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.6 by jsr166, Fri Mar 22 16:10:19 2013 UTC vs.
Revision 1.214 by jsr166, Mon Sep 24 18:09:30 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;
22 < import static java.util.concurrent.TimeUnit.SECONDS;
23 < import java.util.*;
24 < import java.util.function.Supplier;
25 < import java.util.function.Consumer;
36 > import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
27 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 41 | 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 <    void checkCompletedNormally(CompletableFuture<?> f, Object value) {
78 <        try {
79 <            assertEquals(value, f.join());
80 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
81 <        try {
82 <            assertEquals(value, f.getNow(null));
83 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
63 <        try {
64 <            assertEquals(value, f.get());
65 <        } 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(0L, SECONDS));
85 >            result = f.get();
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertEquals(expectedValue, result);
88 +
89          assertTrue(f.isDone());
90          assertFalse(f.isCancelled());
91 <        assertTrue(f.toString().contains("[Completed normally]"));
91 >        assertFalse(f.isCompletedExceptionally());
92 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
93      }
94  
95 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
96 <        try {
97 <            f.join();
98 <            shouldThrow();
99 <        } catch (Throwable ex) {
100 <            assertTrue(ex instanceof CompletionException &&
101 <                       ((CompletionException)ex).getCause() instanceof CFException);
102 <        }
103 <        try {
104 <            f.getNow(null);
105 <            shouldThrow();
106 <        } catch (Throwable ex) {
107 <            assertTrue(ex instanceof CompletionException &&
108 <                       ((CompletionException)ex).getCause() instanceof CFException);
109 <        }
110 <        try {
111 <            f.get();
91 <            shouldThrow();
92 <        } catch (Throwable ex) {
93 <            assertTrue(ex instanceof ExecutionException &&
94 <                       ((ExecutionException)ex).getCause() instanceof CFException);
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 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(0L, SECONDS);
117 >            f.get(LONG_DELAY_MS, MILLISECONDS);
118              shouldThrow();
119 <        } catch (Throwable ex) {
120 <            assertTrue(ex instanceof ExecutionException &&
121 <                       ((ExecutionException)ex).getCause() instanceof CFException);
122 <        }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <    }
119 >        } catch (ExecutionException success) {
120 >            assertSame(cause, success.getCause());
121 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
122 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
123  
107    void checkCancelled(CompletableFuture<?> f) {
124          try {
125              f.join();
126              shouldThrow();
127 <        } catch (Throwable ex) {
128 <            assertTrue(ex instanceof CancellationException);
129 <        }
127 >        } catch (CompletionException success) {
128 >            assertSame(cause, success.getCause());
129 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
130 >
131          try {
132              f.getNow(null);
133              shouldThrow();
134 <        } catch (Throwable ex) {
135 <            assertTrue(ex instanceof CancellationException);
136 <        }
134 >        } catch (CompletionException success) {
135 >            assertSame(cause, success.getCause());
136 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
137 >
138          try {
139              f.get();
140              shouldThrow();
141 <        } catch (Throwable ex) {
142 <            assertTrue(ex instanceof CancellationException);
143 <        }
144 <        try {
145 <            f.get(0L, SECONDS);
128 <            shouldThrow();
129 <        } catch (Throwable ex) {
130 <            assertTrue(ex instanceof CancellationException);
131 <        }
141 >        } catch (ExecutionException success) {
142 >            assertSame(cause, success.getCause());
143 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
144 >
145 >        assertFalse(f.isCancelled());
146          assertTrue(f.isDone());
147 <        assertTrue(f.isCancelled());
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();
187 <        } catch (Throwable ex) {
141 <            assertTrue(ex instanceof CompletionException &&
142 <                       ((CompletionException)ex).getCause() instanceof CancellationException);
143 <        }
187 >        } catch (CancellationException success) {}
188          try {
189              f.getNow(null);
190              shouldThrow();
191 <        } catch (Throwable ex) {
148 <            assertTrue(ex instanceof CompletionException &&
149 <                       ((CompletionException)ex).getCause() instanceof CancellationException);
150 <        }
191 >        } catch (CancellationException success) {}
192          try {
193              f.get();
194              shouldThrow();
195 <        } catch (Throwable ex) {
196 <            assertTrue(ex instanceof ExecutionException &&
197 <                       ((ExecutionException)ex).getCause() instanceof CancellationException);
198 <        }
199 <        try {
159 <            f.get(0L, SECONDS);
160 <            shouldThrow();
161 <        } catch (Throwable ex) {
162 <            assertTrue(ex instanceof ExecutionException &&
163 <                       ((ExecutionException)ex).getCause() instanceof CancellationException);
164 <        }
195 >        } catch (CancellationException success) {
196 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
197 >
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199 >
200          assertTrue(f.isDone());
201 <        assertFalse(f.isCancelled());
201 >        assertTrue(f.isCompletedExceptionally());
202 >        assertTrue(f.isCancelled());
203 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
204      }
205  
206      /**
# Line 171 | Line 208 | public class CompletableFutureTest exten
208       * by methods isDone, isCancelled, and getNow
209       */
210      public void testConstructor() {
211 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
211 >        CompletableFuture<Integer> f = new CompletableFuture<>();
212          checkIncomplete(f);
213      }
214  
# Line 180 | Line 217 | public class CompletableFutureTest exten
217       * isCancelled, join, get, and getNow
218       */
219      public void testComplete() {
220 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
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
231       * methods isDone, isCancelled, join, get, and getNow
232       */
233      public void testCompleteExceptionally() {
234 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
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 202 | Line 243 | public class CompletableFutureTest exten
243       * methods isDone, isCancelled, join, get, and getNow
244       */
245      public void testCancel() {
246 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
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
258       */
259      public void testObtrudeValue() {
260 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
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);
266          f.obtrudeValue(two);
267          checkCompletedNormally(f, two);
268 <        f = new CompletableFuture<Integer>();
268 >        f = new CompletableFuture<>();
269          f.obtrudeValue(three);
270          checkCompletedNormally(f, three);
271 <        f = new CompletableFuture<Integer>();
271 >        f.obtrudeValue(null);
272 >        checkCompletedNormally(f, null);
273 >        f = new CompletableFuture<>();
274          f.completeExceptionally(new CFException());
275          f.obtrudeValue(four);
276          checkCompletedNormally(f, four);
# Line 233 | Line 280 | public class CompletableFutureTest exten
280       * obtrudeException forces completion with given exception
281       */
282      public void testObtrudeException() {
283 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
284 <        checkIncomplete(f);
285 <        f.complete(one);
286 <        checkCompletedNormally(f, one);
287 <        f.obtrudeException(new CFException());
288 <        checkCompletedWithWrappedCFException(f);
289 <        f = new CompletableFuture<Integer>();
290 <        f.obtrudeException(new CFException());
291 <        checkCompletedWithWrappedCFException(f);
292 <        f = new CompletableFuture<Integer>();
283 >        for (Integer v1 : new Integer[] { 1, null })
284 >    {
285 >        CFException ex;
286 >        CompletableFuture<Integer> f;
287 >
288 >        f = new CompletableFuture<>();
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 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
318 <        assertEquals(f.getNumberOfDependents(), 0);
319 <        CompletableFuture g = f.thenRun(new Noop());
320 <        assertEquals(f.getNumberOfDependents(), 1);
321 <        assertEquals(g.getNumberOfDependents(), 0);
322 <        CompletableFuture h = f.thenRun(new Noop());
323 <        assertEquals(f.getNumberOfDependents(), 2);
324 <        f.complete(1);
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 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
323 >        assertEquals(1, f.getNumberOfDependents());
324 >        assertEquals(0, g.getNumberOfDependents());
325 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
326 >        assertEquals(2, f.getNumberOfDependents());
327 >        assertEquals(0, h.getNumberOfDependents());
328 >        assertTrue(f.complete(v1));
329          checkCompletedNormally(g, null);
330 <        assertEquals(f.getNumberOfDependents(), 0);
331 <        assertEquals(g.getNumberOfDependents(), 0);
332 <    }
333 <
330 >        checkCompletedNormally(h, null);
331 >        assertEquals(0, f.getNumberOfDependents());
332 >        assertEquals(0, g.getNumberOfDependents());
333 >        assertEquals(0, h.getNumberOfDependents());
334 >    }}
335  
336      /**
337       * toString indicates current completion state
338       */
339 <    public void testToString() {
340 <        CompletableFuture<String> f;
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 >    /**
377 >     * completedFuture returns a completed CompletableFuture with given value
378 >     */
379 >    public void testCompletedFuture() {
380 >        CompletableFuture<String> f = CompletableFuture.completedFuture("test");
381 >        checkCompletedNormally(f, "test");
382 >    }
383 >
384 >    abstract static class CheckedAction {
385 >        int invocationCount = 0;
386 >        final ExecutionMode m;
387 >        CheckedAction(ExecutionMode m) { this.m = m; }
388 >        void invoked() {
389 >            m.checkExecutionMode();
390 >            assertEquals(0, invocationCount++);
391 >        }
392 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
393 >        void assertInvoked() { assertEquals(1, invocationCount); }
394 >    }
395 >
396 >    abstract static class CheckedIntegerAction extends CheckedAction {
397 >        Integer value;
398 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
399 >        void assertValue(Integer expected) {
400 >            assertInvoked();
401 >            assertEquals(expected, value);
402 >        }
403 >    }
404 >
405 >    static class IntegerSupplier extends CheckedAction
406 >        implements Supplier<Integer>
407 >    {
408 >        final Integer value;
409 >        IntegerSupplier(ExecutionMode m, Integer value) {
410 >            super(m);
411 >            this.value = value;
412 >        }
413 >        public Integer get() {
414 >            invoked();
415 >            return value;
416 >        }
417 >    }
418  
419 <        f = new CompletableFuture<String>();
420 <        assertTrue(f.toString().contains("[Not completed]"));
419 >    // A function that handles and produces null values as well.
420 >    static Integer inc(Integer x) {
421 >        return (x == null) ? null : x + 1;
422 >    }
423  
424 <        f.complete("foo");
425 <        assertTrue(f.toString().contains("[Completed normally]"));
424 >    static class NoopConsumer extends CheckedIntegerAction
425 >        implements Consumer<Integer>
426 >    {
427 >        NoopConsumer(ExecutionMode m) { super(m); }
428 >        public void accept(Integer x) {
429 >            invoked();
430 >            value = x;
431 >        }
432 >    }
433 >
434 >    static class IncFunction extends CheckedIntegerAction
435 >        implements Function<Integer,Integer>
436 >    {
437 >        IncFunction(ExecutionMode m) { super(m); }
438 >        public Integer apply(Integer x) {
439 >            invoked();
440 >            return value = inc(x);
441 >        }
442 >    }
443  
444 <        f = new CompletableFuture<String>();
445 <        f.completeExceptionally(new IndexOutOfBoundsException());
446 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
447 <    }
448 <
449 <    static final Supplier<Integer> supplyOne =
289 <        () -> Integer.valueOf(1);
290 <    static final Function<Integer, Integer> inc =
291 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
292 <    static final BiFunction<Integer, Integer, Integer> add =
293 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() + y.intValue());
294 <    static final class IncAction implements Consumer<Integer> {
295 <        int value;
296 <        public void accept(Integer x) { value = x.intValue() + 1; }
444 >    // Choose non-commutative actions for better coverage
445 >    // A non-commutative function that handles and produces null values as well.
446 >    static Integer subtract(Integer x, Integer y) {
447 >        return (x == null && y == null) ? null :
448 >            ((x == null) ? 42 : x.intValue())
449 >            - ((y == null) ? 99 : y.intValue());
450      }
451 <    static final class AddAction implements BiConsumer<Integer, Integer> {
452 <        int value;
451 >
452 >    static class SubtractAction extends CheckedIntegerAction
453 >        implements BiConsumer<Integer, Integer>
454 >    {
455 >        SubtractAction(ExecutionMode m) { super(m); }
456          public void accept(Integer x, Integer y) {
457 <            value = x.intValue() + y.intValue();
457 >            invoked();
458 >            value = subtract(x, y);
459          }
460      }
461 <    static final class Noop implements Runnable {
462 <        boolean ran;
463 <        public void run() { ran = true; }
461 >
462 >    static class SubtractFunction extends CheckedIntegerAction
463 >        implements BiFunction<Integer, Integer, Integer>
464 >    {
465 >        SubtractFunction(ExecutionMode m) { super(m); }
466 >        public Integer apply(Integer x, Integer y) {
467 >            invoked();
468 >            return value = subtract(x, y);
469 >        }
470      }
471  
472 <    static final class FailingSupplier implements Supplier<Integer> {
473 <        boolean ran;
474 <        public Integer get() { ran = true; throw new CFException(); }
472 >    static class Noop extends CheckedAction implements Runnable {
473 >        Noop(ExecutionMode m) { super(m); }
474 >        public void run() {
475 >            invoked();
476 >        }
477 >    }
478 >
479 >    static class FailingSupplier extends CheckedAction
480 >        implements Supplier<Integer>
481 >    {
482 >        final CFException ex;
483 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
484 >        public Integer get() {
485 >            invoked();
486 >            throw ex;
487 >        }
488      }
489 <    static final class FailingConsumer implements Consumer<Integer> {
490 <        boolean ran;
491 <        public void accept(Integer x) { ran = true; throw new CFException(); }
489 >
490 >    static class FailingConsumer extends CheckedIntegerAction
491 >        implements Consumer<Integer>
492 >    {
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 ex;
499 >        }
500      }
501 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
502 <        boolean ran;
503 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
501 >
502 >    static class FailingBiConsumer extends CheckedIntegerAction
503 >        implements BiConsumer<Integer, Integer>
504 >    {
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 ex;
511 >        }
512      }
513 <    static final class FailingFunction implements Function<Integer, Integer> {
514 <        boolean ran;
515 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
513 >
514 >    static class FailingFunction extends CheckedIntegerAction
515 >        implements Function<Integer, Integer>
516 >    {
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 ex;
523 >        }
524      }
525 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
526 <        boolean ran;
527 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
525 >
526 >    static class FailingBiFunction extends CheckedIntegerAction
527 >        implements BiFunction<Integer, Integer, Integer>
528 >    {
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 ex;
535 >        }
536      }
537 <    static final class FailingNoop implements Runnable {
538 <        boolean ran;
539 <        public void run() { ran = true; throw new CFException(); }
537 >
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 ex;
544 >        }
545      }
546  
547 <    static final class CompletableFutureInc implements Function<Integer, CompletableFuture<Integer>> {
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 <            CompletableFuture<Integer> f = new CompletableFuture<Integer>();
553 <            f.complete(Integer.valueOf(x.intValue() + 1));
554 <            return f;
552 >            invoked();
553 >            value = x;
554 >            return CompletableFuture.completedFuture(inc(x));
555 >        }
556 >    }
557 >
558 >    static class FailingExceptionalCompletableFutureFunction extends CheckedAction
559 >        implements Function<Throwable, CompletableFuture<Integer>>
560 >    {
561 >        final CFException ex;
562 >        FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
563 >        public CompletableFuture<Integer> apply(Throwable x) {
564 >            invoked();
565 >            throw ex;
566          }
567      }
568  
569 <    static final class FailingCompletableFutureFunction implements Function<Integer, CompletableFuture<Integer>> {
570 <        boolean ran;
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 >        final CFException ex;
583 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
584          public CompletableFuture<Integer> apply(Integer x) {
585 <            ran = true; throw new CFException();
585 >            invoked();
586 >            value = x;
587 >            throw ex;
588          }
589      }
590  
591 <    // Used for explicit executor tests
592 <    static final class ThreadExecutor implements Executor {
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 <            new Thread(r).start();
595 >            count.getAndIncrement();
596 >            throw ex;
597          }
598      }
599  
600 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
601 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
602 <    }
600 >    // Used for explicit executor tests
601 >    static final class ThreadExecutor implements Executor {
602 >        final AtomicInteger count = new AtomicInteger(0);
603 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
604 >        static boolean startedCurrentThread() {
605 >            return Thread.currentThread().getThreadGroup() == tg;
606 >        }
607  
608 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
609 <        public Integer apply(Integer x, Throwable t) {
610 <            return (t == null) ? two : three;
608 >        public void execute(Runnable r) {
609 >            count.getAndIncrement();
610 >            new Thread(tg, r).start();
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 +        SYNC {
623 +            public void checkExecutionMode() {
624 +                assertFalse(ThreadExecutor.startedCurrentThread());
625 +                assertNull(ForkJoinTask.getPool());
626 +            }
627 +            public CompletableFuture<Void> runAsync(Runnable a) {
628 +                throw new UnsupportedOperationException();
629 +            }
630 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
631 +                throw new UnsupportedOperationException();
632 +            }
633 +            public <T> CompletableFuture<Void> thenRun
634 +                (CompletableFuture<T> f, Runnable a) {
635 +                return f.thenRun(a);
636 +            }
637 +            public <T> CompletableFuture<Void> thenAccept
638 +                (CompletableFuture<T> f, Consumer<? super T> a) {
639 +                return f.thenAccept(a);
640 +            }
641 +            public <T,U> CompletableFuture<U> thenApply
642 +                (CompletableFuture<T> f, Function<? super T,U> a) {
643 +                return f.thenApply(a);
644 +            }
645 +            public <T,U> CompletableFuture<U> thenCompose
646 +                (CompletableFuture<T> f,
647 +                 Function<? super T,? extends CompletionStage<U>> a) {
648 +                return f.thenCompose(a);
649 +            }
650 +            public <T,U> CompletableFuture<U> handle
651 +                (CompletableFuture<T> f,
652 +                 BiFunction<? super T,Throwable,? extends U> a) {
653 +                return f.handle(a);
654 +            }
655 +            public <T> CompletableFuture<T> whenComplete
656 +                (CompletableFuture<T> f,
657 +                 BiConsumer<? super T,? super Throwable> a) {
658 +                return f.whenComplete(a);
659 +            }
660 +            public <T,U> CompletableFuture<Void> runAfterBoth
661 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
662 +                return f.runAfterBoth(g, a);
663 +            }
664 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
665 +                (CompletableFuture<T> f,
666 +                 CompletionStage<? extends U> g,
667 +                 BiConsumer<? super T,? super U> a) {
668 +                return f.thenAcceptBoth(g, a);
669 +            }
670 +            public <T,U,V> CompletableFuture<V> thenCombine
671 +                (CompletableFuture<T> f,
672 +                 CompletionStage<? extends U> g,
673 +                 BiFunction<? super T,? super U,? extends V> a) {
674 +                return f.thenCombine(g, a);
675 +            }
676 +            public <T> CompletableFuture<Void> runAfterEither
677 +                (CompletableFuture<T> f,
678 +                 CompletionStage<?> g,
679 +                 java.lang.Runnable a) {
680 +                return f.runAfterEither(g, a);
681 +            }
682 +            public <T> CompletableFuture<Void> acceptEither
683 +                (CompletableFuture<T> f,
684 +                 CompletionStage<? extends T> g,
685 +                 Consumer<? super T> a) {
686 +                return f.acceptEither(g, a);
687 +            }
688 +            public <T,U> CompletableFuture<U> applyToEither
689 +                (CompletableFuture<T> f,
690 +                 CompletionStage<? extends T> g,
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 +        },
704 +        ASYNC {
705 +            public void checkExecutionMode() {
706 +                assertEquals(defaultExecutorIsCommonPool,
707 +                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
708 +            }
709 +            public CompletableFuture<Void> runAsync(Runnable a) {
710 +                return CompletableFuture.runAsync(a);
711 +            }
712 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
713 +                return CompletableFuture.supplyAsync(a);
714 +            }
715 +            public <T> CompletableFuture<Void> thenRun
716 +                (CompletableFuture<T> f, Runnable a) {
717 +                return f.thenRunAsync(a);
718 +            }
719 +            public <T> CompletableFuture<Void> thenAccept
720 +                (CompletableFuture<T> f, Consumer<? super T> a) {
721 +                return f.thenAcceptAsync(a);
722 +            }
723 +            public <T,U> CompletableFuture<U> thenApply
724 +                (CompletableFuture<T> f, Function<? super T,U> a) {
725 +                return f.thenApplyAsync(a);
726 +            }
727 +            public <T,U> CompletableFuture<U> thenCompose
728 +                (CompletableFuture<T> f,
729 +                 Function<? super T,? extends CompletionStage<U>> a) {
730 +                return f.thenComposeAsync(a);
731 +            }
732 +            public <T,U> CompletableFuture<U> handle
733 +                (CompletableFuture<T> f,
734 +                 BiFunction<? super T,Throwable,? extends U> a) {
735 +                return f.handleAsync(a);
736 +            }
737 +            public <T> CompletableFuture<T> whenComplete
738 +                (CompletableFuture<T> f,
739 +                 BiConsumer<? super T,? super Throwable> a) {
740 +                return f.whenCompleteAsync(a);
741 +            }
742 +            public <T,U> CompletableFuture<Void> runAfterBoth
743 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
744 +                return f.runAfterBothAsync(g, a);
745 +            }
746 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
747 +                (CompletableFuture<T> f,
748 +                 CompletionStage<? extends U> g,
749 +                 BiConsumer<? super T,? super U> a) {
750 +                return f.thenAcceptBothAsync(g, a);
751 +            }
752 +            public <T,U,V> CompletableFuture<V> thenCombine
753 +                (CompletableFuture<T> f,
754 +                 CompletionStage<? extends U> g,
755 +                 BiFunction<? super T,? super U,? extends V> a) {
756 +                return f.thenCombineAsync(g, a);
757 +            }
758 +            public <T> CompletableFuture<Void> runAfterEither
759 +                (CompletableFuture<T> f,
760 +                 CompletionStage<?> g,
761 +                 java.lang.Runnable a) {
762 +                return f.runAfterEitherAsync(g, a);
763 +            }
764 +            public <T> CompletableFuture<Void> acceptEither
765 +                (CompletableFuture<T> f,
766 +                 CompletionStage<? extends T> g,
767 +                 Consumer<? super T> a) {
768 +                return f.acceptEitherAsync(g, a);
769 +            }
770 +            public <T,U> CompletableFuture<U> applyToEither
771 +                (CompletableFuture<T> f,
772 +                 CompletionStage<? extends T> g,
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 {
790 +            public void checkExecutionMode() {
791 +                assertTrue(ThreadExecutor.startedCurrentThread());
792 +            }
793 +            public CompletableFuture<Void> runAsync(Runnable a) {
794 +                return CompletableFuture.runAsync(a, new ThreadExecutor());
795 +            }
796 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
797 +                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
798 +            }
799 +            public <T> CompletableFuture<Void> thenRun
800 +                (CompletableFuture<T> f, Runnable a) {
801 +                return f.thenRunAsync(a, new ThreadExecutor());
802 +            }
803 +            public <T> CompletableFuture<Void> thenAccept
804 +                (CompletableFuture<T> f, Consumer<? super T> a) {
805 +                return f.thenAcceptAsync(a, new ThreadExecutor());
806 +            }
807 +            public <T,U> CompletableFuture<U> thenApply
808 +                (CompletableFuture<T> f, Function<? super T,U> a) {
809 +                return f.thenApplyAsync(a, new ThreadExecutor());
810 +            }
811 +            public <T,U> CompletableFuture<U> thenCompose
812 +                (CompletableFuture<T> f,
813 +                 Function<? super T,? extends CompletionStage<U>> a) {
814 +                return f.thenComposeAsync(a, new ThreadExecutor());
815 +            }
816 +            public <T,U> CompletableFuture<U> handle
817 +                (CompletableFuture<T> f,
818 +                 BiFunction<? super T,Throwable,? extends U> a) {
819 +                return f.handleAsync(a, new ThreadExecutor());
820 +            }
821 +            public <T> CompletableFuture<T> whenComplete
822 +                (CompletableFuture<T> f,
823 +                 BiConsumer<? super T,? super Throwable> a) {
824 +                return f.whenCompleteAsync(a, new ThreadExecutor());
825 +            }
826 +            public <T,U> CompletableFuture<Void> runAfterBoth
827 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
828 +                return f.runAfterBothAsync(g, a, new ThreadExecutor());
829 +            }
830 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
831 +                (CompletableFuture<T> f,
832 +                 CompletionStage<? extends U> g,
833 +                 BiConsumer<? super T,? super U> a) {
834 +                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
835 +            }
836 +            public <T,U,V> CompletableFuture<V> thenCombine
837 +                (CompletableFuture<T> f,
838 +                 CompletionStage<? extends U> g,
839 +                 BiFunction<? super T,? super U,? extends V> a) {
840 +                return f.thenCombineAsync(g, a, new ThreadExecutor());
841 +            }
842 +            public <T> CompletableFuture<Void> runAfterEither
843 +                (CompletableFuture<T> f,
844 +                 CompletionStage<?> g,
845 +                 java.lang.Runnable a) {
846 +                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
847 +            }
848 +            public <T> CompletableFuture<Void> acceptEither
849 +                (CompletableFuture<T> f,
850 +                 CompletionStage<? extends T> g,
851 +                 Consumer<? super T> a) {
852 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
853 +            }
854 +            public <T,U> CompletableFuture<U> applyToEither
855 +                (CompletableFuture<T> f,
856 +                 CompletionStage<? extends T> g,
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();
873 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
874 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
875 +        public abstract <T> CompletableFuture<Void> thenRun
876 +            (CompletableFuture<T> f, Runnable a);
877 +        public abstract <T> CompletableFuture<Void> thenAccept
878 +            (CompletableFuture<T> f, Consumer<? super T> a);
879 +        public abstract <T,U> CompletableFuture<U> thenApply
880 +            (CompletableFuture<T> f, Function<? super T,U> a);
881 +        public abstract <T,U> CompletableFuture<U> thenCompose
882 +            (CompletableFuture<T> f,
883 +             Function<? super T,? extends CompletionStage<U>> a);
884 +        public abstract <T,U> CompletableFuture<U> handle
885 +            (CompletableFuture<T> f,
886 +             BiFunction<? super T,Throwable,? extends U> a);
887 +        public abstract <T> CompletableFuture<T> whenComplete
888 +            (CompletableFuture<T> f,
889 +             BiConsumer<? super T,? super Throwable> a);
890 +        public abstract <T,U> CompletableFuture<Void> runAfterBoth
891 +            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
892 +        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
893 +            (CompletableFuture<T> f,
894 +             CompletionStage<? extends U> g,
895 +             BiConsumer<? super T,? super U> a);
896 +        public abstract <T,U,V> CompletableFuture<V> thenCombine
897 +            (CompletableFuture<T> f,
898 +             CompletionStage<? extends U> g,
899 +             BiFunction<? super T,? super U,? extends V> a);
900 +        public abstract <T> CompletableFuture<Void> runAfterEither
901 +            (CompletableFuture<T> f,
902 +             CompletionStage<?> g,
903 +             java.lang.Runnable a);
904 +        public abstract <T> CompletableFuture<Void> acceptEither
905 +            (CompletableFuture<T> f,
906 +             CompletionStage<? extends T> g,
907 +             Consumer<? super T> a);
908 +        public abstract <T,U> CompletableFuture<U> applyToEither
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 +    /**
921 +     * exceptionally action is not invoked when source completes
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 CompletableFuture<Integer> f = new CompletableFuture<>();
930 +        if (!createIncomplete) assertTrue(f.complete(v1));
931 +        final CompletableFuture<Integer> g = m.exceptionally
932 +            (f, (Throwable t) -> {
933 +                threadFail("should not be called");
934 +                return null;            // unreached
935 +            });
936 +        if (createIncomplete) assertTrue(f.complete(v1));
937 +
938 +        checkCompletedNormally(g, v1);
939 +        checkCompletedNormally(f, v1);
940 +    }}
941  
942      /**
943       * exceptionally action completes with function value on source
944 <     * exception;  otherwise with source value
944 >     * exception
945       */
946 <    public void testExceptionally() {
947 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
948 <        ExceptionToInteger r = new ExceptionToInteger();
949 <        CompletableFuture<Integer> g = f.exceptionally(r);
950 <        f.completeExceptionally(new CFException());
951 <        checkCompletedNormally(g, three);
946 >    public void testExceptionally_exceptionalCompletion() {
947 >        for (ExecutionMode m : ExecutionMode.values())
948 >        for (boolean createIncomplete : new boolean[] { true, false })
949 >        for (Integer v1 : new Integer[] { 1, null })
950 >    {
951 >        final AtomicInteger a = new AtomicInteger(0);
952 >        final CFException ex = new CFException();
953 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
954 >        if (!createIncomplete) f.completeExceptionally(ex);
955 >        final CompletableFuture<Integer> g = m.exceptionally
956 >            (f, (Throwable t) -> {
957 >                m.checkExecutionMode();
958 >                threadAssertSame(t, ex);
959 >                a.getAndIncrement();
960 >                return v1;
961 >            });
962 >        if (createIncomplete) f.completeExceptionally(ex);
963 >
964 >        checkCompletedNormally(g, v1);
965 >        assertEquals(1, a.get());
966 >    }}
967 >
968 >    /**
969 >     * If an "exceptionally action" throws an exception, it completes
970 >     * exceptionally with that exception
971 >     */
972 >    public void testExceptionally_exceptionalCompletionActionFailed() {
973 >        for (ExecutionMode m : ExecutionMode.values())
974 >        for (boolean createIncomplete : new boolean[] { true, false })
975 >    {
976 >        final AtomicInteger a = new AtomicInteger(0);
977 >        final CFException ex1 = new CFException();
978 >        final CFException ex2 = new CFException();
979 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
980 >        if (!createIncomplete) f.completeExceptionally(ex1);
981 >        final CompletableFuture<Integer> g = m.exceptionally
982 >            (f, (Throwable t) -> {
983 >                m.checkExecutionMode();
984 >                threadAssertSame(t, ex1);
985 >                a.getAndIncrement();
986 >                throw ex2;
987 >            });
988 >        if (createIncomplete) f.completeExceptionally(ex1);
989 >
990 >        checkCompletedWithWrappedException(g, ex2);
991 >        checkCompletedExceptionally(f, ex1);
992 >        assertEquals(1, a.get());
993 >    }}
994 >
995 >    /**
996 >     * whenComplete action executes on normal completion, propagating
997 >     * source result.
998 >     */
999 >    public void testWhenComplete_normalCompletion() {
1000 >        for (ExecutionMode m : ExecutionMode.values())
1001 >        for (boolean createIncomplete : new boolean[] { true, false })
1002 >        for (Integer v1 : new Integer[] { 1, null })
1003 >    {
1004 >        final AtomicInteger a = new AtomicInteger(0);
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        if (!createIncomplete) assertTrue(f.complete(v1));
1007 >        final CompletableFuture<Integer> g = m.whenComplete
1008 >            (f,
1009 >             (Integer result, Throwable t) -> {
1010 >                m.checkExecutionMode();
1011 >                threadAssertSame(result, v1);
1012 >                threadAssertNull(t);
1013 >                a.getAndIncrement();
1014 >            });
1015 >        if (createIncomplete) assertTrue(f.complete(v1));
1016 >
1017 >        checkCompletedNormally(g, v1);
1018 >        checkCompletedNormally(f, v1);
1019 >        assertEquals(1, a.get());
1020 >    }}
1021 >
1022 >    /**
1023 >     * whenComplete action executes on exceptional completion, propagating
1024 >     * source result.
1025 >     */
1026 >    public void testWhenComplete_exceptionalCompletion() {
1027 >        for (ExecutionMode m : ExecutionMode.values())
1028 >        for (boolean createIncomplete : new boolean[] { true, false })
1029 >    {
1030 >        final AtomicInteger a = new AtomicInteger(0);
1031 >        final CFException ex = new CFException();
1032 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1033 >        if (!createIncomplete) f.completeExceptionally(ex);
1034 >        final CompletableFuture<Integer> g = m.whenComplete
1035 >            (f,
1036 >             (Integer result, Throwable t) -> {
1037 >                m.checkExecutionMode();
1038 >                threadAssertNull(result);
1039 >                threadAssertSame(t, ex);
1040 >                a.getAndIncrement();
1041 >            });
1042 >        if (createIncomplete) f.completeExceptionally(ex);
1043 >
1044 >        checkCompletedWithWrappedException(g, ex);
1045 >        checkCompletedExceptionally(f, ex);
1046 >        assertEquals(1, a.get());
1047 >    }}
1048 >
1049 >    /**
1050 >     * whenComplete action executes on cancelled source, propagating
1051 >     * CancellationException.
1052 >     */
1053 >    public void testWhenComplete_sourceCancelled() {
1054 >        for (ExecutionMode m : ExecutionMode.values())
1055 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1056 >        for (boolean createIncomplete : new boolean[] { true, false })
1057 >    {
1058 >        final AtomicInteger a = new AtomicInteger(0);
1059 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1060 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1061 >        final CompletableFuture<Integer> g = m.whenComplete
1062 >            (f,
1063 >             (Integer result, Throwable t) -> {
1064 >                m.checkExecutionMode();
1065 >                threadAssertNull(result);
1066 >                threadAssertTrue(t instanceof CancellationException);
1067 >                a.getAndIncrement();
1068 >            });
1069 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1070  
1071 <        f = new CompletableFuture<Integer>();
1072 <        r = new ExceptionToInteger();
1073 <        g = f.exceptionally(r);
1074 <        f.complete(one);
382 <        checkCompletedNormally(g, one);
383 <    }
1071 >        checkCompletedWithWrappedCancellationException(g);
1072 >        checkCancelled(f);
1073 >        assertEquals(1, a.get());
1074 >    }}
1075  
1076      /**
1077 <     * handle action completes normally with function value on either
1078 <     * normal or exceptional completion of source
1077 >     * If a whenComplete action throws an exception when triggered by
1078 >     * a normal completion, it completes exceptionally
1079       */
1080 <    public void testHandle() {
1081 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1082 <        IntegerHandler r = new IntegerHandler();
1083 <        CompletableFuture<Integer> g = f.handle(r);
1084 <        f.completeExceptionally(new CFException());
1085 <        checkCompletedNormally(g, three);
1080 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1081 >        for (boolean createIncomplete : new boolean[] { true, false })
1082 >        for (ExecutionMode m : ExecutionMode.values())
1083 >        for (Integer v1 : new Integer[] { 1, null })
1084 >    {
1085 >        final AtomicInteger a = new AtomicInteger(0);
1086 >        final CFException ex = new CFException();
1087 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1088 >        if (!createIncomplete) assertTrue(f.complete(v1));
1089 >        final CompletableFuture<Integer> g = m.whenComplete
1090 >            (f,
1091 >             (Integer result, Throwable t) -> {
1092 >                m.checkExecutionMode();
1093 >                threadAssertSame(result, v1);
1094 >                threadAssertNull(t);
1095 >                a.getAndIncrement();
1096 >                throw ex;
1097 >            });
1098 >        if (createIncomplete) assertTrue(f.complete(v1));
1099 >
1100 >        checkCompletedWithWrappedException(g, ex);
1101 >        checkCompletedNormally(f, v1);
1102 >        assertEquals(1, a.get());
1103 >    }}
1104 >
1105 >    /**
1106 >     * If a whenComplete action throws an exception when triggered by
1107 >     * a source completion that also throws an exception, the source
1108 >     * exception takes precedence (unlike handle)
1109 >     */
1110 >    public void testWhenComplete_sourceFailedActionFailed() {
1111 >        for (boolean createIncomplete : new boolean[] { true, false })
1112 >        for (ExecutionMode m : ExecutionMode.values())
1113 >    {
1114 >        final AtomicInteger a = new AtomicInteger(0);
1115 >        final CFException ex1 = new CFException();
1116 >        final CFException ex2 = new CFException();
1117 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1118 >
1119 >        if (!createIncomplete) f.completeExceptionally(ex1);
1120 >        final CompletableFuture<Integer> g = m.whenComplete
1121 >            (f,
1122 >             (Integer result, Throwable t) -> {
1123 >                m.checkExecutionMode();
1124 >                threadAssertSame(t, ex1);
1125 >                threadAssertNull(result);
1126 >                a.getAndIncrement();
1127 >                throw ex2;
1128 >            });
1129 >        if (createIncomplete) f.completeExceptionally(ex1);
1130 >
1131 >        checkCompletedWithWrappedException(g, ex1);
1132 >        checkCompletedExceptionally(f, ex1);
1133 >        if (testImplementationDetails) {
1134 >            assertEquals(1, ex1.getSuppressed().length);
1135 >            assertSame(ex2, ex1.getSuppressed()[0]);
1136 >        }
1137 >        assertEquals(1, a.get());
1138 >    }}
1139  
1140 <        f = new CompletableFuture<Integer>();
1141 <        r = new IntegerHandler();
1142 <        g = f.handle(r);
1143 <        f.complete(one);
1144 <        checkCompletedNormally(g, two);
1145 <    }
1140 >    /**
1141 >     * handle action completes normally with function value on normal
1142 >     * completion of source
1143 >     */
1144 >    public void testHandle_normalCompletion() {
1145 >        for (ExecutionMode m : ExecutionMode.values())
1146 >        for (boolean createIncomplete : new boolean[] { true, false })
1147 >        for (Integer v1 : new Integer[] { 1, null })
1148 >    {
1149 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1150 >        final AtomicInteger a = new AtomicInteger(0);
1151 >        if (!createIncomplete) assertTrue(f.complete(v1));
1152 >        final CompletableFuture<Integer> g = m.handle
1153 >            (f,
1154 >             (Integer result, Throwable t) -> {
1155 >                m.checkExecutionMode();
1156 >                threadAssertSame(result, v1);
1157 >                threadAssertNull(t);
1158 >                a.getAndIncrement();
1159 >                return inc(v1);
1160 >            });
1161 >        if (createIncomplete) assertTrue(f.complete(v1));
1162 >
1163 >        checkCompletedNormally(g, inc(v1));
1164 >        checkCompletedNormally(f, v1);
1165 >        assertEquals(1, a.get());
1166 >    }}
1167 >
1168 >    /**
1169 >     * handle action completes normally with function value on
1170 >     * exceptional completion of source
1171 >     */
1172 >    public void testHandle_exceptionalCompletion() {
1173 >        for (ExecutionMode m : ExecutionMode.values())
1174 >        for (boolean createIncomplete : new boolean[] { true, false })
1175 >        for (Integer v1 : new Integer[] { 1, null })
1176 >    {
1177 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 >        final AtomicInteger a = new AtomicInteger(0);
1179 >        final CFException ex = new CFException();
1180 >        if (!createIncomplete) f.completeExceptionally(ex);
1181 >        final CompletableFuture<Integer> g = m.handle
1182 >            (f,
1183 >             (Integer result, Throwable t) -> {
1184 >                m.checkExecutionMode();
1185 >                threadAssertNull(result);
1186 >                threadAssertSame(t, ex);
1187 >                a.getAndIncrement();
1188 >                return v1;
1189 >            });
1190 >        if (createIncomplete) f.completeExceptionally(ex);
1191 >
1192 >        checkCompletedNormally(g, v1);
1193 >        checkCompletedExceptionally(f, ex);
1194 >        assertEquals(1, a.get());
1195 >    }}
1196 >
1197 >    /**
1198 >     * handle action completes normally with function value on
1199 >     * cancelled source
1200 >     */
1201 >    public void testHandle_sourceCancelled() {
1202 >        for (ExecutionMode m : ExecutionMode.values())
1203 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1204 >        for (boolean createIncomplete : new boolean[] { true, false })
1205 >        for (Integer v1 : new Integer[] { 1, null })
1206 >    {
1207 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1208 >        final AtomicInteger a = new AtomicInteger(0);
1209 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1210 >        final CompletableFuture<Integer> g = m.handle
1211 >            (f,
1212 >             (Integer result, Throwable t) -> {
1213 >                m.checkExecutionMode();
1214 >                threadAssertNull(result);
1215 >                threadAssertTrue(t instanceof CancellationException);
1216 >                a.getAndIncrement();
1217 >                return v1;
1218 >            });
1219 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1220 >
1221 >        checkCompletedNormally(g, v1);
1222 >        checkCancelled(f);
1223 >        assertEquals(1, a.get());
1224 >    }}
1225  
1226      /**
1227 <     * runAsync completes after running Runnable
1227 >     * If a "handle action" throws an exception when triggered by
1228 >     * a normal completion, it completes exceptionally
1229       */
1230 <    public void testRunAsync() {
1231 <        Noop r = new Noop();
1232 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1233 <        assertNull(f.join());
1234 <        assertTrue(r.ran);
1235 <    }
1230 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1231 >        for (ExecutionMode m : ExecutionMode.values())
1232 >        for (boolean createIncomplete : new boolean[] { true, false })
1233 >        for (Integer v1 : new Integer[] { 1, null })
1234 >    {
1235 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1236 >        final AtomicInteger a = new AtomicInteger(0);
1237 >        final CFException ex = new CFException();
1238 >        if (!createIncomplete) assertTrue(f.complete(v1));
1239 >        final CompletableFuture<Integer> g = m.handle
1240 >            (f,
1241 >             (Integer result, Throwable t) -> {
1242 >                m.checkExecutionMode();
1243 >                threadAssertSame(result, v1);
1244 >                threadAssertNull(t);
1245 >                a.getAndIncrement();
1246 >                throw ex;
1247 >            });
1248 >        if (createIncomplete) assertTrue(f.complete(v1));
1249 >
1250 >        checkCompletedWithWrappedException(g, ex);
1251 >        checkCompletedNormally(f, v1);
1252 >        assertEquals(1, a.get());
1253 >    }}
1254 >
1255 >    /**
1256 >     * If a "handle action" throws an exception when triggered by
1257 >     * a source completion that also throws an exception, the action
1258 >     * exception takes precedence (unlike whenComplete)
1259 >     */
1260 >    public void testHandle_sourceFailedActionFailed() {
1261 >        for (boolean createIncomplete : new boolean[] { true, false })
1262 >        for (ExecutionMode m : ExecutionMode.values())
1263 >    {
1264 >        final AtomicInteger a = new AtomicInteger(0);
1265 >        final CFException ex1 = new CFException();
1266 >        final CFException ex2 = new CFException();
1267 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1268 >
1269 >        if (!createIncomplete) f.completeExceptionally(ex1);
1270 >        final CompletableFuture<Integer> g = m.handle
1271 >            (f,
1272 >             (Integer result, Throwable t) -> {
1273 >                m.checkExecutionMode();
1274 >                threadAssertNull(result);
1275 >                threadAssertSame(ex1, t);
1276 >                a.getAndIncrement();
1277 >                throw ex2;
1278 >            });
1279 >        if (createIncomplete) f.completeExceptionally(ex1);
1280 >
1281 >        checkCompletedWithWrappedException(g, ex2);
1282 >        checkCompletedExceptionally(f, ex1);
1283 >        assertEquals(1, a.get());
1284 >    }}
1285  
1286      /**
1287 <     * runAsync with executor completes after running Runnable
1287 >     * runAsync completes after running Runnable
1288       */
1289 <    public void testRunAsync2() {
1290 <        Noop r = new Noop();
1291 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, new ThreadExecutor());
1289 >    public void testRunAsync_normalCompletion() {
1290 >        ExecutionMode[] executionModes = {
1291 >            ExecutionMode.ASYNC,
1292 >            ExecutionMode.EXECUTOR,
1293 >        };
1294 >        for (ExecutionMode m : executionModes)
1295 >    {
1296 >        final Noop r = new Noop(m);
1297 >        final CompletableFuture<Void> f = m.runAsync(r);
1298          assertNull(f.join());
1299 <        assertTrue(r.ran);
1300 <    }
1299 >        checkCompletedNormally(f, null);
1300 >        r.assertInvoked();
1301 >    }}
1302  
1303      /**
1304       * failing runAsync completes exceptionally after running Runnable
1305       */
1306 <    public void testRunAsync3() {
1307 <        FailingNoop r = new FailingNoop();
1308 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1309 <        checkCompletedWithWrappedCFException(f);
1310 <        assertTrue(r.ran);
1311 <    }
1306 >    public void testRunAsync_exceptionalCompletion() {
1307 >        ExecutionMode[] executionModes = {
1308 >            ExecutionMode.ASYNC,
1309 >            ExecutionMode.EXECUTOR,
1310 >        };
1311 >        for (ExecutionMode m : executionModes)
1312 >    {
1313 >        final FailingRunnable r = new FailingRunnable(m);
1314 >        final CompletableFuture<Void> f = m.runAsync(r);
1315 >        checkCompletedWithWrappedException(f, r.ex);
1316 >        r.assertInvoked();
1317 >    }}
1318 >
1319 >    @SuppressWarnings("FutureReturnValueIgnored")
1320 >    public void testRunAsync_rejectingExecutor() {
1321 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1322 >        try {
1323 >            CompletableFuture.runAsync(() -> {}, e);
1324 >            shouldThrow();
1325 >        } catch (Throwable t) {
1326 >            assertSame(e.ex, t);
1327 >        }
1328  
1329 <    /**
434 <     * supplyAsync completes with result of supplier
435 <     */
436 <    public void testSupplyAsync() {
437 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne);
438 <        assertEquals(f.join(), one);
1329 >        assertEquals(1, e.count.get());
1330      }
1331  
1332      /**
1333 <     * supplyAsync with executor completes with result of supplier
1333 >     * supplyAsync completes with result of supplier
1334       */
1335 <    public void testSupplyAsync2() {
1336 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1337 <        assertEquals(f.join(), one);
1338 <    }
1335 >    public void testSupplyAsync_normalCompletion() {
1336 >        ExecutionMode[] executionModes = {
1337 >            ExecutionMode.ASYNC,
1338 >            ExecutionMode.EXECUTOR,
1339 >        };
1340 >        for (ExecutionMode m : executionModes)
1341 >        for (Integer v1 : new Integer[] { 1, null })
1342 >    {
1343 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1344 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1345 >        assertSame(v1, f.join());
1346 >        checkCompletedNormally(f, v1);
1347 >        r.assertInvoked();
1348 >    }}
1349  
1350      /**
1351       * Failing supplyAsync completes exceptionally
1352       */
1353 <    public void testSupplyAsync3() {
1354 <        FailingSupplier r = new FailingSupplier();
1355 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1356 <        checkCompletedWithWrappedCFException(f);
1357 <        assertTrue(r.ran);
1353 >    public void testSupplyAsync_exceptionalCompletion() {
1354 >        ExecutionMode[] executionModes = {
1355 >            ExecutionMode.ASYNC,
1356 >            ExecutionMode.EXECUTOR,
1357 >        };
1358 >        for (ExecutionMode m : executionModes)
1359 >    {
1360 >        FailingSupplier r = new FailingSupplier(m);
1361 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1362 >        checkCompletedWithWrappedException(f, r.ex);
1363 >        r.assertInvoked();
1364 >    }}
1365 >
1366 >    @SuppressWarnings("FutureReturnValueIgnored")
1367 >    public void testSupplyAsync_rejectingExecutor() {
1368 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1369 >        try {
1370 >            CompletableFuture.supplyAsync(() -> null, e);
1371 >            shouldThrow();
1372 >        } catch (Throwable t) {
1373 >            assertSame(e.ex, t);
1374 >        }
1375 >
1376 >        assertEquals(1, e.count.get());
1377      }
1378  
1379 <    // seq conmpletion methods
1379 >    // seq completion methods
1380  
1381      /**
1382       * thenRun result completes normally after normal completion of source
1383       */
1384 <    public void testThenRun() {
1385 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1386 <        Noop r = new Noop();
1387 <        CompletableFuture<Void> g = f.thenRun(r);
1388 <        f.complete(null);
1389 <        checkCompletedNormally(g, null);
1390 <        // reordered version
1391 <        f = new CompletableFuture<Integer>();
1392 <        f.complete(null);
1393 <        r = new Noop();
1394 <        g = f.thenRun(r);
1395 <        checkCompletedNormally(g, null);
1396 <    }
1384 >    public void testThenRun_normalCompletion() {
1385 >        for (ExecutionMode m : ExecutionMode.values())
1386 >        for (Integer v1 : new Integer[] { 1, null })
1387 >    {
1388 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1389 >        final Noop[] rs = new Noop[6];
1390 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1391 >
1392 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1393 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1394 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1395 >        checkIncomplete(h0);
1396 >        checkIncomplete(h1);
1397 >        checkIncomplete(h2);
1398 >        assertTrue(f.complete(v1));
1399 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1400 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1401 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1402 >
1403 >        checkCompletedNormally(h0, null);
1404 >        checkCompletedNormally(h1, null);
1405 >        checkCompletedNormally(h2, null);
1406 >        checkCompletedNormally(h3, null);
1407 >        checkCompletedNormally(h4, null);
1408 >        checkCompletedNormally(h5, null);
1409 >        checkCompletedNormally(f, v1);
1410 >        for (Noop r : rs) r.assertInvoked();
1411 >    }}
1412  
1413      /**
1414       * thenRun result completes exceptionally after exceptional
1415       * completion of source
1416       */
1417 <    public void testThenRun2() {
1418 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1419 <        Noop r = new Noop();
1420 <        CompletableFuture<Void> g = f.thenRun(r);
1421 <        f.completeExceptionally(new CFException());
1422 <        checkCompletedWithWrappedCFException(g);
1423 <    }
1417 >    public void testThenRun_exceptionalCompletion() {
1418 >        for (ExecutionMode m : ExecutionMode.values())
1419 >    {
1420 >        final CFException ex = new CFException();
1421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 >        final Noop[] rs = new Noop[6];
1423 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1424 >
1425 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1426 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1427 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1428 >        checkIncomplete(h0);
1429 >        checkIncomplete(h1);
1430 >        checkIncomplete(h2);
1431 >        assertTrue(f.completeExceptionally(ex));
1432 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1433 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1434 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1435 >
1436 >        checkCompletedWithWrappedException(h0, ex);
1437 >        checkCompletedWithWrappedException(h1, ex);
1438 >        checkCompletedWithWrappedException(h2, ex);
1439 >        checkCompletedWithWrappedException(h3, ex);
1440 >        checkCompletedWithWrappedException(h4, ex);
1441 >        checkCompletedWithWrappedException(h5, ex);
1442 >        checkCompletedExceptionally(f, ex);
1443 >        for (Noop r : rs) r.assertNotInvoked();
1444 >    }}
1445  
1446      /**
1447 <     * thenRun result completes exceptionally if action does
1447 >     * thenRun result completes exceptionally if source cancelled
1448       */
1449 <    public void testThenRun3() {
1450 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1451 <        FailingNoop r = new FailingNoop();
1452 <        CompletableFuture<Void> g = f.thenRun(r);
1453 <        f.complete(null);
1454 <        checkCompletedWithWrappedCFException(g);
1455 <    }
1449 >    public void testThenRun_sourceCancelled() {
1450 >        for (ExecutionMode m : ExecutionMode.values())
1451 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1452 >    {
1453 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1454 >        final Noop[] rs = new Noop[6];
1455 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1456 >
1457 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1458 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1459 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1460 >        checkIncomplete(h0);
1461 >        checkIncomplete(h1);
1462 >        checkIncomplete(h2);
1463 >        assertTrue(f.cancel(mayInterruptIfRunning));
1464 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1465 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1466 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1467 >
1468 >        checkCompletedWithWrappedCancellationException(h0);
1469 >        checkCompletedWithWrappedCancellationException(h1);
1470 >        checkCompletedWithWrappedCancellationException(h2);
1471 >        checkCompletedWithWrappedCancellationException(h3);
1472 >        checkCompletedWithWrappedCancellationException(h4);
1473 >        checkCompletedWithWrappedCancellationException(h5);
1474 >        checkCancelled(f);
1475 >        for (Noop r : rs) r.assertNotInvoked();
1476 >    }}
1477  
1478      /**
1479 <     * thenRun result completes exceptionally if source cancelled
1479 >     * thenRun result completes exceptionally if action does
1480       */
1481 <    public void testThenRun4() {
1482 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1483 <        Noop r = new Noop();
1484 <        CompletableFuture<Void> g = f.thenRun(r);
1485 <        assertTrue(f.cancel(true));
1486 <        checkCompletedWithWrappedCancellationException(g);
1487 <    }
1481 >    public void testThenRun_actionFailed() {
1482 >        for (ExecutionMode m : ExecutionMode.values())
1483 >        for (Integer v1 : new Integer[] { 1, null })
1484 >    {
1485 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 >        final FailingRunnable[] rs = new FailingRunnable[6];
1487 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1488 >
1489 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1490 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1491 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1492 >        assertTrue(f.complete(v1));
1493 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1494 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1495 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1496 >
1497 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1498 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1499 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1500 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1501 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1502 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1503 >        checkCompletedNormally(f, v1);
1504 >    }}
1505  
1506      /**
1507       * thenApply result completes normally after normal completion of source
1508       */
1509 <    public void testThenApply() {
1510 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1511 <        CompletableFuture<Integer> g = f.thenApply(inc);
1512 <        f.complete(one);
1513 <        checkCompletedNormally(g, two);
1514 <    }
1509 >    public void testThenApply_normalCompletion() {
1510 >        for (ExecutionMode m : ExecutionMode.values())
1511 >        for (Integer v1 : new Integer[] { 1, null })
1512 >    {
1513 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 >        final IncFunction[] rs = new IncFunction[4];
1515 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1516 >
1517 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1518 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1519 >        checkIncomplete(h0);
1520 >        checkIncomplete(h1);
1521 >        assertTrue(f.complete(v1));
1522 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1523 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1524 >
1525 >        checkCompletedNormally(h0, inc(v1));
1526 >        checkCompletedNormally(h1, inc(v1));
1527 >        checkCompletedNormally(h2, inc(v1));
1528 >        checkCompletedNormally(h3, inc(v1));
1529 >        checkCompletedNormally(f, v1);
1530 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1531 >    }}
1532  
1533      /**
1534       * thenApply result completes exceptionally after exceptional
1535       * completion of source
1536       */
1537 <    public void testThenApply2() {
1538 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1539 <        CompletableFuture<Integer> g = f.thenApply(inc);
1540 <        f.completeExceptionally(new CFException());
1541 <        checkCompletedWithWrappedCFException(g);
1542 <    }
1537 >    public void testThenApply_exceptionalCompletion() {
1538 >        for (ExecutionMode m : ExecutionMode.values())
1539 >    {
1540 >        final CFException ex = new CFException();
1541 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1542 >        final IncFunction[] rs = new IncFunction[4];
1543 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1544 >
1545 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1546 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1547 >        assertTrue(f.completeExceptionally(ex));
1548 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1549 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1550 >
1551 >        checkCompletedWithWrappedException(h0, ex);
1552 >        checkCompletedWithWrappedException(h1, ex);
1553 >        checkCompletedWithWrappedException(h2, ex);
1554 >        checkCompletedWithWrappedException(h3, ex);
1555 >        checkCompletedExceptionally(f, ex);
1556 >        for (IncFunction r : rs) r.assertNotInvoked();
1557 >    }}
1558  
1559      /**
1560 <     * thenApply result completes exceptionally if action does
1560 >     * thenApply result completes exceptionally if source cancelled
1561       */
1562 <    public void testThenApply3() {
1563 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1564 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1565 <        f.complete(one);
1566 <        checkCompletedWithWrappedCFException(g);
1567 <    }
1562 >    public void testThenApply_sourceCancelled() {
1563 >        for (ExecutionMode m : ExecutionMode.values())
1564 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1565 >    {
1566 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1567 >        final IncFunction[] rs = new IncFunction[4];
1568 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1569 >
1570 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1571 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1572 >        assertTrue(f.cancel(mayInterruptIfRunning));
1573 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1574 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1575 >
1576 >        checkCompletedWithWrappedCancellationException(h0);
1577 >        checkCompletedWithWrappedCancellationException(h1);
1578 >        checkCompletedWithWrappedCancellationException(h2);
1579 >        checkCompletedWithWrappedCancellationException(h3);
1580 >        checkCancelled(f);
1581 >        for (IncFunction r : rs) r.assertNotInvoked();
1582 >    }}
1583  
1584      /**
1585 <     * thenApply result completes exceptionally if source cancelled
1585 >     * thenApply result completes exceptionally if action does
1586       */
1587 <    public void testThenApply4() {
1588 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1589 <        CompletableFuture<Integer> g = f.thenApply(inc);
1590 <        assertTrue(f.cancel(true));
1591 <        checkCompletedWithWrappedCancellationException(g);
1592 <    }
1587 >    public void testThenApply_actionFailed() {
1588 >        for (ExecutionMode m : ExecutionMode.values())
1589 >        for (Integer v1 : new Integer[] { 1, null })
1590 >    {
1591 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1592 >        final FailingFunction[] rs = new FailingFunction[4];
1593 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1594 >
1595 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1596 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1597 >        assertTrue(f.complete(v1));
1598 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1599 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1600 >
1601 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1602 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1603 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1604 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1605 >        checkCompletedNormally(f, v1);
1606 >    }}
1607  
1608      /**
1609       * thenAccept result completes normally after normal completion of source
1610       */
1611 <    public void testThenAccept() {
1612 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1613 <        IncAction r = new IncAction();
1614 <        CompletableFuture<Void> g = f.thenAccept(r);
1615 <        f.complete(one);
1616 <        checkCompletedNormally(g, null);
1617 <        assertEquals(r.value, 2);
1618 <    }
1611 >    public void testThenAccept_normalCompletion() {
1612 >        for (ExecutionMode m : ExecutionMode.values())
1613 >        for (Integer v1 : new Integer[] { 1, null })
1614 >    {
1615 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1616 >        final NoopConsumer[] rs = new NoopConsumer[4];
1617 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1618 >
1619 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1620 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1621 >        checkIncomplete(h0);
1622 >        checkIncomplete(h1);
1623 >        assertTrue(f.complete(v1));
1624 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1625 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1626 >
1627 >        checkCompletedNormally(h0, null);
1628 >        checkCompletedNormally(h1, null);
1629 >        checkCompletedNormally(h2, null);
1630 >        checkCompletedNormally(h3, null);
1631 >        checkCompletedNormally(f, v1);
1632 >        for (NoopConsumer r : rs) r.assertValue(v1);
1633 >    }}
1634  
1635      /**
1636       * thenAccept result completes exceptionally after exceptional
1637       * completion of source
1638       */
1639 <    public void testThenAccept2() {
1640 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1641 <        IncAction r = new IncAction();
1642 <        CompletableFuture<Void> g = f.thenAccept(r);
1643 <        f.completeExceptionally(new CFException());
1644 <        checkCompletedWithWrappedCFException(g);
1645 <    }
1646 <
1647 <    /**
1648 <     * thenAccept result completes exceptionally if action does
1649 <     */
1650 <    public void testThenAccept3() {
1651 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1652 <        FailingConsumer r = new FailingConsumer();
1653 <        CompletableFuture<Void> g = f.thenAccept(r);
1654 <        f.complete(one);
1655 <        checkCompletedWithWrappedCFException(g);
1656 <        assertTrue(r.ran);
1657 <    }
1639 >    public void testThenAccept_exceptionalCompletion() {
1640 >        for (ExecutionMode m : ExecutionMode.values())
1641 >    {
1642 >        final CFException ex = new CFException();
1643 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1644 >        final NoopConsumer[] rs = new NoopConsumer[4];
1645 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1646 >
1647 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1648 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1649 >        assertTrue(f.completeExceptionally(ex));
1650 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1651 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1652 >
1653 >        checkCompletedWithWrappedException(h0, ex);
1654 >        checkCompletedWithWrappedException(h1, ex);
1655 >        checkCompletedWithWrappedException(h2, ex);
1656 >        checkCompletedWithWrappedException(h3, ex);
1657 >        checkCompletedExceptionally(f, ex);
1658 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1659 >    }}
1660  
1661      /**
1662       * thenAccept result completes exceptionally if source cancelled
1663       */
1664 <    public void testThenAccept4() {
1665 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1666 <        IncAction r = new IncAction();
1667 <        CompletableFuture<Void> g = f.thenAccept(r);
1668 <        assertTrue(f.cancel(true));
1669 <        checkCompletedWithWrappedCancellationException(g);
1670 <    }
1671 <
1664 >    public void testThenAccept_sourceCancelled() {
1665 >        for (ExecutionMode m : ExecutionMode.values())
1666 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1667 >    {
1668 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1669 >        final NoopConsumer[] rs = new NoopConsumer[4];
1670 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1671 >
1672 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1673 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1674 >        assertTrue(f.cancel(mayInterruptIfRunning));
1675 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1676 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1677 >
1678 >        checkCompletedWithWrappedCancellationException(h0);
1679 >        checkCompletedWithWrappedCancellationException(h1);
1680 >        checkCompletedWithWrappedCancellationException(h2);
1681 >        checkCompletedWithWrappedCancellationException(h3);
1682 >        checkCancelled(f);
1683 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1684 >    }}
1685  
1686      /**
1687 <     * thenCombine result completes normally after normal completion of sources
1687 >     * thenAccept result completes exceptionally if action does
1688       */
1689 <    public void testThenCombine() {
1690 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1691 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1692 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1693 <        f.complete(one);
1694 <        checkIncomplete(g);
1695 <        f2.complete(two);
1696 <        checkCompletedNormally(g, three);
1697 <
1698 <        f = new CompletableFuture<Integer>();
1699 <        f.complete(one);
1700 <        f2 = new CompletableFuture<Integer>();
1701 <        g = f.thenCombine(f2, add);
1702 <        checkIncomplete(g);
1703 <        f2.complete(two);
1704 <        checkCompletedNormally(g, three);
1705 <    }
1689 >    public void testThenAccept_actionFailed() {
1690 >        for (ExecutionMode m : ExecutionMode.values())
1691 >        for (Integer v1 : new Integer[] { 1, null })
1692 >    {
1693 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1694 >        final FailingConsumer[] rs = new FailingConsumer[4];
1695 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1696 >
1697 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1698 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1699 >        assertTrue(f.complete(v1));
1700 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1701 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1702 >
1703 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1704 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1705 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1706 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1707 >        checkCompletedNormally(f, v1);
1708 >    }}
1709 >
1710 >    /**
1711 >     * thenCombine result completes normally after normal completion
1712 >     * of sources
1713 >     */
1714 >    public void testThenCombine_normalCompletion() {
1715 >        for (ExecutionMode m : ExecutionMode.values())
1716 >        for (boolean fFirst : new boolean[] { true, false })
1717 >        for (Integer v1 : new Integer[] { 1, null })
1718 >        for (Integer v2 : new Integer[] { 2, null })
1719 >    {
1720 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1721 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1722 >        final SubtractFunction[] rs = new SubtractFunction[6];
1723 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1724 >
1725 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1726 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1727 >        final Integer w1 =  fFirst ? v1 : v2;
1728 >        final Integer w2 = !fFirst ? v1 : v2;
1729 >
1730 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1731 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1732 >        assertTrue(fst.complete(w1));
1733 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1734 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1735 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1736 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1737 >        checkCompletedNormally(h1, subtract(w1, w1));
1738 >        checkCompletedNormally(h3, subtract(w1, w1));
1739 >        rs[1].assertValue(subtract(w1, w1));
1740 >        rs[3].assertValue(subtract(w1, w1));
1741 >        assertTrue(snd.complete(w2));
1742 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1743 >
1744 >        checkCompletedNormally(h0, subtract(v1, v2));
1745 >        checkCompletedNormally(h2, subtract(v1, v2));
1746 >        checkCompletedNormally(h4, subtract(v1, v2));
1747 >        rs[0].assertValue(subtract(v1, v2));
1748 >        rs[2].assertValue(subtract(v1, v2));
1749 >        rs[4].assertValue(subtract(v1, v2));
1750 >
1751 >        checkCompletedNormally(f, v1);
1752 >        checkCompletedNormally(g, v2);
1753 >    }}
1754  
1755      /**
1756       * thenCombine result completes exceptionally after exceptional
1757       * completion of either source
1758       */
1759 <    public void testThenCombine2() {
1760 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1761 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1762 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1763 <        f.completeExceptionally(new CFException());
1764 <        f2.complete(two);
1765 <        checkCompletedWithWrappedCFException(g);
1766 <
1767 <        f = new CompletableFuture<Integer>();
1768 <        f.complete(one);
1769 <        f2 = new CompletableFuture<Integer>();
1770 <        g = f.thenCombine(f2, add);
1771 <        f2.completeExceptionally(new CFException());
1772 <        checkCompletedWithWrappedCFException(g);
1773 <    }
1759 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1760 >        for (ExecutionMode m : ExecutionMode.values())
1761 >        for (boolean fFirst : new boolean[] { true, false })
1762 >        for (boolean failFirst : new boolean[] { true, false })
1763 >        for (Integer v1 : new Integer[] { 1, null })
1764 >    {
1765 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1766 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1767 >        final CFException ex = new CFException();
1768 >        final SubtractFunction r1 = new SubtractFunction(m);
1769 >        final SubtractFunction r2 = new SubtractFunction(m);
1770 >        final SubtractFunction r3 = new SubtractFunction(m);
1771 >
1772 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1773 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1774 >        final Callable<Boolean> complete1 = failFirst ?
1775 >            () -> fst.completeExceptionally(ex) :
1776 >            () -> fst.complete(v1);
1777 >        final Callable<Boolean> complete2 = failFirst ?
1778 >            () -> snd.complete(v1) :
1779 >            () -> snd.completeExceptionally(ex);
1780 >
1781 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1782 >        assertTrue(complete1.call());
1783 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1784 >        checkIncomplete(h1);
1785 >        checkIncomplete(h2);
1786 >        assertTrue(complete2.call());
1787 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1788 >
1789 >        checkCompletedWithWrappedException(h1, ex);
1790 >        checkCompletedWithWrappedException(h2, ex);
1791 >        checkCompletedWithWrappedException(h3, ex);
1792 >        r1.assertNotInvoked();
1793 >        r2.assertNotInvoked();
1794 >        r3.assertNotInvoked();
1795 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1796 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1797 >    }}
1798  
1799      /**
1800 <     * thenCombine result completes exceptionally if action does
1800 >     * thenCombine result completes exceptionally if either source cancelled
1801       */
1802 <    public void testThenCombine3() {
1803 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1804 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1805 <        FailingBiFunction r = new FailingBiFunction();
1806 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1807 <        f.complete(one);
1808 <        checkIncomplete(g);
1809 <        f2.complete(two);
1810 <        checkCompletedWithWrappedCFException(g);
1811 <    }
1802 >    public void testThenCombine_sourceCancelled() throws Throwable {
1803 >        for (ExecutionMode m : ExecutionMode.values())
1804 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1805 >        for (boolean fFirst : new boolean[] { true, false })
1806 >        for (boolean failFirst : new boolean[] { true, false })
1807 >        for (Integer v1 : new Integer[] { 1, null })
1808 >    {
1809 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1810 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1811 >        final SubtractFunction r1 = new SubtractFunction(m);
1812 >        final SubtractFunction r2 = new SubtractFunction(m);
1813 >        final SubtractFunction r3 = new SubtractFunction(m);
1814 >
1815 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1816 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1817 >        final Callable<Boolean> complete1 = failFirst ?
1818 >            () -> fst.cancel(mayInterruptIfRunning) :
1819 >            () -> fst.complete(v1);
1820 >        final Callable<Boolean> complete2 = failFirst ?
1821 >            () -> snd.complete(v1) :
1822 >            () -> snd.cancel(mayInterruptIfRunning);
1823 >
1824 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1825 >        assertTrue(complete1.call());
1826 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1827 >        checkIncomplete(h1);
1828 >        checkIncomplete(h2);
1829 >        assertTrue(complete2.call());
1830 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1831 >
1832 >        checkCompletedWithWrappedCancellationException(h1);
1833 >        checkCompletedWithWrappedCancellationException(h2);
1834 >        checkCompletedWithWrappedCancellationException(h3);
1835 >        r1.assertNotInvoked();
1836 >        r2.assertNotInvoked();
1837 >        r3.assertNotInvoked();
1838 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1839 >        checkCancelled(failFirst ? fst : snd);
1840 >    }}
1841  
1842      /**
1843 <     * thenCombine result completes exceptionally if either source cancelled
1843 >     * thenCombine result completes exceptionally if action does
1844       */
1845 <    public void testThenCombine4() {
1846 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1847 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1848 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1849 <        assertTrue(f.cancel(true));
1850 <        f2.complete(two);
1851 <        checkCompletedWithWrappedCancellationException(g);
1852 <        f = new CompletableFuture<Integer>();
1853 <        f2 = new CompletableFuture<Integer>();
1854 <        g = f.thenCombine(f2, add);
1855 <        f.complete(one);
1856 <        assertTrue(f2.cancel(true));
1857 <        checkCompletedWithWrappedCancellationException(g);
1858 <    }
1845 >    public void testThenCombine_actionFailed() {
1846 >        for (ExecutionMode m : ExecutionMode.values())
1847 >        for (boolean fFirst : new boolean[] { true, false })
1848 >        for (Integer v1 : new Integer[] { 1, null })
1849 >        for (Integer v2 : new Integer[] { 2, null })
1850 >    {
1851 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1852 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1853 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1854 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1855 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1856 >
1857 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1858 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1859 >        final Integer w1 =  fFirst ? v1 : v2;
1860 >        final Integer w2 = !fFirst ? v1 : v2;
1861 >
1862 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1863 >        assertTrue(fst.complete(w1));
1864 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1865 >        assertTrue(snd.complete(w2));
1866 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1867 >
1868 >        checkCompletedWithWrappedException(h1, r1.ex);
1869 >        checkCompletedWithWrappedException(h2, r2.ex);
1870 >        checkCompletedWithWrappedException(h3, r3.ex);
1871 >        r1.assertInvoked();
1872 >        r2.assertInvoked();
1873 >        r3.assertInvoked();
1874 >        checkCompletedNormally(f, v1);
1875 >        checkCompletedNormally(g, v2);
1876 >    }}
1877  
1878      /**
1879       * thenAcceptBoth result completes normally after normal
1880       * completion of sources
1881       */
1882 <    public void testThenAcceptBoth() {
1883 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1884 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1885 <        AddAction r = new AddAction();
1886 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1887 <        f.complete(one);
1888 <        checkIncomplete(g);
1889 <        f2.complete(two);
1890 <        checkCompletedNormally(g, null);
1891 <        assertEquals(r.value, 3);
1892 <
1893 <        r = new AddAction();
1894 <        f = new CompletableFuture<Integer>();
1895 <        f.complete(one);
1896 <        f2 = new CompletableFuture<Integer>();
1897 <        g = f.thenAcceptBoth(f2, r);
1898 <        checkIncomplete(g);
1899 <        f2.complete(two);
1900 <        checkCompletedNormally(g, null);
1901 <        assertEquals(r.value, 3);
1902 <    }
1882 >    public void testThenAcceptBoth_normalCompletion() {
1883 >        for (ExecutionMode m : ExecutionMode.values())
1884 >        for (boolean fFirst : new boolean[] { true, false })
1885 >        for (Integer v1 : new Integer[] { 1, null })
1886 >        for (Integer v2 : new Integer[] { 2, null })
1887 >    {
1888 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1889 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1890 >        final SubtractAction r1 = new SubtractAction(m);
1891 >        final SubtractAction r2 = new SubtractAction(m);
1892 >        final SubtractAction r3 = new SubtractAction(m);
1893 >
1894 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1895 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1896 >        final Integer w1 =  fFirst ? v1 : v2;
1897 >        final Integer w2 = !fFirst ? v1 : v2;
1898 >
1899 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1900 >        assertTrue(fst.complete(w1));
1901 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1902 >        checkIncomplete(h1);
1903 >        checkIncomplete(h2);
1904 >        r1.assertNotInvoked();
1905 >        r2.assertNotInvoked();
1906 >        assertTrue(snd.complete(w2));
1907 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1908 >
1909 >        checkCompletedNormally(h1, null);
1910 >        checkCompletedNormally(h2, null);
1911 >        checkCompletedNormally(h3, null);
1912 >        r1.assertValue(subtract(v1, v2));
1913 >        r2.assertValue(subtract(v1, v2));
1914 >        r3.assertValue(subtract(v1, v2));
1915 >        checkCompletedNormally(f, v1);
1916 >        checkCompletedNormally(g, v2);
1917 >    }}
1918  
1919      /**
1920       * thenAcceptBoth result completes exceptionally after exceptional
1921       * completion of either source
1922       */
1923 <    public void testThenAcceptBoth2() {
1924 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1925 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1926 <        AddAction r = new AddAction();
1927 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1928 <        f.completeExceptionally(new CFException());
1929 <        f2.complete(two);
1930 <        checkCompletedWithWrappedCFException(g);
1931 <
1932 <        r = new AddAction();
1933 <        f = new CompletableFuture<Integer>();
1934 <        f.complete(one);
1935 <        f2 = new CompletableFuture<Integer>();
1936 <        g = f.thenAcceptBoth(f2, r);
1937 <        f2.completeExceptionally(new CFException());
1938 <        checkCompletedWithWrappedCFException(g);
1939 <    }
1923 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1924 >        for (ExecutionMode m : ExecutionMode.values())
1925 >        for (boolean fFirst : new boolean[] { true, false })
1926 >        for (boolean failFirst : new boolean[] { true, false })
1927 >        for (Integer v1 : new Integer[] { 1, null })
1928 >    {
1929 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1930 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 >        final CFException ex = new CFException();
1932 >        final SubtractAction r1 = new SubtractAction(m);
1933 >        final SubtractAction r2 = new SubtractAction(m);
1934 >        final SubtractAction r3 = new SubtractAction(m);
1935 >
1936 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1937 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1938 >        final Callable<Boolean> complete1 = failFirst ?
1939 >            () -> fst.completeExceptionally(ex) :
1940 >            () -> fst.complete(v1);
1941 >        final Callable<Boolean> complete2 = failFirst ?
1942 >            () -> snd.complete(v1) :
1943 >            () -> snd.completeExceptionally(ex);
1944 >
1945 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1946 >        assertTrue(complete1.call());
1947 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1948 >        checkIncomplete(h1);
1949 >        checkIncomplete(h2);
1950 >        assertTrue(complete2.call());
1951 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1952 >
1953 >        checkCompletedWithWrappedException(h1, ex);
1954 >        checkCompletedWithWrappedException(h2, ex);
1955 >        checkCompletedWithWrappedException(h3, ex);
1956 >        r1.assertNotInvoked();
1957 >        r2.assertNotInvoked();
1958 >        r3.assertNotInvoked();
1959 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1960 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1961 >    }}
1962  
1963      /**
1964 <     * thenAcceptBoth result completes exceptionally if action does
1964 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1965       */
1966 <    public void testThenAcceptBoth3() {
1967 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1968 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1969 <        FailingBiConsumer r = new FailingBiConsumer();
1970 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1971 <        f.complete(one);
1972 <        checkIncomplete(g);
1973 <        f2.complete(two);
1974 <        checkCompletedWithWrappedCFException(g);
1975 <    }
1966 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1967 >        for (ExecutionMode m : ExecutionMode.values())
1968 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1969 >        for (boolean fFirst : new boolean[] { true, false })
1970 >        for (boolean failFirst : new boolean[] { true, false })
1971 >        for (Integer v1 : new Integer[] { 1, null })
1972 >    {
1973 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1974 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1975 >        final SubtractAction r1 = new SubtractAction(m);
1976 >        final SubtractAction r2 = new SubtractAction(m);
1977 >        final SubtractAction r3 = new SubtractAction(m);
1978 >
1979 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1980 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1981 >        final Callable<Boolean> complete1 = failFirst ?
1982 >            () -> fst.cancel(mayInterruptIfRunning) :
1983 >            () -> fst.complete(v1);
1984 >        final Callable<Boolean> complete2 = failFirst ?
1985 >            () -> snd.complete(v1) :
1986 >            () -> snd.cancel(mayInterruptIfRunning);
1987 >
1988 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1989 >        assertTrue(complete1.call());
1990 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1991 >        checkIncomplete(h1);
1992 >        checkIncomplete(h2);
1993 >        assertTrue(complete2.call());
1994 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1995 >
1996 >        checkCompletedWithWrappedCancellationException(h1);
1997 >        checkCompletedWithWrappedCancellationException(h2);
1998 >        checkCompletedWithWrappedCancellationException(h3);
1999 >        r1.assertNotInvoked();
2000 >        r2.assertNotInvoked();
2001 >        r3.assertNotInvoked();
2002 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2003 >        checkCancelled(failFirst ? fst : snd);
2004 >    }}
2005  
2006      /**
2007 <     * thenAcceptBoth result completes exceptionally if either source cancelled
2007 >     * thenAcceptBoth result completes exceptionally if action does
2008       */
2009 <    public void testThenAcceptBoth4() {
2010 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2011 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2012 <        AddAction r = new AddAction();
2013 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
2014 <        assertTrue(f.cancel(true));
2015 <        f2.complete(two);
2016 <        checkCompletedWithWrappedCancellationException(g);
2017 <        f = new CompletableFuture<Integer>();
2018 <        f2 = new CompletableFuture<Integer>();
2019 <        r = new AddAction();
2020 <        g = f.thenAcceptBoth(f2, r);
2021 <        f.complete(one);
2022 <        assertTrue(f2.cancel(true));
2023 <        checkCompletedWithWrappedCancellationException(g);
2024 <    }
2009 >    public void testThenAcceptBoth_actionFailed() {
2010 >        for (ExecutionMode m : ExecutionMode.values())
2011 >        for (boolean fFirst : new boolean[] { true, false })
2012 >        for (Integer v1 : new Integer[] { 1, null })
2013 >        for (Integer v2 : new Integer[] { 2, null })
2014 >    {
2015 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2016 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2017 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
2018 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
2019 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
2020 >
2021 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2022 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2023 >        final Integer w1 =  fFirst ? v1 : v2;
2024 >        final Integer w2 = !fFirst ? v1 : v2;
2025 >
2026 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
2027 >        assertTrue(fst.complete(w1));
2028 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
2029 >        assertTrue(snd.complete(w2));
2030 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2031 >
2032 >        checkCompletedWithWrappedException(h1, r1.ex);
2033 >        checkCompletedWithWrappedException(h2, r2.ex);
2034 >        checkCompletedWithWrappedException(h3, r3.ex);
2035 >        r1.assertInvoked();
2036 >        r2.assertInvoked();
2037 >        r3.assertInvoked();
2038 >        checkCompletedNormally(f, v1);
2039 >        checkCompletedNormally(g, v2);
2040 >    }}
2041  
2042      /**
2043       * runAfterBoth result completes normally after normal
2044       * completion of sources
2045       */
2046 <    public void testRunAfterBoth() {
2047 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2048 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2049 <        Noop r = new Noop();
2050 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
2051 <        f.complete(one);
2052 <        checkIncomplete(g);
2053 <        f2.complete(two);
2054 <        checkCompletedNormally(g, null);
2055 <        assertTrue(r.ran);
2056 <
2057 <        r = new Noop();
2058 <        f = new CompletableFuture<Integer>();
2059 <        f.complete(one);
2060 <        f2 = new CompletableFuture<Integer>();
2061 <        g = f.runAfterBoth(f2, r);
2062 <        checkIncomplete(g);
2063 <        f2.complete(two);
2064 <        checkCompletedNormally(g, null);
2065 <        assertTrue(r.ran);
2066 <    }
2046 >    public void testRunAfterBoth_normalCompletion() {
2047 >        for (ExecutionMode m : ExecutionMode.values())
2048 >        for (boolean fFirst : new boolean[] { true, false })
2049 >        for (Integer v1 : new Integer[] { 1, null })
2050 >        for (Integer v2 : new Integer[] { 2, null })
2051 >    {
2052 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2053 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2054 >        final Noop r1 = new Noop(m);
2055 >        final Noop r2 = new Noop(m);
2056 >        final Noop r3 = new Noop(m);
2057 >
2058 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2059 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2060 >        final Integer w1 =  fFirst ? v1 : v2;
2061 >        final Integer w2 = !fFirst ? v1 : v2;
2062 >
2063 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2064 >        assertTrue(fst.complete(w1));
2065 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2066 >        checkIncomplete(h1);
2067 >        checkIncomplete(h2);
2068 >        r1.assertNotInvoked();
2069 >        r2.assertNotInvoked();
2070 >        assertTrue(snd.complete(w2));
2071 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2072 >
2073 >        checkCompletedNormally(h1, null);
2074 >        checkCompletedNormally(h2, null);
2075 >        checkCompletedNormally(h3, null);
2076 >        r1.assertInvoked();
2077 >        r2.assertInvoked();
2078 >        r3.assertInvoked();
2079 >        checkCompletedNormally(f, v1);
2080 >        checkCompletedNormally(g, v2);
2081 >    }}
2082  
2083      /**
2084       * runAfterBoth result completes exceptionally after exceptional
2085       * completion of either source
2086       */
2087 <    public void testRunAfterBoth2() {
2088 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2089 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2090 <        Noop r = new Noop();
2091 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
2092 <        f.completeExceptionally(new CFException());
2093 <        f2.complete(two);
2094 <        checkCompletedWithWrappedCFException(g);
2095 <
2096 <        r = new Noop();
2097 <        f = new CompletableFuture<Integer>();
2098 <        f.complete(one);
2099 <        f2 = new CompletableFuture<Integer>();
2100 <        g = f.runAfterBoth(f2, r);
2101 <        f2.completeExceptionally(new CFException());
2102 <        checkCompletedWithWrappedCFException(g);
2103 <    }
2087 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2088 >        for (ExecutionMode m : ExecutionMode.values())
2089 >        for (boolean fFirst : new boolean[] { true, false })
2090 >        for (boolean failFirst : new boolean[] { true, false })
2091 >        for (Integer v1 : new Integer[] { 1, null })
2092 >    {
2093 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2094 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2095 >        final CFException ex = new CFException();
2096 >        final Noop r1 = new Noop(m);
2097 >        final Noop r2 = new Noop(m);
2098 >        final Noop r3 = new Noop(m);
2099 >
2100 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2101 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2102 >        final Callable<Boolean> complete1 = failFirst ?
2103 >            () -> fst.completeExceptionally(ex) :
2104 >            () -> fst.complete(v1);
2105 >        final Callable<Boolean> complete2 = failFirst ?
2106 >            () -> snd.complete(v1) :
2107 >            () -> snd.completeExceptionally(ex);
2108 >
2109 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2110 >        assertTrue(complete1.call());
2111 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2112 >        checkIncomplete(h1);
2113 >        checkIncomplete(h2);
2114 >        assertTrue(complete2.call());
2115 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2116 >
2117 >        checkCompletedWithWrappedException(h1, ex);
2118 >        checkCompletedWithWrappedException(h2, ex);
2119 >        checkCompletedWithWrappedException(h3, ex);
2120 >        r1.assertNotInvoked();
2121 >        r2.assertNotInvoked();
2122 >        r3.assertNotInvoked();
2123 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2124 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2125 >    }}
2126  
2127      /**
2128 <     * runAfterBoth result completes exceptionally if action does
2128 >     * runAfterBoth result completes exceptionally if either source cancelled
2129       */
2130 <    public void testRunAfterBoth3() {
2131 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2132 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2133 <        FailingNoop r = new FailingNoop();
2134 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
2135 <        f.complete(one);
2136 <        checkIncomplete(g);
2137 <        f2.complete(two);
2138 <        checkCompletedWithWrappedCFException(g);
2139 <    }
2130 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2131 >        for (ExecutionMode m : ExecutionMode.values())
2132 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2133 >        for (boolean fFirst : new boolean[] { true, false })
2134 >        for (boolean failFirst : new boolean[] { true, false })
2135 >        for (Integer v1 : new Integer[] { 1, null })
2136 >    {
2137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2138 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2139 >        final Noop r1 = new Noop(m);
2140 >        final Noop r2 = new Noop(m);
2141 >        final Noop r3 = new Noop(m);
2142 >
2143 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2144 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2145 >        final Callable<Boolean> complete1 = failFirst ?
2146 >            () -> fst.cancel(mayInterruptIfRunning) :
2147 >            () -> fst.complete(v1);
2148 >        final Callable<Boolean> complete2 = failFirst ?
2149 >            () -> snd.complete(v1) :
2150 >            () -> snd.cancel(mayInterruptIfRunning);
2151 >
2152 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2153 >        assertTrue(complete1.call());
2154 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2155 >        checkIncomplete(h1);
2156 >        checkIncomplete(h2);
2157 >        assertTrue(complete2.call());
2158 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2159 >
2160 >        checkCompletedWithWrappedCancellationException(h1);
2161 >        checkCompletedWithWrappedCancellationException(h2);
2162 >        checkCompletedWithWrappedCancellationException(h3);
2163 >        r1.assertNotInvoked();
2164 >        r2.assertNotInvoked();
2165 >        r3.assertNotInvoked();
2166 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2167 >        checkCancelled(failFirst ? fst : snd);
2168 >    }}
2169  
2170      /**
2171 <     * runAfterBoth result completes exceptionally if either source cancelled
2171 >     * runAfterBoth result completes exceptionally if action does
2172       */
2173 <    public void testRunAfterBoth4() {
2174 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2175 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2176 <        Noop r = new Noop();
2177 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
2178 <        assertTrue(f.cancel(true));
2179 <        f2.complete(two);
2180 <        checkCompletedWithWrappedCancellationException(g);
2181 <        f = new CompletableFuture<Integer>();
2182 <        f2 = new CompletableFuture<Integer>();
2183 <        r = new Noop();
2184 <        g = f.runAfterBoth(f2, r);
2185 <        f.complete(one);
2186 <        assertTrue(f2.cancel(true));
2187 <        checkCompletedWithWrappedCancellationException(g);
2188 <    }
2173 >    public void testRunAfterBoth_actionFailed() {
2174 >        for (ExecutionMode m : ExecutionMode.values())
2175 >        for (boolean fFirst : new boolean[] { true, false })
2176 >        for (Integer v1 : new Integer[] { 1, null })
2177 >        for (Integer v2 : new Integer[] { 2, null })
2178 >    {
2179 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2180 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2181 >        final FailingRunnable r1 = new FailingRunnable(m);
2182 >        final FailingRunnable r2 = new FailingRunnable(m);
2183 >        final FailingRunnable r3 = new FailingRunnable(m);
2184 >
2185 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2186 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2187 >        final Integer w1 =  fFirst ? v1 : v2;
2188 >        final Integer w2 = !fFirst ? v1 : v2;
2189 >
2190 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2191 >        assertTrue(fst.complete(w1));
2192 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2193 >        assertTrue(snd.complete(w2));
2194 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2195 >
2196 >        checkCompletedWithWrappedException(h1, r1.ex);
2197 >        checkCompletedWithWrappedException(h2, r2.ex);
2198 >        checkCompletedWithWrappedException(h3, r3.ex);
2199 >        r1.assertInvoked();
2200 >        r2.assertInvoked();
2201 >        r3.assertInvoked();
2202 >        checkCompletedNormally(f, v1);
2203 >        checkCompletedNormally(g, v2);
2204 >    }}
2205  
2206      /**
2207       * applyToEither result completes normally after normal completion
2208       * of either source
2209       */
2210 <    public void testApplyToEither() {
2211 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2212 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2213 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2214 <        f.complete(one);
2215 <        checkCompletedNormally(g, two);
2216 <        f2.complete(one);
2217 <        checkCompletedNormally(g, two);
2218 <
2219 <        f = new CompletableFuture<Integer>();
2220 <        f.complete(one);
2221 <        f2 = new CompletableFuture<Integer>();
2222 <        g = f.applyToEither(f2, inc);
2223 <        checkCompletedNormally(g, two);
2224 <    }
2210 >    public void testApplyToEither_normalCompletion() {
2211 >        for (ExecutionMode m : ExecutionMode.values())
2212 >        for (Integer v1 : new Integer[] { 1, null })
2213 >        for (Integer v2 : new Integer[] { 2, null })
2214 >    {
2215 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2216 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2217 >        final IncFunction[] rs = new IncFunction[6];
2218 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2219 >
2220 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2221 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2222 >        checkIncomplete(h0);
2223 >        checkIncomplete(h1);
2224 >        rs[0].assertNotInvoked();
2225 >        rs[1].assertNotInvoked();
2226 >        f.complete(v1);
2227 >        checkCompletedNormally(h0, inc(v1));
2228 >        checkCompletedNormally(h1, inc(v1));
2229 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2230 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2231 >        checkCompletedNormally(h2, inc(v1));
2232 >        checkCompletedNormally(h3, inc(v1));
2233 >        g.complete(v2);
2234 >
2235 >        // unspecified behavior - both source completions available
2236 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2237 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2238 >        rs[4].assertValue(h4.join());
2239 >        rs[5].assertValue(h5.join());
2240 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2241 >                   Objects.equals(inc(v2), h4.join()));
2242 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2243 >                   Objects.equals(inc(v2), h5.join()));
2244 >
2245 >        checkCompletedNormally(f, v1);
2246 >        checkCompletedNormally(g, v2);
2247 >        checkCompletedNormally(h0, inc(v1));
2248 >        checkCompletedNormally(h1, inc(v1));
2249 >        checkCompletedNormally(h2, inc(v1));
2250 >        checkCompletedNormally(h3, inc(v1));
2251 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2252 >    }}
2253  
2254      /**
2255       * applyToEither result completes exceptionally after exceptional
2256       * completion of either source
2257       */
2258 <    public void testApplyToEither2() {
2259 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2260 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2261 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2262 <        f.completeExceptionally(new CFException());
2263 <        f2.complete(one);
2264 <        checkCompletedWithWrappedCFException(g);
2258 >    public void testApplyToEither_exceptionalCompletion() {
2259 >        for (ExecutionMode m : ExecutionMode.values())
2260 >        for (Integer v1 : new Integer[] { 1, null })
2261 >    {
2262 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2263 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2264 >        final CFException ex = new CFException();
2265 >        final IncFunction[] rs = new IncFunction[6];
2266 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2267 >
2268 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2269 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2270 >        checkIncomplete(h0);
2271 >        checkIncomplete(h1);
2272 >        rs[0].assertNotInvoked();
2273 >        rs[1].assertNotInvoked();
2274 >        f.completeExceptionally(ex);
2275 >        checkCompletedWithWrappedException(h0, ex);
2276 >        checkCompletedWithWrappedException(h1, ex);
2277 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2278 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2279 >        checkCompletedWithWrappedException(h2, ex);
2280 >        checkCompletedWithWrappedException(h3, ex);
2281 >        g.complete(v1);
2282 >
2283 >        // unspecified behavior - both source completions available
2284 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2285 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2286 >        try {
2287 >            assertEquals(inc(v1), h4.join());
2288 >            rs[4].assertValue(inc(v1));
2289 >        } catch (CompletionException ok) {
2290 >            checkCompletedWithWrappedException(h4, ex);
2291 >            rs[4].assertNotInvoked();
2292 >        }
2293 >        try {
2294 >            assertEquals(inc(v1), h5.join());
2295 >            rs[5].assertValue(inc(v1));
2296 >        } catch (CompletionException ok) {
2297 >            checkCompletedWithWrappedException(h5, ex);
2298 >            rs[5].assertNotInvoked();
2299 >        }
2300  
2301 <        f = new CompletableFuture<Integer>();
2302 <        f2 = new CompletableFuture<Integer>();
2303 <        f2.completeExceptionally(new CFException());
2304 <        g = f.applyToEither(f2, inc);
2305 <        checkCompletedWithWrappedCFException(g);
2306 <    }
2301 >        checkCompletedExceptionally(f, ex);
2302 >        checkCompletedNormally(g, v1);
2303 >        checkCompletedWithWrappedException(h0, ex);
2304 >        checkCompletedWithWrappedException(h1, ex);
2305 >        checkCompletedWithWrappedException(h2, ex);
2306 >        checkCompletedWithWrappedException(h3, ex);
2307 >        checkCompletedWithWrappedException(h4, ex);
2308 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2309 >    }}
2310 >
2311 >    public void testApplyToEither_exceptionalCompletion2() {
2312 >        for (ExecutionMode m : ExecutionMode.values())
2313 >        for (boolean fFirst : new boolean[] { true, false })
2314 >        for (Integer v1 : new Integer[] { 1, null })
2315 >    {
2316 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2317 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 >        final CFException ex = new CFException();
2319 >        final IncFunction[] rs = new IncFunction[6];
2320 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2321 >
2322 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2323 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2324 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2325 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2326 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2327 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2328  
2329 <    /**
2330 <     * applyToEither result completes exceptionally if action does
2331 <     */
2332 <    public void testApplyToEither3() {
2333 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2334 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2335 <        FailingFunction r = new FailingFunction();
2336 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2337 <        f2.complete(two);
2338 <        checkCompletedWithWrappedCFException(g);
2339 <    }
2329 >        // unspecified behavior - both source completions available
2330 >        try {
2331 >            assertEquals(inc(v1), h0.join());
2332 >            rs[0].assertValue(inc(v1));
2333 >        } catch (CompletionException ok) {
2334 >            checkCompletedWithWrappedException(h0, ex);
2335 >            rs[0].assertNotInvoked();
2336 >        }
2337 >        try {
2338 >            assertEquals(inc(v1), h1.join());
2339 >            rs[1].assertValue(inc(v1));
2340 >        } catch (CompletionException ok) {
2341 >            checkCompletedWithWrappedException(h1, ex);
2342 >            rs[1].assertNotInvoked();
2343 >        }
2344 >        try {
2345 >            assertEquals(inc(v1), h2.join());
2346 >            rs[2].assertValue(inc(v1));
2347 >        } catch (CompletionException ok) {
2348 >            checkCompletedWithWrappedException(h2, ex);
2349 >            rs[2].assertNotInvoked();
2350 >        }
2351 >        try {
2352 >            assertEquals(inc(v1), h3.join());
2353 >            rs[3].assertValue(inc(v1));
2354 >        } catch (CompletionException ok) {
2355 >            checkCompletedWithWrappedException(h3, ex);
2356 >            rs[3].assertNotInvoked();
2357 >        }
2358  
2359 <    /**
2360 <     * applyToEither result completes exceptionally if either source cancelled
2361 <     */
892 <    public void testApplyToEither4() {
893 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
894 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
895 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
896 <        assertTrue(f.cancel(true));
897 <        checkCompletedWithWrappedCancellationException(g);
898 <        f = new CompletableFuture<Integer>();
899 <        f2 = new CompletableFuture<Integer>();
900 <        assertTrue(f2.cancel(true));
901 <        checkCompletedWithWrappedCancellationException(g);
902 <    }
2359 >        checkCompletedNormally(f, v1);
2360 >        checkCompletedExceptionally(g, ex);
2361 >    }}
2362  
2363      /**
2364 <     * acceptEither result completes normally after normal completion
906 <     * of either source
2364 >     * applyToEither result completes exceptionally if either source cancelled
2365       */
2366 <    public void testAcceptEither() {
2367 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2368 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2369 <        IncAction r = new IncAction();
2370 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2371 <        f.complete(one);
2372 <        checkCompletedNormally(g, null);
2373 <        f2.complete(one);
2374 <        checkCompletedNormally(g, null);
2375 <        assertEquals(r.value, 2);
2376 <
2377 <        r = new IncAction();
2378 <        f = new CompletableFuture<Integer>();
2379 <        f.complete(one);
2380 <        f2 = new CompletableFuture<Integer>();
2381 <        g = f.acceptEither(f2, r);
2382 <        checkCompletedNormally(g, null);
2383 <        assertEquals(r.value, 2);
2384 <    }
2366 >    public void testApplyToEither_sourceCancelled() {
2367 >        for (ExecutionMode m : ExecutionMode.values())
2368 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2369 >        for (Integer v1 : new Integer[] { 1, null })
2370 >    {
2371 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2372 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2373 >        final IncFunction[] rs = new IncFunction[6];
2374 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2375 >
2376 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2377 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2378 >        checkIncomplete(h0);
2379 >        checkIncomplete(h1);
2380 >        rs[0].assertNotInvoked();
2381 >        rs[1].assertNotInvoked();
2382 >        f.cancel(mayInterruptIfRunning);
2383 >        checkCompletedWithWrappedCancellationException(h0);
2384 >        checkCompletedWithWrappedCancellationException(h1);
2385 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2386 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2387 >        checkCompletedWithWrappedCancellationException(h2);
2388 >        checkCompletedWithWrappedCancellationException(h3);
2389 >        g.complete(v1);
2390 >
2391 >        // unspecified behavior - both source completions available
2392 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2393 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2394 >        try {
2395 >            assertEquals(inc(v1), h4.join());
2396 >            rs[4].assertValue(inc(v1));
2397 >        } catch (CompletionException ok) {
2398 >            checkCompletedWithWrappedCancellationException(h4);
2399 >            rs[4].assertNotInvoked();
2400 >        }
2401 >        try {
2402 >            assertEquals(inc(v1), h5.join());
2403 >            rs[5].assertValue(inc(v1));
2404 >        } catch (CompletionException ok) {
2405 >            checkCompletedWithWrappedCancellationException(h5);
2406 >            rs[5].assertNotInvoked();
2407 >        }
2408  
2409 <    /**
2410 <     * acceptEither result completes exceptionally after exceptional
2411 <     * completion of either source
2412 <     */
2413 <    public void testAcceptEither2() {
2414 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2415 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2416 <        IncAction r = new IncAction();
2417 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2418 <        f.completeExceptionally(new CFException());
2419 <        f2.complete(one);
2420 <        checkCompletedWithWrappedCFException(g);
2409 >        checkCancelled(f);
2410 >        checkCompletedNormally(g, v1);
2411 >        checkCompletedWithWrappedCancellationException(h0);
2412 >        checkCompletedWithWrappedCancellationException(h1);
2413 >        checkCompletedWithWrappedCancellationException(h2);
2414 >        checkCompletedWithWrappedCancellationException(h3);
2415 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2416 >    }}
2417 >
2418 >    public void testApplyToEither_sourceCancelled2() {
2419 >        for (ExecutionMode m : ExecutionMode.values())
2420 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2421 >        for (boolean fFirst : new boolean[] { true, false })
2422 >        for (Integer v1 : new Integer[] { 1, null })
2423 >    {
2424 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2425 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2426 >        final IncFunction[] rs = new IncFunction[6];
2427 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2428 >
2429 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2430 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2431 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2432 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2433 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2434 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2435  
2436 <        r = new IncAction();
2437 <        f = new CompletableFuture<Integer>();
2438 <        f2 = new CompletableFuture<Integer>();
2439 <        f2.completeExceptionally(new CFException());
2440 <        g = f.acceptEither(f2, r);
2441 <        checkCompletedWithWrappedCFException(g);
2442 <    }
2436 >        // unspecified behavior - both source completions available
2437 >        try {
2438 >            assertEquals(inc(v1), h0.join());
2439 >            rs[0].assertValue(inc(v1));
2440 >        } catch (CompletionException ok) {
2441 >            checkCompletedWithWrappedCancellationException(h0);
2442 >            rs[0].assertNotInvoked();
2443 >        }
2444 >        try {
2445 >            assertEquals(inc(v1), h1.join());
2446 >            rs[1].assertValue(inc(v1));
2447 >        } catch (CompletionException ok) {
2448 >            checkCompletedWithWrappedCancellationException(h1);
2449 >            rs[1].assertNotInvoked();
2450 >        }
2451 >        try {
2452 >            assertEquals(inc(v1), h2.join());
2453 >            rs[2].assertValue(inc(v1));
2454 >        } catch (CompletionException ok) {
2455 >            checkCompletedWithWrappedCancellationException(h2);
2456 >            rs[2].assertNotInvoked();
2457 >        }
2458 >        try {
2459 >            assertEquals(inc(v1), h3.join());
2460 >            rs[3].assertValue(inc(v1));
2461 >        } catch (CompletionException ok) {
2462 >            checkCompletedWithWrappedCancellationException(h3);
2463 >            rs[3].assertNotInvoked();
2464 >        }
2465  
2466 <    /**
2467 <     * acceptEither result completes exceptionally if action does
2468 <     */
952 <    public void testAcceptEither3() {
953 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
954 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
955 <        FailingConsumer r = new FailingConsumer();
956 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
957 <        f2.complete(two);
958 <        checkCompletedWithWrappedCFException(g);
959 <    }
2466 >        checkCompletedNormally(f, v1);
2467 >        checkCancelled(g);
2468 >    }}
2469  
2470      /**
2471 <     * acceptEither result completes exceptionally if either source cancelled
2471 >     * applyToEither result completes exceptionally if action does
2472       */
2473 <    public void testAcceptEither4() {
2474 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2475 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2476 <        IncAction r = new IncAction();
2477 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2478 <        assertTrue(f.cancel(true));
2479 <        checkCompletedWithWrappedCancellationException(g);
2480 <        f = new CompletableFuture<Integer>();
2481 <        f2 = new CompletableFuture<Integer>();
2482 <        assertTrue(f2.cancel(true));
2483 <        checkCompletedWithWrappedCancellationException(g);
2484 <    }
2485 <
2473 >    public void testApplyToEither_actionFailed() {
2474 >        for (ExecutionMode m : ExecutionMode.values())
2475 >        for (Integer v1 : new Integer[] { 1, null })
2476 >        for (Integer v2 : new Integer[] { 2, null })
2477 >    {
2478 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2479 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2480 >        final FailingFunction[] rs = new FailingFunction[6];
2481 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2482 >
2483 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2484 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2485 >        f.complete(v1);
2486 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2487 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2488 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2489 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2490 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2491 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2492 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2493 >
2494 >        g.complete(v2);
2495 >
2496 >        // unspecified behavior - both source completions available
2497 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2498 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2499 >
2500 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2501 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2502 >                   Objects.equals(v2, rs[4].value));
2503 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2504 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2505 >                   Objects.equals(v2, rs[5].value));
2506 >
2507 >        checkCompletedNormally(f, v1);
2508 >        checkCompletedNormally(g, v2);
2509 >    }}
2510  
2511      /**
2512 <     * runAfterEither result completes normally after normal completion
2512 >     * acceptEither result completes normally after normal completion
2513       * of either source
2514       */
2515 <    public void testRunAfterEither() {
2516 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2517 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2518 <        Noop r = new Noop();
2519 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2520 <        f.complete(one);
2521 <        checkCompletedNormally(g, null);
2522 <        f2.complete(one);
2523 <        checkCompletedNormally(g, null);
2524 <        assertTrue(r.ran);
2525 <
2526 <        r = new Noop();
2527 <        f = new CompletableFuture<Integer>();
2528 <        f.complete(one);
2529 <        f2 = new CompletableFuture<Integer>();
2530 <        g = f.runAfterEither(f2, r);
2531 <        checkCompletedNormally(g, null);
2532 <        assertTrue(r.ran);
2533 <    }
2515 >    public void testAcceptEither_normalCompletion() {
2516 >        for (ExecutionMode m : ExecutionMode.values())
2517 >        for (Integer v1 : new Integer[] { 1, null })
2518 >        for (Integer v2 : new Integer[] { 2, null })
2519 >    {
2520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522 >        final NoopConsumer[] rs = new NoopConsumer[6];
2523 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2524 >
2525 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2526 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2527 >        checkIncomplete(h0);
2528 >        checkIncomplete(h1);
2529 >        rs[0].assertNotInvoked();
2530 >        rs[1].assertNotInvoked();
2531 >        f.complete(v1);
2532 >        checkCompletedNormally(h0, null);
2533 >        checkCompletedNormally(h1, null);
2534 >        rs[0].assertValue(v1);
2535 >        rs[1].assertValue(v1);
2536 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2537 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2538 >        checkCompletedNormally(h2, null);
2539 >        checkCompletedNormally(h3, null);
2540 >        rs[2].assertValue(v1);
2541 >        rs[3].assertValue(v1);
2542 >        g.complete(v2);
2543 >
2544 >        // unspecified behavior - both source completions available
2545 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2546 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2547 >        checkCompletedNormally(h4, null);
2548 >        checkCompletedNormally(h5, null);
2549 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2550 >                   Objects.equals(v2, rs[4].value));
2551 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2552 >                   Objects.equals(v2, rs[5].value));
2553 >
2554 >        checkCompletedNormally(f, v1);
2555 >        checkCompletedNormally(g, v2);
2556 >        checkCompletedNormally(h0, null);
2557 >        checkCompletedNormally(h1, null);
2558 >        checkCompletedNormally(h2, null);
2559 >        checkCompletedNormally(h3, null);
2560 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2561 >    }}
2562  
2563      /**
2564 <     * runAfterEither result completes exceptionally after exceptional
2564 >     * acceptEither result completes exceptionally after exceptional
2565       * completion of either source
2566       */
2567 <    public void testRunAfterEither2() {
2568 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2569 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2570 <        Noop r = new Noop();
2571 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2572 <        f.completeExceptionally(new CFException());
2573 <        f2.complete(one);
2574 <        checkCompletedWithWrappedCFException(g);
2567 >    public void testAcceptEither_exceptionalCompletion() {
2568 >        for (ExecutionMode m : ExecutionMode.values())
2569 >        for (Integer v1 : new Integer[] { 1, null })
2570 >    {
2571 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2572 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2573 >        final CFException ex = new CFException();
2574 >        final NoopConsumer[] rs = new NoopConsumer[6];
2575 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2576 >
2577 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2578 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2579 >        checkIncomplete(h0);
2580 >        checkIncomplete(h1);
2581 >        rs[0].assertNotInvoked();
2582 >        rs[1].assertNotInvoked();
2583 >        f.completeExceptionally(ex);
2584 >        checkCompletedWithWrappedException(h0, ex);
2585 >        checkCompletedWithWrappedException(h1, ex);
2586 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2587 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2588 >        checkCompletedWithWrappedException(h2, ex);
2589 >        checkCompletedWithWrappedException(h3, ex);
2590 >
2591 >        g.complete(v1);
2592 >
2593 >        // unspecified behavior - both source completions available
2594 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2595 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2596 >        try {
2597 >            assertNull(h4.join());
2598 >            rs[4].assertValue(v1);
2599 >        } catch (CompletionException ok) {
2600 >            checkCompletedWithWrappedException(h4, ex);
2601 >            rs[4].assertNotInvoked();
2602 >        }
2603 >        try {
2604 >            assertNull(h5.join());
2605 >            rs[5].assertValue(v1);
2606 >        } catch (CompletionException ok) {
2607 >            checkCompletedWithWrappedException(h5, ex);
2608 >            rs[5].assertNotInvoked();
2609 >        }
2610  
2611 <        r = new Noop();
2612 <        f = new CompletableFuture<Integer>();
2613 <        f2 = new CompletableFuture<Integer>();
2614 <        f2.completeExceptionally(new CFException());
2615 <        g = f.runAfterEither(f2, r);
2616 <        checkCompletedWithWrappedCFException(g);
2617 <    }
2611 >        checkCompletedExceptionally(f, ex);
2612 >        checkCompletedNormally(g, v1);
2613 >        checkCompletedWithWrappedException(h0, ex);
2614 >        checkCompletedWithWrappedException(h1, ex);
2615 >        checkCompletedWithWrappedException(h2, ex);
2616 >        checkCompletedWithWrappedException(h3, ex);
2617 >        checkCompletedWithWrappedException(h4, ex);
2618 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2619 >    }}
2620 >
2621 >    public void testAcceptEither_exceptionalCompletion2() {
2622 >        for (ExecutionMode m : ExecutionMode.values())
2623 >        for (boolean fFirst : new boolean[] { true, false })
2624 >        for (Integer v1 : new Integer[] { 1, null })
2625 >    {
2626 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2627 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2628 >        final CFException ex = new CFException();
2629 >        final NoopConsumer[] rs = new NoopConsumer[6];
2630 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2631 >
2632 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2633 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2634 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2635 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2636 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2637 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2638  
2639 <    /**
2640 <     * runAfterEither result completes exceptionally if action does
2641 <     */
2642 <    public void testRunAfterEither3() {
2643 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2644 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2645 <        FailingNoop r = new FailingNoop();
2646 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2647 <        f2.complete(two);
2648 <        checkCompletedWithWrappedCFException(g);
2649 <    }
2639 >        // unspecified behavior - both source completions available
2640 >        try {
2641 >            assertNull(h0.join());
2642 >            rs[0].assertValue(v1);
2643 >        } catch (CompletionException ok) {
2644 >            checkCompletedWithWrappedException(h0, ex);
2645 >            rs[0].assertNotInvoked();
2646 >        }
2647 >        try {
2648 >            assertNull(h1.join());
2649 >            rs[1].assertValue(v1);
2650 >        } catch (CompletionException ok) {
2651 >            checkCompletedWithWrappedException(h1, ex);
2652 >            rs[1].assertNotInvoked();
2653 >        }
2654 >        try {
2655 >            assertNull(h2.join());
2656 >            rs[2].assertValue(v1);
2657 >        } catch (CompletionException ok) {
2658 >            checkCompletedWithWrappedException(h2, ex);
2659 >            rs[2].assertNotInvoked();
2660 >        }
2661 >        try {
2662 >            assertNull(h3.join());
2663 >            rs[3].assertValue(v1);
2664 >        } catch (CompletionException ok) {
2665 >            checkCompletedWithWrappedException(h3, ex);
2666 >            rs[3].assertNotInvoked();
2667 >        }
2668  
2669 <    /**
2670 <     * runAfterEither result completes exceptionally if either source cancelled
2671 <     */
1038 <    public void testRunAfterEither4() {
1039 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1040 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1041 <        Noop r = new Noop();
1042 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1043 <        assertTrue(f.cancel(true));
1044 <        checkCompletedWithWrappedCancellationException(g);
1045 <        f = new CompletableFuture<Integer>();
1046 <        f2 = new CompletableFuture<Integer>();
1047 <        assertTrue(f2.cancel(true));
1048 <        checkCompletedWithWrappedCancellationException(g);
1049 <    }
2669 >        checkCompletedNormally(f, v1);
2670 >        checkCompletedExceptionally(g, ex);
2671 >    }}
2672  
2673      /**
2674 <     * thenCompose result completes normally after normal completion of source
2674 >     * acceptEither result completes exceptionally if either source cancelled
2675       */
2676 <    public void testThenCompose() {
2677 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2678 <        CompletableFutureInc r = new CompletableFutureInc();
2679 <        CompletableFuture<Integer> g = f.thenCompose(r);
2680 <        f.complete(one);
2681 <        checkCompletedNormally(g, two);
2682 <    }
2676 >    public void testAcceptEither_sourceCancelled() {
2677 >        for (ExecutionMode m : ExecutionMode.values())
2678 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2679 >        for (Integer v1 : new Integer[] { 1, null })
2680 >    {
2681 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2682 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2683 >        final NoopConsumer[] rs = new NoopConsumer[6];
2684 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2685 >
2686 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2687 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2688 >        checkIncomplete(h0);
2689 >        checkIncomplete(h1);
2690 >        rs[0].assertNotInvoked();
2691 >        rs[1].assertNotInvoked();
2692 >        f.cancel(mayInterruptIfRunning);
2693 >        checkCompletedWithWrappedCancellationException(h0);
2694 >        checkCompletedWithWrappedCancellationException(h1);
2695 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2696 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2697 >        checkCompletedWithWrappedCancellationException(h2);
2698 >        checkCompletedWithWrappedCancellationException(h3);
2699 >
2700 >        g.complete(v1);
2701 >
2702 >        // unspecified behavior - both source completions available
2703 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2704 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2705 >        try {
2706 >            assertNull(h4.join());
2707 >            rs[4].assertValue(v1);
2708 >        } catch (CompletionException ok) {
2709 >            checkCompletedWithWrappedCancellationException(h4);
2710 >            rs[4].assertNotInvoked();
2711 >        }
2712 >        try {
2713 >            assertNull(h5.join());
2714 >            rs[5].assertValue(v1);
2715 >        } catch (CompletionException ok) {
2716 >            checkCompletedWithWrappedCancellationException(h5);
2717 >            rs[5].assertNotInvoked();
2718 >        }
2719  
2720 <    /**
2721 <     * thenCompose result completes exceptionally after exceptional
2722 <     * completion of source
2723 <     */
2724 <    public void testThenCompose2() {
2725 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2726 <        CompletableFutureInc r = new CompletableFutureInc();
2727 <        CompletableFuture<Integer> g = f.thenCompose(r);
1070 <        f.completeExceptionally(new CFException());
1071 <        checkCompletedWithWrappedCFException(g);
1072 <    }
2720 >        checkCancelled(f);
2721 >        checkCompletedNormally(g, v1);
2722 >        checkCompletedWithWrappedCancellationException(h0);
2723 >        checkCompletedWithWrappedCancellationException(h1);
2724 >        checkCompletedWithWrappedCancellationException(h2);
2725 >        checkCompletedWithWrappedCancellationException(h3);
2726 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2727 >    }}
2728  
2729      /**
2730 <     * thenCompose result completes exceptionally if action does
2730 >     * acceptEither result completes exceptionally if action does
2731       */
2732 <    public void testThenCompose3() {
2733 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2734 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2735 <        CompletableFuture<Integer> g = f.thenCompose(r);
2736 <        f.complete(one);
2737 <        checkCompletedWithWrappedCFException(g);
2738 <    }
2732 >    public void testAcceptEither_actionFailed() {
2733 >        for (ExecutionMode m : ExecutionMode.values())
2734 >        for (Integer v1 : new Integer[] { 1, null })
2735 >        for (Integer v2 : new Integer[] { 2, null })
2736 >    {
2737 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2738 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2739 >        final FailingConsumer[] rs = new FailingConsumer[6];
2740 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2741 >
2742 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2743 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2744 >        f.complete(v1);
2745 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2746 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2747 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2748 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2749 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2750 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2751 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2752 >
2753 >        g.complete(v2);
2754 >
2755 >        // unspecified behavior - both source completions available
2756 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2757 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2758 >
2759 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2760 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2761 >                   Objects.equals(v2, rs[4].value));
2762 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2763 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2764 >                   Objects.equals(v2, rs[5].value));
2765 >
2766 >        checkCompletedNormally(f, v1);
2767 >        checkCompletedNormally(g, v2);
2768 >    }}
2769  
2770      /**
2771 <     * thenCompose result completes exceptionally if source cancelled
2771 >     * runAfterEither result completes normally after normal completion
2772 >     * of either source
2773       */
2774 <    public void testThenCompose4() {
2775 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2776 <        CompletableFutureInc r = new CompletableFutureInc();
2777 <        CompletableFuture<Integer> g = f.thenCompose(r);
2778 <        assertTrue(f.cancel(true));
2779 <        checkCompletedWithWrappedCancellationException(g);
2780 <    }
2781 <
2782 <
2783 <    // asyncs
2774 >    public void testRunAfterEither_normalCompletion() {
2775 >        for (ExecutionMode m : ExecutionMode.values())
2776 >        for (Integer v1 : new Integer[] { 1, null })
2777 >        for (Integer v2 : new Integer[] { 2, null })
2778 >        for (boolean pushNop : new boolean[] { true, false })
2779 >    {
2780 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2781 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2782 >        final Noop[] rs = new Noop[6];
2783 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2784 >
2785 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2786 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2787 >        checkIncomplete(h0);
2788 >        checkIncomplete(h1);
2789 >        rs[0].assertNotInvoked();
2790 >        rs[1].assertNotInvoked();
2791 >        if (pushNop) {          // ad hoc test of intra-completion interference
2792 >            m.thenRun(f, () -> {});
2793 >            m.thenRun(g, () -> {});
2794 >        }
2795 >        f.complete(v1);
2796 >        checkCompletedNormally(h0, null);
2797 >        checkCompletedNormally(h1, null);
2798 >        rs[0].assertInvoked();
2799 >        rs[1].assertInvoked();
2800 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2801 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2802 >        checkCompletedNormally(h2, null);
2803 >        checkCompletedNormally(h3, null);
2804 >        rs[2].assertInvoked();
2805 >        rs[3].assertInvoked();
2806 >
2807 >        g.complete(v2);
2808 >
2809 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2810 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2811 >
2812 >        checkCompletedNormally(f, v1);
2813 >        checkCompletedNormally(g, v2);
2814 >        checkCompletedNormally(h0, null);
2815 >        checkCompletedNormally(h1, null);
2816 >        checkCompletedNormally(h2, null);
2817 >        checkCompletedNormally(h3, null);
2818 >        checkCompletedNormally(h4, null);
2819 >        checkCompletedNormally(h5, null);
2820 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2821 >    }}
2822  
2823      /**
2824 <     * thenRunAsync result completes normally after normal completion of source
2824 >     * runAfterEither result completes exceptionally after exceptional
2825 >     * completion of either source
2826       */
2827 <    public void testThenRunAsync() {
2828 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2829 <        Noop r = new Noop();
2830 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2831 <        f.complete(null);
2832 <        checkCompletedNormally(g, null);
2827 >    public void testRunAfterEither_exceptionalCompletion() {
2828 >        for (ExecutionMode m : ExecutionMode.values())
2829 >        for (Integer v1 : new Integer[] { 1, null })
2830 >    {
2831 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2832 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2833 >        final CFException ex = new CFException();
2834 >        final Noop[] rs = new Noop[6];
2835 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2836 >
2837 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2838 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2839 >        checkIncomplete(h0);
2840 >        checkIncomplete(h1);
2841 >        rs[0].assertNotInvoked();
2842 >        rs[1].assertNotInvoked();
2843 >        assertTrue(f.completeExceptionally(ex));
2844 >        checkCompletedWithWrappedException(h0, ex);
2845 >        checkCompletedWithWrappedException(h1, ex);
2846 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2847 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2848 >        checkCompletedWithWrappedException(h2, ex);
2849 >        checkCompletedWithWrappedException(h3, ex);
2850 >
2851 >        assertTrue(g.complete(v1));
2852 >
2853 >        // unspecified behavior - both source completions available
2854 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2855 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2856 >        try {
2857 >            assertNull(h4.join());
2858 >            rs[4].assertInvoked();
2859 >        } catch (CompletionException ok) {
2860 >            checkCompletedWithWrappedException(h4, ex);
2861 >            rs[4].assertNotInvoked();
2862 >        }
2863 >        try {
2864 >            assertNull(h5.join());
2865 >            rs[5].assertInvoked();
2866 >        } catch (CompletionException ok) {
2867 >            checkCompletedWithWrappedException(h5, ex);
2868 >            rs[5].assertNotInvoked();
2869 >        }
2870  
2871 <        // reordered version
2872 <        f = new CompletableFuture<Integer>();
2873 <        f.complete(null);
2874 <        r = new Noop();
2875 <        g = f.thenRunAsync(r);
2876 <        checkCompletedNormally(g, null);
2877 <    }
2871 >        checkCompletedExceptionally(f, ex);
2872 >        checkCompletedNormally(g, v1);
2873 >        checkCompletedWithWrappedException(h0, ex);
2874 >        checkCompletedWithWrappedException(h1, ex);
2875 >        checkCompletedWithWrappedException(h2, ex);
2876 >        checkCompletedWithWrappedException(h3, ex);
2877 >        checkCompletedWithWrappedException(h4, ex);
2878 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2879 >    }}
2880 >
2881 >    public void testRunAfterEither_exceptionalCompletion2() {
2882 >        for (ExecutionMode m : ExecutionMode.values())
2883 >        for (boolean fFirst : new boolean[] { true, false })
2884 >        for (Integer v1 : new Integer[] { 1, null })
2885 >    {
2886 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2887 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2888 >        final CFException ex = new CFException();
2889 >        final Noop[] rs = new Noop[6];
2890 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2891 >
2892 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2893 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2894 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2895 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2896 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2897 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2898  
2899 <    /**
1118 <     * thenRunAsync result completes exceptionally after exceptional
1119 <     * completion of source
1120 <     */
1121 <    public void testThenRunAsync2() {
1122 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1123 <        Noop r = new Noop();
1124 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1125 <        f.completeExceptionally(new CFException());
2899 >        // unspecified behavior - both source completions available
2900          try {
2901 <            g.join();
2902 <            shouldThrow();
2903 <        } catch (Exception ok) {
2901 >            assertNull(h0.join());
2902 >            rs[0].assertInvoked();
2903 >        } catch (CompletionException ok) {
2904 >            checkCompletedWithWrappedException(h0, ex);
2905 >            rs[0].assertNotInvoked();
2906 >        }
2907 >        try {
2908 >            assertNull(h1.join());
2909 >            rs[1].assertInvoked();
2910 >        } catch (CompletionException ok) {
2911 >            checkCompletedWithWrappedException(h1, ex);
2912 >            rs[1].assertNotInvoked();
2913 >        }
2914 >        try {
2915 >            assertNull(h2.join());
2916 >            rs[2].assertInvoked();
2917 >        } catch (CompletionException ok) {
2918 >            checkCompletedWithWrappedException(h2, ex);
2919 >            rs[2].assertNotInvoked();
2920 >        }
2921 >        try {
2922 >            assertNull(h3.join());
2923 >            rs[3].assertInvoked();
2924 >        } catch (CompletionException ok) {
2925 >            checkCompletedWithWrappedException(h3, ex);
2926 >            rs[3].assertNotInvoked();
2927          }
1131        checkCompletedWithWrappedCFException(g);
1132    }
1133
1134    /**
1135     * thenRunAsync result completes exceptionally if action does
1136     */
1137    public void testThenRunAsync3() {
1138        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1139        FailingNoop r = new FailingNoop();
1140        CompletableFuture<Void> g = f.thenRunAsync(r);
1141        f.complete(null);
1142        checkCompletedWithWrappedCFException(g);
1143    }
2928  
2929 <    /**
2930 <     * thenRunAsync result completes exceptionally if source cancelled
2931 <     */
1148 <    public void testThenRunAsync4() {
1149 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1150 <        Noop r = new Noop();
1151 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1152 <        assertTrue(f.cancel(true));
1153 <        checkCompletedWithWrappedCancellationException(g);
1154 <    }
2929 >        checkCompletedNormally(f, v1);
2930 >        checkCompletedExceptionally(g, ex);
2931 >    }}
2932  
2933      /**
2934 <     * thenApplyAsync result completes normally after normal completion of source
2934 >     * runAfterEither result completes exceptionally if either source cancelled
2935       */
2936 <    public void testThenApplyAsync() {
2937 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2938 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2939 <        f.complete(one);
2940 <        checkCompletedNormally(g, two);
2941 <    }
2936 >    public void testRunAfterEither_sourceCancelled() {
2937 >        for (ExecutionMode m : ExecutionMode.values())
2938 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2939 >        for (Integer v1 : new Integer[] { 1, null })
2940 >    {
2941 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2942 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2943 >        final Noop[] rs = new Noop[6];
2944 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2945 >
2946 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2947 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2948 >        checkIncomplete(h0);
2949 >        checkIncomplete(h1);
2950 >        rs[0].assertNotInvoked();
2951 >        rs[1].assertNotInvoked();
2952 >        f.cancel(mayInterruptIfRunning);
2953 >        checkCompletedWithWrappedCancellationException(h0);
2954 >        checkCompletedWithWrappedCancellationException(h1);
2955 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2956 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2957 >        checkCompletedWithWrappedCancellationException(h2);
2958 >        checkCompletedWithWrappedCancellationException(h3);
2959 >
2960 >        assertTrue(g.complete(v1));
2961 >
2962 >        // unspecified behavior - both source completions available
2963 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2964 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2965 >        try {
2966 >            assertNull(h4.join());
2967 >            rs[4].assertInvoked();
2968 >        } catch (CompletionException ok) {
2969 >            checkCompletedWithWrappedCancellationException(h4);
2970 >            rs[4].assertNotInvoked();
2971 >        }
2972 >        try {
2973 >            assertNull(h5.join());
2974 >            rs[5].assertInvoked();
2975 >        } catch (CompletionException ok) {
2976 >            checkCompletedWithWrappedCancellationException(h5);
2977 >            rs[5].assertNotInvoked();
2978 >        }
2979  
2980 <    /**
2981 <     * thenApplyAsync result completes exceptionally after exceptional
2982 <     * completion of source
2983 <     */
2984 <    public void testThenApplyAsync2() {
2985 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2986 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2987 <        f.completeExceptionally(new CFException());
1174 <        checkCompletedWithWrappedCFException(g);
1175 <    }
2980 >        checkCancelled(f);
2981 >        checkCompletedNormally(g, v1);
2982 >        checkCompletedWithWrappedCancellationException(h0);
2983 >        checkCompletedWithWrappedCancellationException(h1);
2984 >        checkCompletedWithWrappedCancellationException(h2);
2985 >        checkCompletedWithWrappedCancellationException(h3);
2986 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2987 >    }}
2988  
2989      /**
2990 <     * thenApplyAsync result completes exceptionally if action does
2990 >     * runAfterEither result completes exceptionally if action does
2991       */
2992 <    public void testThenApplyAsync3() {
2993 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2994 <        FailingFunction r = new FailingFunction();
2995 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2996 <        f.complete(null);
2997 <        checkCompletedWithWrappedCFException(g);
2998 <    }
2992 >    public void testRunAfterEither_actionFailed() {
2993 >        for (ExecutionMode m : ExecutionMode.values())
2994 >        for (Integer v1 : new Integer[] { 1, null })
2995 >        for (Integer v2 : new Integer[] { 2, null })
2996 >    {
2997 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2998 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2999 >        final FailingRunnable[] rs = new FailingRunnable[6];
3000 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
3001 >
3002 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3003 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3004 >        assertTrue(f.complete(v1));
3005 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
3006 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
3007 >        checkCompletedWithWrappedException(h0, rs[0].ex);
3008 >        checkCompletedWithWrappedException(h1, rs[1].ex);
3009 >        checkCompletedWithWrappedException(h2, rs[2].ex);
3010 >        checkCompletedWithWrappedException(h3, rs[3].ex);
3011 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
3012 >        assertTrue(g.complete(v2));
3013 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
3014 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
3015 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3016 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3017 >
3018 >        checkCompletedNormally(f, v1);
3019 >        checkCompletedNormally(g, v2);
3020 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
3021 >    }}
3022  
3023      /**
3024 <     * thenApplyAsync result completes exceptionally if source cancelled
3024 >     * thenCompose result completes normally after normal completion of source
3025       */
3026 <    public void testThenApplyAsync4() {
3027 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3028 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3029 <        assertTrue(f.cancel(true));
3030 <        checkCompletedWithWrappedCancellationException(g);
3031 <    }
3026 >    public void testThenCompose_normalCompletion() {
3027 >        for (ExecutionMode m : ExecutionMode.values())
3028 >        for (boolean createIncomplete : new boolean[] { true, false })
3029 >        for (Integer v1 : new Integer[] { 1, null })
3030 >    {
3031 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3032 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3033 >        if (!createIncomplete) assertTrue(f.complete(v1));
3034 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3035 >        if (createIncomplete) assertTrue(f.complete(v1));
3036 >
3037 >        checkCompletedNormally(g, inc(v1));
3038 >        checkCompletedNormally(f, v1);
3039 >        r.assertValue(v1);
3040 >    }}
3041  
3042      /**
3043 <     * thenAcceptAsync result completes normally after normal
3043 >     * thenCompose result completes exceptionally after exceptional
3044       * completion of source
3045       */
3046 <    public void testThenAcceptAsync() {
3047 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3048 <        IncAction r = new IncAction();
3049 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3050 <        f.complete(one);
3051 <        checkCompletedNormally(g, null);
3052 <        assertEquals(r.value, 2);
3053 <    }
3046 >    public void testThenCompose_exceptionalCompletion() {
3047 >        for (ExecutionMode m : ExecutionMode.values())
3048 >        for (boolean createIncomplete : new boolean[] { true, false })
3049 >    {
3050 >        final CFException ex = new CFException();
3051 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3052 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3053 >        if (!createIncomplete) f.completeExceptionally(ex);
3054 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3055 >        if (createIncomplete) f.completeExceptionally(ex);
3056 >
3057 >        checkCompletedWithWrappedException(g, ex);
3058 >        checkCompletedExceptionally(f, ex);
3059 >        r.assertNotInvoked();
3060 >    }}
3061  
3062      /**
3063 <     * thenAcceptAsync result completes exceptionally after exceptional
1213 <     * completion of source
3063 >     * thenCompose result completes exceptionally if action does
3064       */
3065 <    public void testThenAcceptAsync2() {
3066 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3067 <        IncAction r = new IncAction();
3068 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3069 <        f.completeExceptionally(new CFException());
3070 <        checkCompletedWithWrappedCFException(g);
3071 <    }
3065 >    public void testThenCompose_actionFailed() {
3066 >        for (ExecutionMode m : ExecutionMode.values())
3067 >        for (boolean createIncomplete : new boolean[] { true, false })
3068 >        for (Integer v1 : new Integer[] { 1, null })
3069 >    {
3070 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3071 >        final FailingCompletableFutureFunction r
3072 >            = new FailingCompletableFutureFunction(m);
3073 >        if (!createIncomplete) assertTrue(f.complete(v1));
3074 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3075 >        if (createIncomplete) assertTrue(f.complete(v1));
3076 >
3077 >        checkCompletedWithWrappedException(g, r.ex);
3078 >        checkCompletedNormally(f, v1);
3079 >    }}
3080  
3081      /**
3082 <     * thenAcceptAsync result completes exceptionally if action does
3082 >     * thenCompose result completes exceptionally if source cancelled
3083       */
3084 <    public void testThenAcceptAsync3() {
3085 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3086 <        FailingConsumer r = new FailingConsumer();
3087 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3088 <        f.complete(null);
3089 <        checkCompletedWithWrappedCFException(g);
3090 <    }
3084 >    public void testThenCompose_sourceCancelled() {
3085 >        for (ExecutionMode m : ExecutionMode.values())
3086 >        for (boolean createIncomplete : new boolean[] { true, false })
3087 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3088 >    {
3089 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3090 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3091 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3092 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3093 >        if (createIncomplete) {
3094 >            checkIncomplete(g);
3095 >            assertTrue(f.cancel(mayInterruptIfRunning));
3096 >        }
3097  
1234    /**
1235     * thenAcceptAsync result completes exceptionally if source cancelled
1236     */
1237    public void testThenAcceptAsync4() {
1238        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1239        IncAction r = new IncAction();
1240        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1241        assertTrue(f.cancel(true));
3098          checkCompletedWithWrappedCancellationException(g);
3099 <    }
3100 <    /**
1245 <     * thenCombineAsync result completes normally after normal
1246 <     * completion of sources
1247 <     */
1248 <    public void testThenCombineAsync() {
1249 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1250 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1251 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1252 <        f.complete(one);
1253 <        checkIncomplete(g);
1254 <        f2.complete(two);
1255 <        checkCompletedNormally(g, three);
1256 <    }
1257 <
1258 <    /**
1259 <     * thenCombineAsync result completes exceptionally after exceptional
1260 <     * completion of source
1261 <     */
1262 <    public void testThenCombineAsync2() {
1263 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1264 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1265 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1266 <        f.completeExceptionally(new CFException());
1267 <        f2.complete(two);
1268 <        checkCompletedWithWrappedCFException(g);
1269 <
1270 <        f = new CompletableFuture<Integer>();
1271 <        f2 = new CompletableFuture<Integer>();
1272 <        g = f.thenCombineAsync(f2, add);
1273 <        f.complete(one);
1274 <        f2.completeExceptionally(new CFException());
1275 <        checkCompletedWithWrappedCFException(g);
1276 <    }
1277 <
1278 <    /**
1279 <     * thenCombineAsync result completes exceptionally if action does
1280 <     */
1281 <    public void testThenCombineAsync3() {
1282 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1283 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1284 <        FailingBiFunction r = new FailingBiFunction();
1285 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1286 <        f.complete(one);
1287 <        checkIncomplete(g);
1288 <        f2.complete(two);
1289 <        checkCompletedWithWrappedCFException(g);
1290 <    }
3099 >        checkCancelled(f);
3100 >    }}
3101  
3102      /**
3103 <     * thenCombineAsync result completes exceptionally if either source cancelled
3103 >     * thenCompose result completes exceptionally if the result of the action does
3104       */
3105 <    public void testThenCombineAsync4() {
3106 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3107 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3108 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
3109 <        assertTrue(f.cancel(true));
3110 <        f2.complete(two);
3111 <        checkCompletedWithWrappedCancellationException(g);
3105 >    public void testThenCompose_actionReturnsFailingFuture() {
3106 >        for (ExecutionMode m : ExecutionMode.values())
3107 >        for (int order = 0; order < 6; order++)
3108 >        for (Integer v1 : new Integer[] { 1, null })
3109 >    {
3110 >        final CFException ex = new CFException();
3111 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3112 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3113 >        final CompletableFuture<Integer> h;
3114 >        // Test all permutations of orders
3115 >        switch (order) {
3116 >        case 0:
3117 >            assertTrue(f.complete(v1));
3118 >            assertTrue(g.completeExceptionally(ex));
3119 >            h = m.thenCompose(f, (x -> g));
3120 >            break;
3121 >        case 1:
3122 >            assertTrue(f.complete(v1));
3123 >            h = m.thenCompose(f, (x -> g));
3124 >            assertTrue(g.completeExceptionally(ex));
3125 >            break;
3126 >        case 2:
3127 >            assertTrue(g.completeExceptionally(ex));
3128 >            assertTrue(f.complete(v1));
3129 >            h = m.thenCompose(f, (x -> g));
3130 >            break;
3131 >        case 3:
3132 >            assertTrue(g.completeExceptionally(ex));
3133 >            h = m.thenCompose(f, (x -> g));
3134 >            assertTrue(f.complete(v1));
3135 >            break;
3136 >        case 4:
3137 >            h = m.thenCompose(f, (x -> g));
3138 >            assertTrue(f.complete(v1));
3139 >            assertTrue(g.completeExceptionally(ex));
3140 >            break;
3141 >        case 5:
3142 >            h = m.thenCompose(f, (x -> g));
3143 >            assertTrue(f.complete(v1));
3144 >            assertTrue(g.completeExceptionally(ex));
3145 >            break;
3146 >        default: throw new AssertionError();
3147 >        }
3148  
3149 <        f = new CompletableFuture<Integer>();
3150 <        f2 = new CompletableFuture<Integer>();
3151 <        g = f.thenCombineAsync(f2, add);
3152 <        f.complete(one);
1307 <        assertTrue(f2.cancel(true));
1308 <        checkCompletedWithWrappedCancellationException(g);
1309 <    }
3149 >        checkCompletedExceptionally(g, ex);
3150 >        checkCompletedWithWrappedException(h, ex);
3151 >        checkCompletedNormally(f, v1);
3152 >    }}
3153  
3154      /**
3155 <     * thenAcceptBothAsync result completes normally after normal
3156 <     * completion of sources
3155 >     * exceptionallyCompose result completes normally after normal
3156 >     * completion of source
3157       */
3158 <    public void testThenAcceptBothAsync() {
3159 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3160 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3161 <        AddAction r = new AddAction();
3162 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
3163 <        f.complete(one);
3164 <        checkIncomplete(g);
3165 <        f2.complete(two);
3166 <        checkCompletedNormally(g, null);
3167 <        assertEquals(r.value, 3);
3168 <    }
3158 >    public void testExceptionallyCompose_normalCompletion() {
3159 >        for (ExecutionMode m : ExecutionMode.values())
3160 >        for (boolean createIncomplete : new boolean[] { true, false })
3161 >        for (Integer v1 : new Integer[] { 1, null })
3162 >    {
3163 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3164 >        final ExceptionalCompletableFutureFunction r =
3165 >            new ExceptionalCompletableFutureFunction(m);
3166 >        if (!createIncomplete) assertTrue(f.complete(v1));
3167 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3168 >        if (createIncomplete) assertTrue(f.complete(v1));
3169 >
3170 >        checkCompletedNormally(f, v1);
3171 >        checkCompletedNormally(g, v1);
3172 >        r.assertNotInvoked();
3173 >    }}
3174  
3175      /**
3176 <     * thenAcceptBothAsync result completes exceptionally after exceptional
3176 >     * exceptionallyCompose result completes normally after exceptional
3177       * completion of source
3178       */
3179 <    public void testThenAcceptBothAsync2() {
3180 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3181 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3182 <        AddAction r = new AddAction();
3183 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
3184 <        f.completeExceptionally(new CFException());
3185 <        f2.complete(two);
3186 <        checkCompletedWithWrappedCFException(g);
3179 >    public void testExceptionallyCompose_exceptionalCompletion() {
3180 >        for (ExecutionMode m : ExecutionMode.values())
3181 >        for (boolean createIncomplete : new boolean[] { true, false })
3182 >    {
3183 >        final CFException ex = new CFException();
3184 >        final ExceptionalCompletableFutureFunction r =
3185 >            new ExceptionalCompletableFutureFunction(m);
3186 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3187 >        if (!createIncomplete) f.completeExceptionally(ex);
3188 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3189 >        if (createIncomplete) f.completeExceptionally(ex);
3190 >
3191 >        checkCompletedExceptionally(f, ex);
3192 >        checkCompletedNormally(g, r.value);
3193 >        r.assertInvoked();
3194 >    }}
3195 >
3196 >    /**
3197 >     * exceptionallyCompose completes exceptionally on exception if action does
3198 >     */
3199 >    public void testExceptionallyCompose_actionFailed() {
3200 >        for (ExecutionMode m : ExecutionMode.values())
3201 >        for (boolean createIncomplete : new boolean[] { true, false })
3202 >    {
3203 >        final CFException ex = new CFException();
3204 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3205 >        final FailingExceptionalCompletableFutureFunction r
3206 >            = new FailingExceptionalCompletableFutureFunction(m);
3207 >        if (!createIncomplete) f.completeExceptionally(ex);
3208 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3209 >        if (createIncomplete) f.completeExceptionally(ex);
3210 >
3211 >        checkCompletedExceptionally(f, ex);
3212 >        checkCompletedWithWrappedException(g, r.ex);
3213 >        r.assertInvoked();
3214 >    }}
3215 >
3216 >    /**
3217 >     * exceptionallyCompose result completes exceptionally if the
3218 >     * result of the action does
3219 >     */
3220 >    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3221 >        for (ExecutionMode m : ExecutionMode.values())
3222 >        for (int order = 0; order < 6; order++)
3223 >    {
3224 >        final CFException ex0 = new CFException();
3225 >        final CFException ex = new CFException();
3226 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3227 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3228 >        final CompletableFuture<Integer> h;
3229 >        // Test all permutations of orders
3230 >        switch (order) {
3231 >        case 0:
3232 >            assertTrue(f.completeExceptionally(ex0));
3233 >            assertTrue(g.completeExceptionally(ex));
3234 >            h = m.exceptionallyCompose(f, (x -> g));
3235 >            break;
3236 >        case 1:
3237 >            assertTrue(f.completeExceptionally(ex0));
3238 >            h = m.exceptionallyCompose(f, (x -> g));
3239 >            assertTrue(g.completeExceptionally(ex));
3240 >            break;
3241 >        case 2:
3242 >            assertTrue(g.completeExceptionally(ex));
3243 >            assertTrue(f.completeExceptionally(ex0));
3244 >            h = m.exceptionallyCompose(f, (x -> g));
3245 >            break;
3246 >        case 3:
3247 >            assertTrue(g.completeExceptionally(ex));
3248 >            h = m.exceptionallyCompose(f, (x -> g));
3249 >            assertTrue(f.completeExceptionally(ex0));
3250 >            break;
3251 >        case 4:
3252 >            h = m.exceptionallyCompose(f, (x -> g));
3253 >            assertTrue(f.completeExceptionally(ex0));
3254 >            assertTrue(g.completeExceptionally(ex));
3255 >            break;
3256 >        case 5:
3257 >            h = m.exceptionallyCompose(f, (x -> g));
3258 >            assertTrue(f.completeExceptionally(ex0));
3259 >            assertTrue(g.completeExceptionally(ex));
3260 >            break;
3261 >        default: throw new AssertionError();
3262 >        }
3263  
3264 <        r = new AddAction();
3265 <        f = new CompletableFuture<Integer>();
3266 <        f2 = new CompletableFuture<Integer>();
3267 <        g = f.thenAcceptBothAsync(f2, r);
1344 <        f.complete(one);
1345 <        f2.completeExceptionally(new CFException());
1346 <        checkCompletedWithWrappedCFException(g);
1347 <    }
3264 >        checkCompletedExceptionally(g, ex);
3265 >        checkCompletedWithWrappedException(h, ex);
3266 >        checkCompletedExceptionally(f, ex0);
3267 >    }}
3268  
3269 <    /**
1350 <     * thenAcceptBothAsync result completes exceptionally if action does
1351 <     */
1352 <    public void testThenAcceptBothAsync3() {
1353 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1354 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1355 <        FailingBiConsumer r = new FailingBiConsumer();
1356 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1357 <        f.complete(one);
1358 <        checkIncomplete(g);
1359 <        f2.complete(two);
1360 <        checkCompletedWithWrappedCFException(g);
1361 <    }
3269 >    // other static methods
3270  
3271      /**
3272 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
3272 >     * allOf(no component futures) returns a future completed normally
3273 >     * with the value null
3274       */
3275 <    public void testThenAcceptBothAsync4() {
3276 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3277 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1369 <        AddAction r = new AddAction();
1370 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1371 <        assertTrue(f.cancel(true));
1372 <        f2.complete(two);
1373 <        checkCompletedWithWrappedCancellationException(g);
1374 <
1375 <        r = new AddAction();
1376 <        f = new CompletableFuture<Integer>();
1377 <        f2 = new CompletableFuture<Integer>();
1378 <        g = f.thenAcceptBothAsync(f2, r);
1379 <        f.complete(one);
1380 <        assertTrue(f2.cancel(true));
1381 <        checkCompletedWithWrappedCancellationException(g);
3275 >    public void testAllOf_empty() throws Exception {
3276 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3277 >        checkCompletedNormally(f, null);
3278      }
3279  
3280      /**
3281 <     * runAfterBothAsync result completes normally after normal
3282 <     * completion of sources
3281 >     * allOf returns a future completed normally with the value null
3282 >     * when all components complete normally
3283       */
3284 <    public void testRunAfterBothAsync() {
3285 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3286 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3287 <        Noop r = new Noop();
3288 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
3289 <        f.complete(one);
3290 <        checkIncomplete(g);
3291 <        f2.complete(two);
3292 <        checkCompletedNormally(g, null);
3293 <        assertTrue(r.ran);
3284 >    public void testAllOf_normal() throws Exception {
3285 >        for (int k = 1; k < 10; k++) {
3286 >            CompletableFuture<Integer>[] fs
3287 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3288 >            for (int i = 0; i < k; i++)
3289 >                fs[i] = new CompletableFuture<>();
3290 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3291 >            for (int i = 0; i < k; i++) {
3292 >                checkIncomplete(f);
3293 >                checkIncomplete(CompletableFuture.allOf(fs));
3294 >                fs[i].complete(one);
3295 >            }
3296 >            checkCompletedNormally(f, null);
3297 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3298 >        }
3299      }
3300  
3301 <    /**
3302 <     * runAfterBothAsync result completes exceptionally after exceptional
3303 <     * completion of source
3304 <     */
3305 <    public void testRunAfterBothAsync2() {
3306 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3307 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3308 <        Noop r = new Noop();
3309 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
3310 <        f.completeExceptionally(new CFException());
3311 <        f2.complete(two);
3312 <        checkCompletedWithWrappedCFException(g);
3313 <
3314 <        r = new Noop();
3315 <        f = new CompletableFuture<Integer>();
1415 <        f2 = new CompletableFuture<Integer>();
1416 <        g = f.runAfterBothAsync(f2, r);
1417 <        f.complete(one);
1418 <        f2.completeExceptionally(new CFException());
1419 <        checkCompletedWithWrappedCFException(g);
3301 >    public void testAllOf_normal_backwards() throws Exception {
3302 >        for (int k = 1; k < 10; k++) {
3303 >            CompletableFuture<Integer>[] fs
3304 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3305 >            for (int i = 0; i < k; i++)
3306 >                fs[i] = new CompletableFuture<>();
3307 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3308 >            for (int i = k - 1; i >= 0; i--) {
3309 >                checkIncomplete(f);
3310 >                checkIncomplete(CompletableFuture.allOf(fs));
3311 >                fs[i].complete(one);
3312 >            }
3313 >            checkCompletedNormally(f, null);
3314 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3315 >        }
3316      }
3317  
3318 <    /**
3319 <     * runAfterBothAsync result completes exceptionally if action does
3320 <     */
3321 <    public void testRunAfterBothAsync3() {
3322 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3323 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3324 <        FailingNoop r = new FailingNoop();
3325 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
3326 <        f.complete(one);
3327 <        checkIncomplete(g);
3328 <        f2.complete(two);
3329 <        checkCompletedWithWrappedCFException(g);
3318 >    public void testAllOf_exceptional() throws Exception {
3319 >        for (int k = 1; k < 10; k++) {
3320 >            CompletableFuture<Integer>[] fs
3321 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3322 >            CFException ex = new CFException();
3323 >            for (int i = 0; i < k; i++)
3324 >                fs[i] = new CompletableFuture<>();
3325 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3326 >            for (int i = 0; i < k; i++) {
3327 >                checkIncomplete(f);
3328 >                checkIncomplete(CompletableFuture.allOf(fs));
3329 >                if (i != k / 2) {
3330 >                    fs[i].complete(i);
3331 >                    checkCompletedNormally(fs[i], i);
3332 >                } else {
3333 >                    fs[i].completeExceptionally(ex);
3334 >                    checkCompletedExceptionally(fs[i], ex);
3335 >                }
3336 >            }
3337 >            checkCompletedWithWrappedException(f, ex);
3338 >            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3339 >        }
3340      }
3341  
3342      /**
3343 <     * runAfterBothAsync result completes exceptionally if either source cancelled
3343 >     * anyOf(no component futures) returns an incomplete future
3344       */
3345 <    public void testRunAfterBothAsync4() {
3346 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3347 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3348 <        Noop r = new Noop();
3349 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1444 <        assertTrue(f.cancel(true));
1445 <        f2.complete(two);
1446 <        checkCompletedWithWrappedCancellationException(g);
3345 >    public void testAnyOf_empty() throws Exception {
3346 >        for (Integer v1 : new Integer[] { 1, null })
3347 >    {
3348 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3349 >        checkIncomplete(f);
3350  
3351 <        r = new Noop();
3352 <        f = new CompletableFuture<Integer>();
3353 <        f2 = new CompletableFuture<Integer>();
1451 <        g = f.runAfterBothAsync(f2, r);
1452 <        f.complete(one);
1453 <        assertTrue(f2.cancel(true));
1454 <        checkCompletedWithWrappedCancellationException(g);
1455 <    }
3351 >        f.complete(v1);
3352 >        checkCompletedNormally(f, v1);
3353 >    }}
3354  
3355      /**
3356 <     * applyToEitherAsync result completes normally after normal
3357 <     * completion of sources
3356 >     * anyOf returns a future completed normally with a value when
3357 >     * a component future does
3358       */
3359 <    public void testApplyToEitherAsync() {
3360 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3361 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3362 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
3363 <        f.complete(one);
3364 <        checkCompletedNormally(g, two);
3365 <
3366 <        f = new CompletableFuture<Integer>();
3367 <        f.complete(one);
3368 <        f2 = new CompletableFuture<Integer>();
3369 <        g = f.applyToEitherAsync(f2, inc);
3370 <        checkCompletedNormally(g, two);
3359 >    public void testAnyOf_normal() throws Exception {
3360 >        for (int k = 0; k < 10; k++) {
3361 >            CompletableFuture[] fs = new CompletableFuture[k];
3362 >            for (int i = 0; i < k; i++)
3363 >                fs[i] = new CompletableFuture<>();
3364 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3365 >            checkIncomplete(f);
3366 >            for (int i = 0; i < k; i++) {
3367 >                fs[i].complete(i);
3368 >                checkCompletedNormally(f, 0);
3369 >                int x = (int) CompletableFuture.anyOf(fs).join();
3370 >                assertTrue(0 <= x && x <= i);
3371 >            }
3372 >        }
3373      }
3374 <
3375 <    /**
3376 <     * applyToEitherAsync result completes exceptionally after exceptional
3377 <     * completion of source
3378 <     */
3379 <    public void testApplyToEitherAsync2() {
3380 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3381 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3382 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
3383 <        f.completeExceptionally(new CFException());
3384 <        checkCompletedWithWrappedCFException(g);
3385 <
3386 <        f = new CompletableFuture<Integer>();
3387 <        f2 = new CompletableFuture<Integer>();
1488 <        f2.completeExceptionally(new CFException());
1489 <        g = f.applyToEitherAsync(f2, inc);
1490 <        f.complete(one);
1491 <        checkCompletedWithWrappedCFException(g);
3374 >    public void testAnyOf_normal_backwards() throws Exception {
3375 >        for (int k = 0; k < 10; k++) {
3376 >            CompletableFuture[] fs = new CompletableFuture[k];
3377 >            for (int i = 0; i < k; i++)
3378 >                fs[i] = new CompletableFuture<>();
3379 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3380 >            checkIncomplete(f);
3381 >            for (int i = k - 1; i >= 0; i--) {
3382 >                fs[i].complete(i);
3383 >                checkCompletedNormally(f, k - 1);
3384 >                int x = (int) CompletableFuture.anyOf(fs).join();
3385 >                assertTrue(i <= x && x <= k - 1);
3386 >            }
3387 >        }
3388      }
3389  
3390      /**
3391 <     * applyToEitherAsync result completes exceptionally if action does
3391 >     * anyOf result completes exceptionally when any component does.
3392       */
3393 <    public void testApplyToEitherAsync3() {
3394 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3395 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3396 <        FailingFunction r = new FailingFunction();
3397 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
3398 <        f.complete(one);
3399 <        checkCompletedWithWrappedCFException(g);
3393 >    public void testAnyOf_exceptional() throws Exception {
3394 >        for (int k = 0; k < 10; k++) {
3395 >            CompletableFuture[] fs = new CompletableFuture[k];
3396 >            CFException[] exs = new CFException[k];
3397 >            for (int i = 0; i < k; i++) {
3398 >                fs[i] = new CompletableFuture<>();
3399 >                exs[i] = new CFException();
3400 >            }
3401 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3402 >            checkIncomplete(f);
3403 >            for (int i = 0; i < k; i++) {
3404 >                fs[i].completeExceptionally(exs[i]);
3405 >                checkCompletedWithWrappedException(f, exs[0]);
3406 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3407 >            }
3408 >        }
3409      }
3410  
3411 <    /**
3412 <     * applyToEitherAsync result completes exceptionally if either source cancelled
3413 <     */
3414 <    public void testApplyToEitherAsync4() {
3415 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3416 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3417 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
3418 <        assertTrue(f.cancel(true));
3419 <        checkCompletedWithWrappedCancellationException(g);
3420 <
3421 <        f = new CompletableFuture<Integer>();
3422 <        f2 = new CompletableFuture<Integer>();
3423 <        assertTrue(f2.cancel(true));
3424 <        g = f.applyToEitherAsync(f2, inc);
3425 <        checkCompletedWithWrappedCancellationException(g);
3411 >    public void testAnyOf_exceptional_backwards() throws Exception {
3412 >        for (int k = 0; k < 10; k++) {
3413 >            CompletableFuture[] fs = new CompletableFuture[k];
3414 >            CFException[] exs = new CFException[k];
3415 >            for (int i = 0; i < k; i++) {
3416 >                fs[i] = new CompletableFuture<>();
3417 >                exs[i] = new CFException();
3418 >            }
3419 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3420 >            checkIncomplete(f);
3421 >            for (int i = k - 1; i >= 0; i--) {
3422 >                fs[i].completeExceptionally(exs[i]);
3423 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3424 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3425 >            }
3426 >        }
3427      }
3428  
3429      /**
3430 <     * acceptEitherAsync result completes normally after normal
1525 <     * completion of sources
3430 >     * Completion methods throw NullPointerException with null arguments
3431       */
3432 <    public void testAcceptEitherAsync() {
3433 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3434 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3435 <        IncAction r = new IncAction();
3436 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
3437 <        f.complete(one);
3438 <        checkCompletedNormally(g, null);
3439 <        assertEquals(r.value, 2);
3432 >    @SuppressWarnings("FutureReturnValueIgnored")
3433 >    public void testNPE() {
3434 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3435 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3436 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3437 >        ThreadExecutor exec = new ThreadExecutor();
3438 >
3439 >        Runnable[] throwingActions = {
3440 >            () -> CompletableFuture.supplyAsync(null),
3441 >            () -> CompletableFuture.supplyAsync(null, exec),
3442 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3443 >
3444 >            () -> CompletableFuture.runAsync(null),
3445 >            () -> CompletableFuture.runAsync(null, exec),
3446 >            () -> CompletableFuture.runAsync(() -> {}, null),
3447 >
3448 >            () -> f.completeExceptionally(null),
3449 >
3450 >            () -> f.thenApply(null),
3451 >            () -> f.thenApplyAsync(null),
3452 >            () -> f.thenApplyAsync(x -> x, null),
3453 >            () -> f.thenApplyAsync(null, exec),
3454 >
3455 >            () -> f.thenAccept(null),
3456 >            () -> f.thenAcceptAsync(null),
3457 >            () -> f.thenAcceptAsync(x -> {} , null),
3458 >            () -> f.thenAcceptAsync(null, exec),
3459 >
3460 >            () -> f.thenRun(null),
3461 >            () -> f.thenRunAsync(null),
3462 >            () -> f.thenRunAsync(() -> {} , null),
3463 >            () -> f.thenRunAsync(null, exec),
3464 >
3465 >            () -> f.thenCombine(g, null),
3466 >            () -> f.thenCombineAsync(g, null),
3467 >            () -> f.thenCombineAsync(g, null, exec),
3468 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3469 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3470 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3471 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3472 >
3473 >            () -> f.thenAcceptBoth(g, null),
3474 >            () -> f.thenAcceptBothAsync(g, null),
3475 >            () -> f.thenAcceptBothAsync(g, null, exec),
3476 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3477 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3478 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3479 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3480 >
3481 >            () -> f.runAfterBoth(g, null),
3482 >            () -> f.runAfterBothAsync(g, null),
3483 >            () -> f.runAfterBothAsync(g, null, exec),
3484 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3485 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3486 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3487 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3488 >
3489 >            () -> f.applyToEither(g, null),
3490 >            () -> f.applyToEitherAsync(g, null),
3491 >            () -> f.applyToEitherAsync(g, null, exec),
3492 >            () -> f.applyToEither(nullFuture, x -> x),
3493 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3494 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3495 >            () -> f.applyToEitherAsync(g, x -> x, null),
3496 >
3497 >            () -> f.acceptEither(g, null),
3498 >            () -> f.acceptEitherAsync(g, null),
3499 >            () -> f.acceptEitherAsync(g, null, exec),
3500 >            () -> f.acceptEither(nullFuture, x -> {}),
3501 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3502 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3503 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3504 >
3505 >            () -> f.runAfterEither(g, null),
3506 >            () -> f.runAfterEitherAsync(g, null),
3507 >            () -> f.runAfterEitherAsync(g, null, exec),
3508 >            () -> f.runAfterEither(nullFuture, () -> {}),
3509 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3510 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3511 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3512 >
3513 >            () -> f.thenCompose(null),
3514 >            () -> f.thenComposeAsync(null),
3515 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3516 >            () -> f.thenComposeAsync(null, exec),
3517 >
3518 >            () -> f.exceptionally(null),
3519 >
3520 >            () -> f.handle(null),
3521 >
3522 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3523 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3524 >            () -> CompletableFuture.allOf(f, null),
3525 >            () -> CompletableFuture.allOf(null, f),
3526 >
3527 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3528 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3529 >            () -> CompletableFuture.anyOf(f, null),
3530 >            () -> CompletableFuture.anyOf(null, f),
3531 >
3532 >            () -> f.obtrudeException(null),
3533 >
3534 >            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3535 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3536 >            () -> CompletableFuture.delayedExecutor(1L, null),
3537 >
3538 >            () -> f.orTimeout(1L, null),
3539 >            () -> f.completeOnTimeout(42, 1L, null),
3540 >
3541 >            () -> CompletableFuture.failedFuture(null),
3542 >            () -> CompletableFuture.failedStage(null),
3543 >        };
3544 >
3545 >        assertThrows(NullPointerException.class, throwingActions);
3546 >        assertEquals(0, exec.count.get());
3547 >    }
3548 >
3549 >    /**
3550 >     * Test submissions to an executor that rejects all tasks.
3551 >     */
3552 >    public void testRejectingExecutor() {
3553 >        for (Integer v : new Integer[] { 1, null })
3554 >    {
3555 >        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3556 >
3557 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3558 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3559 >
3560 >        List<CompletableFuture<?>> futures = new ArrayList<>();
3561 >
3562 >        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3563 >        srcs.add(complete);
3564 >        srcs.add(incomplete);
3565 >
3566 >        for (CompletableFuture<Integer> src : srcs) {
3567 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3568 >            fs.add(src.thenRunAsync(() -> {}, e));
3569 >            fs.add(src.thenAcceptAsync(z -> {}, e));
3570 >            fs.add(src.thenApplyAsync(z -> z, e));
3571 >
3572 >            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3573 >            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3574 >            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3575 >
3576 >            fs.add(src.applyToEitherAsync(src, z -> z, e));
3577 >            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3578 >            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3579 >
3580 >            fs.add(src.thenComposeAsync(z -> null, e));
3581 >            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3582 >            fs.add(src.handleAsync((z, t) -> null, e));
3583 >
3584 >            for (CompletableFuture<?> future : fs) {
3585 >                if (src.isDone())
3586 >                    checkCompletedWithWrappedException(future, e.ex);
3587 >                else
3588 >                    checkIncomplete(future);
3589 >            }
3590 >            futures.addAll(fs);
3591 >        }
3592  
3593 <        r = new IncAction();
3594 <        f = new CompletableFuture<Integer>();
1538 <        f.complete(one);
1539 <        f2 = new CompletableFuture<Integer>();
1540 <        g = f.acceptEitherAsync(f2, r);
1541 <        checkCompletedNormally(g, null);
1542 <        assertEquals(r.value, 2);
1543 <    }
3593 >        {
3594 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3595  
3596 <    /**
3597 <     * acceptEitherAsync result completes exceptionally after exceptional
1547 <     * completion of source
1548 <     */
1549 <    public void testAcceptEitherAsync2() {
1550 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1551 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1552 <        IncAction r = new IncAction();
1553 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1554 <        f.completeExceptionally(new CFException());
1555 <        checkCompletedWithWrappedCFException(g);
3596 >            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3597 >            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3598  
3599 <        r = new IncAction();
3600 <        f = new CompletableFuture<Integer>();
1559 <        f2 = new CompletableFuture<Integer>();
1560 <        f2.completeExceptionally(new CFException());
1561 <        g = f.acceptEitherAsync(f2, r);
1562 <        f.complete(one);
1563 <        checkCompletedWithWrappedCFException(g);
1564 <    }
3599 >            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3600 >            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3601  
3602 <    /**
3603 <     * acceptEitherAsync result completes exceptionally if action does
1568 <     */
1569 <    public void testAcceptEitherAsync3() {
1570 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1571 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1572 <        FailingConsumer r = new FailingConsumer();
1573 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1574 <        f.complete(one);
1575 <        checkCompletedWithWrappedCFException(g);
1576 <    }
3602 >            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3603 >            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3604  
3605 <    /**
3606 <     * acceptEitherAsync result completes exceptionally if either
3607 <     * source cancelled
3608 <     */
1582 <    public void testAcceptEitherAsync4() {
1583 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1584 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1585 <        IncAction r = new IncAction();
1586 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1587 <        assertTrue(f.cancel(true));
1588 <        checkCompletedWithWrappedCancellationException(g);
3605 >            for (CompletableFuture<?> future : fs)
3606 >                checkIncomplete(future);
3607 >            futures.addAll(fs);
3608 >        }
3609  
3610 <        r = new IncAction();
3611 <        f = new CompletableFuture<Integer>();
1592 <        f2 = new CompletableFuture<Integer>();
1593 <        assertTrue(f2.cancel(true));
1594 <        g = f.acceptEitherAsync(f2, r);
1595 <        checkCompletedWithWrappedCancellationException(g);
1596 <    }
3610 >        {
3611 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3612  
3613 <    /**
3614 <     * runAfterEitherAsync result completes normally after normal
1600 <     * completion of sources
1601 <     */
1602 <    public void testRunAfterEitherAsync() {
1603 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1604 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1605 <        Noop r = new Noop();
1606 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1607 <        f.complete(one);
1608 <        checkCompletedNormally(g, null);
1609 <        assertTrue(r.ran);
3613 >            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3614 >            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3615  
3616 <        r = new Noop();
3617 <        f = new CompletableFuture<Integer>();
1613 <        f.complete(one);
1614 <        f2 = new CompletableFuture<Integer>();
1615 <        g = f.runAfterEitherAsync(f2, r);
1616 <        checkCompletedNormally(g, null);
1617 <        assertTrue(r.ran);
1618 <    }
3616 >            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3617 >            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3618  
3619 <    /**
3620 <     * runAfterEitherAsync result completes exceptionally after exceptional
1622 <     * completion of source
1623 <     */
1624 <    public void testRunAfterEitherAsync2() {
1625 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1626 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1627 <        Noop r = new Noop();
1628 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1629 <        f.completeExceptionally(new CFException());
1630 <        checkCompletedWithWrappedCFException(g);
3619 >            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3620 >            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3621  
3622 <        r = new Noop();
3623 <        f = new CompletableFuture<Integer>();
3624 <        f2 = new CompletableFuture<Integer>();
3625 <        f2.completeExceptionally(new CFException());
1636 <        g = f.runAfterEitherAsync(f2, r);
1637 <        f.complete(one);
1638 <        checkCompletedWithWrappedCFException(g);
1639 <    }
3622 >            for (CompletableFuture<?> future : fs)
3623 >                checkCompletedWithWrappedException(future, e.ex);
3624 >            futures.addAll(fs);
3625 >        }
3626  
3627 <    /**
1642 <     * runAfterEitherAsync result completes exceptionally if action does
1643 <     */
1644 <    public void testRunAfterEitherAsync3() {
1645 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1646 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1647 <        FailingNoop r = new FailingNoop();
1648 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1649 <        f.complete(one);
1650 <        checkCompletedWithWrappedCFException(g);
1651 <    }
3627 >        incomplete.complete(v);
3628  
3629 <    /**
3630 <     * runAfterEitherAsync result completes exceptionally if either
1655 <     * source cancelled
1656 <     */
1657 <    public void testRunAfterEitherAsync4() {
1658 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1659 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1660 <        Noop r = new Noop();
1661 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1662 <        assertTrue(f.cancel(true));
1663 <        checkCompletedWithWrappedCancellationException(g);
3629 >        for (CompletableFuture<?> future : futures)
3630 >            checkCompletedWithWrappedException(future, e.ex);
3631  
3632 <        r = new Noop();
3633 <        f = new CompletableFuture<Integer>();
1667 <        f2 = new CompletableFuture<Integer>();
1668 <        assertTrue(f2.cancel(true));
1669 <        g = f.runAfterEitherAsync(f2, r);
1670 <        checkCompletedWithWrappedCancellationException(g);
1671 <    }
3632 >        assertEquals(futures.size(), e.count.get());
3633 >    }}
3634  
3635      /**
3636 <     * thenCompse result completes normally after normal completion of source
3636 >     * Test submissions to an executor that rejects all tasks, but
3637 >     * should never be invoked because the dependent future is
3638 >     * explicitly completed.
3639       */
3640 <    public void testThenComposeAsync() {
3641 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3642 <        CompletableFutureInc r = new CompletableFutureInc();
3643 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1680 <        f.complete(one);
1681 <        checkCompletedNormally(g, two);
1682 <    }
3640 >    public void testRejectingExecutorNeverInvoked() {
3641 >        for (Integer v : new Integer[] { 1, null })
3642 >    {
3643 >        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3644  
3645 <    /**
3646 <     * thenComposeAsync result completes exceptionally after exceptional
1686 <     * completion of source
1687 <     */
1688 <    public void testThenComposeAsync2() {
1689 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1690 <        CompletableFutureInc r = new CompletableFutureInc();
1691 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1692 <        f.completeExceptionally(new CFException());
1693 <        checkCompletedWithWrappedCFException(g);
1694 <    }
3645 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3646 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3647  
3648 <    /**
1697 <     * thenComposeAsync result completes exceptionally if action does
1698 <     */
1699 <    public void testThenComposeAsync3() {
1700 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1701 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1702 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1703 <        f.complete(one);
1704 <        checkCompletedWithWrappedCFException(g);
1705 <    }
3648 >        List<CompletableFuture<?>> futures = new ArrayList<>();
3649  
3650 <    /**
3651 <     * thenComposeAsync result completes exceptionally if source cancelled
3652 <     */
1710 <    public void testThenComposeAsync4() {
1711 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1712 <        CompletableFutureInc r = new CompletableFutureInc();
1713 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1714 <        assertTrue(f.cancel(true));
1715 <        checkCompletedWithWrappedCancellationException(g);
1716 <    }
3650 >        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3651 >        srcs.add(complete);
3652 >        srcs.add(incomplete);
3653  
3654 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3655 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3656 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3657 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3658  
3659 <    // aaync with explicit executors
3659 >        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3660 >        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3661 >        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3662  
3663 <    /**
3664 <     * thenRunAsync result completes normally after normal completion of source
3665 <     */
1724 <    public void testThenRunAsyncE() {
1725 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1726 <        Noop r = new Noop();
1727 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1728 <        f.complete(null);
1729 <        checkCompletedNormally(g, null);
3663 >        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3664 >        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3665 >        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3666  
3667 <        // reordered version
3668 <        f = new CompletableFuture<Integer>();
3669 <        f.complete(null);
1734 <        r = new Noop();
1735 <        g = f.thenRunAsync(r, new ThreadExecutor());
1736 <        checkCompletedNormally(g, null);
1737 <    }
3667 >        fs.add(incomplete.thenComposeAsync(z -> null, e));
3668 >        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3669 >        fs.add(incomplete.handleAsync((z, t) -> null, e));
3670  
3671 <    /**
3672 <     * thenRunAsync result completes exceptionally after exceptional
1741 <     * completion of source
1742 <     */
1743 <    public void testThenRunAsync2E() {
1744 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1745 <        Noop r = new Noop();
1746 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1747 <        f.completeExceptionally(new CFException());
1748 <        try {
1749 <            g.join();
1750 <            shouldThrow();
1751 <        } catch (Exception ok) {
1752 <        }
1753 <        checkCompletedWithWrappedCFException(g);
1754 <    }
3671 >        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3672 >        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3673  
3674 <    /**
3675 <     * thenRunAsync result completes exceptionally if action does
1758 <     */
1759 <    public void testThenRunAsync3E() {
1760 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1761 <        FailingNoop r = new FailingNoop();
1762 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1763 <        f.complete(null);
1764 <        checkCompletedWithWrappedCFException(g);
1765 <    }
3674 >        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3675 >        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3676  
3677 <    /**
3678 <     * thenRunAsync result completes exceptionally if source cancelled
1769 <     */
1770 <    public void testThenRunAsync4E() {
1771 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1772 <        Noop r = new Noop();
1773 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1774 <        assertTrue(f.cancel(true));
1775 <        checkCompletedWithWrappedCancellationException(g);
1776 <    }
3677 >        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3678 >        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3679  
3680 <    /**
3681 <     * thenApplyAsync result completes normally after normal completion of source
1780 <     */
1781 <    public void testThenApplyAsyncE() {
1782 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1783 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1784 <        f.complete(one);
1785 <        checkCompletedNormally(g, two);
1786 <    }
3680 >        for (CompletableFuture<?> future : fs)
3681 >            checkIncomplete(future);
3682  
3683 <    /**
3684 <     * thenApplyAsync result completes exceptionally after exceptional
1790 <     * completion of source
1791 <     */
1792 <    public void testThenApplyAsync2E() {
1793 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1794 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1795 <        f.completeExceptionally(new CFException());
1796 <        checkCompletedWithWrappedCFException(g);
1797 <    }
3683 >        for (CompletableFuture<?> future : fs)
3684 >            future.complete(null);
3685  
3686 <    /**
1800 <     * thenApplyAsync result completes exceptionally if action does
1801 <     */
1802 <    public void testThenApplyAsync3E() {
1803 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1804 <        FailingFunction r = new FailingFunction();
1805 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
1806 <        f.complete(null);
1807 <        checkCompletedWithWrappedCFException(g);
1808 <    }
3686 >        incomplete.complete(v);
3687  
3688 <    /**
3689 <     * thenApplyAsync result completes exceptionally if source cancelled
1812 <     */
1813 <    public void testThenApplyAsync4E() {
1814 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1815 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1816 <        assertTrue(f.cancel(true));
1817 <        checkCompletedWithWrappedCancellationException(g);
1818 <    }
3688 >        for (CompletableFuture<?> future : fs)
3689 >            checkCompletedNormally(future, null);
3690  
3691 <    /**
3692 <     * thenAcceptAsync result completes normally after normal
1822 <     * completion of source
1823 <     */
1824 <    public void testThenAcceptAsyncE() {
1825 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1826 <        IncAction r = new IncAction();
1827 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1828 <        f.complete(one);
1829 <        checkCompletedNormally(g, null);
1830 <        assertEquals(r.value, 2);
1831 <    }
3691 >        assertEquals(0, e.count.get());
3692 >    }}
3693  
3694      /**
3695 <     * thenAcceptAsync result completes exceptionally after exceptional
1835 <     * completion of source
3695 >     * toCompletableFuture returns this CompletableFuture.
3696       */
3697 <    public void testThenAcceptAsync2E() {
3698 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3699 <        IncAction r = new IncAction();
1840 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1841 <        f.completeExceptionally(new CFException());
1842 <        checkCompletedWithWrappedCFException(g);
3697 >    public void testToCompletableFuture() {
3698 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3699 >        assertSame(f, f.toCompletableFuture());
3700      }
3701  
3702 <    /**
1846 <     * thenAcceptAsync result completes exceptionally if action does
1847 <     */
1848 <    public void testThenAcceptAsync3E() {
1849 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1850 <        FailingConsumer r = new FailingConsumer();
1851 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1852 <        f.complete(null);
1853 <        checkCompletedWithWrappedCFException(g);
1854 <    }
3702 >    // jdk9
3703  
3704      /**
3705 <     * thenAcceptAsync result completes exceptionally if source cancelled
1858 <     */
1859 <    public void testThenAcceptAsync4E() {
1860 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1861 <        IncAction r = new IncAction();
1862 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1863 <        assertTrue(f.cancel(true));
1864 <        checkCompletedWithWrappedCancellationException(g);
1865 <    }
1866 <    /**
1867 <     * thenCombineAsync result completes normally after normal
1868 <     * completion of sources
3705 >     * newIncompleteFuture returns an incomplete CompletableFuture
3706       */
3707 <    public void testThenCombineAsyncE() {
3708 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3709 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3710 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
3711 <        f.complete(one);
3707 >    public void testNewIncompleteFuture() {
3708 >        for (Integer v1 : new Integer[] { 1, null })
3709 >    {
3710 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3711 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3712 >        checkIncomplete(f);
3713          checkIncomplete(g);
3714 <        f2.complete(two);
3715 <        checkCompletedNormally(g, three);
1878 <    }
1879 <
1880 <    /**
1881 <     * thenCombineAsync result completes exceptionally after exceptional
1882 <     * completion of source
1883 <     */
1884 <    public void testThenCombineAsync2E() {
1885 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1886 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1887 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1888 <        f.completeExceptionally(new CFException());
1889 <        f2.complete(two);
1890 <        checkCompletedWithWrappedCFException(g);
1891 <
1892 <        f = new CompletableFuture<Integer>();
1893 <        f2 = new CompletableFuture<Integer>();
1894 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1895 <        f.complete(one);
1896 <        f2.completeExceptionally(new CFException());
1897 <        checkCompletedWithWrappedCFException(g);
1898 <    }
1899 <
1900 <    /**
1901 <     * thenCombineAsync result completes exceptionally if action does
1902 <     */
1903 <    public void testThenCombineAsync3E() {
1904 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1905 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1906 <        FailingBiFunction r = new FailingBiFunction();
1907 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
1908 <        f.complete(one);
3714 >        f.complete(v1);
3715 >        checkCompletedNormally(f, v1);
3716          checkIncomplete(g);
3717 <        f2.complete(two);
3718 <        checkCompletedWithWrappedCFException(g);
3719 <    }
3720 <
1914 <    /**
1915 <     * thenCombineAsync result completes exceptionally if either source cancelled
1916 <     */
1917 <    public void testThenCombineAsync4E() {
1918 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1919 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1920 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1921 <        assertTrue(f.cancel(true));
1922 <        f2.complete(two);
1923 <        checkCompletedWithWrappedCancellationException(g);
1924 <
1925 <        f = new CompletableFuture<Integer>();
1926 <        f2 = new CompletableFuture<Integer>();
1927 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1928 <        f.complete(one);
1929 <        assertTrue(f2.cancel(true));
1930 <        checkCompletedWithWrappedCancellationException(g);
1931 <    }
3717 >        g.complete(v1);
3718 >        checkCompletedNormally(g, v1);
3719 >        assertSame(g.getClass(), CompletableFuture.class);
3720 >    }}
3721  
3722      /**
3723 <     * thenAcceptBothAsync result completes normally after normal
1935 <     * completion of sources
3723 >     * completedStage returns a completed CompletionStage
3724       */
3725 <    public void testThenAcceptBothAsyncE() {
3726 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3727 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3728 <        AddAction r = new AddAction();
3729 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
3730 <        f.complete(one);
3731 <        checkIncomplete(g);
1944 <        f2.complete(two);
1945 <        checkCompletedNormally(g, null);
1946 <        assertEquals(r.value, 3);
3725 >    public void testCompletedStage() {
3726 >        AtomicInteger x = new AtomicInteger(0);
3727 >        AtomicReference<Throwable> r = new AtomicReference<>();
3728 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3729 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3730 >        assertEquals(x.get(), 1);
3731 >        assertNull(r.get());
3732      }
3733  
3734      /**
3735 <     * thenAcceptBothAsync result completes exceptionally after exceptional
3736 <     * completion of source
3735 >     * defaultExecutor by default returns the commonPool if
3736 >     * it supports more than one thread.
3737       */
3738 <    public void testThenAcceptBothAsync2E() {
3739 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3740 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3741 <        AddAction r = new AddAction();
3742 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
3743 <        f.completeExceptionally(new CFException());
3744 <        f2.complete(two);
3745 <        checkCompletedWithWrappedCFException(g);
1961 <
1962 <        r = new AddAction();
1963 <        f = new CompletableFuture<Integer>();
1964 <        f2 = new CompletableFuture<Integer>();
1965 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1966 <        f.complete(one);
1967 <        f2.completeExceptionally(new CFException());
1968 <        checkCompletedWithWrappedCFException(g);
1969 <    }
1970 <
1971 <    /**
1972 <     * thenAcceptBothAsync result completes exceptionally if action does
1973 <     */
1974 <    public void testThenAcceptBothAsync3E() {
1975 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1976 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1977 <        FailingBiConsumer r = new FailingBiConsumer();
1978 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1979 <        f.complete(one);
1980 <        checkIncomplete(g);
1981 <        f2.complete(two);
1982 <        checkCompletedWithWrappedCFException(g);
3738 >    public void testDefaultExecutor() {
3739 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3740 >        Executor e = f.defaultExecutor();
3741 >        Executor c = ForkJoinPool.commonPool();
3742 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3743 >            assertSame(e, c);
3744 >        else
3745 >            assertNotSame(e, c);
3746      }
3747  
3748      /**
3749 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
3749 >     * failedFuture returns a CompletableFuture completed
3750 >     * exceptionally with the given Exception
3751       */
3752 <    public void testThenAcceptBothAsync4E() {
3753 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3754 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3755 <        AddAction r = new AddAction();
1992 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1993 <        assertTrue(f.cancel(true));
1994 <        f2.complete(two);
1995 <        checkCompletedWithWrappedCancellationException(g);
1996 <
1997 <        r = new AddAction();
1998 <        f = new CompletableFuture<Integer>();
1999 <        f2 = new CompletableFuture<Integer>();
2000 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2001 <        f.complete(one);
2002 <        assertTrue(f2.cancel(true));
2003 <        checkCompletedWithWrappedCancellationException(g);
3752 >    public void testFailedFuture() {
3753 >        CFException ex = new CFException();
3754 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3755 >        checkCompletedExceptionally(f, ex);
3756      }
3757  
3758      /**
3759 <     * runAfterBothAsync result completes normally after normal
2008 <     * completion of sources
3759 >     * failedFuture(null) throws NPE
3760       */
3761 <    public void testRunAfterBothAsyncE() {
3762 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3763 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3764 <        Noop r = new Noop();
3765 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2015 <        f.complete(one);
2016 <        checkIncomplete(g);
2017 <        f2.complete(two);
2018 <        checkCompletedNormally(g, null);
2019 <        assertTrue(r.ran);
3761 >    public void testFailedFuture_null() {
3762 >        try {
3763 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3764 >            shouldThrow();
3765 >        } catch (NullPointerException success) {}
3766      }
3767  
3768      /**
3769 <     * runAfterBothAsync result completes exceptionally after exceptional
3770 <     * completion of source
3769 >     * copy returns a CompletableFuture that is completed normally,
3770 >     * with the same value, when source is.
3771       */
3772 <    public void testRunAfterBothAsync2E() {
3773 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3774 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3775 <        Noop r = new Noop();
3776 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3777 <        f.completeExceptionally(new CFException());
3778 <        f2.complete(two);
3779 <        checkCompletedWithWrappedCFException(g);
3780 <
3781 <        r = new Noop();
3782 <        f = new CompletableFuture<Integer>();
3783 <        f2 = new CompletableFuture<Integer>();
3784 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3785 <        f.complete(one);
3786 <        f2.completeExceptionally(new CFException());
3787 <        checkCompletedWithWrappedCFException(g);
3788 <    }
3772 >    public void testCopy_normalCompletion() {
3773 >        for (boolean createIncomplete : new boolean[] { true, false })
3774 >        for (Integer v1 : new Integer[] { 1, null })
3775 >    {
3776 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3777 >        if (!createIncomplete) assertTrue(f.complete(v1));
3778 >        CompletableFuture<Integer> g = f.copy();
3779 >        if (createIncomplete) {
3780 >            checkIncomplete(f);
3781 >            checkIncomplete(g);
3782 >            assertTrue(f.complete(v1));
3783 >        }
3784 >        checkCompletedNormally(f, v1);
3785 >        checkCompletedNormally(g, v1);
3786 >    }}
3787 >
3788 >    /**
3789 >     * copy returns a CompletableFuture that is completed exceptionally
3790 >     * when source is.
3791 >     */
3792 >    public void testCopy_exceptionalCompletion() {
3793 >        for (boolean createIncomplete : new boolean[] { true, false })
3794 >    {
3795 >        CFException ex = new CFException();
3796 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3797 >        if (!createIncomplete) f.completeExceptionally(ex);
3798 >        CompletableFuture<Integer> g = f.copy();
3799 >        if (createIncomplete) {
3800 >            checkIncomplete(f);
3801 >            checkIncomplete(g);
3802 >            f.completeExceptionally(ex);
3803 >        }
3804 >        checkCompletedExceptionally(f, ex);
3805 >        checkCompletedWithWrappedException(g, ex);
3806 >    }}
3807  
3808      /**
3809 <     * runAfterBothAsync result completes exceptionally if action does
3810 <     */
3811 <    public void testRunAfterBothAsync3E() {
3812 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3813 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3814 <        FailingNoop r = new FailingNoop();
3815 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3816 <        f.complete(one);
3817 <        checkIncomplete(g);
3818 <        f2.complete(two);
2055 <        checkCompletedWithWrappedCFException(g);
3809 >     * Completion of a copy does not complete its source.
3810 >     */
3811 >    public void testCopy_oneWayPropagation() {
3812 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3813 >        assertTrue(f.copy().complete(1));
3814 >        assertTrue(f.copy().complete(null));
3815 >        assertTrue(f.copy().cancel(true));
3816 >        assertTrue(f.copy().cancel(false));
3817 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3818 >        checkIncomplete(f);
3819      }
3820  
3821      /**
3822 <     * runAfterBothAsync result completes exceptionally if either source cancelled
3822 >     * minimalCompletionStage returns a CompletableFuture that is
3823 >     * completed normally, with the same value, when source is.
3824       */
3825 <    public void testRunAfterBothAsync4E() {
3826 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3827 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3828 <        Noop r = new Noop();
3829 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3830 <        assertTrue(f.cancel(true));
3831 <        f2.complete(two);
3832 <        checkCompletedWithWrappedCancellationException(g);
3833 <
3834 <        r = new Noop();
3835 <        f = new CompletableFuture<Integer>();
2072 <        f2 = new CompletableFuture<Integer>();
2073 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2074 <        f.complete(one);
2075 <        assertTrue(f2.cancel(true));
2076 <        checkCompletedWithWrappedCancellationException(g);
3825 >    public void testMinimalCompletionStage() {
3826 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3827 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3828 >        AtomicInteger x = new AtomicInteger(0);
3829 >        AtomicReference<Throwable> r = new AtomicReference<>();
3830 >        checkIncomplete(f);
3831 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3832 >        f.complete(1);
3833 >        checkCompletedNormally(f, 1);
3834 >        assertEquals(x.get(), 1);
3835 >        assertNull(r.get());
3836      }
3837  
3838      /**
3839 <     * applyToEitherAsync result completes normally after normal
3840 <     * completion of sources
3839 >     * minimalCompletionStage returns a CompletableFuture that is
3840 >     * completed exceptionally when source is.
3841       */
3842 <    public void testApplyToEitherAsyncE() {
3843 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3844 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3845 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3846 <        f.complete(one);
3847 <        checkCompletedNormally(g, two);
3848 <
3849 <        f = new CompletableFuture<Integer>();
3850 <        f.complete(one);
3851 <        f2 = new CompletableFuture<Integer>();
3852 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3853 <        checkCompletedNormally(g, two);
3842 >    public void testMinimalCompletionStage2() {
3843 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3844 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3845 >        AtomicInteger x = new AtomicInteger(0);
3846 >        AtomicReference<Throwable> r = new AtomicReference<>();
3847 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3848 >        checkIncomplete(f);
3849 >        CFException ex = new CFException();
3850 >        f.completeExceptionally(ex);
3851 >        checkCompletedExceptionally(f, ex);
3852 >        assertEquals(x.get(), 0);
3853 >        assertEquals(r.get().getCause(), ex);
3854      }
3855  
3856      /**
3857 <     * applyToEitherAsync result completes exceptionally after exceptional
3858 <     * completion of source
3857 >     * failedStage returns a CompletionStage completed
3858 >     * exceptionally with the given Exception
3859       */
3860 <    public void testApplyToEitherAsync2E() {
3861 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3862 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3863 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3864 <        f.completeExceptionally(new CFException());
3865 <        checkCompletedWithWrappedCFException(g);
3866 <
3867 <        f = new CompletableFuture<Integer>();
2109 <        f2 = new CompletableFuture<Integer>();
2110 <        f2.completeExceptionally(new CFException());
2111 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2112 <        f.complete(one);
2113 <        checkCompletedWithWrappedCFException(g);
3860 >    public void testFailedStage() {
3861 >        CFException ex = new CFException();
3862 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3863 >        AtomicInteger x = new AtomicInteger(0);
3864 >        AtomicReference<Throwable> r = new AtomicReference<>();
3865 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3866 >        assertEquals(x.get(), 0);
3867 >        assertEquals(r.get(), ex);
3868      }
3869  
3870      /**
3871 <     * applyToEitherAsync result completes exceptionally if action does
3871 >     * completeAsync completes with value of given supplier
3872       */
3873 <    public void testApplyToEitherAsync3E() {
3874 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3875 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3876 <        FailingFunction r = new FailingFunction();
3877 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
3878 <        f.complete(one);
3879 <        checkCompletedWithWrappedCFException(g);
3880 <    }
3873 >    public void testCompleteAsync() {
3874 >        for (Integer v1 : new Integer[] { 1, null })
3875 >    {
3876 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3877 >        f.completeAsync(() -> v1);
3878 >        f.join();
3879 >        checkCompletedNormally(f, v1);
3880 >    }}
3881  
3882      /**
3883 <     * applyToEitherAsync result completes exceptionally if either source cancelled
3883 >     * completeAsync completes exceptionally if given supplier throws
3884       */
3885 <    public void testApplyToEitherAsync4E() {
3886 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3887 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3888 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3889 <        assertTrue(f.cancel(true));
3890 <        checkCompletedWithWrappedCancellationException(g);
3891 <
3892 <        f = new CompletableFuture<Integer>();
3893 <        f2 = new CompletableFuture<Integer>();
2140 <        assertTrue(f2.cancel(true));
2141 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2142 <        checkCompletedWithWrappedCancellationException(g);
3885 >    public void testCompleteAsync2() {
3886 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3887 >        CFException ex = new CFException();
3888 >        f.completeAsync(() -> { throw ex; });
3889 >        try {
3890 >            f.join();
3891 >            shouldThrow();
3892 >        } catch (CompletionException success) {}
3893 >        checkCompletedWithWrappedException(f, ex);
3894      }
3895  
3896      /**
3897 <     * acceptEitherAsync result completes normally after normal
2147 <     * completion of sources
3897 >     * completeAsync with given executor completes with value of given supplier
3898       */
3899 <    public void testAcceptEitherAsyncE() {
3900 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3901 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3902 <        IncAction r = new IncAction();
3903 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3904 <        f.complete(one);
3905 <        checkCompletedNormally(g, null);
3906 <        assertEquals(r.value, 2);
3907 <
3908 <        r = new IncAction();
2159 <        f = new CompletableFuture<Integer>();
2160 <        f.complete(one);
2161 <        f2 = new CompletableFuture<Integer>();
2162 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2163 <        checkCompletedNormally(g, null);
2164 <        assertEquals(r.value, 2);
2165 <    }
3899 >    public void testCompleteAsync3() {
3900 >        for (Integer v1 : new Integer[] { 1, null })
3901 >    {
3902 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3903 >        ThreadExecutor executor = new ThreadExecutor();
3904 >        f.completeAsync(() -> v1, executor);
3905 >        assertSame(v1, f.join());
3906 >        checkCompletedNormally(f, v1);
3907 >        assertEquals(1, executor.count.get());
3908 >    }}
3909  
3910      /**
3911 <     * acceptEitherAsync result completes exceptionally after exceptional
3912 <     * completion of source
3911 >     * completeAsync with given executor completes exceptionally if
3912 >     * given supplier throws
3913       */
3914 <    public void testAcceptEitherAsync2E() {
3915 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3916 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
3917 <        IncAction r = new IncAction();
3918 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3919 <        f.completeExceptionally(new CFException());
3920 <        checkCompletedWithWrappedCFException(g);
3914 >    public void testCompleteAsync4() {
3915 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3916 >        CFException ex = new CFException();
3917 >        ThreadExecutor executor = new ThreadExecutor();
3918 >        f.completeAsync(() -> { throw ex; }, executor);
3919 >        try {
3920 >            f.join();
3921 >            shouldThrow();
3922 >        } catch (CompletionException success) {}
3923 >        checkCompletedWithWrappedException(f, ex);
3924 >        assertEquals(1, executor.count.get());
3925 >    }
3926 >
3927 >    /**
3928 >     * orTimeout completes with TimeoutException if not complete
3929 >     */
3930 >    public void testOrTimeout_timesOut() {
3931 >        long timeoutMillis = timeoutMillis();
3932 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3933 >        long startTime = System.nanoTime();
3934 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3935 >        checkCompletedWithTimeoutException(f);
3936 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3937 >    }
3938 >
3939 >    /**
3940 >     * orTimeout completes normally if completed before timeout
3941 >     */
3942 >    public void testOrTimeout_completed() {
3943 >        for (Integer v1 : new Integer[] { 1, null })
3944 >    {
3945 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3946 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3947 >        long startTime = System.nanoTime();
3948 >        f.complete(v1);
3949 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3950 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3951 >        g.complete(v1);
3952 >        checkCompletedNormally(f, v1);
3953 >        checkCompletedNormally(g, v1);
3954 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3955 >    }}
3956 >
3957 >    /**
3958 >     * completeOnTimeout completes with given value if not complete
3959 >     */
3960 >    public void testCompleteOnTimeout_timesOut() {
3961 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3962 >                       () -> testCompleteOnTimeout_timesOut(null));
3963 >    }
3964 >
3965 >    /**
3966 >     * completeOnTimeout completes with given value if not complete
3967 >     */
3968 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3969 >        long timeoutMillis = timeoutMillis();
3970 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3971 >        long startTime = System.nanoTime();
3972 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3973 >        assertSame(v, f.join());
3974 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3975 >        f.complete(99);         // should have no effect
3976 >        checkCompletedNormally(f, v);
3977 >    }
3978 >
3979 >    /**
3980 >     * completeOnTimeout has no effect if completed within timeout
3981 >     */
3982 >    public void testCompleteOnTimeout_completed() {
3983 >        for (Integer v1 : new Integer[] { 1, null })
3984 >    {
3985 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3986 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3987 >        long startTime = System.nanoTime();
3988 >        f.complete(v1);
3989 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3990 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3991 >        g.complete(v1);
3992 >        checkCompletedNormally(f, v1);
3993 >        checkCompletedNormally(g, v1);
3994 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3995 >    }}
3996 >
3997 >    /**
3998 >     * delayedExecutor returns an executor that delays submission
3999 >     */
4000 >    public void testDelayedExecutor() {
4001 >        testInParallel(() -> testDelayedExecutor(null, null),
4002 >                       () -> testDelayedExecutor(null, 1),
4003 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
4004 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
4005 >    }
4006 >
4007 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
4008 >        long timeoutMillis = timeoutMillis();
4009 >        // Use an "unreasonably long" long timeout to catch lingering threads
4010 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
4011 >        final Executor delayer, longDelayer;
4012 >        if (executor == null) {
4013 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
4014 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
4015 >        } else {
4016 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
4017 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
4018 >        }
4019 >        long startTime = System.nanoTime();
4020 >        CompletableFuture<Integer> f =
4021 >            CompletableFuture.supplyAsync(() -> v, delayer);
4022 >        CompletableFuture<Integer> g =
4023 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
4024 >
4025 >        assertNull(g.getNow(null));
4026 >
4027 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
4028 >        long millisElapsed = millisElapsedSince(startTime);
4029 >        assertTrue(millisElapsed >= timeoutMillis);
4030 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
4031  
4032 <        r = new IncAction();
2180 <        f = new CompletableFuture<Integer>();
2181 <        f2 = new CompletableFuture<Integer>();
2182 <        f2.completeExceptionally(new CFException());
2183 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2184 <        f.complete(one);
2185 <        checkCompletedWithWrappedCFException(g);
2186 <    }
4032 >        checkCompletedNormally(f, v);
4033  
4034 <    /**
4035 <     * acceptEitherAsync result completes exceptionally if action does
2190 <     */
2191 <    public void testAcceptEitherAsync3E() {
2192 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2193 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2194 <        FailingConsumer r = new FailingConsumer();
2195 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2196 <        f.complete(one);
2197 <        checkCompletedWithWrappedCFException(g);
4034 >        checkIncomplete(g);
4035 >        assertTrue(g.cancel(true));
4036      }
4037  
4038 <    /**
2201 <     * acceptEitherAsync result completes exceptionally if either
2202 <     * source cancelled
2203 <     */
2204 <    public void testAcceptEitherAsync4E() {
2205 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2206 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2207 <        IncAction r = new IncAction();
2208 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2209 <        assertTrue(f.cancel(true));
2210 <        checkCompletedWithWrappedCancellationException(g);
4038 >    //--- tests of implementation details; not part of official tck ---
4039  
4040 <        r = new IncAction();
4041 <        f = new CompletableFuture<Integer>();
4042 <        f2 = new CompletableFuture<Integer>();
4043 <        assertTrue(f2.cancel(true));
4044 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
4045 <        checkCompletedWithWrappedCancellationException(g);
4040 >    Object resultOf(CompletableFuture<?> f) {
4041 >        SecurityManager sm = System.getSecurityManager();
4042 >        if (sm != null) {
4043 >            try {
4044 >                System.setSecurityManager(null);
4045 >            } catch (SecurityException giveUp) {
4046 >                return "Reflection not available";
4047 >            }
4048 >        }
4049 >
4050 >        try {
4051 >            java.lang.reflect.Field resultField
4052 >                = CompletableFuture.class.getDeclaredField("result");
4053 >            resultField.setAccessible(true);
4054 >            return resultField.get(f);
4055 >        } catch (Throwable t) {
4056 >            throw new AssertionError(t);
4057 >        } finally {
4058 >            if (sm != null) System.setSecurityManager(sm);
4059 >        }
4060      }
4061  
4062 <    /**
4063 <     * runAfterEitherAsync result completes normally after normal
4064 <     * completion of sources
4065 <     */
4066 <    public void testRunAfterEitherAsyncE() {
4067 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4068 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
4069 <        Noop r = new Noop();
4070 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
4071 <        f.complete(one);
4072 <        checkCompletedNormally(g, null);
4073 <        assertTrue(r.ran);
4062 >    public void testExceptionPropagationReusesResultObject() {
4063 >        if (!testImplementationDetails) return;
4064 >        for (ExecutionMode m : ExecutionMode.values())
4065 >    {
4066 >        final CFException ex = new CFException();
4067 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4068 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4069 >
4070 >        final Runnable noopRunnable = new Noop(m);
4071 >        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4072 >        final Function<Integer, Integer> incFunction = new IncFunction(m);
4073 >
4074 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4075 >            = new ArrayList<>();
4076 >
4077 >        funs.add(y -> m.thenRun(y, noopRunnable));
4078 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4079 >        funs.add(y -> m.thenApply(y, incFunction));
4080 >
4081 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4082 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4083 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4084 >
4085 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4086 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4087 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4088 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4089 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4090 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4091 >
4092 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4093 >
4094 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4095 >
4096 >        funs.add(y -> CompletableFuture.allOf(y));
4097 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4098 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4099 >        funs.add(y -> CompletableFuture.anyOf(y));
4100 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4101 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4102 >
4103 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4104 >                 fun : funs) {
4105 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4106 >            f.completeExceptionally(ex);
4107 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4108 >            checkCompletedWithWrappedException(src, ex);
4109 >            CompletableFuture<?> dep = fun.apply(src);
4110 >            checkCompletedWithWrappedException(dep, ex);
4111 >            assertSame(resultOf(src), resultOf(dep));
4112 >        }
4113  
4114 <        r = new Noop();
4115 <        f = new CompletableFuture<Integer>();
4116 <        f.complete(one);
4117 <        f2 = new CompletableFuture<Integer>();
4118 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
4119 <        checkCompletedNormally(g, null);
4120 <        assertTrue(r.ran);
4121 <    }
4114 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4115 >                 fun : funs) {
4116 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4117 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4118 >            CompletableFuture<?> dep = fun.apply(src);
4119 >            f.completeExceptionally(ex);
4120 >            checkCompletedWithWrappedException(src, ex);
4121 >            checkCompletedWithWrappedException(dep, ex);
4122 >            assertSame(resultOf(src), resultOf(dep));
4123 >        }
4124  
4125 <    /**
4126 <     * runAfterEitherAsync result completes exceptionally after exceptional
4127 <     * completion of source
4128 <     */
4129 <    public void testRunAfterEitherAsync2E() {
4130 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4131 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
4132 <        Noop r = new Noop();
4133 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
4134 <        f.completeExceptionally(new CFException());
4135 <        checkCompletedWithWrappedCFException(g);
4125 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4126 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4127 >                 fun : funs) {
4128 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4129 >            f.cancel(mayInterruptIfRunning);
4130 >            checkCancelled(f);
4131 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4132 >            checkCompletedWithWrappedCancellationException(src);
4133 >            CompletableFuture<?> dep = fun.apply(src);
4134 >            checkCompletedWithWrappedCancellationException(dep);
4135 >            assertSame(resultOf(src), resultOf(dep));
4136 >        }
4137  
4138 <        r = new Noop();
4139 <        f = new CompletableFuture<Integer>();
4140 <        f2 = new CompletableFuture<Integer>();
4141 <        f2.completeExceptionally(new CFException());
4142 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
4143 <        f.complete(one);
4144 <        checkCompletedWithWrappedCFException(g);
4145 <    }
4138 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4139 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4140 >                 fun : funs) {
4141 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4142 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4143 >            CompletableFuture<?> dep = fun.apply(src);
4144 >            f.cancel(mayInterruptIfRunning);
4145 >            checkCancelled(f);
4146 >            checkCompletedWithWrappedCancellationException(src);
4147 >            checkCompletedWithWrappedCancellationException(dep);
4148 >            assertSame(resultOf(src), resultOf(dep));
4149 >        }
4150 >    }}
4151  
4152      /**
4153 <     * runAfterEitherAsync result completes exceptionally if action does
4153 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4154       */
4155 <    public void testRunAfterEitherAsync3E() {
4156 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4157 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
4158 <        FailingNoop r = new FailingNoop();
4159 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
4160 <        f.complete(one);
4161 <        checkCompletedWithWrappedCFException(g);
4155 >    public void testMinimalCompletionStage_minimality() {
4156 >        if (!testImplementationDetails) return;
4157 >        Function<Method, String> toSignature =
4158 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4159 >        Predicate<Method> isNotStatic =
4160 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4161 >        List<Method> minimalMethods =
4162 >            Stream.of(Object.class, CompletionStage.class)
4163 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4164 >            .filter(isNotStatic)
4165 >            .collect(Collectors.toList());
4166 >        // Methods from CompletableFuture permitted NOT to throw UOE
4167 >        String[] signatureWhitelist = {
4168 >            "newIncompleteFuture[]",
4169 >            "defaultExecutor[]",
4170 >            "minimalCompletionStage[]",
4171 >            "copy[]",
4172 >        };
4173 >        Set<String> permittedMethodSignatures =
4174 >            Stream.concat(minimalMethods.stream().map(toSignature),
4175 >                          Stream.of(signatureWhitelist))
4176 >            .collect(Collectors.toSet());
4177 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4178 >            .filter(isNotStatic)
4179 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4180 >            .collect(Collectors.toList());
4181 >
4182 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4183 >        CompletionStage<Integer> min =
4184 >            new CompletableFuture<Integer>().minimalCompletionStage();
4185 >        stages.add(min);
4186 >        stages.add(min.thenApply(x -> x));
4187 >        stages.add(CompletableFuture.completedStage(1));
4188 >        stages.add(CompletableFuture.failedStage(new CFException()));
4189 >
4190 >        List<Method> bugs = new ArrayList<>();
4191 >        for (Method method : allMethods) {
4192 >            Class<?>[] parameterTypes = method.getParameterTypes();
4193 >            Object[] args = new Object[parameterTypes.length];
4194 >            // Manufacture boxed primitives for primitive params
4195 >            for (int i = 0; i < args.length; i++) {
4196 >                Class<?> type = parameterTypes[i];
4197 >                if (parameterTypes[i] == boolean.class)
4198 >                    args[i] = false;
4199 >                else if (parameterTypes[i] == int.class)
4200 >                    args[i] = 0;
4201 >                else if (parameterTypes[i] == long.class)
4202 >                    args[i] = 0L;
4203 >            }
4204 >            for (CompletionStage<Integer> stage : stages) {
4205 >                try {
4206 >                    method.invoke(stage, args);
4207 >                    bugs.add(method);
4208 >                }
4209 >                catch (java.lang.reflect.InvocationTargetException expected) {
4210 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4211 >                        bugs.add(method);
4212 >                        // expected.getCause().printStackTrace();
4213 >                    }
4214 >                }
4215 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4216 >            }
4217 >        }
4218 >        if (!bugs.isEmpty())
4219 >            throw new Error("Methods did not throw UOE: " + bugs);
4220      }
4221  
4222      /**
4223 <     * runAfterEitherAsync result completes exceptionally if either
4224 <     * source cancelled
4223 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4224 >     * is completed normally, with the same value, when source is.
4225       */
4226 <    public void testRunAfterEitherAsync4E() {
4227 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4228 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
4229 <        Noop r = new Noop();
4230 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
4231 <        assertTrue(f.cancel(true));
4232 <        checkCompletedWithWrappedCancellationException(g);
4233 <
4234 <        r = new Noop();
4235 <        f = new CompletableFuture<Integer>();
4236 <        f2 = new CompletableFuture<Integer>();
4237 <        assertTrue(f2.cancel(true));
4238 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
4239 <        checkCompletedWithWrappedCancellationException(g);
4240 <    }
4226 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4227 >        for (boolean createIncomplete : new boolean[] { true, false })
4228 >        for (Integer v1 : new Integer[] { 1, null })
4229 >    {
4230 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4231 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4232 >        if (!createIncomplete) assertTrue(f.complete(v1));
4233 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4234 >        if (createIncomplete) {
4235 >            checkIncomplete(f);
4236 >            checkIncomplete(g);
4237 >            assertTrue(f.complete(v1));
4238 >        }
4239 >        checkCompletedNormally(f, v1);
4240 >        checkCompletedNormally(g, v1);
4241 >    }}
4242 >
4243 >    /**
4244 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4245 >     * is completed exceptionally when source is.
4246 >     */
4247 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4248 >        for (boolean createIncomplete : new boolean[] { true, false })
4249 >    {
4250 >        CFException ex = new CFException();
4251 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4252 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4253 >        if (!createIncomplete) f.completeExceptionally(ex);
4254 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4255 >        if (createIncomplete) {
4256 >            checkIncomplete(f);
4257 >            checkIncomplete(g);
4258 >            f.completeExceptionally(ex);
4259 >        }
4260 >        checkCompletedExceptionally(f, ex);
4261 >        checkCompletedWithWrappedException(g, ex);
4262 >    }}
4263  
4264      /**
4265 <     * thenCompse result completes normally after normal completion of source
4266 <     */
4267 <    public void testThenComposeAsyncE() {
4268 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4269 <        CompletableFutureInc r = new CompletableFutureInc();
4270 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
4271 <        f.complete(one);
4272 <        checkCompletedNormally(g, two);
4273 <    }
4265 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4266 >     */
4267 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4268 >        for (Integer v1 : new Integer[] { 1, null })
4269 >    {
4270 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4271 >        CompletionStage minimal = f.minimalCompletionStage();
4272 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4273 >        assertTrue(g.complete(v1));
4274 >        checkCompletedNormally(g, v1);
4275 >        checkIncomplete(f);
4276 >        checkIncomplete(minimal.toCompletableFuture());
4277 >    }}
4278  
4279      /**
4280 <     * thenComposeAsync result completes exceptionally after exceptional
2308 <     * completion of source
4280 >     * minimalStage.toCompletableFuture().join() awaits completion
4281       */
4282 <    public void testThenComposeAsync2E() {
4283 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4284 <        CompletableFutureInc r = new CompletableFutureInc();
4285 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
4286 <        f.completeExceptionally(new CFException());
4287 <        checkCompletedWithWrappedCFException(g);
4282 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4283 >        for (boolean createIncomplete : new boolean[] { true, false })
4284 >        for (Integer v1 : new Integer[] { 1, null })
4285 >    {
4286 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4287 >        if (!createIncomplete) assertTrue(f.complete(v1));
4288 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4289 >        if (createIncomplete) assertTrue(f.complete(v1));
4290 >        assertEquals(v1, minimal.toCompletableFuture().join());
4291 >        assertEquals(v1, minimal.toCompletableFuture().get());
4292 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4293 >    }}
4294 >
4295 >    /**
4296 >     * Completion of a toCompletableFuture copy of a minimal stage
4297 >     * does not complete its source.
4298 >     */
4299 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4300 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4301 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4302 >        assertTrue(g.toCompletableFuture().complete(1));
4303 >        assertTrue(g.toCompletableFuture().complete(null));
4304 >        assertTrue(g.toCompletableFuture().cancel(true));
4305 >        assertTrue(g.toCompletableFuture().cancel(false));
4306 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4307 >        checkIncomplete(g.toCompletableFuture());
4308 >        f.complete(1);
4309 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4310      }
4311  
4312 <    /**
4313 <     * thenComposeAsync result completes exceptionally if action does
4314 <     */
4315 <    public void testThenComposeAsync3E() {
4316 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4317 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
4318 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
4319 <        f.complete(one);
4320 <        checkCompletedWithWrappedCFException(g);
4312 >    /** Demo utility method for external reliable toCompletableFuture */
4313 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4314 >        CompletableFuture<T> f = new CompletableFuture<>();
4315 >        stage.handle((T t, Throwable ex) -> {
4316 >                         if (ex != null) f.completeExceptionally(ex);
4317 >                         else f.complete(t);
4318 >                         return null;
4319 >                     });
4320 >        return f;
4321 >    }
4322 >
4323 >    /** Demo utility method to join a CompletionStage */
4324 >    static <T> T join(CompletionStage<T> stage) {
4325 >        return toCompletableFuture(stage).join();
4326      }
4327  
4328      /**
4329 <     * thenComposeAsync result completes exceptionally if source cancelled
4330 <     */
4331 <    public void testThenComposeAsync4E() {
4332 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4333 <        CompletableFutureInc r = new CompletableFutureInc();
4334 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
4335 <        assertTrue(f.cancel(true));
4336 <        checkCompletedWithWrappedCancellationException(g);
4337 <    }
4329 >     * Joining a minimal stage "by hand" works
4330 >     */
4331 >    public void testMinimalCompletionStage_join_by_hand() {
4332 >        for (boolean createIncomplete : new boolean[] { true, false })
4333 >        for (Integer v1 : new Integer[] { 1, null })
4334 >    {
4335 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4336 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4337 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4338 >        if (!createIncomplete) assertTrue(f.complete(v1));
4339 >        minimal.thenAccept(x -> g.complete(x));
4340 >        if (createIncomplete) assertTrue(f.complete(v1));
4341 >        g.join();
4342 >        checkCompletedNormally(g, v1);
4343 >        checkCompletedNormally(f, v1);
4344 >        assertEquals(v1, join(minimal));
4345 >    }}
4346 >
4347 >    static class Monad {
4348 >        static class ZeroException extends RuntimeException {
4349 >            public ZeroException() { super("monadic zero"); }
4350 >        }
4351 >        // "return", "unit"
4352 >        static <T> CompletableFuture<T> unit(T value) {
4353 >            return completedFuture(value);
4354 >        }
4355 >        // monadic zero ?
4356 >        static <T> CompletableFuture<T> zero() {
4357 >            return failedFuture(new ZeroException());
4358 >        }
4359 >        // >=>
4360 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4361 >            (Function<T, CompletableFuture<U>> f,
4362 >             Function<U, CompletableFuture<V>> g) {
4363 >            return x -> f.apply(x).thenCompose(g);
4364 >        }
4365  
4366 <    // other static methods
4366 >        static void assertZero(CompletableFuture<?> f) {
4367 >            try {
4368 >                f.getNow(null);
4369 >                throw new AssertionError("should throw");
4370 >            } catch (CompletionException success) {
4371 >                assertTrue(success.getCause() instanceof ZeroException);
4372 >            }
4373 >        }
4374  
4375 <    /**
4376 <     * allOf(no component futures) returns a future completed normally
4377 <     * with the value null
4378 <     */
4379 <    public void testAllOf_empty() throws Exception {
4380 <        CompletableFuture<?> f = CompletableFuture.allOf();
4381 <        checkCompletedNormally(f, null);
4382 <    }
4375 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4376 >                                           CompletableFuture<T> g) {
4377 >            T fval = null, gval = null;
4378 >            Throwable fex = null, gex = null;
4379 >
4380 >            try { fval = f.get(); }
4381 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4382 >            catch (Throwable ex) { fex = ex; }
4383 >
4384 >            try { gval = g.get(); }
4385 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4386 >            catch (Throwable ex) { gex = ex; }
4387 >
4388 >            if (fex != null || gex != null)
4389 >                assertSame(fex.getClass(), gex.getClass());
4390 >            else
4391 >                assertEquals(fval, gval);
4392 >        }
4393  
4394 <    /**
4395 <     * allOf returns a future completed when all components complete
2353 <     */
2354 <    public void testAllOf() throws Exception {
2355 <        for (int k = 1; k < 20; ++k) {
2356 <            CompletableFuture[] fs = new CompletableFuture[k];
2357 <            for (int i = 0; i < k; ++i)
2358 <                fs[i] = new CompletableFuture<Integer>();
2359 <            CompletableFuture<?> f = CompletableFuture.allOf(fs);
2360 <            for (int i = 0; i < k; ++i) {
2361 <                checkIncomplete(f);
2362 <                fs[i].complete(one);
2363 <            }
2364 <            assertTrue(f.isDone());
2365 <            assertFalse(f.isCancelled());
4394 >        static class PlusFuture<T> extends CompletableFuture<T> {
4395 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4396          }
2367    }
4397  
4398 <    /**
4399 <     * anyOf(no component futures) returns an incomplete future
4400 <     */
4401 <    public void testAnyOf_empty() throws Exception {
4402 <        CompletableFuture<?> f = CompletableFuture.anyOf();
4403 <        checkIncomplete(f);
4398 >        /** Implements "monadic plus". */
4399 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4400 >                                             CompletableFuture<? extends T> g) {
4401 >            PlusFuture<T> plus = new PlusFuture<T>();
4402 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4403 >                try {
4404 >                    if (ex == null) {
4405 >                        if (plus.complete(result))
4406 >                            if (plus.firstFailure.get() != null)
4407 >                                plus.firstFailure.set(null);
4408 >                    }
4409 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4410 >                        if (plus.isDone())
4411 >                            plus.firstFailure.set(null);
4412 >                    }
4413 >                    else {
4414 >                        // first failure has precedence
4415 >                        Throwable first = plus.firstFailure.getAndSet(null);
4416 >
4417 >                        // may fail with "Self-suppression not permitted"
4418 >                        try { first.addSuppressed(ex); }
4419 >                        catch (Exception ignored) {}
4420 >
4421 >                        plus.completeExceptionally(first);
4422 >                    }
4423 >                } catch (Throwable unexpected) {
4424 >                    plus.completeExceptionally(unexpected);
4425 >                }
4426 >            };
4427 >            f.whenComplete(action);
4428 >            g.whenComplete(action);
4429 >            return plus;
4430 >        }
4431      }
4432  
4433      /**
4434 <     * allOf returns a future completed when any components complete
4434 >     * CompletableFuture is an additive monad - sort of.
4435 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4436       */
4437 <    public void testAnyOf() throws Exception {
4438 <        for (int k = 1; k < 20; ++k) {
4439 <            CompletableFuture[] fs = new CompletableFuture[k];
4440 <            for (int i = 0; i < k; ++i)
4441 <                fs[i] = new CompletableFuture<Integer>();
4442 <            CompletableFuture<?> f = CompletableFuture.anyOf(fs);
4443 <            checkIncomplete(f);
4444 <            for (int i = 0; i < k; ++i) {
4445 <                fs[i].complete(one);
4446 <                assertTrue(f.isDone());
4447 <            }
4437 >    public void testAdditiveMonad() throws Throwable {
4438 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4439 >        CompletableFuture<Long> zero = Monad.zero();
4440 >
4441 >        // Some mutually non-commutative functions
4442 >        Function<Long, CompletableFuture<Long>> triple
4443 >            = x -> Monad.unit(3 * x);
4444 >        Function<Long, CompletableFuture<Long>> inc
4445 >            = x -> Monad.unit(x + 1);
4446 >
4447 >        // unit is a right identity: m >>= unit === m
4448 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4449 >                                 inc.apply(5L));
4450 >        // unit is a left identity: (unit x) >>= f === f x
4451 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4452 >                                 inc.apply(5L));
4453 >
4454 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4455 >        Monad.assertFutureEquals(
4456 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4457 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4458 >
4459 >        // The case for CompletableFuture as an additive monad is weaker...
4460 >
4461 >        // zero is a monadic zero
4462 >        Monad.assertZero(zero);
4463 >
4464 >        // left zero: zero >>= f === zero
4465 >        Monad.assertZero(zero.thenCompose(inc));
4466 >        // right zero: f >>= (\x -> zero) === zero
4467 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4468 >
4469 >        // f plus zero === f
4470 >        Monad.assertFutureEquals(Monad.unit(5L),
4471 >                                 Monad.plus(Monad.unit(5L), zero));
4472 >        // zero plus f === f
4473 >        Monad.assertFutureEquals(Monad.unit(5L),
4474 >                                 Monad.plus(zero, Monad.unit(5L)));
4475 >        // zero plus zero === zero
4476 >        Monad.assertZero(Monad.plus(zero, zero));
4477 >        {
4478 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4479 >                                                   Monad.unit(8L));
4480 >            // non-determinism
4481 >            assertTrue(f.get() == 5L || f.get() == 8L);
4482          }
4483 +
4484 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4485 +        // f plus godot === f (doesn't wait for godot)
4486 +        Monad.assertFutureEquals(Monad.unit(5L),
4487 +                                 Monad.plus(Monad.unit(5L), godot));
4488 +        // godot plus f === f (doesn't wait for godot)
4489 +        Monad.assertFutureEquals(Monad.unit(5L),
4490 +                                 Monad.plus(godot, Monad.unit(5L)));
4491 +    }
4492 +
4493 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4494 +    @SuppressWarnings("FutureReturnValueIgnored")
4495 +    public void testRecursiveChains() throws Throwable {
4496 +        for (ExecutionMode m : ExecutionMode.values())
4497 +        for (boolean addDeadEnds : new boolean[] { true, false })
4498 +    {
4499 +        final int val = 42;
4500 +        final int n = expensiveTests ? 1_000 : 2;
4501 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4502 +        CompletableFuture<Integer> tail = head;
4503 +        for (int i = 0; i < n; i++) {
4504 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4505 +            tail = m.thenApply(tail, v -> v + 1);
4506 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4507 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4508 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4509 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4510 +        }
4511 +        head.complete(val);
4512 +        assertEquals(val + 3 * n, (int) tail.join());
4513 +    }}
4514 +
4515 +    /**
4516 +     * A single CompletableFuture with many dependents.
4517 +     * A demo of scalability - runtime is O(n).
4518 +     */
4519 +    @SuppressWarnings("FutureReturnValueIgnored")
4520 +    public void testManyDependents() throws Throwable {
4521 +        final int n = expensiveTests ? 1_000_000 : 10;
4522 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4523 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4524 +        final AtomicInteger count = new AtomicInteger(0);
4525 +        for (int i = 0; i < n; i++) {
4526 +            head.thenRun(() -> count.getAndIncrement());
4527 +            head.thenAccept(x -> count.getAndIncrement());
4528 +            head.thenApply(x -> count.getAndIncrement());
4529 +
4530 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4531 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4532 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4533 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4534 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4535 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4536 +
4537 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4538 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4539 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4540 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4541 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4542 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4543 +        }
4544 +        head.complete(null);
4545 +        assertEquals(5 * 3 * n, count.get());
4546      }
4547  
4548 <    /**
4549 <     * Completion methods throw NullPointerException with null arguments
4550 <     */
4551 <    public void testNPE() {
4552 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
4553 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
4554 <        CompletableFuture h;
4555 <        try { h = f.thenApply(null); } catch (NullPointerException ok) {}
4556 <        try { h = f.thenAccept(null); } catch (NullPointerException ok) {}
4557 <        try { h = f.thenRun(null); } catch (NullPointerException ok) {}
4558 <        try { h = f.thenCombine(g, null); } catch (NullPointerException ok) {}
4559 <        try { h = f.thenCombine(null, null); } catch (NullPointerException ok) {}
4560 <        try { h = f.applyToEither(g, null); } catch (NullPointerException ok) {}
4561 <        try { h = f.applyToEither(null, null); } catch (NullPointerException ok) {}
4562 <        try { h = f.thenAcceptBoth(g, null); } catch (NullPointerException ok) {}
4563 <        try { h = f.thenAcceptBoth(null, null); } catch (NullPointerException ok) {}
4564 <        try { h = f.runAfterEither(g, null); } catch (NullPointerException ok) {}
4565 <        try { h = f.runAfterEither(null, null); } catch (NullPointerException ok) {}
4566 <        try { h = f.runAfterBoth(g, null); } catch (NullPointerException ok) {}
4567 <        try { h = f.runAfterBoth(null, null); } catch (NullPointerException ok) {}
4568 <        try { h = f.exceptionally(null); } catch (NullPointerException ok) {}
4569 <        try { h = f.handle(null); } catch (NullPointerException ok) {}
4570 <        try { h = f.thenCompose(null); } catch (NullPointerException ok) {}
2417 <
2418 <        try { h = f.thenApplyAsync(null); } catch (NullPointerException ok) {}
2419 <        try { h = f.thenAcceptAsync(null); } catch (NullPointerException ok) {}
2420 <        try { h = f.thenRunAsync(null); } catch (NullPointerException ok) {}
2421 <        try { h = f.thenCombineAsync(g, null); } catch (NullPointerException ok) {}
2422 <        try { h = f.thenCombineAsync(null, null); } catch (NullPointerException ok) {}
2423 <        try { h = f.applyToEitherAsync(g, null); } catch (NullPointerException ok) {}
2424 <        try { h = f.applyToEitherAsync(null, null); } catch (NullPointerException ok) {}
2425 <        try { h = f.thenAcceptBothAsync(g, null); } catch (NullPointerException ok) {}
2426 <        try { h = f.thenAcceptBothAsync(null, null); } catch (NullPointerException ok) {}
2427 <        try { h = f.runAfterEitherAsync(g, null); } catch (NullPointerException ok) {}
2428 <        try { h = f.runAfterEitherAsync(null, null); } catch (NullPointerException ok) {}
2429 <        try { h = f.runAfterBothAsync(g, null); } catch (NullPointerException ok) {}
2430 <        try { h = f.runAfterBothAsync(null, null); } catch (NullPointerException ok) {}
4548 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4549 >    @SuppressWarnings("FutureReturnValueIgnored")
4550 >    public void testCoCompletionGarbageRetention() throws Throwable {
4551 >        final int n = expensiveTests ? 1_000_000 : 10;
4552 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4553 >        CompletableFuture<Integer> f;
4554 >        for (int i = 0; i < n; i++) {
4555 >            f = new CompletableFuture<>();
4556 >            f.runAfterEither(incomplete, () -> {});
4557 >            f.complete(null);
4558 >
4559 >            f = new CompletableFuture<>();
4560 >            f.acceptEither(incomplete, x -> {});
4561 >            f.complete(null);
4562 >
4563 >            f = new CompletableFuture<>();
4564 >            f.applyToEither(incomplete, x -> x);
4565 >            f.complete(null);
4566 >
4567 >            f = new CompletableFuture<>();
4568 >            CompletableFuture.anyOf(f, incomplete);
4569 >            f.complete(null);
4570 >        }
4571  
4572 +        for (int i = 0; i < n; i++) {
4573 +            f = new CompletableFuture<>();
4574 +            incomplete.runAfterEither(f, () -> {});
4575 +            f.complete(null);
4576 +
4577 +            f = new CompletableFuture<>();
4578 +            incomplete.acceptEither(f, x -> {});
4579 +            f.complete(null);
4580 +
4581 +            f = new CompletableFuture<>();
4582 +            incomplete.applyToEither(f, x -> x);
4583 +            f.complete(null);
4584 +
4585 +            f = new CompletableFuture<>();
4586 +            CompletableFuture.anyOf(incomplete, f);
4587 +            f.complete(null);
4588 +        }
4589      }
4590  
4591 +    /**
4592 +     * Reproduction recipe for:
4593 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4594 +     * cvs update -D '2016-05-01' ./src/main/java/util/concurrent/CompletableFuture.java && ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testAnyOfGarbageRetention tck; cvs update -A
4595 +     */
4596 +    public void testAnyOfGarbageRetention() throws Throwable {
4597 +        for (Integer v : new Integer[] { 1, null })
4598 +    {
4599 +        final int n = expensiveTests ? 100_000 : 10;
4600 +        CompletableFuture<Integer>[] fs
4601 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4602 +        for (int i = 0; i < fs.length; i++)
4603 +            fs[i] = new CompletableFuture<>();
4604 +        fs[fs.length - 1].complete(v);
4605 +        for (int i = 0; i < n; i++)
4606 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4607 +    }}
4608 +
4609 +    /**
4610 +     * Checks for garbage retention with allOf.
4611 +     *
4612 +     * As of 2016-07, fails with OOME:
4613 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4614 +     */
4615 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4616 +        final int n = expensiveTests ? 100_000 : 10;
4617 +        CompletableFuture<Integer>[] fs
4618 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4619 +        for (int i = 0; i < fs.length; i++)
4620 +            fs[i] = new CompletableFuture<>();
4621 +        for (int i = 0; i < n; i++)
4622 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4623 +    }
4624 +
4625 +    /**
4626 +     * Checks for garbage retention when a dependent future is
4627 +     * cancelled and garbage-collected.
4628 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4629 +     *
4630 +     * As of 2016-07, fails with OOME:
4631 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4632 +     */
4633 +    public void testCancelledGarbageRetention() throws Throwable {
4634 +        final int n = expensiveTests ? 100_000 : 10;
4635 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4636 +        for (int i = 0; i < n; i++)
4637 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4638 +    }
4639 +
4640 +    /**
4641 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4642 +     * is invoked many times.
4643 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4644 +     *
4645 +     * As of 2016-07, fails with OOME:
4646 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4647 +     */
4648 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4649 +        final int n = expensiveTests ? 900_000 : 10;
4650 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4651 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4652 +        for (int i = 0; i < n; i++)
4653 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4654 +    }
4655 +
4656 + //     static <U> U join(CompletionStage<U> stage) {
4657 + //         CompletableFuture<U> f = new CompletableFuture<>();
4658 + //         stage.whenComplete((v, ex) -> {
4659 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4660 + //         });
4661 + //         return f.join();
4662 + //     }
4663 +
4664 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4665 + //         CompletableFuture<U> f = new CompletableFuture<>();
4666 + //         stage.whenComplete((v, ex) -> {
4667 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4668 + //         });
4669 + //         return f.isDone();
4670 + //     }
4671 +
4672 + //     static <U> U join2(CompletionStage<U> stage) {
4673 + //         return stage.toCompletableFuture().copy().join();
4674 + //     }
4675 +
4676 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4677 + //         return stage.toCompletableFuture().copy().isDone();
4678 + //     }
4679 +
4680 +    // For testing default implementations
4681 +    // Only non-default interface methods defined.
4682 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4683 +        final CompletableFuture<T> cf;
4684 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4685 +        public CompletableFuture<T> toCompletableFuture() {
4686 +            return cf; }
4687 +        public CompletionStage<Void> thenRun
4688 +            (Runnable action) {
4689 +            return cf.thenRun(action); }
4690 +        public CompletionStage<Void> thenRunAsync
4691 +            (Runnable action) {
4692 +            return cf.thenRunAsync(action); }
4693 +        public CompletionStage<Void> thenRunAsync
4694 +            (Runnable action,
4695 +             Executor executor) {
4696 +            return cf.thenRunAsync(action, executor); }
4697 +        public CompletionStage<Void> thenAccept
4698 +            (Consumer<? super T> action) {
4699 +            return cf.thenAccept(action); }
4700 +        public CompletionStage<Void> thenAcceptAsync
4701 +            (Consumer<? super T> action) {
4702 +            return cf.thenAcceptAsync(action); }
4703 +        public CompletionStage<Void> thenAcceptAsync
4704 +            (Consumer<? super T> action,
4705 +             Executor executor) {
4706 +            return cf.thenAcceptAsync(action, executor); }
4707 +        public <U> CompletionStage<U> thenApply
4708 +            (Function<? super T,? extends U> a) {
4709 +            return cf.thenApply(a); }
4710 +        public <U> CompletionStage<U> thenApplyAsync
4711 +            (Function<? super T,? extends U> fn) {
4712 +            return cf.thenApplyAsync(fn); }
4713 +        public <U> CompletionStage<U> thenApplyAsync
4714 +            (Function<? super T,? extends U> fn,
4715 +             Executor executor) {
4716 +            return cf.thenApplyAsync(fn, executor); }
4717 +        public <U,V> CompletionStage<V> thenCombine
4718 +            (CompletionStage<? extends U> other,
4719 +             BiFunction<? super T,? super U,? extends V> fn) {
4720 +            return cf.thenCombine(other, fn); }
4721 +        public <U,V> CompletionStage<V> thenCombineAsync
4722 +            (CompletionStage<? extends U> other,
4723 +             BiFunction<? super T,? super U,? extends V> fn) {
4724 +            return cf.thenCombineAsync(other, fn); }
4725 +        public <U,V> CompletionStage<V> thenCombineAsync
4726 +            (CompletionStage<? extends U> other,
4727 +             BiFunction<? super T,? super U,? extends V> fn,
4728 +             Executor executor) {
4729 +            return cf.thenCombineAsync(other, fn, executor); }
4730 +        public <U> CompletionStage<Void> thenAcceptBoth
4731 +            (CompletionStage<? extends U> other,
4732 +             BiConsumer<? super T, ? super U> action) {
4733 +            return cf.thenAcceptBoth(other, action); }
4734 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4735 +            (CompletionStage<? extends U> other,
4736 +             BiConsumer<? super T, ? super U> action) {
4737 +            return cf.thenAcceptBothAsync(other, action); }
4738 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4739 +            (CompletionStage<? extends U> other,
4740 +             BiConsumer<? super T, ? super U> action,
4741 +             Executor executor) {
4742 +            return cf.thenAcceptBothAsync(other, action, executor); }
4743 +        public CompletionStage<Void> runAfterBoth
4744 +            (CompletionStage<?> other,
4745 +             Runnable action) {
4746 +            return cf.runAfterBoth(other, action); }
4747 +        public CompletionStage<Void> runAfterBothAsync
4748 +            (CompletionStage<?> other,
4749 +             Runnable action) {
4750 +            return cf.runAfterBothAsync(other, action); }
4751 +        public CompletionStage<Void> runAfterBothAsync
4752 +            (CompletionStage<?> other,
4753 +             Runnable action,
4754 +             Executor executor) {
4755 +            return cf.runAfterBothAsync(other, action, executor); }
4756 +        public <U> CompletionStage<U> applyToEither
4757 +            (CompletionStage<? extends T> other,
4758 +             Function<? super T, U> fn) {
4759 +            return cf.applyToEither(other, fn); }
4760 +        public <U> CompletionStage<U> applyToEitherAsync
4761 +            (CompletionStage<? extends T> other,
4762 +             Function<? super T, U> fn) {
4763 +            return cf.applyToEitherAsync(other, fn); }
4764 +        public <U> CompletionStage<U> applyToEitherAsync
4765 +            (CompletionStage<? extends T> other,
4766 +             Function<? super T, U> fn,
4767 +             Executor executor) {
4768 +            return cf.applyToEitherAsync(other, fn, executor); }
4769 +        public CompletionStage<Void> acceptEither
4770 +            (CompletionStage<? extends T> other,
4771 +             Consumer<? super T> action) {
4772 +            return cf.acceptEither(other, action); }
4773 +        public CompletionStage<Void> acceptEitherAsync
4774 +            (CompletionStage<? extends T> other,
4775 +             Consumer<? super T> action) {
4776 +            return cf.acceptEitherAsync(other, action); }
4777 +        public CompletionStage<Void> acceptEitherAsync
4778 +            (CompletionStage<? extends T> other,
4779 +             Consumer<? super T> action,
4780 +             Executor executor) {
4781 +            return cf.acceptEitherAsync(other, action, executor); }
4782 +        public CompletionStage<Void> runAfterEither
4783 +            (CompletionStage<?> other,
4784 +             Runnable action) {
4785 +            return cf.runAfterEither(other, action); }
4786 +        public CompletionStage<Void> runAfterEitherAsync
4787 +            (CompletionStage<?> other,
4788 +             Runnable action) {
4789 +            return cf.runAfterEitherAsync(other, action); }
4790 +        public CompletionStage<Void> runAfterEitherAsync
4791 +            (CompletionStage<?> other,
4792 +             Runnable action,
4793 +             Executor executor) {
4794 +            return cf.runAfterEitherAsync(other, action, executor); }
4795 +        public <U> CompletionStage<U> thenCompose
4796 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4797 +            return cf.thenCompose(fn); }
4798 +        public <U> CompletionStage<U> thenComposeAsync
4799 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4800 +            return cf.thenComposeAsync(fn); }
4801 +        public <U> CompletionStage<U> thenComposeAsync
4802 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4803 +             Executor executor) {
4804 +            return cf.thenComposeAsync(fn, executor); }
4805 +        public <U> CompletionStage<U> handle
4806 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4807 +            return cf.handle(fn); }
4808 +        public <U> CompletionStage<U> handleAsync
4809 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4810 +            return cf.handleAsync(fn); }
4811 +        public <U> CompletionStage<U> handleAsync
4812 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4813 +             Executor executor) {
4814 +            return cf.handleAsync(fn, executor); }
4815 +        public CompletionStage<T> whenComplete
4816 +            (BiConsumer<? super T, ? super Throwable> action) {
4817 +            return cf.whenComplete(action); }
4818 +        public CompletionStage<T> whenCompleteAsync
4819 +            (BiConsumer<? super T, ? super Throwable> action) {
4820 +            return cf.whenCompleteAsync(action); }
4821 +        public CompletionStage<T> whenCompleteAsync
4822 +            (BiConsumer<? super T, ? super Throwable> action,
4823 +             Executor executor) {
4824 +            return cf.whenCompleteAsync(action, executor); }
4825 +        public CompletionStage<T> exceptionally
4826 +            (Function<Throwable, ? extends T> fn) {
4827 +            return cf.exceptionally(fn); }
4828 +    }
4829 +
4830 +    /**
4831 +     * default-implemented exceptionallyAsync action is not invoked when
4832 +     * source completes normally, and source result is propagated
4833 +     */
4834 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4835 +        for (boolean createIncomplete : new boolean[] { true, false })
4836 +        for (Integer v1 : new Integer[] { 1, null })
4837 +    {
4838 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4839 +        final DelegatedCompletionStage<Integer> d =
4840 +            new DelegatedCompletionStage<Integer>(f);
4841 +        if (!createIncomplete) assertTrue(f.complete(v1));
4842 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4843 +            ((Throwable t) -> {
4844 +                threadFail("should not be called");
4845 +                return null;            // unreached
4846 +            });
4847 +        if (createIncomplete) assertTrue(f.complete(v1));
4848 +
4849 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4850 +    }}
4851 +
4852 +    /**
4853 +     * default-implemented exceptionallyAsync action completes with
4854 +     * function value on source exception
4855 +     */
4856 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4857 +        for (boolean createIncomplete : new boolean[] { true, false })
4858 +        for (Integer v1 : new Integer[] { 1, null })
4859 +    {
4860 +        final AtomicInteger a = new AtomicInteger(0);
4861 +        final CFException ex = new CFException();
4862 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4863 +        final DelegatedCompletionStage<Integer> d =
4864 +            new DelegatedCompletionStage<Integer>(f);
4865 +        if (!createIncomplete) f.completeExceptionally(ex);
4866 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4867 +            ((Throwable t) -> {
4868 +                threadAssertSame(t, ex);
4869 +                a.getAndIncrement();
4870 +                return v1;
4871 +            });
4872 +        if (createIncomplete) f.completeExceptionally(ex);
4873 +
4874 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4875 +        assertEquals(1, a.get());
4876 +    }}
4877 +
4878 +    /**
4879 +     * Under default implementation, if an "exceptionally action"
4880 +     * throws an exception, it completes exceptionally with that
4881 +     * exception
4882 +     */
4883 +    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4884 +        for (boolean createIncomplete : new boolean[] { true, false })
4885 +    {
4886 +        final AtomicInteger a = new AtomicInteger(0);
4887 +        final CFException ex1 = new CFException();
4888 +        final CFException ex2 = new CFException();
4889 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4890 +        final DelegatedCompletionStage<Integer> d =
4891 +            new DelegatedCompletionStage<Integer>(f);
4892 +        if (!createIncomplete) f.completeExceptionally(ex1);
4893 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4894 +            ((Throwable t) -> {
4895 +                threadAssertSame(t, ex1);
4896 +                a.getAndIncrement();
4897 +                throw ex2;
4898 +            });
4899 +        if (createIncomplete) f.completeExceptionally(ex1);
4900 +
4901 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4902 +        checkCompletedExceptionally(f, ex1);
4903 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4904 +        assertEquals(1, a.get());
4905 +    }}
4906 +
4907 +    /**
4908 +     * default-implemented exceptionallyCompose result completes
4909 +     * normally after normal completion of source
4910 +     */
4911 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4912 +        for (boolean createIncomplete : new boolean[] { true, false })
4913 +        for (Integer v1 : new Integer[] { 1, null })
4914 +    {
4915 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4916 +        final ExceptionalCompletableFutureFunction r =
4917 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4918 +        final DelegatedCompletionStage<Integer> d =
4919 +            new DelegatedCompletionStage<Integer>(f);
4920 +        if (!createIncomplete) assertTrue(f.complete(v1));
4921 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4922 +        if (createIncomplete) assertTrue(f.complete(v1));
4923 +
4924 +        checkCompletedNormally(f, v1);
4925 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4926 +        r.assertNotInvoked();
4927 +    }}
4928 +
4929 +    /**
4930 +     * default-implemented exceptionallyCompose result completes
4931 +     * normally after exceptional completion of source
4932 +     */
4933 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4934 +        for (boolean createIncomplete : new boolean[] { true, false })
4935 +    {
4936 +        final CFException ex = new CFException();
4937 +        final ExceptionalCompletableFutureFunction r =
4938 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4939 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4940 +        final DelegatedCompletionStage<Integer> d =
4941 +            new DelegatedCompletionStage<Integer>(f);
4942 +        if (!createIncomplete) f.completeExceptionally(ex);
4943 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4944 +        if (createIncomplete) f.completeExceptionally(ex);
4945 +
4946 +        checkCompletedExceptionally(f, ex);
4947 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4948 +        r.assertInvoked();
4949 +    }}
4950 +
4951 +    /**
4952 +     * default-implemented exceptionallyCompose completes
4953 +     * exceptionally on exception if action does
4954 +     */
4955 +    public void testDefaultExceptionallyCompose_actionFailed() {
4956 +        for (boolean createIncomplete : new boolean[] { true, false })
4957 +    {
4958 +        final CFException ex = new CFException();
4959 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4960 +        final FailingExceptionalCompletableFutureFunction r
4961 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4962 +        final DelegatedCompletionStage<Integer> d =
4963 +            new DelegatedCompletionStage<Integer>(f);
4964 +        if (!createIncomplete) f.completeExceptionally(ex);
4965 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4966 +        if (createIncomplete) f.completeExceptionally(ex);
4967 +
4968 +        checkCompletedExceptionally(f, ex);
4969 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4970 +        r.assertInvoked();
4971 +    }}
4972 +
4973 +    /**
4974 +     * default-implemented exceptionallyComposeAsync result completes
4975 +     * normally after normal completion of source
4976 +     */
4977 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4978 +        for (boolean createIncomplete : new boolean[] { true, false })
4979 +        for (Integer v1 : new Integer[] { 1, null })
4980 +    {
4981 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4982 +        final ExceptionalCompletableFutureFunction r =
4983 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4984 +        final DelegatedCompletionStage<Integer> d =
4985 +            new DelegatedCompletionStage<Integer>(f);
4986 +        if (!createIncomplete) assertTrue(f.complete(v1));
4987 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4988 +        if (createIncomplete) assertTrue(f.complete(v1));
4989 +
4990 +        checkCompletedNormally(f, v1);
4991 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4992 +        r.assertNotInvoked();
4993 +    }}
4994 +
4995 +    /**
4996 +     * default-implemented exceptionallyComposeAsync result completes
4997 +     * normally after exceptional completion of source
4998 +     */
4999 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
5000 +        for (boolean createIncomplete : new boolean[] { true, false })
5001 +    {
5002 +        final CFException ex = new CFException();
5003 +        final ExceptionalCompletableFutureFunction r =
5004 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5005 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5006 +        final DelegatedCompletionStage<Integer> d =
5007 +            new DelegatedCompletionStage<Integer>(f);
5008 +        if (!createIncomplete) f.completeExceptionally(ex);
5009 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5010 +        if (createIncomplete) f.completeExceptionally(ex);
5011 +
5012 +        checkCompletedExceptionally(f, ex);
5013 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5014 +        r.assertInvoked();
5015 +    }}
5016 +
5017 +    /**
5018 +     * default-implemented exceptionallyComposeAsync completes
5019 +     * exceptionally on exception if action does
5020 +     */
5021 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5022 +        for (boolean createIncomplete : new boolean[] { true, false })
5023 +    {
5024 +        final CFException ex = new CFException();
5025 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5026 +        final FailingExceptionalCompletableFutureFunction r
5027 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5028 +        final DelegatedCompletionStage<Integer> d =
5029 +            new DelegatedCompletionStage<Integer>(f);
5030 +        if (!createIncomplete) f.completeExceptionally(ex);
5031 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5032 +        if (createIncomplete) f.completeExceptionally(ex);
5033 +
5034 +        checkCompletedExceptionally(f, ex);
5035 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5036 +        r.assertInvoked();
5037 +    }}
5038 +
5039 +    /**
5040 +     * default-implemented exceptionallyComposeAsync result completes
5041 +     * normally after normal completion of source
5042 +     */
5043 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5044 +        for (boolean createIncomplete : new boolean[] { true, false })
5045 +        for (Integer v1 : new Integer[] { 1, null })
5046 +    {
5047 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5048 +        final ExceptionalCompletableFutureFunction r =
5049 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5050 +        final DelegatedCompletionStage<Integer> d =
5051 +            new DelegatedCompletionStage<Integer>(f);
5052 +        if (!createIncomplete) assertTrue(f.complete(v1));
5053 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5054 +        if (createIncomplete) assertTrue(f.complete(v1));
5055 +
5056 +        checkCompletedNormally(f, v1);
5057 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5058 +        r.assertNotInvoked();
5059 +    }}
5060 +
5061 +    /**
5062 +     * default-implemented exceptionallyComposeAsync result completes
5063 +     * normally after exceptional completion of source
5064 +     */
5065 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5066 +        for (boolean createIncomplete : new boolean[] { true, false })
5067 +    {
5068 +        final CFException ex = new CFException();
5069 +        final ExceptionalCompletableFutureFunction r =
5070 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5071 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5072 +        final DelegatedCompletionStage<Integer> d =
5073 +            new DelegatedCompletionStage<Integer>(f);
5074 +        if (!createIncomplete) f.completeExceptionally(ex);
5075 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5076 +        if (createIncomplete) f.completeExceptionally(ex);
5077 +
5078 +        checkCompletedExceptionally(f, ex);
5079 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5080 +        r.assertInvoked();
5081 +    }}
5082 +
5083 +    /**
5084 +     * default-implemented exceptionallyComposeAsync completes
5085 +     * exceptionally on exception if action does
5086 +     */
5087 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5088 +        for (boolean createIncomplete : new boolean[] { true, false })
5089 +    {
5090 +        final CFException ex = new CFException();
5091 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5092 +        final FailingExceptionalCompletableFutureFunction r
5093 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5094 +        final DelegatedCompletionStage<Integer> d =
5095 +            new DelegatedCompletionStage<Integer>(f);
5096 +        if (!createIncomplete) f.completeExceptionally(ex);
5097 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5098 +        if (createIncomplete) f.completeExceptionally(ex);
5099 +
5100 +        checkCompletedExceptionally(f, ex);
5101 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5102 +        r.assertInvoked();
5103 +    }}
5104  
5105   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines