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.24 by jsr166, Sun Apr 14 05:45:38 2013 UTC vs.
Revision 1.216 by jsr166, Wed Nov 21 23:25:17 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines