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.68 by jsr166, Fri Jun 6 19:35:54 2014 UTC vs.
Revision 1.208 by jsr166, Sun Sep 23 15:29:31 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 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
106 <                                              CFException 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 <        assertTrue(f.isDone());
144 >
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 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
152 >        checkCompletedExceptionally(f, true,
153 >            t -> assertTrue(t instanceof CFException));
154 >    }
155 >
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 155 | Line 194 | public class CompletableFutureTest exten
194              shouldThrow();
195          } catch (CancellationException success) {
196          } catch (Throwable fail) { threadUnexpectedException(fail); }
158        assertTrue(f.isDone());
159        assertTrue(f.isCompletedExceptionally());
160        assertTrue(f.isCancelled());
161        assertTrue(f.toString().contains("[Completed exceptionally]"));
162    }
197  
198 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
199 <        try {
166 <            f.get(LONG_DELAY_MS, MILLISECONDS);
167 <            shouldThrow();
168 <        } catch (ExecutionException success) {
169 <            assertTrue(success.getCause() instanceof CancellationException);
170 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
171 <        try {
172 <            f.join();
173 <            shouldThrow();
174 <        } catch (CompletionException success) {
175 <            assertTrue(success.getCause() instanceof CancellationException);
176 <        }
177 <        try {
178 <            f.getNow(null);
179 <            shouldThrow();
180 <        } catch (CompletionException success) {
181 <            assertTrue(success.getCause() instanceof CancellationException);
182 <        }
183 <        try {
184 <            f.get();
185 <            shouldThrow();
186 <        } catch (ExecutionException success) {
187 <            assertTrue(success.getCause() instanceof CancellationException);
188 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199 >
200          assertTrue(f.isDone());
190        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 206 | Line 217 | public class CompletableFutureTest exten
217       * isCancelled, join, get, and getNow
218       */
219      public void testComplete() {
220 +        for (Integer v1 : new Integer[] { 1, null })
221 +    {
222          CompletableFuture<Integer> f = new CompletableFuture<>();
223          checkIncomplete(f);
224 <        f.complete(one);
225 <        checkCompletedNormally(f, one);
226 <    }
224 >        assertTrue(f.complete(v1));
225 >        assertFalse(f.complete(v1));
226 >        checkCompletedNormally(f, v1);
227 >    }}
228  
229      /**
230       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 232 | public class CompletableFutureTest exten
232       */
233      public void testCompleteExceptionally() {
234          CompletableFuture<Integer> f = new CompletableFuture<>();
235 +        CFException ex = new CFException();
236          checkIncomplete(f);
237 <        f.completeExceptionally(new CFException());
238 <        checkCompletedWithWrappedCFException(f);
237 >        f.completeExceptionally(ex);
238 >        checkCompletedExceptionally(f, ex);
239      }
240  
241      /**
# Line 228 | Line 243 | public class CompletableFutureTest exten
243       * methods isDone, isCancelled, join, get, and getNow
244       */
245      public void testCancel() {
246 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
247 +    {
248          CompletableFuture<Integer> f = new CompletableFuture<>();
249          checkIncomplete(f);
250 <        assertTrue(f.cancel(true));
250 >        assertTrue(f.cancel(mayInterruptIfRunning));
251 >        assertTrue(f.cancel(mayInterruptIfRunning));
252 >        assertTrue(f.cancel(!mayInterruptIfRunning));
253          checkCancelled(f);
254 <    }
254 >    }}
255  
256      /**
257       * obtrudeValue forces completion with given value
# Line 240 | Line 259 | public class CompletableFutureTest exten
259      public void testObtrudeValue() {
260          CompletableFuture<Integer> f = new CompletableFuture<>();
261          checkIncomplete(f);
262 <        f.complete(one);
262 >        assertTrue(f.complete(one));
263          checkCompletedNormally(f, one);
264          f.obtrudeValue(three);
265          checkCompletedNormally(f, three);
# Line 261 | Line 280 | public class CompletableFutureTest exten
280       * obtrudeException forces completion with given exception
281       */
282      public void testObtrudeException() {
283 <        CompletableFuture<Integer> f = new CompletableFuture<>();
284 <        checkIncomplete(f);
285 <        f.complete(one);
286 <        checkCompletedNormally(f, one);
287 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
283 >        for (Integer v1 : new Integer[] { 1, null })
284 >    {
285 >        CFException ex;
286 >        CompletableFuture<Integer> f;
287 >
288          f = new CompletableFuture<>();
289 <        f.obtrudeException(new CFException());
290 <        checkCompletedWithWrappedCFException(f);
289 >        assertTrue(f.complete(v1));
290 >        for (int i = 0; i < 2; i++) {
291 >            f.obtrudeException(ex = new CFException());
292 >            checkCompletedExceptionally(f, ex);
293 >        }
294 >
295 >        f = new CompletableFuture<>();
296 >        for (int i = 0; i < 2; i++) {
297 >            f.obtrudeException(ex = new CFException());
298 >            checkCompletedExceptionally(f, ex);
299 >        }
300 >
301          f = new CompletableFuture<>();
302          f.completeExceptionally(new CFException());
303 <        f.obtrudeValue(four);
304 <        checkCompletedNormally(f, four);
305 <        f.obtrudeException(new CFException());
306 <        checkCompletedWithWrappedCFException(f);
307 <    }
303 >        f.obtrudeValue(v1);
304 >        checkCompletedNormally(f, v1);
305 >        f.obtrudeException(ex = new CFException());
306 >        checkCompletedExceptionally(f, ex);
307 >        f.completeExceptionally(new CFException());
308 >        checkCompletedExceptionally(f, ex);
309 >        assertFalse(f.complete(v1));
310 >        checkCompletedExceptionally(f, ex);
311 >    }}
312  
313      /**
314       * getNumberOfDependents returns number of dependent tasks
315       */
316      public void testGetNumberOfDependents() {
317 +        for (ExecutionMode m : ExecutionMode.values())
318 +        for (Integer v1 : new Integer[] { 1, null })
319 +    {
320          CompletableFuture<Integer> f = new CompletableFuture<>();
321          assertEquals(0, f.getNumberOfDependents());
322 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
322 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
323          assertEquals(1, f.getNumberOfDependents());
324          assertEquals(0, g.getNumberOfDependents());
325 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
325 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
326          assertEquals(2, f.getNumberOfDependents());
327 <        f.complete(1);
327 >        assertEquals(0, h.getNumberOfDependents());
328 >        assertTrue(f.complete(v1));
329          checkCompletedNormally(g, null);
330 +        checkCompletedNormally(h, null);
331          assertEquals(0, f.getNumberOfDependents());
332          assertEquals(0, g.getNumberOfDependents());
333 <    }
333 >        assertEquals(0, h.getNumberOfDependents());
334 >    }}
335  
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]"));
344 <
345 <        f.complete("foo");
346 <        assertTrue(f.toString().contains("[Completed normally]"));
347 <
348 <        f = new CompletableFuture<String>();
349 <        f.completeExceptionally(new IndexOutOfBoundsException());
350 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
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().matches(".*\\[.*Completed normally.*\\]"));
351 >        if (testImplementationDetails)
352 >            assertEquals(identityString(f) + "[Completed normally]",
353 >                         f.toString());
354 >    }
355 >
356 >    public void testToString_exception() {
357 >        CompletableFuture<String> f = new CompletableFuture<>();
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
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 >            CompletableFuture<String> f = new CompletableFuture<>();
368 >            assertTrue(f.cancel(mayInterruptIfRunning));
369 >            assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
370 >            if (testImplementationDetails)
371 >                assertTrue(f.toString().startsWith(
372 >                                   identityString(f) + "[Completed exceptionally: "));
373 >        }
374      }
375  
376      /**
# Line 320 | 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 332 | 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 341 | 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 360 | 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 370 | 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 388 | 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 398 | 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 408 | 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 <
481 <    class CompletableFutureInc extends CheckedIntegerAction
547 >    static class CompletableFutureInc extends CheckedIntegerAction
548          implements Function<Integer, CompletableFuture<Integer>>
549      {
550          CompletableFutureInc(ExecutionMode m) { super(m); }
551          public CompletableFuture<Integer> apply(Integer x) {
552              invoked();
553              value = x;
554 <            CompletableFuture<Integer> f = new CompletableFuture<>();
489 <            f.complete(inc(x));
490 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555          }
556      }
557  
558 <    class FailingCompletableFutureFunction extends CheckedIntegerAction
558 >    static class FailingExceptionalCompletableFutureFunction extends CheckedAction
559 >        implements Function<Throwable, CompletableFuture<Integer>>
560 >    {
561 >        final CFException ex;
562 >        FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
563 >        public CompletableFuture<Integer> apply(Throwable x) {
564 >            invoked();
565 >            throw ex;
566 >        }
567 >    }
568 >
569 >    static class ExceptionalCompletableFutureFunction extends CheckedAction
570 >        implements Function<Throwable, CompletionStage<Integer>> {
571 >        final Integer value = 3;
572 >        ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
573 >        public CompletionStage<Integer> apply(Throwable x) {
574 >            invoked();
575 >            return CompletableFuture.completedFuture(value);
576 >        }
577 >    }
578 >
579 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
580          implements Function<Integer, CompletableFuture<Integer>>
581      {
582 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
582 >        final CFException ex;
583 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
584          public CompletableFuture<Integer> apply(Integer x) {
585              invoked();
586              value = x;
587 <            throw new CFException();
587 >            throw ex;
588 >        }
589 >    }
590 >
591 >    static class CountingRejectingExecutor implements Executor {
592 >        final RejectedExecutionException ex = new RejectedExecutionException();
593 >        final AtomicInteger count = new AtomicInteger(0);
594 >        public void execute(Runnable r) {
595 >            count.getAndIncrement();
596 >            throw ex;
597          }
598      }
599  
# Line 516 | Line 611 | public class CompletableFutureTest exten
611          }
612      }
613  
614 +    static final boolean defaultExecutorIsCommonPool
615 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
616 +
617      /**
618       * Permits the testing of parallel code for the 3 different
619       * execution modes without copy/pasting all the test methods.
620       */
621      enum ExecutionMode {
622 <        DEFAULT {
622 >        SYNC {
623              public void checkExecutionMode() {
624                  assertFalse(ThreadExecutor.startedCurrentThread());
625                  assertNull(ForkJoinTask.getPool());
# Line 593 | Line 691 | public class CompletableFutureTest exten
691                   Function<? super T,U> a) {
692                  return f.applyToEither(g, a);
693              }
694 +            public <T> CompletableFuture<T> exceptionally
695 +                (CompletableFuture<T> f,
696 +                 Function<Throwable, ? extends T> fn) {
697 +                return f.exceptionally(fn);
698 +            }
699 +            public <T> CompletableFuture<T> exceptionallyCompose
700 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
701 +                return f.exceptionallyCompose(fn);
702 +            }
703          },
597
704          ASYNC {
705              public void checkExecutionMode() {
706 <                assertSame(ForkJoinPool.commonPool(),
707 <                           ForkJoinTask.getPool());
706 >                assertEquals(defaultExecutorIsCommonPool,
707 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
708              }
709              public CompletableFuture<Void> runAsync(Runnable a) {
710                  return CompletableFuture.runAsync(a);
# Line 667 | Line 773 | public class CompletableFutureTest exten
773                   Function<? super T,U> a) {
774                  return f.applyToEitherAsync(g, a);
775              }
776 +            public <T> CompletableFuture<T> exceptionally
777 +                (CompletableFuture<T> f,
778 +                 Function<Throwable, ? extends T> fn) {
779 +                return f.exceptionallyAsync(fn);
780 +            }
781 +
782 +            public <T> CompletableFuture<T> exceptionallyCompose
783 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
784 +                return f.exceptionallyComposeAsync(fn);
785 +            }
786 +
787          },
788  
789          EXECUTOR {
# Line 740 | Line 857 | public class CompletableFutureTest exten
857                   Function<? super T,U> a) {
858                  return f.applyToEitherAsync(g, a, new ThreadExecutor());
859              }
860 +            public <T> CompletableFuture<T> exceptionally
861 +                (CompletableFuture<T> f,
862 +                 Function<Throwable, ? extends T> fn) {
863 +                return f.exceptionallyAsync(fn, new ThreadExecutor());
864 +            }
865 +            public <T> CompletableFuture<T> exceptionallyCompose
866 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
867 +                return f.exceptionallyComposeAsync(fn, new ThreadExecutor());
868 +            }
869 +
870          };
871  
872          public abstract void checkExecutionMode();
# Line 782 | Line 909 | public class CompletableFutureTest exten
909              (CompletableFuture<T> f,
910               CompletionStage<? extends T> g,
911               Function<? super T,U> a);
912 +        public abstract <T> CompletableFuture<T> exceptionally
913 +            (CompletableFuture<T> f,
914 +             Function<Throwable, ? extends T> fn);
915 +        public abstract <T> CompletableFuture<T> exceptionallyCompose
916 +            (CompletableFuture<T> f,
917 +             Function<Throwable, ? extends CompletionStage<T>> fn);
918      }
919  
920      /**
# Line 789 | Line 922 | public class CompletableFutureTest exten
922       * normally, and source result is propagated
923       */
924      public void testExceptionally_normalCompletion() {
925 +        for (ExecutionMode m : ExecutionMode.values())
926          for (boolean createIncomplete : new boolean[] { true, false })
927          for (Integer v1 : new Integer[] { 1, null })
928      {
795        final AtomicInteger a = new AtomicInteger(0);
929          final CompletableFuture<Integer> f = new CompletableFuture<>();
930 <        if (!createIncomplete) f.complete(v1);
931 <        final CompletableFuture<Integer> g = f.exceptionally
932 <            ((Throwable t) -> {
933 <                // Should not be called
934 <                a.getAndIncrement();
802 <                throw new AssertionError();
930 >        if (!createIncomplete) assertTrue(f.complete(v1));
931 >        final CompletableFuture<Integer> g = m.exceptionally
932 >            (f, (Throwable t) -> {
933 >                threadFail("should not be called");
934 >                return null;            // unreached
935              });
936 <        if (createIncomplete) f.complete(v1);
936 >        if (createIncomplete) assertTrue(f.complete(v1));
937  
938          checkCompletedNormally(g, v1);
939          checkCompletedNormally(f, v1);
808        assertEquals(0, a.get());
940      }}
941  
811
942      /**
943       * exceptionally action completes with function value on source
944       * exception
945       */
946      public void testExceptionally_exceptionalCompletion() {
947 +        for (ExecutionMode m : ExecutionMode.values())
948          for (boolean createIncomplete : new boolean[] { true, false })
949          for (Integer v1 : new Integer[] { 1, null })
950      {
# Line 821 | Line 952 | public class CompletableFutureTest exten
952          final CFException ex = new CFException();
953          final CompletableFuture<Integer> f = new CompletableFuture<>();
954          if (!createIncomplete) f.completeExceptionally(ex);
955 <        final CompletableFuture<Integer> g = f.exceptionally
956 <            ((Throwable t) -> {
957 <                ExecutionMode.DEFAULT.checkExecutionMode();
955 >        final CompletableFuture<Integer> g = m.exceptionally
956 >            (f, (Throwable t) -> {
957 >                m.checkExecutionMode();
958                  threadAssertSame(t, ex);
959                  a.getAndIncrement();
960                  return v1;
# Line 834 | Line 965 | public class CompletableFutureTest exten
965          assertEquals(1, a.get());
966      }}
967  
968 +    /**
969 +     * If an "exceptionally action" throws an exception, it completes
970 +     * exceptionally with that exception
971 +     */
972      public void testExceptionally_exceptionalCompletionActionFailed() {
973 +        for (ExecutionMode m : ExecutionMode.values())
974 +        for (boolean createIncomplete : new boolean[] { true, false })
975 +    {
976 +        final AtomicInteger a = new AtomicInteger(0);
977 +        final CFException ex1 = new CFException();
978 +        final CFException ex2 = new CFException();
979 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
980 +        if (!createIncomplete) f.completeExceptionally(ex1);
981 +        final CompletableFuture<Integer> g = m.exceptionally
982 +            (f, (Throwable t) -> {
983 +                m.checkExecutionMode();
984 +                threadAssertSame(t, ex1);
985 +                a.getAndIncrement();
986 +                throw ex2;
987 +            });
988 +        if (createIncomplete) f.completeExceptionally(ex1);
989 +
990 +        checkCompletedWithWrappedException(g, ex2);
991 +        checkCompletedExceptionally(f, ex1);
992 +        assertEquals(1, a.get());
993 +    }}
994 +
995 +    /**
996 +     * whenComplete action executes on normal completion, propagating
997 +     * source result.
998 +     */
999 +    public void testWhenComplete_normalCompletion() {
1000 +        for (ExecutionMode m : ExecutionMode.values())
1001 +        for (boolean createIncomplete : new boolean[] { true, false })
1002 +        for (Integer v1 : new Integer[] { 1, null })
1003 +    {
1004 +        final AtomicInteger a = new AtomicInteger(0);
1005 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 +        if (!createIncomplete) assertTrue(f.complete(v1));
1007 +        final CompletableFuture<Integer> g = m.whenComplete
1008 +            (f,
1009 +             (Integer result, Throwable t) -> {
1010 +                m.checkExecutionMode();
1011 +                threadAssertSame(result, v1);
1012 +                threadAssertNull(t);
1013 +                a.getAndIncrement();
1014 +            });
1015 +        if (createIncomplete) assertTrue(f.complete(v1));
1016 +
1017 +        checkCompletedNormally(g, v1);
1018 +        checkCompletedNormally(f, v1);
1019 +        assertEquals(1, a.get());
1020 +    }}
1021 +
1022 +    /**
1023 +     * whenComplete action executes on exceptional completion, propagating
1024 +     * source result.
1025 +     */
1026 +    public void testWhenComplete_exceptionalCompletion() {
1027 +        for (ExecutionMode m : ExecutionMode.values())
1028 +        for (boolean createIncomplete : new boolean[] { true, false })
1029 +    {
1030 +        final AtomicInteger a = new AtomicInteger(0);
1031 +        final CFException ex = new CFException();
1032 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1033 +        if (!createIncomplete) f.completeExceptionally(ex);
1034 +        final CompletableFuture<Integer> g = m.whenComplete
1035 +            (f,
1036 +             (Integer result, Throwable t) -> {
1037 +                m.checkExecutionMode();
1038 +                threadAssertNull(result);
1039 +                threadAssertSame(t, ex);
1040 +                a.getAndIncrement();
1041 +            });
1042 +        if (createIncomplete) f.completeExceptionally(ex);
1043 +
1044 +        checkCompletedWithWrappedException(g, ex);
1045 +        checkCompletedExceptionally(f, ex);
1046 +        assertEquals(1, a.get());
1047 +    }}
1048 +
1049 +    /**
1050 +     * whenComplete action executes on cancelled source, propagating
1051 +     * CancellationException.
1052 +     */
1053 +    public void testWhenComplete_sourceCancelled() {
1054 +        for (ExecutionMode m : ExecutionMode.values())
1055 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1056          for (boolean createIncomplete : new boolean[] { true, false })
1057 +    {
1058 +        final AtomicInteger a = new AtomicInteger(0);
1059 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1060 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1061 +        final CompletableFuture<Integer> g = m.whenComplete
1062 +            (f,
1063 +             (Integer result, Throwable t) -> {
1064 +                m.checkExecutionMode();
1065 +                threadAssertNull(result);
1066 +                threadAssertTrue(t instanceof CancellationException);
1067 +                a.getAndIncrement();
1068 +            });
1069 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1070 +
1071 +        checkCompletedWithWrappedCancellationException(g);
1072 +        checkCancelled(f);
1073 +        assertEquals(1, a.get());
1074 +    }}
1075 +
1076 +    /**
1077 +     * If a whenComplete action throws an exception when triggered by
1078 +     * a normal completion, it completes exceptionally
1079 +     */
1080 +    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1081 +        for (boolean createIncomplete : new boolean[] { true, false })
1082 +        for (ExecutionMode m : ExecutionMode.values())
1083          for (Integer v1 : new Integer[] { 1, null })
1084      {
1085          final AtomicInteger a = new AtomicInteger(0);
1086 +        final CFException ex = new CFException();
1087 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1088 +        if (!createIncomplete) assertTrue(f.complete(v1));
1089 +        final CompletableFuture<Integer> g = m.whenComplete
1090 +            (f,
1091 +             (Integer result, Throwable t) -> {
1092 +                m.checkExecutionMode();
1093 +                threadAssertSame(result, v1);
1094 +                threadAssertNull(t);
1095 +                a.getAndIncrement();
1096 +                throw ex;
1097 +            });
1098 +        if (createIncomplete) assertTrue(f.complete(v1));
1099 +
1100 +        checkCompletedWithWrappedException(g, ex);
1101 +        checkCompletedNormally(f, v1);
1102 +        assertEquals(1, a.get());
1103 +    }}
1104 +
1105 +    /**
1106 +     * If a whenComplete action throws an exception when triggered by
1107 +     * a source completion that also throws an exception, the source
1108 +     * exception takes precedence (unlike handle)
1109 +     */
1110 +    public void testWhenComplete_sourceFailedActionFailed() {
1111 +        for (boolean createIncomplete : new boolean[] { true, false })
1112 +        for (ExecutionMode m : ExecutionMode.values())
1113 +    {
1114 +        final AtomicInteger a = new AtomicInteger(0);
1115          final CFException ex1 = new CFException();
1116          final CFException ex2 = new CFException();
1117          final CompletableFuture<Integer> f = new CompletableFuture<>();
1118 +
1119          if (!createIncomplete) f.completeExceptionally(ex1);
1120 <        final CompletableFuture<Integer> g = f.exceptionally
1121 <            ((Throwable t) -> {
1122 <                ExecutionMode.DEFAULT.checkExecutionMode();
1120 >        final CompletableFuture<Integer> g = m.whenComplete
1121 >            (f,
1122 >             (Integer result, Throwable t) -> {
1123 >                m.checkExecutionMode();
1124                  threadAssertSame(t, ex1);
1125 +                threadAssertNull(result);
1126                  a.getAndIncrement();
1127                  throw ex2;
1128              });
1129          if (createIncomplete) f.completeExceptionally(ex1);
1130  
1131 <        checkCompletedWithWrappedCFException(g, ex2);
1131 >        checkCompletedWithWrappedException(g, ex1);
1132 >        checkCompletedExceptionally(f, ex1);
1133 >        if (testImplementationDetails) {
1134 >            assertEquals(1, ex1.getSuppressed().length);
1135 >            assertSame(ex2, ex1.getSuppressed()[0]);
1136 >        }
1137          assertEquals(1, a.get());
1138      }}
1139  
# Line 867 | Line 1148 | public class CompletableFutureTest exten
1148      {
1149          final CompletableFuture<Integer> f = new CompletableFuture<>();
1150          final AtomicInteger a = new AtomicInteger(0);
1151 <        if (!createIncomplete) f.complete(v1);
1151 >        if (!createIncomplete) assertTrue(f.complete(v1));
1152          final CompletableFuture<Integer> g = m.handle
1153              (f,
1154 <             (Integer x, Throwable t) -> {
1154 >             (Integer result, Throwable t) -> {
1155                  m.checkExecutionMode();
1156 <                threadAssertSame(x, v1);
1156 >                threadAssertSame(result, v1);
1157                  threadAssertNull(t);
1158                  a.getAndIncrement();
1159                  return inc(v1);
1160              });
1161 <        if (createIncomplete) f.complete(v1);
1161 >        if (createIncomplete) assertTrue(f.complete(v1));
1162  
1163          checkCompletedNormally(g, inc(v1));
1164          checkCompletedNormally(f, v1);
# Line 899 | Line 1180 | public class CompletableFutureTest exten
1180          if (!createIncomplete) f.completeExceptionally(ex);
1181          final CompletableFuture<Integer> g = m.handle
1182              (f,
1183 <             (Integer x, Throwable t) -> {
1183 >             (Integer result, Throwable t) -> {
1184                  m.checkExecutionMode();
1185 <                threadAssertNull(x);
1185 >                threadAssertNull(result);
1186                  threadAssertSame(t, ex);
1187                  a.getAndIncrement();
1188                  return v1;
# Line 909 | Line 1190 | public class CompletableFutureTest exten
1190          if (createIncomplete) f.completeExceptionally(ex);
1191  
1192          checkCompletedNormally(g, v1);
1193 <        checkCompletedWithWrappedCFException(f, ex);
1193 >        checkCompletedExceptionally(f, ex);
1194          assertEquals(1, a.get());
1195      }}
1196  
# Line 928 | Line 1209 | public class CompletableFutureTest exten
1209          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1210          final CompletableFuture<Integer> g = m.handle
1211              (f,
1212 <             (Integer x, Throwable t) -> {
1212 >             (Integer result, Throwable t) -> {
1213                  m.checkExecutionMode();
1214 <                threadAssertNull(x);
1214 >                threadAssertNull(result);
1215                  threadAssertTrue(t instanceof CancellationException);
1216                  a.getAndIncrement();
1217                  return v1;
# Line 943 | Line 1224 | public class CompletableFutureTest exten
1224      }}
1225  
1226      /**
1227 <     * handle result completes exceptionally if action does
1227 >     * If a "handle action" throws an exception when triggered by
1228 >     * a normal completion, it completes exceptionally
1229       */
1230 <    public void testHandle_sourceFailedActionFailed() {
1230 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1231          for (ExecutionMode m : ExecutionMode.values())
1232          for (boolean createIncomplete : new boolean[] { true, false })
1233 +        for (Integer v1 : new Integer[] { 1, null })
1234      {
1235          final CompletableFuture<Integer> f = new CompletableFuture<>();
1236          final AtomicInteger a = new AtomicInteger(0);
1237 <        final CFException ex1 = new CFException();
1238 <        final CFException ex2 = new CFException();
956 <        if (!createIncomplete) f.completeExceptionally(ex1);
1237 >        final CFException ex = new CFException();
1238 >        if (!createIncomplete) assertTrue(f.complete(v1));
1239          final CompletableFuture<Integer> g = m.handle
1240              (f,
1241 <             (Integer x, Throwable t) -> {
1241 >             (Integer result, Throwable t) -> {
1242                  m.checkExecutionMode();
1243 <                threadAssertNull(x);
1244 <                threadAssertSame(ex1, t);
1243 >                threadAssertSame(result, v1);
1244 >                threadAssertNull(t);
1245                  a.getAndIncrement();
1246 <                throw ex2;
1246 >                throw ex;
1247              });
1248 <        if (createIncomplete) f.completeExceptionally(ex1);
1248 >        if (createIncomplete) assertTrue(f.complete(v1));
1249  
1250 <        checkCompletedWithWrappedCFException(g, ex2);
1251 <        checkCompletedWithWrappedCFException(f, ex1);
1250 >        checkCompletedWithWrappedException(g, ex);
1251 >        checkCompletedNormally(f, v1);
1252          assertEquals(1, a.get());
1253      }}
1254  
1255 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1256 <        for (ExecutionMode m : ExecutionMode.values())
1255 >    /**
1256 >     * If a "handle action" throws an exception when triggered by
1257 >     * a source completion that also throws an exception, the action
1258 >     * exception takes precedence (unlike whenComplete)
1259 >     */
1260 >    public void testHandle_sourceFailedActionFailed() {
1261          for (boolean createIncomplete : new boolean[] { true, false })
1262 <        for (Integer v1 : new Integer[] { 1, null })
1262 >        for (ExecutionMode m : ExecutionMode.values())
1263      {
978        final CompletableFuture<Integer> f = new CompletableFuture<>();
1264          final AtomicInteger a = new AtomicInteger(0);
1265 <        final CFException ex = new CFException();
1266 <        if (!createIncomplete) f.complete(v1);
1265 >        final CFException ex1 = new CFException();
1266 >        final CFException ex2 = new CFException();
1267 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1268 >
1269 >        if (!createIncomplete) f.completeExceptionally(ex1);
1270          final CompletableFuture<Integer> g = m.handle
1271              (f,
1272 <             (Integer x, Throwable t) -> {
1272 >             (Integer result, Throwable t) -> {
1273                  m.checkExecutionMode();
1274 <                threadAssertSame(x, v1);
1275 <                threadAssertNull(t);
1274 >                threadAssertNull(result);
1275 >                threadAssertSame(ex1, t);
1276                  a.getAndIncrement();
1277 <                throw ex;
1277 >                throw ex2;
1278              });
1279 <        if (createIncomplete) f.complete(v1);
1279 >        if (createIncomplete) f.completeExceptionally(ex1);
1280  
1281 <        checkCompletedWithWrappedCFException(g, ex);
1282 <        checkCompletedNormally(f, v1);
1281 >        checkCompletedWithWrappedException(g, ex2);
1282 >        checkCompletedExceptionally(f, ex1);
1283          assertEquals(1, a.get());
1284      }}
1285  
# Line 1024 | Line 1312 | public class CompletableFutureTest exten
1312      {
1313          final FailingRunnable r = new FailingRunnable(m);
1314          final CompletableFuture<Void> f = m.runAsync(r);
1315 <        checkCompletedWithWrappedCFException(f);
1315 >        checkCompletedWithWrappedException(f, r.ex);
1316          r.assertInvoked();
1317      }}
1318  
1319 +    @SuppressWarnings("FutureReturnValueIgnored")
1320 +    public void testRunAsync_rejectingExecutor() {
1321 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1322 +        try {
1323 +            CompletableFuture.runAsync(() -> {}, e);
1324 +            shouldThrow();
1325 +        } catch (Throwable t) {
1326 +            assertSame(e.ex, t);
1327 +        }
1328 +
1329 +        assertEquals(1, e.count.get());
1330 +    }
1331 +
1332      /**
1333       * supplyAsync completes with result of supplier
1334       */
# Line 1058 | Line 1359 | public class CompletableFutureTest exten
1359      {
1360          FailingSupplier r = new FailingSupplier(m);
1361          CompletableFuture<Integer> f = m.supplyAsync(r);
1362 <        checkCompletedWithWrappedCFException(f);
1362 >        checkCompletedWithWrappedException(f, r.ex);
1363          r.assertInvoked();
1364      }}
1365  
1366 +    @SuppressWarnings("FutureReturnValueIgnored")
1367 +    public void testSupplyAsync_rejectingExecutor() {
1368 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1369 +        try {
1370 +            CompletableFuture.supplyAsync(() -> null, e);
1371 +            shouldThrow();
1372 +        } catch (Throwable t) {
1373 +            assertSame(e.ex, t);
1374 +        }
1375 +
1376 +        assertEquals(1, e.count.get());
1377 +    }
1378 +
1379      // seq completion methods
1380  
1381      /**
# Line 1069 | Line 1383 | public class CompletableFutureTest exten
1383       */
1384      public void testThenRun_normalCompletion() {
1385          for (ExecutionMode m : ExecutionMode.values())
1072        for (boolean createIncomplete : new boolean[] { true, false })
1386          for (Integer v1 : new Integer[] { 1, null })
1387      {
1388          final CompletableFuture<Integer> f = new CompletableFuture<>();
1389 <        final Noop r = new Noop(m);
1390 <        if (!createIncomplete) f.complete(v1);
1078 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1079 <        if (createIncomplete) {
1080 <            checkIncomplete(g);
1081 <            f.complete(v1);
1082 <        }
1389 >        final Noop[] rs = new Noop[6];
1390 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1391  
1392 <        checkCompletedNormally(g, null);
1392 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1393 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1394 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1395 >        checkIncomplete(h0);
1396 >        checkIncomplete(h1);
1397 >        checkIncomplete(h2);
1398 >        assertTrue(f.complete(v1));
1399 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1400 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1401 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1402 >
1403 >        checkCompletedNormally(h0, null);
1404 >        checkCompletedNormally(h1, null);
1405 >        checkCompletedNormally(h2, null);
1406 >        checkCompletedNormally(h3, null);
1407 >        checkCompletedNormally(h4, null);
1408 >        checkCompletedNormally(h5, null);
1409          checkCompletedNormally(f, v1);
1410 <        r.assertInvoked();
1410 >        for (Noop r : rs) r.assertInvoked();
1411      }}
1412  
1413      /**
# Line 1092 | Line 1416 | public class CompletableFutureTest exten
1416       */
1417      public void testThenRun_exceptionalCompletion() {
1418          for (ExecutionMode m : ExecutionMode.values())
1095        for (boolean createIncomplete : new boolean[] { true, false })
1419      {
1420          final CFException ex = new CFException();
1421          final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 <        final Noop r = new Noop(m);
1423 <        if (!createIncomplete) f.completeExceptionally(ex);
1101 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1102 <        if (createIncomplete) {
1103 <            checkIncomplete(g);
1104 <            f.completeExceptionally(ex);
1105 <        }
1422 >        final Noop[] rs = new Noop[6];
1423 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1424  
1425 <        checkCompletedWithWrappedCFException(g, ex);
1426 <        checkCompletedWithWrappedCFException(f, ex);
1427 <        r.assertNotInvoked();
1425 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1426 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1427 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1428 >        checkIncomplete(h0);
1429 >        checkIncomplete(h1);
1430 >        checkIncomplete(h2);
1431 >        assertTrue(f.completeExceptionally(ex));
1432 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1433 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1434 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1435 >
1436 >        checkCompletedWithWrappedException(h0, ex);
1437 >        checkCompletedWithWrappedException(h1, ex);
1438 >        checkCompletedWithWrappedException(h2, ex);
1439 >        checkCompletedWithWrappedException(h3, ex);
1440 >        checkCompletedWithWrappedException(h4, ex);
1441 >        checkCompletedWithWrappedException(h5, ex);
1442 >        checkCompletedExceptionally(f, ex);
1443 >        for (Noop r : rs) r.assertNotInvoked();
1444      }}
1445  
1446      /**
# Line 1114 | Line 1448 | public class CompletableFutureTest exten
1448       */
1449      public void testThenRun_sourceCancelled() {
1450          for (ExecutionMode m : ExecutionMode.values())
1117        for (boolean createIncomplete : new boolean[] { true, false })
1451          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1452      {
1453          final CompletableFuture<Integer> f = new CompletableFuture<>();
1454 <        final Noop r = new Noop(m);
1455 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 <        if (createIncomplete) {
1125 <            checkIncomplete(g);
1126 <            assertTrue(f.cancel(mayInterruptIfRunning));
1127 <        }
1454 >        final Noop[] rs = new Noop[6];
1455 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1456  
1457 <        checkCompletedWithWrappedCancellationException(g);
1457 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1458 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1459 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1460 >        checkIncomplete(h0);
1461 >        checkIncomplete(h1);
1462 >        checkIncomplete(h2);
1463 >        assertTrue(f.cancel(mayInterruptIfRunning));
1464 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1465 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1466 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1467 >
1468 >        checkCompletedWithWrappedCancellationException(h0);
1469 >        checkCompletedWithWrappedCancellationException(h1);
1470 >        checkCompletedWithWrappedCancellationException(h2);
1471 >        checkCompletedWithWrappedCancellationException(h3);
1472 >        checkCompletedWithWrappedCancellationException(h4);
1473 >        checkCompletedWithWrappedCancellationException(h5);
1474          checkCancelled(f);
1475 <        r.assertNotInvoked();
1475 >        for (Noop r : rs) r.assertNotInvoked();
1476      }}
1477  
1478      /**
# Line 1136 | Line 1480 | public class CompletableFutureTest exten
1480       */
1481      public void testThenRun_actionFailed() {
1482          for (ExecutionMode m : ExecutionMode.values())
1139        for (boolean createIncomplete : new boolean[] { true, false })
1483          for (Integer v1 : new Integer[] { 1, null })
1484      {
1485          final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 <        final FailingRunnable r = new FailingRunnable(m);
1487 <        if (!createIncomplete) f.complete(v1);
1145 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 <        if (createIncomplete) {
1147 <            checkIncomplete(g);
1148 <            f.complete(v1);
1149 <        }
1486 >        final FailingRunnable[] rs = new FailingRunnable[6];
1487 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1488  
1489 <        checkCompletedWithWrappedCFException(g);
1489 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1490 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1491 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1492 >        assertTrue(f.complete(v1));
1493 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1494 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1495 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1496 >
1497 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1498 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1499 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1500 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1501 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1502 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1503          checkCompletedNormally(f, v1);
1504      }}
1505  
# Line 1157 | Line 1508 | public class CompletableFutureTest exten
1508       */
1509      public void testThenApply_normalCompletion() {
1510          for (ExecutionMode m : ExecutionMode.values())
1160        for (boolean createIncomplete : new boolean[] { true, false })
1511          for (Integer v1 : new Integer[] { 1, null })
1512      {
1513          final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 <        final IncFunction r = new IncFunction(m);
1515 <        if (!createIncomplete) f.complete(v1);
1166 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1167 <        if (createIncomplete) {
1168 <            checkIncomplete(g);
1169 <            f.complete(v1);
1170 <        }
1514 >        final IncFunction[] rs = new IncFunction[4];
1515 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1516  
1517 <        checkCompletedNormally(g, inc(v1));
1517 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1518 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1519 >        checkIncomplete(h0);
1520 >        checkIncomplete(h1);
1521 >        assertTrue(f.complete(v1));
1522 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1523 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1524 >
1525 >        checkCompletedNormally(h0, inc(v1));
1526 >        checkCompletedNormally(h1, inc(v1));
1527 >        checkCompletedNormally(h2, inc(v1));
1528 >        checkCompletedNormally(h3, inc(v1));
1529          checkCompletedNormally(f, v1);
1530 <        r.assertInvoked();
1530 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1531      }}
1532  
1533      /**
# Line 1180 | Line 1536 | public class CompletableFutureTest exten
1536       */
1537      public void testThenApply_exceptionalCompletion() {
1538          for (ExecutionMode m : ExecutionMode.values())
1183        for (boolean createIncomplete : new boolean[] { true, false })
1539      {
1540          final CFException ex = new CFException();
1541          final CompletableFuture<Integer> f = new CompletableFuture<>();
1542 <        final IncFunction r = new IncFunction(m);
1543 <        if (!createIncomplete) f.completeExceptionally(ex);
1189 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 <        if (createIncomplete) {
1191 <            checkIncomplete(g);
1192 <            f.completeExceptionally(ex);
1193 <        }
1542 >        final IncFunction[] rs = new IncFunction[4];
1543 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1544  
1545 <        checkCompletedWithWrappedCFException(g, ex);
1546 <        checkCompletedWithWrappedCFException(f, ex);
1547 <        r.assertNotInvoked();
1545 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1546 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1547 >        assertTrue(f.completeExceptionally(ex));
1548 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1549 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1550 >
1551 >        checkCompletedWithWrappedException(h0, ex);
1552 >        checkCompletedWithWrappedException(h1, ex);
1553 >        checkCompletedWithWrappedException(h2, ex);
1554 >        checkCompletedWithWrappedException(h3, ex);
1555 >        checkCompletedExceptionally(f, ex);
1556 >        for (IncFunction r : rs) r.assertNotInvoked();
1557      }}
1558  
1559      /**
# Line 1202 | Line 1561 | public class CompletableFutureTest exten
1561       */
1562      public void testThenApply_sourceCancelled() {
1563          for (ExecutionMode m : ExecutionMode.values())
1205        for (boolean createIncomplete : new boolean[] { true, false })
1564          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1565      {
1566          final CompletableFuture<Integer> f = new CompletableFuture<>();
1567 <        final IncFunction r = new IncFunction(m);
1568 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 <        if (createIncomplete) {
1213 <            checkIncomplete(g);
1214 <            assertTrue(f.cancel(mayInterruptIfRunning));
1215 <        }
1567 >        final IncFunction[] rs = new IncFunction[4];
1568 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1569  
1570 <        checkCompletedWithWrappedCancellationException(g);
1570 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1571 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1572 >        assertTrue(f.cancel(mayInterruptIfRunning));
1573 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1574 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1575 >
1576 >        checkCompletedWithWrappedCancellationException(h0);
1577 >        checkCompletedWithWrappedCancellationException(h1);
1578 >        checkCompletedWithWrappedCancellationException(h2);
1579 >        checkCompletedWithWrappedCancellationException(h3);
1580          checkCancelled(f);
1581 <        r.assertNotInvoked();
1581 >        for (IncFunction r : rs) r.assertNotInvoked();
1582      }}
1583  
1584      /**
# Line 1224 | Line 1586 | public class CompletableFutureTest exten
1586       */
1587      public void testThenApply_actionFailed() {
1588          for (ExecutionMode m : ExecutionMode.values())
1227        for (boolean createIncomplete : new boolean[] { true, false })
1589          for (Integer v1 : new Integer[] { 1, null })
1590      {
1591          final CompletableFuture<Integer> f = new CompletableFuture<>();
1592 <        final FailingFunction r = new FailingFunction(m);
1593 <        if (!createIncomplete) f.complete(v1);
1233 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 <        if (createIncomplete) {
1235 <            checkIncomplete(g);
1236 <            f.complete(v1);
1237 <        }
1592 >        final FailingFunction[] rs = new FailingFunction[4];
1593 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1594  
1595 <        checkCompletedWithWrappedCFException(g);
1595 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1596 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1597 >        assertTrue(f.complete(v1));
1598 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1599 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1600 >
1601 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1602 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1603 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1604 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1605          checkCompletedNormally(f, v1);
1606      }}
1607  
# Line 1245 | Line 1610 | public class CompletableFutureTest exten
1610       */
1611      public void testThenAccept_normalCompletion() {
1612          for (ExecutionMode m : ExecutionMode.values())
1248        for (boolean createIncomplete : new boolean[] { true, false })
1613          for (Integer v1 : new Integer[] { 1, null })
1614      {
1615          final CompletableFuture<Integer> f = new CompletableFuture<>();
1616 <        final NoopConsumer r = new NoopConsumer(m);
1617 <        if (!createIncomplete) f.complete(v1);
1254 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 <        if (createIncomplete) {
1256 <            checkIncomplete(g);
1257 <            f.complete(v1);
1258 <        }
1616 >        final NoopConsumer[] rs = new NoopConsumer[4];
1617 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1618  
1619 <        checkCompletedNormally(g, null);
1620 <        r.assertValue(v1);
1619 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1620 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1621 >        checkIncomplete(h0);
1622 >        checkIncomplete(h1);
1623 >        assertTrue(f.complete(v1));
1624 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1625 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1626 >
1627 >        checkCompletedNormally(h0, null);
1628 >        checkCompletedNormally(h1, null);
1629 >        checkCompletedNormally(h2, null);
1630 >        checkCompletedNormally(h3, null);
1631          checkCompletedNormally(f, v1);
1632 +        for (NoopConsumer r : rs) r.assertValue(v1);
1633      }}
1634  
1635      /**
# Line 1268 | Line 1638 | public class CompletableFutureTest exten
1638       */
1639      public void testThenAccept_exceptionalCompletion() {
1640          for (ExecutionMode m : ExecutionMode.values())
1271        for (boolean createIncomplete : new boolean[] { true, false })
1641      {
1642          final CFException ex = new CFException();
1643          final CompletableFuture<Integer> f = new CompletableFuture<>();
1644 <        final NoopConsumer r = new NoopConsumer(m);
1645 <        if (!createIncomplete) f.completeExceptionally(ex);
1277 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 <        if (createIncomplete) {
1279 <            checkIncomplete(g);
1280 <            f.completeExceptionally(ex);
1281 <        }
1644 >        final NoopConsumer[] rs = new NoopConsumer[4];
1645 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1646  
1647 <        checkCompletedWithWrappedCFException(g, ex);
1648 <        checkCompletedWithWrappedCFException(f, ex);
1649 <        r.assertNotInvoked();
1647 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1648 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1649 >        assertTrue(f.completeExceptionally(ex));
1650 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1651 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1652 >
1653 >        checkCompletedWithWrappedException(h0, ex);
1654 >        checkCompletedWithWrappedException(h1, ex);
1655 >        checkCompletedWithWrappedException(h2, ex);
1656 >        checkCompletedWithWrappedException(h3, ex);
1657 >        checkCompletedExceptionally(f, ex);
1658 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1659      }}
1660  
1661      /**
# Line 1290 | Line 1663 | public class CompletableFutureTest exten
1663       */
1664      public void testThenAccept_sourceCancelled() {
1665          for (ExecutionMode m : ExecutionMode.values())
1293        for (boolean createIncomplete : new boolean[] { true, false })
1666          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1667      {
1668          final CompletableFuture<Integer> f = new CompletableFuture<>();
1669 <        final NoopConsumer r = new NoopConsumer(m);
1670 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300 <        if (createIncomplete) {
1301 <            checkIncomplete(g);
1302 <            assertTrue(f.cancel(mayInterruptIfRunning));
1303 <        }
1669 >        final NoopConsumer[] rs = new NoopConsumer[4];
1670 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1671  
1672 <        checkCompletedWithWrappedCancellationException(g);
1672 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1673 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1674 >        assertTrue(f.cancel(mayInterruptIfRunning));
1675 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1676 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1677 >
1678 >        checkCompletedWithWrappedCancellationException(h0);
1679 >        checkCompletedWithWrappedCancellationException(h1);
1680 >        checkCompletedWithWrappedCancellationException(h2);
1681 >        checkCompletedWithWrappedCancellationException(h3);
1682          checkCancelled(f);
1683 <        r.assertNotInvoked();
1683 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1684      }}
1685  
1686      /**
# Line 1312 | Line 1688 | public class CompletableFutureTest exten
1688       */
1689      public void testThenAccept_actionFailed() {
1690          for (ExecutionMode m : ExecutionMode.values())
1315        for (boolean createIncomplete : new boolean[] { true, false })
1691          for (Integer v1 : new Integer[] { 1, null })
1692      {
1693          final CompletableFuture<Integer> f = new CompletableFuture<>();
1694 <        final FailingConsumer r = new FailingConsumer(m);
1695 <        if (!createIncomplete) f.complete(v1);
1321 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 <        if (createIncomplete) {
1323 <            checkIncomplete(g);
1324 <            f.complete(v1);
1325 <        }
1694 >        final FailingConsumer[] rs = new FailingConsumer[4];
1695 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1696  
1697 <        checkCompletedWithWrappedCFException(g);
1697 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1698 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1699 >        assertTrue(f.complete(v1));
1700 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1701 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1702 >
1703 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1704 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1705 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1706 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1707          checkCompletedNormally(f, v1);
1708      }}
1709  
# Line 1334 | Line 1713 | public class CompletableFutureTest exten
1713       */
1714      public void testThenCombine_normalCompletion() {
1715          for (ExecutionMode m : ExecutionMode.values())
1337        for (boolean createIncomplete : new boolean[] { true, false })
1716          for (boolean fFirst : new boolean[] { true, false })
1717          for (Integer v1 : new Integer[] { 1, null })
1718          for (Integer v2 : new Integer[] { 2, null })
1719      {
1720          final CompletableFuture<Integer> f = new CompletableFuture<>();
1721          final CompletableFuture<Integer> g = new CompletableFuture<>();
1722 <        final SubtractFunction r = new SubtractFunction(m);
1722 >        final SubtractFunction[] rs = new SubtractFunction[6];
1723 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1724  
1725 <        if (fFirst) f.complete(v1); else g.complete(v2);
1726 <        if (!createIncomplete)
1727 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1728 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1729 <        if (createIncomplete) {
1730 <            checkIncomplete(h);
1731 <            r.assertNotInvoked();
1732 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1733 <        }
1725 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1726 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1727 >        final Integer w1 =  fFirst ? v1 : v2;
1728 >        final Integer w2 = !fFirst ? v1 : v2;
1729 >
1730 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1731 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1732 >        assertTrue(fst.complete(w1));
1733 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1734 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1735 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1736 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1737 >        checkCompletedNormally(h1, subtract(w1, w1));
1738 >        checkCompletedNormally(h3, subtract(w1, w1));
1739 >        rs[1].assertValue(subtract(w1, w1));
1740 >        rs[3].assertValue(subtract(w1, w1));
1741 >        assertTrue(snd.complete(w2));
1742 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1743 >
1744 >        checkCompletedNormally(h0, subtract(v1, v2));
1745 >        checkCompletedNormally(h2, subtract(v1, v2));
1746 >        checkCompletedNormally(h4, subtract(v1, v2));
1747 >        rs[0].assertValue(subtract(v1, v2));
1748 >        rs[2].assertValue(subtract(v1, v2));
1749 >        rs[4].assertValue(subtract(v1, v2));
1750  
1356        checkCompletedNormally(h, subtract(v1, v2));
1751          checkCompletedNormally(f, v1);
1752          checkCompletedNormally(g, v2);
1359        r.assertInvoked();
1753      }}
1754  
1755      /**
1756       * thenCombine result completes exceptionally after exceptional
1757       * completion of either source
1758       */
1759 <    public void testThenCombine_exceptionalCompletion() {
1759 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1760          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1761          for (boolean fFirst : new boolean[] { true, false })
1762 +        for (boolean failFirst : new boolean[] { true, false })
1763          for (Integer v1 : new Integer[] { 1, null })
1764      {
1765          final CompletableFuture<Integer> f = new CompletableFuture<>();
1766          final CompletableFuture<Integer> g = new CompletableFuture<>();
1767          final CFException ex = new CFException();
1768 <        final SubtractFunction r = new SubtractFunction(m);
1769 <
1770 <        (fFirst ? f : g).complete(v1);
1771 <        if (!createIncomplete)
1772 <            (!fFirst ? f : g).completeExceptionally(ex);
1773 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1774 <        if (createIncomplete) {
1775 <            checkIncomplete(h);
1776 <            (!fFirst ? f : g).completeExceptionally(ex);
1777 <        }
1778 <
1779 <        checkCompletedWithWrappedCFException(h, ex);
1780 <        r.assertNotInvoked();
1781 <        checkCompletedNormally(fFirst ? f : g, v1);
1782 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1768 >        final SubtractFunction r1 = new SubtractFunction(m);
1769 >        final SubtractFunction r2 = new SubtractFunction(m);
1770 >        final SubtractFunction r3 = new SubtractFunction(m);
1771 >
1772 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1773 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1774 >        final Callable<Boolean> complete1 = failFirst ?
1775 >            () -> fst.completeExceptionally(ex) :
1776 >            () -> fst.complete(v1);
1777 >        final Callable<Boolean> complete2 = failFirst ?
1778 >            () -> snd.complete(v1) :
1779 >            () -> snd.completeExceptionally(ex);
1780 >
1781 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1782 >        assertTrue(complete1.call());
1783 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1784 >        checkIncomplete(h1);
1785 >        checkIncomplete(h2);
1786 >        assertTrue(complete2.call());
1787 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1788 >
1789 >        checkCompletedWithWrappedException(h1, ex);
1790 >        checkCompletedWithWrappedException(h2, ex);
1791 >        checkCompletedWithWrappedException(h3, ex);
1792 >        r1.assertNotInvoked();
1793 >        r2.assertNotInvoked();
1794 >        r3.assertNotInvoked();
1795 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1796 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1797      }}
1798  
1799      /**
1800       * thenCombine result completes exceptionally if either source cancelled
1801       */
1802 <    public void testThenCombine_sourceCancelled() {
1802 >    public void testThenCombine_sourceCancelled() throws Throwable {
1803          for (ExecutionMode m : ExecutionMode.values())
1804          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398        for (boolean createIncomplete : new boolean[] { true, false })
1805          for (boolean fFirst : new boolean[] { true, false })
1806 +        for (boolean failFirst : new boolean[] { true, false })
1807          for (Integer v1 : new Integer[] { 1, null })
1808      {
1809          final CompletableFuture<Integer> f = new CompletableFuture<>();
1810          final CompletableFuture<Integer> g = new CompletableFuture<>();
1811 <        final SubtractFunction r = new SubtractFunction(m);
1812 <
1813 <        (fFirst ? f : g).complete(v1);
1814 <        if (!createIncomplete)
1815 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1816 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1817 <        if (createIncomplete) {
1818 <            checkIncomplete(h);
1819 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1820 <        }
1811 >        final SubtractFunction r1 = new SubtractFunction(m);
1812 >        final SubtractFunction r2 = new SubtractFunction(m);
1813 >        final SubtractFunction r3 = new SubtractFunction(m);
1814 >
1815 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1816 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1817 >        final Callable<Boolean> complete1 = failFirst ?
1818 >            () -> fst.cancel(mayInterruptIfRunning) :
1819 >            () -> fst.complete(v1);
1820 >        final Callable<Boolean> complete2 = failFirst ?
1821 >            () -> snd.complete(v1) :
1822 >            () -> snd.cancel(mayInterruptIfRunning);
1823 >
1824 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1825 >        assertTrue(complete1.call());
1826 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1827 >        checkIncomplete(h1);
1828 >        checkIncomplete(h2);
1829 >        assertTrue(complete2.call());
1830 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1831  
1832 <        checkCompletedWithWrappedCancellationException(h);
1833 <        checkCancelled(!fFirst ? f : g);
1834 <        r.assertNotInvoked();
1835 <        checkCompletedNormally(fFirst ? f : g, v1);
1832 >        checkCompletedWithWrappedCancellationException(h1);
1833 >        checkCompletedWithWrappedCancellationException(h2);
1834 >        checkCompletedWithWrappedCancellationException(h3);
1835 >        r1.assertNotInvoked();
1836 >        r2.assertNotInvoked();
1837 >        r3.assertNotInvoked();
1838 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1839 >        checkCancelled(failFirst ? fst : snd);
1840      }}
1841  
1842      /**
# Line 1429 | Line 1850 | public class CompletableFutureTest exten
1850      {
1851          final CompletableFuture<Integer> f = new CompletableFuture<>();
1852          final CompletableFuture<Integer> g = new CompletableFuture<>();
1853 <        final FailingBiFunction r = new FailingBiFunction(m);
1854 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1855 <
1856 <        if (fFirst) {
1857 <            f.complete(v1);
1858 <            g.complete(v2);
1859 <        } else {
1860 <            g.complete(v2);
1861 <            f.complete(v1);
1862 <        }
1863 <
1864 <        checkCompletedWithWrappedCFException(h);
1853 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1854 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1855 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1856 >
1857 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1858 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1859 >        final Integer w1 =  fFirst ? v1 : v2;
1860 >        final Integer w2 = !fFirst ? v1 : v2;
1861 >
1862 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1863 >        assertTrue(fst.complete(w1));
1864 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1865 >        assertTrue(snd.complete(w2));
1866 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1867 >
1868 >        checkCompletedWithWrappedException(h1, r1.ex);
1869 >        checkCompletedWithWrappedException(h2, r2.ex);
1870 >        checkCompletedWithWrappedException(h3, r3.ex);
1871 >        r1.assertInvoked();
1872 >        r2.assertInvoked();
1873 >        r3.assertInvoked();
1874          checkCompletedNormally(f, v1);
1875          checkCompletedNormally(g, v2);
1876      }}
# Line 1451 | Line 1881 | public class CompletableFutureTest exten
1881       */
1882      public void testThenAcceptBoth_normalCompletion() {
1883          for (ExecutionMode m : ExecutionMode.values())
1454        for (boolean createIncomplete : new boolean[] { true, false })
1884          for (boolean fFirst : new boolean[] { true, false })
1885          for (Integer v1 : new Integer[] { 1, null })
1886          for (Integer v2 : new Integer[] { 2, null })
1887      {
1888          final CompletableFuture<Integer> f = new CompletableFuture<>();
1889          final CompletableFuture<Integer> g = new CompletableFuture<>();
1890 <        final SubtractAction r = new SubtractAction(m);
1891 <
1892 <        if (fFirst) f.complete(v1); else g.complete(v2);
1893 <        if (!createIncomplete)
1894 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1895 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1896 <        if (createIncomplete) {
1897 <            checkIncomplete(h);
1898 <            r.assertNotInvoked();
1899 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1900 <        }
1890 >        final SubtractAction r1 = new SubtractAction(m);
1891 >        final SubtractAction r2 = new SubtractAction(m);
1892 >        final SubtractAction r3 = new SubtractAction(m);
1893 >
1894 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1895 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1896 >        final Integer w1 =  fFirst ? v1 : v2;
1897 >        final Integer w2 = !fFirst ? v1 : v2;
1898 >
1899 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1900 >        assertTrue(fst.complete(w1));
1901 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1902 >        checkIncomplete(h1);
1903 >        checkIncomplete(h2);
1904 >        r1.assertNotInvoked();
1905 >        r2.assertNotInvoked();
1906 >        assertTrue(snd.complete(w2));
1907 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1908  
1909 <        checkCompletedNormally(h, null);
1910 <        r.assertValue(subtract(v1, v2));
1909 >        checkCompletedNormally(h1, null);
1910 >        checkCompletedNormally(h2, null);
1911 >        checkCompletedNormally(h3, null);
1912 >        r1.assertValue(subtract(v1, v2));
1913 >        r2.assertValue(subtract(v1, v2));
1914 >        r3.assertValue(subtract(v1, v2));
1915          checkCompletedNormally(f, v1);
1916          checkCompletedNormally(g, v2);
1917      }}
# Line 1480 | Line 1920 | public class CompletableFutureTest exten
1920       * thenAcceptBoth result completes exceptionally after exceptional
1921       * completion of either source
1922       */
1923 <    public void testThenAcceptBoth_exceptionalCompletion() {
1923 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1924          for (ExecutionMode m : ExecutionMode.values())
1485        for (boolean createIncomplete : new boolean[] { true, false })
1925          for (boolean fFirst : new boolean[] { true, false })
1926 +        for (boolean failFirst : new boolean[] { true, false })
1927          for (Integer v1 : new Integer[] { 1, null })
1928      {
1929          final CompletableFuture<Integer> f = new CompletableFuture<>();
1930          final CompletableFuture<Integer> g = new CompletableFuture<>();
1931          final CFException ex = new CFException();
1932 <        final SubtractAction r = new SubtractAction(m);
1933 <
1934 <        (fFirst ? f : g).complete(v1);
1935 <        if (!createIncomplete)
1936 <            (!fFirst ? f : g).completeExceptionally(ex);
1937 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1938 <        if (createIncomplete) {
1939 <            checkIncomplete(h);
1940 <            (!fFirst ? f : g).completeExceptionally(ex);
1941 <        }
1942 <
1943 <        checkCompletedWithWrappedCFException(h, ex);
1944 <        r.assertNotInvoked();
1945 <        checkCompletedNormally(fFirst ? f : g, v1);
1946 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1932 >        final SubtractAction r1 = new SubtractAction(m);
1933 >        final SubtractAction r2 = new SubtractAction(m);
1934 >        final SubtractAction r3 = new SubtractAction(m);
1935 >
1936 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1937 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1938 >        final Callable<Boolean> complete1 = failFirst ?
1939 >            () -> fst.completeExceptionally(ex) :
1940 >            () -> fst.complete(v1);
1941 >        final Callable<Boolean> complete2 = failFirst ?
1942 >            () -> snd.complete(v1) :
1943 >            () -> snd.completeExceptionally(ex);
1944 >
1945 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1946 >        assertTrue(complete1.call());
1947 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1948 >        checkIncomplete(h1);
1949 >        checkIncomplete(h2);
1950 >        assertTrue(complete2.call());
1951 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1952 >
1953 >        checkCompletedWithWrappedException(h1, ex);
1954 >        checkCompletedWithWrappedException(h2, ex);
1955 >        checkCompletedWithWrappedException(h3, ex);
1956 >        r1.assertNotInvoked();
1957 >        r2.assertNotInvoked();
1958 >        r3.assertNotInvoked();
1959 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1960 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1961      }}
1962  
1963      /**
1964       * thenAcceptBoth result completes exceptionally if either source cancelled
1965       */
1966 <    public void testThenAcceptBoth_sourceCancelled() {
1966 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1967          for (ExecutionMode m : ExecutionMode.values())
1968          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515        for (boolean createIncomplete : new boolean[] { true, false })
1969          for (boolean fFirst : new boolean[] { true, false })
1970 +        for (boolean failFirst : new boolean[] { true, false })
1971          for (Integer v1 : new Integer[] { 1, null })
1972      {
1973          final CompletableFuture<Integer> f = new CompletableFuture<>();
1974          final CompletableFuture<Integer> g = new CompletableFuture<>();
1975 <        final SubtractAction r = new SubtractAction(m);
1976 <
1977 <        (fFirst ? f : g).complete(v1);
1978 <        if (!createIncomplete)
1979 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1980 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1981 <        if (createIncomplete) {
1982 <            checkIncomplete(h);
1983 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1984 <        }
1975 >        final SubtractAction r1 = new SubtractAction(m);
1976 >        final SubtractAction r2 = new SubtractAction(m);
1977 >        final SubtractAction r3 = new SubtractAction(m);
1978 >
1979 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1980 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1981 >        final Callable<Boolean> complete1 = failFirst ?
1982 >            () -> fst.cancel(mayInterruptIfRunning) :
1983 >            () -> fst.complete(v1);
1984 >        final Callable<Boolean> complete2 = failFirst ?
1985 >            () -> snd.complete(v1) :
1986 >            () -> snd.cancel(mayInterruptIfRunning);
1987 >
1988 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1989 >        assertTrue(complete1.call());
1990 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1991 >        checkIncomplete(h1);
1992 >        checkIncomplete(h2);
1993 >        assertTrue(complete2.call());
1994 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1995  
1996 <        checkCompletedWithWrappedCancellationException(h);
1997 <        checkCancelled(!fFirst ? f : g);
1998 <        r.assertNotInvoked();
1999 <        checkCompletedNormally(fFirst ? f : g, v1);
1996 >        checkCompletedWithWrappedCancellationException(h1);
1997 >        checkCompletedWithWrappedCancellationException(h2);
1998 >        checkCompletedWithWrappedCancellationException(h3);
1999 >        r1.assertNotInvoked();
2000 >        r2.assertNotInvoked();
2001 >        r3.assertNotInvoked();
2002 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2003 >        checkCancelled(failFirst ? fst : snd);
2004      }}
2005  
2006      /**
# Line 1546 | Line 2014 | public class CompletableFutureTest exten
2014      {
2015          final CompletableFuture<Integer> f = new CompletableFuture<>();
2016          final CompletableFuture<Integer> g = new CompletableFuture<>();
2017 <        final FailingBiConsumer r = new FailingBiConsumer(m);
2018 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2019 <
2020 <        if (fFirst) {
2021 <            f.complete(v1);
2022 <            g.complete(v2);
2023 <        } else {
2024 <            g.complete(v2);
2025 <            f.complete(v1);
2026 <        }
2027 <
2028 <        checkCompletedWithWrappedCFException(h);
2017 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
2018 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
2019 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
2020 >
2021 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2022 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2023 >        final Integer w1 =  fFirst ? v1 : v2;
2024 >        final Integer w2 = !fFirst ? v1 : v2;
2025 >
2026 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
2027 >        assertTrue(fst.complete(w1));
2028 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
2029 >        assertTrue(snd.complete(w2));
2030 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2031 >
2032 >        checkCompletedWithWrappedException(h1, r1.ex);
2033 >        checkCompletedWithWrappedException(h2, r2.ex);
2034 >        checkCompletedWithWrappedException(h3, r3.ex);
2035 >        r1.assertInvoked();
2036 >        r2.assertInvoked();
2037 >        r3.assertInvoked();
2038          checkCompletedNormally(f, v1);
2039          checkCompletedNormally(g, v2);
2040      }}
# Line 1568 | Line 2045 | public class CompletableFutureTest exten
2045       */
2046      public void testRunAfterBoth_normalCompletion() {
2047          for (ExecutionMode m : ExecutionMode.values())
1571        for (boolean createIncomplete : new boolean[] { true, false })
2048          for (boolean fFirst : new boolean[] { true, false })
2049          for (Integer v1 : new Integer[] { 1, null })
2050          for (Integer v2 : new Integer[] { 2, null })
2051      {
2052          final CompletableFuture<Integer> f = new CompletableFuture<>();
2053          final CompletableFuture<Integer> g = new CompletableFuture<>();
2054 <        final Noop r = new Noop(m);
2055 <
2056 <        if (fFirst) f.complete(v1); else g.complete(v2);
2057 <        if (!createIncomplete)
2058 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2059 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2060 <        if (createIncomplete) {
2061 <            checkIncomplete(h);
2062 <            r.assertNotInvoked();
2063 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2064 <        }
2054 >        final Noop r1 = new Noop(m);
2055 >        final Noop r2 = new Noop(m);
2056 >        final Noop r3 = new Noop(m);
2057 >
2058 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2059 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2060 >        final Integer w1 =  fFirst ? v1 : v2;
2061 >        final Integer w2 = !fFirst ? v1 : v2;
2062 >
2063 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2064 >        assertTrue(fst.complete(w1));
2065 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2066 >        checkIncomplete(h1);
2067 >        checkIncomplete(h2);
2068 >        r1.assertNotInvoked();
2069 >        r2.assertNotInvoked();
2070 >        assertTrue(snd.complete(w2));
2071 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2072  
2073 <        checkCompletedNormally(h, null);
2074 <        r.assertInvoked();
2073 >        checkCompletedNormally(h1, null);
2074 >        checkCompletedNormally(h2, null);
2075 >        checkCompletedNormally(h3, null);
2076 >        r1.assertInvoked();
2077 >        r2.assertInvoked();
2078 >        r3.assertInvoked();
2079          checkCompletedNormally(f, v1);
2080          checkCompletedNormally(g, v2);
2081      }}
# Line 1597 | Line 2084 | public class CompletableFutureTest exten
2084       * runAfterBoth result completes exceptionally after exceptional
2085       * completion of either source
2086       */
2087 <    public void testRunAfterBoth_exceptionalCompletion() {
2087 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2088          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : new boolean[] { true, false })
2089          for (boolean fFirst : new boolean[] { true, false })
2090 +        for (boolean failFirst : new boolean[] { true, false })
2091          for (Integer v1 : new Integer[] { 1, null })
2092      {
2093          final CompletableFuture<Integer> f = new CompletableFuture<>();
2094          final CompletableFuture<Integer> g = new CompletableFuture<>();
2095          final CFException ex = new CFException();
2096 <        final Noop r = new Noop(m);
2097 <
2098 <        (fFirst ? f : g).complete(v1);
2099 <        if (!createIncomplete)
2100 <            (!fFirst ? f : g).completeExceptionally(ex);
2101 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2102 <        if (createIncomplete) {
2103 <            checkIncomplete(h);
2104 <            (!fFirst ? f : g).completeExceptionally(ex);
2105 <        }
2106 <
2107 <        checkCompletedWithWrappedCFException(h, ex);
2108 <        r.assertNotInvoked();
2109 <        checkCompletedNormally(fFirst ? f : g, v1);
2110 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
2096 >        final Noop r1 = new Noop(m);
2097 >        final Noop r2 = new Noop(m);
2098 >        final Noop r3 = new Noop(m);
2099 >
2100 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2101 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2102 >        final Callable<Boolean> complete1 = failFirst ?
2103 >            () -> fst.completeExceptionally(ex) :
2104 >            () -> fst.complete(v1);
2105 >        final Callable<Boolean> complete2 = failFirst ?
2106 >            () -> snd.complete(v1) :
2107 >            () -> snd.completeExceptionally(ex);
2108 >
2109 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2110 >        assertTrue(complete1.call());
2111 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2112 >        checkIncomplete(h1);
2113 >        checkIncomplete(h2);
2114 >        assertTrue(complete2.call());
2115 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2116 >
2117 >        checkCompletedWithWrappedException(h1, ex);
2118 >        checkCompletedWithWrappedException(h2, ex);
2119 >        checkCompletedWithWrappedException(h3, ex);
2120 >        r1.assertNotInvoked();
2121 >        r2.assertNotInvoked();
2122 >        r3.assertNotInvoked();
2123 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2124 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2125      }}
2126  
2127      /**
2128       * runAfterBoth result completes exceptionally if either source cancelled
2129       */
2130 <    public void testRunAfterBoth_sourceCancelled() {
2130 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2131          for (ExecutionMode m : ExecutionMode.values())
2132          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632        for (boolean createIncomplete : new boolean[] { true, false })
2133          for (boolean fFirst : new boolean[] { true, false })
2134 +        for (boolean failFirst : new boolean[] { true, false })
2135          for (Integer v1 : new Integer[] { 1, null })
2136      {
2137          final CompletableFuture<Integer> f = new CompletableFuture<>();
2138          final CompletableFuture<Integer> g = new CompletableFuture<>();
2139 <        final Noop r = new Noop(m);
2140 <
2141 <
2142 <        (fFirst ? f : g).complete(v1);
2143 <        if (!createIncomplete)
2144 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2145 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2146 <        if (createIncomplete) {
2147 <            checkIncomplete(h);
2148 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2149 <        }
2139 >        final Noop r1 = new Noop(m);
2140 >        final Noop r2 = new Noop(m);
2141 >        final Noop r3 = new Noop(m);
2142 >
2143 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2144 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2145 >        final Callable<Boolean> complete1 = failFirst ?
2146 >            () -> fst.cancel(mayInterruptIfRunning) :
2147 >            () -> fst.complete(v1);
2148 >        final Callable<Boolean> complete2 = failFirst ?
2149 >            () -> snd.complete(v1) :
2150 >            () -> snd.cancel(mayInterruptIfRunning);
2151 >
2152 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2153 >        assertTrue(complete1.call());
2154 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2155 >        checkIncomplete(h1);
2156 >        checkIncomplete(h2);
2157 >        assertTrue(complete2.call());
2158 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2159  
2160 <        checkCompletedWithWrappedCancellationException(h);
2161 <        checkCancelled(!fFirst ? f : g);
2162 <        r.assertNotInvoked();
2163 <        checkCompletedNormally(fFirst ? f : g, v1);
2160 >        checkCompletedWithWrappedCancellationException(h1);
2161 >        checkCompletedWithWrappedCancellationException(h2);
2162 >        checkCompletedWithWrappedCancellationException(h3);
2163 >        r1.assertNotInvoked();
2164 >        r2.assertNotInvoked();
2165 >        r3.assertNotInvoked();
2166 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2167 >        checkCancelled(failFirst ? fst : snd);
2168      }}
2169  
2170      /**
# Line 1666 | Line 2180 | public class CompletableFutureTest exten
2180          final CompletableFuture<Integer> g = new CompletableFuture<>();
2181          final FailingRunnable r1 = new FailingRunnable(m);
2182          final FailingRunnable r2 = new FailingRunnable(m);
2183 +        final FailingRunnable r3 = new FailingRunnable(m);
2184  
2185 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2186 <        if (fFirst) {
2187 <            f.complete(v1);
2188 <            g.complete(v2);
2189 <        } else {
2190 <            g.complete(v2);
2191 <            f.complete(v1);
2192 <        }
2193 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2194 <
2195 <        checkCompletedWithWrappedCFException(h1);
2196 <        checkCompletedWithWrappedCFException(h2);
2185 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2186 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2187 >        final Integer w1 =  fFirst ? v1 : v2;
2188 >        final Integer w2 = !fFirst ? v1 : v2;
2189 >
2190 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2191 >        assertTrue(fst.complete(w1));
2192 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2193 >        assertTrue(snd.complete(w2));
2194 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2195 >
2196 >        checkCompletedWithWrappedException(h1, r1.ex);
2197 >        checkCompletedWithWrappedException(h2, r2.ex);
2198 >        checkCompletedWithWrappedException(h3, r3.ex);
2199 >        r1.assertInvoked();
2200 >        r2.assertInvoked();
2201 >        r3.assertInvoked();
2202          checkCompletedNormally(f, v1);
2203          checkCompletedNormally(g, v2);
2204      }}
# Line 1752 | Line 2272 | public class CompletableFutureTest exten
2272          rs[0].assertNotInvoked();
2273          rs[1].assertNotInvoked();
2274          f.completeExceptionally(ex);
2275 <        checkCompletedWithWrappedCFException(h0, ex);
2276 <        checkCompletedWithWrappedCFException(h1, ex);
2275 >        checkCompletedWithWrappedException(h0, ex);
2276 >        checkCompletedWithWrappedException(h1, ex);
2277          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2278          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2279 <        checkCompletedWithWrappedCFException(h2, ex);
2280 <        checkCompletedWithWrappedCFException(h3, ex);
2279 >        checkCompletedWithWrappedException(h2, ex);
2280 >        checkCompletedWithWrappedException(h3, ex);
2281          g.complete(v1);
2282  
2283          // unspecified behavior - both source completions available
# Line 1767 | Line 2287 | public class CompletableFutureTest exten
2287              assertEquals(inc(v1), h4.join());
2288              rs[4].assertValue(inc(v1));
2289          } catch (CompletionException ok) {
2290 <            checkCompletedWithWrappedCFException(h4, ex);
2290 >            checkCompletedWithWrappedException(h4, ex);
2291              rs[4].assertNotInvoked();
2292          }
2293          try {
2294              assertEquals(inc(v1), h5.join());
2295              rs[5].assertValue(inc(v1));
2296          } catch (CompletionException ok) {
2297 <            checkCompletedWithWrappedCFException(h5, ex);
2297 >            checkCompletedWithWrappedException(h5, ex);
2298              rs[5].assertNotInvoked();
2299          }
2300  
2301 <        checkCompletedWithWrappedCFException(f, ex);
2301 >        checkCompletedExceptionally(f, ex);
2302          checkCompletedNormally(g, v1);
2303 <        checkCompletedWithWrappedCFException(h0, ex);
2304 <        checkCompletedWithWrappedCFException(h1, ex);
2305 <        checkCompletedWithWrappedCFException(h2, ex);
2306 <        checkCompletedWithWrappedCFException(h3, ex);
2307 <        checkCompletedWithWrappedCFException(h4, ex);
2303 >        checkCompletedWithWrappedException(h0, ex);
2304 >        checkCompletedWithWrappedException(h1, ex);
2305 >        checkCompletedWithWrappedException(h2, ex);
2306 >        checkCompletedWithWrappedException(h3, ex);
2307 >        checkCompletedWithWrappedException(h4, ex);
2308          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2309      }}
2310  
# Line 1801 | Line 2321 | public class CompletableFutureTest exten
2321  
2322          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2323          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2324 <        if (fFirst) {
2325 <            f.complete(v1);
1806 <            g.completeExceptionally(ex);
1807 <        } else {
1808 <            g.completeExceptionally(ex);
1809 <            f.complete(v1);
1810 <        }
2324 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2325 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2326          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2327          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2328  
# Line 1816 | Line 2331 | public class CompletableFutureTest exten
2331              assertEquals(inc(v1), h0.join());
2332              rs[0].assertValue(inc(v1));
2333          } catch (CompletionException ok) {
2334 <            checkCompletedWithWrappedCFException(h0, ex);
2334 >            checkCompletedWithWrappedException(h0, ex);
2335              rs[0].assertNotInvoked();
2336          }
2337          try {
2338              assertEquals(inc(v1), h1.join());
2339              rs[1].assertValue(inc(v1));
2340          } catch (CompletionException ok) {
2341 <            checkCompletedWithWrappedCFException(h1, ex);
2341 >            checkCompletedWithWrappedException(h1, ex);
2342              rs[1].assertNotInvoked();
2343          }
2344          try {
2345              assertEquals(inc(v1), h2.join());
2346              rs[2].assertValue(inc(v1));
2347          } catch (CompletionException ok) {
2348 <            checkCompletedWithWrappedCFException(h2, ex);
2348 >            checkCompletedWithWrappedException(h2, ex);
2349              rs[2].assertNotInvoked();
2350          }
2351          try {
2352              assertEquals(inc(v1), h3.join());
2353              rs[3].assertValue(inc(v1));
2354          } catch (CompletionException ok) {
2355 <            checkCompletedWithWrappedCFException(h3, ex);
2355 >            checkCompletedWithWrappedException(h3, ex);
2356              rs[3].assertNotInvoked();
2357          }
2358  
2359          checkCompletedNormally(f, v1);
2360 <        checkCompletedWithWrappedCFException(g, ex);
2360 >        checkCompletedExceptionally(g, ex);
2361      }}
2362  
2363      /**
# Line 1913 | Line 2428 | public class CompletableFutureTest exten
2428  
2429          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2430          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2431 <        if (fFirst) {
2432 <            f.complete(v1);
1918 <            g.cancel(mayInterruptIfRunning);
1919 <        } else {
1920 <            g.cancel(mayInterruptIfRunning);
1921 <            f.complete(v1);
1922 <        }
2431 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2432 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2433          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2434          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2435  
# Line 1975 | Line 2485 | public class CompletableFutureTest exten
2485          f.complete(v1);
2486          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2487          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2488 <        checkCompletedWithWrappedCFException(h0);
2489 <        checkCompletedWithWrappedCFException(h1);
2490 <        checkCompletedWithWrappedCFException(h2);
2491 <        checkCompletedWithWrappedCFException(h3);
2488 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2489 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2490 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2491 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2492          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2493  
2494          g.complete(v2);
# Line 1987 | Line 2497 | public class CompletableFutureTest exten
2497          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2498          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2499  
2500 <        checkCompletedWithWrappedCFException(h4);
2500 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2501          assertTrue(Objects.equals(v1, rs[4].value) ||
2502                     Objects.equals(v2, rs[4].value));
2503 <        checkCompletedWithWrappedCFException(h5);
2503 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2504          assertTrue(Objects.equals(v1, rs[5].value) ||
2505                     Objects.equals(v2, rs[5].value));
2506  
# Line 2071 | Line 2581 | public class CompletableFutureTest exten
2581          rs[0].assertNotInvoked();
2582          rs[1].assertNotInvoked();
2583          f.completeExceptionally(ex);
2584 <        checkCompletedWithWrappedCFException(h0, ex);
2585 <        checkCompletedWithWrappedCFException(h1, ex);
2584 >        checkCompletedWithWrappedException(h0, ex);
2585 >        checkCompletedWithWrappedException(h1, ex);
2586          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2587          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2588 <        checkCompletedWithWrappedCFException(h2, ex);
2589 <        checkCompletedWithWrappedCFException(h3, ex);
2588 >        checkCompletedWithWrappedException(h2, ex);
2589 >        checkCompletedWithWrappedException(h3, ex);
2590  
2591          g.complete(v1);
2592  
# Line 2087 | Line 2597 | public class CompletableFutureTest exten
2597              assertNull(h4.join());
2598              rs[4].assertValue(v1);
2599          } catch (CompletionException ok) {
2600 <            checkCompletedWithWrappedCFException(h4, ex);
2600 >            checkCompletedWithWrappedException(h4, ex);
2601              rs[4].assertNotInvoked();
2602          }
2603          try {
2604              assertNull(h5.join());
2605              rs[5].assertValue(v1);
2606          } catch (CompletionException ok) {
2607 <            checkCompletedWithWrappedCFException(h5, ex);
2607 >            checkCompletedWithWrappedException(h5, ex);
2608              rs[5].assertNotInvoked();
2609          }
2610  
2611 <        checkCompletedWithWrappedCFException(f, ex);
2611 >        checkCompletedExceptionally(f, ex);
2612          checkCompletedNormally(g, v1);
2613 <        checkCompletedWithWrappedCFException(h0, ex);
2614 <        checkCompletedWithWrappedCFException(h1, ex);
2615 <        checkCompletedWithWrappedCFException(h2, ex);
2616 <        checkCompletedWithWrappedCFException(h3, ex);
2617 <        checkCompletedWithWrappedCFException(h4, ex);
2613 >        checkCompletedWithWrappedException(h0, ex);
2614 >        checkCompletedWithWrappedException(h1, ex);
2615 >        checkCompletedWithWrappedException(h2, ex);
2616 >        checkCompletedWithWrappedException(h3, ex);
2617 >        checkCompletedWithWrappedException(h4, ex);
2618          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2619      }}
2620  
# Line 2121 | Line 2631 | public class CompletableFutureTest exten
2631  
2632          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2633          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2634 <        if (fFirst) {
2635 <            f.complete(v1);
2126 <            g.completeExceptionally(ex);
2127 <        } else {
2128 <            g.completeExceptionally(ex);
2129 <            f.complete(v1);
2130 <        }
2634 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2635 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2636          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2637          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2638  
2639          // unspecified behavior - both source completions available
2640          try {
2641 <            assertEquals(null, h0.join());
2641 >            assertNull(h0.join());
2642              rs[0].assertValue(v1);
2643          } catch (CompletionException ok) {
2644 <            checkCompletedWithWrappedCFException(h0, ex);
2644 >            checkCompletedWithWrappedException(h0, ex);
2645              rs[0].assertNotInvoked();
2646          }
2647          try {
2648 <            assertEquals(null, h1.join());
2648 >            assertNull(h1.join());
2649              rs[1].assertValue(v1);
2650          } catch (CompletionException ok) {
2651 <            checkCompletedWithWrappedCFException(h1, ex);
2651 >            checkCompletedWithWrappedException(h1, ex);
2652              rs[1].assertNotInvoked();
2653          }
2654          try {
2655 <            assertEquals(null, h2.join());
2655 >            assertNull(h2.join());
2656              rs[2].assertValue(v1);
2657          } catch (CompletionException ok) {
2658 <            checkCompletedWithWrappedCFException(h2, ex);
2658 >            checkCompletedWithWrappedException(h2, ex);
2659              rs[2].assertNotInvoked();
2660          }
2661          try {
2662 <            assertEquals(null, h3.join());
2662 >            assertNull(h3.join());
2663              rs[3].assertValue(v1);
2664          } catch (CompletionException ok) {
2665 <            checkCompletedWithWrappedCFException(h3, ex);
2665 >            checkCompletedWithWrappedException(h3, ex);
2666              rs[3].assertNotInvoked();
2667          }
2668  
2669          checkCompletedNormally(f, v1);
2670 <        checkCompletedWithWrappedCFException(g, ex);
2670 >        checkCompletedExceptionally(g, ex);
2671      }}
2672  
2673      /**
# Line 2239 | Line 2744 | public class CompletableFutureTest exten
2744          f.complete(v1);
2745          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2746          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2747 <        checkCompletedWithWrappedCFException(h0);
2748 <        checkCompletedWithWrappedCFException(h1);
2749 <        checkCompletedWithWrappedCFException(h2);
2750 <        checkCompletedWithWrappedCFException(h3);
2747 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2748 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2749 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2750 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2751          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2752  
2753          g.complete(v2);
# Line 2251 | Line 2756 | public class CompletableFutureTest exten
2756          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2757          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2758  
2759 <        checkCompletedWithWrappedCFException(h4);
2759 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2760          assertTrue(Objects.equals(v1, rs[4].value) ||
2761                     Objects.equals(v2, rs[4].value));
2762 <        checkCompletedWithWrappedCFException(h5);
2762 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2763          assertTrue(Objects.equals(v1, rs[5].value) ||
2764                     Objects.equals(v2, rs[5].value));
2765  
# Line 2270 | Line 2775 | public class CompletableFutureTest exten
2775          for (ExecutionMode m : ExecutionMode.values())
2776          for (Integer v1 : new Integer[] { 1, null })
2777          for (Integer v2 : new Integer[] { 2, null })
2778 +        for (boolean pushNop : new boolean[] { true, false })
2779      {
2780          final CompletableFuture<Integer> f = new CompletableFuture<>();
2781          final CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 2282 | Line 2788 | public class CompletableFutureTest exten
2788          checkIncomplete(h1);
2789          rs[0].assertNotInvoked();
2790          rs[1].assertNotInvoked();
2791 +        if (pushNop) {          // ad hoc test of intra-completion interference
2792 +            m.thenRun(f, () -> {});
2793 +            m.thenRun(g, () -> {});
2794 +        }
2795          f.complete(v1);
2796          checkCompletedNormally(h0, null);
2797          checkCompletedNormally(h1, null);
# Line 2330 | Line 2840 | public class CompletableFutureTest exten
2840          checkIncomplete(h1);
2841          rs[0].assertNotInvoked();
2842          rs[1].assertNotInvoked();
2843 <        f.completeExceptionally(ex);
2844 <        checkCompletedWithWrappedCFException(h0, ex);
2845 <        checkCompletedWithWrappedCFException(h1, ex);
2843 >        assertTrue(f.completeExceptionally(ex));
2844 >        checkCompletedWithWrappedException(h0, ex);
2845 >        checkCompletedWithWrappedException(h1, ex);
2846          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2847          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2848 <        checkCompletedWithWrappedCFException(h2, ex);
2849 <        checkCompletedWithWrappedCFException(h3, ex);
2848 >        checkCompletedWithWrappedException(h2, ex);
2849 >        checkCompletedWithWrappedException(h3, ex);
2850  
2851 <        g.complete(v1);
2851 >        assertTrue(g.complete(v1));
2852  
2853          // unspecified behavior - both source completions available
2854          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2347 | Line 2857 | public class CompletableFutureTest exten
2857              assertNull(h4.join());
2858              rs[4].assertInvoked();
2859          } catch (CompletionException ok) {
2860 <            checkCompletedWithWrappedCFException(h4, ex);
2860 >            checkCompletedWithWrappedException(h4, ex);
2861              rs[4].assertNotInvoked();
2862          }
2863          try {
2864              assertNull(h5.join());
2865              rs[5].assertInvoked();
2866          } catch (CompletionException ok) {
2867 <            checkCompletedWithWrappedCFException(h5, ex);
2867 >            checkCompletedWithWrappedException(h5, ex);
2868              rs[5].assertNotInvoked();
2869          }
2870  
2871 <        checkCompletedWithWrappedCFException(f, ex);
2871 >        checkCompletedExceptionally(f, ex);
2872          checkCompletedNormally(g, v1);
2873 <        checkCompletedWithWrappedCFException(h0, ex);
2874 <        checkCompletedWithWrappedCFException(h1, ex);
2875 <        checkCompletedWithWrappedCFException(h2, ex);
2876 <        checkCompletedWithWrappedCFException(h3, ex);
2877 <        checkCompletedWithWrappedCFException(h4, ex);
2873 >        checkCompletedWithWrappedException(h0, ex);
2874 >        checkCompletedWithWrappedException(h1, ex);
2875 >        checkCompletedWithWrappedException(h2, ex);
2876 >        checkCompletedWithWrappedException(h3, ex);
2877 >        checkCompletedWithWrappedException(h4, ex);
2878          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2879      }}
2880  
2881 +    public void testRunAfterEither_exceptionalCompletion2() {
2882 +        for (ExecutionMode m : ExecutionMode.values())
2883 +        for (boolean fFirst : new boolean[] { true, false })
2884 +        for (Integer v1 : new Integer[] { 1, null })
2885 +    {
2886 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2887 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2888 +        final CFException ex = new CFException();
2889 +        final Noop[] rs = new Noop[6];
2890 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2891 +
2892 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2893 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2894 +        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2895 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2896 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2897 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2898 +
2899 +        // unspecified behavior - both source completions available
2900 +        try {
2901 +            assertNull(h0.join());
2902 +            rs[0].assertInvoked();
2903 +        } catch (CompletionException ok) {
2904 +            checkCompletedWithWrappedException(h0, ex);
2905 +            rs[0].assertNotInvoked();
2906 +        }
2907 +        try {
2908 +            assertNull(h1.join());
2909 +            rs[1].assertInvoked();
2910 +        } catch (CompletionException ok) {
2911 +            checkCompletedWithWrappedException(h1, ex);
2912 +            rs[1].assertNotInvoked();
2913 +        }
2914 +        try {
2915 +            assertNull(h2.join());
2916 +            rs[2].assertInvoked();
2917 +        } catch (CompletionException ok) {
2918 +            checkCompletedWithWrappedException(h2, ex);
2919 +            rs[2].assertNotInvoked();
2920 +        }
2921 +        try {
2922 +            assertNull(h3.join());
2923 +            rs[3].assertInvoked();
2924 +        } catch (CompletionException ok) {
2925 +            checkCompletedWithWrappedException(h3, ex);
2926 +            rs[3].assertNotInvoked();
2927 +        }
2928 +
2929 +        checkCompletedNormally(f, v1);
2930 +        checkCompletedExceptionally(g, ex);
2931 +    }}
2932 +
2933      /**
2934       * runAfterEither result completes exceptionally if either source cancelled
2935       */
# Line 2395 | Line 2957 | public class CompletableFutureTest exten
2957          checkCompletedWithWrappedCancellationException(h2);
2958          checkCompletedWithWrappedCancellationException(h3);
2959  
2960 <        g.complete(v1);
2960 >        assertTrue(g.complete(v1));
2961  
2962          // unspecified behavior - both source completions available
2963          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2439 | Line 3001 | public class CompletableFutureTest exten
3001  
3002          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3003          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3004 <        f.complete(v1);
3004 >        assertTrue(f.complete(v1));
3005          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
3006          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
3007 <        checkCompletedWithWrappedCFException(h0);
3008 <        checkCompletedWithWrappedCFException(h1);
3009 <        checkCompletedWithWrappedCFException(h2);
3010 <        checkCompletedWithWrappedCFException(h3);
3007 >        checkCompletedWithWrappedException(h0, rs[0].ex);
3008 >        checkCompletedWithWrappedException(h1, rs[1].ex);
3009 >        checkCompletedWithWrappedException(h2, rs[2].ex);
3010 >        checkCompletedWithWrappedException(h3, rs[3].ex);
3011          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
3012 <        g.complete(v2);
3012 >        assertTrue(g.complete(v2));
3013          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
3014          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
3015 <        checkCompletedWithWrappedCFException(h4);
3016 <        checkCompletedWithWrappedCFException(h5);
3015 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3016 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3017  
3018          checkCompletedNormally(f, v1);
3019          checkCompletedNormally(g, v2);
# Line 2468 | Line 3030 | public class CompletableFutureTest exten
3030      {
3031          final CompletableFuture<Integer> f = new CompletableFuture<>();
3032          final CompletableFutureInc r = new CompletableFutureInc(m);
3033 <        if (!createIncomplete) f.complete(v1);
3033 >        if (!createIncomplete) assertTrue(f.complete(v1));
3034          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3035 <        if (createIncomplete) f.complete(v1);
3035 >        if (createIncomplete) assertTrue(f.complete(v1));
3036  
3037          checkCompletedNormally(g, inc(v1));
3038          checkCompletedNormally(f, v1);
3039 <        r.assertInvoked();
3039 >        r.assertValue(v1);
3040      }}
3041  
3042      /**
# Line 2492 | Line 3054 | public class CompletableFutureTest exten
3054          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3055          if (createIncomplete) f.completeExceptionally(ex);
3056  
3057 <        checkCompletedWithWrappedCFException(g, ex);
3058 <        checkCompletedWithWrappedCFException(f, ex);
3057 >        checkCompletedWithWrappedException(g, ex);
3058 >        checkCompletedExceptionally(f, ex);
3059          r.assertNotInvoked();
3060      }}
3061  
# Line 2508 | Line 3070 | public class CompletableFutureTest exten
3070          final CompletableFuture<Integer> f = new CompletableFuture<>();
3071          final FailingCompletableFutureFunction r
3072              = new FailingCompletableFutureFunction(m);
3073 <        if (!createIncomplete) f.complete(v1);
3073 >        if (!createIncomplete) assertTrue(f.complete(v1));
3074          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3075 <        if (createIncomplete) f.complete(v1);
3075 >        if (createIncomplete) assertTrue(f.complete(v1));
3076  
3077 <        checkCompletedWithWrappedCFException(g);
3077 >        checkCompletedWithWrappedException(g, r.ex);
3078          checkCompletedNormally(f, v1);
3079      }}
3080  
# Line 2537 | Line 3099 | public class CompletableFutureTest exten
3099          checkCancelled(f);
3100      }}
3101  
3102 +    /**
3103 +     * thenCompose result completes exceptionally if the result of the action does
3104 +     */
3105 +    public void testThenCompose_actionReturnsFailingFuture() {
3106 +        for (ExecutionMode m : ExecutionMode.values())
3107 +        for (int order = 0; order < 6; order++)
3108 +        for (Integer v1 : new Integer[] { 1, null })
3109 +    {
3110 +        final CFException ex = new CFException();
3111 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3112 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3113 +        final CompletableFuture<Integer> h;
3114 +        // Test all permutations of orders
3115 +        switch (order) {
3116 +        case 0:
3117 +            assertTrue(f.complete(v1));
3118 +            assertTrue(g.completeExceptionally(ex));
3119 +            h = m.thenCompose(f, (x -> g));
3120 +            break;
3121 +        case 1:
3122 +            assertTrue(f.complete(v1));
3123 +            h = m.thenCompose(f, (x -> g));
3124 +            assertTrue(g.completeExceptionally(ex));
3125 +            break;
3126 +        case 2:
3127 +            assertTrue(g.completeExceptionally(ex));
3128 +            assertTrue(f.complete(v1));
3129 +            h = m.thenCompose(f, (x -> g));
3130 +            break;
3131 +        case 3:
3132 +            assertTrue(g.completeExceptionally(ex));
3133 +            h = m.thenCompose(f, (x -> g));
3134 +            assertTrue(f.complete(v1));
3135 +            break;
3136 +        case 4:
3137 +            h = m.thenCompose(f, (x -> g));
3138 +            assertTrue(f.complete(v1));
3139 +            assertTrue(g.completeExceptionally(ex));
3140 +            break;
3141 +        case 5:
3142 +            h = m.thenCompose(f, (x -> g));
3143 +            assertTrue(f.complete(v1));
3144 +            assertTrue(g.completeExceptionally(ex));
3145 +            break;
3146 +        default: throw new AssertionError();
3147 +        }
3148 +
3149 +        checkCompletedExceptionally(g, ex);
3150 +        checkCompletedWithWrappedException(h, ex);
3151 +        checkCompletedNormally(f, v1);
3152 +    }}
3153 +
3154 +    /**
3155 +     * exceptionallyCompose result completes normally after normal
3156 +     * completion of source
3157 +     */
3158 +    public void testExceptionallyCompose_normalCompletion() {
3159 +        for (ExecutionMode m : ExecutionMode.values())
3160 +        for (boolean createIncomplete : new boolean[] { true, false })
3161 +        for (Integer v1 : new Integer[] { 1, null })
3162 +    {
3163 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3164 +        final ExceptionalCompletableFutureFunction r =
3165 +            new ExceptionalCompletableFutureFunction(m);
3166 +        if (!createIncomplete) assertTrue(f.complete(v1));
3167 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3168 +        if (createIncomplete) assertTrue(f.complete(v1));
3169 +
3170 +        if (!createIncomplete && testImplementationDetails)
3171 +            assertSame(f, g);
3172 +        checkCompletedNormally(f, v1);
3173 +        checkCompletedNormally(g, v1);
3174 +        r.assertNotInvoked();
3175 +    }}
3176 +
3177 +    /**
3178 +     * exceptionallyCompose result completes normally after exceptional
3179 +     * completion of source
3180 +     */
3181 +    public void testExceptionallyCompose_exceptionalCompletion() {
3182 +        for (ExecutionMode m : ExecutionMode.values())
3183 +        for (boolean createIncomplete : new boolean[] { true, false })
3184 +    {
3185 +        final CFException ex = new CFException();
3186 +        final ExceptionalCompletableFutureFunction r =
3187 +            new ExceptionalCompletableFutureFunction(m);
3188 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3189 +        if (!createIncomplete) f.completeExceptionally(ex);
3190 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3191 +        if (createIncomplete) f.completeExceptionally(ex);
3192 +
3193 +        checkCompletedExceptionally(f, ex);
3194 +        checkCompletedNormally(g, r.value);
3195 +        r.assertInvoked();
3196 +    }}
3197 +
3198 +    /**
3199 +     * exceptionallyCompose completes exceptionally on exception if action does
3200 +     */
3201 +    public void testExceptionallyCompose_actionFailed() {
3202 +        for (ExecutionMode m : ExecutionMode.values())
3203 +        for (boolean createIncomplete : new boolean[] { true, false })
3204 +        for (Integer v1 : new Integer[] { 1, null })
3205 +    {
3206 +        final CFException ex = new CFException();
3207 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3208 +        final FailingExceptionalCompletableFutureFunction r
3209 +            = new FailingExceptionalCompletableFutureFunction(m);
3210 +        if (!createIncomplete) f.completeExceptionally(ex);
3211 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3212 +        if (createIncomplete) f.completeExceptionally(ex);
3213 +
3214 +        checkCompletedExceptionally(f, ex);
3215 +        checkCompletedWithWrappedException(g, r.ex);
3216 +        r.assertInvoked();
3217 +    }}
3218 +
3219 +
3220      // other static methods
3221  
3222      /**
# Line 2553 | Line 3233 | public class CompletableFutureTest exten
3233       * when all components complete normally
3234       */
3235      public void testAllOf_normal() throws Exception {
3236 <        for (int k = 1; k < 20; ++k) {
3236 >        for (int k = 1; k < 10; k++) {
3237              CompletableFuture<Integer>[] fs
3238                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3239 <            for (int i = 0; i < k; ++i)
3239 >            for (int i = 0; i < k; i++)
3240                  fs[i] = new CompletableFuture<>();
3241              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3242 <            for (int i = 0; i < k; ++i) {
3242 >            for (int i = 0; i < k; i++) {
3243                  checkIncomplete(f);
3244                  checkIncomplete(CompletableFuture.allOf(fs));
3245                  fs[i].complete(one);
# Line 2569 | Line 3249 | public class CompletableFutureTest exten
3249          }
3250      }
3251  
3252 <    public void testAllOf_backwards() throws Exception {
3253 <        for (int k = 1; k < 20; ++k) {
3252 >    public void testAllOf_normal_backwards() throws Exception {
3253 >        for (int k = 1; k < 10; k++) {
3254              CompletableFuture<Integer>[] fs
3255                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3256 <            for (int i = 0; i < k; ++i)
3256 >            for (int i = 0; i < k; i++)
3257                  fs[i] = new CompletableFuture<>();
3258              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3259              for (int i = k - 1; i >= 0; i--) {
# Line 2586 | Line 3266 | public class CompletableFutureTest exten
3266          }
3267      }
3268  
3269 +    public void testAllOf_exceptional() throws Exception {
3270 +        for (int k = 1; k < 10; k++) {
3271 +            CompletableFuture<Integer>[] fs
3272 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3273 +            CFException ex = new CFException();
3274 +            for (int i = 0; i < k; i++)
3275 +                fs[i] = new CompletableFuture<>();
3276 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3277 +            for (int i = 0; i < k; i++) {
3278 +                checkIncomplete(f);
3279 +                checkIncomplete(CompletableFuture.allOf(fs));
3280 +                if (i != k / 2) {
3281 +                    fs[i].complete(i);
3282 +                    checkCompletedNormally(fs[i], i);
3283 +                } else {
3284 +                    fs[i].completeExceptionally(ex);
3285 +                    checkCompletedExceptionally(fs[i], ex);
3286 +                }
3287 +            }
3288 +            checkCompletedWithWrappedException(f, ex);
3289 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3290 +        }
3291 +    }
3292 +
3293      /**
3294       * anyOf(no component futures) returns an incomplete future
3295       */
3296      public void testAnyOf_empty() throws Exception {
3297 +        for (Integer v1 : new Integer[] { 1, null })
3298 +    {
3299          CompletableFuture<Object> f = CompletableFuture.anyOf();
3300          checkIncomplete(f);
3301 <    }
3301 >
3302 >        f.complete(v1);
3303 >        checkCompletedNormally(f, v1);
3304 >    }}
3305  
3306      /**
3307       * anyOf returns a future completed normally with a value when
3308       * a component future does
3309       */
3310      public void testAnyOf_normal() throws Exception {
3311 <        for (int k = 0; k < 10; ++k) {
3311 >        for (int k = 0; k < 10; k++) {
3312              CompletableFuture[] fs = new CompletableFuture[k];
3313 <            for (int i = 0; i < k; ++i)
3313 >            for (int i = 0; i < k; i++)
3314                  fs[i] = new CompletableFuture<>();
3315              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3316              checkIncomplete(f);
3317 <            for (int i = 0; i < k; ++i) {
3318 <                fs[i].complete(one);
3319 <                checkCompletedNormally(f, one);
3320 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3317 >            for (int i = 0; i < k; i++) {
3318 >                fs[i].complete(i);
3319 >                checkCompletedNormally(f, 0);
3320 >                int x = (int) CompletableFuture.anyOf(fs).join();
3321 >                assertTrue(0 <= x && x <= i);
3322 >            }
3323 >        }
3324 >    }
3325 >    public void testAnyOf_normal_backwards() throws Exception {
3326 >        for (int k = 0; k < 10; k++) {
3327 >            CompletableFuture[] fs = new CompletableFuture[k];
3328 >            for (int i = 0; i < k; i++)
3329 >                fs[i] = new CompletableFuture<>();
3330 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3331 >            checkIncomplete(f);
3332 >            for (int i = k - 1; i >= 0; i--) {
3333 >                fs[i].complete(i);
3334 >                checkCompletedNormally(f, k - 1);
3335 >                int x = (int) CompletableFuture.anyOf(fs).join();
3336 >                assertTrue(i <= x && x <= k - 1);
3337              }
3338          }
3339      }
# Line 2617 | Line 3342 | public class CompletableFutureTest exten
3342       * anyOf result completes exceptionally when any component does.
3343       */
3344      public void testAnyOf_exceptional() throws Exception {
3345 <        for (int k = 0; k < 10; ++k) {
3345 >        for (int k = 0; k < 10; k++) {
3346              CompletableFuture[] fs = new CompletableFuture[k];
3347 <            for (int i = 0; i < k; ++i)
3347 >            CFException[] exs = new CFException[k];
3348 >            for (int i = 0; i < k; i++) {
3349                  fs[i] = new CompletableFuture<>();
3350 +                exs[i] = new CFException();
3351 +            }
3352              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3353              checkIncomplete(f);
3354 <            for (int i = 0; i < k; ++i) {
3355 <                fs[i].completeExceptionally(new CFException());
3356 <                checkCompletedWithWrappedCFException(f);
3354 >            for (int i = 0; i < k; i++) {
3355 >                fs[i].completeExceptionally(exs[i]);
3356 >                checkCompletedWithWrappedException(f, exs[0]);
3357 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3358 >            }
3359 >        }
3360 >    }
3361 >
3362 >    public void testAnyOf_exceptional_backwards() throws Exception {
3363 >        for (int k = 0; k < 10; k++) {
3364 >            CompletableFuture[] fs = new CompletableFuture[k];
3365 >            CFException[] exs = new CFException[k];
3366 >            for (int i = 0; i < k; i++) {
3367 >                fs[i] = new CompletableFuture<>();
3368 >                exs[i] = new CFException();
3369 >            }
3370 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3371 >            checkIncomplete(f);
3372 >            for (int i = k - 1; i >= 0; i--) {
3373 >                fs[i].completeExceptionally(exs[i]);
3374 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3375                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3376              }
3377          }
# Line 2634 | Line 3380 | public class CompletableFutureTest exten
3380      /**
3381       * Completion methods throw NullPointerException with null arguments
3382       */
3383 +    @SuppressWarnings("FutureReturnValueIgnored")
3384      public void testNPE() {
3385          CompletableFuture<Integer> f = new CompletableFuture<>();
3386          CompletableFuture<Integer> g = new CompletableFuture<>();
3387          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2641        CompletableFuture<?> h;
3388          ThreadExecutor exec = new ThreadExecutor();
3389  
3390          Runnable[] throwingActions = {
3391              () -> CompletableFuture.supplyAsync(null),
3392              () -> CompletableFuture.supplyAsync(null, exec),
3393 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3393 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3394  
3395              () -> CompletableFuture.runAsync(null),
3396              () -> CompletableFuture.runAsync(null, exec),
# Line 2654 | Line 3400 | public class CompletableFutureTest exten
3400  
3401              () -> f.thenApply(null),
3402              () -> f.thenApplyAsync(null),
3403 <            () -> f.thenApplyAsync((x) -> x, null),
3403 >            () -> f.thenApplyAsync(x -> x, null),
3404              () -> f.thenApplyAsync(null, exec),
3405  
3406              () -> f.thenAccept(null),
3407              () -> f.thenAcceptAsync(null),
3408 <            () -> f.thenAcceptAsync((x) -> {} , null),
3408 >            () -> f.thenAcceptAsync(x -> {} , null),
3409              () -> f.thenAcceptAsync(null, exec),
3410  
3411              () -> f.thenRun(null),
# Line 2694 | Line 3440 | public class CompletableFutureTest exten
3440              () -> f.applyToEither(g, null),
3441              () -> f.applyToEitherAsync(g, null),
3442              () -> f.applyToEitherAsync(g, null, exec),
3443 <            () -> f.applyToEither(nullFuture, (x) -> x),
3444 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3445 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3446 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3443 >            () -> f.applyToEither(nullFuture, x -> x),
3444 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3445 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3446 >            () -> f.applyToEitherAsync(g, x -> x, null),
3447  
3448              () -> f.acceptEither(g, null),
3449              () -> f.acceptEitherAsync(g, null),
3450              () -> f.acceptEitherAsync(g, null, exec),
3451 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3452 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3453 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3454 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3451 >            () -> f.acceptEither(nullFuture, x -> {}),
3452 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3453 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3454 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3455  
3456              () -> f.runAfterEither(g, null),
3457              () -> f.runAfterEitherAsync(g, null),
# Line 2735 | Line 3481 | public class CompletableFutureTest exten
3481              () -> CompletableFuture.anyOf(null, f),
3482  
3483              () -> f.obtrudeException(null),
3484 +
3485 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3486 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3487 +            () -> CompletableFuture.delayedExecutor(1L, null),
3488 +
3489 +            () -> f.orTimeout(1L, null),
3490 +            () -> f.completeOnTimeout(42, 1L, null),
3491 +
3492 +            () -> CompletableFuture.failedFuture(null),
3493 +            () -> CompletableFuture.failedStage(null),
3494          };
3495  
3496          assertThrows(NullPointerException.class, throwingActions);
# Line 2742 | Line 3498 | public class CompletableFutureTest exten
3498      }
3499  
3500      /**
3501 +     * Test submissions to an executor that rejects all tasks.
3502 +     */
3503 +    public void testRejectingExecutor() {
3504 +        for (Integer v : new Integer[] { 1, null })
3505 +    {
3506 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3507 +
3508 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3509 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3510 +
3511 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3512 +
3513 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3514 +        srcs.add(complete);
3515 +        srcs.add(incomplete);
3516 +
3517 +        for (CompletableFuture<Integer> src : srcs) {
3518 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3519 +            fs.add(src.thenRunAsync(() -> {}, e));
3520 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3521 +            fs.add(src.thenApplyAsync(z -> z, e));
3522 +
3523 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3524 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3525 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3526 +
3527 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3528 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3529 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3530 +
3531 +            fs.add(src.thenComposeAsync(z -> null, e));
3532 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3533 +            fs.add(src.handleAsync((z, t) -> null, e));
3534 +
3535 +            for (CompletableFuture<?> future : fs) {
3536 +                if (src.isDone())
3537 +                    checkCompletedWithWrappedException(future, e.ex);
3538 +                else
3539 +                    checkIncomplete(future);
3540 +            }
3541 +            futures.addAll(fs);
3542 +        }
3543 +
3544 +        {
3545 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3546 +
3547 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3548 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3549 +
3550 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3551 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3552 +
3553 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3554 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3555 +
3556 +            for (CompletableFuture<?> future : fs)
3557 +                checkIncomplete(future);
3558 +            futures.addAll(fs);
3559 +        }
3560 +
3561 +        {
3562 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3563 +
3564 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3565 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3566 +
3567 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3568 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3569 +
3570 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3571 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3572 +
3573 +            for (CompletableFuture<?> future : fs)
3574 +                checkCompletedWithWrappedException(future, e.ex);
3575 +            futures.addAll(fs);
3576 +        }
3577 +
3578 +        incomplete.complete(v);
3579 +
3580 +        for (CompletableFuture<?> future : futures)
3581 +            checkCompletedWithWrappedException(future, e.ex);
3582 +
3583 +        assertEquals(futures.size(), e.count.get());
3584 +    }}
3585 +
3586 +    /**
3587 +     * Test submissions to an executor that rejects all tasks, but
3588 +     * should never be invoked because the dependent future is
3589 +     * explicitly completed.
3590 +     */
3591 +    public void testRejectingExecutorNeverInvoked() {
3592 +        for (Integer v : new Integer[] { 1, null })
3593 +    {
3594 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3595 +
3596 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3597 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3598 +
3599 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3600 +
3601 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3602 +        srcs.add(complete);
3603 +        srcs.add(incomplete);
3604 +
3605 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3606 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3607 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3608 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3609 +
3610 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3611 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3612 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3613 +
3614 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3615 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3616 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3617 +
3618 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3619 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3620 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3621 +
3622 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3623 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3624 +
3625 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3626 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3627 +
3628 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3629 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3630 +
3631 +        for (CompletableFuture<?> future : fs)
3632 +            checkIncomplete(future);
3633 +
3634 +        for (CompletableFuture<?> future : fs)
3635 +            future.complete(null);
3636 +
3637 +        incomplete.complete(v);
3638 +
3639 +        for (CompletableFuture<?> future : fs)
3640 +            checkCompletedNormally(future, null);
3641 +
3642 +        assertEquals(0, e.count.get());
3643 +    }}
3644 +
3645 +    /**
3646       * toCompletableFuture returns this CompletableFuture.
3647       */
3648      public void testToCompletableFuture() {
# Line 2749 | Line 3650 | public class CompletableFutureTest exten
3650          assertSame(f, f.toCompletableFuture());
3651      }
3652  
3653 +    // jdk9
3654 +
3655      /**
3656 <     * whenComplete action executes on normal completion, propagating
2754 <     * source result.
3656 >     * newIncompleteFuture returns an incomplete CompletableFuture
3657       */
3658 <    public void testWhenComplete_normalCompletion1() {
3659 <        for (ExecutionMode m : ExecutionMode.values())
3658 >    public void testNewIncompleteFuture() {
3659 >        for (Integer v1 : new Integer[] { 1, null })
3660 >    {
3661 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3662 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3663 >        checkIncomplete(f);
3664 >        checkIncomplete(g);
3665 >        f.complete(v1);
3666 >        checkCompletedNormally(f, v1);
3667 >        checkIncomplete(g);
3668 >        g.complete(v1);
3669 >        checkCompletedNormally(g, v1);
3670 >        assertSame(g.getClass(), CompletableFuture.class);
3671 >    }}
3672 >
3673 >    /**
3674 >     * completedStage returns a completed CompletionStage
3675 >     */
3676 >    public void testCompletedStage() {
3677 >        AtomicInteger x = new AtomicInteger(0);
3678 >        AtomicReference<Throwable> r = new AtomicReference<>();
3679 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3680 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3681 >        assertEquals(x.get(), 1);
3682 >        assertNull(r.get());
3683 >    }
3684 >
3685 >    /**
3686 >     * defaultExecutor by default returns the commonPool if
3687 >     * it supports more than one thread.
3688 >     */
3689 >    public void testDefaultExecutor() {
3690 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3691 >        Executor e = f.defaultExecutor();
3692 >        Executor c = ForkJoinPool.commonPool();
3693 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3694 >            assertSame(e, c);
3695 >        else
3696 >            assertNotSame(e, c);
3697 >    }
3698 >
3699 >    /**
3700 >     * failedFuture returns a CompletableFuture completed
3701 >     * exceptionally with the given Exception
3702 >     */
3703 >    public void testFailedFuture() {
3704 >        CFException ex = new CFException();
3705 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3706 >        checkCompletedExceptionally(f, ex);
3707 >    }
3708 >
3709 >    /**
3710 >     * failedFuture(null) throws NPE
3711 >     */
3712 >    public void testFailedFuture_null() {
3713 >        try {
3714 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3715 >            shouldThrow();
3716 >        } catch (NullPointerException success) {}
3717 >    }
3718 >
3719 >    /**
3720 >     * copy returns a CompletableFuture that is completed normally,
3721 >     * with the same value, when source is.
3722 >     */
3723 >    public void testCopy_normalCompletion() {
3724          for (boolean createIncomplete : new boolean[] { true, false })
3725          for (Integer v1 : new Integer[] { 1, null })
3726      {
3727 <        final AtomicInteger a = new AtomicInteger(0);
3728 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3729 <        if (!createIncomplete) f.complete(v1);
3730 <        final CompletableFuture<Integer> g = m.whenComplete
3731 <            (f,
3732 <             (Integer x, Throwable t) -> {
3733 <                threadAssertSame(x, v1);
3734 <                threadAssertNull(t);
3735 <                a.getAndIncrement();
3736 <            });
3737 <        if (createIncomplete) f.complete(v1);
3727 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3728 >        if (!createIncomplete) assertTrue(f.complete(v1));
3729 >        CompletableFuture<Integer> g = f.copy();
3730 >        if (createIncomplete) {
3731 >            checkIncomplete(f);
3732 >            checkIncomplete(g);
3733 >            assertTrue(f.complete(v1));
3734 >        }
3735 >        checkCompletedNormally(f, v1);
3736 >        checkCompletedNormally(g, v1);
3737 >    }}
3738 >
3739 >    /**
3740 >     * copy returns a CompletableFuture that is completed exceptionally
3741 >     * when source is.
3742 >     */
3743 >    public void testCopy_exceptionalCompletion() {
3744 >        for (boolean createIncomplete : new boolean[] { true, false })
3745 >    {
3746 >        CFException ex = new CFException();
3747 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3748 >        if (!createIncomplete) f.completeExceptionally(ex);
3749 >        CompletableFuture<Integer> g = f.copy();
3750 >        if (createIncomplete) {
3751 >            checkIncomplete(f);
3752 >            checkIncomplete(g);
3753 >            f.completeExceptionally(ex);
3754 >        }
3755 >        checkCompletedExceptionally(f, ex);
3756 >        checkCompletedWithWrappedException(g, ex);
3757 >    }}
3758 >
3759 >    /**
3760 >     * Completion of a copy does not complete its source.
3761 >     */
3762 >    public void testCopy_oneWayPropagation() {
3763 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3764 >        assertTrue(f.copy().complete(1));
3765 >        assertTrue(f.copy().complete(null));
3766 >        assertTrue(f.copy().cancel(true));
3767 >        assertTrue(f.copy().cancel(false));
3768 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3769 >        checkIncomplete(f);
3770 >    }
3771 >
3772 >    /**
3773 >     * minimalCompletionStage returns a CompletableFuture that is
3774 >     * completed normally, with the same value, when source is.
3775 >     */
3776 >    public void testMinimalCompletionStage() {
3777 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3778 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3779 >        AtomicInteger x = new AtomicInteger(0);
3780 >        AtomicReference<Throwable> r = new AtomicReference<>();
3781 >        checkIncomplete(f);
3782 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3783 >        f.complete(1);
3784 >        checkCompletedNormally(f, 1);
3785 >        assertEquals(x.get(), 1);
3786 >        assertNull(r.get());
3787 >    }
3788 >
3789 >    /**
3790 >     * minimalCompletionStage returns a CompletableFuture that is
3791 >     * completed exceptionally when source is.
3792 >     */
3793 >    public void testMinimalCompletionStage2() {
3794 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3795 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3796 >        AtomicInteger x = new AtomicInteger(0);
3797 >        AtomicReference<Throwable> r = new AtomicReference<>();
3798 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3799 >        checkIncomplete(f);
3800 >        CFException ex = new CFException();
3801 >        f.completeExceptionally(ex);
3802 >        checkCompletedExceptionally(f, ex);
3803 >        assertEquals(x.get(), 0);
3804 >        assertEquals(r.get().getCause(), ex);
3805 >    }
3806 >
3807 >    /**
3808 >     * failedStage returns a CompletionStage completed
3809 >     * exceptionally with the given Exception
3810 >     */
3811 >    public void testFailedStage() {
3812 >        CFException ex = new CFException();
3813 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3814 >        AtomicInteger x = new AtomicInteger(0);
3815 >        AtomicReference<Throwable> r = new AtomicReference<>();
3816 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3817 >        assertEquals(x.get(), 0);
3818 >        assertEquals(r.get(), ex);
3819 >    }
3820 >
3821 >    /**
3822 >     * completeAsync completes with value of given supplier
3823 >     */
3824 >    public void testCompleteAsync() {
3825 >        for (Integer v1 : new Integer[] { 1, null })
3826 >    {
3827 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3828 >        f.completeAsync(() -> v1);
3829 >        f.join();
3830 >        checkCompletedNormally(f, v1);
3831 >    }}
3832 >
3833 >    /**
3834 >     * completeAsync completes exceptionally if given supplier throws
3835 >     */
3836 >    public void testCompleteAsync2() {
3837 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3838 >        CFException ex = new CFException();
3839 >        f.completeAsync(() -> { throw ex; });
3840 >        try {
3841 >            f.join();
3842 >            shouldThrow();
3843 >        } catch (CompletionException success) {}
3844 >        checkCompletedWithWrappedException(f, ex);
3845 >    }
3846 >
3847 >    /**
3848 >     * completeAsync with given executor completes with value of given supplier
3849 >     */
3850 >    public void testCompleteAsync3() {
3851 >        for (Integer v1 : new Integer[] { 1, null })
3852 >    {
3853 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3854 >        ThreadExecutor executor = new ThreadExecutor();
3855 >        f.completeAsync(() -> v1, executor);
3856 >        assertSame(v1, f.join());
3857 >        checkCompletedNormally(f, v1);
3858 >        assertEquals(1, executor.count.get());
3859 >    }}
3860 >
3861 >    /**
3862 >     * completeAsync with given executor completes exceptionally if
3863 >     * given supplier throws
3864 >     */
3865 >    public void testCompleteAsync4() {
3866 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3867 >        CFException ex = new CFException();
3868 >        ThreadExecutor executor = new ThreadExecutor();
3869 >        f.completeAsync(() -> { throw ex; }, executor);
3870 >        try {
3871 >            f.join();
3872 >            shouldThrow();
3873 >        } catch (CompletionException success) {}
3874 >        checkCompletedWithWrappedException(f, ex);
3875 >        assertEquals(1, executor.count.get());
3876 >    }
3877 >
3878 >    /**
3879 >     * orTimeout completes with TimeoutException if not complete
3880 >     */
3881 >    public void testOrTimeout_timesOut() {
3882 >        long timeoutMillis = timeoutMillis();
3883 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3884 >        long startTime = System.nanoTime();
3885 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3886 >        checkCompletedWithTimeoutException(f);
3887 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3888 >    }
3889  
3890 +    /**
3891 +     * orTimeout completes normally if completed before timeout
3892 +     */
3893 +    public void testOrTimeout_completed() {
3894 +        for (Integer v1 : new Integer[] { 1, null })
3895 +    {
3896 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3897 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3898 +        long startTime = System.nanoTime();
3899 +        f.complete(v1);
3900 +        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3901 +        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3902 +        g.complete(v1);
3903 +        checkCompletedNormally(f, v1);
3904          checkCompletedNormally(g, v1);
3905 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3906 +    }}
3907 +
3908 +    /**
3909 +     * completeOnTimeout completes with given value if not complete
3910 +     */
3911 +    public void testCompleteOnTimeout_timesOut() {
3912 +        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3913 +                       () -> testCompleteOnTimeout_timesOut(null));
3914 +    }
3915 +
3916 +    /**
3917 +     * completeOnTimeout completes with given value if not complete
3918 +     */
3919 +    public void testCompleteOnTimeout_timesOut(Integer v) {
3920 +        long timeoutMillis = timeoutMillis();
3921 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3922 +        long startTime = System.nanoTime();
3923 +        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3924 +        assertSame(v, f.join());
3925 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3926 +        f.complete(99);         // should have no effect
3927 +        checkCompletedNormally(f, v);
3928 +    }
3929 +
3930 +    /**
3931 +     * completeOnTimeout has no effect if completed within timeout
3932 +     */
3933 +    public void testCompleteOnTimeout_completed() {
3934 +        for (Integer v1 : new Integer[] { 1, null })
3935 +    {
3936 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3937 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3938 +        long startTime = System.nanoTime();
3939 +        f.complete(v1);
3940 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3941 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3942 +        g.complete(v1);
3943          checkCompletedNormally(f, v1);
3944 <        assertEquals(1, a.get());
3944 >        checkCompletedNormally(g, v1);
3945 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3946      }}
3947  
3948      /**
3949 <     * whenComplete action executes on exceptional completion, propagating
2780 <     * source result.
3949 >     * delayedExecutor returns an executor that delays submission
3950       */
3951 <    public void testWhenComplete_exceptionalCompletion() {
3951 >    public void testDelayedExecutor() {
3952 >        testInParallel(() -> testDelayedExecutor(null, null),
3953 >                       () -> testDelayedExecutor(null, 1),
3954 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3955 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3956 >    }
3957 >
3958 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3959 >        long timeoutMillis = timeoutMillis();
3960 >        // Use an "unreasonably long" long timeout to catch lingering threads
3961 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3962 >        final Executor delayer, longDelayer;
3963 >        if (executor == null) {
3964 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3965 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3966 >        } else {
3967 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3968 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3969 >        }
3970 >        long startTime = System.nanoTime();
3971 >        CompletableFuture<Integer> f =
3972 >            CompletableFuture.supplyAsync(() -> v, delayer);
3973 >        CompletableFuture<Integer> g =
3974 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3975 >
3976 >        assertNull(g.getNow(null));
3977 >
3978 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3979 >        long millisElapsed = millisElapsedSince(startTime);
3980 >        assertTrue(millisElapsed >= timeoutMillis);
3981 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3982 >
3983 >        checkCompletedNormally(f, v);
3984 >
3985 >        checkIncomplete(g);
3986 >        assertTrue(g.cancel(true));
3987 >    }
3988 >
3989 >    //--- tests of implementation details; not part of official tck ---
3990 >
3991 >    Object resultOf(CompletableFuture<?> f) {
3992 >        SecurityManager sm = System.getSecurityManager();
3993 >        if (sm != null) {
3994 >            try {
3995 >                System.setSecurityManager(null);
3996 >            } catch (SecurityException giveUp) {
3997 >                return "Reflection not available";
3998 >            }
3999 >        }
4000 >
4001 >        try {
4002 >            java.lang.reflect.Field resultField
4003 >                = CompletableFuture.class.getDeclaredField("result");
4004 >            resultField.setAccessible(true);
4005 >            return resultField.get(f);
4006 >        } catch (Throwable t) {
4007 >            throw new AssertionError(t);
4008 >        } finally {
4009 >            if (sm != null) System.setSecurityManager(sm);
4010 >        }
4011 >    }
4012 >
4013 >    public void testExceptionPropagationReusesResultObject() {
4014 >        if (!testImplementationDetails) return;
4015          for (ExecutionMode m : ExecutionMode.values())
4016 +    {
4017 +        final CFException ex = new CFException();
4018 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4019 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4020 +
4021 +        final Runnable noopRunnable = new Noop(m);
4022 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4023 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4024 +
4025 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4026 +            = new ArrayList<>();
4027 +
4028 +        funs.add(y -> m.thenRun(y, noopRunnable));
4029 +        funs.add(y -> m.thenAccept(y, noopConsumer));
4030 +        funs.add(y -> m.thenApply(y, incFunction));
4031 +
4032 +        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4033 +        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4034 +        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4035 +
4036 +        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4037 +        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4038 +        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4039 +        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4040 +        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4041 +        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4042 +
4043 +        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4044 +
4045 +        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4046 +
4047 +        funs.add(y -> CompletableFuture.allOf(y));
4048 +        funs.add(y -> CompletableFuture.allOf(y, v42));
4049 +        funs.add(y -> CompletableFuture.allOf(v42, y));
4050 +        funs.add(y -> CompletableFuture.anyOf(y));
4051 +        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4052 +        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4053 +
4054 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4055 +                 fun : funs) {
4056 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4057 +            f.completeExceptionally(ex);
4058 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4059 +            checkCompletedWithWrappedException(src, ex);
4060 +            CompletableFuture<?> dep = fun.apply(src);
4061 +            checkCompletedWithWrappedException(dep, ex);
4062 +            assertSame(resultOf(src), resultOf(dep));
4063 +        }
4064 +
4065 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4066 +                 fun : funs) {
4067 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4068 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4069 +            CompletableFuture<?> dep = fun.apply(src);
4070 +            f.completeExceptionally(ex);
4071 +            checkCompletedWithWrappedException(src, ex);
4072 +            checkCompletedWithWrappedException(dep, ex);
4073 +            assertSame(resultOf(src), resultOf(dep));
4074 +        }
4075 +
4076 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4077 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4078 +                 fun : funs) {
4079 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4080 +            f.cancel(mayInterruptIfRunning);
4081 +            checkCancelled(f);
4082 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4083 +            checkCompletedWithWrappedCancellationException(src);
4084 +            CompletableFuture<?> dep = fun.apply(src);
4085 +            checkCompletedWithWrappedCancellationException(dep);
4086 +            assertSame(resultOf(src), resultOf(dep));
4087 +        }
4088 +
4089 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4090 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4091 +                 fun : funs) {
4092 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4093 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4094 +            CompletableFuture<?> dep = fun.apply(src);
4095 +            f.cancel(mayInterruptIfRunning);
4096 +            checkCancelled(f);
4097 +            checkCompletedWithWrappedCancellationException(src);
4098 +            checkCompletedWithWrappedCancellationException(dep);
4099 +            assertSame(resultOf(src), resultOf(dep));
4100 +        }
4101 +    }}
4102 +
4103 +    /**
4104 +     * Minimal completion stages throw UOE for most non-CompletionStage methods
4105 +     */
4106 +    public void testMinimalCompletionStage_minimality() {
4107 +        if (!testImplementationDetails) return;
4108 +        Function<Method, String> toSignature =
4109 +            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4110 +        Predicate<Method> isNotStatic =
4111 +            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4112 +        List<Method> minimalMethods =
4113 +            Stream.of(Object.class, CompletionStage.class)
4114 +            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4115 +            .filter(isNotStatic)
4116 +            .collect(Collectors.toList());
4117 +        // Methods from CompletableFuture permitted NOT to throw UOE
4118 +        String[] signatureWhitelist = {
4119 +            "newIncompleteFuture[]",
4120 +            "defaultExecutor[]",
4121 +            "minimalCompletionStage[]",
4122 +            "copy[]",
4123 +        };
4124 +        Set<String> permittedMethodSignatures =
4125 +            Stream.concat(minimalMethods.stream().map(toSignature),
4126 +                          Stream.of(signatureWhitelist))
4127 +            .collect(Collectors.toSet());
4128 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4129 +            .filter(isNotStatic)
4130 +            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4131 +            .collect(Collectors.toList());
4132 +
4133 +        List<CompletionStage<Integer>> stages = new ArrayList<>();
4134 +        CompletionStage<Integer> min =
4135 +            new CompletableFuture<Integer>().minimalCompletionStage();
4136 +        stages.add(min);
4137 +        stages.add(min.thenApply(x -> x));
4138 +        stages.add(CompletableFuture.completedStage(1));
4139 +        stages.add(CompletableFuture.failedStage(new CFException()));
4140 +
4141 +        List<Method> bugs = new ArrayList<>();
4142 +        for (Method method : allMethods) {
4143 +            Class<?>[] parameterTypes = method.getParameterTypes();
4144 +            Object[] args = new Object[parameterTypes.length];
4145 +            // Manufacture boxed primitives for primitive params
4146 +            for (int i = 0; i < args.length; i++) {
4147 +                Class<?> type = parameterTypes[i];
4148 +                if (parameterTypes[i] == boolean.class)
4149 +                    args[i] = false;
4150 +                else if (parameterTypes[i] == int.class)
4151 +                    args[i] = 0;
4152 +                else if (parameterTypes[i] == long.class)
4153 +                    args[i] = 0L;
4154 +            }
4155 +            for (CompletionStage<Integer> stage : stages) {
4156 +                try {
4157 +                    method.invoke(stage, args);
4158 +                    bugs.add(method);
4159 +                }
4160 +                catch (java.lang.reflect.InvocationTargetException expected) {
4161 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4162 +                        bugs.add(method);
4163 +                        // expected.getCause().printStackTrace();
4164 +                    }
4165 +                }
4166 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4167 +            }
4168 +        }
4169 +        if (!bugs.isEmpty())
4170 +            throw new Error("Methods did not throw UOE: " + bugs);
4171 +    }
4172 +
4173 +    /**
4174 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4175 +     * is completed normally, with the same value, when source is.
4176 +     */
4177 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4178          for (boolean createIncomplete : new boolean[] { true, false })
4179          for (Integer v1 : new Integer[] { 1, null })
4180      {
4181 <        final AtomicInteger a = new AtomicInteger(0);
4182 <        final CFException ex = new CFException();
4183 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4181 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4182 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4183 >        if (!createIncomplete) assertTrue(f.complete(v1));
4184 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4185 >        if (createIncomplete) {
4186 >            checkIncomplete(f);
4187 >            checkIncomplete(g);
4188 >            assertTrue(f.complete(v1));
4189 >        }
4190 >        checkCompletedNormally(f, v1);
4191 >        checkCompletedNormally(g, v1);
4192 >    }}
4193 >
4194 >    /**
4195 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4196 >     * is completed exceptionally when source is.
4197 >     */
4198 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4199 >        for (boolean createIncomplete : new boolean[] { true, false })
4200 >    {
4201 >        CFException ex = new CFException();
4202 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4203 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4204          if (!createIncomplete) f.completeExceptionally(ex);
4205 <        final CompletableFuture<Integer> g = m.whenComplete
4206 <            (f,
4207 <             (Integer x, Throwable t) -> {
4208 <                threadAssertNull(x);
4209 <                threadAssertSame(t, ex);
4210 <                a.getAndIncrement();
4211 <            });
4212 <        if (createIncomplete) f.completeExceptionally(ex);
2799 <        checkCompletedWithWrappedCFException(f, ex);
2800 <        checkCompletedWithWrappedCFException(g, ex);
2801 <        assertEquals(1, a.get());
4205 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4206 >        if (createIncomplete) {
4207 >            checkIncomplete(f);
4208 >            checkIncomplete(g);
4209 >            f.completeExceptionally(ex);
4210 >        }
4211 >        checkCompletedExceptionally(f, ex);
4212 >        checkCompletedWithWrappedException(g, ex);
4213      }}
4214  
4215      /**
4216 <     * whenComplete action executes on cancelled source, propagating
2806 <     * CancellationException.
4216 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4217       */
4218 <    public void testWhenComplete_sourceCancelled() {
4219 <        for (ExecutionMode m : ExecutionMode.values())
4220 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4218 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4219 >        for (Integer v1 : new Integer[] { 1, null })
4220 >    {
4221 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4222 >        CompletionStage minimal = f.minimalCompletionStage();
4223 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4224 >        assertTrue(g.complete(v1));
4225 >        checkCompletedNormally(g, v1);
4226 >        checkIncomplete(f);
4227 >        checkIncomplete(minimal.toCompletableFuture());
4228 >    }}
4229 >
4230 >    /**
4231 >     * minimalStage.toCompletableFuture().join() awaits completion
4232 >     */
4233 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4234          for (boolean createIncomplete : new boolean[] { true, false })
4235 +        for (Integer v1 : new Integer[] { 1, null })
4236 +    {
4237 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4238 +        if (!createIncomplete) assertTrue(f.complete(v1));
4239 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4240 +        if (createIncomplete) assertTrue(f.complete(v1));
4241 +        assertEquals(v1, minimal.toCompletableFuture().join());
4242 +        assertEquals(v1, minimal.toCompletableFuture().get());
4243 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4244 +    }}
4245 +
4246 +    /**
4247 +     * Completion of a toCompletableFuture copy of a minimal stage
4248 +     * does not complete its source.
4249 +     */
4250 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4251 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4252 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4253 +        assertTrue(g.toCompletableFuture().complete(1));
4254 +        assertTrue(g.toCompletableFuture().complete(null));
4255 +        assertTrue(g.toCompletableFuture().cancel(true));
4256 +        assertTrue(g.toCompletableFuture().cancel(false));
4257 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4258 +        checkIncomplete(g.toCompletableFuture());
4259 +        f.complete(1);
4260 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4261 +    }
4262 +
4263 +    /** Demo utility method for external reliable toCompletableFuture */
4264 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4265 +        CompletableFuture<T> f = new CompletableFuture<>();
4266 +        stage.handle((T t, Throwable ex) -> {
4267 +                         if (ex != null) f.completeExceptionally(ex);
4268 +                         else f.complete(t);
4269 +                         return null;
4270 +                     });
4271 +        return f;
4272 +    }
4273 +
4274 +    /** Demo utility method to join a CompletionStage */
4275 +    static <T> T join(CompletionStage<T> stage) {
4276 +        return toCompletableFuture(stage).join();
4277 +    }
4278 +
4279 +    /**
4280 +     * Joining a minimal stage "by hand" works
4281 +     */
4282 +    public void testMinimalCompletionStage_join_by_hand() {
4283 +        for (boolean createIncomplete : new boolean[] { true, false })
4284 +        for (Integer v1 : new Integer[] { 1, null })
4285 +    {
4286 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4287 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4288 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4289 +        if (!createIncomplete) assertTrue(f.complete(v1));
4290 +        minimal.thenAccept(x -> g.complete(x));
4291 +        if (createIncomplete) assertTrue(f.complete(v1));
4292 +        g.join();
4293 +        checkCompletedNormally(g, v1);
4294 +        checkCompletedNormally(f, v1);
4295 +        assertEquals(v1, join(minimal));
4296 +    }}
4297 +
4298 +    static class Monad {
4299 +        static class ZeroException extends RuntimeException {
4300 +            public ZeroException() { super("monadic zero"); }
4301 +        }
4302 +        // "return", "unit"
4303 +        static <T> CompletableFuture<T> unit(T value) {
4304 +            return completedFuture(value);
4305 +        }
4306 +        // monadic zero ?
4307 +        static <T> CompletableFuture<T> zero() {
4308 +            return failedFuture(new ZeroException());
4309 +        }
4310 +        // >=>
4311 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4312 +            (Function<T, CompletableFuture<U>> f,
4313 +             Function<U, CompletableFuture<V>> g) {
4314 +            return x -> f.apply(x).thenCompose(g);
4315 +        }
4316 +
4317 +        static void assertZero(CompletableFuture<?> f) {
4318 +            try {
4319 +                f.getNow(null);
4320 +                throw new AssertionError("should throw");
4321 +            } catch (CompletionException success) {
4322 +                assertTrue(success.getCause() instanceof ZeroException);
4323 +            }
4324 +        }
4325 +
4326 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4327 +                                           CompletableFuture<T> g) {
4328 +            T fval = null, gval = null;
4329 +            Throwable fex = null, gex = null;
4330 +
4331 +            try { fval = f.get(); }
4332 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4333 +            catch (Throwable ex) { fex = ex; }
4334 +
4335 +            try { gval = g.get(); }
4336 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4337 +            catch (Throwable ex) { gex = ex; }
4338 +
4339 +            if (fex != null || gex != null)
4340 +                assertSame(fex.getClass(), gex.getClass());
4341 +            else
4342 +                assertEquals(fval, gval);
4343 +        }
4344 +
4345 +        static class PlusFuture<T> extends CompletableFuture<T> {
4346 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4347 +        }
4348 +
4349 +        /** Implements "monadic plus". */
4350 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4351 +                                             CompletableFuture<? extends T> g) {
4352 +            PlusFuture<T> plus = new PlusFuture<T>();
4353 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4354 +                try {
4355 +                    if (ex == null) {
4356 +                        if (plus.complete(result))
4357 +                            if (plus.firstFailure.get() != null)
4358 +                                plus.firstFailure.set(null);
4359 +                    }
4360 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4361 +                        if (plus.isDone())
4362 +                            plus.firstFailure.set(null);
4363 +                    }
4364 +                    else {
4365 +                        // first failure has precedence
4366 +                        Throwable first = plus.firstFailure.getAndSet(null);
4367 +
4368 +                        // may fail with "Self-suppression not permitted"
4369 +                        try { first.addSuppressed(ex); }
4370 +                        catch (Exception ignored) {}
4371 +
4372 +                        plus.completeExceptionally(first);
4373 +                    }
4374 +                } catch (Throwable unexpected) {
4375 +                    plus.completeExceptionally(unexpected);
4376 +                }
4377 +            };
4378 +            f.whenComplete(action);
4379 +            g.whenComplete(action);
4380 +            return plus;
4381 +        }
4382 +    }
4383 +
4384 +    /**
4385 +     * CompletableFuture is an additive monad - sort of.
4386 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4387 +     */
4388 +    public void testAdditiveMonad() throws Throwable {
4389 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4390 +        CompletableFuture<Long> zero = Monad.zero();
4391 +
4392 +        // Some mutually non-commutative functions
4393 +        Function<Long, CompletableFuture<Long>> triple
4394 +            = x -> Monad.unit(3 * x);
4395 +        Function<Long, CompletableFuture<Long>> inc
4396 +            = x -> Monad.unit(x + 1);
4397 +
4398 +        // unit is a right identity: m >>= unit === m
4399 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4400 +                                 inc.apply(5L));
4401 +        // unit is a left identity: (unit x) >>= f === f x
4402 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4403 +                                 inc.apply(5L));
4404 +
4405 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4406 +        Monad.assertFutureEquals(
4407 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4408 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4409 +
4410 +        // The case for CompletableFuture as an additive monad is weaker...
4411 +
4412 +        // zero is a monadic zero
4413 +        Monad.assertZero(zero);
4414 +
4415 +        // left zero: zero >>= f === zero
4416 +        Monad.assertZero(zero.thenCompose(inc));
4417 +        // right zero: f >>= (\x -> zero) === zero
4418 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4419 +
4420 +        // f plus zero === f
4421 +        Monad.assertFutureEquals(Monad.unit(5L),
4422 +                                 Monad.plus(Monad.unit(5L), zero));
4423 +        // zero plus f === f
4424 +        Monad.assertFutureEquals(Monad.unit(5L),
4425 +                                 Monad.plus(zero, Monad.unit(5L)));
4426 +        // zero plus zero === zero
4427 +        Monad.assertZero(Monad.plus(zero, zero));
4428 +        {
4429 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4430 +                                                   Monad.unit(8L));
4431 +            // non-determinism
4432 +            assertTrue(f.get() == 5L || f.get() == 8L);
4433 +        }
4434 +
4435 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4436 +        // f plus godot === f (doesn't wait for godot)
4437 +        Monad.assertFutureEquals(Monad.unit(5L),
4438 +                                 Monad.plus(Monad.unit(5L), godot));
4439 +        // godot plus f === f (doesn't wait for godot)
4440 +        Monad.assertFutureEquals(Monad.unit(5L),
4441 +                                 Monad.plus(godot, Monad.unit(5L)));
4442 +    }
4443 +
4444 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4445 +    @SuppressWarnings("FutureReturnValueIgnored")
4446 +    public void testRecursiveChains() throws Throwable {
4447 +        for (ExecutionMode m : ExecutionMode.values())
4448 +        for (boolean addDeadEnds : new boolean[] { true, false })
4449 +    {
4450 +        final int val = 42;
4451 +        final int n = expensiveTests ? 1_000 : 2;
4452 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4453 +        CompletableFuture<Integer> tail = head;
4454 +        for (int i = 0; i < n; i++) {
4455 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4456 +            tail = m.thenApply(tail, v -> v + 1);
4457 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4458 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4459 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4460 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4461 +        }
4462 +        head.complete(val);
4463 +        assertEquals(val + 3 * n, (int) tail.join());
4464 +    }}
4465 +
4466 +    /**
4467 +     * A single CompletableFuture with many dependents.
4468 +     * A demo of scalability - runtime is O(n).
4469 +     */
4470 +    @SuppressWarnings("FutureReturnValueIgnored")
4471 +    public void testManyDependents() throws Throwable {
4472 +        final int n = expensiveTests ? 1_000_000 : 10;
4473 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4474 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4475 +        final AtomicInteger count = new AtomicInteger(0);
4476 +        for (int i = 0; i < n; i++) {
4477 +            head.thenRun(() -> count.getAndIncrement());
4478 +            head.thenAccept(x -> count.getAndIncrement());
4479 +            head.thenApply(x -> count.getAndIncrement());
4480 +
4481 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4482 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4483 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4484 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4485 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4486 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4487 +
4488 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4489 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4490 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4491 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4492 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4493 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4494 +        }
4495 +        head.complete(null);
4496 +        assertEquals(5 * 3 * n, count.get());
4497 +    }
4498 +
4499 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4500 +    @SuppressWarnings("FutureReturnValueIgnored")
4501 +    public void testCoCompletionGarbageRetention() throws Throwable {
4502 +        final int n = expensiveTests ? 1_000_000 : 10;
4503 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4504 +        CompletableFuture<Integer> f;
4505 +        for (int i = 0; i < n; i++) {
4506 +            f = new CompletableFuture<>();
4507 +            f.runAfterEither(incomplete, () -> {});
4508 +            f.complete(null);
4509 +
4510 +            f = new CompletableFuture<>();
4511 +            f.acceptEither(incomplete, x -> {});
4512 +            f.complete(null);
4513 +
4514 +            f = new CompletableFuture<>();
4515 +            f.applyToEither(incomplete, x -> x);
4516 +            f.complete(null);
4517 +
4518 +            f = new CompletableFuture<>();
4519 +            CompletableFuture.anyOf(f, incomplete);
4520 +            f.complete(null);
4521 +        }
4522 +
4523 +        for (int i = 0; i < n; i++) {
4524 +            f = new CompletableFuture<>();
4525 +            incomplete.runAfterEither(f, () -> {});
4526 +            f.complete(null);
4527 +
4528 +            f = new CompletableFuture<>();
4529 +            incomplete.acceptEither(f, x -> {});
4530 +            f.complete(null);
4531 +
4532 +            f = new CompletableFuture<>();
4533 +            incomplete.applyToEither(f, x -> x);
4534 +            f.complete(null);
4535 +
4536 +            f = new CompletableFuture<>();
4537 +            CompletableFuture.anyOf(incomplete, f);
4538 +            f.complete(null);
4539 +        }
4540 +    }
4541 +
4542 +    /**
4543 +     * Reproduction recipe for:
4544 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4545 +     * 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
4546 +     */
4547 +    public void testAnyOfGarbageRetention() throws Throwable {
4548 +        for (Integer v : new Integer[] { 1, null })
4549 +    {
4550 +        final int n = expensiveTests ? 100_000 : 10;
4551 +        CompletableFuture<Integer>[] fs
4552 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4553 +        for (int i = 0; i < fs.length; i++)
4554 +            fs[i] = new CompletableFuture<>();
4555 +        fs[fs.length - 1].complete(v);
4556 +        for (int i = 0; i < n; i++)
4557 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4558 +    }}
4559 +
4560 +    /**
4561 +     * Checks for garbage retention with allOf.
4562 +     *
4563 +     * As of 2016-07, fails with OOME:
4564 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4565 +     */
4566 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4567 +        final int n = expensiveTests ? 100_000 : 10;
4568 +        CompletableFuture<Integer>[] fs
4569 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4570 +        for (int i = 0; i < fs.length; i++)
4571 +            fs[i] = new CompletableFuture<>();
4572 +        for (int i = 0; i < n; i++)
4573 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4574 +    }
4575 +
4576 +    /**
4577 +     * Checks for garbage retention when a dependent future is
4578 +     * cancelled and garbage-collected.
4579 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4580 +     *
4581 +     * As of 2016-07, fails with OOME:
4582 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4583 +     */
4584 +    public void testCancelledGarbageRetention() throws Throwable {
4585 +        final int n = expensiveTests ? 100_000 : 10;
4586 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4587 +        for (int i = 0; i < n; i++)
4588 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4589 +    }
4590 +
4591 +    /**
4592 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4593 +     * is invoked many times.
4594 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4595 +     *
4596 +     * As of 2016-07, fails with OOME:
4597 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4598 +     */
4599 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4600 +        final int n = expensiveTests ? 900_000 : 10;
4601 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4602 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4603 +        for (int i = 0; i < n; i++)
4604 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4605 +    }
4606 +
4607 + //     static <U> U join(CompletionStage<U> stage) {
4608 + //         CompletableFuture<U> f = new CompletableFuture<>();
4609 + //         stage.whenComplete((v, ex) -> {
4610 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4611 + //         });
4612 + //         return f.join();
4613 + //     }
4614 +
4615 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4616 + //         CompletableFuture<U> f = new CompletableFuture<>();
4617 + //         stage.whenComplete((v, ex) -> {
4618 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4619 + //         });
4620 + //         return f.isDone();
4621 + //     }
4622 +
4623 + //     static <U> U join2(CompletionStage<U> stage) {
4624 + //         return stage.toCompletableFuture().copy().join();
4625 + //     }
4626 +
4627 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4628 + //         return stage.toCompletableFuture().copy().isDone();
4629 + //     }
4630 +
4631 +    // For testing default implementations
4632 +    // Only non-default interface methods defined.
4633 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4634 +        final CompletableFuture<T> cf;
4635 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4636 +        public CompletableFuture<T> toCompletableFuture() {
4637 +            return cf; }
4638 +        public CompletionStage<Void> thenRun
4639 +            (Runnable action) {
4640 +            return cf.thenRun(action); }
4641 +        public CompletionStage<Void> thenRunAsync
4642 +            (Runnable action) {
4643 +            return cf.thenRunAsync(action); }
4644 +        public CompletionStage<Void> thenRunAsync
4645 +            (Runnable action,
4646 +             Executor executor) {
4647 +            return cf.thenRunAsync(action, executor); }
4648 +        public CompletionStage<Void> thenAccept
4649 +            (Consumer<? super T> action) {
4650 +            return cf.thenAccept(action); }
4651 +        public CompletionStage<Void> thenAcceptAsync
4652 +            (Consumer<? super T> action) {
4653 +            return cf.thenAcceptAsync(action); }
4654 +        public CompletionStage<Void> thenAcceptAsync
4655 +            (Consumer<? super T> action,
4656 +             Executor executor) {
4657 +            return cf.thenAcceptAsync(action, executor); }
4658 +        public <U> CompletionStage<U> thenApply
4659 +            (Function<? super T,? extends U> a) {
4660 +            return cf.thenApply(a); }
4661 +        public <U> CompletionStage<U> thenApplyAsync
4662 +            (Function<? super T,? extends U> fn) {
4663 +            return cf.thenApplyAsync(fn); }
4664 +        public <U> CompletionStage<U> thenApplyAsync
4665 +            (Function<? super T,? extends U> fn,
4666 +             Executor executor) {
4667 +            return cf.thenApplyAsync(fn, executor); }
4668 +        public <U,V> CompletionStage<V> thenCombine
4669 +            (CompletionStage<? extends U> other,
4670 +             BiFunction<? super T,? super U,? extends V> fn) {
4671 +            return cf.thenCombine(other, fn); }
4672 +        public <U,V> CompletionStage<V> thenCombineAsync
4673 +            (CompletionStage<? extends U> other,
4674 +             BiFunction<? super T,? super U,? extends V> fn) {
4675 +            return cf.thenCombineAsync(other, fn); }
4676 +        public <U,V> CompletionStage<V> thenCombineAsync
4677 +            (CompletionStage<? extends U> other,
4678 +             BiFunction<? super T,? super U,? extends V> fn,
4679 +             Executor executor) {
4680 +            return cf.thenCombineAsync(other, fn, executor); }
4681 +        public <U> CompletionStage<Void> thenAcceptBoth
4682 +            (CompletionStage<? extends U> other,
4683 +             BiConsumer<? super T, ? super U> action) {
4684 +            return cf.thenAcceptBoth(other, action); }
4685 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4686 +            (CompletionStage<? extends U> other,
4687 +             BiConsumer<? super T, ? super U> action) {
4688 +            return cf.thenAcceptBothAsync(other, action); }
4689 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4690 +            (CompletionStage<? extends U> other,
4691 +             BiConsumer<? super T, ? super U> action,
4692 +             Executor executor) {
4693 +            return cf.thenAcceptBothAsync(other, action, executor); }
4694 +        public CompletionStage<Void> runAfterBoth
4695 +            (CompletionStage<?> other,
4696 +             Runnable action) {
4697 +            return cf.runAfterBoth(other, action); }
4698 +        public CompletionStage<Void> runAfterBothAsync
4699 +            (CompletionStage<?> other,
4700 +             Runnable action) {
4701 +            return cf.runAfterBothAsync(other, action); }
4702 +        public CompletionStage<Void> runAfterBothAsync
4703 +            (CompletionStage<?> other,
4704 +             Runnable action,
4705 +             Executor executor) {
4706 +            return cf.runAfterBothAsync(other, action, executor); }
4707 +        public <U> CompletionStage<U> applyToEither
4708 +            (CompletionStage<? extends T> other,
4709 +             Function<? super T, U> fn) {
4710 +            return cf.applyToEither(other, fn); }
4711 +        public <U> CompletionStage<U> applyToEitherAsync
4712 +            (CompletionStage<? extends T> other,
4713 +             Function<? super T, U> fn) {
4714 +            return cf.applyToEitherAsync(other, fn); }
4715 +        public <U> CompletionStage<U> applyToEitherAsync
4716 +            (CompletionStage<? extends T> other,
4717 +             Function<? super T, U> fn,
4718 +             Executor executor) {
4719 +            return cf.applyToEitherAsync(other, fn, executor); }
4720 +        public CompletionStage<Void> acceptEither
4721 +            (CompletionStage<? extends T> other,
4722 +             Consumer<? super T> action) {
4723 +            return cf.acceptEither(other, action); }
4724 +        public CompletionStage<Void> acceptEitherAsync
4725 +            (CompletionStage<? extends T> other,
4726 +             Consumer<? super T> action) {
4727 +            return cf.acceptEitherAsync(other, action); }
4728 +        public CompletionStage<Void> acceptEitherAsync
4729 +            (CompletionStage<? extends T> other,
4730 +             Consumer<? super T> action,
4731 +             Executor executor) {
4732 +            return cf.acceptEitherAsync(other, action, executor); }
4733 +        public CompletionStage<Void> runAfterEither
4734 +            (CompletionStage<?> other,
4735 +             Runnable action) {
4736 +            return cf.runAfterEither(other, action); }
4737 +        public CompletionStage<Void> runAfterEitherAsync
4738 +            (CompletionStage<?> other,
4739 +             Runnable action) {
4740 +            return cf.runAfterEitherAsync(other, action); }
4741 +        public CompletionStage<Void> runAfterEitherAsync
4742 +            (CompletionStage<?> other,
4743 +             Runnable action,
4744 +             Executor executor) {
4745 +            return cf.runAfterEitherAsync(other, action, executor); }
4746 +        public <U> CompletionStage<U> thenCompose
4747 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4748 +            return cf.thenCompose(fn); }
4749 +        public <U> CompletionStage<U> thenComposeAsync
4750 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4751 +            return cf.thenComposeAsync(fn); }
4752 +        public <U> CompletionStage<U> thenComposeAsync
4753 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4754 +             Executor executor) {
4755 +            return cf.thenComposeAsync(fn, executor); }
4756 +        public <U> CompletionStage<U> handle
4757 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4758 +            return cf.handle(fn); }
4759 +        public <U> CompletionStage<U> handleAsync
4760 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4761 +            return cf.handleAsync(fn); }
4762 +        public <U> CompletionStage<U> handleAsync
4763 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4764 +             Executor executor) {
4765 +            return cf.handleAsync(fn, executor); }
4766 +        public CompletionStage<T> whenComplete
4767 +            (BiConsumer<? super T, ? super Throwable> action) {
4768 +            return cf.whenComplete(action); }
4769 +        public CompletionStage<T> whenCompleteAsync
4770 +            (BiConsumer<? super T, ? super Throwable> action) {
4771 +            return cf.whenCompleteAsync(action); }
4772 +        public CompletionStage<T> whenCompleteAsync
4773 +            (BiConsumer<? super T, ? super Throwable> action,
4774 +             Executor executor) {
4775 +            return cf.whenCompleteAsync(action, executor); }
4776 +        public CompletionStage<T> exceptionally
4777 +            (Function<Throwable, ? extends T> fn) {
4778 +            return cf.exceptionally(fn); }
4779 +    }
4780 +
4781 +    /**
4782 +     * default-implemented exceptionallyAsync action is not invoked when
4783 +     * source completes normally, and source result is propagated
4784 +     */
4785 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4786 +        for (boolean createIncomplete : new boolean[] { true, false })
4787 +        for (Integer v1 : new Integer[] { 1, null })
4788      {
2813        final AtomicInteger a = new AtomicInteger(0);
4789          final CompletableFuture<Integer> f = new CompletableFuture<>();
4790 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
4791 <        final CompletableFuture<Integer> g = m.whenComplete
4792 <            (f,
4793 <             (Integer x, Throwable t) -> {
4794 <                threadAssertNull(x);
4795 <                threadAssertTrue(t instanceof CancellationException);
4796 <                a.getAndIncrement();
4790 >        final DelegatedCompletionStage<Integer> d =
4791 >            new DelegatedCompletionStage<Integer>(f);
4792 >        if (!createIncomplete) assertTrue(f.complete(v1));
4793 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4794 >            ((Throwable t) -> {
4795 >                threadFail("should not be called");
4796 >                return null;            // unreached
4797              });
4798 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
4798 >        if (createIncomplete) assertTrue(f.complete(v1));
4799  
4800 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2826 <        checkCompletedWithWrappedCancellationException(g);
2827 <        checkCancelled(f);
2828 <        assertEquals(1, a.get());
4800 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4801      }}
4802  
4803      /**
4804 <     * If a whenComplete action throws an exception when triggered by
4805 <     * a normal completion, it completes exceptionally
4804 >     * default-implemented exceptionallyAsync action completes with
4805 >     * function value on source exception
4806       */
4807 <    public void testWhenComplete_actionFailed() {
4807 >    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4808          for (boolean createIncomplete : new boolean[] { true, false })
2837        for (ExecutionMode m : ExecutionMode.values())
4809          for (Integer v1 : new Integer[] { 1, null })
4810      {
4811          final AtomicInteger a = new AtomicInteger(0);
4812          final CFException ex = new CFException();
4813          final CompletableFuture<Integer> f = new CompletableFuture<>();
4814 <        if (!createIncomplete) f.complete(v1);
4815 <        final CompletableFuture<Integer> g = m.whenComplete
4816 <            (f,
4817 <             (Integer x, Throwable t) -> {
4818 <                threadAssertSame(x, v1);
4819 <                threadAssertNull(t);
4814 >        final DelegatedCompletionStage<Integer> d =
4815 >            new DelegatedCompletionStage<Integer>(f);
4816 >        if (!createIncomplete) f.completeExceptionally(ex);
4817 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4818 >            ((Throwable t) -> {
4819 >                threadAssertSame(t, ex);
4820                  a.getAndIncrement();
4821 <                throw ex;
4821 >                return v1;
4822              });
4823 <        if (createIncomplete) f.complete(v1);
4824 <        checkCompletedNormally(f, v1);
4825 <        checkCompletedWithWrappedCFException(g, ex);
4823 >        if (createIncomplete) f.completeExceptionally(ex);
4824 >
4825 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4826          assertEquals(1, a.get());
4827      }}
4828  
4829      /**
4830 <     * If a whenComplete action throws an exception when triggered by
4831 <     * a source completion that also throws an exception, the source
4832 <     * exception takes precedence.
4830 >     * Under default implementation, if an "exceptionally action"
4831 >     * throws an exception, it completes exceptionally with that
4832 >     * exception
4833       */
4834 <    public void testWhenComplete_actionFailedSourceFailed() {
4834 >    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4835          for (boolean createIncomplete : new boolean[] { true, false })
2865        for (ExecutionMode m : ExecutionMode.values())
2866        for (Integer v1 : new Integer[] { 1, null })
4836      {
4837          final AtomicInteger a = new AtomicInteger(0);
4838          final CFException ex1 = new CFException();
4839          final CFException ex2 = new CFException();
4840          final CompletableFuture<Integer> f = new CompletableFuture<>();
4841 <
4841 >        final DelegatedCompletionStage<Integer> d =
4842 >            new DelegatedCompletionStage<Integer>(f);
4843          if (!createIncomplete) f.completeExceptionally(ex1);
4844 <        final CompletableFuture<Integer> g = m.whenComplete
4845 <            (f,
2876 <             (Integer x, Throwable t) -> {
4844 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4845 >            ((Throwable t) -> {
4846                  threadAssertSame(t, ex1);
2878                threadAssertNull(x);
4847                  a.getAndIncrement();
4848                  throw ex2;
4849              });
4850          if (createIncomplete) f.completeExceptionally(ex1);
4851  
4852 <        checkCompletedWithWrappedCFException(f, ex1);
4853 <        checkCompletedWithWrappedCFException(g, ex1);
4852 >        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4853 >        checkCompletedExceptionally(f, ex1);
4854 >        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4855          assertEquals(1, a.get());
4856      }}
4857  
4858 +    /**
4859 +     * default exceptionallyCompose result completes normally after normal
4860 +     * completion of source
4861 +     */
4862 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4863 +        for (boolean createIncomplete : new boolean[] { true, false })
4864 +        for (Integer v1 : new Integer[] { 1, null })
4865 +    {
4866 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4867 +        final ExceptionalCompletableFutureFunction r =
4868 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4869 +        final DelegatedCompletionStage<Integer> d =
4870 +            new DelegatedCompletionStage<Integer>(f);
4871 +        if (!createIncomplete) assertTrue(f.complete(v1));
4872 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4873 +        if (createIncomplete) assertTrue(f.complete(v1));
4874 +
4875 +        checkCompletedNormally(f, v1);
4876 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4877 +        r.assertNotInvoked();
4878 +    }}
4879 +
4880 +    /**
4881 +     * default-implemented exceptionallyCompose result completes
4882 +     * normally after exceptional completion of source
4883 +     */
4884 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4885 +        for (boolean createIncomplete : new boolean[] { true, false })
4886 +    {
4887 +        final CFException ex = new CFException();
4888 +        final ExceptionalCompletableFutureFunction r =
4889 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4890 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4891 +        final DelegatedCompletionStage<Integer> d =
4892 +            new DelegatedCompletionStage<Integer>(f);
4893 +        if (!createIncomplete) f.completeExceptionally(ex);
4894 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4895 +        if (createIncomplete) f.completeExceptionally(ex);
4896 +
4897 +        checkCompletedExceptionally(f, ex);
4898 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4899 +        r.assertInvoked();
4900 +    }}
4901 +
4902 +    /**
4903 +     * default-implemented exceptionallyCompose completes
4904 +     * exceptionally on exception if action does
4905 +     */
4906 +    public void testDefaultExceptionallyCompose_actionFailed() {
4907 +        for (boolean createIncomplete : new boolean[] { true, false })
4908 +        for (Integer v1 : new Integer[] { 1, null })
4909 +    {
4910 +        final CFException ex = new CFException();
4911 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4912 +        final FailingExceptionalCompletableFutureFunction r
4913 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4914 +        final DelegatedCompletionStage<Integer> d =
4915 +            new DelegatedCompletionStage<Integer>(f);
4916 +        if (!createIncomplete) f.completeExceptionally(ex);
4917 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4918 +        if (createIncomplete) f.completeExceptionally(ex);
4919 +
4920 +        checkCompletedExceptionally(f, ex);
4921 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4922 +        r.assertInvoked();
4923 +    }}
4924 +
4925 +    /**
4926 +     * default exceptionallyComposeAsync result completes normally after normal
4927 +     * completion of source
4928 +     */
4929 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4930 +        for (boolean createIncomplete : new boolean[] { true, false })
4931 +        for (Integer v1 : new Integer[] { 1, null })
4932 +    {
4933 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4934 +        final ExceptionalCompletableFutureFunction r =
4935 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4936 +        final DelegatedCompletionStage<Integer> d =
4937 +            new DelegatedCompletionStage<Integer>(f);
4938 +        if (!createIncomplete) assertTrue(f.complete(v1));
4939 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4940 +        if (createIncomplete) assertTrue(f.complete(v1));
4941 +
4942 +        checkCompletedNormally(f, v1);
4943 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4944 +        r.assertNotInvoked();
4945 +    }}
4946 +
4947 +    /**
4948 +     * default-implemented exceptionallyComposeAsync result completes
4949 +     * normally after exceptional completion of source
4950 +     */
4951 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4952 +        for (boolean createIncomplete : new boolean[] { true, false })
4953 +    {
4954 +        final CFException ex = new CFException();
4955 +        final ExceptionalCompletableFutureFunction r =
4956 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4957 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4958 +        final DelegatedCompletionStage<Integer> d =
4959 +            new DelegatedCompletionStage<Integer>(f);
4960 +        if (!createIncomplete) f.completeExceptionally(ex);
4961 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4962 +        if (createIncomplete) f.completeExceptionally(ex);
4963 +
4964 +        checkCompletedExceptionally(f, ex);
4965 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4966 +        r.assertInvoked();
4967 +    }}
4968 +
4969 +    /**
4970 +     * default-implemented exceptionallyComposeAsync completes
4971 +     * exceptionally on exception if action does
4972 +     */
4973 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
4974 +        for (boolean createIncomplete : new boolean[] { true, false })
4975 +        for (Integer v1 : new Integer[] { 1, null })
4976 +    {
4977 +        final CFException ex = new CFException();
4978 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4979 +        final FailingExceptionalCompletableFutureFunction r
4980 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4981 +        final DelegatedCompletionStage<Integer> d =
4982 +            new DelegatedCompletionStage<Integer>(f);
4983 +        if (!createIncomplete) f.completeExceptionally(ex);
4984 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4985 +        if (createIncomplete) f.completeExceptionally(ex);
4986 +
4987 +        checkCompletedExceptionally(f, ex);
4988 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4989 +        r.assertInvoked();
4990 +    }}
4991 +
4992 +
4993 +    /**
4994 +     * default exceptionallyComposeAsync result completes normally after normal
4995 +     * completion of source
4996 +     */
4997 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
4998 +        for (boolean createIncomplete : new boolean[] { true, false })
4999 +        for (Integer v1 : new Integer[] { 1, null })
5000 +    {
5001 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5002 +        final ExceptionalCompletableFutureFunction r =
5003 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5004 +        final DelegatedCompletionStage<Integer> d =
5005 +            new DelegatedCompletionStage<Integer>(f);
5006 +        if (!createIncomplete) assertTrue(f.complete(v1));
5007 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5008 +        if (createIncomplete) assertTrue(f.complete(v1));
5009 +
5010 +        checkCompletedNormally(f, v1);
5011 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5012 +        r.assertNotInvoked();
5013 +    }}
5014 +
5015 +    /**
5016 +     * default-implemented exceptionallyComposeAsync result completes
5017 +     * normally after exceptional completion of source
5018 +     */
5019 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5020 +        for (boolean createIncomplete : new boolean[] { true, false })
5021 +    {
5022 +        final CFException ex = new CFException();
5023 +        final ExceptionalCompletableFutureFunction r =
5024 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5025 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5026 +        final DelegatedCompletionStage<Integer> d =
5027 +            new DelegatedCompletionStage<Integer>(f);
5028 +        if (!createIncomplete) f.completeExceptionally(ex);
5029 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5030 +        if (createIncomplete) f.completeExceptionally(ex);
5031 +
5032 +        checkCompletedExceptionally(f, ex);
5033 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5034 +        r.assertInvoked();
5035 +    }}
5036 +
5037 +    /**
5038 +     * default-implemented exceptionallyComposeAsync completes
5039 +     * exceptionally on exception if action does
5040 +     */
5041 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5042 +        for (boolean createIncomplete : new boolean[] { true, false })
5043 +        for (Integer v1 : new Integer[] { 1, null })
5044 +    {
5045 +        final CFException ex = new CFException();
5046 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5047 +        final FailingExceptionalCompletableFutureFunction r
5048 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5049 +        final DelegatedCompletionStage<Integer> d =
5050 +            new DelegatedCompletionStage<Integer>(f);
5051 +        if (!createIncomplete) f.completeExceptionally(ex);
5052 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5053 +        if (createIncomplete) f.completeExceptionally(ex);
5054 +
5055 +        checkCompletedExceptionally(f, ex);
5056 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5057 +        r.assertInvoked();
5058 +    }}
5059 +
5060   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines