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.206 by jsr166, Sun Sep 23 02:04:03 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines