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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines