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.44 by jsr166, Mon Jun 2 06:06:30 2014 UTC vs.
Revision 1.163 by jsr166, Sun Jul 3 18:33:17 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());
286 <        checkCompletedWithWrappedCFException(f);
281 >        for (Integer v1 : new Integer[] { 1, null })
282 >    {
283 >        CFException ex;
284 >        CompletableFuture<Integer> f;
285 >
286 >        f = new CompletableFuture<>();
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 <        f.obtrudeException(new CFException());
295 <        checkCompletedWithWrappedCFException(f);
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 <    // A non-commutative function that handles and produces null values as well.
378 <    static Integer subtract(Integer x, Integer y) {
379 <        return (x == null && y == null) ? null :
380 <            ((x == null) ? 42 : x.intValue())
381 <            - ((y == null) ? 99 : y.intValue());
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 >    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.
# Line 330 | Line 402 | public class CompletableFutureTest exten
402          return (x == null) ? null : x + 1;
403      }
404  
405 <    static final Supplier<Integer> supplyOne =
406 <        () -> Integer.valueOf(1);
407 <    static final Function<Integer, Integer> inc =
408 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
337 <    static final BiFunction<Integer, Integer, Integer> subtract =
338 <        (Integer x, Integer y) -> subtract(x, y);
339 <    static final class IncAction implements Consumer<Integer> {
340 <        int invocationCount = 0;
341 <        Integer value;
405 >    class NoopConsumer extends CheckedIntegerAction
406 >        implements Consumer<Integer>
407 >    {
408 >        NoopConsumer(ExecutionMode m) { super(m); }
409          public void accept(Integer x) {
410 <            invocationCount++;
411 <            value = inc(x);
410 >            invoked();
411 >            value = x;
412          }
413      }
414 <    static final class IncFunction implements Function<Integer,Integer> {
415 <        int invocationCount = 0;
416 <        Integer value;
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 <            invocationCount++;
420 >            invoked();
421              return value = inc(x);
422          }
423      }
424 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
425 <        int invocationCount = 0;
426 <        Integer value;
427 <        // Check this action was invoked exactly once when result is computed.
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 >    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.
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 <        int invocationCount = 0;
452 >
453 >    class Noop extends CheckedAction implements Runnable {
454 >        Noop(ExecutionMode m) { super(m); }
455          public void run() {
456 <            invocationCount++;
456 >            invoked();
457          }
458      }
459  
460 <    static final class FailingSupplier implements Supplier<Integer> {
461 <        int invocationCount = 0;
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 <            invocationCount++;
467 <            throw new CFException();
466 >            invoked();
467 >            throw ex;
468          }
469      }
470 <    static final class FailingConsumer implements Consumer<Integer> {
471 <        int invocationCount = 0;
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 <            invocationCount++;
478 <            throw new CFException();
477 >            invoked();
478 >            value = x;
479 >            throw ex;
480          }
481      }
482 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
483 <        int invocationCount = 0;
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 <            invocationCount++;
490 <            throw new CFException();
489 >            invoked();
490 >            value = subtract(x, y);
491 >            throw ex;
492          }
493      }
494 <    static final class FailingFunction implements Function<Integer, Integer> {
495 <        int invocationCount = 0;
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 <            invocationCount++;
502 <            throw new CFException();
501 >            invoked();
502 >            value = x;
503 >            throw ex;
504          }
505      }
506 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
507 <        int invocationCount = 0;
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 <            invocationCount++;
514 <            throw new CFException();
513 >            invoked();
514 >            value = subtract(x, y);
515 >            throw ex;
516          }
517      }
518 <    static final class FailingNoop implements Runnable {
519 <        int invocationCount = 0;
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 <            invocationCount++;
524 <            throw new CFException();
523 >            invoked();
524 >            throw ex;
525          }
526      }
527  
528 <    static final class CompletableFutureInc
529 <        implements Function<Integer, CompletableFuture<Integer>> {
530 <        int invocationCount = 0;
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 <            invocationCount++;
533 >            invoked();
534 >            value = x;
535              CompletableFuture<Integer> f = new CompletableFuture<>();
536 <            f.complete(inc(x));
536 >            assertTrue(f.complete(inc(x)));
537              return f;
538          }
539      }
540  
541 <    static final class FailingCompletableFutureFunction
542 <        implements Function<Integer, CompletableFuture<Integer>> {
543 <        int invocationCount = 0;
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 <            invocationCount++;
548 <            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);
446 <
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 <        int invocationCount = 0;
572 <        public Integer apply(Integer x, Throwable t) {
460 <            invocationCount++;
461 <            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 484 | 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,U> CompletableFuture<U> applyToEither
638 >            public <T> CompletableFuture<Void> runAfterEither
639                  (CompletableFuture<T> f,
640 <                 CompletionStage<? extends T> g,
641 <                 Function<? super T,U> a) {
642 <                return f.applyToEither(g, a);
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,
# Line 496 | Line 647 | public class CompletableFutureTest exten
647                   Consumer<? super T> a) {
648                  return f.acceptEither(g, a);
649              }
650 <            public <T> CompletableFuture<Void> runAfterEither
650 >            public <T,U> CompletableFuture<U> applyToEither
651                  (CompletableFuture<T> f,
652 <                 CompletionStage<?> g,
653 <                 java.lang.Runnable a) {
654 <                return f.runAfterEither(g, a);
652 >                 CompletionStage<? extends T> g,
653 >                 Function<? super T,U> a) {
654 >                return f.applyToEither(g, a);
655 >            }
656 >        },
657 >
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.thenCompose(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.whenComplete(a);
694 >                return f.whenCompleteAsync(a);
695              }
515        },
516
517 //             /** Experimental way to do more testing */
518 //         REVERSE_DEFAULT {
519 //             public <T,U> CompletableFuture<Void> runAfterBoth
520 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
521 //                 return g.runAfterBoth(f, a);
522 //             }
523 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
524 //                 (CompletableFuture<T> f,
525 //                  CompletionStage<? extends U> g,
526 //                  BiConsumer<? super T,? super U> a) {
527 //                 return DEFAULT.thenAcceptBoth(f, g, a);
528 //             }
529 //         },
530
531        DEFAULT_ASYNC {
696              public <T,U> CompletableFuture<Void> runAfterBoth
697                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
698                  return f.runAfterBothAsync(g, a);
# Line 545 | 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,U> CompletableFuture<U> applyToEither
712 >            public <T> CompletableFuture<Void> runAfterEither
713                  (CompletableFuture<T> f,
714 <                 CompletionStage<? extends T> g,
715 <                 Function<? super T,U> a) {
716 <                return f.applyToEitherAsync(g, a);
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,
# Line 557 | Line 721 | public class CompletableFutureTest exten
721                   Consumer<? super T> a) {
722                  return f.acceptEitherAsync(g, a);
723              }
724 <            public <T> CompletableFuture<Void> runAfterEither
724 >            public <T,U> CompletableFuture<U> applyToEither
725                  (CompletableFuture<T> f,
726 <                 CompletionStage<?> g,
727 <                 java.lang.Runnable a) {
728 <                return f.runAfterEitherAsync(g, a);
726 >                 CompletionStage<? extends T> g,
727 >                 Function<? super T,U> a) {
728 >                return f.applyToEitherAsync(g, a);
729 >            }
730 >        },
731 >
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);
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);
767 >                return f.whenCompleteAsync(a, new ThreadExecutor());
768              }
576        },
577
578 //         REVERSE_DEFAULT_ASYNC {
579 //             public <T,U> CompletableFuture<Void> runAfterBoth
580 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
581 //                 return f.runAfterBothAsync(g, a);
582 //             }
583 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
584 //                 (CompletableFuture<T> f,
585 //                  CompletionStage<? extends U> g,
586 //                  BiConsumer<? super T,? super U> a) {
587 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
588 //             }
589 //         },
590
591        EXECUTOR {
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 605 | Line 782 | public class CompletableFutureTest exten
782                   BiFunction<? super T,? super U,? extends V> a) {
783                  return f.thenCombineAsync(g, a, new ThreadExecutor());
784              }
608            public <T,U> CompletableFuture<U> applyToEither
609                (CompletableFuture<T> f,
610                 CompletionStage<? extends T> g,
611                 Function<? super T,U> a) {
612                return f.applyToEitherAsync(g, a, new ThreadExecutor());
613            }
614            public <T> CompletableFuture<Void> acceptEither
615                (CompletableFuture<T> f,
616                 CompletionStage<? extends T> g,
617                 Consumer<? super T> a) {
618                return f.acceptEitherAsync(g, a, new ThreadExecutor());
619            }
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,U> CompletableFuture<U> thenCompose
791 >            public <T> CompletableFuture<Void> acceptEither
792                  (CompletableFuture<T> f,
793 <                 Function<? super T,? extends CompletionStage<U>> a) {
794 <                return f.thenComposeAsync(a, new ThreadExecutor());
793 >                 CompletionStage<? extends T> g,
794 >                 Consumer<? super T> a) {
795 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
796              }
797 <            public <T> CompletableFuture<T> whenComplete
797 >            public <T,U> CompletableFuture<U> applyToEither
798                  (CompletableFuture<T> f,
799 <                 BiConsumer<? super T,? super Throwable> a) {
800 <                return f.whenCompleteAsync(a, new ThreadExecutor());
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 645 | Line 830 | public class CompletableFutureTest exten
830              (CompletableFuture<T> f,
831               CompletionStage<? extends U> g,
832               BiFunction<? super T,? super U,? extends V> a);
648        public abstract <T,U> CompletableFuture<U> applyToEither
649            (CompletableFuture<T> f,
650             CompletionStage<? extends T> g,
651             Function<? super T,U> a);
652        public abstract <T> CompletableFuture<Void> acceptEither
653            (CompletableFuture<T> f,
654             CompletionStage<? extends T> g,
655             Consumer<? super T> a);
833          public abstract <T> CompletableFuture<Void> runAfterEither
834              (CompletableFuture<T> f,
835               CompletionStage<?> g,
836               java.lang.Runnable a);
837 <        public abstract <T,U> CompletableFuture<U> thenCompose
837 >        public abstract <T> CompletableFuture<Void> acceptEither
838              (CompletableFuture<T> f,
839 <             Function<? super T,? extends CompletionStage<U>> a);
840 <        public abstract <T> CompletableFuture<T> whenComplete
839 >             CompletionStage<? extends T> g,
840 >             Consumer<? super T> a);
841 >        public abstract <T,U> CompletableFuture<U> applyToEither
842              (CompletableFuture<T> f,
843 <             BiConsumer<? super T,? super Throwable> a);
844 <
667 <
668 <    }
669 <
670 <    /**
671 <     * exceptionally action completes with function value on source
672 <     * exception; otherwise with source value
673 <     */
674 <    public void testExceptionally() {
675 <        CompletableFuture<Integer> f = new CompletableFuture<>();
676 <        ExceptionToInteger r = new ExceptionToInteger();
677 <        CompletableFuture<Integer> g = f.exceptionally(r);
678 <        f.completeExceptionally(new CFException());
679 <        checkCompletedNormally(g, three);
680 <
681 <        f = new CompletableFuture<>();
682 <        r = new ExceptionToInteger();
683 <        g = f.exceptionally(r);
684 <        f.complete(one);
685 <        checkCompletedNormally(g, one);
686 <    }
687 <
688 <    /**
689 <     * handle action completes normally with function value on either
690 <     * normal or exceptional completion of source
691 <     */
692 <    public void testHandle() {
693 <        CompletableFuture<Integer> f, g;
694 <        IntegerHandler r;
695 <
696 <        f = new CompletableFuture<>();
697 <        f.completeExceptionally(new CFException());
698 <        g = f.handle(r = new IntegerHandler());
699 <        assertEquals(1, r.invocationCount);
700 <        assertEquals(1, r.invocationCount);
701 <        checkCompletedNormally(g, three);
702 <
703 <        f = new CompletableFuture<>();
704 <        g = f.handle(r = new IntegerHandler());
705 <        assertEquals(0, r.invocationCount);
706 <        f.completeExceptionally(new CFException());
707 <        checkCompletedNormally(g, three);
708 <        assertEquals(1, r.invocationCount);
709 <
710 <        f = new CompletableFuture<>();
711 <        f.complete(one);
712 <        g = f.handle(r = new IntegerHandler());
713 <        assertEquals(1, r.invocationCount);
714 <        checkCompletedNormally(g, two);
715 <
716 <        f = new CompletableFuture<>();
717 <        g = f.handle(r = new IntegerHandler());
718 <        assertEquals(0, r.invocationCount);
719 <        f.complete(one);
720 <        assertEquals(1, r.invocationCount);
721 <        checkCompletedNormally(g, two);
722 <    }
723 <
724 <    /**
725 <     * runAsync completes after running Runnable
726 <     */
727 <    public void testRunAsync() {
728 <        Noop r = new Noop();
729 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
730 <        assertNull(f.join());
731 <        assertEquals(1, r.invocationCount);
732 <        checkCompletedNormally(f, null);
733 <    }
734 <
735 <    /**
736 <     * runAsync with executor completes after running Runnable
737 <     */
738 <    public void testRunAsync2() {
739 <        Noop r = new Noop();
740 <        ThreadExecutor exec = new ThreadExecutor();
741 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
742 <        assertNull(f.join());
743 <        assertEquals(1, r.invocationCount);
744 <        checkCompletedNormally(f, null);
745 <        assertEquals(1, exec.count.get());
746 <    }
747 <
748 <    /**
749 <     * failing runAsync completes exceptionally after running Runnable
750 <     */
751 <    public void testRunAsync3() {
752 <        FailingNoop r = new FailingNoop();
753 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
754 <        checkCompletedWithWrappedCFException(f);
755 <        assertEquals(1, r.invocationCount);
843 >             CompletionStage<? extends T> g,
844 >             Function<? super T,U> a);
845      }
846  
847      /**
848 <     * supplyAsync completes with result of supplier
848 >     * exceptionally action is not invoked when source completes
849 >     * normally, and source result is propagated
850       */
851 <    public void testSupplyAsync() {
852 <        CompletableFuture<Integer> f;
853 <        f = CompletableFuture.supplyAsync(supplyOne);
854 <        assertEquals(f.join(), one);
855 <        checkCompletedNormally(f, one);
856 <    }
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 <    /**
867 <     * supplyAsync with executor completes with result of supplier
868 <     */
869 <    public void testSupplyAsync2() {
772 <        CompletableFuture<Integer> f;
773 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
774 <        assertEquals(f.join(), one);
775 <        checkCompletedNormally(f, one);
776 <    }
866 >        checkCompletedNormally(g, v1);
867 >        checkCompletedNormally(f, v1);
868 >        assertEquals(0, a.get());
869 >    }}
870  
871      /**
872 <     * Failing supplyAsync completes exceptionally
872 >     * exceptionally action completes with function value on source
873 >     * exception
874       */
875 <    public void testSupplyAsync3() {
876 <        FailingSupplier r = new FailingSupplier();
877 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
878 <        checkCompletedWithWrappedCFException(f);
879 <        assertEquals(1, r.invocationCount);
880 <    }
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 <    // seq completion methods
892 >        checkCompletedNormally(g, v1);
893 >        assertEquals(1, a.get());
894 >    }}
895  
896      /**
897 <     * thenRun result completes normally after normal completion of source
897 >     * If an "exceptionally action" throws an exception, it completes
898 >     * exceptionally with that exception
899       */
900 <    public void testThenRun() {
901 <        CompletableFuture<Integer> f;
902 <        CompletableFuture<Void> g;
903 <        Noop r;
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 <        f = new CompletableFuture<>();
918 <        g = f.thenRun(r = new Noop());
919 <        f.complete(null);
920 <        checkCompletedNormally(g, null);
802 <        assertEquals(1, r.invocationCount);
803 <
804 <        f = new CompletableFuture<>();
805 <        f.complete(null);
806 <        g = f.thenRun(r = new Noop());
807 <        checkCompletedNormally(g, null);
808 <        assertEquals(1, r.invocationCount);
809 <    }
917 >        checkCompletedWithWrappedException(g, ex2);
918 >        checkCompletedExceptionally(f, ex1);
919 >        assertEquals(1, a.get());
920 >    }}
921  
922      /**
923 <     * thenRun result completes exceptionally after exceptional
924 <     * completion of source
923 >     * whenComplete action executes on normal completion, propagating
924 >     * source result.
925       */
926 <    public void testThenRun2() {
927 <        CompletableFuture<Integer> f;
928 <        CompletableFuture<Void> g;
929 <        Noop r;
930 <
931 <        f = new CompletableFuture<>();
932 <        g = f.thenRun(r = new Noop());
933 <        f.completeExceptionally(new CFException());
934 <        checkCompletedWithWrappedCFException(g);
935 <        assertEquals(0, r.invocationCount);
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 <        f = new CompletableFuture<>();
945 <        f.completeExceptionally(new CFException());
946 <        g = f.thenRun(r = new Noop());
947 <        checkCompletedWithWrappedCFException(g);
830 <        assertEquals(0, r.invocationCount);
831 <    }
944 >        checkCompletedNormally(g, v1);
945 >        checkCompletedNormally(f, v1);
946 >        assertEquals(1, a.get());
947 >    }}
948  
949      /**
950 <     * thenRun result completes exceptionally if action does
950 >     * whenComplete action executes on exceptional completion, propagating
951 >     * source result.
952       */
953 <    public void testThenRun3() {
954 <        CompletableFuture<Integer> f;
955 <        CompletableFuture<Void> g;
956 <        FailingNoop r;
957 <
958 <        f = new CompletableFuture<>();
959 <        g = f.thenRun(r = new FailingNoop());
960 <        f.complete(null);
961 <        checkCompletedWithWrappedCFException(g);
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 <        f = new CompletableFuture<>();
972 <        f.complete(null);
973 <        g = f.thenRun(r = new FailingNoop());
974 <        checkCompletedWithWrappedCFException(g);
850 <    }
971 >        checkCompletedWithWrappedException(g, ex);
972 >        checkCompletedExceptionally(f, ex);
973 >        assertEquals(1, a.get());
974 >    }}
975  
976      /**
977 <     * thenRun result completes exceptionally if source cancelled
977 >     * whenComplete action executes on cancelled source, propagating
978 >     * CancellationException.
979       */
980 <    public void testThenRun4() {
981 <        CompletableFuture<Integer> f;
982 <        CompletableFuture<Void> g;
983 <        Noop r;
984 <
985 <        f = new CompletableFuture<>();
986 <        g = f.thenRun(r = new Noop());
987 <        assertTrue(f.cancel(true));
988 <        checkCompletedWithWrappedCancellationException(g);
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  
865        f = new CompletableFuture<>();
866        assertTrue(f.cancel(true));
867        g = f.thenRun(r = new Noop());
998          checkCompletedWithWrappedCancellationException(g);
999 <    }
999 >        checkCancelled(f);
1000 >        assertEquals(1, a.get());
1001 >    }}
1002  
1003      /**
1004 <     * thenApply result completes normally after normal completion of source
1004 >     * If a whenComplete action throws an exception when triggered by
1005 >     * a normal completion, it completes exceptionally
1006       */
1007 <    public void testThenApply() {
1008 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1009 <        CompletableFuture<Integer> g = f.thenApply(inc);
1010 <        f.complete(one);
1011 <        checkCompletedNormally(g, two);
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 <    /**
1028 <     * thenApply result completes exceptionally after exceptional
1029 <     * completion of source
1030 <     */
885 <    public void testThenApply2() {
886 <        CompletableFuture<Integer> f = new CompletableFuture<>();
887 <        CompletableFuture<Integer> g = f.thenApply(inc);
888 <        f.completeExceptionally(new CFException());
889 <        checkCompletedWithWrappedCFException(g);
890 <    }
1027 >        checkCompletedWithWrappedException(g, ex);
1028 >        checkCompletedNormally(f, v1);
1029 >        assertEquals(1, a.get());
1030 >    }}
1031  
1032      /**
1033 <     * thenApply result completes exceptionally if action does
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 testThenApply3() {
1038 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1039 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1040 <        f.complete(one);
1041 <        checkCompletedWithWrappedCFException(g);
1042 <    }
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 <    /**
1047 <     * thenApply result completes exceptionally if source cancelled
1048 <     */
1049 <    public void testThenApply4() {
1050 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1051 <        CompletableFuture<Integer> g = f.thenApply(inc);
1052 <        assertTrue(f.cancel(true));
1053 <        checkCompletedWithWrappedCancellationException(g);
1054 <    }
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 <    /**
1059 <     * thenAccept result completes normally after normal completion of source
1060 <     */
1061 <    public void testThenAccept() {
1062 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1063 <        IncAction r = new IncAction();
1064 <        CompletableFuture<Void> g = f.thenAccept(r);
1065 <        f.complete(one);
920 <        checkCompletedNormally(g, null);
921 <        assertEquals(r.value, (Integer) 2);
922 <    }
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 <     * thenAccept result completes exceptionally after exceptional
1068 >     * handle action completes normally with function value on normal
1069       * completion of source
1070       */
1071 <    public void testThenAccept2() {
929 <        CompletableFuture<Integer> f = new CompletableFuture<>();
930 <        IncAction r = new IncAction();
931 <        CompletableFuture<Void> g = f.thenAccept(r);
932 <        f.completeExceptionally(new CFException());
933 <        checkCompletedWithWrappedCFException(g);
934 <    }
935 <
936 <    /**
937 <     * thenAccept result completes exceptionally if action does
938 <     */
939 <    public void testThenAccept3() {
940 <        CompletableFuture<Integer> f = new CompletableFuture<>();
941 <        FailingConsumer r = new FailingConsumer();
942 <        CompletableFuture<Void> g = f.thenAccept(r);
943 <        f.complete(one);
944 <        checkCompletedWithWrappedCFException(g);
945 <        assertEquals(1, r.invocationCount);
946 <    }
947 <
948 <    /**
949 <     * thenAccept result completes exceptionally if source cancelled
950 <     */
951 <    public void testThenAccept4() {
952 <        CompletableFuture<Integer> f = new CompletableFuture<>();
953 <        IncAction r = new IncAction();
954 <        CompletableFuture<Void> g = f.thenAccept(r);
955 <        assertTrue(f.cancel(true));
956 <        checkCompletedWithWrappedCancellationException(g);
957 <    }
958 <
959 <    /**
960 <     * thenCombine result completes normally after normal completion
961 <     * of sources
962 <     */
963 <    public void testThenCombine_normalCompletion1() {
964 <        for (boolean createIncomplete : new boolean[] { true, false })
965 <        for (boolean fFirst : new boolean[] { true, false })
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 <        for (Integer v2 : new Integer[] { 2, null }) {
969 <
1075 >    {
1076          final CompletableFuture<Integer> f = new CompletableFuture<>();
1077 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1078 <        final SubtractFunction r = new SubtractFunction();
1079 <        CompletableFuture<Integer> h = null;
1080 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1081 <
1082 <        if (fFirst)
1083 <            f.complete(v1);
1084 <        else
1085 <            g.complete(v2);
1086 <        if (createIncomplete) checkIncomplete(h);
1087 <        assertEquals(0, r.invocationCount);
1088 <        if (!fFirst)
983 <            f.complete(v1);
984 <        else
985 <            g.complete(v2);
986 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1090 >        checkCompletedNormally(g, inc(v1));
1091          checkCompletedNormally(f, v1);
1092 <        checkCompletedNormally(g, v2);
1093 <        assertEquals(1, r.invocationCount);
992 <        }
993 <    }
1092 >        assertEquals(1, a.get());
1093 >    }}
1094  
1095      /**
1096 <     * thenCombine result completes exceptionally after exceptional
1097 <     * completion of either source
1096 >     * handle action completes normally with function value on
1097 >     * exceptional completion of source
1098       */
1099 <    public void testThenCombine_exceptionalCompletion1() {
1099 >    public void testHandle_exceptionalCompletion() {
1100          for (ExecutionMode m : ExecutionMode.values())
1101 <        for (Integer v1 : new Integer[] { 1, null }) {
1102 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1005 <        final SubtractFunction r = new SubtractFunction();
1006 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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  
1009        f.completeExceptionally(ex);
1010        checkIncomplete(h);
1011        g.complete(v1);
1012
1013        checkCompletedWithWrappedCFException(h, ex);
1014        checkCompletedWithWrappedCFException(f, ex);
1015        assertEquals(0, r.invocationCount);
1119          checkCompletedNormally(g, v1);
1120 <        }
1121 <    }
1120 >        checkCompletedExceptionally(f, ex);
1121 >        assertEquals(1, a.get());
1122 >    }}
1123  
1124 <    public void testThenCombine_exceptionalCompletion2() {
1124 >    /**
1125 >     * handle action completes normally with function value on
1126 >     * cancelled source
1127 >     */
1128 >    public void testHandle_sourceCancelled() {
1129          for (ExecutionMode m : ExecutionMode.values())
1130 <        for (Integer v1 : new Integer[] { 1, null }) {
1131 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1136 <        final SubtractFunction r = new SubtractFunction();
1137 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1138 <        final CFException ex = new CFException();
1139 <
1140 <        g.completeExceptionally(ex);
1141 <        checkIncomplete(h);
1142 <        f.complete(v1);
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 <        checkCompletedWithWrappedCFException(h, ex);
1149 <        checkCompletedWithWrappedCFException(g, ex);
1150 <        assertEquals(0, r.invocationCount);
1151 <        checkCompletedNormally(f, v1);
1038 <        }
1039 <    }
1148 >        checkCompletedNormally(g, v1);
1149 >        checkCancelled(f);
1150 >        assertEquals(1, a.get());
1151 >    }}
1152  
1153 <    public void testThenCombine_exceptionalCompletion3() {
1153 >    /**
1154 >     * If a "handle action" throws an exception when triggered by
1155 >     * a normal completion, it completes exceptionally
1156 >     */
1157 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1158          for (ExecutionMode m : ExecutionMode.values())
1159 <        for (Integer v1 : new Integer[] { 1, null }) {
1160 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1047 <        final SubtractFunction r = new SubtractFunction();
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 <        g.completeExceptionally(ex);
1051 <        f.complete(v1);
1052 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1053 <
1054 <        checkCompletedWithWrappedCFException(h, ex);
1055 <        checkCompletedWithWrappedCFException(g, ex);
1056 <        assertEquals(0, r.invocationCount);
1177 >        checkCompletedWithWrappedException(g, ex);
1178          checkCompletedNormally(f, v1);
1179 <        }
1180 <    }
1179 >        assertEquals(1, a.get());
1180 >    }}
1181  
1182 <    public void testThenCombine_exceptionalCompletion4() {
1182 >    /**
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 <        for (Integer v1 : new Integer[] { 1, null }) {
1191 <
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<>();
1066        final CompletableFuture<Integer> g = new CompletableFuture<>();
1067        final SubtractFunction r = new SubtractFunction();
1068        final CFException ex = new CFException();
1195  
1196 <        f.completeExceptionally(ex);
1197 <        g.complete(v1);
1198 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkCompletedWithWrappedCFException(h, ex);
1209 <        checkCompletedWithWrappedCFException(f, ex);
1210 <        assertEquals(0, r.invocationCount);
1211 <        checkCompletedNormally(g, v1);
1078 <        }
1079 <    }
1208 >        checkCompletedWithWrappedException(g, ex2);
1209 >        checkCompletedExceptionally(f, ex1);
1210 >        assertEquals(1, a.get());
1211 >    }}
1212  
1213      /**
1214 <     * thenCombine result completes exceptionally if action does
1214 >     * runAsync completes after running Runnable
1215       */
1216 <    public void testThenCombine_actionFailed1() {
1217 <        for (ExecutionMode m : ExecutionMode.values())
1218 <        for (Integer v1 : new Integer[] { 1, null })
1219 <        for (Integer v2 : new Integer[] { 2, null }) {
1220 <
1221 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1223 <        final FailingBiFunction r = new FailingBiFunction();
1224 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        f.complete(v1);
1231 <        checkIncomplete(h);
1232 <        g.complete(v2);
1230 >    /**
1231 >     * failing runAsync completes exceptionally after running Runnable
1232 >     */
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 <        checkCompletedWithWrappedCFException(h);
1247 <        checkCompletedNormally(f, v1);
1248 <        checkCompletedNormally(g, v2);
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 <    public void testThenCombine_actionFailed2() {
1259 <        for (ExecutionMode m : ExecutionMode.values())
1258 >    /**
1259 >     * supplyAsync completes with result of supplier
1260 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1269 <
1270 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1111 <        final FailingBiFunction r = new FailingBiFunction();
1112 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1113 <
1114 <        g.complete(v2);
1115 <        checkIncomplete(h);
1116 <        f.complete(v1);
1117 <
1118 <        checkCompletedWithWrappedCFException(h);
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 <        checkCompletedNormally(g, v2);
1274 <        }
1122 <    }
1273 >        r.assertInvoked();
1274 >    }}
1275  
1276      /**
1277 <     * thenCombine result completes exceptionally if either source cancelled
1277 >     * Failing supplyAsync completes exceptionally
1278       */
1279 <    public void testThenCombine_sourceCancelled1() {
1280 <        for (ExecutionMode m : ExecutionMode.values())
1281 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1282 <        for (Integer v1 : new Integer[] { 1, null }) {
1283 <
1284 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1285 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1286 <        final SubtractFunction r = new SubtractFunction();
1287 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1288 <
1289 <        assertTrue(f.cancel(mayInterruptIfRunning));
1290 <        checkIncomplete(h);
1139 <        g.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
1293 <        checkCancelled(f);
1294 <        assertEquals(0, r.invocationCount);
1295 <        checkCompletedNormally(g, v1);
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 <    public void testThenCombine_sourceCancelled2() {
1149 <        for (ExecutionMode m : ExecutionMode.values())
1150 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1151 <        for (Integer v1 : new Integer[] { 1, null }) {
1304 >    // seq completion methods
1305  
1306 +    /**
1307 +     * thenRun result completes normally after normal completion of source
1308 +     */
1309 +    public void testThenRun_normalCompletion() {
1310 +        for (ExecutionMode m : ExecutionMode.values())
1311 +        for (Integer v1 : new Integer[] { 1, null })
1312 +    {
1313          final CompletableFuture<Integer> f = new CompletableFuture<>();
1314 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1315 <        final SubtractFunction r = new SubtractFunction();
1156 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1157 <
1158 <        assertTrue(g.cancel(mayInterruptIfRunning));
1159 <        checkIncomplete(h);
1160 <        f.complete(v1);
1314 >        final Noop[] rs = new Noop[6];
1315 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1316  
1317 <        checkCompletedWithWrappedCancellationException(h);
1318 <        checkCancelled(g);
1319 <        assertEquals(0, r.invocationCount);
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 <        }
1336 <    }
1335 >        for (Noop r : rs) r.assertInvoked();
1336 >    }}
1337  
1338 <    public void testThenCombine_sourceCancelled3() {
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 (boolean mayInterruptIfRunning : new boolean[] { true, false })
1345 <        for (Integer v1 : new Integer[] { 1, null }) {
1173 <
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();
1347 >        final Noop[] rs = new Noop[6];
1348 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1349  
1350 <        assertTrue(g.cancel(mayInterruptIfRunning));
1351 <        f.complete(v1);
1352 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkCompletedWithWrappedCancellationException(h);
1372 <        checkCancelled(g);
1373 <        assertEquals(0, r.invocationCount);
1374 <        checkCompletedNormally(f, v1);
1186 <        }
1187 <    }
1188 <
1189 <    public void testThenCombine_sourceCancelled4() {
1371 >    /**
1372 >     * thenRun result completes exceptionally if source cancelled
1373 >     */
1374 >    public void testThenRun_sourceCancelled() {
1375          for (ExecutionMode m : ExecutionMode.values())
1376          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1377 <        for (Integer v1 : new Integer[] { 1, null }) {
1193 <
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 +        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 <        g.complete(v1);
1390 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1391 <
1392 <        checkCompletedWithWrappedCancellationException(h);
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 <        assertEquals(0, r.invocationCount);
1401 <        checkCompletedNormally(g, v1);
1206 <        }
1207 <    }
1400 >        for (Noop r : rs) r.assertNotInvoked();
1401 >    }}
1402  
1403      /**
1404 <     * thenAcceptBoth result completes normally after normal
1211 <     * completion of sources
1404 >     * thenRun result completes exceptionally if action does
1405       */
1406 <    public void testThenAcceptBoth_normalCompletion1() {
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 }) {
1217 <
1409 >    {
1410          final CompletableFuture<Integer> f = new CompletableFuture<>();
1411 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1412 <        final SubtractAction r = new SubtractAction();
1221 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1222 <
1223 <        f.complete(v1);
1224 <        checkIncomplete(h);
1225 <        assertEquals(0, r.invocationCount);
1226 <        g.complete(v2);
1411 >        final FailingRunnable[] rs = new FailingRunnable[6];
1412 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1413  
1414 <        checkCompletedNormally(h, null);
1415 <        assertEquals(r.value, 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);
1232 <        }
1233 <    }
1234 <
1235 <    public void testThenAcceptBoth_normalCompletion2() {
1236 <        for (ExecutionMode m : ExecutionMode.values())
1237 <        for (Integer v1 : new Integer[] { 1, null })
1238 <        for (Integer v2 : new Integer[] { 2, null }) {
1239 <
1240 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1241 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1242 <        final SubtractAction r = new SubtractAction();
1243 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1244 <
1245 <        g.complete(v2);
1246 <        checkIncomplete(h);
1247 <        assertEquals(0, r.invocationCount);
1248 <        f.complete(v1);
1249 <
1250 <        checkCompletedNormally(h, null);
1251 <        assertEquals(r.value, subtract(v1, v2));
1252 <        checkCompletedNormally(f, v1);
1253 <        checkCompletedNormally(g, v2);
1254 <        }
1255 <    }
1429 >    }}
1430  
1431 <    public void testThenAcceptBoth_normalCompletion3() {
1432 <        for (ExecutionMode m : ExecutionMode.values())
1433 <        for (Integer v1 : new Integer[] { 1, null })
1434 <        for (Integer v2 : new Integer[] { 2, null }) {
1261 <
1262 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1263 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1264 <        final SubtractAction r = new SubtractAction();
1265 <
1266 <        g.complete(v2);
1267 <        f.complete(v1);
1268 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1269 <
1270 <        checkCompletedNormally(h, null);
1271 <        assertEquals(r.value, subtract(v1, v2));
1272 <        checkCompletedNormally(f, v1);
1273 <        checkCompletedNormally(g, v2);
1274 <        }
1275 <    }
1276 <
1277 <    public void testThenAcceptBoth_normalCompletion4() {
1431 >    /**
1432 >     * thenApply result completes normally after normal completion of source
1433 >     */
1434 >    public void testThenApply_normalCompletion() {
1435          for (ExecutionMode m : ExecutionMode.values())
1436          for (Integer v1 : new Integer[] { 1, null })
1437 <        for (Integer v2 : new Integer[] { 2, null }) {
1281 <
1437 >    {
1438          final CompletableFuture<Integer> f = new CompletableFuture<>();
1439 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1440 <        final SubtractAction r = new SubtractAction();
1439 >        final IncFunction[] rs = new IncFunction[4];
1440 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1441  
1442 <        f.complete(v1);
1443 <        g.complete(v2);
1444 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1445 <
1446 <        checkCompletedNormally(h, null);
1447 <        assertEquals(r.value, subtract(v1, v2));
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 <        checkCompletedNormally(g, v2);
1456 <        }
1295 <    }
1455 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1456 >    }}
1457  
1458      /**
1459 <     * thenAcceptBoth result completes exceptionally after exceptional
1460 <     * completion of either source
1459 >     * thenApply result completes exceptionally after exceptional
1460 >     * completion of source
1461       */
1462 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1462 >    public void testThenApply_exceptionalCompletion() {
1463          for (ExecutionMode m : ExecutionMode.values())
1464 <        for (Integer v1 : new Integer[] { 1, null }) {
1304 <
1305 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1306 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1307 <        final SubtractAction r = new SubtractAction();
1308 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1464 >    {
1465          final CFException ex = new CFException();
1310
1311        f.completeExceptionally(ex);
1312        checkIncomplete(h);
1313        g.complete(v1);
1314
1315        checkCompletedWithWrappedCFException(h, ex);
1316        checkCompletedWithWrappedCFException(f, ex);
1317        assertEquals(0, r.invocationCount);
1318        checkCompletedNormally(g, v1);
1319        }
1320    }
1321
1322    public void testThenAcceptBoth_exceptionalCompletion2() {
1323        for (ExecutionMode m : ExecutionMode.values())
1324        for (Integer v1 : new Integer[] { 1, null }) {
1325
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1468 <        final SubtractAction r = new SubtractAction();
1329 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1330 <        final CFException ex = new CFException();
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 <        checkIncomplete(h);
1472 <        f.complete(v1);
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 <        checkCompletedWithWrappedCFException(h, ex);
1485 <        checkCompletedWithWrappedCFException(g, ex);
1486 <        assertEquals(0, r.invocationCount);
1487 <        checkCompletedNormally(f, v1);
1340 <        }
1341 <    }
1342 <
1343 <    public void testThenAcceptBoth_exceptionalCompletion3() {
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 SubtractAction r = new SubtractAction();
1350 <        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 <        g.completeExceptionally(ex);
1496 <        f.complete(v1);
1497 <        final CompletableFuture<Void> h = m.thenAcceptBoth(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(g, ex);
1503 <        assertEquals(0, r.invocationCount);
1504 <        checkCompletedNormally(f, 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 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1509 >    /**
1510 >     * thenApply result completes exceptionally if action does
1511 >     */
1512 >    public void testThenApply_actionFailed() {
1513          for (ExecutionMode m : ExecutionMode.values())
1514 <        for (Integer v1 : new Integer[] { 1, null }) {
1515 <
1514 >        for (Integer v1 : new Integer[] { 1, null })
1515 >    {
1516          final CompletableFuture<Integer> f = new CompletableFuture<>();
1517 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1518 <        final SubtractAction r = new SubtractAction();
1370 <        final CFException ex = new CFException();
1371 <
1372 <        f.completeExceptionally(ex);
1373 <        g.complete(v1);
1374 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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, ex);
1521 <        checkCompletedWithWrappedCFException(f, ex);
1522 <        assertEquals(0, r.invocationCount);
1523 <        checkCompletedNormally(g, v1);
1524 <        }
1525 <    }
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 >    }}
1532  
1533      /**
1534 <     * thenAcceptBoth result completes exceptionally if action does
1534 >     * thenAccept result completes normally after normal completion of source
1535       */
1536 <    public void testThenAcceptBoth_actionFailed1() {
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 }) {
1390 <
1539 >    {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1542 <        final FailingBiConsumer r = new FailingBiConsumer();
1394 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1541 >        final NoopConsumer[] rs = new NoopConsumer[4];
1542 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1543  
1544 <        f.complete(v1);
1545 <        checkIncomplete(h);
1546 <        g.complete(v2);
1547 <
1548 <        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 <        }
1404 <    }
1557 >        for (NoopConsumer r : rs) r.assertValue(v1);
1558 >    }}
1559  
1560 <    public void testThenAcceptBoth_actionFailed2() {
1560 >    /**
1561 >     * thenAccept result completes exceptionally after exceptional
1562 >     * completion of source
1563 >     */
1564 >    public void testThenAccept_exceptionalCompletion() {
1565          for (ExecutionMode m : ExecutionMode.values())
1566 <        for (Integer v1 : new Integer[] { 1, null })
1567 <        for (Integer v2 : new Integer[] { 2, null }) {
1410 <
1566 >    {
1567 >        final CFException ex = new CFException();
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1570 <        final FailingBiConsumer r = new FailingBiConsumer();
1414 <        final CompletableFuture<Void> h = m.thenAcceptBoth(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 <        g.complete(v2);
1573 <        checkIncomplete(h);
1574 <        f.complete(v1);
1575 <
1576 <        checkCompletedWithWrappedCFException(h);
1577 <        checkCompletedNormally(f, v1);
1578 <        checkCompletedNormally(g, v2);
1579 <        }
1580 <    }
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      /**
1587 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1587 >     * thenAccept result completes exceptionally if source cancelled
1588       */
1589 <    public void testThenAcceptBoth_sourceCancelled1() {
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 }) {
1433 <
1592 >    {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1595 <        final SubtractAction r = new SubtractAction();
1437 <        final CompletableFuture<Void> h = m.thenAcceptBoth(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 +        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 <        checkIncomplete(h);
1601 <        g.complete(v1);
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);
1603 >        checkCompletedWithWrappedCancellationException(h0);
1604 >        checkCompletedWithWrappedCancellationException(h1);
1605 >        checkCompletedWithWrappedCancellationException(h2);
1606 >        checkCompletedWithWrappedCancellationException(h3);
1607          checkCancelled(f);
1608 <        assertEquals(0, r.invocationCount);
1609 <        checkCompletedNormally(g, v1);
1447 <        }
1448 <    }
1608 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1609 >    }}
1610  
1611 <    public void testThenAcceptBoth_sourceCancelled2() {
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 }) {
1454 <
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 SubtractAction r = new SubtractAction();
1458 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        checkIncomplete(h);
1624 <        f.complete(v1);
1625 <
1626 <        checkCompletedWithWrappedCancellationException(h);
1627 <        checkCancelled(g);
1628 <        assertEquals(0, r.invocationCount);
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 <        }
1469 <    }
1633 >    }}
1634  
1635 <    public void testThenAcceptBoth_sourceCancelled3() {
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 SubtractAction r = new SubtractAction();
1647 >        final SubtractFunction[] rs = new SubtractFunction[6];
1648 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1649  
1650 <        assertTrue(g.cancel(mayInterruptIfRunning));
1651 <        f.complete(v1);
1652 <        final CompletableFuture<Void> h = m.thenAcceptBoth(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  
1484        checkCompletedWithWrappedCancellationException(h);
1485        checkCancelled(g);
1486        assertEquals(0, r.invocationCount);
1676          checkCompletedNormally(f, v1);
1677 <        }
1678 <    }
1490 <
1491 <    public void testThenAcceptBoth_sourceCancelled4() {
1492 <        for (ExecutionMode m : ExecutionMode.values())
1493 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1494 <        for (Integer v1 : new Integer[] { 1, null }) {
1495 <
1496 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1497 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1498 <        final SubtractAction r = new SubtractAction();
1499 <
1500 <        assertTrue(f.cancel(mayInterruptIfRunning));
1501 <        g.complete(v1);
1502 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1503 <
1504 <        checkCompletedWithWrappedCancellationException(h);
1505 <        checkCancelled(f);
1506 <        assertEquals(0, r.invocationCount);
1507 <        checkCompletedNormally(g, v1);
1508 <        }
1509 <    }
1677 >        checkCompletedNormally(g, v2);
1678 >    }}
1679  
1680      /**
1681 <     * runAfterBoth 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 testRunAfterBoth_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 }) {
1519 <
1689 >    {
1690          final CompletableFuture<Integer> f = new CompletableFuture<>();
1691          final CompletableFuture<Integer> g = new CompletableFuture<>();
1692 <        final Noop r = new Noop();
1693 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1694 <
1695 <        f.complete(v1);
1696 <        checkIncomplete(h);
1697 <        assertEquals(0, r.invocationCount);
1698 <        g.complete(v2);
1699 <
1700 <        checkCompletedNormally(h, null);
1701 <        assertEquals(1, r.invocationCount);
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 testRunAfterBoth_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 }) {
1541 <
1733 >    {
1734          final CompletableFuture<Integer> f = new CompletableFuture<>();
1735          final CompletableFuture<Integer> g = new CompletableFuture<>();
1736 <        final Noop r = new Noop();
1737 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1738 <
1739 <        g.complete(v2);
1740 <        checkIncomplete(h);
1741 <        assertEquals(0, r.invocationCount);
1742 <        f.complete(v1);
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 <        checkCompletedNormally(h, null);
1768 <        assertEquals(1, r.invocationCount);
1769 <        checkCompletedNormally(f, v1);
1770 <        checkCompletedNormally(g, v2);
1556 <        }
1557 <    }
1558 <
1559 <    public void testRunAfterBoth_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 Noop r = new Noop();
1779 <
1780 <        g.complete(v2);
1781 <        f.complete(v1);
1782 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1783 <
1784 <        checkCompletedNormally(h, null);
1785 <        assertEquals(1, r.invocationCount);
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 <        }
1577 <    }
1801 >    }}
1802  
1803 <    public void testRunAfterBoth_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 Noop r = new Noop();
1816 <
1817 <        f.complete(v1);
1818 <        g.complete(v2);
1819 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1820 <
1821 <        checkCompletedNormally(h, null);
1822 <        assertEquals(1, r.invocationCount);
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 <        }
1597 <    }
1842 >    }}
1843  
1844      /**
1845 <     * runAfterBoth result completes exceptionally after exceptional
1845 >     * thenAcceptBoth result completes exceptionally after exceptional
1846       * completion of either source
1847       */
1848 <    public void testRunAfterBoth_exceptionalCompletion1() {
1604 <        for (ExecutionMode m : ExecutionMode.values())
1605 <        for (Integer v1 : new Integer[] { 1, null }) {
1606 <
1607 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1608 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1609 <        final Noop r = new Noop();
1610 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1611 <        final CFException ex = new CFException();
1612 <
1613 <        f.completeExceptionally(ex);
1614 <        checkIncomplete(h);
1615 <        g.complete(v1);
1616 <
1617 <        checkCompletedWithWrappedCFException(h, ex);
1618 <        checkCompletedWithWrappedCFException(f, ex);
1619 <        assertEquals(0, r.invocationCount);
1620 <        checkCompletedNormally(g, v1);
1621 <        }
1622 <    }
1623 <
1624 <    public void testRunAfterBoth_exceptionalCompletion2() {
1848 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1849          for (ExecutionMode m : ExecutionMode.values())
1850 <        for (Integer v1 : new Integer[] { 1, null }) {
1851 <
1852 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1853 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1630 <        final Noop r = new Noop();
1631 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1632 <        final CFException ex = new CFException();
1633 <
1634 <        g.completeExceptionally(ex);
1635 <        checkIncomplete(h);
1636 <        f.complete(v1);
1637 <
1638 <        checkCompletedWithWrappedCFException(h, ex);
1639 <        checkCompletedWithWrappedCFException(g, ex);
1640 <        assertEquals(0, r.invocationCount);
1641 <        checkCompletedNormally(f, v1);
1642 <        }
1643 <    }
1644 <
1645 <    public void testRunAfterBoth_exceptionalCompletion3() {
1646 <        for (ExecutionMode m : ExecutionMode.values())
1647 <        for (Integer v1 : new Integer[] { 1, null }) {
1648 <
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<>();
1651        final Noop r = new Noop();
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 <        g.completeExceptionally(ex);
1889 <        f.complete(v1);
1890 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1891 <
1658 <        checkCompletedWithWrappedCFException(h, ex);
1659 <        checkCompletedWithWrappedCFException(g, ex);
1660 <        assertEquals(0, r.invocationCount);
1661 <        checkCompletedNormally(f, v1);
1662 <        }
1663 <    }
1664 <
1665 <    public void testRunAfterBoth_exceptionalCompletion4() {
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 Noop r = new Noop();
1901 <        final CFException ex = new CFException();
1902 <
1903 <        f.completeExceptionally(ex);
1904 <        g.complete(v1);
1905 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1906 <
1907 <        checkCompletedWithWrappedCFException(h, ex);
1908 <        checkCompletedWithWrappedCFException(f, ex);
1909 <        assertEquals(0, r.invocationCount);
1910 <        checkCompletedNormally(g, v1);
1911 <        }
1912 <    }
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      /**
1932 <     * runAfterBoth result completes exceptionally if action does
1932 >     * thenAcceptBoth result completes exceptionally if action does
1933       */
1934 <    public void testRunAfterBoth_actionFailed1() {
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 <
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 FailingNoop r = new FailingNoop();
1943 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1944 <
1945 <        f.complete(v1);
1946 <        checkIncomplete(h);
1947 <        g.complete(v2);
1948 <
1949 <        checkCompletedWithWrappedCFException(h);
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          checkCompletedNormally(g, v2);
1965 <        }
1706 <    }
1965 >    }}
1966  
1967 <    public void testRunAfterBoth_actionFailed2() {
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 (boolean fFirst : new boolean[] { true, false })
1974          for (Integer v1 : new Integer[] { 1, null })
1975 <        for (Integer v2 : new Integer[] { 2, null }) {
1976 <
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 FailingNoop r = new FailingNoop();
1980 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1981 <
1982 <        g.complete(v2);
1983 <        checkIncomplete(h);
1984 <        f.complete(v1);
1985 <
1986 <        checkCompletedWithWrappedCFException(h);
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          checkCompletedNormally(g, v2);
2006 <        }
1726 <    }
2006 >    }}
2007  
2008      /**
2009 <     * runAfterBoth result completes exceptionally if either source cancelled
2009 >     * runAfterBoth result completes exceptionally after exceptional
2010 >     * completion of either source
2011       */
2012 <    public void testRunAfterBoth_sourceCancelled1() {
1732 <        for (ExecutionMode m : ExecutionMode.values())
1733 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1734 <        for (Integer v1 : new Integer[] { 1, null }) {
1735 <
1736 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1737 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1738 <        final Noop r = new Noop();
1739 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1740 <
1741 <        assertTrue(f.cancel(mayInterruptIfRunning));
1742 <        checkIncomplete(h);
1743 <        g.complete(v1);
1744 <
1745 <        checkCompletedWithWrappedCancellationException(h);
1746 <        checkCancelled(f);
1747 <        assertEquals(0, r.invocationCount);
1748 <        checkCompletedNormally(g, v1);
1749 <        }
1750 <    }
1751 <
1752 <    public void testRunAfterBoth_sourceCancelled2() {
1753 <        for (ExecutionMode m : ExecutionMode.values())
1754 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1755 <        for (Integer v1 : new Integer[] { 1, null }) {
1756 <
1757 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1758 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1759 <        final Noop r = new Noop();
1760 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761 <
1762 <        assertTrue(g.cancel(mayInterruptIfRunning));
1763 <        checkIncomplete(h);
1764 <        f.complete(v1);
1765 <
1766 <        checkCompletedWithWrappedCancellationException(h);
1767 <        checkCancelled(g);
1768 <        assertEquals(0, r.invocationCount);
1769 <        checkCompletedNormally(f, v1);
1770 <        }
1771 <    }
1772 <
1773 <    public void testRunAfterBoth_sourceCancelled3() {
2012 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2013          for (ExecutionMode m : ExecutionMode.values())
2014 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2015 <        for (Integer v1 : new Integer[] { 1, null }) {
2016 <
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<>();
2020 <        final Noop r = new Noop();
2021 <
2022 <        assertTrue(g.cancel(mayInterruptIfRunning));
2023 <        f.complete(v1);
2024 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2025 <
2026 <        checkCompletedWithWrappedCancellationException(h);
2027 <        checkCancelled(g);
2028 <        assertEquals(0, r.invocationCount);
2029 <        checkCompletedNormally(f, v1);
2030 <        }
2031 <    }
2020 >        final CFException ex = new CFException();
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 <    public void testRunAfterBoth_sourceCancelled4() {
2052 >    /**
2053 >     * runAfterBoth result completes exceptionally if either source cancelled
2054 >     */
2055 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2056          for (ExecutionMode m : ExecutionMode.values())
2057          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2058 <        for (Integer v1 : new Integer[] { 1, null }) {
2059 <
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 >    {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final Noop r = new Noop();
2065 <
2066 <        assertTrue(f.cancel(mayInterruptIfRunning));
2067 <        g.complete(v1);
2068 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2069 <
2070 <        checkCompletedWithWrappedCancellationException(h);
2071 <        checkCancelled(f);
2072 <        assertEquals(0, r.invocationCount);
2073 <        checkCompletedNormally(g, v1);
2074 <        }
2075 <    }
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      /**
2096 <     * applyToEither result completes normally after normal completion
1815 <     * of either source
2096 >     * runAfterBoth result completes exceptionally if action does
2097       */
2098 <    public void testApplyToEither_normalCompletion1() {
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 <
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 IncFunction r = new IncFunction();
2107 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2108 <
2109 <        f.complete(v1);
2110 <        checkCompletedNormally(h, inc(v1));
2111 <        g.complete(v2);
2112 <
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 <        checkCompletedNormally(h, inc(v1));
1834 <        }
1835 <    }
2129 >    }}
2130  
2131 <    public void testApplyToEither_normalCompletion2() {
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 IncFunction r = new IncFunction();
2143 <        final CompletableFuture<Integer> h = m.applyToEither(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 +        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);
1848        checkCompletedNormally(h, inc(v2));
1849        f.complete(v1);
2159  
2160 <        checkCompletedNormally(f, v1);
2161 <        checkCompletedNormally(g, v2);
2162 <        checkCompletedNormally(h, inc(v2));
2163 <        }
2164 <    }
2165 <    public void testApplyToEither_normalCompletion3() {
2166 <        for (ExecutionMode m : ExecutionMode.values())
2167 <        for (Integer v1 : new Integer[] { 1, null })
2168 <        for (Integer v2 : new Integer[] { 2, null }) {
1860 <
1861 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1862 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1863 <        final IncFunction r = new IncFunction();
1864 <
1865 <        f.complete(v1);
1866 <        g.complete(v2);
1867 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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  
2170          checkCompletedNormally(f, v1);
2171          checkCompletedNormally(g, v2);
2172 <
2173 <        // unspecified behavior
2174 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2175 <                   Objects.equals(h.join(), inc(v2)));
2176 <        assertEquals(1, r.invocationCount);
2177 <        }
1877 <    }
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       * applyToEither result completes exceptionally after exceptional
2181       * completion of either source
2182       */
2183 <    public void testApplyToEither_exceptionalCompletion1() {
2183 >    public void testApplyToEither_exceptionalCompletion() {
2184          for (ExecutionMode m : ExecutionMode.values())
2185 <        for (Integer v1 : new Integer[] { 1, null }) {
2186 <
2185 >        for (Integer v1 : new Integer[] { 1, null })
2186 >    {
2187          final CompletableFuture<Integer> f = new CompletableFuture<>();
2188          final CompletableFuture<Integer> g = new CompletableFuture<>();
1889        final IncFunction r = new IncFunction();
1890        final CompletableFuture<Integer> h = m.applyToEither(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 +        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 <        checkCompletedWithWrappedCFException(h, 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 <        assertEquals(0, r.invocationCount);
2209 <        checkCompletedNormally(g, v1);
2210 <        checkCompletedWithWrappedCFException(f, ex);
2211 <        checkCompletedWithWrappedCFException(h, ex);
2212 <        }
2213 <    }
2214 <
2215 <    public void testApplyToEither_exceptionalCompletion2() {
2216 <        for (ExecutionMode m : ExecutionMode.values())
1906 <        for (Integer v1 : new Integer[] { 1, null }) {
1907 <
1908 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1909 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1910 <        final IncFunction r = new IncFunction();
1911 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1912 <        final CFException ex = new CFException();
1913 <
1914 <        g.completeExceptionally(ex);
1915 <        checkCompletedWithWrappedCFException(h, ex);
1916 <        f.complete(v1);
1917 <
1918 <        assertEquals(0, r.invocationCount);
1919 <        checkCompletedNormally(f, v1);
1920 <        checkCompletedWithWrappedCFException(g, ex);
1921 <        checkCompletedWithWrappedCFException(h, ex);
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          }
1923    }
1924
1925    public void testApplyToEither_exceptionalCompletion3() {
1926        for (ExecutionMode m : ExecutionMode.values())
1927        for (Integer v1 : new Integer[] { 1, null }) {
1928
1929        final CompletableFuture<Integer> f = new CompletableFuture<>();
1930        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931        final IncFunction r = new IncFunction();
1932        final CFException ex = new CFException();
1933
1934        g.completeExceptionally(ex);
1935        f.complete(v1);
1936        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1937
1938        // unspecified behavior
1939        Integer v;
2218          try {
2219 <            assertEquals(h.join(), inc(v1));
2220 <            assertEquals(1, r.invocationCount);
2219 >            assertEquals(inc(v1), h5.join());
2220 >            rs[5].assertValue(inc(v1));
2221          } catch (CompletionException ok) {
2222 <            checkCompletedWithWrappedCFException(h, ex);
2223 <            assertEquals(0, r.invocationCount);
2222 >            checkCompletedWithWrappedException(h5, ex);
2223 >            rs[5].assertNotInvoked();
2224          }
2225  
2226 <        checkCompletedWithWrappedCFException(g, ex);
2227 <        checkCompletedNormally(f, v1);
2228 <        }
2229 <    }
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_exceptionalCompletion4() {
2236 >    public void testApplyToEither_exceptionalCompletion2() {
2237          for (ExecutionMode m : ExecutionMode.values())
2238 <        for (Integer v1 : new Integer[] { 1, null }) {
2239 <
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<>();
1959        final IncFunction r = new IncFunction();
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 <        f.completeExceptionally(ex);
2248 <        g.complete(v1);
2249 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        // unspecified behavior
1967 <        Integer v;
2254 >        // unspecified behavior - both source completions available
2255          try {
2256 <            assertEquals(h.join(), inc(v1));
2257 <            assertEquals(1, r.invocationCount);
2256 >            assertEquals(inc(v1), h0.join());
2257 >            rs[0].assertValue(inc(v1));
2258          } catch (CompletionException ok) {
2259 <            checkCompletedWithWrappedCFException(h, ex);
2260 <            assertEquals(0, r.invocationCount);
2259 >            checkCompletedWithWrappedException(h0, ex);
2260 >            rs[0].assertNotInvoked();
2261          }
2262 <
2263 <        checkCompletedWithWrappedCFException(f, ex);
2264 <        checkCompletedNormally(g, v1);
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 <    }
2270 <
2271 <    /**
2272 <     * applyToEither result completes exceptionally if action does
2273 <     */
2274 <    public void testApplyToEither_actionFailed1() {
2275 <        for (ExecutionMode m : ExecutionMode.values())
2276 <        for (Integer v1 : new Integer[] { 1, null })
2277 <        for (Integer v2 : new Integer[] { 2, null }) {
2278 <
2279 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2280 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2281 <        final FailingFunction r = new FailingFunction();
1992 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1993 <
1994 <        f.complete(v1);
1995 <        checkCompletedWithWrappedCFException(h);
1996 <        g.complete(v2);
1997 <        checkCompletedNormally(f, v1);
1998 <        checkCompletedNormally(g, v2);
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          }
2000    }
2001
2002    public void testApplyToEither_actionFailed2() {
2003        for (ExecutionMode m : ExecutionMode.values())
2004        for (Integer v1 : new Integer[] { 1, null })
2005        for (Integer v2 : new Integer[] { 2, null }) {
2006
2007        final CompletableFuture<Integer> f = new CompletableFuture<>();
2008        final CompletableFuture<Integer> g = new CompletableFuture<>();
2009        final FailingFunction r = new FailingFunction();
2010        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2283  
2012        g.complete(v2);
2013        checkCompletedWithWrappedCFException(h);
2014        f.complete(v1);
2284          checkCompletedNormally(f, v1);
2285 <        checkCompletedNormally(g, v2);
2286 <        }
2018 <    }
2285 >        checkCompletedExceptionally(g, ex);
2286 >    }}
2287  
2288      /**
2289       * applyToEither result completes exceptionally if either source cancelled
2290       */
2291 <    public void testApplyToEither_sourceCancelled1() {
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 IncFunction r = new IncFunction();
2299 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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));
2302 <        checkCompletedWithWrappedCancellationException(h);
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);
2315  
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);
2038        assertEquals(0, r.invocationCount);
2335          checkCompletedNormally(g, v1);
2336 <        checkCompletedWithWrappedCancellationException(h);
2337 <        }
2338 <    }
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      public void testApplyToEither_sourceCancelled2() {
2344          for (ExecutionMode m : ExecutionMode.values())
2345          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2346 <        for (Integer v1 : new Integer[] { 1, null }) {
2347 <
2346 >        for (boolean fFirst : new boolean[] { true, false })
2347 >        for (Integer v1 : new Integer[] { 1, null })
2348 >    {
2349          final CompletableFuture<Integer> f = new CompletableFuture<>();
2350          final CompletableFuture<Integer> g = new CompletableFuture<>();
2351 <        final IncFunction r = new IncFunction();
2352 <        final CompletableFuture<Integer> h = m.applyToEither(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 <        assertTrue(g.cancel(mayInterruptIfRunning));
2355 <        checkCompletedWithWrappedCancellationException(h);
2356 <        f.complete(v1);
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 <        checkCancelled(g);
2362 <        assertEquals(0, r.invocationCount);
2363 <        checkCompletedNormally(f, v1);
2364 <        checkCompletedWithWrappedCancellationException(h);
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          }
2063    }
2064
2065    public void testApplyToEither_sourceCancelled3() {
2066        for (ExecutionMode m : ExecutionMode.values())
2067        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2068        for (Integer v1 : new Integer[] { 1, null }) {
2069
2070        final CompletableFuture<Integer> f = new CompletableFuture<>();
2071        final CompletableFuture<Integer> g = new CompletableFuture<>();
2072        final IncFunction r = new IncFunction();
2073
2074        assertTrue(g.cancel(mayInterruptIfRunning));
2075        f.complete(v1);
2076        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2077
2078        // unspecified behavior
2079        Integer v;
2369          try {
2370 <            assertEquals(h.join(), inc(v1));
2371 <            assertEquals(1, r.invocationCount);
2370 >            assertEquals(inc(v1), h1.join());
2371 >            rs[1].assertValue(inc(v1));
2372          } catch (CompletionException ok) {
2373 <            checkCompletedWithWrappedCancellationException(h);
2374 <            assertEquals(0, r.invocationCount);
2373 >            checkCompletedWithWrappedCancellationException(h1);
2374 >            rs[1].assertNotInvoked();
2375          }
2376 <
2377 <        checkCancelled(g);
2378 <        checkCompletedNormally(f, v1);
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          }
2091    }
2092
2093    public void testApplyToEither_sourceCancelled4() {
2094        for (ExecutionMode m : ExecutionMode.values())
2095        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2096        for (Integer v1 : new Integer[] { 1, null }) {
2097
2098        final CompletableFuture<Integer> f = new CompletableFuture<>();
2099        final CompletableFuture<Integer> g = new CompletableFuture<>();
2100        final IncFunction r = new IncFunction();
2101
2102        assertTrue(f.cancel(mayInterruptIfRunning));
2103        g.complete(v1);
2104        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2105
2106        // unspecified behavior
2107        Integer v;
2383          try {
2384 <            assertEquals(h.join(), inc(v1));
2385 <            assertEquals(1, r.invocationCount);
2384 >            assertEquals(inc(v1), h3.join());
2385 >            rs[3].assertValue(inc(v1));
2386          } catch (CompletionException ok) {
2387 <            checkCompletedWithWrappedCancellationException(h);
2388 <            assertEquals(0, r.invocationCount);
2387 >            checkCompletedWithWrappedCancellationException(h3);
2388 >            rs[3].assertNotInvoked();
2389          }
2390  
2391 <        checkCancelled(f);
2392 <        checkCompletedNormally(g, v1);
2393 <        }
2119 <    }
2391 >        checkCompletedNormally(f, v1);
2392 >        checkCancelled(g);
2393 >    }}
2394  
2395      /**
2396 <     * acceptEither result completes normally after normal completion
2123 <     * of either source
2396 >     * applyToEither result completes exceptionally if action does
2397       */
2398 <    public void testAcceptEither_normalCompletion1() {
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 IncAction r = new IncAction();
2406 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2405 >        final FailingFunction[] rs = new FailingFunction[6];
2406 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2407 >
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<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  
2135        f.complete(v1);
2136        checkCompletedNormally(h, null);
2137        assertEquals(r.value, inc(v1));
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 +
2432          checkCompletedNormally(f, v1);
2433          checkCompletedNormally(g, v2);
2434 <        checkCompletedNormally(h, null);
2143 <        }
2144 <    }
2434 >    }}
2435  
2436 <    public void testAcceptEither_normalCompletion2() {
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 IncAction r = new IncAction();
2448 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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);
2157        checkCompletedNormally(h, null);
2158        assertEquals(r.value, inc(v2));
2159        f.complete(v1);
2160
2161        checkCompletedNormally(f, v1);
2162        checkCompletedNormally(g, v2);
2163        checkCompletedNormally(h, null);
2164        }
2165    }
2166    public void testAcceptEither_normalCompletion3() {
2167        for (ExecutionMode m : ExecutionMode.values())
2168        for (Integer v1 : new Integer[] { 1, null })
2169        for (Integer v2 : new Integer[] { 2, null }) {
2170
2171        final CompletableFuture<Integer> f = new CompletableFuture<>();
2172        final CompletableFuture<Integer> g = new CompletableFuture<>();
2173        final IncAction r = new IncAction();
2468  
2469 <        f.complete(v1);
2470 <        g.complete(v2);
2471 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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  
2179        checkCompletedNormally(h, null);
2479          checkCompletedNormally(f, v1);
2480          checkCompletedNormally(g, v2);
2481 <
2482 <        // unspecified behavior
2483 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2484 <                   Objects.equals(r.value, inc(v2)));
2485 <        }
2486 <    }
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       * acceptEither result completes exceptionally after exceptional
2490       * completion of either source
2491       */
2492 <    public void testAcceptEither_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<>();
2199        final IncAction r = new IncAction();
2200        final CompletableFuture<Void> h = m.acceptEither(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 <        checkCompletedWithWrappedCFException(h, ex);
2510 <        g.complete(v1);
2511 <
2512 <        assertEquals(0, r.invocationCount);
2513 <        checkCompletedNormally(g, v1);
2514 <        checkCompletedWithWrappedCFException(f, ex);
2210 <        checkCompletedWithWrappedCFException(h, ex);
2211 <        }
2212 <    }
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 <    public void testAcceptEither_exceptionalCompletion2() {
2215 <        for (ExecutionMode m : ExecutionMode.values())
2216 <        for (Integer v1 : new Integer[] { 1, null }) {
2217 <
2218 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2219 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2220 <        final IncAction r = new IncAction();
2221 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2222 <        final CFException ex = new CFException();
2223 <
2224 <        g.completeExceptionally(ex);
2225 <        checkCompletedWithWrappedCFException(h, ex);
2226 <        f.complete(v1);
2516 >        g.complete(v1);
2517  
2518 <        assertEquals(0, r.invocationCount);
2519 <        checkCompletedNormally(f, v1);
2520 <        checkCompletedWithWrappedCFException(g, ex);
2521 <        checkCompletedWithWrappedCFException(h, ex);
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          }
2233    }
2234
2235    public void testAcceptEither_exceptionalCompletion3() {
2236        for (ExecutionMode m : ExecutionMode.values())
2237        for (Integer v1 : new Integer[] { 1, null }) {
2238
2239        final CompletableFuture<Integer> f = new CompletableFuture<>();
2240        final CompletableFuture<Integer> g = new CompletableFuture<>();
2241        final IncAction r = new IncAction();
2242        final CFException ex = new CFException();
2243
2244        g.completeExceptionally(ex);
2245        f.complete(v1);
2246        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2247
2248        // unspecified behavior
2249        Integer v;
2528          try {
2529 <            assertEquals(h.join(), null);
2530 <            assertEquals(1, r.invocationCount);
2253 <            assertEquals(inc(v1), r.value);
2529 >            assertNull(h5.join());
2530 >            rs[5].assertValue(v1);
2531          } catch (CompletionException ok) {
2532 <            checkCompletedWithWrappedCFException(h, ex);
2533 <            assertEquals(0, r.invocationCount);
2532 >            checkCompletedWithWrappedException(h5, ex);
2533 >            rs[5].assertNotInvoked();
2534          }
2535  
2536 <        checkCompletedWithWrappedCFException(g, ex);
2537 <        checkCompletedNormally(f, v1);
2538 <        }
2539 <    }
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_exceptionalCompletion4() {
2546 >    public void testAcceptEither_exceptionalCompletion2() {
2547          for (ExecutionMode m : ExecutionMode.values())
2548 <        for (Integer v1 : new Integer[] { 1, null }) {
2549 <
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<>();
2270        final IncAction r = new IncAction();
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 <        f.completeExceptionally(ex);
2558 <        g.complete(v1);
2559 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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 <        // unspecified behavior
2278 <        Integer v;
2564 >        // unspecified behavior - both source completions available
2565          try {
2566 <            assertEquals(h.join(), null);
2567 <            assertEquals(1, r.invocationCount);
2282 <            assertEquals(inc(v1), r.value);
2566 >            assertEquals(null, h0.join());
2567 >            rs[0].assertValue(v1);
2568          } catch (CompletionException ok) {
2569 <            checkCompletedWithWrappedCFException(h, ex);
2570 <            assertEquals(0, r.invocationCount);
2569 >            checkCompletedWithWrappedException(h0, ex);
2570 >            rs[0].assertNotInvoked();
2571          }
2572 <
2573 <        checkCompletedWithWrappedCFException(f, ex);
2574 <        checkCompletedNormally(g, v1);
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 <    }
2580 <
2581 <    /**
2582 <     * acceptEither result completes exceptionally if action does
2583 <     */
2584 <    public void testAcceptEither_actionFailed1() {
2585 <        for (ExecutionMode m : ExecutionMode.values())
2586 <        for (Integer v1 : new Integer[] { 1, null })
2587 <        for (Integer v2 : new Integer[] { 2, null }) {
2588 <
2589 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2590 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2591 <        final FailingConsumer r = new FailingConsumer();
2304 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2305 <
2306 <        f.complete(v1);
2307 <        checkCompletedWithWrappedCFException(h);
2308 <        g.complete(v2);
2309 <        checkCompletedNormally(f, v1);
2310 <        checkCompletedNormally(g, v2);
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          }
2312    }
2313
2314    public void testAcceptEither_actionFailed2() {
2315        for (ExecutionMode m : ExecutionMode.values())
2316        for (Integer v1 : new Integer[] { 1, null })
2317        for (Integer v2 : new Integer[] { 2, null }) {
2318
2319        final CompletableFuture<Integer> f = new CompletableFuture<>();
2320        final CompletableFuture<Integer> g = new CompletableFuture<>();
2321        final FailingConsumer r = new FailingConsumer();
2322        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2593  
2324        g.complete(v2);
2325        checkCompletedWithWrappedCFException(h);
2326        f.complete(v1);
2594          checkCompletedNormally(f, v1);
2595 <        checkCompletedNormally(g, v2);
2596 <        }
2330 <    }
2595 >        checkCompletedExceptionally(g, ex);
2596 >    }}
2597  
2598      /**
2599       * acceptEither result completes exceptionally if either source cancelled
2600       */
2601 <    public void testAcceptEither_sourceCancelled1() {
2601 >    public void testAcceptEither_sourceCancelled() {
2602          for (ExecutionMode m : ExecutionMode.values())
2603          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2604 <        for (Integer v1 : new Integer[] { 1, null }) {
2605 <
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 IncAction r = new IncAction();
2609 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2608 >        final NoopConsumer[] rs = new NoopConsumer[6];
2609 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2610  
2611 <        assertTrue(f.cancel(mayInterruptIfRunning));
2612 <        checkCompletedWithWrappedCancellationException(h);
2613 <        g.complete(v1);
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  
2625 <        checkCancelled(f);
2350 <        assertEquals(0, r.invocationCount);
2351 <        checkCompletedNormally(g, v1);
2352 <        checkCompletedWithWrappedCancellationException(h);
2353 <        }
2354 <    }
2355 <
2356 <    public void testAcceptEither_sourceCancelled2() {
2357 <        for (ExecutionMode m : ExecutionMode.values())
2358 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2359 <        for (Integer v1 : new Integer[] { 1, null }) {
2360 <
2361 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2362 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2363 <        final IncAction r = new IncAction();
2364 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2365 <
2366 <        assertTrue(g.cancel(mayInterruptIfRunning));
2367 <        checkCompletedWithWrappedCancellationException(h);
2368 <        f.complete(v1);
2369 <
2370 <        checkCancelled(g);
2371 <        assertEquals(0, r.invocationCount);
2372 <        checkCompletedNormally(f, v1);
2373 <        checkCompletedWithWrappedCancellationException(h);
2374 <        }
2375 <    }
2376 <
2377 <    public void testAcceptEither_sourceCancelled3() {
2378 <        for (ExecutionMode m : ExecutionMode.values())
2379 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2380 <        for (Integer v1 : new Integer[] { 1, null }) {
2381 <
2382 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2383 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2384 <        final IncAction r = new IncAction();
2385 <
2386 <        assertTrue(g.cancel(mayInterruptIfRunning));
2387 <        f.complete(v1);
2388 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2625 >        g.complete(v1);
2626  
2627 <        // unspecified behavior
2628 <        Integer v;
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 <            assertEquals(h.join(), null);
2632 <            assertEquals(1, r.invocationCount);
2395 <            assertEquals(inc(v1), r.value);
2631 >            assertNull(h4.join());
2632 >            rs[4].assertValue(v1);
2633          } catch (CompletionException ok) {
2634 <            checkCompletedWithWrappedCancellationException(h);
2635 <            assertEquals(0, r.invocationCount);
2634 >            checkCompletedWithWrappedCancellationException(h4);
2635 >            rs[4].assertNotInvoked();
2636          }
2400
2401        checkCancelled(g);
2402        checkCompletedNormally(f, v1);
2403        }
2404    }
2405
2406    public void testAcceptEither_sourceCancelled4() {
2407        for (ExecutionMode m : ExecutionMode.values())
2408        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2409        for (Integer v1 : new Integer[] { 1, null }) {
2410
2411        final CompletableFuture<Integer> f = new CompletableFuture<>();
2412        final CompletableFuture<Integer> g = new CompletableFuture<>();
2413        final IncAction r = new IncAction();
2414
2415        assertTrue(f.cancel(mayInterruptIfRunning));
2416        g.complete(v1);
2417        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2418
2419        // unspecified behavior
2420        Integer v;
2637          try {
2638 <            assertEquals(h.join(), null);
2639 <            assertEquals(1, r.invocationCount);
2424 <            assertEquals(inc(v1), r.value);
2638 >            assertNull(h5.join());
2639 >            rs[5].assertValue(v1);
2640          } catch (CompletionException ok) {
2641 <            checkCompletedWithWrappedCancellationException(h);
2642 <            assertEquals(0, r.invocationCount);
2641 >            checkCompletedWithWrappedCancellationException(h5);
2642 >            rs[5].assertNotInvoked();
2643          }
2644  
2645          checkCancelled(f);
2646          checkCompletedNormally(g, v1);
2647 <        }
2648 <    }
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 <     * runAfterEither result completes normally after normal completion
2437 <     * of either source
2655 >     * acceptEither result completes exceptionally if action does
2656       */
2657 <    public void testRunAfterEither_normalCompletion1() {
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 Noop r = new Noop();
2665 <        final CompletableFuture<Void> h = m.runAfterEither(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 >        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  
2449        f.complete(v1);
2450        checkCompletedNormally(h, null);
2451        assertEquals(1, r.invocationCount);
2678          g.complete(v2);
2679  
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 <        checkCompletedNormally(h, null);
2457 <        assertEquals(1, r.invocationCount);
2458 <        }
2459 <    }
2693 >    }}
2694  
2695 <    public void testRunAfterEither_normalCompletion2() {
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 <
2704 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2705 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2706 <        final Noop r = new Noop();
2707 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2702 >        for (Integer v2 : new Integer[] { 2, null })
2703 >        for (boolean pushNop : new boolean[] { true, false })
2704 >    {
2705 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2706 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2707 >        final Noop[] rs = new Noop[6];
2708 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2709 >
2710 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2711 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2712 >        checkIncomplete(h0);
2713 >        checkIncomplete(h1);
2714 >        rs[0].assertNotInvoked();
2715 >        rs[1].assertNotInvoked();
2716 >        if (pushNop) {          // ad hoc test of intra-completion interference
2717 >            m.thenRun(f, () -> {});
2718 >            m.thenRun(g, () -> {});
2719 >        }
2720 >        f.complete(v1);
2721 >        checkCompletedNormally(h0, null);
2722 >        checkCompletedNormally(h1, null);
2723 >        rs[0].assertInvoked();
2724 >        rs[1].assertInvoked();
2725 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2726 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2727 >        checkCompletedNormally(h2, null);
2728 >        checkCompletedNormally(h3, null);
2729 >        rs[2].assertInvoked();
2730 >        rs[3].assertInvoked();
2731  
2732          g.complete(v2);
2472        checkCompletedNormally(h, null);
2473        assertEquals(1, r.invocationCount);
2474        f.complete(v1);
2733  
2734 <        checkCompletedNormally(f, v1);
2735 <        checkCompletedNormally(g, v2);
2478 <        checkCompletedNormally(h, null);
2479 <        assertEquals(1, r.invocationCount);
2480 <        }
2481 <    }
2482 <    public void testRunAfterEither_normalCompletion3() {
2483 <        for (ExecutionMode m : ExecutionMode.values())
2484 <        for (Integer v1 : new Integer[] { 1, null })
2485 <        for (Integer v2 : new Integer[] { 2, null }) {
2486 <
2487 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2488 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2489 <        final Noop r = new Noop();
2734 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2735 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2736  
2491        f.complete(v1);
2492        g.complete(v2);
2493        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2494
2495        checkCompletedNormally(h, null);
2737          checkCompletedNormally(f, v1);
2738          checkCompletedNormally(g, v2);
2739 <        assertEquals(1, r.invocationCount);
2740 <        }
2741 <    }
2739 >        checkCompletedNormally(h0, null);
2740 >        checkCompletedNormally(h1, null);
2741 >        checkCompletedNormally(h2, null);
2742 >        checkCompletedNormally(h3, null);
2743 >        checkCompletedNormally(h4, null);
2744 >        checkCompletedNormally(h5, null);
2745 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2746 >    }}
2747  
2748      /**
2749       * runAfterEither result completes exceptionally after exceptional
2750       * completion of either source
2751       */
2752 <    public void testRunAfterEither_exceptionalCompletion1() {
2752 >    public void testRunAfterEither_exceptionalCompletion() {
2753          for (ExecutionMode m : ExecutionMode.values())
2754 <        for (Integer v1 : new Integer[] { 1, null }) {
2755 <
2754 >        for (Integer v1 : new Integer[] { 1, null })
2755 >    {
2756          final CompletableFuture<Integer> f = new CompletableFuture<>();
2757          final CompletableFuture<Integer> g = new CompletableFuture<>();
2512        final Noop r = new Noop();
2513        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2758          final CFException ex = new CFException();
2759 +        final Noop[] rs = new Noop[6];
2760 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2761  
2762 <        f.completeExceptionally(ex);
2763 <        checkCompletedWithWrappedCFException(h, ex);
2764 <        g.complete(v1);
2762 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2763 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2764 >        checkIncomplete(h0);
2765 >        checkIncomplete(h1);
2766 >        rs[0].assertNotInvoked();
2767 >        rs[1].assertNotInvoked();
2768 >        assertTrue(f.completeExceptionally(ex));
2769 >        checkCompletedWithWrappedException(h0, ex);
2770 >        checkCompletedWithWrappedException(h1, ex);
2771 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2772 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2773 >        checkCompletedWithWrappedException(h2, ex);
2774 >        checkCompletedWithWrappedException(h3, ex);
2775 >
2776 >        assertTrue(g.complete(v1));
2777 >
2778 >        // unspecified behavior - both source completions available
2779 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2780 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2781 >        try {
2782 >            assertNull(h4.join());
2783 >            rs[4].assertInvoked();
2784 >        } catch (CompletionException ok) {
2785 >            checkCompletedWithWrappedException(h4, ex);
2786 >            rs[4].assertNotInvoked();
2787 >        }
2788 >        try {
2789 >            assertNull(h5.join());
2790 >            rs[5].assertInvoked();
2791 >        } catch (CompletionException ok) {
2792 >            checkCompletedWithWrappedException(h5, ex);
2793 >            rs[5].assertNotInvoked();
2794 >        }
2795  
2796 <        assertEquals(0, r.invocationCount);
2796 >        checkCompletedExceptionally(f, ex);
2797          checkCompletedNormally(g, v1);
2798 <        checkCompletedWithWrappedCFException(f, ex);
2799 <        checkCompletedWithWrappedCFException(h, ex);
2800 <        }
2801 <    }
2798 >        checkCompletedWithWrappedException(h0, ex);
2799 >        checkCompletedWithWrappedException(h1, ex);
2800 >        checkCompletedWithWrappedException(h2, ex);
2801 >        checkCompletedWithWrappedException(h3, ex);
2802 >        checkCompletedWithWrappedException(h4, ex);
2803 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2804 >    }}
2805  
2806      public void testRunAfterEither_exceptionalCompletion2() {
2807          for (ExecutionMode m : ExecutionMode.values())
2808 <        for (Integer v1 : new Integer[] { 1, null }) {
2809 <
2810 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2532 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2533 <        final Noop r = new Noop();
2534 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2535 <        final CFException ex = new CFException();
2536 <
2537 <        g.completeExceptionally(ex);
2538 <        checkCompletedWithWrappedCFException(h, ex);
2539 <        f.complete(v1);
2540 <
2541 <        assertEquals(0, r.invocationCount);
2542 <        checkCompletedNormally(f, v1);
2543 <        checkCompletedWithWrappedCFException(g, ex);
2544 <        checkCompletedWithWrappedCFException(h, ex);
2545 <        }
2546 <    }
2547 <
2548 <    public void testRunAfterEither_exceptionalCompletion3() {
2549 <        for (ExecutionMode m : ExecutionMode.values())
2550 <        for (Integer v1 : new Integer[] { 1, null }) {
2551 <
2808 >        for (boolean fFirst : new boolean[] { true, false })
2809 >        for (Integer v1 : new Integer[] { 1, null })
2810 >    {
2811          final CompletableFuture<Integer> f = new CompletableFuture<>();
2812          final CompletableFuture<Integer> g = new CompletableFuture<>();
2554        final Noop r = new Noop();
2813          final CFException ex = new CFException();
2814 +        final Noop[] rs = new Noop[6];
2815 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2816  
2817 <        g.completeExceptionally(ex);
2818 <        f.complete(v1);
2819 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2817 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2818 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2819 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2820 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2821 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2822 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2823  
2824 <        // unspecified behavior
2562 <        Integer v;
2824 >        // unspecified behavior - both source completions available
2825          try {
2826 <            assertEquals(h.join(), null);
2827 <            assertEquals(1, r.invocationCount);
2826 >            assertEquals(null, h0.join());
2827 >            rs[0].assertInvoked();
2828          } catch (CompletionException ok) {
2829 <            checkCompletedWithWrappedCFException(h, ex);
2830 <            assertEquals(0, r.invocationCount);
2569 <        }
2570 <
2571 <        checkCompletedWithWrappedCFException(g, ex);
2572 <        checkCompletedNormally(f, v1);
2829 >            checkCompletedWithWrappedException(h0, ex);
2830 >            rs[0].assertNotInvoked();
2831          }
2574    }
2575
2576    public void testRunAfterEither_exceptionalCompletion4() {
2577        for (ExecutionMode m : ExecutionMode.values())
2578        for (Integer v1 : new Integer[] { 1, null }) {
2579
2580        final CompletableFuture<Integer> f = new CompletableFuture<>();
2581        final CompletableFuture<Integer> g = new CompletableFuture<>();
2582        final Noop r = new Noop();
2583        final CFException ex = new CFException();
2584
2585        f.completeExceptionally(ex);
2586        g.complete(v1);
2587        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2588
2589        // unspecified behavior
2590        Integer v;
2832          try {
2833 <            assertEquals(h.join(), null);
2834 <            assertEquals(1, r.invocationCount);
2833 >            assertEquals(null, h1.join());
2834 >            rs[1].assertInvoked();
2835          } catch (CompletionException ok) {
2836 <            checkCompletedWithWrappedCFException(h, ex);
2837 <            assertEquals(0, r.invocationCount);
2836 >            checkCompletedWithWrappedException(h1, ex);
2837 >            rs[1].assertNotInvoked();
2838          }
2839 <
2840 <        checkCompletedWithWrappedCFException(f, ex);
2841 <        checkCompletedNormally(g, v1);
2839 >        try {
2840 >            assertEquals(null, h2.join());
2841 >            rs[2].assertInvoked();
2842 >        } catch (CompletionException ok) {
2843 >            checkCompletedWithWrappedException(h2, ex);
2844 >            rs[2].assertNotInvoked();
2845          }
2846 <    }
2847 <
2848 <    /**
2849 <     * runAfterEither result completes exceptionally if action does
2850 <     */
2851 <    public void testRunAfterEither_actionFailed1() {
2608 <        for (ExecutionMode m : ExecutionMode.values())
2609 <        for (Integer v1 : new Integer[] { 1, null })
2610 <        for (Integer v2 : new Integer[] { 2, null }) {
2611 <
2612 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2613 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2614 <        final FailingNoop r = new FailingNoop();
2615 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2616 <
2617 <        f.complete(v1);
2618 <        checkCompletedWithWrappedCFException(h);
2619 <        g.complete(v2);
2620 <        checkCompletedNormally(f, v1);
2621 <        checkCompletedNormally(g, v2);
2846 >        try {
2847 >            assertEquals(null, h3.join());
2848 >            rs[3].assertInvoked();
2849 >        } catch (CompletionException ok) {
2850 >            checkCompletedWithWrappedException(h3, ex);
2851 >            rs[3].assertNotInvoked();
2852          }
2623    }
2624
2625    public void testRunAfterEither_actionFailed2() {
2626        for (ExecutionMode m : ExecutionMode.values())
2627        for (Integer v1 : new Integer[] { 1, null })
2628        for (Integer v2 : new Integer[] { 2, null }) {
2853  
2630        final CompletableFuture<Integer> f = new CompletableFuture<>();
2631        final CompletableFuture<Integer> g = new CompletableFuture<>();
2632        final FailingNoop r = new FailingNoop();
2633        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2634
2635        g.complete(v2);
2636        checkCompletedWithWrappedCFException(h);
2637        f.complete(v1);
2854          checkCompletedNormally(f, v1);
2855 <        checkCompletedNormally(g, v2);
2856 <        }
2641 <    }
2855 >        checkCompletedExceptionally(g, ex);
2856 >    }}
2857  
2858      /**
2859       * runAfterEither result completes exceptionally if either source cancelled
2860       */
2861 <    public void testRunAfterEither_sourceCancelled1() {
2861 >    public void testRunAfterEither_sourceCancelled() {
2862          for (ExecutionMode m : ExecutionMode.values())
2863          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2864 <        for (Integer v1 : new Integer[] { 1, null }) {
2865 <
2651 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2652 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2653 <        final Noop r = new Noop();
2654 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2655 <
2656 <        assertTrue(f.cancel(mayInterruptIfRunning));
2657 <        checkCompletedWithWrappedCancellationException(h);
2658 <        g.complete(v1);
2659 <
2660 <        checkCancelled(f);
2661 <        assertEquals(0, r.invocationCount);
2662 <        checkCompletedNormally(g, v1);
2663 <        checkCompletedWithWrappedCancellationException(h);
2664 <        }
2665 <    }
2666 <
2667 <    public void testRunAfterEither_sourceCancelled2() {
2668 <        for (ExecutionMode m : ExecutionMode.values())
2669 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2670 <        for (Integer v1 : new Integer[] { 1, null }) {
2671 <
2672 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2673 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2674 <        final Noop r = new Noop();
2675 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2676 <
2677 <        assertTrue(g.cancel(mayInterruptIfRunning));
2678 <        checkCompletedWithWrappedCancellationException(h);
2679 <        f.complete(v1);
2680 <
2681 <        checkCancelled(g);
2682 <        assertEquals(0, r.invocationCount);
2683 <        checkCompletedNormally(f, v1);
2684 <        checkCompletedWithWrappedCancellationException(h);
2685 <        }
2686 <    }
2687 <
2688 <    public void testRunAfterEither_sourceCancelled3() {
2689 <        for (ExecutionMode m : ExecutionMode.values())
2690 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2691 <        for (Integer v1 : new Integer[] { 1, null }) {
2692 <
2864 >        for (Integer v1 : new Integer[] { 1, null })
2865 >    {
2866          final CompletableFuture<Integer> f = new CompletableFuture<>();
2867          final CompletableFuture<Integer> g = new CompletableFuture<>();
2868 <        final Noop r = new Noop();
2869 <
2697 <        assertTrue(g.cancel(mayInterruptIfRunning));
2698 <        f.complete(v1);
2699 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2868 >        final Noop[] rs = new Noop[6];
2869 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2870  
2871 <        // unspecified behavior
2872 <        Integer v;
2871 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2872 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2873 >        checkIncomplete(h0);
2874 >        checkIncomplete(h1);
2875 >        rs[0].assertNotInvoked();
2876 >        rs[1].assertNotInvoked();
2877 >        f.cancel(mayInterruptIfRunning);
2878 >        checkCompletedWithWrappedCancellationException(h0);
2879 >        checkCompletedWithWrappedCancellationException(h1);
2880 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2881 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2882 >        checkCompletedWithWrappedCancellationException(h2);
2883 >        checkCompletedWithWrappedCancellationException(h3);
2884 >
2885 >        assertTrue(g.complete(v1));
2886 >
2887 >        // unspecified behavior - both source completions available
2888 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2889 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2890          try {
2891 <            assertEquals(h.join(), null);
2892 <            assertEquals(1, r.invocationCount);
2891 >            assertNull(h4.join());
2892 >            rs[4].assertInvoked();
2893          } catch (CompletionException ok) {
2894 <            checkCompletedWithWrappedCancellationException(h);
2895 <            assertEquals(0, r.invocationCount);
2709 <        }
2710 <
2711 <        checkCancelled(g);
2712 <        checkCompletedNormally(f, v1);
2894 >            checkCompletedWithWrappedCancellationException(h4);
2895 >            rs[4].assertNotInvoked();
2896          }
2714    }
2715
2716    public void testRunAfterEither_sourceCancelled4() {
2717        for (ExecutionMode m : ExecutionMode.values())
2718        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2719        for (Integer v1 : new Integer[] { 1, null }) {
2720
2721        final CompletableFuture<Integer> f = new CompletableFuture<>();
2722        final CompletableFuture<Integer> g = new CompletableFuture<>();
2723        final Noop r = new Noop();
2724
2725        assertTrue(f.cancel(mayInterruptIfRunning));
2726        g.complete(v1);
2727        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2728
2729        // unspecified behavior
2730        Integer v;
2897          try {
2898 <            assertEquals(h.join(), null);
2899 <            assertEquals(1, r.invocationCount);
2898 >            assertNull(h5.join());
2899 >            rs[5].assertInvoked();
2900          } catch (CompletionException ok) {
2901 <            checkCompletedWithWrappedCancellationException(h);
2902 <            assertEquals(0, r.invocationCount);
2901 >            checkCompletedWithWrappedCancellationException(h5);
2902 >            rs[5].assertNotInvoked();
2903          }
2904  
2905          checkCancelled(f);
2906          checkCompletedNormally(g, v1);
2907 <        }
2908 <    }
2907 >        checkCompletedWithWrappedCancellationException(h0);
2908 >        checkCompletedWithWrappedCancellationException(h1);
2909 >        checkCompletedWithWrappedCancellationException(h2);
2910 >        checkCompletedWithWrappedCancellationException(h3);
2911 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2912 >    }}
2913  
2914      /**
2915 <     * thenCompose result completes normally after normal completion of source
2915 >     * runAfterEither result completes exceptionally if action does
2916       */
2917 <    public void testThenCompose_normalCompletion1() {
2917 >    public void testRunAfterEither_actionFailed() {
2918          for (ExecutionMode m : ExecutionMode.values())
2919 <        for (Integer v1 : new Integer[] { 1, null }) {
2920 <
2919 >        for (Integer v1 : new Integer[] { 1, null })
2920 >        for (Integer v2 : new Integer[] { 2, null })
2921 >    {
2922          final CompletableFuture<Integer> f = new CompletableFuture<>();
2923 <        final CompletableFutureInc r = new CompletableFutureInc();
2924 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2925 <        f.complete(v1);
2926 <        checkCompletedNormally(g, inc(v1));
2923 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2924 >        final FailingRunnable[] rs = new FailingRunnable[6];
2925 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2926 >
2927 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2928 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2929 >        assertTrue(f.complete(v1));
2930 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2931 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2932 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2933 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2934 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2935 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2936 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2937 >        assertTrue(g.complete(v2));
2938 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2939 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2940 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2941 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2942 >
2943          checkCompletedNormally(f, v1);
2944 <        assertEquals(1, r.invocationCount);
2945 <        }
2946 <    }
2944 >        checkCompletedNormally(g, v2);
2945 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2946 >    }}
2947  
2948 <    public void testThenCompose_normalCompletion2() {
2948 >    /**
2949 >     * thenCompose result completes normally after normal completion of source
2950 >     */
2951 >    public void testThenCompose_normalCompletion() {
2952          for (ExecutionMode m : ExecutionMode.values())
2953 <        for (Integer v1 : new Integer[] { 1, null }) {
2954 <
2953 >        for (boolean createIncomplete : new boolean[] { true, false })
2954 >        for (Integer v1 : new Integer[] { 1, null })
2955 >    {
2956          final CompletableFuture<Integer> f = new CompletableFuture<>();
2957 <        final CompletableFutureInc r = new CompletableFutureInc();
2958 <        f.complete(v1);
2959 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2957 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2958 >        if (!createIncomplete) assertTrue(f.complete(v1));
2959 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2960 >        if (createIncomplete) assertTrue(f.complete(v1));
2961 >
2962          checkCompletedNormally(g, inc(v1));
2963          checkCompletedNormally(f, v1);
2964 <        assertEquals(1, r.invocationCount);
2965 <        }
2773 <    }
2964 >        r.assertValue(v1);
2965 >    }}
2966  
2967      /**
2968       * thenCompose result completes exceptionally after exceptional
2969       * completion of source
2970       */
2971 <    public void testThenCompose_exceptionalCompletion1() {
2972 <        for (ExecutionMode m : ExecutionMode.values()) {
2973 <
2971 >    public void testThenCompose_exceptionalCompletion() {
2972 >        for (ExecutionMode m : ExecutionMode.values())
2973 >        for (boolean createIncomplete : new boolean[] { true, false })
2974 >    {
2975          final CFException ex = new CFException();
2976 <        final CompletableFutureInc r = new CompletableFutureInc();
2976 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2977          final CompletableFuture<Integer> f = new CompletableFuture<>();
2978 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2979 <        f.completeExceptionally(ex);
2980 <        checkCompletedWithWrappedCFException(g, ex);
2788 <        checkCompletedWithWrappedCFException(f, ex);
2789 <        }
2790 <    }
2791 <
2792 <    public void testThenCompose_exceptionalCompletion2() {
2793 <        for (ExecutionMode m : ExecutionMode.values()) {
2978 >        if (!createIncomplete) f.completeExceptionally(ex);
2979 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2980 >        if (createIncomplete) f.completeExceptionally(ex);
2981  
2982 <        final CFException ex = new CFException();
2983 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2984 <        f.completeExceptionally(ex);
2985 <        final CompletableFutureInc r = new CompletableFutureInc();
2799 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2800 <        checkCompletedWithWrappedCFException(g, ex);
2801 <        checkCompletedWithWrappedCFException(f, ex);
2802 <        }
2803 <    }
2982 >        checkCompletedWithWrappedException(g, ex);
2983 >        checkCompletedExceptionally(f, ex);
2984 >        r.assertNotInvoked();
2985 >    }}
2986  
2987      /**
2988       * thenCompose result completes exceptionally if action does
2989       */
2990 <    public void testThenCompose_actionFailed1() {
2990 >    public void testThenCompose_actionFailed() {
2991          for (ExecutionMode m : ExecutionMode.values())
2992 <        for (Integer v1 : new Integer[] { 1, null }) {
2993 <
2992 >        for (boolean createIncomplete : new boolean[] { true, false })
2993 >        for (Integer v1 : new Integer[] { 1, null })
2994 >    {
2995          final CompletableFuture<Integer> f = new CompletableFuture<>();
2996          final FailingCompletableFutureFunction r
2997 <            = new FailingCompletableFutureFunction();
2998 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2999 <        f.complete(v1);
3000 <        checkCompletedWithWrappedCFException(g);
2818 <        checkCompletedNormally(f, v1);
2819 <        }
2820 <    }
2821 <
2822 <    public void testThenCompose_actionFailed2() {
2823 <        for (ExecutionMode m : ExecutionMode.values())
2824 <        for (Integer v1 : new Integer[] { 1, null }) {
2997 >            = new FailingCompletableFutureFunction(m);
2998 >        if (!createIncomplete) assertTrue(f.complete(v1));
2999 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3000 >        if (createIncomplete) assertTrue(f.complete(v1));
3001  
3002 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2827 <        f.complete(v1);
2828 <        final FailingCompletableFutureFunction r
2829 <            = new FailingCompletableFutureFunction();
2830 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2831 <        checkCompletedWithWrappedCFException(g);
3002 >        checkCompletedWithWrappedException(g, r.ex);
3003          checkCompletedNormally(f, v1);
3004 <        }
2834 <    }
3004 >    }}
3005  
3006      /**
3007       * thenCompose result completes exceptionally if source cancelled
3008       */
3009 <    public void testThenCompose_sourceCancelled1() {
3009 >    public void testThenCompose_sourceCancelled() {
3010          for (ExecutionMode m : ExecutionMode.values())
3011 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3012 <
3011 >        for (boolean createIncomplete : new boolean[] { true, false })
3012 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3013 >    {
3014          final CompletableFuture<Integer> f = new CompletableFuture<>();
3015 <        final CompletableFutureInc r = new CompletableFutureInc();
3016 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3017 <        assertTrue(f.cancel(mayInterruptIfRunning));
3018 <        checkCompletedWithWrappedCancellationException(g);
3019 <        checkCancelled(f);
3015 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3016 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3017 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3018 >        if (createIncomplete) {
3019 >            checkIncomplete(g);
3020 >            assertTrue(f.cancel(mayInterruptIfRunning));
3021          }
2850    }
3022  
2852    public void testThenCompose_sourceCancelled2() {
2853        for (ExecutionMode m : ExecutionMode.values())
2854        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2855
2856        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857        assertTrue(f.cancel(mayInterruptIfRunning));
2858        final CompletableFutureInc r = new CompletableFutureInc();
2859        final CompletableFuture<Integer> g = f.thenCompose(r);
3023          checkCompletedWithWrappedCancellationException(g);
3024          checkCancelled(f);
3025 <        }
2863 <    }
2864 <
2865 <    // asyncs
2866 <
2867 <    /**
2868 <     * thenRunAsync result completes normally after normal completion of source
2869 <     */
2870 <    public void testThenRunAsync() {
2871 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2872 <        Noop r = new Noop();
2873 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2874 <        f.complete(null);
2875 <        checkCompletedNormally(g, null);
2876 <
2877 <        // reordered version
2878 <        f = new CompletableFuture<>();
2879 <        f.complete(null);
2880 <        r = new Noop();
2881 <        g = f.thenRunAsync(r);
2882 <        checkCompletedNormally(g, null);
2883 <    }
2884 <
2885 <    /**
2886 <     * thenRunAsync result completes exceptionally after exceptional
2887 <     * completion of source
2888 <     */
2889 <    public void testThenRunAsync2() {
2890 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2891 <        Noop r = new Noop();
2892 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2893 <        f.completeExceptionally(new CFException());
2894 <        try {
2895 <            g.join();
2896 <            shouldThrow();
2897 <        } catch (CompletionException success) {}
2898 <        checkCompletedWithWrappedCFException(g);
2899 <    }
2900 <
2901 <    /**
2902 <     * thenRunAsync result completes exceptionally if action does
2903 <     */
2904 <    public void testThenRunAsync3() {
2905 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2906 <        FailingNoop r = new FailingNoop();
2907 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2908 <        f.complete(null);
2909 <        checkCompletedWithWrappedCFException(g);
2910 <    }
2911 <
2912 <    /**
2913 <     * thenRunAsync result completes exceptionally if source cancelled
2914 <     */
2915 <    public void testThenRunAsync4() {
2916 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2917 <        Noop r = new Noop();
2918 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2919 <        assertTrue(f.cancel(true));
2920 <        checkCompletedWithWrappedCancellationException(g);
2921 <    }
2922 <
2923 <    /**
2924 <     * thenApplyAsync result completes normally after normal completion of source
2925 <     */
2926 <    public void testThenApplyAsync() {
2927 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2928 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2929 <        f.complete(one);
2930 <        checkCompletedNormally(g, two);
2931 <    }
2932 <
2933 <    /**
2934 <     * thenApplyAsync result completes exceptionally after exceptional
2935 <     * completion of source
2936 <     */
2937 <    public void testThenApplyAsync2() {
2938 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2939 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2940 <        f.completeExceptionally(new CFException());
2941 <        checkCompletedWithWrappedCFException(g);
2942 <    }
2943 <
2944 <    /**
2945 <     * thenApplyAsync result completes exceptionally if action does
2946 <     */
2947 <    public void testThenApplyAsync3() {
2948 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2949 <        FailingFunction r = new FailingFunction();
2950 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2951 <        f.complete(null);
2952 <        checkCompletedWithWrappedCFException(g);
2953 <    }
2954 <
2955 <    /**
2956 <     * thenApplyAsync result completes exceptionally if source cancelled
2957 <     */
2958 <    public void testThenApplyAsync4() {
2959 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2960 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2961 <        assertTrue(f.cancel(true));
2962 <        checkCompletedWithWrappedCancellationException(g);
2963 <    }
2964 <
2965 <    /**
2966 <     * thenAcceptAsync result completes normally after normal
2967 <     * completion of source
2968 <     */
2969 <    public void testThenAcceptAsync() {
2970 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2971 <        IncAction r = new IncAction();
2972 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2973 <        f.complete(one);
2974 <        checkCompletedNormally(g, null);
2975 <        assertEquals(r.value, (Integer) 2);
2976 <    }
2977 <
2978 <    /**
2979 <     * thenAcceptAsync result completes exceptionally after exceptional
2980 <     * completion of source
2981 <     */
2982 <    public void testThenAcceptAsync2() {
2983 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2984 <        IncAction r = new IncAction();
2985 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2986 <        f.completeExceptionally(new CFException());
2987 <        checkCompletedWithWrappedCFException(g);
2988 <    }
2989 <
2990 <    /**
2991 <     * thenAcceptAsync result completes exceptionally if action does
2992 <     */
2993 <    public void testThenAcceptAsync3() {
2994 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2995 <        FailingConsumer r = new FailingConsumer();
2996 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2997 <        f.complete(null);
2998 <        checkCompletedWithWrappedCFException(g);
2999 <    }
3000 <
3001 <    /**
3002 <     * thenAcceptAsync result completes exceptionally if source cancelled
3003 <     */
3004 <    public void testThenAcceptAsync4() {
3005 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3006 <        IncAction r = new IncAction();
3007 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3008 <        assertTrue(f.cancel(true));
3009 <        checkCompletedWithWrappedCancellationException(g);
3010 <    }
3011 <
3012 <    // async with explicit executors
3013 <
3014 <    /**
3015 <     * thenRunAsync result completes normally after normal completion of source
3016 <     */
3017 <    public void testThenRunAsyncE() {
3018 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3019 <        Noop r = new Noop();
3020 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3021 <        f.complete(null);
3022 <        checkCompletedNormally(g, null);
3023 <
3024 <        // reordered version
3025 <        f = new CompletableFuture<>();
3026 <        f.complete(null);
3027 <        r = new Noop();
3028 <        g = f.thenRunAsync(r, new ThreadExecutor());
3029 <        checkCompletedNormally(g, null);
3030 <    }
3031 <
3032 <    /**
3033 <     * thenRunAsync result completes exceptionally after exceptional
3034 <     * completion of source
3035 <     */
3036 <    public void testThenRunAsync2E() {
3037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3038 <        Noop r = new Noop();
3039 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3040 <        f.completeExceptionally(new CFException());
3041 <        try {
3042 <            g.join();
3043 <            shouldThrow();
3044 <        } catch (CompletionException success) {}
3045 <        checkCompletedWithWrappedCFException(g);
3046 <    }
3047 <
3048 <    /**
3049 <     * thenRunAsync result completes exceptionally if action does
3050 <     */
3051 <    public void testThenRunAsync3E() {
3052 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3053 <        FailingNoop r = new FailingNoop();
3054 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3055 <        f.complete(null);
3056 <        checkCompletedWithWrappedCFException(g);
3057 <    }
3058 <
3059 <    /**
3060 <     * thenRunAsync result completes exceptionally if source cancelled
3061 <     */
3062 <    public void testThenRunAsync4E() {
3063 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3064 <        Noop r = new Noop();
3065 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3066 <        assertTrue(f.cancel(true));
3067 <        checkCompletedWithWrappedCancellationException(g);
3068 <    }
3069 <
3070 <    /**
3071 <     * thenApplyAsync result completes normally after normal completion of source
3072 <     */
3073 <    public void testThenApplyAsyncE() {
3074 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3075 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3076 <        f.complete(one);
3077 <        checkCompletedNormally(g, two);
3078 <    }
3079 <
3080 <    /**
3081 <     * thenApplyAsync result completes exceptionally after exceptional
3082 <     * completion of source
3083 <     */
3084 <    public void testThenApplyAsync2E() {
3085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3086 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3087 <        f.completeExceptionally(new CFException());
3088 <        checkCompletedWithWrappedCFException(g);
3089 <    }
3090 <
3091 <    /**
3092 <     * thenApplyAsync result completes exceptionally if action does
3093 <     */
3094 <    public void testThenApplyAsync3E() {
3095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3096 <        FailingFunction r = new FailingFunction();
3097 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3098 <        f.complete(null);
3099 <        checkCompletedWithWrappedCFException(g);
3100 <    }
3025 >    }}
3026  
3027      /**
3028 <     * thenApplyAsync result completes exceptionally if source cancelled
3028 >     * thenCompose result completes exceptionally if the result of the action does
3029       */
3030 <    public void testThenApplyAsync4E() {
3031 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3032 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3033 <        assertTrue(f.cancel(true));
3034 <        checkCompletedWithWrappedCancellationException(g);
3035 <    }
3036 <
3037 <    /**
3038 <     * thenAcceptAsync result completes normally after normal
3039 <     * completion of source
3040 <     */
3041 <    public void testThenAcceptAsyncE() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        IncAction r = new IncAction();
3044 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3045 <        f.complete(one);
3046 <        checkCompletedNormally(g, null);
3047 <        assertEquals(r.value, (Integer) 2);
3048 <    }
3049 <
3050 <    /**
3051 <     * thenAcceptAsync result completes exceptionally after exceptional
3052 <     * completion of source
3053 <     */
3054 <    public void testThenAcceptAsync2E() {
3055 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3056 <        IncAction r = new IncAction();
3057 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3058 <        f.completeExceptionally(new CFException());
3059 <        checkCompletedWithWrappedCFException(g);
3060 <    }
3061 <
3062 <    /**
3063 <     * thenAcceptAsync result completes exceptionally if action does
3064 <     */
3065 <    public void testThenAcceptAsync3E() {
3066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3067 <        FailingConsumer r = new FailingConsumer();
3068 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3069 <        f.complete(null);
3070 <        checkCompletedWithWrappedCFException(g);
3071 <    }
3030 >    public void testThenCompose_actionReturnsFailingFuture() {
3031 >        for (ExecutionMode m : ExecutionMode.values())
3032 >        for (int order = 0; order < 6; order++)
3033 >        for (Integer v1 : new Integer[] { 1, null })
3034 >    {
3035 >        final CFException ex = new CFException();
3036 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3037 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3038 >        final CompletableFuture<Integer> h;
3039 >        // Test all permutations of orders
3040 >        switch (order) {
3041 >        case 0:
3042 >            assertTrue(f.complete(v1));
3043 >            assertTrue(g.completeExceptionally(ex));
3044 >            h = m.thenCompose(f, (x -> g));
3045 >            break;
3046 >        case 1:
3047 >            assertTrue(f.complete(v1));
3048 >            h = m.thenCompose(f, (x -> g));
3049 >            assertTrue(g.completeExceptionally(ex));
3050 >            break;
3051 >        case 2:
3052 >            assertTrue(g.completeExceptionally(ex));
3053 >            assertTrue(f.complete(v1));
3054 >            h = m.thenCompose(f, (x -> g));
3055 >            break;
3056 >        case 3:
3057 >            assertTrue(g.completeExceptionally(ex));
3058 >            h = m.thenCompose(f, (x -> g));
3059 >            assertTrue(f.complete(v1));
3060 >            break;
3061 >        case 4:
3062 >            h = m.thenCompose(f, (x -> g));
3063 >            assertTrue(f.complete(v1));
3064 >            assertTrue(g.completeExceptionally(ex));
3065 >            break;
3066 >        case 5:
3067 >            h = m.thenCompose(f, (x -> g));
3068 >            assertTrue(f.complete(v1));
3069 >            assertTrue(g.completeExceptionally(ex));
3070 >            break;
3071 >        default: throw new AssertionError();
3072 >        }
3073  
3074 <    /**
3075 <     * thenAcceptAsync result completes exceptionally if source cancelled
3076 <     */
3077 <    public void testThenAcceptAsync4E() {
3152 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3153 <        IncAction r = new IncAction();
3154 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3155 <        assertTrue(f.cancel(true));
3156 <        checkCompletedWithWrappedCancellationException(g);
3157 <    }
3074 >        checkCompletedExceptionally(g, ex);
3075 >        checkCompletedWithWrappedException(h, ex);
3076 >        checkCompletedNormally(f, v1);
3077 >    }}
3078  
3079      // other static methods
3080  
# Line 3172 | Line 3092 | public class CompletableFutureTest exten
3092       * when all components complete normally
3093       */
3094      public void testAllOf_normal() throws Exception {
3095 <        for (int k = 1; k < 20; ++k) {
3096 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3097 <            for (int i = 0; i < k; ++i)
3095 >        for (int k = 1; k < 10; k++) {
3096 >            CompletableFuture<Integer>[] fs
3097 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3098 >            for (int i = 0; i < k; i++)
3099 >                fs[i] = new CompletableFuture<>();
3100 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3101 >            for (int i = 0; i < k; i++) {
3102 >                checkIncomplete(f);
3103 >                checkIncomplete(CompletableFuture.allOf(fs));
3104 >                fs[i].complete(one);
3105 >            }
3106 >            checkCompletedNormally(f, null);
3107 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3108 >        }
3109 >    }
3110 >
3111 >    public void testAllOf_normal_backwards() throws Exception {
3112 >        for (int k = 1; k < 10; k++) {
3113 >            CompletableFuture<Integer>[] fs
3114 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3115 >            for (int i = 0; i < k; i++)
3116                  fs[i] = new CompletableFuture<>();
3117              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3118 <            for (int i = 0; i < k; ++i) {
3118 >            for (int i = k - 1; i >= 0; i--) {
3119                  checkIncomplete(f);
3120                  checkIncomplete(CompletableFuture.allOf(fs));
3121                  fs[i].complete(one);
# Line 3187 | Line 3125 | public class CompletableFutureTest exten
3125          }
3126      }
3127  
3128 +    public void testAllOf_exceptional() throws Exception {
3129 +        for (int k = 1; k < 10; k++) {
3130 +            CompletableFuture<Integer>[] fs
3131 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3132 +            CFException ex = new CFException();
3133 +            for (int i = 0; i < k; i++)
3134 +                fs[i] = new CompletableFuture<>();
3135 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3136 +            for (int i = 0; i < k; i++) {
3137 +                checkIncomplete(f);
3138 +                checkIncomplete(CompletableFuture.allOf(fs));
3139 +                if (i != k / 2) {
3140 +                    fs[i].complete(i);
3141 +                    checkCompletedNormally(fs[i], i);
3142 +                } else {
3143 +                    fs[i].completeExceptionally(ex);
3144 +                    checkCompletedExceptionally(fs[i], ex);
3145 +                }
3146 +            }
3147 +            checkCompletedWithWrappedException(f, ex);
3148 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3149 +        }
3150 +    }
3151 +
3152      /**
3153       * anyOf(no component futures) returns an incomplete future
3154       */
3155      public void testAnyOf_empty() throws Exception {
3156 +        for (Integer v1 : new Integer[] { 1, null })
3157 +    {
3158          CompletableFuture<Object> f = CompletableFuture.anyOf();
3159          checkIncomplete(f);
3160 <    }
3160 >
3161 >        f.complete(v1);
3162 >        checkCompletedNormally(f, v1);
3163 >    }}
3164  
3165      /**
3166       * anyOf returns a future completed normally with a value when
3167       * a component future does
3168       */
3169      public void testAnyOf_normal() throws Exception {
3170 <        for (int k = 0; k < 10; ++k) {
3170 >        for (int k = 0; k < 10; k++) {
3171              CompletableFuture[] fs = new CompletableFuture[k];
3172 <            for (int i = 0; i < k; ++i)
3172 >            for (int i = 0; i < k; i++)
3173                  fs[i] = new CompletableFuture<>();
3174              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3175              checkIncomplete(f);
3176 <            for (int i = 0; i < k; ++i) {
3177 <                fs[i].complete(one);
3178 <                checkCompletedNormally(f, one);
3179 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3176 >            for (int i = 0; i < k; i++) {
3177 >                fs[i].complete(i);
3178 >                checkCompletedNormally(f, 0);
3179 >                int x = (int) CompletableFuture.anyOf(fs).join();
3180 >                assertTrue(0 <= x && x <= i);
3181 >            }
3182 >        }
3183 >    }
3184 >    public void testAnyOf_normal_backwards() throws Exception {
3185 >        for (int k = 0; k < 10; k++) {
3186 >            CompletableFuture[] fs = new CompletableFuture[k];
3187 >            for (int i = 0; i < k; i++)
3188 >                fs[i] = new CompletableFuture<>();
3189 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3190 >            checkIncomplete(f);
3191 >            for (int i = k - 1; i >= 0; i--) {
3192 >                fs[i].complete(i);
3193 >                checkCompletedNormally(f, k - 1);
3194 >                int x = (int) CompletableFuture.anyOf(fs).join();
3195 >                assertTrue(i <= x && x <= k - 1);
3196              }
3197          }
3198      }
# Line 3218 | Line 3201 | public class CompletableFutureTest exten
3201       * anyOf result completes exceptionally when any component does.
3202       */
3203      public void testAnyOf_exceptional() throws Exception {
3204 <        for (int k = 0; k < 10; ++k) {
3204 >        for (int k = 0; k < 10; k++) {
3205              CompletableFuture[] fs = new CompletableFuture[k];
3206 <            for (int i = 0; i < k; ++i)
3206 >            CFException[] exs = new CFException[k];
3207 >            for (int i = 0; i < k; i++) {
3208                  fs[i] = new CompletableFuture<>();
3209 +                exs[i] = new CFException();
3210 +            }
3211              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3212              checkIncomplete(f);
3213 <            for (int i = 0; i < k; ++i) {
3214 <                fs[i].completeExceptionally(new CFException());
3215 <                checkCompletedWithWrappedCFException(f);
3213 >            for (int i = 0; i < k; i++) {
3214 >                fs[i].completeExceptionally(exs[i]);
3215 >                checkCompletedWithWrappedException(f, exs[0]);
3216 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3217 >            }
3218 >        }
3219 >    }
3220 >
3221 >    public void testAnyOf_exceptional_backwards() throws Exception {
3222 >        for (int k = 0; k < 10; k++) {
3223 >            CompletableFuture[] fs = new CompletableFuture[k];
3224 >            CFException[] exs = new CFException[k];
3225 >            for (int i = 0; i < k; i++) {
3226 >                fs[i] = new CompletableFuture<>();
3227 >                exs[i] = new CFException();
3228 >            }
3229 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3230 >            checkIncomplete(f);
3231 >            for (int i = k - 1; i >= 0; i--) {
3232 >                fs[i].completeExceptionally(exs[i]);
3233 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3234                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3235              }
3236          }
# Line 3239 | Line 3243 | public class CompletableFutureTest exten
3243          CompletableFuture<Integer> f = new CompletableFuture<>();
3244          CompletableFuture<Integer> g = new CompletableFuture<>();
3245          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3242        CompletableFuture<?> h;
3246          ThreadExecutor exec = new ThreadExecutor();
3247  
3248          Runnable[] throwingActions = {
3249              () -> CompletableFuture.supplyAsync(null),
3250              () -> CompletableFuture.supplyAsync(null, exec),
3251 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3251 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3252  
3253              () -> CompletableFuture.runAsync(null),
3254              () -> CompletableFuture.runAsync(null, exec),
# Line 3318 | Line 3321 | public class CompletableFutureTest exten
3321  
3322              () -> f.thenCompose(null),
3323              () -> f.thenComposeAsync(null),
3324 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3324 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3325              () -> f.thenComposeAsync(null, exec),
3326  
3327              () -> f.exceptionally(null),
# Line 3336 | Line 3339 | public class CompletableFutureTest exten
3339              () -> CompletableFuture.anyOf(null, f),
3340  
3341              () -> f.obtrudeException(null),
3342 +
3343 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3344 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3345 +            () -> CompletableFuture.delayedExecutor(1L, null),
3346 +
3347 +            () -> f.orTimeout(1L, null),
3348 +            () -> f.completeOnTimeout(42, 1L, null),
3349 +
3350 +            () -> CompletableFuture.failedFuture(null),
3351 +            () -> CompletableFuture.failedStage(null),
3352          };
3353  
3354          assertThrows(NullPointerException.class, throwingActions);
# Line 3343 | Line 3356 | public class CompletableFutureTest exten
3356      }
3357  
3358      /**
3359 +     * Test submissions to an executor that rejects all tasks.
3360 +     */
3361 +    public void testRejectingExecutor() {
3362 +        for (Integer v : new Integer[] { 1, null })
3363 +    {
3364 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3365 +
3366 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3367 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3368 +
3369 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3370 +
3371 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3372 +        srcs.add(complete);
3373 +        srcs.add(incomplete);
3374 +
3375 +        for (CompletableFuture<Integer> src : srcs) {
3376 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3377 +            fs.add(src.thenRunAsync(() -> {}, e));
3378 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3379 +            fs.add(src.thenApplyAsync((z) -> z, e));
3380 +
3381 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3382 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3383 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3384 +
3385 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3386 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3387 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3388 +
3389 +            fs.add(src.thenComposeAsync((z) -> null, e));
3390 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3391 +            fs.add(src.handleAsync((z, t) -> null, e));
3392 +
3393 +            for (CompletableFuture<?> future : fs) {
3394 +                if (src.isDone())
3395 +                    checkCompletedWithWrappedException(future, e.ex);
3396 +                else
3397 +                    checkIncomplete(future);
3398 +            }
3399 +            futures.addAll(fs);
3400 +        }
3401 +
3402 +        {
3403 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3404 +
3405 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3406 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3407 +
3408 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3409 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3410 +
3411 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3412 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3413 +
3414 +            for (CompletableFuture<?> future : fs)
3415 +                checkIncomplete(future);
3416 +            futures.addAll(fs);
3417 +        }
3418 +
3419 +        {
3420 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3421 +
3422 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3423 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3424 +
3425 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3426 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3427 +
3428 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3429 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3430 +
3431 +            for (CompletableFuture<?> future : fs)
3432 +                checkCompletedWithWrappedException(future, e.ex);
3433 +            futures.addAll(fs);
3434 +        }
3435 +
3436 +        incomplete.complete(v);
3437 +
3438 +        for (CompletableFuture<?> future : futures)
3439 +            checkCompletedWithWrappedException(future, e.ex);
3440 +
3441 +        assertEquals(futures.size(), e.count.get());
3442 +    }}
3443 +
3444 +    /**
3445 +     * Test submissions to an executor that rejects all tasks, but
3446 +     * should never be invoked because the dependent future is
3447 +     * explicitly completed.
3448 +     */
3449 +    public void testRejectingExecutorNeverInvoked() {
3450 +        for (Integer v : new Integer[] { 1, null })
3451 +    {
3452 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3453 +
3454 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3455 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3456 +
3457 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3458 +
3459 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3460 +        srcs.add(complete);
3461 +        srcs.add(incomplete);
3462 +
3463 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3464 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3465 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3466 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3467 +
3468 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3469 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3470 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3471 +
3472 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3473 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3474 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3475 +
3476 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3477 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3478 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3479 +
3480 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3481 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3482 +
3483 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3484 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3485 +
3486 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3487 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3488 +
3489 +        for (CompletableFuture<?> future : fs)
3490 +            checkIncomplete(future);
3491 +
3492 +        for (CompletableFuture<?> future : fs)
3493 +            future.complete(null);
3494 +
3495 +        incomplete.complete(v);
3496 +
3497 +        for (CompletableFuture<?> future : fs)
3498 +            checkCompletedNormally(future, null);
3499 +
3500 +        assertEquals(0, e.count.get());
3501 +    }}
3502 +
3503 +    /**
3504       * toCompletableFuture returns this CompletableFuture.
3505       */
3506      public void testToCompletableFuture() {
# Line 3350 | Line 3508 | public class CompletableFutureTest exten
3508          assertSame(f, f.toCompletableFuture());
3509      }
3510  
3511 +    // jdk9
3512 +
3513      /**
3514 <     * whenComplete action executes on normal completion, propagating
3355 <     * source result.
3514 >     * newIncompleteFuture returns an incomplete CompletableFuture
3515       */
3516 <    public void testWhenComplete_normalCompletion1() {
3517 <        for (boolean createIncomplete : new boolean[] { true, false })
3518 <        for (ExecutionMode m : ExecutionMode.values())
3519 <        for (Integer v1 : new Integer[] { 1, null }) {
3520 <
3521 <        final AtomicInteger a = new AtomicInteger();
3522 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3523 <        if (!createIncomplete) f.complete(v1);
3365 <        final CompletableFuture<Integer> g =
3366 <            m.whenComplete(f,
3367 <                           (Integer x, Throwable t) -> {
3368 <                               threadAssertSame(x, v1);
3369 <                               threadAssertNull(t);
3370 <                               a.getAndIncrement();
3371 <                           });
3372 <        if (createIncomplete) f.complete(v1);
3516 >    public void testNewIncompleteFuture() {
3517 >        for (Integer v1 : new Integer[] { 1, null })
3518 >    {
3519 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3520 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3521 >        checkIncomplete(f);
3522 >        checkIncomplete(g);
3523 >        f.complete(v1);
3524          checkCompletedNormally(f, v1);
3525 +        checkIncomplete(g);
3526 +        g.complete(v1);
3527          checkCompletedNormally(g, v1);
3528 <        assertEquals(a.get(), 1);
3529 <        }
3528 >        assertSame(g.getClass(), CompletableFuture.class);
3529 >    }}
3530 >
3531 >    /**
3532 >     * completedStage returns a completed CompletionStage
3533 >     */
3534 >    public void testCompletedStage() {
3535 >        AtomicInteger x = new AtomicInteger(0);
3536 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3537 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3538 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3539 >        assertEquals(x.get(), 1);
3540 >        assertNull(r.get());
3541      }
3542  
3543      /**
3544 <     * whenComplete action executes on exceptional completion, propagating
3545 <     * source result.
3544 >     * defaultExecutor by default returns the commonPool if
3545 >     * it supports more than one thread.
3546       */
3547 <    public void testWhenComplete_exceptionalCompletion() {
3548 <        for (boolean createIncomplete : new boolean[] { true, false })
3549 <        for (ExecutionMode m : ExecutionMode.values())
3550 <        for (Integer v1 : new Integer[] { 1, null }) {
3547 >    public void testDefaultExecutor() {
3548 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3549 >        Executor e = f.defaultExecutor();
3550 >        Executor c = ForkJoinPool.commonPool();
3551 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3552 >            assertSame(e, c);
3553 >        else
3554 >            assertNotSame(e, c);
3555 >    }
3556  
3557 <        final AtomicInteger a = new AtomicInteger();
3558 <        final CFException ex = new CFException();
3559 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3560 <        if (!createIncomplete) f.completeExceptionally(ex);
3561 <        final CompletableFuture<Integer> g = m.whenComplete
3562 <            (f,
3563 <             (Integer x, Throwable t) -> {
3564 <                threadAssertNull(x);
3396 <                threadAssertSame(t, ex);
3397 <                a.getAndIncrement();
3398 <            });
3399 <        if (createIncomplete) f.completeExceptionally(ex);
3400 <        checkCompletedWithWrappedCFException(f, ex);
3401 <        checkCompletedWithWrappedCFException(g, ex);
3402 <        assertEquals(a.get(), 1);
3403 <        }
3557 >    /**
3558 >     * failedFuture returns a CompletableFuture completed
3559 >     * exceptionally with the given Exception
3560 >     */
3561 >    public void testFailedFuture() {
3562 >        CFException ex = new CFException();
3563 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3564 >        checkCompletedExceptionally(f, ex);
3565      }
3566  
3567      /**
3568 <     * If a whenComplete action throws an exception when triggered by
3408 <     * a normal completion, it completes exceptionally
3568 >     * failedFuture(null) throws NPE
3569       */
3570 <    public void testWhenComplete_actionFailed() {
3571 <        for (boolean createIncomplete : new boolean[] { true, false })
3572 <        for (ExecutionMode m : ExecutionMode.values())
3573 <        for (Integer v1 : new Integer[] { 1, null }) {
3570 >    public void testFailedFuture_null() {
3571 >        try {
3572 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3573 >            shouldThrow();
3574 >        } catch (NullPointerException success) {}
3575 >    }
3576  
3577 <        final CFException ex = new CFException();
3578 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3579 <        if (!createIncomplete) f.complete(v1);
3580 <        final CompletableFuture<Integer> g = m.whenComplete
3581 <            (f,
3582 <             (Integer x, Throwable t) -> {
3583 <                threadAssertSame(x, v1);
3584 <                threadAssertNull(t);
3585 <                throw ex;
3586 <            });
3587 <        if (createIncomplete) f.complete(v1);
3588 <        checkCompletedNormally(f, v1);
3427 <        checkCompletedWithWrappedCFException(g, ex);
3428 <        }
3577 >    /**
3578 >     * copy returns a CompletableFuture that is completed normally,
3579 >     * with the same value, when source is.
3580 >     */
3581 >    public void testCopy() {
3582 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3583 >        CompletableFuture<Integer> g = f.copy();
3584 >        checkIncomplete(f);
3585 >        checkIncomplete(g);
3586 >        f.complete(1);
3587 >        checkCompletedNormally(f, 1);
3588 >        checkCompletedNormally(g, 1);
3589      }
3590  
3591      /**
3592 <     * If a whenComplete action throws an exception when triggered by
3593 <     * a source completion that also throws an exception, the source
3434 <     * exception takes precedence.
3592 >     * copy returns a CompletableFuture that is completed exceptionally
3593 >     * when source is.
3594       */
3595 <    public void testWhenComplete_actionFailedSourceFailed() {
3596 <        for (boolean createIncomplete : new boolean[] { true, false })
3597 <        for (ExecutionMode m : ExecutionMode.values())
3598 <        for (Integer v1 : new Integer[] { 1, null }) {
3595 >    public void testCopy2() {
3596 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3597 >        CompletableFuture<Integer> g = f.copy();
3598 >        checkIncomplete(f);
3599 >        checkIncomplete(g);
3600 >        CFException ex = new CFException();
3601 >        f.completeExceptionally(ex);
3602 >        checkCompletedExceptionally(f, ex);
3603 >        checkCompletedWithWrappedException(g, ex);
3604 >    }
3605  
3606 <        final CFException ex1 = new CFException();
3607 <        final CFException ex2 = new CFException();
3608 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3606 >    /**
3607 >     * minimalCompletionStage returns a CompletableFuture that is
3608 >     * completed normally, with the same value, when source is.
3609 >     */
3610 >    public void testMinimalCompletionStage() {
3611 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3612 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3613 >        AtomicInteger x = new AtomicInteger(0);
3614 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3615 >        checkIncomplete(f);
3616 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3617 >        f.complete(1);
3618 >        checkCompletedNormally(f, 1);
3619 >        assertEquals(x.get(), 1);
3620 >        assertNull(r.get());
3621 >    }
3622  
3623 <        if (!createIncomplete) f.completeExceptionally(ex1);
3624 <        final CompletableFuture<Integer> g = m.whenComplete
3625 <            (f,
3626 <             (Integer x, Throwable t) -> {
3627 <                threadAssertSame(t, ex1);
3628 <                threadAssertNull(x);
3629 <                throw ex2;
3630 <            });
3631 <        if (createIncomplete) f.completeExceptionally(ex1);
3623 >    /**
3624 >     * minimalCompletionStage returns a CompletableFuture that is
3625 >     * completed exceptionally when source is.
3626 >     */
3627 >    public void testMinimalCompletionStage2() {
3628 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3629 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3630 >        AtomicInteger x = new AtomicInteger(0);
3631 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3632 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3633 >        checkIncomplete(f);
3634 >        CFException ex = new CFException();
3635 >        f.completeExceptionally(ex);
3636 >        checkCompletedExceptionally(f, ex);
3637 >        assertEquals(x.get(), 0);
3638 >        assertEquals(r.get().getCause(), ex);
3639 >    }
3640  
3641 <        checkCompletedWithWrappedCFException(f, ex1);
3642 <        checkCompletedWithWrappedCFException(g, ex1);
3643 <        }
3641 >    /**
3642 >     * failedStage returns a CompletionStage completed
3643 >     * exceptionally with the given Exception
3644 >     */
3645 >    public void testFailedStage() {
3646 >        CFException ex = new CFException();
3647 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3648 >        AtomicInteger x = new AtomicInteger(0);
3649 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3650 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3651 >        assertEquals(x.get(), 0);
3652 >        assertEquals(r.get(), ex);
3653      }
3654  
3655      /**
3656 <     * handleAsync action completes normally with function value on
3462 <     * either normal or exceptional completion of source
3656 >     * completeAsync completes with value of given supplier
3657       */
3658 <    public void testHandleAsync() {
3659 <        CompletableFuture<Integer> f, g;
3660 <        IntegerHandler r;
3658 >    public void testCompleteAsync() {
3659 >        for (Integer v1 : new Integer[] { 1, null })
3660 >    {
3661 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3662 >        f.completeAsync(() -> v1);
3663 >        f.join();
3664 >        checkCompletedNormally(f, v1);
3665 >    }}
3666  
3667 <        f = new CompletableFuture<>();
3668 <        g = f.handleAsync(r = new IntegerHandler());
3669 <        assertEquals(0, r.invocationCount);
3670 <        f.completeExceptionally(new CFException());
3671 <        checkCompletedWithWrappedCFException(f);
3672 <        checkCompletedNormally(g, three);
3673 <        assertEquals(1, r.invocationCount);
3667 >    /**
3668 >     * completeAsync completes exceptionally if given supplier throws
3669 >     */
3670 >    public void testCompleteAsync2() {
3671 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3672 >        CFException ex = new CFException();
3673 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3674 >        try {
3675 >            f.join();
3676 >            shouldThrow();
3677 >        } catch (CompletionException success) {}
3678 >        checkCompletedWithWrappedException(f, ex);
3679 >    }
3680  
3681 <        f = new CompletableFuture<>();
3682 <        g = f.handleAsync(r = new IntegerHandler());
3683 <        assertEquals(0, r.invocationCount);
3684 <        f.completeExceptionally(new CFException());
3685 <        checkCompletedWithWrappedCFException(f);
3686 <        checkCompletedNormally(g, three);
3687 <        assertEquals(1, r.invocationCount);
3681 >    /**
3682 >     * completeAsync with given executor completes with value of given supplier
3683 >     */
3684 >    public void testCompleteAsync3() {
3685 >        for (Integer v1 : new Integer[] { 1, null })
3686 >    {
3687 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3688 >        ThreadExecutor executor = new ThreadExecutor();
3689 >        f.completeAsync(() -> v1, executor);
3690 >        assertSame(v1, f.join());
3691 >        checkCompletedNormally(f, v1);
3692 >        assertEquals(1, executor.count.get());
3693 >    }}
3694  
3695 <        f = new CompletableFuture<>();
3696 <        g = f.handleAsync(r = new IntegerHandler());
3697 <        assertEquals(0, r.invocationCount);
3698 <        f.complete(one);
3699 <        checkCompletedNormally(f, one);
3700 <        checkCompletedNormally(g, two);
3701 <        assertEquals(1, r.invocationCount);
3695 >    /**
3696 >     * completeAsync with given executor completes exceptionally if
3697 >     * given supplier throws
3698 >     */
3699 >    public void testCompleteAsync4() {
3700 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3701 >        CFException ex = new CFException();
3702 >        ThreadExecutor executor = new ThreadExecutor();
3703 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3704 >        try {
3705 >            f.join();
3706 >            shouldThrow();
3707 >        } catch (CompletionException success) {}
3708 >        checkCompletedWithWrappedException(f, ex);
3709 >        assertEquals(1, executor.count.get());
3710 >    }
3711  
3712 <        f = new CompletableFuture<>();
3713 <        g = f.handleAsync(r = new IntegerHandler());
3714 <        assertEquals(0, r.invocationCount);
3715 <        f.complete(one);
3716 <        checkCompletedNormally(f, one);
3717 <        checkCompletedNormally(g, two);
3718 <        assertEquals(1, r.invocationCount);
3712 >    /**
3713 >     * orTimeout completes with TimeoutException if not complete
3714 >     */
3715 >    public void testOrTimeout_timesOut() {
3716 >        long timeoutMillis = timeoutMillis();
3717 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3718 >        long startTime = System.nanoTime();
3719 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3720 >        checkCompletedWithTimeoutException(f);
3721 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3722      }
3723  
3724      /**
3725 <     * handleAsync action with Executor completes normally with
3503 <     * function value on either normal or exceptional completion of
3504 <     * source
3725 >     * orTimeout completes normally if completed before timeout
3726       */
3727 <    public void testHandleAsync2() {
3728 <        CompletableFuture<Integer> f, g;
3729 <        ThreadExecutor exec = new ThreadExecutor();
3730 <        IntegerHandler r;
3727 >    public void testOrTimeout_completed() {
3728 >        for (Integer v1 : new Integer[] { 1, null })
3729 >    {
3730 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3731 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3732 >        long startTime = System.nanoTime();
3733 >        f.complete(v1);
3734 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3735 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3736 >        g.complete(v1);
3737 >        checkCompletedNormally(f, v1);
3738 >        checkCompletedNormally(g, v1);
3739 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3740 >    }}
3741  
3742 <        f = new CompletableFuture<>();
3743 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3744 <        assertEquals(0, r.invocationCount);
3745 <        f.completeExceptionally(new CFException());
3746 <        checkCompletedWithWrappedCFException(f);
3747 <        checkCompletedNormally(g, three);
3748 <        assertEquals(1, r.invocationCount);
3742 >    /**
3743 >     * completeOnTimeout completes with given value if not complete
3744 >     */
3745 >    public void testCompleteOnTimeout_timesOut() {
3746 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3747 >                       () -> testCompleteOnTimeout_timesOut(null));
3748 >    }
3749  
3750 <        f = new CompletableFuture<>();
3751 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3752 <        assertEquals(0, r.invocationCount);
3753 <        f.completeExceptionally(new CFException());
3754 <        checkCompletedWithWrappedCFException(f);
3755 <        checkCompletedNormally(g, three);
3756 <        assertEquals(1, r.invocationCount);
3750 >    /**
3751 >     * completeOnTimeout completes with given value if not complete
3752 >     */
3753 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3754 >        long timeoutMillis = timeoutMillis();
3755 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3756 >        long startTime = System.nanoTime();
3757 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3758 >        assertSame(v, f.join());
3759 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3760 >        f.complete(99);         // should have no effect
3761 >        checkCompletedNormally(f, v);
3762 >    }
3763  
3764 <        f = new CompletableFuture<>();
3765 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3766 <        assertEquals(0, r.invocationCount);
3767 <        f.complete(one);
3768 <        checkCompletedNormally(f, one);
3769 <        checkCompletedNormally(g, two);
3770 <        assertEquals(1, r.invocationCount);
3764 >    /**
3765 >     * completeOnTimeout has no effect if completed within timeout
3766 >     */
3767 >    public void testCompleteOnTimeout_completed() {
3768 >        for (Integer v1 : new Integer[] { 1, null })
3769 >    {
3770 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3771 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3772 >        long startTime = System.nanoTime();
3773 >        f.complete(v1);
3774 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3775 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3776 >        g.complete(v1);
3777 >        checkCompletedNormally(f, v1);
3778 >        checkCompletedNormally(g, v1);
3779 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3780 >    }}
3781  
3782 <        f = new CompletableFuture<>();
3783 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3784 <        assertEquals(0, r.invocationCount);
3785 <        f.complete(one);
3786 <        checkCompletedNormally(f, one);
3787 <        checkCompletedNormally(g, two);
3788 <        assertEquals(1, r.invocationCount);
3782 >    /**
3783 >     * delayedExecutor returns an executor that delays submission
3784 >     */
3785 >    public void testDelayedExecutor() {
3786 >        testInParallel(() -> testDelayedExecutor(null, null),
3787 >                       () -> testDelayedExecutor(null, 1),
3788 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3789 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3790 >    }
3791 >
3792 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3793 >        long timeoutMillis = timeoutMillis();
3794 >        // Use an "unreasonably long" long timeout to catch lingering threads
3795 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3796 >        final Executor delayer, longDelayer;
3797 >        if (executor == null) {
3798 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3799 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3800 >        } else {
3801 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3802 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3803 >        }
3804 >        long startTime = System.nanoTime();
3805 >        CompletableFuture<Integer> f =
3806 >            CompletableFuture.supplyAsync(() -> v, delayer);
3807 >        CompletableFuture<Integer> g =
3808 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3809 >
3810 >        assertNull(g.getNow(null));
3811 >
3812 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3813 >        long millisElapsed = millisElapsedSince(startTime);
3814 >        assertTrue(millisElapsed >= timeoutMillis);
3815 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3816 >
3817 >        checkCompletedNormally(f, v);
3818 >
3819 >        checkIncomplete(g);
3820 >        assertTrue(g.cancel(true));
3821 >    }
3822 >
3823 >    //--- tests of implementation details; not part of official tck ---
3824 >
3825 >    Object resultOf(CompletableFuture<?> f) {
3826 >        SecurityManager sm = System.getSecurityManager();
3827 >        if (sm != null) {
3828 >            try {
3829 >                System.setSecurityManager(null);
3830 >            } catch (SecurityException giveUp) {
3831 >                return "Reflection not available";
3832 >            }
3833 >        }
3834 >
3835 >        try {
3836 >            java.lang.reflect.Field resultField
3837 >                = CompletableFuture.class.getDeclaredField("result");
3838 >            resultField.setAccessible(true);
3839 >            return resultField.get(f);
3840 >        } catch (Throwable t) {
3841 >            throw new AssertionError(t);
3842 >        } finally {
3843 >            if (sm != null) System.setSecurityManager(sm);
3844 >        }
3845      }
3846  
3847 +    public void testExceptionPropagationReusesResultObject() {
3848 +        if (!testImplementationDetails) return;
3849 +        for (ExecutionMode m : ExecutionMode.values())
3850 +    {
3851 +        final CFException ex = new CFException();
3852 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3853 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3854 +
3855 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3856 +            = new ArrayList<>();
3857 +
3858 +        funs.add((y) -> m.thenRun(y, new Noop(m)));
3859 +        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3860 +        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3861 +
3862 +        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3863 +        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3864 +        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3865 +
3866 +        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3867 +        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3868 +        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3869 +        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3870 +        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3871 +        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3872 +
3873 +        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3874 +
3875 +        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3876 +
3877 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3878 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3879 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3880 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3881 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3882 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3883 +
3884 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3885 +                 fun : funs) {
3886 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3887 +            f.completeExceptionally(ex);
3888 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3889 +            checkCompletedWithWrappedException(src, ex);
3890 +            CompletableFuture<?> dep = fun.apply(src);
3891 +            checkCompletedWithWrappedException(dep, ex);
3892 +            assertSame(resultOf(src), resultOf(dep));
3893 +        }
3894 +
3895 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3896 +                 fun : funs) {
3897 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3898 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3899 +            CompletableFuture<?> dep = fun.apply(src);
3900 +            f.completeExceptionally(ex);
3901 +            checkCompletedWithWrappedException(src, ex);
3902 +            checkCompletedWithWrappedException(dep, ex);
3903 +            assertSame(resultOf(src), resultOf(dep));
3904 +        }
3905 +
3906 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3907 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3908 +                 fun : funs) {
3909 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3910 +            f.cancel(mayInterruptIfRunning);
3911 +            checkCancelled(f);
3912 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3913 +            checkCompletedWithWrappedCancellationException(src);
3914 +            CompletableFuture<?> dep = fun.apply(src);
3915 +            checkCompletedWithWrappedCancellationException(dep);
3916 +            assertSame(resultOf(src), resultOf(dep));
3917 +        }
3918 +
3919 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3920 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3921 +                 fun : funs) {
3922 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3923 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3924 +            CompletableFuture<?> dep = fun.apply(src);
3925 +            f.cancel(mayInterruptIfRunning);
3926 +            checkCancelled(f);
3927 +            checkCompletedWithWrappedCancellationException(src);
3928 +            checkCompletedWithWrappedCancellationException(dep);
3929 +            assertSame(resultOf(src), resultOf(dep));
3930 +        }
3931 +    }}
3932 +
3933 +    /**
3934 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3935 +     */
3936 +    public void testMinimalCompletionStage_minimality() {
3937 +        if (!testImplementationDetails) return;
3938 +        Function<Method, String> toSignature =
3939 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3940 +        Predicate<Method> isNotStatic =
3941 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3942 +        List<Method> minimalMethods =
3943 +            Stream.of(Object.class, CompletionStage.class)
3944 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3945 +            .filter(isNotStatic)
3946 +            .collect(Collectors.toList());
3947 +        // Methods from CompletableFuture permitted NOT to throw UOE
3948 +        String[] signatureWhitelist = {
3949 +            "newIncompleteFuture[]",
3950 +            "defaultExecutor[]",
3951 +            "minimalCompletionStage[]",
3952 +            "copy[]",
3953 +        };
3954 +        Set<String> permittedMethodSignatures =
3955 +            Stream.concat(minimalMethods.stream().map(toSignature),
3956 +                          Stream.of(signatureWhitelist))
3957 +            .collect(Collectors.toSet());
3958 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3959 +            .filter(isNotStatic)
3960 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3961 +            .collect(Collectors.toList());
3962 +
3963 +        CompletionStage<Integer> minimalStage =
3964 +            new CompletableFuture<Integer>().minimalCompletionStage();
3965 +
3966 +        List<Method> bugs = new ArrayList<>();
3967 +        for (Method method : allMethods) {
3968 +            Class<?>[] parameterTypes = method.getParameterTypes();
3969 +            Object[] args = new Object[parameterTypes.length];
3970 +            // Manufacture boxed primitives for primitive params
3971 +            for (int i = 0; i < args.length; i++) {
3972 +                Class<?> type = parameterTypes[i];
3973 +                if (parameterTypes[i] == boolean.class)
3974 +                    args[i] = false;
3975 +                else if (parameterTypes[i] == int.class)
3976 +                    args[i] = 0;
3977 +                else if (parameterTypes[i] == long.class)
3978 +                    args[i] = 0L;
3979 +            }
3980 +            try {
3981 +                method.invoke(minimalStage, args);
3982 +                bugs.add(method);
3983 +            }
3984 +            catch (java.lang.reflect.InvocationTargetException expected) {
3985 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3986 +                    bugs.add(method);
3987 +                    // expected.getCause().printStackTrace();
3988 +                }
3989 +            }
3990 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3991 +        }
3992 +        if (!bugs.isEmpty())
3993 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3994 +    }
3995 +
3996 +    static class Monad {
3997 +        static class ZeroException extends RuntimeException {
3998 +            public ZeroException() { super("monadic zero"); }
3999 +        }
4000 +        // "return", "unit"
4001 +        static <T> CompletableFuture<T> unit(T value) {
4002 +            return completedFuture(value);
4003 +        }
4004 +        // monadic zero ?
4005 +        static <T> CompletableFuture<T> zero() {
4006 +            return failedFuture(new ZeroException());
4007 +        }
4008 +        // >=>
4009 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4010 +            (Function<T, CompletableFuture<U>> f,
4011 +             Function<U, CompletableFuture<V>> g) {
4012 +            return (x) -> f.apply(x).thenCompose(g);
4013 +        }
4014 +
4015 +        static void assertZero(CompletableFuture<?> f) {
4016 +            try {
4017 +                f.getNow(null);
4018 +                throw new AssertionFailedError("should throw");
4019 +            } catch (CompletionException success) {
4020 +                assertTrue(success.getCause() instanceof ZeroException);
4021 +            }
4022 +        }
4023 +
4024 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4025 +                                           CompletableFuture<T> g) {
4026 +            T fval = null, gval = null;
4027 +            Throwable fex = null, gex = null;
4028 +
4029 +            try { fval = f.get(); }
4030 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4031 +            catch (Throwable ex) { fex = ex; }
4032 +
4033 +            try { gval = g.get(); }
4034 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4035 +            catch (Throwable ex) { gex = ex; }
4036 +
4037 +            if (fex != null || gex != null)
4038 +                assertSame(fex.getClass(), gex.getClass());
4039 +            else
4040 +                assertEquals(fval, gval);
4041 +        }
4042 +
4043 +        static class PlusFuture<T> extends CompletableFuture<T> {
4044 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4045 +        }
4046 +
4047 +        /** Implements "monadic plus". */
4048 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4049 +                                             CompletableFuture<? extends T> g) {
4050 +            PlusFuture<T> plus = new PlusFuture<T>();
4051 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4052 +                try {
4053 +                    if (ex == null) {
4054 +                        if (plus.complete(result))
4055 +                            if (plus.firstFailure.get() != null)
4056 +                                plus.firstFailure.set(null);
4057 +                    }
4058 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4059 +                        if (plus.isDone())
4060 +                            plus.firstFailure.set(null);
4061 +                    }
4062 +                    else {
4063 +                        // first failure has precedence
4064 +                        Throwable first = plus.firstFailure.getAndSet(null);
4065 +
4066 +                        // may fail with "Self-suppression not permitted"
4067 +                        try { first.addSuppressed(ex); }
4068 +                        catch (Exception ignored) {}
4069 +
4070 +                        plus.completeExceptionally(first);
4071 +                    }
4072 +                } catch (Throwable unexpected) {
4073 +                    plus.completeExceptionally(unexpected);
4074 +                }
4075 +            };
4076 +            f.whenComplete(action);
4077 +            g.whenComplete(action);
4078 +            return plus;
4079 +        }
4080 +    }
4081 +
4082 +    /**
4083 +     * CompletableFuture is an additive monad - sort of.
4084 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4085 +     */
4086 +    public void testAdditiveMonad() throws Throwable {
4087 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4088 +        CompletableFuture<Long> zero = Monad.zero();
4089 +
4090 +        // Some mutually non-commutative functions
4091 +        Function<Long, CompletableFuture<Long>> triple
4092 +            = (x) -> Monad.unit(3 * x);
4093 +        Function<Long, CompletableFuture<Long>> inc
4094 +            = (x) -> Monad.unit(x + 1);
4095 +
4096 +        // unit is a right identity: m >>= unit === m
4097 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4098 +                                 inc.apply(5L));
4099 +        // unit is a left identity: (unit x) >>= f === f x
4100 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4101 +                                 inc.apply(5L));
4102 +
4103 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4104 +        Monad.assertFutureEquals(
4105 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4106 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4107 +
4108 +        // The case for CompletableFuture as an additive monad is weaker...
4109 +
4110 +        // zero is a monadic zero
4111 +        Monad.assertZero(zero);
4112 +
4113 +        // left zero: zero >>= f === zero
4114 +        Monad.assertZero(zero.thenCompose(inc));
4115 +        // right zero: f >>= (\x -> zero) === zero
4116 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4117 +
4118 +        // f plus zero === f
4119 +        Monad.assertFutureEquals(Monad.unit(5L),
4120 +                                 Monad.plus(Monad.unit(5L), zero));
4121 +        // zero plus f === f
4122 +        Monad.assertFutureEquals(Monad.unit(5L),
4123 +                                 Monad.plus(zero, Monad.unit(5L)));
4124 +        // zero plus zero === zero
4125 +        Monad.assertZero(Monad.plus(zero, zero));
4126 +        {
4127 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4128 +                                                   Monad.unit(8L));
4129 +            // non-determinism
4130 +            assertTrue(f.get() == 5L || f.get() == 8L);
4131 +        }
4132 +
4133 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4134 +        // f plus godot === f (doesn't wait for godot)
4135 +        Monad.assertFutureEquals(Monad.unit(5L),
4136 +                                 Monad.plus(Monad.unit(5L), godot));
4137 +        // godot plus f === f (doesn't wait for godot)
4138 +        Monad.assertFutureEquals(Monad.unit(5L),
4139 +                                 Monad.plus(godot, Monad.unit(5L)));
4140 +    }
4141 +
4142 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4143 +    public void testRecursiveChains() throws Throwable {
4144 +        for (ExecutionMode m : ExecutionMode.values())
4145 +        for (boolean addDeadEnds : new boolean[] { true, false })
4146 +    {
4147 +        final int val = 42;
4148 +        final int n = expensiveTests ? 1_000 : 2;
4149 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4150 +        CompletableFuture<Integer> tail = head;
4151 +        for (int i = 0; i < n; i++) {
4152 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4153 +            tail = m.thenApply(tail, v -> v + 1);
4154 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4155 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4156 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4157 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4158 +        }
4159 +        head.complete(val);
4160 +        assertEquals(val + 3 * n, (int) tail.join());
4161 +    }}
4162 +
4163 +    /**
4164 +     * A single CompletableFuture with many dependents.
4165 +     * A demo of scalability - runtime is O(n).
4166 +     */
4167 +    public void testManyDependents() throws Throwable {
4168 +        final int n = expensiveTests ? 1_000_000 : 10;
4169 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4170 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4171 +        final AtomicInteger count = new AtomicInteger(0);
4172 +        for (int i = 0; i < n; i++) {
4173 +            head.thenRun(() -> count.getAndIncrement());
4174 +            head.thenAccept((x) -> count.getAndIncrement());
4175 +            head.thenApply((x) -> count.getAndIncrement());
4176 +
4177 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4178 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4179 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4180 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4181 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4182 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4183 +
4184 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4185 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4186 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4187 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4188 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4189 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4190 +        }
4191 +        head.complete(null);
4192 +        assertEquals(5 * 3 * n, count.get());
4193 +    }
4194 +
4195 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4196 +    public void testCoCompletionGarbageRetention() throws Throwable {
4197 +        final int n = expensiveTests ? 1_000_000 : 10;
4198 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4199 +        CompletableFuture<Integer> f;
4200 +        for (int i = 0; i < n; i++) {
4201 +            f = new CompletableFuture<>();
4202 +            f.runAfterEither(incomplete, () -> {});
4203 +            f.complete(null);
4204 +
4205 +            f = new CompletableFuture<>();
4206 +            f.acceptEither(incomplete, (x) -> {});
4207 +            f.complete(null);
4208 +
4209 +            f = new CompletableFuture<>();
4210 +            f.applyToEither(incomplete, (x) -> x);
4211 +            f.complete(null);
4212 +
4213 +            f = new CompletableFuture<>();
4214 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4215 +            f.complete(null);
4216 +        }
4217 +
4218 +        for (int i = 0; i < n; i++) {
4219 +            f = new CompletableFuture<>();
4220 +            incomplete.runAfterEither(f, () -> {});
4221 +            f.complete(null);
4222 +
4223 +            f = new CompletableFuture<>();
4224 +            incomplete.acceptEither(f, (x) -> {});
4225 +            f.complete(null);
4226 +
4227 +            f = new CompletableFuture<>();
4228 +            incomplete.applyToEither(f, (x) -> x);
4229 +            f.complete(null);
4230 +
4231 +            f = new CompletableFuture<>();
4232 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4233 +            f.complete(null);
4234 +        }
4235 +    }
4236 +
4237 +    /*
4238 +     * Tests below currently fail in stress mode due to memory retention.
4239 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
4240 +     */
4241 +
4242 +    /** Checks for garbage retention with anyOf. */
4243 +    public void testAnyOfGarbageRetention() throws Throwable {
4244 +        for (Integer v : new Integer[] { 1, null })
4245 +    {
4246 +        final int n = expensiveTests ? 100_000 : 10;
4247 +        CompletableFuture<Integer>[] fs
4248 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4249 +        for (int i = 0; i < fs.length; i++)
4250 +            fs[i] = new CompletableFuture<>();
4251 +        fs[fs.length - 1].complete(v);
4252 +        for (int i = 0; i < n; i++)
4253 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4254 +    }}
4255 +
4256 +    /** Checks for garbage retention with allOf. */
4257 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4258 +        final int n = expensiveTests ? 100_000 : 10;
4259 +        CompletableFuture<Integer>[] fs
4260 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4261 +        for (int i = 0; i < fs.length; i++)
4262 +            fs[i] = new CompletableFuture<>();
4263 +        for (int i = 0; i < n; i++)
4264 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4265 +    }
4266 +
4267 + //     static <U> U join(CompletionStage<U> stage) {
4268 + //         CompletableFuture<U> f = new CompletableFuture<>();
4269 + //         stage.whenComplete((v, ex) -> {
4270 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4271 + //         });
4272 + //         return f.join();
4273 + //     }
4274 +
4275 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4276 + //         CompletableFuture<U> f = new CompletableFuture<>();
4277 + //         stage.whenComplete((v, ex) -> {
4278 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4279 + //         });
4280 + //         return f.isDone();
4281 + //     }
4282 +
4283 + //     static <U> U join2(CompletionStage<U> stage) {
4284 + //         return stage.toCompletableFuture().copy().join();
4285 + //     }
4286 +
4287 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4288 + //         return stage.toCompletableFuture().copy().isDone();
4289 + //     }
4290 +
4291   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines