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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines