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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines