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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines