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.36 by jsr166, Sun Jun 1 23:12:45 2014 UTC vs.
Revision 1.208 by jsr166, Sun Sep 23 15:29:31 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;
23 < import static java.util.concurrent.TimeUnit.SECONDS;
24 < import java.util.*;
25 < import java.util.function.Supplier;
26 < import java.util.function.Consumer;
36 > import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
28 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 42 | 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); }
64 <        try {
65 <            assertEquals(value, f.getNow(null));
66 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
77 >    <T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
78 >        checkTimedGet(f, expectedValue);
79 >
80 >        assertEquals(expectedValue, f.join());
81 >        assertEquals(expectedValue, f.getNow(null));
82 >
83 >        T result = null;
84          try {
85 <            assertEquals(value, f.get());
85 >            result = f.get();
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertEquals(expectedValue, result);
88 +
89          assertTrue(f.isDone());
90          assertFalse(f.isCancelled());
91          assertFalse(f.isCompletedExceptionally());
92 <        assertTrue(f.toString().contains("[Completed normally]"));
92 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
93      }
94  
95 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
96 <        try {
97 <            f.get(LONG_DELAY_MS, MILLISECONDS);
98 <            shouldThrow();
99 <        } catch (ExecutionException success) {
100 <            assertTrue(success.getCause() instanceof CFException);
101 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
102 <        try {
84 <            f.join();
85 <            shouldThrow();
86 <        } catch (CompletionException success) {
87 <            assertTrue(success.getCause() instanceof CFException);
88 <        }
89 <        try {
90 <            f.getNow(null);
91 <            shouldThrow();
92 <        } catch (CompletionException success) {
93 <            assertTrue(success.getCause() instanceof CFException);
94 <        }
95 <        try {
96 <            f.get();
97 <            shouldThrow();
98 <        } catch (ExecutionException success) {
99 <            assertTrue(success.getCause() instanceof CFException);
100 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
101 <        assertTrue(f.isDone());
102 <        assertFalse(f.isCancelled());
103 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
95 >    /**
96 >     * Returns the "raw" internal exceptional completion of f,
97 >     * without any additional wrapping with CompletionException.
98 >     */
99 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
100 >        // handle (and whenComplete and exceptionally) can distinguish
101 >        // between "direct" and "wrapped" exceptional completion
102 >        return f.handle((u, t) -> t).join();
103      }
104  
105 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
106 <                                              CFException ex) {
105 >    void checkCompletedExceptionally(CompletableFuture<?> f,
106 >                                     boolean wrapped,
107 >                                     Consumer<Throwable> checker) {
108 >        Throwable cause = exceptionalCompletion(f);
109 >        if (wrapped) {
110 >            assertTrue(cause instanceof CompletionException);
111 >            cause = cause.getCause();
112 >        }
113 >        checker.accept(cause);
114 >
115 >        long startTime = System.nanoTime();
116          try {
117              f.get(LONG_DELAY_MS, MILLISECONDS);
118              shouldThrow();
119          } catch (ExecutionException success) {
120 <            assertSame(ex, success.getCause());
120 >            assertSame(cause, success.getCause());
121          } catch (Throwable fail) { threadUnexpectedException(fail); }
122 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
123 +
124          try {
125              f.join();
126              shouldThrow();
127          } catch (CompletionException success) {
128 <            assertSame(ex, success.getCause());
129 <        }
128 >            assertSame(cause, success.getCause());
129 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
130 >
131          try {
132              f.getNow(null);
133              shouldThrow();
134          } catch (CompletionException success) {
135 <            assertSame(ex, success.getCause());
136 <        }
135 >            assertSame(cause, success.getCause());
136 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
137 >
138          try {
139              f.get();
140              shouldThrow();
141          } catch (ExecutionException success) {
142 <            assertSame(ex, success.getCause());
142 >            assertSame(cause, success.getCause());
143          } catch (Throwable fail) { threadUnexpectedException(fail); }
144 <        assertTrue(f.isDone());
144 >
145          assertFalse(f.isCancelled());
146 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
146 >        assertTrue(f.isDone());
147 >        assertTrue(f.isCompletedExceptionally());
148 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
149 >    }
150 >
151 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
152 >        checkCompletedExceptionally(f, true,
153 >            t -> assertTrue(t instanceof CFException));
154 >    }
155 >
156 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
157 >        checkCompletedExceptionally(f, true,
158 >            t -> assertTrue(t instanceof CancellationException));
159 >    }
160 >
161 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
162 >        checkCompletedExceptionally(f, false,
163 >            t -> assertTrue(t instanceof TimeoutException));
164 >    }
165 >
166 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
167 >                                            Throwable ex) {
168 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
169 >    }
170 >
171 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
172 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
173      }
174  
175      void checkCancelled(CompletableFuture<?> f) {
176 +        long startTime = System.nanoTime();
177          try {
178              f.get(LONG_DELAY_MS, MILLISECONDS);
179              shouldThrow();
180          } catch (CancellationException success) {
181          } catch (Throwable fail) { threadUnexpectedException(fail); }
182 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
183 +
184          try {
185              f.join();
186              shouldThrow();
# Line 153 | Line 194 | public class CompletableFutureTest exten
194              shouldThrow();
195          } catch (CancellationException success) {
196          } catch (Throwable fail) { threadUnexpectedException(fail); }
156        assertTrue(f.isDone());
157        assertTrue(f.isCompletedExceptionally());
158        assertTrue(f.isCancelled());
159        assertTrue(f.toString().contains("[Completed exceptionally]"));
160    }
197  
198 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
199 <        try {
164 <            f.get(LONG_DELAY_MS, MILLISECONDS);
165 <            shouldThrow();
166 <        } catch (ExecutionException success) {
167 <            assertTrue(success.getCause() instanceof CancellationException);
168 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
169 <        try {
170 <            f.join();
171 <            shouldThrow();
172 <        } catch (CompletionException success) {
173 <            assertTrue(success.getCause() instanceof CancellationException);
174 <        }
175 <        try {
176 <            f.getNow(null);
177 <            shouldThrow();
178 <        } catch (CompletionException success) {
179 <            assertTrue(success.getCause() instanceof CancellationException);
180 <        }
181 <        try {
182 <            f.get();
183 <            shouldThrow();
184 <        } catch (ExecutionException success) {
185 <            assertTrue(success.getCause() instanceof CancellationException);
186 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199 >
200          assertTrue(f.isDone());
188        assertFalse(f.isCancelled());
201          assertTrue(f.isCompletedExceptionally());
202 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
202 >        assertTrue(f.isCancelled());
203 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
204      }
205  
206      /**
# Line 204 | 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 216 | 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 226 | 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 238 | 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 247 | 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 257 | 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());
265 <        checkCompletedWithWrappedCFException(f);
283 >        for (Integer v1 : new Integer[] { 1, null })
284 >    {
285 >        CFException ex;
286 >        CompletableFuture<Integer> f;
287 >
288          f = new CompletableFuture<>();
289 <        f.obtrudeException(new CFException());
290 <        checkCompletedWithWrappedCFException(f);
289 >        assertTrue(f.complete(v1));
290 >        for (int i = 0; i < 2; i++) {
291 >            f.obtrudeException(ex = new CFException());
292 >            checkCompletedExceptionally(f, ex);
293 >        }
294 >
295 >        f = new CompletableFuture<>();
296 >        for (int i = 0; i < 2; i++) {
297 >            f.obtrudeException(ex = new CFException());
298 >            checkCompletedExceptionally(f, ex);
299 >        }
300 >
301          f = new CompletableFuture<>();
302          f.completeExceptionally(new CFException());
303 <        f.obtrudeValue(four);
304 <        checkCompletedNormally(f, four);
305 <        f.obtrudeException(new CFException());
306 <        checkCompletedWithWrappedCFException(f);
307 <    }
303 >        f.obtrudeValue(v1);
304 >        checkCompletedNormally(f, v1);
305 >        f.obtrudeException(ex = new CFException());
306 >        checkCompletedExceptionally(f, ex);
307 >        f.completeExceptionally(new CFException());
308 >        checkCompletedExceptionally(f, ex);
309 >        assertFalse(f.complete(v1));
310 >        checkCompletedExceptionally(f, ex);
311 >    }}
312  
313      /**
314       * getNumberOfDependents returns number of dependent tasks
315       */
316      public void testGetNumberOfDependents() {
317 +        for (ExecutionMode m : ExecutionMode.values())
318 +        for (Integer v1 : new Integer[] { 1, null })
319 +    {
320          CompletableFuture<Integer> f = new CompletableFuture<>();
321 <        assertEquals(f.getNumberOfDependents(), 0);
322 <        CompletableFuture g = f.thenRun(new Noop());
323 <        assertEquals(f.getNumberOfDependents(), 1);
324 <        assertEquals(g.getNumberOfDependents(), 0);
325 <        CompletableFuture h = f.thenRun(new Noop());
326 <        assertEquals(f.getNumberOfDependents(), 2);
327 <        f.complete(1);
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 <    }
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 316 | 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 <    // A non-commutative function that handles null values as well
397 <    public static int subtract(Integer x, Integer y) {
398 <        return ((x == null) ? 42 : x.intValue())
396 >    abstract static class CheckedIntegerAction extends CheckedAction {
397 >        Integer value;
398 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
399 >        void assertValue(Integer expected) {
400 >            assertInvoked();
401 >            assertEquals(expected, value);
402 >        }
403 >    }
404 >
405 >    static class IntegerSupplier extends CheckedAction
406 >        implements Supplier<Integer>
407 >    {
408 >        final Integer value;
409 >        IntegerSupplier(ExecutionMode m, Integer value) {
410 >            super(m);
411 >            this.value = value;
412 >        }
413 >        public Integer get() {
414 >            invoked();
415 >            return value;
416 >        }
417 >    }
418 >
419 >    // A function that handles and produces null values as well.
420 >    static Integer inc(Integer x) {
421 >        return (x == null) ? null : x + 1;
422 >    }
423 >
424 >    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 final Supplier<Integer> supplyOne =
453 <        () -> Integer.valueOf(1);
454 <    static final Function<Integer, Integer> inc =
455 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
331 <    static final BiFunction<Integer, Integer, Integer> subtract =
332 <        (Integer x, Integer y) -> subtract(x, y);
333 <    static final class IncAction implements Consumer<Integer> {
334 <        int value;
335 <        public void accept(Integer x) { value = x.intValue() + 1; }
336 <    }
337 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
338 <        volatile int invocationCount = 0;
339 <        int value;
340 <        // Check this action was invoked exactly once when result is computed.
341 <        public boolean ran() { return invocationCount == 1; }
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 <            invocationCount++;
457 >            invoked();
458              value = subtract(x, y);
459          }
460      }
461 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
462 <        volatile int invocationCount = 0;
463 <        int value;
464 <        // Check this action was invoked exactly once when result is computed.
465 <        public boolean ran() { return invocationCount == 1; }
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 <            invocationCount++;
468 <            return subtract(x, y);
467 >            invoked();
468 >            return value = subtract(x, y);
469          }
470      }
471 <    static final class Noop implements Runnable {
472 <        boolean ran;
473 <        public void run() { ran = true; }
471 >
472 >    static class Noop extends CheckedAction implements Runnable {
473 >        Noop(ExecutionMode m) { super(m); }
474 >        public void run() {
475 >            invoked();
476 >        }
477      }
478  
479 <    static final class FailingSupplier implements Supplier<Integer> {
480 <        boolean ran;
481 <        public Integer get() { ran = true; throw new CFException(); }
479 >    static class FailingSupplier extends CheckedAction
480 >        implements Supplier<Integer>
481 >    {
482 >        final CFException ex;
483 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
484 >        public Integer get() {
485 >            invoked();
486 >            throw ex;
487 >        }
488      }
489 <    static final class FailingConsumer implements Consumer<Integer> {
490 <        boolean ran;
491 <        public void accept(Integer x) { ran = true; throw new CFException(); }
489 >
490 >    static class FailingConsumer extends CheckedIntegerAction
491 >        implements Consumer<Integer>
492 >    {
493 >        final CFException ex;
494 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
495 >        public void accept(Integer x) {
496 >            invoked();
497 >            value = x;
498 >            throw ex;
499 >        }
500      }
501 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
502 <        boolean ran;
503 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
501 >
502 >    static class FailingBiConsumer extends CheckedIntegerAction
503 >        implements BiConsumer<Integer, Integer>
504 >    {
505 >        final CFException ex;
506 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
507 >        public void accept(Integer x, Integer y) {
508 >            invoked();
509 >            value = subtract(x, y);
510 >            throw ex;
511 >        }
512      }
513 <    static final class FailingFunction implements Function<Integer, Integer> {
514 <        boolean ran;
515 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
513 >
514 >    static class FailingFunction extends CheckedIntegerAction
515 >        implements Function<Integer, Integer>
516 >    {
517 >        final CFException ex;
518 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
519 >        public Integer apply(Integer x) {
520 >            invoked();
521 >            value = x;
522 >            throw ex;
523 >        }
524      }
525 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
526 <        boolean ran;
527 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
525 >
526 >    static class FailingBiFunction extends CheckedIntegerAction
527 >        implements BiFunction<Integer, Integer, Integer>
528 >    {
529 >        final CFException ex;
530 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
531 >        public Integer apply(Integer x, Integer y) {
532 >            invoked();
533 >            value = subtract(x, y);
534 >            throw ex;
535 >        }
536      }
537 <    static final class FailingNoop implements Runnable {
538 <        boolean ran;
539 <        public void run() { ran = true; throw new CFException(); }
537 >
538 >    static class FailingRunnable extends CheckedAction implements Runnable {
539 >        final CFException ex;
540 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
541 >        public void run() {
542 >            invoked();
543 >            throw ex;
544 >        }
545      }
546  
547 <    static final class CompletableFutureInc
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));
394 <            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;
561 <        public CompletableFuture<Integer> apply(Integer x) {
562 <            ran = true; throw new CFException();
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 <    // Used for explicit executor tests
570 <    static final class ThreadExecutor implements Executor {
571 <        AtomicInteger count = new AtomicInteger(0);
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 +            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 <            new Thread(r).start();
596 >            throw ex;
597          }
598      }
599  
600 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
601 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
602 <    }
600 >    // Used for explicit executor tests
601 >    static final class ThreadExecutor implements Executor {
602 >        final AtomicInteger count = new AtomicInteger(0);
603 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
604 >        static boolean startedCurrentThread() {
605 >            return Thread.currentThread().getThreadGroup() == tg;
606 >        }
607  
608 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
609 <        boolean ran;
610 <        public Integer apply(Integer x, Throwable t) {
423 <            ran = true;
424 <            return (t == null) ? two : three;
608 >        public void execute(Runnable r) {
609 >            count.getAndIncrement();
610 >            new Thread(tg, r).start();
611          }
612      }
613  
614 +    static final boolean defaultExecutorIsCommonPool
615 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
616 +
617      /**
618       * Permits the testing of parallel code for the 3 different
619 <     * execution modes without repeating all the testing code.
619 >     * execution modes without copy/pasting all the test methods.
620       */
621      enum ExecutionMode {
622 <        DEFAULT {
622 >        SYNC {
623 >            public void checkExecutionMode() {
624 >                assertFalse(ThreadExecutor.startedCurrentThread());
625 >                assertNull(ForkJoinTask.getPool());
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);
# Line 447 | Line 673 | public class CompletableFutureTest exten
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 <
705 < //             /** Experimental way to do more testing */
706 < //         REVERSE_DEFAULT {
707 < //             public <T,U> CompletableFuture<Void> runAfterBoth
708 < //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
709 < //                 return g.runAfterBoth(f, a);
710 < //             }
711 < //             public <T,U> CompletableFuture<Void> thenAcceptBoth
712 < //                 (CompletableFuture<T> f,
713 < //                  CompletionStage<? extends U> g,
714 < //                  BiConsumer<? super T,? super U> a) {
715 < //                 return DEFAULT.thenAcceptBoth(f, g, a);
716 < //             }
717 < //         },
718 <
719 <        DEFAULT_ASYNC {
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);
# Line 480 | Line 755 | public class CompletableFutureTest exten
755                   BiFunction<? super T,? super U,? extends V> a) {
756                  return f.thenCombineAsync(g, a);
757              }
758 <        },
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 < //         REVERSE_DEFAULT_ASYNC {
486 < //             public <T,U> CompletableFuture<Void> runAfterBoth
487 < //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
488 < //                 return f.runAfterBothAsync(g, a);
489 < //             }
490 < //             public <T,U> CompletableFuture<Void> thenAcceptBoth
491 < //                 (CompletableFuture<T> f,
492 < //                  CompletionStage<? extends U> g,
493 < //                  BiConsumer<? super T,? super U> a) {
494 < //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
495 < //             }
496 < //         },
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());
# Line 512 | Line 839 | public class CompletableFutureTest exten
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
# Line 524 | Line 897 | public class CompletableFutureTest exten
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 completes with function value on source
922 <     * exception; otherwise with source value
921 >     * exceptionally action is not invoked when source completes
922 >     * normally, and source result is propagated
923       */
924 <    public void testExceptionally() {
925 <        CompletableFuture<Integer> f = new CompletableFuture<>();
926 <        ExceptionToInteger r = new ExceptionToInteger();
927 <        CompletableFuture<Integer> g = f.exceptionally(r);
928 <        f.completeExceptionally(new CFException());
929 <        checkCompletedNormally(g, three);
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 <        f = new CompletableFuture<>();
939 <        r = new ExceptionToInteger();
940 <        g = f.exceptionally(r);
543 <        f.complete(one);
544 <        checkCompletedNormally(g, one);
545 <    }
938 >        checkCompletedNormally(g, v1);
939 >        checkCompletedNormally(f, v1);
940 >    }}
941  
942      /**
943 <     * handle action completes normally with function value on either
944 <     * normal or exceptional completion of source
943 >     * exceptionally action completes with function value on source
944 >     * exception
945       */
946 <    public void testHandle() {
947 <        CompletableFuture<Integer> f, g;
948 <        IntegerHandler r;
949 <
950 <        f = new CompletableFuture<>();
951 <        f.completeExceptionally(new CFException());
952 <        g = f.handle(r = new IntegerHandler());
953 <        assertTrue(r.ran);
954 <        checkCompletedNormally(g, three);
955 <
956 <        f = new CompletableFuture<>();
957 <        g = f.handle(r = new IntegerHandler());
958 <        assertFalse(r.ran);
959 <        f.completeExceptionally(new CFException());
960 <        checkCompletedNormally(g, three);
961 <        assertTrue(r.ran);
962 <
568 <        f = new CompletableFuture<>();
569 <        f.complete(one);
570 <        g = f.handle(r = new IntegerHandler());
571 <        assertTrue(r.ran);
572 <        checkCompletedNormally(g, two);
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 <        f = new CompletableFuture<>();
965 <        g = f.handle(r = new IntegerHandler());
966 <        assertFalse(r.ran);
577 <        f.complete(one);
578 <        assertTrue(r.ran);
579 <        checkCompletedNormally(g, two);
580 <    }
964 >        checkCompletedNormally(g, v1);
965 >        assertEquals(1, a.get());
966 >    }}
967  
968      /**
969 <     * runAsync completes after running Runnable
969 >     * If an "exceptionally action" throws an exception, it completes
970 >     * exceptionally with that exception
971       */
972 <    public void testRunAsync() {
973 <        Noop r = new Noop();
974 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
975 <        assertNull(f.join());
976 <        assertTrue(r.ran);
977 <        checkCompletedNormally(f, null);
978 <    }
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 <     * runAsync with executor completes after running Runnable
996 >     * whenComplete action executes on normal completion, propagating
997 >     * source result.
998       */
999 <    public void testRunAsync2() {
1000 <        Noop r = new Noop();
1001 <        ThreadExecutor exec = new ThreadExecutor();
1002 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1003 <        assertNull(f.join());
1004 <        assertTrue(r.ran);
1005 <        checkCompletedNormally(f, null);
1006 <        assertEquals(1, exec.count.get());
1007 <    }
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 <    /**
1018 <     * failing runAsync completes exceptionally after running Runnable
1019 <     */
1020 <    public void testRunAsync3() {
610 <        FailingNoop r = new FailingNoop();
611 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
612 <        checkCompletedWithWrappedCFException(f);
613 <        assertTrue(r.ran);
614 <    }
1017 >        checkCompletedNormally(g, v1);
1018 >        checkCompletedNormally(f, v1);
1019 >        assertEquals(1, a.get());
1020 >    }}
1021  
1022      /**
1023 <     * supplyAsync completes with result of supplier
1023 >     * whenComplete action executes on exceptional completion, propagating
1024 >     * source result.
1025       */
1026 <    public void testSupplyAsync() {
1027 <        CompletableFuture<Integer> f;
1028 <        f = CompletableFuture.supplyAsync(supplyOne);
1029 <        assertEquals(f.join(), one);
1030 <        checkCompletedNormally(f, one);
1031 <    }
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 <     * supplyAsync with executor completes with result of supplier
1050 >     * whenComplete action executes on cancelled source, propagating
1051 >     * CancellationException.
1052       */
1053 <    public void testSupplyAsync2() {
1054 <        CompletableFuture<Integer> f;
1055 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1056 <        assertEquals(f.join(), one);
1057 <        checkCompletedNormally(f, one);
1058 <    }
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 >        checkCompletedWithWrappedCancellationException(g);
1072 >        checkCancelled(f);
1073 >        assertEquals(1, a.get());
1074 >    }}
1075  
1076      /**
1077 <     * Failing supplyAsync completes exceptionally
1077 >     * If a whenComplete action throws an exception when triggered by
1078 >     * a normal completion, it completes exceptionally
1079       */
1080 <    public void testSupplyAsync3() {
1081 <        FailingSupplier r = new FailingSupplier();
1082 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1083 <        checkCompletedWithWrappedCFException(f);
1084 <        assertTrue(r.ran);
1085 <    }
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 <    // seq completion methods
1100 >        checkCompletedWithWrappedException(g, ex);
1101 >        checkCompletedNormally(f, v1);
1102 >        assertEquals(1, a.get());
1103 >    }}
1104  
1105      /**
1106 <     * thenRun result completes normally after normal completion of source
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 testThenRun() {
1111 <        CompletableFuture<Integer> f;
1112 <        CompletableFuture<Void> g;
1113 <        Noop r;
1114 <
1115 <        f = new CompletableFuture<>();
1116 <        g = f.thenRun(r = new Noop());
1117 <        f.complete(null);
1118 <        checkCompletedNormally(g, null);
1119 <        assertTrue(r.ran);
1120 <
1121 <        f = new CompletableFuture<>();
1122 <        f.complete(null);
1123 <        g = f.thenRun(r = new Noop());
1124 <        checkCompletedNormally(g, null);
1125 <        assertTrue(r.ran);
1126 <    }
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      /**
1141 <     * thenRun result completes exceptionally after exceptional
1141 >     * handle action completes normally with function value on normal
1142       * completion of source
1143       */
1144 <    public void testThenRun2() {
1145 <        CompletableFuture<Integer> f;
1146 <        CompletableFuture<Void> g;
1147 <        Noop r;
1148 <
1149 <        f = new CompletableFuture<>();
1150 <        g = f.thenRun(r = new Noop());
1151 <        f.completeExceptionally(new CFException());
1152 <        checkCompletedWithWrappedCFException(g);
1153 <        assertFalse(r.ran);
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 <        f = new CompletableFuture<>();
1164 <        f.completeExceptionally(new CFException());
1165 <        g = f.thenRun(r = new Noop());
1166 <        checkCompletedWithWrappedCFException(g);
688 <        assertFalse(r.ran);
689 <    }
1163 >        checkCompletedNormally(g, inc(v1));
1164 >        checkCompletedNormally(f, v1);
1165 >        assertEquals(1, a.get());
1166 >    }}
1167  
1168      /**
1169 <     * thenRun result completes exceptionally if action does
1169 >     * handle action completes normally with function value on
1170 >     * exceptional completion of source
1171       */
1172 <    public void testThenRun3() {
1173 <        CompletableFuture<Integer> f;
1174 <        CompletableFuture<Void> g;
1175 <        FailingNoop r;
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 <        f = new CompletableFuture<>();
1193 <        g = f.thenRun(r = new FailingNoop());
1194 <        f.complete(null);
1195 <        checkCompletedWithWrappedCFException(g);
1192 >        checkCompletedNormally(g, v1);
1193 >        checkCompletedExceptionally(f, ex);
1194 >        assertEquals(1, a.get());
1195 >    }}
1196  
1197 <        f = new CompletableFuture<>();
1198 <        f.complete(null);
1199 <        g = f.thenRun(r = new FailingNoop());
1200 <        checkCompletedWithWrappedCFException(g);
1201 <    }
1197 >    /**
1198 >     * handle action completes normally with function value on
1199 >     * cancelled source
1200 >     */
1201 >    public void testHandle_sourceCancelled() {
1202 >        for (ExecutionMode m : ExecutionMode.values())
1203 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1204 >        for (boolean createIncomplete : new boolean[] { true, false })
1205 >        for (Integer v1 : new Integer[] { 1, null })
1206 >    {
1207 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1208 >        final AtomicInteger a = new AtomicInteger(0);
1209 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1210 >        final CompletableFuture<Integer> g = m.handle
1211 >            (f,
1212 >             (Integer result, Throwable t) -> {
1213 >                m.checkExecutionMode();
1214 >                threadAssertNull(result);
1215 >                threadAssertTrue(t instanceof CancellationException);
1216 >                a.getAndIncrement();
1217 >                return v1;
1218 >            });
1219 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1220 >
1221 >        checkCompletedNormally(g, v1);
1222 >        checkCancelled(f);
1223 >        assertEquals(1, a.get());
1224 >    }}
1225  
1226      /**
1227 <     * thenRun result completes exceptionally if source cancelled
1227 >     * If a "handle action" throws an exception when triggered by
1228 >     * a normal completion, it completes exceptionally
1229       */
1230 <    public void testThenRun4() {
1231 <        CompletableFuture<Integer> f;
1232 <        CompletableFuture<Void> g;
1233 <        Noop r;
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 <        f = new CompletableFuture<>();
1251 <        g = f.thenRun(r = new Noop());
1252 <        assertTrue(f.cancel(true));
1253 <        checkCompletedWithWrappedCancellationException(g);
1250 >        checkCompletedWithWrappedException(g, ex);
1251 >        checkCompletedNormally(f, v1);
1252 >        assertEquals(1, a.get());
1253 >    }}
1254  
1255 <        f = new CompletableFuture<>();
1256 <        assertTrue(f.cancel(true));
1257 <        g = f.thenRun(r = new Noop());
1258 <        checkCompletedWithWrappedCancellationException(g);
1259 <    }
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 <     * thenApply result completes normally after normal completion of source
1287 >     * runAsync completes after running Runnable
1288       */
1289 <    public void testThenApply() {
1290 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1291 <        CompletableFuture<Integer> g = f.thenApply(inc);
1292 <        f.complete(one);
1293 <        checkCompletedNormally(g, two);
1294 <    }
1289 >    public void testRunAsync_normalCompletion() {
1290 >        ExecutionMode[] executionModes = {
1291 >            ExecutionMode.ASYNC,
1292 >            ExecutionMode.EXECUTOR,
1293 >        };
1294 >        for (ExecutionMode m : executionModes)
1295 >    {
1296 >        final Noop r = new Noop(m);
1297 >        final CompletableFuture<Void> f = m.runAsync(r);
1298 >        assertNull(f.join());
1299 >        checkCompletedNormally(f, null);
1300 >        r.assertInvoked();
1301 >    }}
1302  
1303      /**
1304 <     * thenApply result completes exceptionally after exceptional
741 <     * completion of source
1304 >     * failing runAsync completes exceptionally after running Runnable
1305       */
1306 <    public void testThenApply2() {
1307 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1308 <        CompletableFuture<Integer> g = f.thenApply(inc);
1309 <        f.completeExceptionally(new CFException());
1310 <        checkCompletedWithWrappedCFException(g);
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 >        assertEquals(1, e.count.get());
1330      }
1331  
1332      /**
1333 <     * thenApply result completes exceptionally if action does
1333 >     * supplyAsync completes with result of supplier
1334       */
1335 <    public void testThenApply3() {
1336 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1337 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1338 <        f.complete(one);
1339 <        checkCompletedWithWrappedCFException(g);
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 <     * thenApply result completes exceptionally if source cancelled
1351 >     * Failing supplyAsync completes exceptionally
1352       */
1353 <    public void testThenApply4() {
1354 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1355 <        CompletableFuture<Integer> g = f.thenApply(inc);
1356 <        assertTrue(f.cancel(true));
1357 <        checkCompletedWithWrappedCancellationException(g);
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
1380 +
1381      /**
1382 <     * thenAccept result completes normally after normal completion of source
1382 >     * thenRun result completes normally after normal completion of source
1383       */
1384 <    public void testThenAccept() {
1385 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1386 <        IncAction r = new IncAction();
1387 <        CompletableFuture<Void> g = f.thenAccept(r);
1388 <        f.complete(one);
1389 <        checkCompletedNormally(g, null);
1390 <        assertEquals(r.value, 2);
1391 <    }
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 <     * thenAccept result completes exceptionally after exceptional
1414 >     * thenRun result completes exceptionally after exceptional
1415       * completion of source
1416       */
1417 <    public void testThenAccept2() {
1418 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1419 <        IncAction r = new IncAction();
1420 <        CompletableFuture<Void> g = f.thenAccept(r);
1421 <        f.completeExceptionally(new CFException());
1422 <        checkCompletedWithWrappedCFException(g);
1423 <    }
1417 >    public void testThenRun_exceptionalCompletion() {
1418 >        for (ExecutionMode m : ExecutionMode.values())
1419 >    {
1420 >        final CFException ex = new CFException();
1421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 >        final Noop[] rs = new Noop[6];
1423 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1424 >
1425 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1426 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1427 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1428 >        checkIncomplete(h0);
1429 >        checkIncomplete(h1);
1430 >        checkIncomplete(h2);
1431 >        assertTrue(f.completeExceptionally(ex));
1432 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1433 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1434 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1435 >
1436 >        checkCompletedWithWrappedException(h0, ex);
1437 >        checkCompletedWithWrappedException(h1, ex);
1438 >        checkCompletedWithWrappedException(h2, ex);
1439 >        checkCompletedWithWrappedException(h3, ex);
1440 >        checkCompletedWithWrappedException(h4, ex);
1441 >        checkCompletedWithWrappedException(h5, ex);
1442 >        checkCompletedExceptionally(f, ex);
1443 >        for (Noop r : rs) r.assertNotInvoked();
1444 >    }}
1445  
1446      /**
1447 <     * thenAccept result completes exceptionally if action does
1447 >     * thenRun result completes exceptionally if source cancelled
1448       */
1449 <    public void testThenAccept3() {
1450 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1451 <        FailingConsumer r = new FailingConsumer();
1452 <        CompletableFuture<Void> g = f.thenAccept(r);
1453 <        f.complete(one);
1454 <        checkCompletedWithWrappedCFException(g);
1455 <        assertTrue(r.ran);
1456 <    }
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 <     * thenAccept result completes exceptionally if source cancelled
1479 >     * thenRun result completes exceptionally if action does
1480       */
1481 <    public void testThenAccept4() {
1482 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1483 <        IncAction r = new IncAction();
1484 <        CompletableFuture<Void> g = f.thenAccept(r);
1485 <        assertTrue(f.cancel(true));
1486 <        checkCompletedWithWrappedCancellationException(g);
1487 <    }
1481 >    public void testThenRun_actionFailed() {
1482 >        for (ExecutionMode m : ExecutionMode.values())
1483 >        for (Integer v1 : new Integer[] { 1, null })
1484 >    {
1485 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 >        final FailingRunnable[] rs = new FailingRunnable[6];
1487 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1488 >
1489 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1490 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1491 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1492 >        assertTrue(f.complete(v1));
1493 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1494 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1495 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1496 >
1497 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1498 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1499 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1500 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1501 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1502 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1503 >        checkCompletedNormally(f, v1);
1504 >    }}
1505  
1506      /**
1507 <     * thenCombine result completes normally after normal completion
819 <     * of sources
1507 >     * thenApply result completes normally after normal completion of source
1508       */
1509 <    public void testThenCombine_normalCompletion1() {
1509 >    public void testThenApply_normalCompletion() {
1510          for (ExecutionMode m : ExecutionMode.values())
1511          for (Integer v1 : new Integer[] { 1, null })
1512 <        for (Integer v2 : new Integer[] { 2, null }) {
825 <
1512 >    {
1513          final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1515 <        final SubtractFunction r = new SubtractFunction();
829 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
830 <
831 <        f.complete(v1);
832 <        checkIncomplete(h);
833 <        assertFalse(r.ran());
834 <        g.complete(v2);
1514 >        final IncFunction[] rs = new IncFunction[4];
1515 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1516  
1517 <        checkCompletedNormally(h, subtract(v1, v2));
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 <        checkCompletedNormally(g, v2);
1531 <        }
840 <    }
1530 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1531 >    }}
1532  
1533 <    public void testThenCombine_normalCompletion2() {
1533 >    /**
1534 >     * thenApply result completes exceptionally after exceptional
1535 >     * completion of source
1536 >     */
1537 >    public void testThenApply_exceptionalCompletion() {
1538          for (ExecutionMode m : ExecutionMode.values())
1539 <        for (Integer v1 : new Integer[] { 1, null })
1540 <        for (Integer v2 : new Integer[] { 2, null }) {
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 source cancelled
1561 +     */
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1568 <        final SubtractFunction r = new SubtractFunction();
850 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1567 >        final IncFunction[] rs = new IncFunction[4];
1568 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1569  
1570 <        g.complete(v2);
1571 <        checkIncomplete(h);
1572 <        assertFalse(r.ran());
1573 <        f.complete(v1);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1577 <        checkCompletedNormally(f, v1);
1578 <        checkCompletedNormally(g, v2);
1579 <        }
1580 <    }
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 <    public void testThenCombine_normalCompletion3() {
1584 >    /**
1585 >     * thenApply result completes exceptionally if action does
1586 >     */
1587 >    public void testThenApply_actionFailed() {
1588          for (ExecutionMode m : ExecutionMode.values())
1589          for (Integer v1 : new Integer[] { 1, null })
1590 <        for (Integer v2 : new Integer[] { 2, null }) {
867 <
1590 >    {
1591          final CompletableFuture<Integer> f = new CompletableFuture<>();
1592 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1593 <        final SubtractFunction r = new SubtractFunction();
1592 >        final FailingFunction[] rs = new FailingFunction[4];
1593 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1594  
1595 <        g.complete(v2);
1596 <        f.complete(v1);
1597 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1598 <
1599 <        checkCompletedNormally(h, subtract(v1, v2));
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 <        checkCompletedNormally(g, v2);
879 <        }
880 <    }
1606 >    }}
1607  
1608 <    public void testThenCombine_normalCompletion4() {
1608 >    /**
1609 >     * thenAccept result completes normally after normal completion of source
1610 >     */
1611 >    public void testThenAccept_normalCompletion() {
1612          for (ExecutionMode m : ExecutionMode.values())
1613          for (Integer v1 : new Integer[] { 1, null })
1614 <        for (Integer v2 : new Integer[] { 2, null }) {
886 <
1614 >    {
1615          final CompletableFuture<Integer> f = new CompletableFuture<>();
1616 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1617 <        final SubtractFunction r = new SubtractFunction();
1616 >        final NoopConsumer[] rs = new NoopConsumer[4];
1617 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1618  
1619 <        f.complete(v1);
1620 <        g.complete(v2);
1621 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1622 <
1623 <        checkCompletedNormally(h, subtract(v1, v2));
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 <        checkCompletedNormally(g, v2);
1633 <        }
899 <    }
1632 >        for (NoopConsumer r : rs) r.assertValue(v1);
1633 >    }}
1634  
1635      /**
1636 <     * thenCombine result completes exceptionally after exceptional
1637 <     * completion of either source
1636 >     * thenAccept result completes exceptionally after exceptional
1637 >     * completion of source
1638       */
1639 <    public void testThenCombine_exceptionalCompletion1() {
1639 >    public void testThenAccept_exceptionalCompletion() {
1640          for (ExecutionMode m : ExecutionMode.values())
1641 <        for (Integer v1 : new Integer[] { 1, null }) {
1641 >    {
1642 >        final CFException ex = new CFException();
1643 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1644 >        final NoopConsumer[] rs = new NoopConsumer[4];
1645 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1646  
1647 +        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1648 +        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1649 +        assertTrue(f.completeExceptionally(ex));
1650 +        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1651 +        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1652 +
1653 +        checkCompletedWithWrappedException(h0, ex);
1654 +        checkCompletedWithWrappedException(h1, ex);
1655 +        checkCompletedWithWrappedException(h2, ex);
1656 +        checkCompletedWithWrappedException(h3, ex);
1657 +        checkCompletedExceptionally(f, ex);
1658 +        for (NoopConsumer r : rs) r.assertNotInvoked();
1659 +    }}
1660 +
1661 +    /**
1662 +     * thenAccept result completes exceptionally if source cancelled
1663 +     */
1664 +    public void 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 CompletableFuture<Integer> g = new CompletableFuture<>();
1670 <        final SubtractFunction r = new SubtractFunction();
912 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
913 <        final CFException ex = new CFException();
1669 >        final NoopConsumer[] rs = new NoopConsumer[4];
1670 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1671  
1672 <        f.completeExceptionally(ex);
1673 <        checkIncomplete(h);
1674 <        g.complete(v1);
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 <        checkCompletedWithWrappedCFException(h, ex);
1679 <        checkCompletedWithWrappedCFException(f, ex);
1680 <        assertFalse(r.ran());
1681 <        checkCompletedNormally(g, v1);
1682 <        }
1683 <    }
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 <    public void testThenCombine_exceptionalCompletion2() {
1686 >    /**
1687 >     * thenAccept result completes exceptionally if action does
1688 >     */
1689 >    public void testThenAccept_actionFailed() {
1690          for (ExecutionMode m : ExecutionMode.values())
1691 <        for (Integer v1 : new Integer[] { 1, null }) {
1692 <
1691 >        for (Integer v1 : new Integer[] { 1, null })
1692 >    {
1693          final CompletableFuture<Integer> f = new CompletableFuture<>();
1694 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1695 <        final SubtractFunction r = new SubtractFunction();
933 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
934 <        final CFException ex = new CFException();
1694 >        final FailingConsumer[] rs = new FailingConsumer[4];
1695 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1696  
1697 <        g.completeExceptionally(ex);
1698 <        checkIncomplete(h);
1699 <        f.complete(v1);
1700 <
1701 <        checkCompletedWithWrappedCFException(h, ex);
1702 <        checkCompletedWithWrappedCFException(g, ex);
1703 <        assertFalse(r.ran());
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 <        }
945 <    }
1708 >    }}
1709  
1710 <    public void testThenCombine_exceptionalCompletion3() {
1710 >    /**
1711 >     * thenCombine result completes normally after normal completion
1712 >     * of sources
1713 >     */
1714 >    public void testThenCombine_normalCompletion() {
1715          for (ExecutionMode m : ExecutionMode.values())
1716 <        for (Integer v1 : new Integer[] { 1, null }) {
1717 <
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 r = new SubtractFunction();
1723 <        final CFException ex = new CFException();
1722 >        final SubtractFunction[] rs = new SubtractFunction[6];
1723 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1724  
1725 <        g.completeExceptionally(ex);
1726 <        f.complete(v1);
1727 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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  
960        checkCompletedWithWrappedCFException(h, ex);
961        checkCompletedWithWrappedCFException(g, ex);
962        assertFalse(r.ran());
1751          checkCompletedNormally(f, v1);
1752 <        }
1753 <    }
1752 >        checkCompletedNormally(g, v2);
1753 >    }}
1754  
1755 <    public void testThenCombine_exceptionalCompletion4() {
1755 >    /**
1756 >     * thenCombine result completes exceptionally after exceptional
1757 >     * completion of either source
1758 >     */
1759 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1760          for (ExecutionMode m : ExecutionMode.values())
1761 <        for (Integer v1 : new Integer[] { 1, null }) {
1762 <
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<>();
973        final SubtractFunction r = new SubtractFunction();
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 <        f.completeExceptionally(ex);
1800 <        g.complete(v1);
1801 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
1802 <
1803 <        checkCompletedWithWrappedCFException(h, ex);
1804 <        checkCompletedWithWrappedCFException(f, ex);
1805 <        assertFalse(r.ran());
1806 <        checkCompletedNormally(g, v1);
1807 <        }
1808 <    }
1799 >    /**
1800 >     * thenCombine result completes exceptionally if either source cancelled
1801 >     */
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 action does
1844       */
1845 <    public void testThenCombine_actionFailed1() {
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 <
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 r = new FailingBiFunction();
1854 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1855 <
1856 <        f.complete(v1);
1857 <        checkIncomplete(h);
1858 <        g.complete(v2);
1859 <
1860 <        checkCompletedWithWrappedCFException(h);
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 <        }
1008 <    }
1876 >    }}
1877  
1878 <    public void testThenCombine_actionFailed2() {
1878 >    /**
1879 >     * thenAcceptBoth result completes normally after normal
1880 >     * completion of sources
1881 >     */
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 <
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 FailingBiFunction r = new FailingBiFunction();
1891 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1892 <
1893 <        g.complete(v2);
1894 <        checkIncomplete(h);
1895 <        f.complete(v1);
1896 <
1897 <        checkCompletedWithWrappedCFException(h);
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 <        }
1028 <    }
1917 >    }}
1918  
1919      /**
1920 <     * thenCombine result completes exceptionally if either source cancelled
1920 >     * thenAcceptBoth result completes exceptionally after exceptional
1921 >     * completion of either source
1922       */
1923 <    public void testThenCombine_sourceCancelled1() {
1923 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1924          for (ExecutionMode m : ExecutionMode.values())
1925 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1926 <        for (Integer v1 : new Integer[] { 1, null }) {
1927 <
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 SubtractFunction r = new SubtractFunction();
1932 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1933 <
1934 <        assertTrue(f.cancel(mayInterruptIfRunning));
1935 <        checkIncomplete(h);
1936 <        g.complete(v1);
1937 <
1938 <        checkCompletedWithWrappedCancellationException(h);
1939 <        checkCancelled(f);
1940 <        assertFalse(r.ran());
1941 <        checkCompletedNormally(g, v1);
1942 <        }
1943 <    }
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 <    public void testThenCombine_sourceCancelled2() {
1963 >    /**
1964 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1965 >     */
1966 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1967          for (ExecutionMode m : ExecutionMode.values())
1968          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1969 <        for (Integer v1 : new Integer[] { 1, null }) {
1970 <
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 SubtractFunction r = new SubtractFunction();
1976 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        assertTrue(g.cancel(mayInterruptIfRunning));
2007 <        checkIncomplete(h);
2008 <        f.complete(v1);
2009 <
1068 <        checkCompletedWithWrappedCancellationException(h);
1069 <        checkCancelled(g);
1070 <        assertFalse(r.ran());
1071 <        checkCompletedNormally(f, v1);
1072 <        }
1073 <    }
1074 <
1075 <    public void testThenCombine_sourceCancelled3() {
2006 >    /**
2007 >     * thenAcceptBoth result completes exceptionally if action does
2008 >     */
2009 >    public void testThenAcceptBoth_actionFailed() {
2010          for (ExecutionMode m : ExecutionMode.values())
2011 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2012 <        for (Integer v1 : new Integer[] { 1, null }) {
2013 <
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 SubtractFunction r = new SubtractFunction();
2018 <
2019 <        assertTrue(g.cancel(mayInterruptIfRunning));
2020 <        f.complete(v1);
2021 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
2022 <
2023 <        checkCompletedWithWrappedCancellationException(h);
2024 <        checkCancelled(g);
2025 <        assertFalse(r.ran());
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 <        }
2040 <    }
1094 <
1095 <    public void testThenCombine_sourceCancelled4() {
1096 <        for (ExecutionMode m : ExecutionMode.values())
1097 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1098 <        for (Integer v1 : new Integer[] { 1, null }) {
1099 <
1100 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1101 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1102 <        final SubtractFunction r = new SubtractFunction();
1103 <
1104 <        assertTrue(f.cancel(mayInterruptIfRunning));
1105 <        g.complete(v1);
1106 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1107 <
1108 <        checkCompletedWithWrappedCancellationException(h);
1109 <        checkCancelled(f);
1110 <        assertFalse(r.ran());
1111 <        checkCompletedNormally(g, v1);
1112 <        }
1113 <    }
2039 >        checkCompletedNormally(g, v2);
2040 >    }}
2041  
2042      /**
2043 <     * thenAcceptBoth result completes normally after normal
2043 >     * runAfterBoth result completes normally after normal
2044       * completion of sources
2045       */
2046 <    public void testThenAcceptBoth_normalCompletion1() {
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 <
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 SubtractAction r = new SubtractAction();
2055 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2056 <
2057 <        f.complete(v1);
2058 <        checkIncomplete(h);
2059 <        assertEquals(r.value, 0);
2060 <        g.complete(v2);
2061 <
2062 <        checkCompletedNormally(h, null);
2063 <        assertEquals(r.value, subtract(v1, v2));
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 <        }
1139 <    }
2081 >    }}
2082  
2083 <    public void testThenAcceptBoth_normalCompletion2() {
2083 >    /**
2084 >     * runAfterBoth result completes exceptionally after exceptional
2085 >     * completion of either source
2086 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1145 <
2092 >    {
2093          final CompletableFuture<Integer> f = new CompletableFuture<>();
2094          final CompletableFuture<Integer> g = new CompletableFuture<>();
2095 <        final SubtractAction r = new SubtractAction();
2096 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2097 <
2098 <        g.complete(v2);
2099 <        checkIncomplete(h);
2100 <        assertEquals(r.value, 0);
2101 <        f.complete(v1);
2102 <
2103 <        checkCompletedNormally(h, null);
2104 <        assertEquals(r.value, subtract(v1, v2));
2105 <        checkCompletedNormally(f, v1);
2106 <        checkCompletedNormally(g, v2);
2107 <        }
2108 <    }
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 <    public void testThenAcceptBoth_normalCompletion3() {
2127 >    /**
2128 >     * runAfterBoth result completes exceptionally if either source cancelled
2129 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1167 <
2136 >    {
2137          final CompletableFuture<Integer> f = new CompletableFuture<>();
2138          final CompletableFuture<Integer> g = new CompletableFuture<>();
2139 <        final SubtractAction r = new SubtractAction();
2140 <
2141 <        g.complete(v2);
2142 <        f.complete(v1);
2143 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        checkCompletedNormally(h, null);
2171 <        assertEquals(r.value, subtract(v1, v2));
2170 >    /**
2171 >     * runAfterBoth result completes exceptionally if action does
2172 >     */
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 <        }
1181 <    }
2204 >    }}
2205  
2206 <    public void testThenAcceptBoth_normalCompletion4() {
2206 >    /**
2207 >     * applyToEither result completes normally after normal completion
2208 >     * of either source
2209 >     */
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 <
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 SubtractAction r = new SubtractAction();
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);
1194        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2234  
2235 <        checkCompletedNormally(h, null);
2236 <        assertEquals(r.value, subtract(v1, v2));
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 <        }
2248 <    }
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 <     * thenAcceptBoth result completes exceptionally after exceptional
2255 >     * applyToEither result completes exceptionally after exceptional
2256       * completion of either source
2257       */
2258 <    public void testThenAcceptBoth_exceptionalCompletion1() {
2258 >    public void testApplyToEither_exceptionalCompletion() {
2259          for (ExecutionMode m : ExecutionMode.values())
2260 <        for (Integer v1 : new Integer[] { 1, null }) {
2261 <
2260 >        for (Integer v1 : new Integer[] { 1, null })
2261 >    {
2262          final CompletableFuture<Integer> f = new CompletableFuture<>();
2263          final CompletableFuture<Integer> g = new CompletableFuture<>();
1213        final SubtractAction r = new SubtractAction();
1214        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        checkIncomplete(h);
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 <        checkCompletedWithWrappedCFException(h, ex);
2284 <        checkCompletedWithWrappedCFException(f, ex);
2285 <        assertFalse(r.ran());
2286 <        checkCompletedNormally(g, v1);
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          }
1226    }
2300  
2301 <    public void testThenAcceptBoth_exceptionalCompletion2() {
2302 <        for (ExecutionMode m : ExecutionMode.values())
2303 <        for (Integer v1 : new Integer[] { 1, null }) {
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<>();
1234        final SubtractAction r = new SubtractAction();
1235        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        g.completeExceptionally(ex);
2323 <        checkIncomplete(h);
2324 <        f.complete(v1);
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 <        checkCompletedWithWrappedCFException(h, ex);
2330 <        checkCompletedWithWrappedCFException(g, ex);
2331 <        assertFalse(r.ran());
2332 <        checkCompletedNormally(f, v1);
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          }
1247    }
2358  
2359 <    public void testThenAcceptBoth_exceptionalCompletion3() {
2360 <        for (ExecutionMode m : ExecutionMode.values())
2361 <        for (Integer v1 : new Integer[] { 1, null }) {
2359 >        checkCompletedNormally(f, v1);
2360 >        checkCompletedExceptionally(g, ex);
2361 >    }}
2362  
2363 +    /**
2364 +     * applyToEither result completes exceptionally if either source cancelled
2365 +     */
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 SubtractAction r = new SubtractAction();
2374 <        final CFException ex = new CFException();
2373 >        final IncFunction[] rs = new IncFunction[6];
2374 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2375  
2376 <        g.completeExceptionally(ex);
2377 <        f.complete(v1);
2378 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        checkCompletedWithWrappedCFException(h, ex);
2392 <        checkCompletedWithWrappedCFException(g, ex);
2393 <        assertFalse(r.ran());
2394 <        checkCompletedNormally(f, v1);
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          }
1267    }
2408  
2409 <    public void testThenAcceptBoth_exceptionalCompletion4() {
2410 <        for (ExecutionMode m : ExecutionMode.values())
2411 <        for (Integer v1 : new Integer[] { 1, null }) {
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 SubtractAction r = new SubtractAction();
2427 <        final CFException ex = new CFException();
2426 >        final IncFunction[] rs = new IncFunction[6];
2427 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2428  
2429 <        f.completeExceptionally(ex);
2430 <        g.complete(v1);
2431 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        checkCompletedWithWrappedCFException(h, ex);
2437 <        checkCompletedWithWrappedCFException(f, ex);
2438 <        assertFalse(r.ran());
2439 <        checkCompletedNormally(g, v1);
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 <    }
2465 >
2466 >        checkCompletedNormally(f, v1);
2467 >        checkCancelled(g);
2468 >    }}
2469  
2470      /**
2471 <     * thenAcceptBoth result completes exceptionally if action does
2471 >     * applyToEither result completes exceptionally if action does
2472       */
2473 <    public void testThenAcceptBoth_actionFailed1() {
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 <
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 FailingBiConsumer r = new FailingBiConsumer();
2481 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        checkIncomplete(h);
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 <        checkCompletedWithWrappedCFException(h);
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 <        }
1310 <    }
2509 >    }}
2510  
2511 <    public void testThenAcceptBoth_actionFailed2() {
2511 >    /**
2512 >     * acceptEither result completes normally after normal completion
2513 >     * of either source
2514 >     */
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 <
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 FailingBiConsumer r = new FailingBiConsumer();
2523 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2522 >        final NoopConsumer[] rs = new NoopConsumer[6];
2523 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2524  
2525 <        g.complete(v2);
2526 <        checkIncomplete(h);
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  
1326        checkCompletedWithWrappedCFException(h);
2554          checkCompletedNormally(f, v1);
2555          checkCompletedNormally(g, v2);
2556 <        }
2557 <    }
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 <     * thenAcceptBoth result completes exceptionally if either source cancelled
2564 >     * acceptEither result completes exceptionally after exceptional
2565 >     * completion of either source
2566       */
2567 <    public void testThenAcceptBoth_sourceCancelled1() {
2567 >    public void testAcceptEither_exceptionalCompletion() {
2568          for (ExecutionMode m : ExecutionMode.values())
2569 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2570 <        for (Integer v1 : new Integer[] { 1, null }) {
1339 <
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 SubtractAction r = new SubtractAction();
2574 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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  
1345        assertTrue(f.cancel(mayInterruptIfRunning));
1346        checkIncomplete(h);
2591          g.complete(v1);
2592  
2593 <        checkCompletedWithWrappedCancellationException(h);
2594 <        checkCancelled(f);
2595 <        assertFalse(r.ran());
2596 <        checkCompletedNormally(g, v1);
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          }
1354    }
2610  
2611 <    public void testThenAcceptBoth_sourceCancelled2() {
2612 <        for (ExecutionMode m : ExecutionMode.values())
2613 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2614 <        for (Integer v1 : new Integer[] { 1, null }) {
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 SubtractAction r = new SubtractAction();
2629 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        assertTrue(g.cancel(mayInterruptIfRunning));
2633 <        checkIncomplete(h);
2634 <        f.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
2640 <        checkCancelled(g);
2641 <        assertFalse(r.ran());
2642 <        checkCompletedNormally(f, v1);
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          }
1375    }
1376
1377    public void testThenAcceptBoth_sourceCancelled3() {
1378        for (ExecutionMode m : ExecutionMode.values())
1379        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1380        for (Integer v1 : new Integer[] { 1, null }) {
1381
1382        final CompletableFuture<Integer> f = new CompletableFuture<>();
1383        final CompletableFuture<Integer> g = new CompletableFuture<>();
1384        final SubtractAction r = new SubtractAction();
1385
1386        assertTrue(g.cancel(mayInterruptIfRunning));
1387        f.complete(v1);
1388        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2668  
1390        checkCompletedWithWrappedCancellationException(h);
1391        checkCancelled(g);
1392        assertFalse(r.ran());
2669          checkCompletedNormally(f, v1);
2670 <        }
2671 <    }
2670 >        checkCompletedExceptionally(g, ex);
2671 >    }}
2672  
2673 <    public void testThenAcceptBoth_sourceCancelled4() {
2673 >    /**
2674 >     * acceptEither result completes exceptionally if either source cancelled
2675 >     */
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 <
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 SubtractAction r = new SubtractAction();
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  
1406        assertTrue(f.cancel(mayInterruptIfRunning));
2700          g.complete(v1);
1408        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2701  
2702 <        checkCompletedWithWrappedCancellationException(h);
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);
1412        assertFalse(r.ran());
2721          checkCompletedNormally(g, v1);
2722 <        }
2723 <    }
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 <     * runAfterBoth result completes normally after normal
1419 <     * completion of sources
2730 >     * acceptEither result completes exceptionally if action does
2731       */
2732 <    public void testRunAfterBoth_normalCompletion1() {
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 <
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 Noop r = new Noop();
2740 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        checkIncomplete(h);
2746 <        assertFalse(r.ran);
2747 <        g.complete(v2);
2748 <
2749 <        checkCompletedNormally(h, null);
2750 <        assertTrue(r.ran);
2751 <        checkCompletedNormally(f, v1);
1439 <        checkCompletedNormally(g, v2);
1440 <        }
1441 <    }
1442 <
1443 <    public void testRunAfterBoth_normalCompletion2() {
1444 <        for (ExecutionMode m : ExecutionMode.values())
1445 <        for (Integer v1 : new Integer[] { 1, null })
1446 <        for (Integer v2 : new Integer[] { 2, null }) {
1447 <
1448 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1449 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1450 <        final Noop r = new Noop();
1451 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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);
1454        checkIncomplete(h);
1455        assertFalse(r.ran);
1456        f.complete(v1);
1457
1458        checkCompletedNormally(h, null);
1459        assertTrue(r.ran);
1460        checkCompletedNormally(f, v1);
1461        checkCompletedNormally(g, v2);
1462        }
1463    }
1464
1465    public void testRunAfterBoth_normalCompletion3() {
1466        for (ExecutionMode m : ExecutionMode.values())
1467        for (Integer v1 : new Integer[] { 1, null })
1468        for (Integer v2 : new Integer[] { 2, null }) {
1469
1470        final CompletableFuture<Integer> f = new CompletableFuture<>();
1471        final CompletableFuture<Integer> g = new CompletableFuture<>();
1472        final Noop r = new Noop();
2754  
2755 <        g.complete(v2);
2756 <        f.complete(v1);
2757 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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  
1478        checkCompletedNormally(h, null);
1479        assertTrue(r.ran);
2766          checkCompletedNormally(f, v1);
2767          checkCompletedNormally(g, v2);
2768 <        }
1483 <    }
2768 >    }}
2769  
2770 <    public void testRunAfterBoth_normalCompletion4() {
2770 >    /**
2771 >     * runAfterEither result completes normally after normal completion
2772 >     * of either source
2773 >     */
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 <
2779 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2780 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2781 <        final Noop r = new Noop();
2782 <
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);
1496        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2808  
2809 <        checkCompletedNormally(h, null);
2810 <        assertTrue(r.ran);
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 <        }
2815 <    }
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 <     * runAfterBoth result completes exceptionally after exceptional
2824 >     * runAfterEither result completes exceptionally after exceptional
2825       * completion of either source
2826       */
2827 <    public void testRunAfterBoth_exceptionalCompletion1() {
2827 >    public void testRunAfterEither_exceptionalCompletion() {
2828          for (ExecutionMode m : ExecutionMode.values())
2829 <        for (Integer v1 : new Integer[] { 1, null }) {
2830 <
2829 >        for (Integer v1 : new Integer[] { 1, null })
2830 >    {
2831          final CompletableFuture<Integer> f = new CompletableFuture<>();
2832          final CompletableFuture<Integer> g = new CompletableFuture<>();
1515        final Noop r = new Noop();
1516        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        f.completeExceptionally(ex);
2838 <        checkIncomplete(h);
2839 <        g.complete(v1);
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 <        checkCompletedWithWrappedCFException(h, ex);
1524 <        checkCompletedWithWrappedCFException(f, ex);
1525 <        assertFalse(r.ran);
2871 >        checkCompletedExceptionally(f, ex);
2872          checkCompletedNormally(g, v1);
2873 <        }
2874 <    }
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 testRunAfterBoth_exceptionalCompletion2() {
2881 >    public void testRunAfterEither_exceptionalCompletion2() {
2882          for (ExecutionMode m : ExecutionMode.values())
2883 <        for (Integer v1 : new Integer[] { 1, null }) {
2884 <
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<>();
1536        final Noop r = new Noop();
1537        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        g.completeExceptionally(ex);
2893 <        checkIncomplete(h);
2894 <        f.complete(v1);
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 <        checkCompletedWithWrappedCFException(h, ex);
2900 <        checkCompletedWithWrappedCFException(g, ex);
2901 <        assertFalse(r.ran);
2902 <        checkCompletedNormally(f, v1);
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          }
1549    }
1550
1551    public void testRunAfterBoth_exceptionalCompletion3() {
1552        for (ExecutionMode m : ExecutionMode.values())
1553        for (Integer v1 : new Integer[] { 1, null }) {
1554
1555        final CompletableFuture<Integer> f = new CompletableFuture<>();
1556        final CompletableFuture<Integer> g = new CompletableFuture<>();
1557        final Noop r = new Noop();
1558        final CFException ex = new CFException();
1559
1560        g.completeExceptionally(ex);
1561        f.complete(v1);
1562        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2928  
1564        checkCompletedWithWrappedCFException(h, ex);
1565        checkCompletedWithWrappedCFException(g, ex);
1566        assertFalse(r.ran);
2929          checkCompletedNormally(f, v1);
2930 <        }
2931 <    }
2930 >        checkCompletedExceptionally(g, ex);
2931 >    }}
2932  
2933 <    public void testRunAfterBoth_exceptionalCompletion4() {
2933 >    /**
2934 >     * runAfterEither result completes exceptionally if either source cancelled
2935 >     */
2936 >    public void testRunAfterEither_sourceCancelled() {
2937          for (ExecutionMode m : ExecutionMode.values())
2938 <        for (Integer v1 : new Integer[] { 1, null }) {
2939 <
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 r = new Noop();
2944 <        final CFException ex = new CFException();
2943 >        final Noop[] rs = new Noop[6];
2944 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2945  
2946 <        f.completeExceptionally(ex);
2947 <        g.complete(v1);
2948 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        checkCompletedWithWrappedCFException(h, ex);
1585 <        checkCompletedWithWrappedCFException(f, ex);
1586 <        assertFalse(r.ran);
2980 >        checkCancelled(f);
2981          checkCompletedNormally(g, v1);
2982 <        }
2983 <    }
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 <     * runAfterBoth result completes exceptionally if action does
2990 >     * runAfterEither result completes exceptionally if action does
2991       */
2992 <    public void testRunAfterBoth_actionFailed1() {
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 <
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 FailingNoop r = new FailingNoop();
3000 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2999 >        final FailingRunnable[] rs = new FailingRunnable[6];
3000 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
3001  
3002 <        f.complete(v1);
3003 <        checkIncomplete(h);
3004 <        g.complete(v2);
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  
1608        checkCompletedWithWrappedCFException(h);
3018          checkCompletedNormally(f, v1);
3019          checkCompletedNormally(g, v2);
3020 <        }
3021 <    }
3020 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
3021 >    }}
3022  
3023 <    public void testRunAfterBoth_actionFailed2() {
3023 >    /**
3024 >     * thenCompose result completes normally after normal completion of source
3025 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1618 <
3030 >    {
3031          final CompletableFuture<Integer> f = new CompletableFuture<>();
3032 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3033 <        final FailingNoop r = new FailingNoop();
3034 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        g.complete(v2);
1625 <        checkIncomplete(h);
1626 <        f.complete(v1);
1627 <
1628 <        checkCompletedWithWrappedCFException(h);
3037 >        checkCompletedNormally(g, inc(v1));
3038          checkCompletedNormally(f, v1);
3039 <        checkCompletedNormally(g, v2);
3040 <        }
1632 <    }
3039 >        r.assertValue(v1);
3040 >    }}
3041  
3042      /**
3043 <     * runAfterBoth result completes exceptionally if either source cancelled
3043 >     * thenCompose result completes exceptionally after exceptional
3044 >     * completion of source
3045       */
3046 <    public void testRunAfterBoth_sourceCancelled1() {
3046 >    public void testThenCompose_exceptionalCompletion() {
3047          for (ExecutionMode m : ExecutionMode.values())
3048 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3049 <        for (Integer v1 : new Integer[] { 1, null }) {
3050 <
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 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3054 <        final Noop r = new Noop();
3055 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
3056 <
3057 <        assertTrue(f.cancel(mayInterruptIfRunning));
3058 <        checkIncomplete(h);
3059 <        g.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
3063 <        checkCancelled(f);
3064 <        assertFalse(r.ran);
3065 <        checkCompletedNormally(g, v1);
1655 <        }
1656 <    }
1657 <
1658 <    public void testRunAfterBoth_sourceCancelled2() {
3062 >    /**
3063 >     * thenCompose result completes exceptionally if action does
3064 >     */
3065 >    public void testThenCompose_actionFailed() {
3066          for (ExecutionMode m : ExecutionMode.values())
3067 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3068 <        for (Integer v1 : new Integer[] { 1, null }) {
3069 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
3072 <        final Noop r = new Noop();
3073 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
3074 <
3075 <        assertTrue(g.cancel(mayInterruptIfRunning));
1669 <        checkIncomplete(h);
1670 <        f.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
1673 <        checkCancelled(g);
1674 <        assertFalse(r.ran);
3077 >        checkCompletedWithWrappedException(g, r.ex);
3078          checkCompletedNormally(f, v1);
3079 <        }
1677 <    }
3079 >    }}
3080  
3081 <    public void testRunAfterBoth_sourceCancelled3() {
3081 >    /**
3082 >     * thenCompose result completes exceptionally if source cancelled
3083 >     */
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 <        for (Integer v1 : new Integer[] { 1, null }) {
1683 <
3088 >    {
3089          final CompletableFuture<Integer> f = new CompletableFuture<>();
3090 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3091 <        final Noop r = new Noop();
3092 <
3093 <        assertTrue(g.cancel(mayInterruptIfRunning));
3094 <        f.complete(v1);
3095 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1691 <
1692 <        checkCompletedWithWrappedCancellationException(h);
1693 <        checkCancelled(g);
1694 <        assertFalse(r.ran);
1695 <        checkCompletedNormally(f, v1);
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          }
1697    }
1698
1699    public void testRunAfterBoth_sourceCancelled4() {
1700        for (ExecutionMode m : ExecutionMode.values())
1701        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1702        for (Integer v1 : new Integer[] { 1, null }) {
1703
1704        final CompletableFuture<Integer> f = new CompletableFuture<>();
1705        final CompletableFuture<Integer> g = new CompletableFuture<>();
1706        final Noop r = new Noop();
1707
1708        assertTrue(f.cancel(mayInterruptIfRunning));
1709        g.complete(v1);
1710        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
3097  
3098 <        checkCompletedWithWrappedCancellationException(h);
3098 >        checkCompletedWithWrappedCancellationException(g);
3099          checkCancelled(f);
3100 <        assertFalse(r.ran);
1715 <        checkCompletedNormally(g, v1);
1716 <        }
1717 <    }
3100 >    }}
3101  
3102      /**
3103 <     * applyToEither result completes normally after normal completion
1721 <     * of either source
3103 >     * thenCompose result completes exceptionally if the result of the action does
3104       */
3105 <    public void testApplyToEither() {
3106 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3107 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3108 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
3109 <        f.complete(one);
3110 <        checkCompletedNormally(g, two);
3111 <        f2.complete(one);
3112 <        checkCompletedNormally(g, two);
3105 >    public void testThenCompose_actionReturnsFailingFuture() {
3106 >        for (ExecutionMode m : ExecutionMode.values())
3107 >        for (int order = 0; order < 6; order++)
3108 >        for (Integer v1 : new Integer[] { 1, null })
3109 >    {
3110 >        final CFException ex = new CFException();
3111 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3112 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3113 >        final CompletableFuture<Integer> h;
3114 >        // Test all permutations of orders
3115 >        switch (order) {
3116 >        case 0:
3117 >            assertTrue(f.complete(v1));
3118 >            assertTrue(g.completeExceptionally(ex));
3119 >            h = m.thenCompose(f, (x -> g));
3120 >            break;
3121 >        case 1:
3122 >            assertTrue(f.complete(v1));
3123 >            h = m.thenCompose(f, (x -> g));
3124 >            assertTrue(g.completeExceptionally(ex));
3125 >            break;
3126 >        case 2:
3127 >            assertTrue(g.completeExceptionally(ex));
3128 >            assertTrue(f.complete(v1));
3129 >            h = m.thenCompose(f, (x -> g));
3130 >            break;
3131 >        case 3:
3132 >            assertTrue(g.completeExceptionally(ex));
3133 >            h = m.thenCompose(f, (x -> g));
3134 >            assertTrue(f.complete(v1));
3135 >            break;
3136 >        case 4:
3137 >            h = m.thenCompose(f, (x -> g));
3138 >            assertTrue(f.complete(v1));
3139 >            assertTrue(g.completeExceptionally(ex));
3140 >            break;
3141 >        case 5:
3142 >            h = m.thenCompose(f, (x -> g));
3143 >            assertTrue(f.complete(v1));
3144 >            assertTrue(g.completeExceptionally(ex));
3145 >            break;
3146 >        default: throw new AssertionError();
3147 >        }
3148  
3149 <        f = new CompletableFuture<>();
3150 <        f.complete(one);
3151 <        f2 = new CompletableFuture<>();
3152 <        g = f.applyToEither(f2, inc);
1736 <        checkCompletedNormally(g, two);
1737 <    }
3149 >        checkCompletedExceptionally(g, ex);
3150 >        checkCompletedWithWrappedException(h, ex);
3151 >        checkCompletedNormally(f, v1);
3152 >    }}
3153  
3154      /**
3155 <     * applyToEither result completes exceptionally after exceptional
3156 <     * completion of either source
3155 >     * exceptionallyCompose result completes normally after normal
3156 >     * completion of source
3157       */
3158 <    public void testApplyToEither2() {
3159 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3160 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3161 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
3162 <        f.completeExceptionally(new CFException());
3163 <        f2.complete(one);
3164 <        checkCompletedWithWrappedCFException(g);
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 <        f = new CompletableFuture<>();
3171 <        f2 = new CompletableFuture<>();
3172 <        f2.completeExceptionally(new CFException());
3173 <        g = f.applyToEither(f2, inc);
3174 <        checkCompletedWithWrappedCFException(g);
3175 <    }
3170 >        if (!createIncomplete && testImplementationDetails)
3171 >            assertSame(f, g);
3172 >        checkCompletedNormally(f, v1);
3173 >        checkCompletedNormally(g, v1);
3174 >        r.assertNotInvoked();
3175 >    }}
3176  
3177      /**
3178 <     * applyToEither result completes exceptionally if action does
3178 >     * exceptionallyCompose result completes normally after exceptional
3179 >     * completion of source
3180       */
3181 <    public void testApplyToEither3() {
3182 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3183 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3184 <        FailingFunction r = new FailingFunction();
3185 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
3186 <        f2.complete(two);
3187 <        checkCompletedWithWrappedCFException(g);
3188 <    }
3181 >    public void testExceptionallyCompose_exceptionalCompletion() {
3182 >        for (ExecutionMode m : ExecutionMode.values())
3183 >        for (boolean createIncomplete : new boolean[] { true, false })
3184 >    {
3185 >        final CFException ex = new CFException();
3186 >        final ExceptionalCompletableFutureFunction r =
3187 >            new ExceptionalCompletableFutureFunction(m);
3188 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3189 >        if (!createIncomplete) f.completeExceptionally(ex);
3190 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3191 >        if (createIncomplete) f.completeExceptionally(ex);
3192  
3193 <    /**
3194 <     * applyToEither result completes exceptionally if either source cancelled
3195 <     */
3196 <    public void testApplyToEither4() {
1774 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1775 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1776 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1777 <        assertTrue(f.cancel(true));
1778 <        checkCompletedWithWrappedCancellationException(g);
1779 <        f = new CompletableFuture<>();
1780 <        f2 = new CompletableFuture<>();
1781 <        assertTrue(f2.cancel(true));
1782 <        checkCompletedWithWrappedCancellationException(g);
1783 <    }
3193 >        checkCompletedExceptionally(f, ex);
3194 >        checkCompletedNormally(g, r.value);
3195 >        r.assertInvoked();
3196 >    }}
3197  
3198      /**
3199 <     * acceptEither result completes normally after normal completion
1787 <     * of either source
3199 >     * exceptionallyCompose completes exceptionally on exception if action does
3200       */
3201 <    public void testAcceptEither() {
3202 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3203 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3204 <        IncAction r = new IncAction();
3205 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
3206 <        f.complete(one);
3207 <        checkCompletedNormally(g, null);
3208 <        f2.complete(one);
3209 <        checkCompletedNormally(g, null);
3210 <        assertEquals(r.value, 2);
3211 <
3212 <        r = new IncAction();
3213 <        f = new CompletableFuture<>();
3214 <        f.complete(one);
3215 <        f2 = new CompletableFuture<>();
3216 <        g = f.acceptEither(f2, r);
3217 <        checkCompletedNormally(g, null);
1806 <        assertEquals(r.value, 2);
1807 <    }
3201 >    public void testExceptionallyCompose_actionFailed() {
3202 >        for (ExecutionMode m : ExecutionMode.values())
3203 >        for (boolean createIncomplete : new boolean[] { true, false })
3204 >        for (Integer v1 : new Integer[] { 1, null })
3205 >    {
3206 >        final CFException ex = new CFException();
3207 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3208 >        final FailingExceptionalCompletableFutureFunction r
3209 >            = new FailingExceptionalCompletableFutureFunction(m);
3210 >        if (!createIncomplete) f.completeExceptionally(ex);
3211 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3212 >        if (createIncomplete) f.completeExceptionally(ex);
3213 >
3214 >        checkCompletedExceptionally(f, ex);
3215 >        checkCompletedWithWrappedException(g, r.ex);
3216 >        r.assertInvoked();
3217 >    }}
3218  
1809    /**
1810     * acceptEither result completes exceptionally after exceptional
1811     * completion of either source
1812     */
1813    public void testAcceptEither2() {
1814        CompletableFuture<Integer> f = new CompletableFuture<>();
1815        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1816        IncAction r = new IncAction();
1817        CompletableFuture<Void> g = f.acceptEither(f2, r);
1818        f.completeExceptionally(new CFException());
1819        f2.complete(one);
1820        checkCompletedWithWrappedCFException(g);
3219  
3220 <        r = new IncAction();
1823 <        f = new CompletableFuture<>();
1824 <        f2 = new CompletableFuture<>();
1825 <        f2.completeExceptionally(new CFException());
1826 <        g = f.acceptEither(f2, r);
1827 <        checkCompletedWithWrappedCFException(g);
1828 <    }
3220 >    // other static methods
3221  
3222      /**
3223 <     * acceptEither result completes exceptionally if action does
3223 >     * allOf(no component futures) returns a future completed normally
3224 >     * with the value null
3225       */
3226 <    public void testAcceptEither3() {
3227 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3228 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1836 <        FailingConsumer r = new FailingConsumer();
1837 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1838 <        f2.complete(two);
1839 <        checkCompletedWithWrappedCFException(g);
3226 >    public void testAllOf_empty() throws Exception {
3227 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3228 >        checkCompletedNormally(f, null);
3229      }
3230  
3231      /**
3232 <     * acceptEither result completes exceptionally if either source cancelled
3232 >     * allOf returns a future completed normally with the value null
3233 >     * when all components complete normally
3234       */
3235 <    public void testAcceptEither4() {
3236 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3237 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3238 <        IncAction r = new IncAction();
3239 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
3240 <        assertTrue(f.cancel(true));
3241 <        checkCompletedWithWrappedCancellationException(g);
3242 <        f = new CompletableFuture<>();
3243 <        f2 = new CompletableFuture<>();
3244 <        assertTrue(f2.cancel(true));
3245 <        checkCompletedWithWrappedCancellationException(g);
3235 >    public void testAllOf_normal() throws Exception {
3236 >        for (int k = 1; k < 10; k++) {
3237 >            CompletableFuture<Integer>[] fs
3238 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3239 >            for (int i = 0; i < k; i++)
3240 >                fs[i] = new CompletableFuture<>();
3241 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3242 >            for (int i = 0; i < k; i++) {
3243 >                checkIncomplete(f);
3244 >                checkIncomplete(CompletableFuture.allOf(fs));
3245 >                fs[i].complete(one);
3246 >            }
3247 >            checkCompletedNormally(f, null);
3248 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3249 >        }
3250      }
3251  
3252 <    /**
3253 <     * runAfterEither result completes normally after normal completion
3254 <     * of either source
3255 <     */
3256 <    public void testRunAfterEither() {
3257 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3258 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3259 <        Noop r = new Noop();
3260 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
3261 <        f.complete(one);
3262 <        checkCompletedNormally(g, null);
3263 <        f2.complete(one);
3264 <        checkCompletedNormally(g, null);
3265 <        assertTrue(r.ran);
3252 >    public void testAllOf_normal_backwards() throws Exception {
3253 >        for (int k = 1; k < 10; k++) {
3254 >            CompletableFuture<Integer>[] fs
3255 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3256 >            for (int i = 0; i < k; i++)
3257 >                fs[i] = new CompletableFuture<>();
3258 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3259 >            for (int i = k - 1; i >= 0; i--) {
3260 >                checkIncomplete(f);
3261 >                checkIncomplete(CompletableFuture.allOf(fs));
3262 >                fs[i].complete(one);
3263 >            }
3264 >            checkCompletedNormally(f, null);
3265 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3266 >        }
3267 >    }
3268  
3269 <        r = new Noop();
3270 <        f = new CompletableFuture<>();
3271 <        f.complete(one);
3272 <        f2 = new CompletableFuture<>();
3273 <        g = f.runAfterEither(f2, r);
3274 <        checkCompletedNormally(g, null);
3275 <        assertTrue(r.ran);
3269 >    public void testAllOf_exceptional() throws Exception {
3270 >        for (int k = 1; k < 10; k++) {
3271 >            CompletableFuture<Integer>[] fs
3272 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3273 >            CFException ex = new CFException();
3274 >            for (int i = 0; i < k; i++)
3275 >                fs[i] = new CompletableFuture<>();
3276 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3277 >            for (int i = 0; i < k; i++) {
3278 >                checkIncomplete(f);
3279 >                checkIncomplete(CompletableFuture.allOf(fs));
3280 >                if (i != k / 2) {
3281 >                    fs[i].complete(i);
3282 >                    checkCompletedNormally(fs[i], i);
3283 >                } else {
3284 >                    fs[i].completeExceptionally(ex);
3285 >                    checkCompletedExceptionally(fs[i], ex);
3286 >                }
3287 >            }
3288 >            checkCompletedWithWrappedException(f, ex);
3289 >            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3290 >        }
3291      }
3292  
3293      /**
3294 <     * runAfterEither result completes exceptionally after exceptional
1884 <     * completion of either source
3294 >     * anyOf(no component futures) returns an incomplete future
3295       */
3296 <    public void testRunAfterEither2() {
3297 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3298 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3299 <        Noop r = new Noop();
3300 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1891 <        f.completeExceptionally(new CFException());
1892 <        f2.complete(one);
1893 <        checkCompletedWithWrappedCFException(g);
3296 >    public void testAnyOf_empty() throws Exception {
3297 >        for (Integer v1 : new Integer[] { 1, null })
3298 >    {
3299 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3300 >        checkIncomplete(f);
3301  
3302 <        r = new Noop();
3303 <        f = new CompletableFuture<>();
3304 <        f2 = new CompletableFuture<>();
1898 <        f2.completeExceptionally(new CFException());
1899 <        g = f.runAfterEither(f2, r);
1900 <        checkCompletedWithWrappedCFException(g);
1901 <    }
3302 >        f.complete(v1);
3303 >        checkCompletedNormally(f, v1);
3304 >    }}
3305  
3306      /**
3307 <     * runAfterEither result completes exceptionally if action does
3307 >     * anyOf returns a future completed normally with a value when
3308 >     * a component future does
3309       */
3310 <    public void testRunAfterEither3() {
3311 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3312 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3313 <        FailingNoop r = new FailingNoop();
3314 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
3315 <        f2.complete(two);
3316 <        checkCompletedWithWrappedCFException(g);
3310 >    public void testAnyOf_normal() throws Exception {
3311 >        for (int k = 0; k < 10; k++) {
3312 >            CompletableFuture[] fs = new CompletableFuture[k];
3313 >            for (int i = 0; i < k; i++)
3314 >                fs[i] = new CompletableFuture<>();
3315 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3316 >            checkIncomplete(f);
3317 >            for (int i = 0; i < k; i++) {
3318 >                fs[i].complete(i);
3319 >                checkCompletedNormally(f, 0);
3320 >                int x = (int) CompletableFuture.anyOf(fs).join();
3321 >                assertTrue(0 <= x && x <= i);
3322 >            }
3323 >        }
3324      }
3325 <
3326 <    /**
3327 <     * runAfterEither result completes exceptionally if either source cancelled
3328 <     */
3329 <    public void testRunAfterEither4() {
3330 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3331 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3332 <        Noop r = new Noop();
3333 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
3334 <        assertTrue(f.cancel(true));
3335 <        checkCompletedWithWrappedCancellationException(g);
3336 <        f = new CompletableFuture<>();
3337 <        f2 = new CompletableFuture<>();
3338 <        assertTrue(f2.cancel(true));
1928 <        checkCompletedWithWrappedCancellationException(g);
3325 >    public void testAnyOf_normal_backwards() throws Exception {
3326 >        for (int k = 0; k < 10; k++) {
3327 >            CompletableFuture[] fs = new CompletableFuture[k];
3328 >            for (int i = 0; i < k; i++)
3329 >                fs[i] = new CompletableFuture<>();
3330 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3331 >            checkIncomplete(f);
3332 >            for (int i = k - 1; i >= 0; i--) {
3333 >                fs[i].complete(i);
3334 >                checkCompletedNormally(f, k - 1);
3335 >                int x = (int) CompletableFuture.anyOf(fs).join();
3336 >                assertTrue(i <= x && x <= k - 1);
3337 >            }
3338 >        }
3339      }
3340  
3341      /**
3342 <     * thenCompose result completes normally after normal completion of source
3342 >     * anyOf result completes exceptionally when any component does.
3343       */
3344 <    public void testThenCompose() {
3345 <        CompletableFuture<Integer> f, g;
3346 <        CompletableFutureInc r;
3347 <
3348 <        f = new CompletableFuture<>();
3349 <        g = f.thenCompose(r = new CompletableFutureInc());
3350 <        f.complete(one);
3351 <        checkCompletedNormally(g, two);
3352 <        assertTrue(r.ran);
3353 <
3354 <        f = new CompletableFuture<>();
3355 <        f.complete(one);
3356 <        g = f.thenCompose(r = new CompletableFutureInc());
3357 <        checkCompletedNormally(g, two);
3358 <        assertTrue(r.ran);
3344 >    public void testAnyOf_exceptional() throws Exception {
3345 >        for (int k = 0; k < 10; k++) {
3346 >            CompletableFuture[] fs = new CompletableFuture[k];
3347 >            CFException[] exs = new CFException[k];
3348 >            for (int i = 0; i < k; i++) {
3349 >                fs[i] = new CompletableFuture<>();
3350 >                exs[i] = new CFException();
3351 >            }
3352 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3353 >            checkIncomplete(f);
3354 >            for (int i = 0; i < k; i++) {
3355 >                fs[i].completeExceptionally(exs[i]);
3356 >                checkCompletedWithWrappedException(f, exs[0]);
3357 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3358 >            }
3359 >        }
3360      }
3361  
3362 <    /**
3363 <     * thenCompose result completes exceptionally after exceptional
3364 <     * completion of source
3365 <     */
3366 <    public void testThenCompose2() {
3367 <        CompletableFuture<Integer> f, g;
3368 <        CompletableFutureInc r;
3369 <
3370 <        f = new CompletableFuture<>();
3371 <        g = f.thenCompose(r = new CompletableFutureInc());
3372 <        f.completeExceptionally(new CFException());
3373 <        checkCompletedWithWrappedCFException(g);
3374 <
3375 <        f = new CompletableFuture<>();
3376 <        f.completeExceptionally(new CFException());
3377 <        g = f.thenCompose(r = new CompletableFutureInc());
1967 <        checkCompletedWithWrappedCFException(g);
3362 >    public void testAnyOf_exceptional_backwards() throws Exception {
3363 >        for (int k = 0; k < 10; k++) {
3364 >            CompletableFuture[] fs = new CompletableFuture[k];
3365 >            CFException[] exs = new CFException[k];
3366 >            for (int i = 0; i < k; i++) {
3367 >                fs[i] = new CompletableFuture<>();
3368 >                exs[i] = new CFException();
3369 >            }
3370 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3371 >            checkIncomplete(f);
3372 >            for (int i = k - 1; i >= 0; i--) {
3373 >                fs[i].completeExceptionally(exs[i]);
3374 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3375 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3376 >            }
3377 >        }
3378      }
3379  
3380      /**
3381 <     * thenCompose result completes exceptionally if action does
3381 >     * Completion methods throw NullPointerException with null arguments
3382       */
3383 <    public void testThenCompose3() {
3384 <        CompletableFuture<Integer> f, g;
3385 <        FailingCompletableFutureFunction r;
3386 <
3387 <        f = new CompletableFuture<>();
3388 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1979 <        f.complete(one);
1980 <        checkCompletedWithWrappedCFException(g);
3383 >    @SuppressWarnings("FutureReturnValueIgnored")
3384 >    public void testNPE() {
3385 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3386 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3387 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3388 >        ThreadExecutor exec = new ThreadExecutor();
3389  
3390 <        f = new CompletableFuture<>();
3391 <        f.complete(one);
3392 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
3393 <        checkCompletedWithWrappedCFException(g);
1986 <    }
3390 >        Runnable[] throwingActions = {
3391 >            () -> CompletableFuture.supplyAsync(null),
3392 >            () -> CompletableFuture.supplyAsync(null, exec),
3393 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3394  
3395 <    /**
3396 <     * thenCompose result completes exceptionally if source cancelled
3397 <     */
1991 <    public void testThenCompose4() {
1992 <        CompletableFuture<Integer> f, g;
1993 <        CompletableFutureInc r;
3395 >            () -> CompletableFuture.runAsync(null),
3396 >            () -> CompletableFuture.runAsync(null, exec),
3397 >            () -> CompletableFuture.runAsync(() -> {}, null),
3398  
3399 <        f = new CompletableFuture<>();
1996 <        g = f.thenCompose(r = new CompletableFutureInc());
1997 <        assertTrue(f.cancel(true));
1998 <        checkCompletedWithWrappedCancellationException(g);
3399 >            () -> f.completeExceptionally(null),
3400  
3401 <        f = new CompletableFuture<>();
3402 <        assertTrue(f.cancel(true));
3403 <        g = f.thenCompose(r = new CompletableFutureInc());
3404 <        checkCompletedWithWrappedCancellationException(g);
2004 <    }
3401 >            () -> f.thenApply(null),
3402 >            () -> f.thenApplyAsync(null),
3403 >            () -> f.thenApplyAsync(x -> x, null),
3404 >            () -> f.thenApplyAsync(null, exec),
3405  
3406 <    // asyncs
3406 >            () -> f.thenAccept(null),
3407 >            () -> f.thenAcceptAsync(null),
3408 >            () -> f.thenAcceptAsync(x -> {} , null),
3409 >            () -> f.thenAcceptAsync(null, exec),
3410  
3411 <    /**
3412 <     * thenRunAsync result completes normally after normal completion of source
3413 <     */
3414 <    public void testThenRunAsync() {
2012 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2013 <        Noop r = new Noop();
2014 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2015 <        f.complete(null);
2016 <        checkCompletedNormally(g, null);
3411 >            () -> f.thenRun(null),
3412 >            () -> f.thenRunAsync(null),
3413 >            () -> f.thenRunAsync(() -> {} , null),
3414 >            () -> f.thenRunAsync(null, exec),
3415  
3416 <        // reordered version
3417 <        f = new CompletableFuture<>();
3418 <        f.complete(null);
3419 <        r = new Noop();
3420 <        g = f.thenRunAsync(r);
3421 <        checkCompletedNormally(g, null);
3422 <    }
3416 >            () -> f.thenCombine(g, null),
3417 >            () -> f.thenCombineAsync(g, null),
3418 >            () -> f.thenCombineAsync(g, null, exec),
3419 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3420 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3421 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3422 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3423  
3424 <    /**
3425 <     * thenRunAsync result completes exceptionally after exceptional
3426 <     * completion of source
3427 <     */
3428 <    public void testThenRunAsync2() {
3429 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3430 <        Noop r = new Noop();
2033 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2034 <        f.completeExceptionally(new CFException());
2035 <        try {
2036 <            g.join();
2037 <            shouldThrow();
2038 <        } catch (CompletionException success) {}
2039 <        checkCompletedWithWrappedCFException(g);
2040 <    }
3424 >            () -> f.thenAcceptBoth(g, null),
3425 >            () -> f.thenAcceptBothAsync(g, null),
3426 >            () -> f.thenAcceptBothAsync(g, null, exec),
3427 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3428 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3429 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3430 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3431  
3432 <    /**
3433 <     * thenRunAsync result completes exceptionally if action does
3434 <     */
3435 <    public void testThenRunAsync3() {
3436 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3437 <        FailingNoop r = new FailingNoop();
3438 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2049 <        f.complete(null);
2050 <        checkCompletedWithWrappedCFException(g);
2051 <    }
3432 >            () -> f.runAfterBoth(g, null),
3433 >            () -> f.runAfterBothAsync(g, null),
3434 >            () -> f.runAfterBothAsync(g, null, exec),
3435 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3436 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3437 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3438 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3439  
3440 <    /**
3441 <     * thenRunAsync result completes exceptionally if source cancelled
3442 <     */
3443 <    public void testThenRunAsync4() {
3444 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3445 <        Noop r = new Noop();
3446 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2060 <        assertTrue(f.cancel(true));
2061 <        checkCompletedWithWrappedCancellationException(g);
2062 <    }
3440 >            () -> f.applyToEither(g, null),
3441 >            () -> f.applyToEitherAsync(g, null),
3442 >            () -> f.applyToEitherAsync(g, null, exec),
3443 >            () -> f.applyToEither(nullFuture, x -> x),
3444 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3445 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3446 >            () -> f.applyToEitherAsync(g, x -> x, null),
3447  
3448 <    /**
3449 <     * thenApplyAsync result completes normally after normal completion of source
3450 <     */
3451 <    public void testThenApplyAsync() {
3452 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3453 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3454 <        f.complete(one);
2071 <        checkCompletedNormally(g, two);
2072 <    }
3448 >            () -> f.acceptEither(g, null),
3449 >            () -> f.acceptEitherAsync(g, null),
3450 >            () -> f.acceptEitherAsync(g, null, exec),
3451 >            () -> f.acceptEither(nullFuture, x -> {}),
3452 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3453 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3454 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3455  
3456 <    /**
3457 <     * thenApplyAsync result completes exceptionally after exceptional
3458 <     * completion of source
3459 <     */
3460 <    public void testThenApplyAsync2() {
3461 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3462 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2081 <        f.completeExceptionally(new CFException());
2082 <        checkCompletedWithWrappedCFException(g);
2083 <    }
3456 >            () -> f.runAfterEither(g, null),
3457 >            () -> f.runAfterEitherAsync(g, null),
3458 >            () -> f.runAfterEitherAsync(g, null, exec),
3459 >            () -> f.runAfterEither(nullFuture, () -> {}),
3460 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3461 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3462 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3463  
3464 <    /**
3465 <     * thenApplyAsync result completes exceptionally if action does
3466 <     */
3467 <    public void testThenApplyAsync3() {
2089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2090 <        FailingFunction r = new FailingFunction();
2091 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2092 <        f.complete(null);
2093 <        checkCompletedWithWrappedCFException(g);
2094 <    }
3464 >            () -> f.thenCompose(null),
3465 >            () -> f.thenComposeAsync(null),
3466 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3467 >            () -> f.thenComposeAsync(null, exec),
3468  
3469 <    /**
2097 <     * thenApplyAsync result completes exceptionally if source cancelled
2098 <     */
2099 <    public void testThenApplyAsync4() {
2100 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2101 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2102 <        assertTrue(f.cancel(true));
2103 <        checkCompletedWithWrappedCancellationException(g);
2104 <    }
3469 >            () -> f.exceptionally(null),
3470  
3471 <    /**
2107 <     * thenAcceptAsync result completes normally after normal
2108 <     * completion of source
2109 <     */
2110 <    public void testThenAcceptAsync() {
2111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        IncAction r = new IncAction();
2113 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2114 <        f.complete(one);
2115 <        checkCompletedNormally(g, null);
2116 <        assertEquals(r.value, 2);
2117 <    }
3471 >            () -> f.handle(null),
3472  
3473 <    /**
3474 <     * thenAcceptAsync result completes exceptionally after exceptional
3475 <     * completion of source
3476 <     */
2123 <    public void testThenAcceptAsync2() {
2124 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2125 <        IncAction r = new IncAction();
2126 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2127 <        f.completeExceptionally(new CFException());
2128 <        checkCompletedWithWrappedCFException(g);
2129 <    }
3473 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3474 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3475 >            () -> CompletableFuture.allOf(f, null),
3476 >            () -> CompletableFuture.allOf(null, f),
3477  
3478 <    /**
3479 <     * thenAcceptAsync result completes exceptionally if action does
3480 <     */
3481 <    public void testThenAcceptAsync3() {
2135 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        FailingConsumer r = new FailingConsumer();
2137 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2138 <        f.complete(null);
2139 <        checkCompletedWithWrappedCFException(g);
2140 <    }
3478 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3479 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3480 >            () -> CompletableFuture.anyOf(f, null),
3481 >            () -> CompletableFuture.anyOf(null, f),
3482  
3483 <    /**
2143 <     * thenAcceptAsync result completes exceptionally if source cancelled
2144 <     */
2145 <    public void testThenAcceptAsync4() {
2146 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2147 <        IncAction r = new IncAction();
2148 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2149 <        assertTrue(f.cancel(true));
2150 <        checkCompletedWithWrappedCancellationException(g);
2151 <    }
3483 >            () -> f.obtrudeException(null),
3484  
3485 <    /**
3486 <     * applyToEitherAsync result completes normally after normal
3487 <     * completion of sources
2156 <     */
2157 <    public void testApplyToEitherAsync() {
2158 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2159 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2160 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2161 <        f.complete(one);
2162 <        checkCompletedNormally(g, two);
3485 >            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3486 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3487 >            () -> CompletableFuture.delayedExecutor(1L, null),
3488  
3489 <        f = new CompletableFuture<>();
3490 <        f.complete(one);
2166 <        f2 = new CompletableFuture<>();
2167 <        g = f.applyToEitherAsync(f2, inc);
2168 <        checkCompletedNormally(g, two);
2169 <    }
3489 >            () -> f.orTimeout(1L, null),
3490 >            () -> f.completeOnTimeout(42, 1L, null),
3491  
3492 <    /**
3493 <     * applyToEitherAsync result completes exceptionally after exceptional
3494 <     * completion of source
2174 <     */
2175 <    public void testApplyToEitherAsync2() {
2176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2177 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2178 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2179 <        f.completeExceptionally(new CFException());
2180 <        checkCompletedWithWrappedCFException(g);
3492 >            () -> CompletableFuture.failedFuture(null),
3493 >            () -> CompletableFuture.failedStage(null),
3494 >        };
3495  
3496 <        f = new CompletableFuture<>();
3497 <        f2 = new CompletableFuture<>();
2184 <        f2.completeExceptionally(new CFException());
2185 <        g = f.applyToEitherAsync(f2, inc);
2186 <        f.complete(one);
2187 <        checkCompletedWithWrappedCFException(g);
3496 >        assertThrows(NullPointerException.class, throwingActions);
3497 >        assertEquals(0, exec.count.get());
3498      }
3499  
3500      /**
3501 <     * applyToEitherAsync result completes exceptionally if action does
3501 >     * Test submissions to an executor that rejects all tasks.
3502       */
3503 <    public void testApplyToEitherAsync3() {
3504 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3505 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3506 <        FailingFunction r = new FailingFunction();
3507 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
3508 <        f.complete(one);
3509 <        checkCompletedWithWrappedCFException(g);
3510 <    }
3503 >    public void testRejectingExecutor() {
3504 >        for (Integer v : new Integer[] { 1, null })
3505 >    {
3506 >        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3507 >
3508 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3509 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3510 >
3511 >        List<CompletableFuture<?>> futures = new ArrayList<>();
3512 >
3513 >        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3514 >        srcs.add(complete);
3515 >        srcs.add(incomplete);
3516 >
3517 >        for (CompletableFuture<Integer> src : srcs) {
3518 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3519 >            fs.add(src.thenRunAsync(() -> {}, e));
3520 >            fs.add(src.thenAcceptAsync(z -> {}, e));
3521 >            fs.add(src.thenApplyAsync(z -> z, e));
3522 >
3523 >            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3524 >            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3525 >            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3526 >
3527 >            fs.add(src.applyToEitherAsync(src, z -> z, e));
3528 >            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3529 >            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3530 >
3531 >            fs.add(src.thenComposeAsync(z -> null, e));
3532 >            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3533 >            fs.add(src.handleAsync((z, t) -> null, e));
3534 >
3535 >            for (CompletableFuture<?> future : fs) {
3536 >                if (src.isDone())
3537 >                    checkCompletedWithWrappedException(future, e.ex);
3538 >                else
3539 >                    checkIncomplete(future);
3540 >            }
3541 >            futures.addAll(fs);
3542 >        }
3543  
3544 <    /**
3545 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2204 <     */
2205 <    public void testApplyToEitherAsync4() {
2206 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2207 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2208 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2209 <        assertTrue(f.cancel(true));
2210 <        checkCompletedWithWrappedCancellationException(g);
3544 >        {
3545 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3546  
3547 <        f = new CompletableFuture<>();
3548 <        f2 = new CompletableFuture<>();
2214 <        assertTrue(f2.cancel(true));
2215 <        g = f.applyToEitherAsync(f2, inc);
2216 <        checkCompletedWithWrappedCancellationException(g);
2217 <    }
3547 >            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3548 >            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3549  
3550 <    /**
3551 <     * acceptEitherAsync result completes normally after normal
2221 <     * completion of sources
2222 <     */
2223 <    public void testAcceptEitherAsync() {
2224 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2225 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2226 <        IncAction r = new IncAction();
2227 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2228 <        f.complete(one);
2229 <        checkCompletedNormally(g, null);
2230 <        assertEquals(r.value, 2);
3550 >            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3551 >            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3552  
3553 <        r = new IncAction();
3554 <        f = new CompletableFuture<>();
2234 <        f.complete(one);
2235 <        f2 = new CompletableFuture<>();
2236 <        g = f.acceptEitherAsync(f2, r);
2237 <        checkCompletedNormally(g, null);
2238 <        assertEquals(r.value, 2);
2239 <    }
3553 >            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3554 >            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3555  
3556 <    /**
3557 <     * acceptEitherAsync result completes exceptionally after exceptional
3558 <     * completion of source
3559 <     */
2245 <    public void testAcceptEitherAsync2() {
2246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2247 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2248 <        IncAction r = new IncAction();
2249 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2250 <        f.completeExceptionally(new CFException());
2251 <        checkCompletedWithWrappedCFException(g);
3556 >            for (CompletableFuture<?> future : fs)
3557 >                checkIncomplete(future);
3558 >            futures.addAll(fs);
3559 >        }
3560  
3561 <        r = new IncAction();
3562 <        f = new CompletableFuture<>();
2255 <        f2 = new CompletableFuture<>();
2256 <        f2.completeExceptionally(new CFException());
2257 <        g = f.acceptEitherAsync(f2, r);
2258 <        f.complete(one);
2259 <        checkCompletedWithWrappedCFException(g);
2260 <    }
3561 >        {
3562 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3563  
3564 <    /**
3565 <     * acceptEitherAsync result completes exceptionally if action does
2264 <     */
2265 <    public void testAcceptEitherAsync3() {
2266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2267 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2268 <        FailingConsumer r = new FailingConsumer();
2269 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2270 <        f.complete(one);
2271 <        checkCompletedWithWrappedCFException(g);
2272 <    }
3564 >            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3565 >            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3566  
3567 <    /**
3568 <     * acceptEitherAsync result completes exceptionally if either
2276 <     * source cancelled
2277 <     */
2278 <    public void testAcceptEitherAsync4() {
2279 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2280 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2281 <        IncAction r = new IncAction();
2282 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2283 <        assertTrue(f.cancel(true));
2284 <        checkCompletedWithWrappedCancellationException(g);
3567 >            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3568 >            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3569  
3570 <        r = new IncAction();
3571 <        f = new CompletableFuture<>();
2288 <        f2 = new CompletableFuture<>();
2289 <        assertTrue(f2.cancel(true));
2290 <        g = f.acceptEitherAsync(f2, r);
2291 <        checkCompletedWithWrappedCancellationException(g);
2292 <    }
3570 >            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3571 >            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3572  
3573 <    /**
3574 <     * runAfterEitherAsync result completes normally after normal
3575 <     * completion of sources
3576 <     */
2298 <    public void testRunAfterEitherAsync() {
2299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2301 <        Noop r = new Noop();
2302 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2303 <        f.complete(one);
2304 <        checkCompletedNormally(g, null);
2305 <        assertTrue(r.ran);
3573 >            for (CompletableFuture<?> future : fs)
3574 >                checkCompletedWithWrappedException(future, e.ex);
3575 >            futures.addAll(fs);
3576 >        }
3577  
3578 <        r = new Noop();
2308 <        f = new CompletableFuture<>();
2309 <        f.complete(one);
2310 <        f2 = new CompletableFuture<>();
2311 <        g = f.runAfterEitherAsync(f2, r);
2312 <        checkCompletedNormally(g, null);
2313 <        assertTrue(r.ran);
2314 <    }
3578 >        incomplete.complete(v);
3579  
3580 <    /**
3581 <     * runAfterEitherAsync result completes exceptionally after exceptional
2318 <     * completion of source
2319 <     */
2320 <    public void testRunAfterEitherAsync2() {
2321 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2322 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2323 <        Noop r = new Noop();
2324 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2325 <        f.completeExceptionally(new CFException());
2326 <        checkCompletedWithWrappedCFException(g);
3580 >        for (CompletableFuture<?> future : futures)
3581 >            checkCompletedWithWrappedException(future, e.ex);
3582  
3583 <        r = new Noop();
3584 <        f = new CompletableFuture<>();
2330 <        f2 = new CompletableFuture<>();
2331 <        f2.completeExceptionally(new CFException());
2332 <        g = f.runAfterEitherAsync(f2, r);
2333 <        f.complete(one);
2334 <        checkCompletedWithWrappedCFException(g);
2335 <    }
3583 >        assertEquals(futures.size(), e.count.get());
3584 >    }}
3585  
3586      /**
3587 <     * runAfterEitherAsync result completes exceptionally if action does
3587 >     * Test submissions to an executor that rejects all tasks, but
3588 >     * should never be invoked because the dependent future is
3589 >     * explicitly completed.
3590       */
3591 <    public void testRunAfterEitherAsync3() {
3592 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3593 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3594 <        FailingNoop r = new FailingNoop();
2344 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2345 <        f.complete(one);
2346 <        checkCompletedWithWrappedCFException(g);
2347 <    }
3591 >    public void testRejectingExecutorNeverInvoked() {
3592 >        for (Integer v : new Integer[] { 1, null })
3593 >    {
3594 >        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3595  
3596 <    /**
3597 <     * runAfterEitherAsync result completes exceptionally if either
2351 <     * source cancelled
2352 <     */
2353 <    public void testRunAfterEitherAsync4() {
2354 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2355 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2356 <        Noop r = new Noop();
2357 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2358 <        assertTrue(f.cancel(true));
2359 <        checkCompletedWithWrappedCancellationException(g);
3596 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3597 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3598  
3599 <        r = new Noop();
2362 <        f = new CompletableFuture<>();
2363 <        f2 = new CompletableFuture<>();
2364 <        assertTrue(f2.cancel(true));
2365 <        g = f.runAfterEitherAsync(f2, r);
2366 <        checkCompletedWithWrappedCancellationException(g);
2367 <    }
3599 >        List<CompletableFuture<?>> futures = new ArrayList<>();
3600  
3601 <    /**
3602 <     * thenComposeAsync result completes normally after normal
3603 <     * completion of source
2372 <     */
2373 <    public void testThenComposeAsync() {
2374 <        CompletableFuture<Integer> f, g;
2375 <        CompletableFutureInc r;
3601 >        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3602 >        srcs.add(complete);
3603 >        srcs.add(incomplete);
3604  
3605 <        f = new CompletableFuture<>();
3606 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3607 <        f.complete(one);
3608 <        checkCompletedNormally(g, two);
3605 >        List<CompletableFuture<?>> fs = new ArrayList<>();
3606 >        fs.add(incomplete.thenRunAsync(() -> {}, e));
3607 >        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3608 >        fs.add(incomplete.thenApplyAsync(z -> z, e));
3609  
3610 <        f = new CompletableFuture<>();
3611 <        f.complete(one);
3612 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2385 <        checkCompletedNormally(g, two);
2386 <    }
3610 >        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3611 >        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3612 >        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3613  
3614 <    /**
3615 <     * thenComposeAsync result completes exceptionally after
3616 <     * exceptional completion of source
2391 <     */
2392 <    public void testThenComposeAsync2() {
2393 <        CompletableFuture<Integer> f, g;
2394 <        CompletableFutureInc r;
3614 >        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3615 >        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3616 >        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3617  
3618 <        f = new CompletableFuture<>();
3619 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3620 <        f.completeExceptionally(new CFException());
2399 <        checkCompletedWithWrappedCFException(g);
2400 <        assertFalse(r.ran);
3618 >        fs.add(incomplete.thenComposeAsync(z -> null, e));
3619 >        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3620 >        fs.add(incomplete.handleAsync((z, t) -> null, e));
3621  
3622 <        f = new CompletableFuture<>();
3623 <        f.completeExceptionally(new CFException());
2404 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2405 <        checkCompletedWithWrappedCFException(g);
2406 <        assertFalse(r.ran);
2407 <    }
3622 >        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3623 >        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3624  
3625 <    /**
3626 <     * thenComposeAsync result completes exceptionally if action does
2411 <     */
2412 <    public void testThenComposeAsync3() {
2413 <        CompletableFuture<Integer> f, g;
2414 <        FailingCompletableFutureFunction r;
3625 >        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3626 >        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3627  
3628 <        f = new CompletableFuture<>();
3629 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2418 <        f.complete(one);
2419 <        checkCompletedWithWrappedCFException(g);
3628 >        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3629 >        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3630  
3631 <        f = new CompletableFuture<>();
3632 <        f.complete(one);
2423 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2424 <        checkCompletedWithWrappedCFException(g);
2425 <    }
3631 >        for (CompletableFuture<?> future : fs)
3632 >            checkIncomplete(future);
3633  
3634 <    /**
3635 <     * thenComposeAsync result completes exceptionally if source cancelled
2429 <     */
2430 <    public void testThenComposeAsync4() {
2431 <        CompletableFuture<Integer> f, g;
2432 <        CompletableFutureInc r;
3634 >        for (CompletableFuture<?> future : fs)
3635 >            future.complete(null);
3636  
3637 <        f = new CompletableFuture<>();
2435 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2436 <        assertTrue(f.cancel(true));
2437 <        checkCompletedWithWrappedCancellationException(g);
3637 >        incomplete.complete(v);
3638  
3639 <        f = new CompletableFuture<>();
3640 <        assertTrue(f.cancel(true));
2441 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2442 <        checkCompletedWithWrappedCancellationException(g);
2443 <    }
3639 >        for (CompletableFuture<?> future : fs)
3640 >            checkCompletedNormally(future, null);
3641  
3642 <    // async with explicit executors
3642 >        assertEquals(0, e.count.get());
3643 >    }}
3644  
3645      /**
3646 <     * thenRunAsync result completes normally after normal completion of source
3646 >     * toCompletableFuture returns this CompletableFuture.
3647       */
3648 <    public void testThenRunAsyncE() {
3648 >    public void testToCompletableFuture() {
3649          CompletableFuture<Integer> f = new CompletableFuture<>();
3650 <        Noop r = new Noop();
2453 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2454 <        f.complete(null);
2455 <        checkCompletedNormally(g, null);
2456 <
2457 <        // reordered version
2458 <        f = new CompletableFuture<>();
2459 <        f.complete(null);
2460 <        r = new Noop();
2461 <        g = f.thenRunAsync(r, new ThreadExecutor());
2462 <        checkCompletedNormally(g, null);
3650 >        assertSame(f, f.toCompletableFuture());
3651      }
3652  
3653 +    // jdk9
3654 +
3655      /**
3656 <     * thenRunAsync result completes exceptionally after exceptional
2467 <     * completion of source
3656 >     * newIncompleteFuture returns an incomplete CompletableFuture
3657       */
3658 <    public void testThenRunAsync2E() {
3658 >    public void testNewIncompleteFuture() {
3659 >        for (Integer v1 : new Integer[] { 1, null })
3660 >    {
3661          CompletableFuture<Integer> f = new CompletableFuture<>();
3662 <        Noop r = new Noop();
3663 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3664 <        f.completeExceptionally(new CFException());
3665 <        try {
3666 <            g.join();
3667 <            shouldThrow();
3668 <        } catch (CompletionException success) {}
3669 <        checkCompletedWithWrappedCFException(g);
3670 <    }
3662 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3663 >        checkIncomplete(f);
3664 >        checkIncomplete(g);
3665 >        f.complete(v1);
3666 >        checkCompletedNormally(f, v1);
3667 >        checkIncomplete(g);
3668 >        g.complete(v1);
3669 >        checkCompletedNormally(g, v1);
3670 >        assertSame(g.getClass(), CompletableFuture.class);
3671 >    }}
3672  
3673      /**
3674 <     * thenRunAsync result completes exceptionally if action does
3674 >     * completedStage returns a completed CompletionStage
3675       */
3676 <    public void testThenRunAsync3E() {
3677 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3678 <        FailingNoop r = new FailingNoop();
3679 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3680 <        f.complete(null);
3681 <        checkCompletedWithWrappedCFException(g);
3676 >    public void testCompletedStage() {
3677 >        AtomicInteger x = new AtomicInteger(0);
3678 >        AtomicReference<Throwable> r = new AtomicReference<>();
3679 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3680 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3681 >        assertEquals(x.get(), 1);
3682 >        assertNull(r.get());
3683      }
3684  
3685      /**
3686 <     * thenRunAsync result completes exceptionally if source cancelled
3686 >     * defaultExecutor by default returns the commonPool if
3687 >     * it supports more than one thread.
3688       */
3689 <    public void testThenRunAsync4E() {
3689 >    public void testDefaultExecutor() {
3690          CompletableFuture<Integer> f = new CompletableFuture<>();
3691 <        Noop r = new Noop();
3692 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3693 <        assertTrue(f.cancel(true));
3694 <        checkCompletedWithWrappedCancellationException(g);
3691 >        Executor e = f.defaultExecutor();
3692 >        Executor c = ForkJoinPool.commonPool();
3693 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3694 >            assertSame(e, c);
3695 >        else
3696 >            assertNotSame(e, c);
3697      }
3698  
3699      /**
3700 <     * thenApplyAsync result completes normally after normal completion of source
3700 >     * failedFuture returns a CompletableFuture completed
3701 >     * exceptionally with the given Exception
3702       */
3703 <    public void testThenApplyAsyncE() {
3704 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3705 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3706 <        f.complete(one);
2510 <        checkCompletedNormally(g, two);
3703 >    public void testFailedFuture() {
3704 >        CFException ex = new CFException();
3705 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3706 >        checkCompletedExceptionally(f, ex);
3707      }
3708  
3709      /**
3710 <     * thenApplyAsync result completes exceptionally after exceptional
2515 <     * completion of source
3710 >     * failedFuture(null) throws NPE
3711       */
3712 <    public void testThenApplyAsync2E() {
3713 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3714 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3715 <        f.completeExceptionally(new CFException());
3716 <        checkCompletedWithWrappedCFException(g);
3712 >    public void testFailedFuture_null() {
3713 >        try {
3714 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3715 >            shouldThrow();
3716 >        } catch (NullPointerException success) {}
3717      }
3718  
3719      /**
3720 <     * thenApplyAsync result completes exceptionally if action does
3720 >     * copy returns a CompletableFuture that is completed normally,
3721 >     * with the same value, when source is.
3722       */
3723 <    public void testThenApplyAsync3E() {
3723 >    public void testCopy_normalCompletion() {
3724 >        for (boolean createIncomplete : new boolean[] { true, false })
3725 >        for (Integer v1 : new Integer[] { 1, null })
3726 >    {
3727          CompletableFuture<Integer> f = new CompletableFuture<>();
3728 <        FailingFunction r = new FailingFunction();
3729 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3730 <        f.complete(null);
3731 <        checkCompletedWithWrappedCFException(g);
3732 <    }
3728 >        if (!createIncomplete) assertTrue(f.complete(v1));
3729 >        CompletableFuture<Integer> g = f.copy();
3730 >        if (createIncomplete) {
3731 >            checkIncomplete(f);
3732 >            checkIncomplete(g);
3733 >            assertTrue(f.complete(v1));
3734 >        }
3735 >        checkCompletedNormally(f, v1);
3736 >        checkCompletedNormally(g, v1);
3737 >    }}
3738  
3739      /**
3740 <     * thenApplyAsync result completes exceptionally if source cancelled
3740 >     * copy returns a CompletableFuture that is completed exceptionally
3741 >     * when source is.
3742       */
3743 <    public void testThenApplyAsync4E() {
3743 >    public void testCopy_exceptionalCompletion() {
3744 >        for (boolean createIncomplete : new boolean[] { true, false })
3745 >    {
3746 >        CFException ex = new CFException();
3747          CompletableFuture<Integer> f = new CompletableFuture<>();
3748 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3749 <        assertTrue(f.cancel(true));
3750 <        checkCompletedWithWrappedCancellationException(g);
3751 <    }
3748 >        if (!createIncomplete) f.completeExceptionally(ex);
3749 >        CompletableFuture<Integer> g = f.copy();
3750 >        if (createIncomplete) {
3751 >            checkIncomplete(f);
3752 >            checkIncomplete(g);
3753 >            f.completeExceptionally(ex);
3754 >        }
3755 >        checkCompletedExceptionally(f, ex);
3756 >        checkCompletedWithWrappedException(g, ex);
3757 >    }}
3758  
3759      /**
3760 <     * thenAcceptAsync result completes normally after normal
2547 <     * completion of source
3760 >     * Completion of a copy does not complete its source.
3761       */
3762 <    public void testThenAcceptAsyncE() {
3762 >    public void testCopy_oneWayPropagation() {
3763          CompletableFuture<Integer> f = new CompletableFuture<>();
3764 <        IncAction r = new IncAction();
3765 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3766 <        f.complete(one);
3767 <        checkCompletedNormally(g, null);
3768 <        assertEquals(r.value, 2);
3764 >        assertTrue(f.copy().complete(1));
3765 >        assertTrue(f.copy().complete(null));
3766 >        assertTrue(f.copy().cancel(true));
3767 >        assertTrue(f.copy().cancel(false));
3768 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3769 >        checkIncomplete(f);
3770      }
3771  
3772      /**
3773 <     * thenAcceptAsync result completes exceptionally after exceptional
3774 <     * completion of source
3773 >     * minimalCompletionStage returns a CompletableFuture that is
3774 >     * completed normally, with the same value, when source is.
3775       */
3776 <    public void testThenAcceptAsync2E() {
3776 >    public void testMinimalCompletionStage() {
3777          CompletableFuture<Integer> f = new CompletableFuture<>();
3778 <        IncAction r = new IncAction();
3779 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3780 <        f.completeExceptionally(new CFException());
3781 <        checkCompletedWithWrappedCFException(g);
3778 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3779 >        AtomicInteger x = new AtomicInteger(0);
3780 >        AtomicReference<Throwable> r = new AtomicReference<>();
3781 >        checkIncomplete(f);
3782 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3783 >        f.complete(1);
3784 >        checkCompletedNormally(f, 1);
3785 >        assertEquals(x.get(), 1);
3786 >        assertNull(r.get());
3787      }
3788  
3789      /**
3790 <     * thenAcceptAsync result completes exceptionally if action does
3790 >     * minimalCompletionStage returns a CompletableFuture that is
3791 >     * completed exceptionally when source is.
3792       */
3793 <    public void testThenAcceptAsync3E() {
3793 >    public void testMinimalCompletionStage2() {
3794          CompletableFuture<Integer> f = new CompletableFuture<>();
3795 <        FailingConsumer r = new FailingConsumer();
3796 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3797 <        f.complete(null);
3798 <        checkCompletedWithWrappedCFException(g);
3795 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3796 >        AtomicInteger x = new AtomicInteger(0);
3797 >        AtomicReference<Throwable> r = new AtomicReference<>();
3798 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3799 >        checkIncomplete(f);
3800 >        CFException ex = new CFException();
3801 >        f.completeExceptionally(ex);
3802 >        checkCompletedExceptionally(f, ex);
3803 >        assertEquals(x.get(), 0);
3804 >        assertEquals(r.get().getCause(), ex);
3805      }
3806  
3807      /**
3808 <     * thenAcceptAsync result completes exceptionally if source cancelled
3808 >     * failedStage returns a CompletionStage completed
3809 >     * exceptionally with the given Exception
3810       */
3811 <    public void testThenAcceptAsync4E() {
3812 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3813 <        IncAction r = new IncAction();
3814 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3815 <        assertTrue(f.cancel(true));
3816 <        checkCompletedWithWrappedCancellationException(g);
3811 >    public void testFailedStage() {
3812 >        CFException ex = new CFException();
3813 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3814 >        AtomicInteger x = new AtomicInteger(0);
3815 >        AtomicReference<Throwable> r = new AtomicReference<>();
3816 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3817 >        assertEquals(x.get(), 0);
3818 >        assertEquals(r.get(), ex);
3819      }
3820  
3821      /**
3822 <     * applyToEitherAsync result completes normally after normal
2594 <     * completion of sources
3822 >     * completeAsync completes with value of given supplier
3823       */
3824 <    public void testApplyToEitherAsyncE() {
3824 >    public void testCompleteAsync() {
3825 >        for (Integer v1 : new Integer[] { 1, null })
3826 >    {
3827          CompletableFuture<Integer> f = new CompletableFuture<>();
3828 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3829 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3830 <        f.complete(one);
3831 <        checkCompletedNormally(g, two);
2602 <
2603 <        f = new CompletableFuture<>();
2604 <        f.complete(one);
2605 <        f2 = new CompletableFuture<>();
2606 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2607 <        checkCompletedNormally(g, two);
2608 <    }
3828 >        f.completeAsync(() -> v1);
3829 >        f.join();
3830 >        checkCompletedNormally(f, v1);
3831 >    }}
3832  
3833      /**
3834 <     * applyToEitherAsync result completes exceptionally after exceptional
2612 <     * completion of source
3834 >     * completeAsync completes exceptionally if given supplier throws
3835       */
3836 <    public void testApplyToEitherAsync2E() {
3836 >    public void testCompleteAsync2() {
3837          CompletableFuture<Integer> f = new CompletableFuture<>();
3838 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3839 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3840 <        f.completeExceptionally(new CFException());
3841 <        checkCompletedWithWrappedCFException(g);
3842 <
3843 <        f = new CompletableFuture<>();
3844 <        f2 = new CompletableFuture<>();
2623 <        f2.completeExceptionally(new CFException());
2624 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2625 <        f.complete(one);
2626 <        checkCompletedWithWrappedCFException(g);
3838 >        CFException ex = new CFException();
3839 >        f.completeAsync(() -> { throw ex; });
3840 >        try {
3841 >            f.join();
3842 >            shouldThrow();
3843 >        } catch (CompletionException success) {}
3844 >        checkCompletedWithWrappedException(f, ex);
3845      }
3846  
3847      /**
3848 <     * applyToEitherAsync result completes exceptionally if action does
3848 >     * completeAsync with given executor completes with value of given supplier
3849       */
3850 <    public void testApplyToEitherAsync3E() {
3850 >    public void testCompleteAsync3() {
3851 >        for (Integer v1 : new Integer[] { 1, null })
3852 >    {
3853          CompletableFuture<Integer> f = new CompletableFuture<>();
3854 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3855 <        FailingFunction r = new FailingFunction();
3856 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
3857 <        f.complete(one);
3858 <        checkCompletedWithWrappedCFException(g);
3859 <    }
3854 >        ThreadExecutor executor = new ThreadExecutor();
3855 >        f.completeAsync(() -> v1, executor);
3856 >        assertSame(v1, f.join());
3857 >        checkCompletedNormally(f, v1);
3858 >        assertEquals(1, executor.count.get());
3859 >    }}
3860  
3861      /**
3862 <     * applyToEitherAsync result completes exceptionally if either source cancelled
3862 >     * completeAsync with given executor completes exceptionally if
3863 >     * given supplier throws
3864       */
3865 <    public void testApplyToEitherAsync4E() {
3865 >    public void testCompleteAsync4() {
3866          CompletableFuture<Integer> f = new CompletableFuture<>();
3867 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3868 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3869 <        assertTrue(f.cancel(true));
3870 <        checkCompletedWithWrappedCancellationException(g);
3871 <
3872 <        f = new CompletableFuture<>();
3873 <        f2 = new CompletableFuture<>();
3874 <        assertTrue(f2.cancel(true));
3875 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2655 <        checkCompletedWithWrappedCancellationException(g);
3867 >        CFException ex = new CFException();
3868 >        ThreadExecutor executor = new ThreadExecutor();
3869 >        f.completeAsync(() -> { throw ex; }, executor);
3870 >        try {
3871 >            f.join();
3872 >            shouldThrow();
3873 >        } catch (CompletionException success) {}
3874 >        checkCompletedWithWrappedException(f, ex);
3875 >        assertEquals(1, executor.count.get());
3876      }
3877  
3878      /**
3879 <     * acceptEitherAsync result completes normally after normal
2660 <     * completion of sources
3879 >     * orTimeout completes with TimeoutException if not complete
3880       */
3881 <    public void testAcceptEitherAsyncE() {
3881 >    public void testOrTimeout_timesOut() {
3882 >        long timeoutMillis = timeoutMillis();
3883          CompletableFuture<Integer> f = new CompletableFuture<>();
3884 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3885 <        IncAction r = new IncAction();
3886 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3887 <        f.complete(one);
2668 <        checkCompletedNormally(g, null);
2669 <        assertEquals(r.value, 2);
2670 <
2671 <        r = new IncAction();
2672 <        f = new CompletableFuture<>();
2673 <        f.complete(one);
2674 <        f2 = new CompletableFuture<>();
2675 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2676 <        checkCompletedNormally(g, null);
2677 <        assertEquals(r.value, 2);
3884 >        long startTime = System.nanoTime();
3885 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3886 >        checkCompletedWithTimeoutException(f);
3887 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3888      }
3889  
3890      /**
3891 <     * acceptEitherAsync result completes exceptionally after exceptional
2682 <     * completion of source
3891 >     * orTimeout completes normally if completed before timeout
3892       */
3893 <    public void testAcceptEitherAsync2E() {
3893 >    public void testOrTimeout_completed() {
3894 >        for (Integer v1 : new Integer[] { 1, null })
3895 >    {
3896          CompletableFuture<Integer> f = new CompletableFuture<>();
3897 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3898 <        IncAction r = new IncAction();
3899 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3900 <        f.completeExceptionally(new CFException());
3901 <        checkCompletedWithWrappedCFException(g);
3902 <
3903 <        r = new IncAction();
3904 <        f = new CompletableFuture<>();
3905 <        f2 = new CompletableFuture<>();
3906 <        f2.completeExceptionally(new CFException());
2696 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2697 <        f.complete(one);
2698 <        checkCompletedWithWrappedCFException(g);
2699 <    }
3897 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3898 >        long startTime = System.nanoTime();
3899 >        f.complete(v1);
3900 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3901 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3902 >        g.complete(v1);
3903 >        checkCompletedNormally(f, v1);
3904 >        checkCompletedNormally(g, v1);
3905 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3906 >    }}
3907  
3908      /**
3909 <     * acceptEitherAsync result completes exceptionally if action does
3909 >     * completeOnTimeout completes with given value if not complete
3910       */
3911 <    public void testAcceptEitherAsync3E() {
3912 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3913 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2707 <        FailingConsumer r = new FailingConsumer();
2708 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2709 <        f.complete(one);
2710 <        checkCompletedWithWrappedCFException(g);
3911 >    public void testCompleteOnTimeout_timesOut() {
3912 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3913 >                       () -> testCompleteOnTimeout_timesOut(null));
3914      }
3915  
3916      /**
3917 <     * acceptEitherAsync result completes exceptionally if either
2715 <     * source cancelled
3917 >     * completeOnTimeout completes with given value if not complete
3918       */
3919 <    public void testAcceptEitherAsync4E() {
3919 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3920 >        long timeoutMillis = timeoutMillis();
3921          CompletableFuture<Integer> f = new CompletableFuture<>();
3922 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3923 <        IncAction r = new IncAction();
3924 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3925 <        assertTrue(f.cancel(true));
3926 <        checkCompletedWithWrappedCancellationException(g);
3927 <
2725 <        r = new IncAction();
2726 <        f = new CompletableFuture<>();
2727 <        f2 = new CompletableFuture<>();
2728 <        assertTrue(f2.cancel(true));
2729 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2730 <        checkCompletedWithWrappedCancellationException(g);
3922 >        long startTime = System.nanoTime();
3923 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3924 >        assertSame(v, f.join());
3925 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3926 >        f.complete(99);         // should have no effect
3927 >        checkCompletedNormally(f, v);
3928      }
3929  
3930      /**
3931 <     * runAfterEitherAsync result completes normally after normal
2735 <     * completion of sources
3931 >     * completeOnTimeout has no effect if completed within timeout
3932       */
3933 <    public void testRunAfterEitherAsyncE() {
3933 >    public void testCompleteOnTimeout_completed() {
3934 >        for (Integer v1 : new Integer[] { 1, null })
3935 >    {
3936          CompletableFuture<Integer> f = new CompletableFuture<>();
3937 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3938 <        Noop r = new Noop();
3939 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3940 <        f.complete(one);
3941 <        checkCompletedNormally(g, null);
3942 <        assertTrue(r.ran);
3943 <
3944 <        r = new Noop();
3945 <        f = new CompletableFuture<>();
3946 <        f.complete(one);
2749 <        f2 = new CompletableFuture<>();
2750 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2751 <        checkCompletedNormally(g, null);
2752 <        assertTrue(r.ran);
2753 <    }
3937 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3938 >        long startTime = System.nanoTime();
3939 >        f.complete(v1);
3940 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3941 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3942 >        g.complete(v1);
3943 >        checkCompletedNormally(f, v1);
3944 >        checkCompletedNormally(g, v1);
3945 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3946 >    }}
3947  
3948      /**
3949 <     * runAfterEitherAsync result completes exceptionally after exceptional
2757 <     * completion of source
3949 >     * delayedExecutor returns an executor that delays submission
3950       */
3951 <    public void testRunAfterEitherAsync2E() {
3952 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3953 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3954 <        Noop r = new Noop();
3955 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3956 <        f.completeExceptionally(new CFException());
3957 <        checkCompletedWithWrappedCFException(g);
3951 >    public void testDelayedExecutor() {
3952 >        testInParallel(() -> testDelayedExecutor(null, null),
3953 >                       () -> testDelayedExecutor(null, 1),
3954 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3955 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3956 >    }
3957 >
3958 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3959 >        long timeoutMillis = timeoutMillis();
3960 >        // Use an "unreasonably long" long timeout to catch lingering threads
3961 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3962 >        final Executor delayer, longDelayer;
3963 >        if (executor == null) {
3964 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3965 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3966 >        } else {
3967 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3968 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3969 >        }
3970 >        long startTime = System.nanoTime();
3971 >        CompletableFuture<Integer> f =
3972 >            CompletableFuture.supplyAsync(() -> v, delayer);
3973 >        CompletableFuture<Integer> g =
3974 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3975  
3976 <        r = new Noop();
2768 <        f = new CompletableFuture<>();
2769 <        f2 = new CompletableFuture<>();
2770 <        f2.completeExceptionally(new CFException());
2771 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2772 <        f.complete(one);
2773 <        checkCompletedWithWrappedCFException(g);
2774 <    }
3976 >        assertNull(g.getNow(null));
3977  
3978 <    /**
3979 <     * runAfterEitherAsync result completes exceptionally if action does
3980 <     */
3981 <    public void testRunAfterEitherAsync3E() {
2780 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2781 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2782 <        FailingNoop r = new FailingNoop();
2783 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2784 <        f.complete(one);
2785 <        checkCompletedWithWrappedCFException(g);
2786 <    }
3978 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3979 >        long millisElapsed = millisElapsedSince(startTime);
3980 >        assertTrue(millisElapsed >= timeoutMillis);
3981 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3982  
3983 <    /**
2789 <     * runAfterEitherAsync result completes exceptionally if either
2790 <     * source cancelled
2791 <     */
2792 <    public void testRunAfterEitherAsync4E() {
2793 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2794 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2795 <        Noop r = new Noop();
2796 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2797 <        assertTrue(f.cancel(true));
2798 <        checkCompletedWithWrappedCancellationException(g);
3983 >        checkCompletedNormally(f, v);
3984  
3985 <        r = new Noop();
3986 <        f = new CompletableFuture<>();
2802 <        f2 = new CompletableFuture<>();
2803 <        assertTrue(f2.cancel(true));
2804 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2805 <        checkCompletedWithWrappedCancellationException(g);
3985 >        checkIncomplete(g);
3986 >        assertTrue(g.cancel(true));
3987      }
3988  
3989 <    /**
2809 <     * thenComposeAsync result completes normally after normal
2810 <     * completion of source
2811 <     */
2812 <    public void testThenComposeAsyncE() {
2813 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2814 <        CompletableFutureInc r = new CompletableFutureInc();
2815 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2816 <        f.complete(one);
2817 <        checkCompletedNormally(g, two);
2818 <    }
3989 >    //--- tests of implementation details; not part of official tck ---
3990  
3991 <    /**
3992 <     * thenComposeAsync result completes exceptionally after
3993 <     * exceptional completion of source
3994 <     */
3995 <    public void testThenComposeAsync2E() {
3996 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3997 <        CompletableFutureInc r = new CompletableFutureInc();
3998 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3999 <        f.completeExceptionally(new CFException());
2829 <        checkCompletedWithWrappedCFException(g);
2830 <    }
3991 >    Object resultOf(CompletableFuture<?> f) {
3992 >        SecurityManager sm = System.getSecurityManager();
3993 >        if (sm != null) {
3994 >            try {
3995 >                System.setSecurityManager(null);
3996 >            } catch (SecurityException giveUp) {
3997 >                return "Reflection not available";
3998 >            }
3999 >        }
4000  
4001 <    /**
4002 <     * thenComposeAsync result completes exceptionally if action does
4003 <     */
4004 <    public void testThenComposeAsync3E() {
4005 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4006 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
4007 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
4008 <        f.complete(one);
4009 <        checkCompletedWithWrappedCFException(g);
4001 >        try {
4002 >            java.lang.reflect.Field resultField
4003 >                = CompletableFuture.class.getDeclaredField("result");
4004 >            resultField.setAccessible(true);
4005 >            return resultField.get(f);
4006 >        } catch (Throwable t) {
4007 >            throw new AssertionError(t);
4008 >        } finally {
4009 >            if (sm != null) System.setSecurityManager(sm);
4010 >        }
4011      }
4012  
4013 <    /**
4014 <     * thenComposeAsync result completes exceptionally if source cancelled
4015 <     */
4016 <    public void testThenComposeAsync4E() {
4017 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4018 <        CompletableFutureInc r = new CompletableFutureInc();
4019 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2850 <        assertTrue(f.cancel(true));
2851 <        checkCompletedWithWrappedCancellationException(g);
2852 <    }
4013 >    public void testExceptionPropagationReusesResultObject() {
4014 >        if (!testImplementationDetails) return;
4015 >        for (ExecutionMode m : ExecutionMode.values())
4016 >    {
4017 >        final CFException ex = new CFException();
4018 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4019 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4020  
4021 <    // other static methods
4021 >        final Runnable noopRunnable = new Noop(m);
4022 >        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4023 >        final Function<Integer, Integer> incFunction = new IncFunction(m);
4024 >
4025 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4026 >            = new ArrayList<>();
4027 >
4028 >        funs.add(y -> m.thenRun(y, noopRunnable));
4029 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4030 >        funs.add(y -> m.thenApply(y, incFunction));
4031 >
4032 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4033 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4034 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4035 >
4036 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4037 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4038 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4039 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4040 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4041 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4042 >
4043 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4044 >
4045 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4046 >
4047 >        funs.add(y -> CompletableFuture.allOf(y));
4048 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4049 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4050 >        funs.add(y -> CompletableFuture.anyOf(y));
4051 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4052 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4053  
4054 <    /**
4055 <     * allOf(no component futures) returns a future completed normally
4056 <     * with the value null
4057 <     */
4058 <    public void testAllOf_empty() throws Exception {
4059 <        CompletableFuture<Void> f = CompletableFuture.allOf();
4060 <        checkCompletedNormally(f, null);
4061 <    }
4054 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4055 >                 fun : funs) {
4056 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4057 >            f.completeExceptionally(ex);
4058 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4059 >            checkCompletedWithWrappedException(src, ex);
4060 >            CompletableFuture<?> dep = fun.apply(src);
4061 >            checkCompletedWithWrappedException(dep, ex);
4062 >            assertSame(resultOf(src), resultOf(dep));
4063 >        }
4064  
4065 <    /**
4066 <     * allOf returns a future completed normally with the value null
4067 <     * when all components complete normally
4068 <     */
4069 <    public void testAllOf_normal() throws Exception {
4070 <        for (int k = 1; k < 20; ++k) {
4071 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
4072 <            for (int i = 0; i < k; ++i)
4073 <                fs[i] = new CompletableFuture<>();
2874 <            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2875 <            for (int i = 0; i < k; ++i) {
2876 <                checkIncomplete(f);
2877 <                checkIncomplete(CompletableFuture.allOf(fs));
2878 <                fs[i].complete(one);
2879 <            }
2880 <            checkCompletedNormally(f, null);
2881 <            checkCompletedNormally(CompletableFuture.allOf(fs), null);
4065 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4066 >                 fun : funs) {
4067 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4068 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4069 >            CompletableFuture<?> dep = fun.apply(src);
4070 >            f.completeExceptionally(ex);
4071 >            checkCompletedWithWrappedException(src, ex);
4072 >            checkCompletedWithWrappedException(dep, ex);
4073 >            assertSame(resultOf(src), resultOf(dep));
4074          }
2883    }
4075  
4076 <    /**
4077 <     * anyOf(no component futures) returns an incomplete future
4078 <     */
4079 <    public void testAnyOf_empty() throws Exception {
4080 <        CompletableFuture<Object> f = CompletableFuture.anyOf();
4081 <        checkIncomplete(f);
4082 <    }
4076 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4077 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4078 >                 fun : funs) {
4079 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4080 >            f.cancel(mayInterruptIfRunning);
4081 >            checkCancelled(f);
4082 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4083 >            checkCompletedWithWrappedCancellationException(src);
4084 >            CompletableFuture<?> dep = fun.apply(src);
4085 >            checkCompletedWithWrappedCancellationException(dep);
4086 >            assertSame(resultOf(src), resultOf(dep));
4087 >        }
4088  
4089 <    /**
4090 <     * anyOf returns a future completed normally with a value when
4091 <     * a component future does
4092 <     */
4093 <    public void testAnyOf_normal() throws Exception {
4094 <        for (int k = 0; k < 10; ++k) {
4095 <            CompletableFuture[] fs = new CompletableFuture[k];
4096 <            for (int i = 0; i < k; ++i)
4097 <                fs[i] = new CompletableFuture<>();
4098 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
4099 <            checkIncomplete(f);
4100 <            for (int i = 0; i < k; ++i) {
4101 <                fs[i].complete(one);
4102 <                checkCompletedNormally(f, one);
4103 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
4089 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4090 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4091 >                 fun : funs) {
4092 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4093 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4094 >            CompletableFuture<?> dep = fun.apply(src);
4095 >            f.cancel(mayInterruptIfRunning);
4096 >            checkCancelled(f);
4097 >            checkCompletedWithWrappedCancellationException(src);
4098 >            checkCompletedWithWrappedCancellationException(dep);
4099 >            assertSame(resultOf(src), resultOf(dep));
4100 >        }
4101 >    }}
4102 >
4103 >    /**
4104 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4105 >     */
4106 >    public void testMinimalCompletionStage_minimality() {
4107 >        if (!testImplementationDetails) return;
4108 >        Function<Method, String> toSignature =
4109 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4110 >        Predicate<Method> isNotStatic =
4111 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4112 >        List<Method> minimalMethods =
4113 >            Stream.of(Object.class, CompletionStage.class)
4114 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4115 >            .filter(isNotStatic)
4116 >            .collect(Collectors.toList());
4117 >        // Methods from CompletableFuture permitted NOT to throw UOE
4118 >        String[] signatureWhitelist = {
4119 >            "newIncompleteFuture[]",
4120 >            "defaultExecutor[]",
4121 >            "minimalCompletionStage[]",
4122 >            "copy[]",
4123 >        };
4124 >        Set<String> permittedMethodSignatures =
4125 >            Stream.concat(minimalMethods.stream().map(toSignature),
4126 >                          Stream.of(signatureWhitelist))
4127 >            .collect(Collectors.toSet());
4128 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4129 >            .filter(isNotStatic)
4130 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4131 >            .collect(Collectors.toList());
4132 >
4133 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4134 >        CompletionStage<Integer> min =
4135 >            new CompletableFuture<Integer>().minimalCompletionStage();
4136 >        stages.add(min);
4137 >        stages.add(min.thenApply(x -> x));
4138 >        stages.add(CompletableFuture.completedStage(1));
4139 >        stages.add(CompletableFuture.failedStage(new CFException()));
4140 >
4141 >        List<Method> bugs = new ArrayList<>();
4142 >        for (Method method : allMethods) {
4143 >            Class<?>[] parameterTypes = method.getParameterTypes();
4144 >            Object[] args = new Object[parameterTypes.length];
4145 >            // Manufacture boxed primitives for primitive params
4146 >            for (int i = 0; i < args.length; i++) {
4147 >                Class<?> type = parameterTypes[i];
4148 >                if (parameterTypes[i] == boolean.class)
4149 >                    args[i] = false;
4150 >                else if (parameterTypes[i] == int.class)
4151 >                    args[i] = 0;
4152 >                else if (parameterTypes[i] == long.class)
4153 >                    args[i] = 0L;
4154 >            }
4155 >            for (CompletionStage<Integer> stage : stages) {
4156 >                try {
4157 >                    method.invoke(stage, args);
4158 >                    bugs.add(method);
4159 >                }
4160 >                catch (java.lang.reflect.InvocationTargetException expected) {
4161 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4162 >                        bugs.add(method);
4163 >                        // expected.getCause().printStackTrace();
4164 >                    }
4165 >                }
4166 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4167              }
4168          }
4169 +        if (!bugs.isEmpty())
4170 +            throw new Error("Methods did not throw UOE: " + bugs);
4171      }
4172  
4173      /**
4174 <     * anyOf result completes exceptionally when any component does.
4174 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4175 >     * is completed normally, with the same value, when source is.
4176       */
4177 <    public void testAnyOf_exceptional() throws Exception {
4178 <        for (int k = 0; k < 10; ++k) {
4179 <            CompletableFuture[] fs = new CompletableFuture[k];
4180 <            for (int i = 0; i < k; ++i)
4181 <                fs[i] = new CompletableFuture<>();
4182 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
4177 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4178 >        for (boolean createIncomplete : new boolean[] { true, false })
4179 >        for (Integer v1 : new Integer[] { 1, null })
4180 >    {
4181 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4182 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4183 >        if (!createIncomplete) assertTrue(f.complete(v1));
4184 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4185 >        if (createIncomplete) {
4186              checkIncomplete(f);
4187 <            for (int i = 0; i < k; ++i) {
4188 <                fs[i].completeExceptionally(new CFException());
2924 <                checkCompletedWithWrappedCFException(f);
2925 <                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2926 <            }
4187 >            checkIncomplete(g);
4188 >            assertTrue(f.complete(v1));
4189          }
4190 <    }
4190 >        checkCompletedNormally(f, v1);
4191 >        checkCompletedNormally(g, v1);
4192 >    }}
4193  
4194      /**
4195 <     * Completion methods throw NullPointerException with null arguments
4195 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4196 >     * is completed exceptionally when source is.
4197       */
4198 <    public void testNPE() {
4198 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4199 >        for (boolean createIncomplete : new boolean[] { true, false })
4200 >    {
4201 >        CFException ex = new CFException();
4202          CompletableFuture<Integer> f = new CompletableFuture<>();
4203 <        CompletableFuture<Integer> g = new CompletableFuture<>();
4204 <        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
4205 <        CompletableFuture<?> h;
4206 <        ThreadExecutor exec = new ThreadExecutor();
4207 <
4208 <        Runnable[] throwingActions = {
4209 <            () -> CompletableFuture.supplyAsync(null),
4210 <            () -> CompletableFuture.supplyAsync(null, exec),
4211 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
4212 <
4213 <            () -> CompletableFuture.runAsync(null),
2946 <            () -> CompletableFuture.runAsync(null, exec),
2947 <            () -> CompletableFuture.runAsync(() -> {}, null),
2948 <
2949 <            () -> f.completeExceptionally(null),
2950 <
2951 <            () -> f.thenApply(null),
2952 <            () -> f.thenApplyAsync(null),
2953 <            () -> f.thenApplyAsync((x) -> x, null),
2954 <            () -> f.thenApplyAsync(null, exec),
2955 <
2956 <            () -> f.thenAccept(null),
2957 <            () -> f.thenAcceptAsync(null),
2958 <            () -> f.thenAcceptAsync((x) -> {} , null),
2959 <            () -> f.thenAcceptAsync(null, exec),
2960 <
2961 <            () -> f.thenRun(null),
2962 <            () -> f.thenRunAsync(null),
2963 <            () -> f.thenRunAsync(() -> {} , null),
2964 <            () -> f.thenRunAsync(null, exec),
2965 <
2966 <            () -> f.thenCombine(g, null),
2967 <            () -> f.thenCombineAsync(g, null),
2968 <            () -> f.thenCombineAsync(g, null, exec),
2969 <            () -> f.thenCombine(nullFuture, (x, y) -> x),
2970 <            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2971 <            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2972 <            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2973 <
2974 <            () -> f.thenAcceptBoth(g, null),
2975 <            () -> f.thenAcceptBothAsync(g, null),
2976 <            () -> f.thenAcceptBothAsync(g, null, exec),
2977 <            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2978 <            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2979 <            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2980 <            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2981 <
2982 <            () -> f.runAfterBoth(g, null),
2983 <            () -> f.runAfterBothAsync(g, null),
2984 <            () -> f.runAfterBothAsync(g, null, exec),
2985 <            () -> f.runAfterBoth(nullFuture, () -> {}),
2986 <            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2987 <            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2988 <            () -> f.runAfterBothAsync(g, () -> {}, null),
2989 <
2990 <            () -> f.applyToEither(g, null),
2991 <            () -> f.applyToEitherAsync(g, null),
2992 <            () -> f.applyToEitherAsync(g, null, exec),
2993 <            () -> f.applyToEither(nullFuture, (x) -> x),
2994 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2995 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2996 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
2997 <
2998 <            () -> f.acceptEither(g, null),
2999 <            () -> f.acceptEitherAsync(g, null),
3000 <            () -> f.acceptEitherAsync(g, null, exec),
3001 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3002 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3003 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3004 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3005 <
3006 <            () -> f.runAfterEither(g, null),
3007 <            () -> f.runAfterEitherAsync(g, null),
3008 <            () -> f.runAfterEitherAsync(g, null, exec),
3009 <            () -> f.runAfterEither(nullFuture, () -> {}),
3010 <            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3011 <            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3012 <            () -> f.runAfterEitherAsync(g, () -> {}, null),
3013 <
3014 <            () -> f.thenCompose(null),
3015 <            () -> f.thenComposeAsync(null),
3016 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3017 <            () -> f.thenComposeAsync(null, exec),
3018 <
3019 <            () -> f.exceptionally(null),
3020 <
3021 <            () -> f.handle(null),
3022 <
3023 <            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3024 <            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3025 <            () -> CompletableFuture.allOf(f, null),
3026 <            () -> CompletableFuture.allOf(null, f),
3027 <
3028 <            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3029 <            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3030 <            () -> CompletableFuture.anyOf(f, null),
3031 <            () -> CompletableFuture.anyOf(null, f),
3032 <
3033 <            () -> f.obtrudeException(null),
3034 <        };
3035 <
3036 <        assertThrows(NullPointerException.class, throwingActions);
3037 <        assertEquals(0, exec.count.get());
3038 <    }
4203 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4204 >        if (!createIncomplete) f.completeExceptionally(ex);
4205 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4206 >        if (createIncomplete) {
4207 >            checkIncomplete(f);
4208 >            checkIncomplete(g);
4209 >            f.completeExceptionally(ex);
4210 >        }
4211 >        checkCompletedExceptionally(f, ex);
4212 >        checkCompletedWithWrappedException(g, ex);
4213 >    }}
4214  
4215      /**
4216 <     * toCompletableFuture returns this CompletableFuture.
4216 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4217       */
4218 <    public void testToCompletableFuture() {
4218 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4219 >        for (Integer v1 : new Integer[] { 1, null })
4220 >    {
4221          CompletableFuture<Integer> f = new CompletableFuture<>();
4222 <        assertSame(f, f.toCompletableFuture());
4223 <    }
4222 >        CompletionStage minimal = f.minimalCompletionStage();
4223 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4224 >        assertTrue(g.complete(v1));
4225 >        checkCompletedNormally(g, v1);
4226 >        checkIncomplete(f);
4227 >        checkIncomplete(minimal.toCompletableFuture());
4228 >    }}
4229  
4230      /**
4231 <     * whenComplete action executes on normal completion, propagating
3050 <     * source result.
4231 >     * minimalStage.toCompletableFuture().join() awaits completion
4232       */
4233 <    public void testWhenComplete1() {
4234 <        final AtomicInteger a = new AtomicInteger();
4233 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4234 >        for (boolean createIncomplete : new boolean[] { true, false })
4235 >        for (Integer v1 : new Integer[] { 1, null })
4236 >    {
4237          CompletableFuture<Integer> f = new CompletableFuture<>();
4238 <        CompletableFuture<Integer> g =
4239 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
4240 <        f.complete(three);
4241 <        checkCompletedNormally(f, three);
4242 <        checkCompletedNormally(g, three);
4243 <        assertEquals(a.get(), 1);
4238 >        if (!createIncomplete) assertTrue(f.complete(v1));
4239 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4240 >        if (createIncomplete) assertTrue(f.complete(v1));
4241 >        assertEquals(v1, minimal.toCompletableFuture().join());
4242 >        assertEquals(v1, minimal.toCompletableFuture().get());
4243 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4244 >    }}
4245 >
4246 >    /**
4247 >     * Completion of a toCompletableFuture copy of a minimal stage
4248 >     * does not complete its source.
4249 >     */
4250 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4251 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4252 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4253 >        assertTrue(g.toCompletableFuture().complete(1));
4254 >        assertTrue(g.toCompletableFuture().complete(null));
4255 >        assertTrue(g.toCompletableFuture().cancel(true));
4256 >        assertTrue(g.toCompletableFuture().cancel(false));
4257 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4258 >        checkIncomplete(g.toCompletableFuture());
4259 >        f.complete(1);
4260 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4261      }
4262  
4263 <    /**
4264 <     * whenComplete action executes on exceptional completion, propagating
4265 <     * source result.
4266 <     */
4267 <    public void testWhenComplete2() {
4268 <        final AtomicInteger a = new AtomicInteger();
4269 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4270 <        CompletableFuture<Integer> g =
4271 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3072 <        f.completeExceptionally(new CFException());
3073 <        assertTrue(f.isCompletedExceptionally());
3074 <        assertTrue(g.isCompletedExceptionally());
3075 <        assertEquals(a.get(), 1);
4263 >    /** Demo utility method for external reliable toCompletableFuture */
4264 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4265 >        CompletableFuture<T> f = new CompletableFuture<>();
4266 >        stage.handle((T t, Throwable ex) -> {
4267 >                         if (ex != null) f.completeExceptionally(ex);
4268 >                         else f.complete(t);
4269 >                         return null;
4270 >                     });
4271 >        return f;
4272      }
4273  
4274 <    /**
4275 <     * If a whenComplete action throws an exception when triggered by
4276 <     * a normal completion, it completes exceptionally
3081 <     */
3082 <    public void testWhenComplete3() {
3083 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3084 <        CompletableFuture<Integer> g =
3085 <            f.whenComplete((Integer x, Throwable t) ->
3086 <                           { throw new CFException(); } );
3087 <        f.complete(three);
3088 <        checkCompletedNormally(f, three);
3089 <        assertTrue(g.isCompletedExceptionally());
3090 <        checkCompletedWithWrappedCFException(g);
4274 >    /** Demo utility method to join a CompletionStage */
4275 >    static <T> T join(CompletionStage<T> stage) {
4276 >        return toCompletableFuture(stage).join();
4277      }
4278  
4279      /**
4280 <     * whenCompleteAsync action executes on normal completion, propagating
3095 <     * source result.
4280 >     * Joining a minimal stage "by hand" works
4281       */
4282 <    public void testWhenCompleteAsync1() {
4283 <        final AtomicInteger a = new AtomicInteger();
4282 >    public void testMinimalCompletionStage_join_by_hand() {
4283 >        for (boolean createIncomplete : new boolean[] { true, false })
4284 >        for (Integer v1 : new Integer[] { 1, null })
4285 >    {
4286          CompletableFuture<Integer> f = new CompletableFuture<>();
4287 <        CompletableFuture<Integer> g =
4288 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
4289 <        f.complete(three);
4290 <        checkCompletedNormally(f, three);
4291 <        checkCompletedNormally(g, three);
4292 <        assertEquals(a.get(), 1);
4287 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4288 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4289 >        if (!createIncomplete) assertTrue(f.complete(v1));
4290 >        minimal.thenAccept(x -> g.complete(x));
4291 >        if (createIncomplete) assertTrue(f.complete(v1));
4292 >        g.join();
4293 >        checkCompletedNormally(g, v1);
4294 >        checkCompletedNormally(f, v1);
4295 >        assertEquals(v1, join(minimal));
4296 >    }}
4297 >
4298 >    static class Monad {
4299 >        static class ZeroException extends RuntimeException {
4300 >            public ZeroException() { super("monadic zero"); }
4301 >        }
4302 >        // "return", "unit"
4303 >        static <T> CompletableFuture<T> unit(T value) {
4304 >            return completedFuture(value);
4305 >        }
4306 >        // monadic zero ?
4307 >        static <T> CompletableFuture<T> zero() {
4308 >            return failedFuture(new ZeroException());
4309 >        }
4310 >        // >=>
4311 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4312 >            (Function<T, CompletableFuture<U>> f,
4313 >             Function<U, CompletableFuture<V>> g) {
4314 >            return x -> f.apply(x).thenCompose(g);
4315 >        }
4316 >
4317 >        static void assertZero(CompletableFuture<?> f) {
4318 >            try {
4319 >                f.getNow(null);
4320 >                throw new AssertionError("should throw");
4321 >            } catch (CompletionException success) {
4322 >                assertTrue(success.getCause() instanceof ZeroException);
4323 >            }
4324 >        }
4325 >
4326 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4327 >                                           CompletableFuture<T> g) {
4328 >            T fval = null, gval = null;
4329 >            Throwable fex = null, gex = null;
4330 >
4331 >            try { fval = f.get(); }
4332 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4333 >            catch (Throwable ex) { fex = ex; }
4334 >
4335 >            try { gval = g.get(); }
4336 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4337 >            catch (Throwable ex) { gex = ex; }
4338 >
4339 >            if (fex != null || gex != null)
4340 >                assertSame(fex.getClass(), gex.getClass());
4341 >            else
4342 >                assertEquals(fval, gval);
4343 >        }
4344 >
4345 >        static class PlusFuture<T> extends CompletableFuture<T> {
4346 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4347 >        }
4348 >
4349 >        /** Implements "monadic plus". */
4350 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4351 >                                             CompletableFuture<? extends T> g) {
4352 >            PlusFuture<T> plus = new PlusFuture<T>();
4353 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4354 >                try {
4355 >                    if (ex == null) {
4356 >                        if (plus.complete(result))
4357 >                            if (plus.firstFailure.get() != null)
4358 >                                plus.firstFailure.set(null);
4359 >                    }
4360 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4361 >                        if (plus.isDone())
4362 >                            plus.firstFailure.set(null);
4363 >                    }
4364 >                    else {
4365 >                        // first failure has precedence
4366 >                        Throwable first = plus.firstFailure.getAndSet(null);
4367 >
4368 >                        // may fail with "Self-suppression not permitted"
4369 >                        try { first.addSuppressed(ex); }
4370 >                        catch (Exception ignored) {}
4371 >
4372 >                        plus.completeExceptionally(first);
4373 >                    }
4374 >                } catch (Throwable unexpected) {
4375 >                    plus.completeExceptionally(unexpected);
4376 >                }
4377 >            };
4378 >            f.whenComplete(action);
4379 >            g.whenComplete(action);
4380 >            return plus;
4381 >        }
4382 >    }
4383 >
4384 >    /**
4385 >     * CompletableFuture is an additive monad - sort of.
4386 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4387 >     */
4388 >    public void testAdditiveMonad() throws Throwable {
4389 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4390 >        CompletableFuture<Long> zero = Monad.zero();
4391 >
4392 >        // Some mutually non-commutative functions
4393 >        Function<Long, CompletableFuture<Long>> triple
4394 >            = x -> Monad.unit(3 * x);
4395 >        Function<Long, CompletableFuture<Long>> inc
4396 >            = x -> Monad.unit(x + 1);
4397 >
4398 >        // unit is a right identity: m >>= unit === m
4399 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4400 >                                 inc.apply(5L));
4401 >        // unit is a left identity: (unit x) >>= f === f x
4402 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4403 >                                 inc.apply(5L));
4404 >
4405 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4406 >        Monad.assertFutureEquals(
4407 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4408 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4409 >
4410 >        // The case for CompletableFuture as an additive monad is weaker...
4411 >
4412 >        // zero is a monadic zero
4413 >        Monad.assertZero(zero);
4414 >
4415 >        // left zero: zero >>= f === zero
4416 >        Monad.assertZero(zero.thenCompose(inc));
4417 >        // right zero: f >>= (\x -> zero) === zero
4418 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4419 >
4420 >        // f plus zero === f
4421 >        Monad.assertFutureEquals(Monad.unit(5L),
4422 >                                 Monad.plus(Monad.unit(5L), zero));
4423 >        // zero plus f === f
4424 >        Monad.assertFutureEquals(Monad.unit(5L),
4425 >                                 Monad.plus(zero, Monad.unit(5L)));
4426 >        // zero plus zero === zero
4427 >        Monad.assertZero(Monad.plus(zero, zero));
4428 >        {
4429 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4430 >                                                   Monad.unit(8L));
4431 >            // non-determinism
4432 >            assertTrue(f.get() == 5L || f.get() == 8L);
4433 >        }
4434 >
4435 >        CompletableFuture<Long> godot = new CompletableFuture<>();
4436 >        // f plus godot === f (doesn't wait for godot)
4437 >        Monad.assertFutureEquals(Monad.unit(5L),
4438 >                                 Monad.plus(Monad.unit(5L), godot));
4439 >        // godot plus f === f (doesn't wait for godot)
4440 >        Monad.assertFutureEquals(Monad.unit(5L),
4441 >                                 Monad.plus(godot, Monad.unit(5L)));
4442 >    }
4443 >
4444 >    /** Test long recursive chains of CompletableFutures with cascading completions */
4445 >    @SuppressWarnings("FutureReturnValueIgnored")
4446 >    public void testRecursiveChains() throws Throwable {
4447 >        for (ExecutionMode m : ExecutionMode.values())
4448 >        for (boolean addDeadEnds : new boolean[] { true, false })
4449 >    {
4450 >        final int val = 42;
4451 >        final int n = expensiveTests ? 1_000 : 2;
4452 >        CompletableFuture<Integer> head = new CompletableFuture<>();
4453 >        CompletableFuture<Integer> tail = head;
4454 >        for (int i = 0; i < n; i++) {
4455 >            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4456 >            tail = m.thenApply(tail, v -> v + 1);
4457 >            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4458 >            tail = m.applyToEither(tail, tail, v -> v + 1);
4459 >            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4460 >            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4461 >        }
4462 >        head.complete(val);
4463 >        assertEquals(val + 3 * n, (int) tail.join());
4464 >    }}
4465 >
4466 >    /**
4467 >     * A single CompletableFuture with many dependents.
4468 >     * A demo of scalability - runtime is O(n).
4469 >     */
4470 >    @SuppressWarnings("FutureReturnValueIgnored")
4471 >    public void testManyDependents() throws Throwable {
4472 >        final int n = expensiveTests ? 1_000_000 : 10;
4473 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4474 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4475 >        final AtomicInteger count = new AtomicInteger(0);
4476 >        for (int i = 0; i < n; i++) {
4477 >            head.thenRun(() -> count.getAndIncrement());
4478 >            head.thenAccept(x -> count.getAndIncrement());
4479 >            head.thenApply(x -> count.getAndIncrement());
4480 >
4481 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4482 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4483 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4484 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4485 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4486 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4487 >
4488 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4489 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4490 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4491 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4492 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4493 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4494 >        }
4495 >        head.complete(null);
4496 >        assertEquals(5 * 3 * n, count.get());
4497 >    }
4498 >
4499 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4500 >    @SuppressWarnings("FutureReturnValueIgnored")
4501 >    public void testCoCompletionGarbageRetention() throws Throwable {
4502 >        final int n = expensiveTests ? 1_000_000 : 10;
4503 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4504 >        CompletableFuture<Integer> f;
4505 >        for (int i = 0; i < n; i++) {
4506 >            f = new CompletableFuture<>();
4507 >            f.runAfterEither(incomplete, () -> {});
4508 >            f.complete(null);
4509 >
4510 >            f = new CompletableFuture<>();
4511 >            f.acceptEither(incomplete, x -> {});
4512 >            f.complete(null);
4513 >
4514 >            f = new CompletableFuture<>();
4515 >            f.applyToEither(incomplete, x -> x);
4516 >            f.complete(null);
4517 >
4518 >            f = new CompletableFuture<>();
4519 >            CompletableFuture.anyOf(f, incomplete);
4520 >            f.complete(null);
4521 >        }
4522 >
4523 >        for (int i = 0; i < n; i++) {
4524 >            f = new CompletableFuture<>();
4525 >            incomplete.runAfterEither(f, () -> {});
4526 >            f.complete(null);
4527 >
4528 >            f = new CompletableFuture<>();
4529 >            incomplete.acceptEither(f, x -> {});
4530 >            f.complete(null);
4531 >
4532 >            f = new CompletableFuture<>();
4533 >            incomplete.applyToEither(f, x -> x);
4534 >            f.complete(null);
4535 >
4536 >            f = new CompletableFuture<>();
4537 >            CompletableFuture.anyOf(incomplete, f);
4538 >            f.complete(null);
4539 >        }
4540 >    }
4541 >
4542 >    /**
4543 >     * Reproduction recipe for:
4544 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4545 >     * 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
4546 >     */
4547 >    public void testAnyOfGarbageRetention() throws Throwable {
4548 >        for (Integer v : new Integer[] { 1, null })
4549 >    {
4550 >        final int n = expensiveTests ? 100_000 : 10;
4551 >        CompletableFuture<Integer>[] fs
4552 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4553 >        for (int i = 0; i < fs.length; i++)
4554 >            fs[i] = new CompletableFuture<>();
4555 >        fs[fs.length - 1].complete(v);
4556 >        for (int i = 0; i < n; i++)
4557 >            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4558 >    }}
4559 >
4560 >    /**
4561 >     * Checks for garbage retention with allOf.
4562 >     *
4563 >     * As of 2016-07, fails with OOME:
4564 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4565 >     */
4566 >    public void testCancelledAllOfGarbageRetention() throws Throwable {
4567 >        final int n = expensiveTests ? 100_000 : 10;
4568 >        CompletableFuture<Integer>[] fs
4569 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4570 >        for (int i = 0; i < fs.length; i++)
4571 >            fs[i] = new CompletableFuture<>();
4572 >        for (int i = 0; i < n; i++)
4573 >            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4574 >    }
4575 >
4576 >    /**
4577 >     * Checks for garbage retention when a dependent future is
4578 >     * cancelled and garbage-collected.
4579 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4580 >     *
4581 >     * As of 2016-07, fails with OOME:
4582 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4583 >     */
4584 >    public void testCancelledGarbageRetention() throws Throwable {
4585 >        final int n = expensiveTests ? 100_000 : 10;
4586 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4587 >        for (int i = 0; i < n; i++)
4588 >            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4589 >    }
4590 >
4591 >    /**
4592 >     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4593 >     * is invoked many times.
4594 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4595 >     *
4596 >     * As of 2016-07, fails with OOME:
4597 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4598 >     */
4599 >    public void testToCompletableFutureGarbageRetention() throws Throwable {
4600 >        final int n = expensiveTests ? 900_000 : 10;
4601 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4602 >        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4603 >        for (int i = 0; i < n; i++)
4604 >            assertTrue(minimal.toCompletableFuture().cancel(true));
4605 >    }
4606 >
4607 > //     static <U> U join(CompletionStage<U> stage) {
4608 > //         CompletableFuture<U> f = new CompletableFuture<>();
4609 > //         stage.whenComplete((v, ex) -> {
4610 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4611 > //         });
4612 > //         return f.join();
4613 > //     }
4614 >
4615 > //     static <U> boolean isDone(CompletionStage<U> stage) {
4616 > //         CompletableFuture<U> f = new CompletableFuture<>();
4617 > //         stage.whenComplete((v, ex) -> {
4618 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4619 > //         });
4620 > //         return f.isDone();
4621 > //     }
4622 >
4623 > //     static <U> U join2(CompletionStage<U> stage) {
4624 > //         return stage.toCompletableFuture().copy().join();
4625 > //     }
4626 >
4627 > //     static <U> boolean isDone2(CompletionStage<U> stage) {
4628 > //         return stage.toCompletableFuture().copy().isDone();
4629 > //     }
4630 >
4631 >    // For testing default implementations
4632 >    // Only non-default interface methods defined.
4633 >    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4634 >        final CompletableFuture<T> cf;
4635 >        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4636 >        public CompletableFuture<T> toCompletableFuture() {
4637 >            return cf; }
4638 >        public CompletionStage<Void> thenRun
4639 >            (Runnable action) {
4640 >            return cf.thenRun(action); }
4641 >        public CompletionStage<Void> thenRunAsync
4642 >            (Runnable action) {
4643 >            return cf.thenRunAsync(action); }
4644 >        public CompletionStage<Void> thenRunAsync
4645 >            (Runnable action,
4646 >             Executor executor) {
4647 >            return cf.thenRunAsync(action, executor); }
4648 >        public CompletionStage<Void> thenAccept
4649 >            (Consumer<? super T> action) {
4650 >            return cf.thenAccept(action); }
4651 >        public CompletionStage<Void> thenAcceptAsync
4652 >            (Consumer<? super T> action) {
4653 >            return cf.thenAcceptAsync(action); }
4654 >        public CompletionStage<Void> thenAcceptAsync
4655 >            (Consumer<? super T> action,
4656 >             Executor executor) {
4657 >            return cf.thenAcceptAsync(action, executor); }
4658 >        public <U> CompletionStage<U> thenApply
4659 >            (Function<? super T,? extends U> a) {
4660 >            return cf.thenApply(a); }
4661 >        public <U> CompletionStage<U> thenApplyAsync
4662 >            (Function<? super T,? extends U> fn) {
4663 >            return cf.thenApplyAsync(fn); }
4664 >        public <U> CompletionStage<U> thenApplyAsync
4665 >            (Function<? super T,? extends U> fn,
4666 >             Executor executor) {
4667 >            return cf.thenApplyAsync(fn, executor); }
4668 >        public <U,V> CompletionStage<V> thenCombine
4669 >            (CompletionStage<? extends U> other,
4670 >             BiFunction<? super T,? super U,? extends V> fn) {
4671 >            return cf.thenCombine(other, fn); }
4672 >        public <U,V> CompletionStage<V> thenCombineAsync
4673 >            (CompletionStage<? extends U> other,
4674 >             BiFunction<? super T,? super U,? extends V> fn) {
4675 >            return cf.thenCombineAsync(other, fn); }
4676 >        public <U,V> CompletionStage<V> thenCombineAsync
4677 >            (CompletionStage<? extends U> other,
4678 >             BiFunction<? super T,? super U,? extends V> fn,
4679 >             Executor executor) {
4680 >            return cf.thenCombineAsync(other, fn, executor); }
4681 >        public <U> CompletionStage<Void> thenAcceptBoth
4682 >            (CompletionStage<? extends U> other,
4683 >             BiConsumer<? super T, ? super U> action) {
4684 >            return cf.thenAcceptBoth(other, action); }
4685 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4686 >            (CompletionStage<? extends U> other,
4687 >             BiConsumer<? super T, ? super U> action) {
4688 >            return cf.thenAcceptBothAsync(other, action); }
4689 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4690 >            (CompletionStage<? extends U> other,
4691 >             BiConsumer<? super T, ? super U> action,
4692 >             Executor executor) {
4693 >            return cf.thenAcceptBothAsync(other, action, executor); }
4694 >        public CompletionStage<Void> runAfterBoth
4695 >            (CompletionStage<?> other,
4696 >             Runnable action) {
4697 >            return cf.runAfterBoth(other, action); }
4698 >        public CompletionStage<Void> runAfterBothAsync
4699 >            (CompletionStage<?> other,
4700 >             Runnable action) {
4701 >            return cf.runAfterBothAsync(other, action); }
4702 >        public CompletionStage<Void> runAfterBothAsync
4703 >            (CompletionStage<?> other,
4704 >             Runnable action,
4705 >             Executor executor) {
4706 >            return cf.runAfterBothAsync(other, action, executor); }
4707 >        public <U> CompletionStage<U> applyToEither
4708 >            (CompletionStage<? extends T> other,
4709 >             Function<? super T, U> fn) {
4710 >            return cf.applyToEither(other, fn); }
4711 >        public <U> CompletionStage<U> applyToEitherAsync
4712 >            (CompletionStage<? extends T> other,
4713 >             Function<? super T, U> fn) {
4714 >            return cf.applyToEitherAsync(other, fn); }
4715 >        public <U> CompletionStage<U> applyToEitherAsync
4716 >            (CompletionStage<? extends T> other,
4717 >             Function<? super T, U> fn,
4718 >             Executor executor) {
4719 >            return cf.applyToEitherAsync(other, fn, executor); }
4720 >        public CompletionStage<Void> acceptEither
4721 >            (CompletionStage<? extends T> other,
4722 >             Consumer<? super T> action) {
4723 >            return cf.acceptEither(other, action); }
4724 >        public CompletionStage<Void> acceptEitherAsync
4725 >            (CompletionStage<? extends T> other,
4726 >             Consumer<? super T> action) {
4727 >            return cf.acceptEitherAsync(other, action); }
4728 >        public CompletionStage<Void> acceptEitherAsync
4729 >            (CompletionStage<? extends T> other,
4730 >             Consumer<? super T> action,
4731 >             Executor executor) {
4732 >            return cf.acceptEitherAsync(other, action, executor); }
4733 >        public CompletionStage<Void> runAfterEither
4734 >            (CompletionStage<?> other,
4735 >             Runnable action) {
4736 >            return cf.runAfterEither(other, action); }
4737 >        public CompletionStage<Void> runAfterEitherAsync
4738 >            (CompletionStage<?> other,
4739 >             Runnable action) {
4740 >            return cf.runAfterEitherAsync(other, action); }
4741 >        public CompletionStage<Void> runAfterEitherAsync
4742 >            (CompletionStage<?> other,
4743 >             Runnable action,
4744 >             Executor executor) {
4745 >            return cf.runAfterEitherAsync(other, action, executor); }
4746 >        public <U> CompletionStage<U> thenCompose
4747 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4748 >            return cf.thenCompose(fn); }
4749 >        public <U> CompletionStage<U> thenComposeAsync
4750 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4751 >            return cf.thenComposeAsync(fn); }
4752 >        public <U> CompletionStage<U> thenComposeAsync
4753 >            (Function<? super T, ? extends CompletionStage<U>> fn,
4754 >             Executor executor) {
4755 >            return cf.thenComposeAsync(fn, executor); }
4756 >        public <U> CompletionStage<U> handle
4757 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4758 >            return cf.handle(fn); }
4759 >        public <U> CompletionStage<U> handleAsync
4760 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4761 >            return cf.handleAsync(fn); }
4762 >        public <U> CompletionStage<U> handleAsync
4763 >            (BiFunction<? super T, Throwable, ? extends U> fn,
4764 >             Executor executor) {
4765 >            return cf.handleAsync(fn, executor); }
4766 >        public CompletionStage<T> whenComplete
4767 >            (BiConsumer<? super T, ? super Throwable> action) {
4768 >            return cf.whenComplete(action); }
4769 >        public CompletionStage<T> whenCompleteAsync
4770 >            (BiConsumer<? super T, ? super Throwable> action) {
4771 >            return cf.whenCompleteAsync(action); }
4772 >        public CompletionStage<T> whenCompleteAsync
4773 >            (BiConsumer<? super T, ? super Throwable> action,
4774 >             Executor executor) {
4775 >            return cf.whenCompleteAsync(action, executor); }
4776 >        public CompletionStage<T> exceptionally
4777 >            (Function<Throwable, ? extends T> fn) {
4778 >            return cf.exceptionally(fn); }
4779      }
4780  
4781      /**
4782 <     * whenCompleteAsync action executes on exceptional completion, propagating
4783 <     * source result.
4782 >     * default-implemented exceptionallyAsync action is not invoked when
4783 >     * source completes normally, and source result is propagated
4784       */
4785 <    public void testWhenCompleteAsync2() {
4786 <        final AtomicInteger a = new AtomicInteger();
4787 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4788 <        CompletableFuture<Integer> g =
4789 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
4790 <        f.completeExceptionally(new CFException());
4791 <        checkCompletedWithWrappedCFException(f);
4792 <        checkCompletedWithWrappedCFException(g);
4793 <    }
4785 >    public void testDefaultExceptionallyAsync_normalCompletion() {
4786 >        for (boolean createIncomplete : new boolean[] { true, false })
4787 >        for (Integer v1 : new Integer[] { 1, null })
4788 >    {
4789 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4790 >        final DelegatedCompletionStage<Integer> d =
4791 >            new DelegatedCompletionStage<Integer>(f);
4792 >        if (!createIncomplete) assertTrue(f.complete(v1));
4793 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4794 >            ((Throwable t) -> {
4795 >                threadFail("should not be called");
4796 >                return null;            // unreached
4797 >            });
4798 >        if (createIncomplete) assertTrue(f.complete(v1));
4799 >
4800 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4801 >    }}
4802  
4803      /**
4804 <     * If a whenCompleteAsync action throws an exception when
4805 <     * triggered by a normal completion, it completes exceptionally
4804 >     * default-implemented exceptionallyAsync action completes with
4805 >     * function value on source exception
4806       */
4807 <    public void testWhenCompleteAsync3() {
4808 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4809 <        CompletableFuture<Integer> g =
4810 <            f.whenCompleteAsync((Integer x, Throwable t) ->
4811 <                           { throw new CFException(); } );
4812 <        f.complete(three);
4813 <        checkCompletedNormally(f, three);
4814 <        checkCompletedWithWrappedCFException(g);
4815 <    }
4807 >    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4808 >        for (boolean createIncomplete : new boolean[] { true, false })
4809 >        for (Integer v1 : new Integer[] { 1, null })
4810 >    {
4811 >        final AtomicInteger a = new AtomicInteger(0);
4812 >        final CFException ex = new CFException();
4813 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4814 >        final DelegatedCompletionStage<Integer> d =
4815 >            new DelegatedCompletionStage<Integer>(f);
4816 >        if (!createIncomplete) f.completeExceptionally(ex);
4817 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4818 >            ((Throwable t) -> {
4819 >                threadAssertSame(t, ex);
4820 >                a.getAndIncrement();
4821 >                return v1;
4822 >            });
4823 >        if (createIncomplete) f.completeExceptionally(ex);
4824 >
4825 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4826 >        assertEquals(1, a.get());
4827 >    }}
4828 >
4829 >    /**
4830 >     * Under default implementation, if an "exceptionally action"
4831 >     * throws an exception, it completes exceptionally with that
4832 >     * exception
4833 >     */
4834 >    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4835 >        for (boolean createIncomplete : new boolean[] { true, false })
4836 >    {
4837 >        final AtomicInteger a = new AtomicInteger(0);
4838 >        final CFException ex1 = new CFException();
4839 >        final CFException ex2 = new CFException();
4840 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4841 >        final DelegatedCompletionStage<Integer> d =
4842 >            new DelegatedCompletionStage<Integer>(f);
4843 >        if (!createIncomplete) f.completeExceptionally(ex1);
4844 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4845 >            ((Throwable t) -> {
4846 >                threadAssertSame(t, ex1);
4847 >                a.getAndIncrement();
4848 >                throw ex2;
4849 >            });
4850 >        if (createIncomplete) f.completeExceptionally(ex1);
4851 >
4852 >        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4853 >        checkCompletedExceptionally(f, ex1);
4854 >        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4855 >        assertEquals(1, a.get());
4856 >    }}
4857  
4858      /**
4859 <     * whenCompleteAsync action executes on normal completion, propagating
4860 <     * source result.
4859 >     * default exceptionallyCompose result completes normally after normal
4860 >     * completion of source
4861       */
4862 <    public void testWhenCompleteAsync1e() {
4863 <        final AtomicInteger a = new AtomicInteger();
4864 <        ThreadExecutor exec = new ThreadExecutor();
4865 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4866 <        CompletableFuture<Integer> g =
4867 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
4868 <                                exec);
4869 <        f.complete(three);
4870 <        checkCompletedNormally(f, three);
4871 <        checkCompletedNormally(g, three);
4872 <        assertEquals(a.get(), 1);
4873 <    }
4862 >    public void testDefaultExceptionallyCompose_normalCompletion() {
4863 >        for (boolean createIncomplete : new boolean[] { true, false })
4864 >        for (Integer v1 : new Integer[] { 1, null })
4865 >    {
4866 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4867 >        final ExceptionalCompletableFutureFunction r =
4868 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4869 >        final DelegatedCompletionStage<Integer> d =
4870 >            new DelegatedCompletionStage<Integer>(f);
4871 >        if (!createIncomplete) assertTrue(f.complete(v1));
4872 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4873 >        if (createIncomplete) assertTrue(f.complete(v1));
4874 >
4875 >        checkCompletedNormally(f, v1);
4876 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4877 >        r.assertNotInvoked();
4878 >    }}
4879  
4880      /**
4881 <     * whenCompleteAsync action executes on exceptional completion, propagating
4882 <     * source result.
4881 >     * default-implemented exceptionallyCompose result completes
4882 >     * normally after exceptional completion of source
4883       */
4884 <    public void testWhenCompleteAsync2e() {
4885 <        final AtomicInteger a = new AtomicInteger();
4886 <        ThreadExecutor exec = new ThreadExecutor();
4887 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4888 <        CompletableFuture<Integer> g =
4889 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
4890 <                                exec);
4891 <        f.completeExceptionally(new CFException());
4892 <        checkCompletedWithWrappedCFException(f);
4893 <        checkCompletedWithWrappedCFException(g);
4894 <    }
4884 >    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4885 >        for (boolean createIncomplete : new boolean[] { true, false })
4886 >    {
4887 >        final CFException ex = new CFException();
4888 >        final ExceptionalCompletableFutureFunction r =
4889 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4890 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4891 >        final DelegatedCompletionStage<Integer> d =
4892 >            new DelegatedCompletionStage<Integer>(f);
4893 >        if (!createIncomplete) f.completeExceptionally(ex);
4894 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4895 >        if (createIncomplete) f.completeExceptionally(ex);
4896 >
4897 >        checkCompletedExceptionally(f, ex);
4898 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
4899 >        r.assertInvoked();
4900 >    }}
4901  
4902      /**
4903 <     * If a whenCompleteAsync action throws an exception when triggered
4904 <     * by a normal completion, it completes exceptionally
4903 >     * default-implemented exceptionallyCompose completes
4904 >     * exceptionally on exception if action does
4905       */
4906 <    public void testWhenCompleteAsync3e() {
4907 <        ThreadExecutor exec = new ThreadExecutor();
4908 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4909 <        CompletableFuture<Integer> g =
4910 <            f.whenCompleteAsync((Integer x, Throwable t) ->
4911 <                                { throw new CFException(); },
4912 <                                exec);
4913 <        f.complete(three);
4914 <        checkCompletedNormally(f, three);
4915 <        checkCompletedWithWrappedCFException(g);
4916 <    }
4906 >    public void testDefaultExceptionallyCompose_actionFailed() {
4907 >        for (boolean createIncomplete : new boolean[] { true, false })
4908 >        for (Integer v1 : new Integer[] { 1, null })
4909 >    {
4910 >        final CFException ex = new CFException();
4911 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4912 >        final FailingExceptionalCompletableFutureFunction r
4913 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4914 >        final DelegatedCompletionStage<Integer> d =
4915 >            new DelegatedCompletionStage<Integer>(f);
4916 >        if (!createIncomplete) f.completeExceptionally(ex);
4917 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4918 >        if (createIncomplete) f.completeExceptionally(ex);
4919 >
4920 >        checkCompletedExceptionally(f, ex);
4921 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4922 >        r.assertInvoked();
4923 >    }}
4924  
4925      /**
4926 <     * handleAsync action completes normally with function value on
4927 <     * either normal or exceptional completion of source
4926 >     * default exceptionallyComposeAsync result completes normally after normal
4927 >     * completion of source
4928       */
4929 <    public void testHandleAsync() {
4930 <        CompletableFuture<Integer> f, g;
4931 <        IntegerHandler r;
4929 >    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4930 >        for (boolean createIncomplete : new boolean[] { true, false })
4931 >        for (Integer v1 : new Integer[] { 1, null })
4932 >    {
4933 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4934 >        final ExceptionalCompletableFutureFunction r =
4935 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4936 >        final DelegatedCompletionStage<Integer> d =
4937 >            new DelegatedCompletionStage<Integer>(f);
4938 >        if (!createIncomplete) assertTrue(f.complete(v1));
4939 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4940 >        if (createIncomplete) assertTrue(f.complete(v1));
4941  
4942 <        f = new CompletableFuture<>();
4943 <        g = f.handleAsync(r = new IntegerHandler());
4944 <        assertFalse(r.ran);
4945 <        f.completeExceptionally(new CFException());
3197 <        checkCompletedWithWrappedCFException(f);
3198 <        checkCompletedNormally(g, three);
3199 <        assertTrue(r.ran);
4942 >        checkCompletedNormally(f, v1);
4943 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4944 >        r.assertNotInvoked();
4945 >    }}
4946  
4947 <        f = new CompletableFuture<>();
4948 <        g = f.handleAsync(r = new IntegerHandler());
4949 <        assertFalse(r.ran);
4950 <        f.completeExceptionally(new CFException());
4951 <        checkCompletedWithWrappedCFException(f);
4952 <        checkCompletedNormally(g, three);
4953 <        assertTrue(r.ran);
4947 >    /**
4948 >     * default-implemented exceptionallyComposeAsync result completes
4949 >     * normally after exceptional completion of source
4950 >     */
4951 >    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4952 >        for (boolean createIncomplete : new boolean[] { true, false })
4953 >    {
4954 >        final CFException ex = new CFException();
4955 >        final ExceptionalCompletableFutureFunction r =
4956 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4957 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4958 >        final DelegatedCompletionStage<Integer> d =
4959 >            new DelegatedCompletionStage<Integer>(f);
4960 >        if (!createIncomplete) f.completeExceptionally(ex);
4961 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4962 >        if (createIncomplete) f.completeExceptionally(ex);
4963 >
4964 >        checkCompletedExceptionally(f, ex);
4965 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
4966 >        r.assertInvoked();
4967 >    }}
4968  
4969 <        f = new CompletableFuture<>();
4970 <        g = f.handleAsync(r = new IntegerHandler());
4971 <        assertFalse(r.ran);
4972 <        f.complete(one);
4973 <        checkCompletedNormally(f, one);
4974 <        checkCompletedNormally(g, two);
4975 <        assertTrue(r.ran);
4969 >    /**
4970 >     * default-implemented exceptionallyComposeAsync completes
4971 >     * exceptionally on exception if action does
4972 >     */
4973 >    public void testDefaultExceptionallyComposeAsync_actionFailed() {
4974 >        for (boolean createIncomplete : new boolean[] { true, false })
4975 >        for (Integer v1 : new Integer[] { 1, null })
4976 >    {
4977 >        final CFException ex = new CFException();
4978 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4979 >        final FailingExceptionalCompletableFutureFunction r
4980 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4981 >        final DelegatedCompletionStage<Integer> d =
4982 >            new DelegatedCompletionStage<Integer>(f);
4983 >        if (!createIncomplete) f.completeExceptionally(ex);
4984 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4985 >        if (createIncomplete) f.completeExceptionally(ex);
4986 >
4987 >        checkCompletedExceptionally(f, ex);
4988 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4989 >        r.assertInvoked();
4990 >    }}
4991  
3217        f = new CompletableFuture<>();
3218        g = f.handleAsync(r = new IntegerHandler());
3219        assertFalse(r.ran);
3220        f.complete(one);
3221        checkCompletedNormally(f, one);
3222        checkCompletedNormally(g, two);
3223        assertTrue(r.ran);
3224    }
4992  
4993      /**
4994 <     * handleAsync action with Executor completes normally with
4995 <     * function value on either normal or exceptional completion of
3229 <     * source
4994 >     * default exceptionallyComposeAsync result completes normally after normal
4995 >     * completion of source
4996       */
4997 <    public void testHandleAsync2() {
4998 <        CompletableFuture<Integer> f, g;
4999 <        ThreadExecutor exec = new ThreadExecutor();
5000 <        IntegerHandler r;
5001 <
5002 <        f = new CompletableFuture<>();
5003 <        g = f.handleAsync(r = new IntegerHandler(), exec);
5004 <        assertFalse(r.ran);
5005 <        f.completeExceptionally(new CFException());
5006 <        checkCompletedWithWrappedCFException(f);
5007 <        checkCompletedNormally(g, three);
5008 <        assertTrue(r.ran);
4997 >    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
4998 >        for (boolean createIncomplete : new boolean[] { true, false })
4999 >        for (Integer v1 : new Integer[] { 1, null })
5000 >    {
5001 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5002 >        final ExceptionalCompletableFutureFunction r =
5003 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5004 >        final DelegatedCompletionStage<Integer> d =
5005 >            new DelegatedCompletionStage<Integer>(f);
5006 >        if (!createIncomplete) assertTrue(f.complete(v1));
5007 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5008 >        if (createIncomplete) assertTrue(f.complete(v1));
5009  
5010 <        f = new CompletableFuture<>();
5011 <        g = f.handleAsync(r = new IntegerHandler(), exec);
5012 <        assertFalse(r.ran);
5013 <        f.completeExceptionally(new CFException());
3248 <        checkCompletedWithWrappedCFException(f);
3249 <        checkCompletedNormally(g, three);
3250 <        assertTrue(r.ran);
5010 >        checkCompletedNormally(f, v1);
5011 >        checkCompletedNormally(g.toCompletableFuture(), v1);
5012 >        r.assertNotInvoked();
5013 >    }}
5014  
5015 <        f = new CompletableFuture<>();
5016 <        g = f.handleAsync(r = new IntegerHandler(), exec);
5017 <        assertFalse(r.ran);
5018 <        f.complete(one);
5019 <        checkCompletedNormally(f, one);
5020 <        checkCompletedNormally(g, two);
5021 <        assertTrue(r.ran);
5015 >    /**
5016 >     * default-implemented exceptionallyComposeAsync result completes
5017 >     * normally after exceptional completion of source
5018 >     */
5019 >    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5020 >        for (boolean createIncomplete : new boolean[] { true, false })
5021 >    {
5022 >        final CFException ex = new CFException();
5023 >        final ExceptionalCompletableFutureFunction r =
5024 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5025 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5026 >        final DelegatedCompletionStage<Integer> d =
5027 >            new DelegatedCompletionStage<Integer>(f);
5028 >        if (!createIncomplete) f.completeExceptionally(ex);
5029 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5030 >        if (createIncomplete) f.completeExceptionally(ex);
5031 >
5032 >        checkCompletedExceptionally(f, ex);
5033 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5034 >        r.assertInvoked();
5035 >    }}
5036  
5037 <        f = new CompletableFuture<>();
5038 <        g = f.handleAsync(r = new IntegerHandler(), exec);
5039 <        assertFalse(r.ran);
5040 <        f.complete(one);
5041 <        checkCompletedNormally(f, one);
5042 <        checkCompletedNormally(g, two);
5043 <        assertTrue(r.ran);
5044 <    }
5037 >    /**
5038 >     * default-implemented exceptionallyComposeAsync completes
5039 >     * exceptionally on exception if action does
5040 >     */
5041 >    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5042 >        for (boolean createIncomplete : new boolean[] { true, false })
5043 >        for (Integer v1 : new Integer[] { 1, null })
5044 >    {
5045 >        final CFException ex = new CFException();
5046 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5047 >        final FailingExceptionalCompletableFutureFunction r
5048 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5049 >        final DelegatedCompletionStage<Integer> d =
5050 >            new DelegatedCompletionStage<Integer>(f);
5051 >        if (!createIncomplete) f.completeExceptionally(ex);
5052 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5053 >        if (createIncomplete) f.completeExceptionally(ex);
5054 >
5055 >        checkCompletedExceptionally(f, ex);
5056 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5057 >        r.assertInvoked();
5058 >    }}
5059  
5060   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines