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.13 by jsr166, Sun Mar 31 18:17:18 2013 UTC vs.
Revision 1.72 by jsr166, Fri Jun 6 21:10:34 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19 + import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 55 | Line 58 | public class CompletableFutureTest exten
58  
59      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
60          try {
61 +            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
63 +        try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
66          try {
# Line 63 | Line 69 | public class CompletableFutureTest exten
69          try {
70              assertEquals(value, f.get());
71          } catch (Throwable fail) { threadUnexpectedException(fail); }
66        try {
67            assertEquals(value, f.get(0L, SECONDS));
68        } catch (Throwable fail) { threadUnexpectedException(fail); }
72          assertTrue(f.isDone());
73          assertFalse(f.isCancelled());
74 +        assertFalse(f.isCompletedExceptionally());
75          assertTrue(f.toString().contains("[Completed normally]"));
76      }
77  
78      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
79          try {
80 +            f.get(LONG_DELAY_MS, MILLISECONDS);
81 +            shouldThrow();
82 +        } catch (ExecutionException success) {
83 +            assertTrue(success.getCause() instanceof CFException);
84 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
85 +        try {
86              f.join();
87              shouldThrow();
88          } catch (CompletionException success) {
# Line 90 | Line 100 | public class CompletableFutureTest exten
100          } catch (ExecutionException success) {
101              assertTrue(success.getCause() instanceof CFException);
102          } catch (Throwable fail) { threadUnexpectedException(fail); }
103 +        assertTrue(f.isDone());
104 +        assertFalse(f.isCancelled());
105 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
106 +    }
107 +
108 +    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 +                                                      Throwable ex) {
110          try {
111 <            f.get(0L, SECONDS);
111 >            f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
113          } catch (ExecutionException success) {
114 <            assertTrue(success.getCause() instanceof CFException);
114 >            assertSame(ex, success.getCause());
115 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
116 >        try {
117 >            f.join();
118 >            shouldThrow();
119 >        } catch (CompletionException success) {
120 >            assertSame(ex, success.getCause());
121 >        }
122 >        try {
123 >            f.getNow(null);
124 >            shouldThrow();
125 >        } catch (CompletionException success) {
126 >            assertSame(ex, success.getCause());
127 >        }
128 >        try {
129 >            f.get();
130 >            shouldThrow();
131 >        } catch (ExecutionException success) {
132 >            assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +                                                            
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
138 +    }
139 +
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158      }
159  
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162 +            f.get(LONG_DELAY_MS, MILLISECONDS);
163 +            shouldThrow();
164 +        } catch (CancellationException success) {
165 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
166 +        try {
167              f.join();
168              shouldThrow();
169          } catch (CancellationException success) {}
# Line 114 | Line 176 | public class CompletableFutureTest exten
176              shouldThrow();
177          } catch (CancellationException success) {
178          } catch (Throwable fail) { threadUnexpectedException(fail); }
117        try {
118            f.get(0L, SECONDS);
119            shouldThrow();
120        } catch (CancellationException success) {
121        } catch (Throwable fail) { threadUnexpectedException(fail); }
179          assertTrue(f.isDone());
180 +        assertTrue(f.isCompletedExceptionally());
181          assertTrue(f.isCancelled());
182 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
183      }
184  
185      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
186          try {
187 +            f.get(LONG_DELAY_MS, MILLISECONDS);
188 +            shouldThrow();
189 +        } catch (ExecutionException success) {
190 +            assertTrue(success.getCause() instanceof CancellationException);
191 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
192 +        try {
193              f.join();
194              shouldThrow();
195          } catch (CompletionException success) {
# Line 142 | Line 207 | public class CompletableFutureTest exten
207          } catch (ExecutionException success) {
208              assertTrue(success.getCause() instanceof CancellationException);
209          } catch (Throwable fail) { threadUnexpectedException(fail); }
145        try {
146            f.get(0L, SECONDS);
147            shouldThrow();
148        } catch (ExecutionException success) {
149            assertTrue(success.getCause() instanceof CancellationException);
150        } catch (Throwable fail) { threadUnexpectedException(fail); }
210          assertTrue(f.isDone());
211          assertFalse(f.isCancelled());
212 +        assertTrue(f.isCompletedExceptionally());
213 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
214      }
215  
216      /**
# Line 157 | Line 218 | public class CompletableFutureTest exten
218       * by methods isDone, isCancelled, and getNow
219       */
220      public void testConstructor() {
221 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
221 >        CompletableFuture<Integer> f = new CompletableFuture<>();
222          checkIncomplete(f);
223      }
224  
# Line 166 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
230 >        CompletableFuture<Integer> f = new CompletableFuture<>();
231          checkIncomplete(f);
232          f.complete(one);
233          checkCompletedNormally(f, one);
# Line 177 | Line 238 | public class CompletableFutureTest exten
238       * methods isDone, isCancelled, join, get, and getNow
239       */
240      public void testCompleteExceptionally() {
241 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
241 >        CompletableFuture<Integer> f = new CompletableFuture<>();
242 >        CFException ex = new CFException();
243          checkIncomplete(f);
244 <        f.completeExceptionally(new CFException());
245 <        checkCompletedWithWrappedCFException(f);
244 >        f.completeExceptionally(ex);
245 >        checkCompletedExceptionally(f, ex);
246      }
247  
248      /**
# Line 188 | Line 250 | public class CompletableFutureTest exten
250       * methods isDone, isCancelled, join, get, and getNow
251       */
252      public void testCancel() {
253 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
253 >        CompletableFuture<Integer> f = new CompletableFuture<>();
254          checkIncomplete(f);
255          assertTrue(f.cancel(true));
256          checkCancelled(f);
# Line 198 | Line 260 | public class CompletableFutureTest exten
260       * obtrudeValue forces completion with given value
261       */
262      public void testObtrudeValue() {
263 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
263 >        CompletableFuture<Integer> f = new CompletableFuture<>();
264          checkIncomplete(f);
265          f.complete(one);
266          checkCompletedNormally(f, one);
# Line 206 | Line 268 | public class CompletableFutureTest exten
268          checkCompletedNormally(f, three);
269          f.obtrudeValue(two);
270          checkCompletedNormally(f, two);
271 <        f = new CompletableFuture<Integer>();
271 >        f = new CompletableFuture<>();
272          f.obtrudeValue(three);
273          checkCompletedNormally(f, three);
274 <        f = new CompletableFuture<Integer>();
274 >        f.obtrudeValue(null);
275 >        checkCompletedNormally(f, null);
276 >        f = new CompletableFuture<>();
277          f.completeExceptionally(new CFException());
278          f.obtrudeValue(four);
279          checkCompletedNormally(f, four);
# Line 219 | Line 283 | public class CompletableFutureTest exten
283       * obtrudeException forces completion with given exception
284       */
285      public void testObtrudeException() {
286 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
287 <        checkIncomplete(f);
288 <        f.complete(one);
289 <        checkCompletedNormally(f, one);
290 <        f.obtrudeException(new CFException());
291 <        checkCompletedWithWrappedCFException(f);
292 <        f = new CompletableFuture<Integer>();
293 <        f.obtrudeException(new CFException());
294 <        checkCompletedWithWrappedCFException(f);
295 <        f = new CompletableFuture<Integer>();
296 <        f.completeExceptionally(new CFException());
297 <        f.obtrudeValue(four);
298 <        checkCompletedNormally(f, four);
299 <        f.obtrudeException(new CFException());
300 <        checkCompletedWithWrappedCFException(f);
301 <    }
286 >        for (Integer v1 : new Integer[] { 1, null })
287 >    {
288 >        CFException ex;
289 >        CompletableFuture<Integer> f;
290 >
291 >        f = new CompletableFuture<>();
292 >        f.complete(v1);
293 >        for (int i = 0; i < 2; i++) {
294 >            f.obtrudeException(ex = new CFException());
295 >            checkCompletedExceptionally(f, ex);
296 >        }
297 >
298 >        f = new CompletableFuture<>();
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304 >        f = new CompletableFuture<>();
305 >        f.completeExceptionally(ex = new CFException());
306 >        f.obtrudeValue(v1);
307 >        checkCompletedNormally(f, v1);
308 >        f.obtrudeException(ex = new CFException());
309 >        checkCompletedExceptionally(f, ex);
310 >        f.completeExceptionally(new CFException());
311 >        checkCompletedExceptionally(f, ex);
312 >        f.complete(v1);
313 >        checkCompletedExceptionally(f, ex);
314 >    }}
315  
316      /**
317       * getNumberOfDependents returns number of dependent tasks
318       */
319      public void testGetNumberOfDependents() {
320 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
321 <        assertEquals(f.getNumberOfDependents(), 0);
322 <        CompletableFuture g = f.thenRun(new Noop());
323 <        assertEquals(f.getNumberOfDependents(), 1);
324 <        assertEquals(g.getNumberOfDependents(), 0);
325 <        CompletableFuture h = f.thenRun(new Noop());
326 <        assertEquals(f.getNumberOfDependents(), 2);
320 >        CompletableFuture<Integer> f = new CompletableFuture<>();
321 >        assertEquals(0, f.getNumberOfDependents());
322 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
323 >        assertEquals(1, f.getNumberOfDependents());
324 >        assertEquals(0, g.getNumberOfDependents());
325 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
326 >        assertEquals(2, f.getNumberOfDependents());
327          f.complete(1);
328          checkCompletedNormally(g, null);
329 <        assertEquals(f.getNumberOfDependents(), 0);
330 <        assertEquals(g.getNumberOfDependents(), 0);
329 >        assertEquals(0, f.getNumberOfDependents());
330 >        assertEquals(0, g.getNumberOfDependents());
331      }
332  
256
333      /**
334       * toString indicates current completion state
335       */
# Line 279 | Line 355 | public class CompletableFutureTest exten
355          checkCompletedNormally(f, "test");
356      }
357  
358 <    static final Supplier<Integer> supplyOne =
359 <        () -> Integer.valueOf(1);
360 <    static final Function<Integer, Integer> inc =
361 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
362 <    static final BiFunction<Integer, Integer, Integer> add =
363 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() + y.intValue());
364 <    static final class IncAction implements Consumer<Integer> {
289 <        int value;
290 <        public void accept(Integer x) { value = x.intValue() + 1; }
291 <    }
292 <    static final class AddAction implements BiConsumer<Integer, Integer> {
293 <        int value;
294 <        public void accept(Integer x, Integer y) {
295 <            value = x.intValue() + y.intValue();
358 >    abstract class CheckedAction {
359 >        int invocationCount = 0;
360 >        final ExecutionMode m;
361 >        CheckedAction(ExecutionMode m) { this.m = m; }
362 >        void invoked() {
363 >            m.checkExecutionMode();
364 >            assertEquals(0, invocationCount++);
365          }
366 <    }
367 <    static final class Noop implements Runnable {
299 <        boolean ran;
300 <        public void run() { ran = true; }
301 <    }
302 <
303 <    static final class FailingSupplier implements Supplier<Integer> {
304 <        boolean ran;
305 <        public Integer get() { ran = true; throw new CFException(); }
306 <    }
307 <    static final class FailingConsumer implements Consumer<Integer> {
308 <        boolean ran;
309 <        public void accept(Integer x) { ran = true; throw new CFException(); }
310 <    }
311 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
312 <        boolean ran;
313 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
314 <    }
315 <    static final class FailingFunction implements Function<Integer, Integer> {
316 <        boolean ran;
317 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
318 <    }
319 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
320 <        boolean ran;
321 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
322 <    }
323 <    static final class FailingNoop implements Runnable {
324 <        boolean ran;
325 <        public void run() { ran = true; throw new CFException(); }
366 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
367 >        void assertInvoked() { assertEquals(1, invocationCount); }
368      }
369  
370 <    static final class CompletableFutureInc implements Function<Integer, CompletableFuture<Integer>> {
371 <        public CompletableFuture<Integer> apply(Integer x) {
372 <            CompletableFuture<Integer> f = new CompletableFuture<Integer>();
373 <            f.complete(Integer.valueOf(x.intValue() + 1));
374 <            return f;
370 >    abstract class CheckedIntegerAction extends CheckedAction {
371 >        Integer value;
372 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
373 >        void assertValue(Integer expected) {
374 >            assertInvoked();
375 >            assertEquals(expected, value);
376          }
377      }
378  
379 <    static final class FailingCompletableFutureFunction implements Function<Integer, CompletableFuture<Integer>> {
380 <        boolean ran;
381 <        public CompletableFuture<Integer> apply(Integer x) {
382 <            ran = true; throw new CFException();
379 >    class IntegerSupplier extends CheckedAction
380 >        implements Supplier<Integer>
381 >    {
382 >        final Integer value;
383 >        IntegerSupplier(ExecutionMode m, Integer value) {
384 >            super(m);
385 >            this.value = value;
386          }
387 <    }
388 <
389 <    // Used for explicit executor tests
344 <    static final class ThreadExecutor implements Executor {
345 <        public void execute(Runnable r) {
346 <            new Thread(r).start();
387 >        public Integer get() {
388 >            invoked();
389 >            return value;
390          }
391      }
392  
393 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
394 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
393 >    // A function that handles and produces null values as well.
394 >    static Integer inc(Integer x) {
395 >        return (x == null) ? null : x + 1;
396      }
397  
398 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
399 <        public Integer apply(Integer x, Throwable t) {
400 <            return (t == null) ? two : three;
398 >    class NoopConsumer extends CheckedIntegerAction
399 >        implements Consumer<Integer>
400 >    {
401 >        NoopConsumer(ExecutionMode m) { super(m); }
402 >        public void accept(Integer x) {
403 >            invoked();
404 >            value = x;
405          }
406      }
407  
408 <
409 <    /**
410 <     * exceptionally action completes with function value on source
411 <     * exception;  otherwise with source value
412 <     */
413 <    public void testExceptionally() {
414 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
415 <        ExceptionToInteger r = new ExceptionToInteger();
368 <        CompletableFuture<Integer> g = f.exceptionally(r);
369 <        f.completeExceptionally(new CFException());
370 <        checkCompletedNormally(g, three);
371 <
372 <        f = new CompletableFuture<Integer>();
373 <        r = new ExceptionToInteger();
374 <        g = f.exceptionally(r);
375 <        f.complete(one);
376 <        checkCompletedNormally(g, one);
377 <    }
378 <
379 <    /**
380 <     * handle action completes normally with function value on either
381 <     * normal or exceptional completion of source
382 <     */
383 <    public void testHandle() {
384 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
385 <        IntegerHandler r = new IntegerHandler();
386 <        CompletableFuture<Integer> g = f.handle(r);
387 <        f.completeExceptionally(new CFException());
388 <        checkCompletedNormally(g, three);
389 <
390 <        f = new CompletableFuture<Integer>();
391 <        r = new IntegerHandler();
392 <        g = f.handle(r);
393 <        f.complete(one);
394 <        checkCompletedNormally(g, two);
395 <    }
396 <
397 <    /**
398 <     * runAsync completes after running Runnable
399 <     */
400 <    public void testRunAsync() {
401 <        Noop r = new Noop();
402 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
403 <        assertNull(f.join());
404 <        assertTrue(r.ran);
405 <    }
406 <
407 <    /**
408 <     * runAsync with executor completes after running Runnable
409 <     */
410 <    public void testRunAsync2() {
411 <        Noop r = new Noop();
412 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, new ThreadExecutor());
413 <        assertNull(f.join());
414 <        assertTrue(r.ran);
415 <    }
416 <
417 <    /**
418 <     * failing runAsync completes exceptionally after running Runnable
419 <     */
420 <    public void testRunAsync3() {
421 <        FailingNoop r = new FailingNoop();
422 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
423 <        checkCompletedWithWrappedCFException(f);
424 <        assertTrue(r.ran);
425 <    }
426 <
427 <    /**
428 <     * supplyAsync completes with result of supplier
429 <     */
430 <    public void testSupplyAsync() {
431 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne);
432 <        assertEquals(f.join(), one);
433 <    }
434 <
435 <    /**
436 <     * supplyAsync with executor completes with result of supplier
437 <     */
438 <    public void testSupplyAsync2() {
439 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
440 <        assertEquals(f.join(), one);
441 <    }
442 <
443 <    /**
444 <     * Failing supplyAsync completes exceptionally
445 <     */
446 <    public void testSupplyAsync3() {
447 <        FailingSupplier r = new FailingSupplier();
448 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
449 <        checkCompletedWithWrappedCFException(f);
450 <        assertTrue(r.ran);
451 <    }
452 <
453 <    // seq completion methods
454 <
455 <    /**
456 <     * thenRun result completes normally after normal completion of source
457 <     */
458 <    public void testThenRun() {
459 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
460 <        Noop r = new Noop();
461 <        CompletableFuture<Void> g = f.thenRun(r);
462 <        f.complete(null);
463 <        checkCompletedNormally(g, null);
464 <        // reordered version
465 <        f = new CompletableFuture<Integer>();
466 <        f.complete(null);
467 <        r = new Noop();
468 <        g = f.thenRun(r);
469 <        checkCompletedNormally(g, null);
470 <    }
471 <
472 <    /**
473 <     * thenRun result completes exceptionally after exceptional
474 <     * completion of source
475 <     */
476 <    public void testThenRun2() {
477 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
478 <        Noop r = new Noop();
479 <        CompletableFuture<Void> g = f.thenRun(r);
480 <        f.completeExceptionally(new CFException());
481 <        checkCompletedWithWrappedCFException(g);
482 <    }
483 <
484 <    /**
485 <     * thenRun result completes exceptionally if action does
486 <     */
487 <    public void testThenRun3() {
488 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
489 <        FailingNoop r = new FailingNoop();
490 <        CompletableFuture<Void> g = f.thenRun(r);
491 <        f.complete(null);
492 <        checkCompletedWithWrappedCFException(g);
493 <    }
494 <
495 <    /**
496 <     * thenRun result completes exceptionally if source cancelled
497 <     */
498 <    public void testThenRun4() {
499 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
500 <        Noop r = new Noop();
501 <        CompletableFuture<Void> g = f.thenRun(r);
502 <        assertTrue(f.cancel(true));
503 <        checkCompletedWithWrappedCancellationException(g);
504 <    }
505 <
506 <    /**
507 <     * thenApply result completes normally after normal completion of source
508 <     */
509 <    public void testThenApply() {
510 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
511 <        CompletableFuture<Integer> g = f.thenApply(inc);
512 <        f.complete(one);
513 <        checkCompletedNormally(g, two);
514 <    }
515 <
516 <    /**
517 <     * thenApply result completes exceptionally after exceptional
518 <     * completion of source
519 <     */
520 <    public void testThenApply2() {
521 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
522 <        CompletableFuture<Integer> g = f.thenApply(inc);
523 <        f.completeExceptionally(new CFException());
524 <        checkCompletedWithWrappedCFException(g);
408 >    class IncFunction extends CheckedIntegerAction
409 >        implements Function<Integer,Integer>
410 >    {
411 >        IncFunction(ExecutionMode m) { super(m); }
412 >        public Integer apply(Integer x) {
413 >            invoked();
414 >            return value = inc(x);
415 >        }
416      }
417  
418 <    /**
419 <     * thenApply result completes exceptionally if action does
420 <     */
421 <    public void testThenApply3() {
422 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
423 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
533 <        f.complete(one);
534 <        checkCompletedWithWrappedCFException(g);
418 >    // Choose non-commutative actions for better coverage
419 >    // A non-commutative function that handles and produces null values as well.
420 >    static Integer subtract(Integer x, Integer y) {
421 >        return (x == null && y == null) ? null :
422 >            ((x == null) ? 42 : x.intValue())
423 >            - ((y == null) ? 99 : y.intValue());
424      }
425  
426 <    /**
427 <     * thenApply result completes exceptionally if source cancelled
428 <     */
429 <    public void testThenApply4() {
430 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
431 <        CompletableFuture<Integer> g = f.thenApply(inc);
432 <        assertTrue(f.cancel(true));
433 <        checkCompletedWithWrappedCancellationException(g);
426 >    class SubtractAction extends CheckedIntegerAction
427 >        implements BiConsumer<Integer, Integer>
428 >    {
429 >        SubtractAction(ExecutionMode m) { super(m); }
430 >        public void accept(Integer x, Integer y) {
431 >            invoked();
432 >            value = subtract(x, y);
433 >        }
434      }
435  
436 <    /**
437 <     * thenAccept result completes normally after normal completion of source
438 <     */
439 <    public void testThenAccept() {
440 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
441 <        IncAction r = new IncAction();
442 <        CompletableFuture<Void> g = f.thenAccept(r);
443 <        f.complete(one);
555 <        checkCompletedNormally(g, null);
556 <        assertEquals(r.value, 2);
436 >    class SubtractFunction extends CheckedIntegerAction
437 >        implements BiFunction<Integer, Integer, Integer>
438 >    {
439 >        SubtractFunction(ExecutionMode m) { super(m); }
440 >        public Integer apply(Integer x, Integer y) {
441 >            invoked();
442 >            return value = subtract(x, y);
443 >        }
444      }
445  
446 <    /**
447 <     * thenAccept result completes exceptionally after exceptional
448 <     * completion of source
449 <     */
450 <    public void testThenAccept2() {
564 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
565 <        IncAction r = new IncAction();
566 <        CompletableFuture<Void> g = f.thenAccept(r);
567 <        f.completeExceptionally(new CFException());
568 <        checkCompletedWithWrappedCFException(g);
446 >    class Noop extends CheckedAction implements Runnable {
447 >        Noop(ExecutionMode m) { super(m); }
448 >        public void run() {
449 >            invoked();
450 >        }
451      }
452  
453 <    /**
454 <     * thenAccept result completes exceptionally if action does
455 <     */
456 <    public void testThenAccept3() {
457 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
458 <        FailingConsumer r = new FailingConsumer();
459 <        CompletableFuture<Void> g = f.thenAccept(r);
460 <        f.complete(one);
579 <        checkCompletedWithWrappedCFException(g);
580 <        assertTrue(r.ran);
453 >    class FailingSupplier extends CheckedAction
454 >        implements Supplier<Integer>
455 >    {
456 >        FailingSupplier(ExecutionMode m) { super(m); }
457 >        public Integer get() {
458 >            invoked();
459 >            throw new CFException();
460 >        }
461      }
462  
463 <    /**
464 <     * thenAccept result completes exceptionally if source cancelled
465 <     */
466 <    public void testThenAccept4() {
467 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
468 <        IncAction r = new IncAction();
469 <        CompletableFuture<Void> g = f.thenAccept(r);
470 <        assertTrue(f.cancel(true));
471 <        checkCompletedWithWrappedCancellationException(g);
463 >    class FailingConsumer extends CheckedIntegerAction
464 >        implements Consumer<Integer>
465 >    {
466 >        FailingConsumer(ExecutionMode m) { super(m); }
467 >        public void accept(Integer x) {
468 >            invoked();
469 >            value = x;
470 >            throw new CFException();
471 >        }
472      }
473  
474 <
475 <    /**
476 <     * thenCombine result completes normally after normal completion of sources
477 <     */
478 <    public void testThenCombine() {
479 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
480 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
481 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
482 <        f.complete(one);
603 <        checkIncomplete(g);
604 <        f2.complete(two);
605 <        checkCompletedNormally(g, three);
606 <
607 <        f = new CompletableFuture<Integer>();
608 <        f.complete(one);
609 <        f2 = new CompletableFuture<Integer>();
610 <        g = f.thenCombine(f2, add);
611 <        checkIncomplete(g);
612 <        f2.complete(two);
613 <        checkCompletedNormally(g, three);
474 >    class FailingBiConsumer extends CheckedIntegerAction
475 >        implements BiConsumer<Integer, Integer>
476 >    {
477 >        FailingBiConsumer(ExecutionMode m) { super(m); }
478 >        public void accept(Integer x, Integer y) {
479 >            invoked();
480 >            value = subtract(x, y);
481 >            throw new CFException();
482 >        }
483      }
484  
485 <    /**
486 <     * thenCombine result completes exceptionally after exceptional
487 <     * completion of either source
488 <     */
489 <    public void testThenCombine2() {
490 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
491 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
492 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
493 <        f.completeExceptionally(new CFException());
625 <        f2.complete(two);
626 <        checkCompletedWithWrappedCFException(g);
627 <
628 <        f = new CompletableFuture<Integer>();
629 <        f.complete(one);
630 <        f2 = new CompletableFuture<Integer>();
631 <        g = f.thenCombine(f2, add);
632 <        f2.completeExceptionally(new CFException());
633 <        checkCompletedWithWrappedCFException(g);
485 >    class FailingFunction extends CheckedIntegerAction
486 >        implements Function<Integer, Integer>
487 >    {
488 >        FailingFunction(ExecutionMode m) { super(m); }
489 >        public Integer apply(Integer x) {
490 >            invoked();
491 >            value = x;
492 >            throw new CFException();
493 >        }
494      }
495  
496 <    /**
497 <     * thenCombine result completes exceptionally if action does
498 <     */
499 <    public void testThenCombine3() {
500 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
501 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
502 <        FailingBiFunction r = new FailingBiFunction();
503 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
504 <        f.complete(one);
645 <        checkIncomplete(g);
646 <        f2.complete(two);
647 <        checkCompletedWithWrappedCFException(g);
496 >    class FailingBiFunction extends CheckedIntegerAction
497 >        implements BiFunction<Integer, Integer, Integer>
498 >    {
499 >        FailingBiFunction(ExecutionMode m) { super(m); }
500 >        public Integer apply(Integer x, Integer y) {
501 >            invoked();
502 >            value = subtract(x, y);
503 >            throw new CFException();
504 >        }
505      }
506  
507 <    /**
508 <     * thenCombine result completes exceptionally if either source cancelled
509 <     */
510 <    public void testThenCombine4() {
511 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
512 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
656 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
657 <        assertTrue(f.cancel(true));
658 <        f2.complete(two);
659 <        checkCompletedWithWrappedCancellationException(g);
660 <        f = new CompletableFuture<Integer>();
661 <        f2 = new CompletableFuture<Integer>();
662 <        g = f.thenCombine(f2, add);
663 <        f.complete(one);
664 <        assertTrue(f2.cancel(true));
665 <        checkCompletedWithWrappedCancellationException(g);
507 >    class FailingRunnable extends CheckedAction implements Runnable {
508 >        FailingRunnable(ExecutionMode m) { super(m); }
509 >        public void run() {
510 >            invoked();
511 >            throw new CFException();
512 >        }
513      }
514  
668    /**
669     * thenAcceptBoth result completes normally after normal
670     * completion of sources
671     */
672    public void testThenAcceptBoth() {
673        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
674        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
675        AddAction r = new AddAction();
676        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
677        f.complete(one);
678        checkIncomplete(g);
679        f2.complete(two);
680        checkCompletedNormally(g, null);
681        assertEquals(r.value, 3);
515  
516 <        r = new AddAction();
517 <        f = new CompletableFuture<Integer>();
518 <        f.complete(one);
519 <        f2 = new CompletableFuture<Integer>();
520 <        g = f.thenAcceptBoth(f2, r);
521 <        checkIncomplete(g);
522 <        f2.complete(two);
523 <        checkCompletedNormally(g, null);
524 <        assertEquals(r.value, 3);
516 >    class CompletableFutureInc extends CheckedIntegerAction
517 >        implements Function<Integer, CompletableFuture<Integer>>
518 >    {
519 >        CompletableFutureInc(ExecutionMode m) { super(m); }
520 >        public CompletableFuture<Integer> apply(Integer x) {
521 >            invoked();
522 >            value = x;
523 >            CompletableFuture<Integer> f = new CompletableFuture<>();
524 >            f.complete(inc(x));
525 >            return f;
526 >        }
527      }
528  
529 <    /**
530 <     * thenAcceptBoth result completes exceptionally after exceptional
531 <     * completion of either source
532 <     */
533 <    public void testThenAcceptBoth2() {
534 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
535 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
536 <        AddAction r = new AddAction();
537 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
703 <        f.completeExceptionally(new CFException());
704 <        f2.complete(two);
705 <        checkCompletedWithWrappedCFException(g);
706 <
707 <        r = new AddAction();
708 <        f = new CompletableFuture<Integer>();
709 <        f.complete(one);
710 <        f2 = new CompletableFuture<Integer>();
711 <        g = f.thenAcceptBoth(f2, r);
712 <        f2.completeExceptionally(new CFException());
713 <        checkCompletedWithWrappedCFException(g);
529 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
530 >        implements Function<Integer, CompletableFuture<Integer>>
531 >    {
532 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
533 >        public CompletableFuture<Integer> apply(Integer x) {
534 >            invoked();
535 >            value = x;
536 >            throw new CFException();
537 >        }
538      }
539  
540 <    /**
541 <     * thenAcceptBoth result completes exceptionally if action does
542 <     */
543 <    public void testThenAcceptBoth3() {
544 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
545 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
546 <        FailingBiConsumer r = new FailingBiConsumer();
723 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
724 <        f.complete(one);
725 <        checkIncomplete(g);
726 <        f2.complete(two);
727 <        checkCompletedWithWrappedCFException(g);
728 <    }
540 >    // Used for explicit executor tests
541 >    static final class ThreadExecutor implements Executor {
542 >        final AtomicInteger count = new AtomicInteger(0);
543 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
544 >        static boolean startedCurrentThread() {
545 >            return Thread.currentThread().getThreadGroup() == tg;
546 >        }
547  
548 <    /**
549 <     * thenAcceptBoth result completes exceptionally if either source cancelled
550 <     */
551 <    public void testThenAcceptBoth4() {
734 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
735 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
736 <        AddAction r = new AddAction();
737 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
738 <        assertTrue(f.cancel(true));
739 <        f2.complete(two);
740 <        checkCompletedWithWrappedCancellationException(g);
741 <        f = new CompletableFuture<Integer>();
742 <        f2 = new CompletableFuture<Integer>();
743 <        r = new AddAction();
744 <        g = f.thenAcceptBoth(f2, r);
745 <        f.complete(one);
746 <        assertTrue(f2.cancel(true));
747 <        checkCompletedWithWrappedCancellationException(g);
548 >        public void execute(Runnable r) {
549 >            count.getAndIncrement();
550 >            new Thread(tg, r).start();
551 >        }
552      }
553  
554      /**
555 <     * runAfterBoth result completes normally after normal
556 <     * completion of sources
555 >     * Permits the testing of parallel code for the 3 different
556 >     * execution modes without copy/pasting all the test methods.
557       */
558 <    public void testRunAfterBoth() {
559 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
560 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
561 <        Noop r = new Noop();
562 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
563 <        f.complete(one);
564 <        checkIncomplete(g);
565 <        f2.complete(two);
566 <        checkCompletedNormally(g, null);
567 <        assertTrue(r.ran);
568 <
569 <        r = new Noop();
570 <        f = new CompletableFuture<Integer>();
571 <        f.complete(one);
572 <        f2 = new CompletableFuture<Integer>();
573 <        g = f.runAfterBoth(f2, r);
574 <        checkIncomplete(g);
575 <        f2.complete(two);
576 <        checkCompletedNormally(g, null);
577 <        assertTrue(r.ran);
578 <    }
558 >    enum ExecutionMode {
559 >        DEFAULT {
560 >            public void checkExecutionMode() {
561 >                assertFalse(ThreadExecutor.startedCurrentThread());
562 >                assertNull(ForkJoinTask.getPool());
563 >            }
564 >            public CompletableFuture<Void> runAsync(Runnable a) {
565 >                throw new UnsupportedOperationException();
566 >            }
567 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
568 >                throw new UnsupportedOperationException();
569 >            }
570 >            public <T> CompletableFuture<Void> thenRun
571 >                (CompletableFuture<T> f, Runnable a) {
572 >                return f.thenRun(a);
573 >            }
574 >            public <T> CompletableFuture<Void> thenAccept
575 >                (CompletableFuture<T> f, Consumer<? super T> a) {
576 >                return f.thenAccept(a);
577 >            }
578 >            public <T,U> CompletableFuture<U> thenApply
579 >                (CompletableFuture<T> f, Function<? super T,U> a) {
580 >                return f.thenApply(a);
581 >            }
582 >            public <T,U> CompletableFuture<U> thenCompose
583 >                (CompletableFuture<T> f,
584 >                 Function<? super T,? extends CompletionStage<U>> a) {
585 >                return f.thenCompose(a);
586 >            }
587 >            public <T,U> CompletableFuture<U> handle
588 >                (CompletableFuture<T> f,
589 >                 BiFunction<? super T,Throwable,? extends U> a) {
590 >                return f.handle(a);
591 >            }
592 >            public <T> CompletableFuture<T> whenComplete
593 >                (CompletableFuture<T> f,
594 >                 BiConsumer<? super T,? super Throwable> a) {
595 >                return f.whenComplete(a);
596 >            }
597 >            public <T,U> CompletableFuture<Void> runAfterBoth
598 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
599 >                return f.runAfterBoth(g, a);
600 >            }
601 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
602 >                (CompletableFuture<T> f,
603 >                 CompletionStage<? extends U> g,
604 >                 BiConsumer<? super T,? super U> a) {
605 >                return f.thenAcceptBoth(g, a);
606 >            }
607 >            public <T,U,V> CompletableFuture<V> thenCombine
608 >                (CompletableFuture<T> f,
609 >                 CompletionStage<? extends U> g,
610 >                 BiFunction<? super T,? super U,? extends V> a) {
611 >                return f.thenCombine(g, a);
612 >            }
613 >            public <T> CompletableFuture<Void> runAfterEither
614 >                (CompletableFuture<T> f,
615 >                 CompletionStage<?> g,
616 >                 java.lang.Runnable a) {
617 >                return f.runAfterEither(g, a);
618 >            }
619 >            public <T> CompletableFuture<Void> acceptEither
620 >                (CompletableFuture<T> f,
621 >                 CompletionStage<? extends T> g,
622 >                 Consumer<? super T> a) {
623 >                return f.acceptEither(g, a);
624 >            }
625 >            public <T,U> CompletableFuture<U> applyToEither
626 >                (CompletableFuture<T> f,
627 >                 CompletionStage<? extends T> g,
628 >                 Function<? super T,U> a) {
629 >                return f.applyToEither(g, a);
630 >            }
631 >        },
632  
633 <    /**
634 <     * runAfterBoth result completes exceptionally after exceptional
635 <     * completion of either source
636 <     */
637 <    public void testRunAfterBoth2() {
638 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
639 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
640 <        Noop r = new Noop();
641 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
642 <        f.completeExceptionally(new CFException());
643 <        f2.complete(two);
644 <        checkCompletedWithWrappedCFException(g);
633 >        ASYNC {
634 >            public void checkExecutionMode() {
635 >                assertSame(ForkJoinPool.commonPool(),
636 >                           ForkJoinTask.getPool());
637 >            }
638 >            public CompletableFuture<Void> runAsync(Runnable a) {
639 >                return CompletableFuture.runAsync(a);
640 >            }
641 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
642 >                return CompletableFuture.supplyAsync(a);
643 >            }
644 >            public <T> CompletableFuture<Void> thenRun
645 >                (CompletableFuture<T> f, Runnable a) {
646 >                return f.thenRunAsync(a);
647 >            }
648 >            public <T> CompletableFuture<Void> thenAccept
649 >                (CompletableFuture<T> f, Consumer<? super T> a) {
650 >                return f.thenAcceptAsync(a);
651 >            }
652 >            public <T,U> CompletableFuture<U> thenApply
653 >                (CompletableFuture<T> f, Function<? super T,U> a) {
654 >                return f.thenApplyAsync(a);
655 >            }
656 >            public <T,U> CompletableFuture<U> thenCompose
657 >                (CompletableFuture<T> f,
658 >                 Function<? super T,? extends CompletionStage<U>> a) {
659 >                return f.thenComposeAsync(a);
660 >            }
661 >            public <T,U> CompletableFuture<U> handle
662 >                (CompletableFuture<T> f,
663 >                 BiFunction<? super T,Throwable,? extends U> a) {
664 >                return f.handleAsync(a);
665 >            }
666 >            public <T> CompletableFuture<T> whenComplete
667 >                (CompletableFuture<T> f,
668 >                 BiConsumer<? super T,? super Throwable> a) {
669 >                return f.whenCompleteAsync(a);
670 >            }
671 >            public <T,U> CompletableFuture<Void> runAfterBoth
672 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
673 >                return f.runAfterBothAsync(g, a);
674 >            }
675 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
676 >                (CompletableFuture<T> f,
677 >                 CompletionStage<? extends U> g,
678 >                 BiConsumer<? super T,? super U> a) {
679 >                return f.thenAcceptBothAsync(g, a);
680 >            }
681 >            public <T,U,V> CompletableFuture<V> thenCombine
682 >                (CompletableFuture<T> f,
683 >                 CompletionStage<? extends U> g,
684 >                 BiFunction<? super T,? super U,? extends V> a) {
685 >                return f.thenCombineAsync(g, a);
686 >            }
687 >            public <T> CompletableFuture<Void> runAfterEither
688 >                (CompletableFuture<T> f,
689 >                 CompletionStage<?> g,
690 >                 java.lang.Runnable a) {
691 >                return f.runAfterEitherAsync(g, a);
692 >            }
693 >            public <T> CompletableFuture<Void> acceptEither
694 >                (CompletableFuture<T> f,
695 >                 CompletionStage<? extends T> g,
696 >                 Consumer<? super T> a) {
697 >                return f.acceptEitherAsync(g, a);
698 >            }
699 >            public <T,U> CompletableFuture<U> applyToEither
700 >                (CompletableFuture<T> f,
701 >                 CompletionStage<? extends T> g,
702 >                 Function<? super T,U> a) {
703 >                return f.applyToEitherAsync(g, a);
704 >            }
705 >        },
706  
707 <        r = new Noop();
708 <        f = new CompletableFuture<Integer>();
709 <        f.complete(one);
710 <        f2 = new CompletableFuture<Integer>();
711 <        g = f.runAfterBoth(f2, r);
712 <        f2.completeExceptionally(new CFException());
713 <        checkCompletedWithWrappedCFException(g);
714 <    }
707 >        EXECUTOR {
708 >            public void checkExecutionMode() {
709 >                assertTrue(ThreadExecutor.startedCurrentThread());
710 >            }
711 >            public CompletableFuture<Void> runAsync(Runnable a) {
712 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
713 >            }
714 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
715 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
716 >            }
717 >            public <T> CompletableFuture<Void> thenRun
718 >                (CompletableFuture<T> f, Runnable a) {
719 >                return f.thenRunAsync(a, new ThreadExecutor());
720 >            }
721 >            public <T> CompletableFuture<Void> thenAccept
722 >                (CompletableFuture<T> f, Consumer<? super T> a) {
723 >                return f.thenAcceptAsync(a, new ThreadExecutor());
724 >            }
725 >            public <T,U> CompletableFuture<U> thenApply
726 >                (CompletableFuture<T> f, Function<? super T,U> a) {
727 >                return f.thenApplyAsync(a, new ThreadExecutor());
728 >            }
729 >            public <T,U> CompletableFuture<U> thenCompose
730 >                (CompletableFuture<T> f,
731 >                 Function<? super T,? extends CompletionStage<U>> a) {
732 >                return f.thenComposeAsync(a, new ThreadExecutor());
733 >            }
734 >            public <T,U> CompletableFuture<U> handle
735 >                (CompletableFuture<T> f,
736 >                 BiFunction<? super T,Throwable,? extends U> a) {
737 >                return f.handleAsync(a, new ThreadExecutor());
738 >            }
739 >            public <T> CompletableFuture<T> whenComplete
740 >                (CompletableFuture<T> f,
741 >                 BiConsumer<? super T,? super Throwable> a) {
742 >                return f.whenCompleteAsync(a, new ThreadExecutor());
743 >            }
744 >            public <T,U> CompletableFuture<Void> runAfterBoth
745 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
746 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
747 >            }
748 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
749 >                (CompletableFuture<T> f,
750 >                 CompletionStage<? extends U> g,
751 >                 BiConsumer<? super T,? super U> a) {
752 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
753 >            }
754 >            public <T,U,V> CompletableFuture<V> thenCombine
755 >                (CompletableFuture<T> f,
756 >                 CompletionStage<? extends U> g,
757 >                 BiFunction<? super T,? super U,? extends V> a) {
758 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
759 >            }
760 >            public <T> CompletableFuture<Void> runAfterEither
761 >                (CompletableFuture<T> f,
762 >                 CompletionStage<?> g,
763 >                 java.lang.Runnable a) {
764 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
765 >            }
766 >            public <T> CompletableFuture<Void> acceptEither
767 >                (CompletableFuture<T> f,
768 >                 CompletionStage<? extends T> g,
769 >                 Consumer<? super T> a) {
770 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
771 >            }
772 >            public <T,U> CompletableFuture<U> applyToEither
773 >                (CompletableFuture<T> f,
774 >                 CompletionStage<? extends T> g,
775 >                 Function<? super T,U> a) {
776 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
777 >            }
778 >        };
779  
780 <    /**
781 <     * runAfterBoth result completes exceptionally if action does
782 <     */
783 <    public void testRunAfterBoth3() {
784 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
785 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
786 <        FailingNoop r = new FailingNoop();
787 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
788 <        f.complete(one);
789 <        checkIncomplete(g);
790 <        f2.complete(two);
791 <        checkCompletedWithWrappedCFException(g);
792 <    }
780 >        public abstract void checkExecutionMode();
781 >        public abstract CompletableFuture<Void> runAsync(Runnable a);
782 >        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
783 >        public abstract <T> CompletableFuture<Void> thenRun
784 >            (CompletableFuture<T> f, Runnable a);
785 >        public abstract <T> CompletableFuture<Void> thenAccept
786 >            (CompletableFuture<T> f, Consumer<? super T> a);
787 >        public abstract <T,U> CompletableFuture<U> thenApply
788 >            (CompletableFuture<T> f, Function<? super T,U> a);
789 >        public abstract <T,U> CompletableFuture<U> thenCompose
790 >            (CompletableFuture<T> f,
791 >             Function<? super T,? extends CompletionStage<U>> a);
792 >        public abstract <T,U> CompletableFuture<U> handle
793 >            (CompletableFuture<T> f,
794 >             BiFunction<? super T,Throwable,? extends U> a);
795 >        public abstract <T> CompletableFuture<T> whenComplete
796 >            (CompletableFuture<T> f,
797 >             BiConsumer<? super T,? super Throwable> a);
798 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
799 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
800 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
801 >            (CompletableFuture<T> f,
802 >             CompletionStage<? extends U> g,
803 >             BiConsumer<? super T,? super U> a);
804 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
805 >            (CompletableFuture<T> f,
806 >             CompletionStage<? extends U> g,
807 >             BiFunction<? super T,? super U,? extends V> a);
808 >        public abstract <T> CompletableFuture<Void> runAfterEither
809 >            (CompletableFuture<T> f,
810 >             CompletionStage<?> g,
811 >             java.lang.Runnable a);
812 >        public abstract <T> CompletableFuture<Void> acceptEither
813 >            (CompletableFuture<T> f,
814 >             CompletionStage<? extends T> g,
815 >             Consumer<? super T> a);
816 >        public abstract <T,U> CompletableFuture<U> applyToEither
817 >            (CompletableFuture<T> f,
818 >             CompletionStage<? extends T> g,
819 >             Function<? super T,U> a);
820 >    }
821 >
822 >    /**
823 >     * exceptionally action is not invoked when source completes
824 >     * normally, and source result is propagated
825 >     */
826 >    public void testExceptionally_normalCompletion() {
827 >        for (boolean createIncomplete : new boolean[] { true, false })
828 >        for (Integer v1 : new Integer[] { 1, null })
829 >    {
830 >        final AtomicInteger a = new AtomicInteger(0);
831 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
832 >        if (!createIncomplete) f.complete(v1);
833 >        final CompletableFuture<Integer> g = f.exceptionally
834 >            ((Throwable t) -> {
835 >                // Should not be called
836 >                a.getAndIncrement();
837 >                throw new AssertionError();
838 >            });
839 >        if (createIncomplete) f.complete(v1);
840 >
841 >        checkCompletedNormally(g, v1);
842 >        checkCompletedNormally(f, v1);
843 >        assertEquals(0, a.get());
844 >    }}
845  
812    /**
813     * runAfterBoth result completes exceptionally if either source cancelled
814     */
815    public void testRunAfterBoth4() {
816        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
817        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
818        Noop r = new Noop();
819        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
820        assertTrue(f.cancel(true));
821        f2.complete(two);
822        checkCompletedWithWrappedCancellationException(g);
823        f = new CompletableFuture<Integer>();
824        f2 = new CompletableFuture<Integer>();
825        r = new Noop();
826        g = f.runAfterBoth(f2, r);
827        f.complete(one);
828        assertTrue(f2.cancel(true));
829        checkCompletedWithWrappedCancellationException(g);
830    }
846  
847      /**
848 <     * applyToEither result completes normally after normal completion
849 <     * of either source
848 >     * exceptionally action completes with function value on source
849 >     * exception
850       */
851 <    public void testApplyToEither() {
852 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
853 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
854 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
855 <        f.complete(one);
856 <        checkCompletedNormally(g, two);
857 <        f2.complete(one);
858 <        checkCompletedNormally(g, two);
859 <
860 <        f = new CompletableFuture<Integer>();
861 <        f.complete(one);
862 <        f2 = new CompletableFuture<Integer>();
863 <        g = f.applyToEither(f2, inc);
864 <        checkCompletedNormally(g, two);
865 <    }
851 >    public void testExceptionally_exceptionalCompletion() {
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 CFException ex = new CFException();
857 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
858 >        if (!createIncomplete) f.completeExceptionally(ex);
859 >        final CompletableFuture<Integer> g = f.exceptionally
860 >            ((Throwable t) -> {
861 >                ExecutionMode.DEFAULT.checkExecutionMode();
862 >                threadAssertSame(t, ex);
863 >                a.getAndIncrement();
864 >                return v1;
865 >            });
866 >        if (createIncomplete) f.completeExceptionally(ex);
867 >
868 >        checkCompletedNormally(g, v1);
869 >        assertEquals(1, a.get());
870 >    }}
871 >
872 >    public void testExceptionally_exceptionalCompletionActionFailed() {
873 >        for (boolean createIncomplete : new boolean[] { true, false })
874 >        for (Integer v1 : new Integer[] { 1, null })
875 >    {
876 >        final AtomicInteger a = new AtomicInteger(0);
877 >        final CFException ex1 = new CFException();
878 >        final CFException ex2 = new CFException();
879 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
880 >        if (!createIncomplete) f.completeExceptionally(ex1);
881 >        final CompletableFuture<Integer> g = f.exceptionally
882 >            ((Throwable t) -> {
883 >                ExecutionMode.DEFAULT.checkExecutionMode();
884 >                threadAssertSame(t, ex1);
885 >                a.getAndIncrement();
886 >                throw ex2;
887 >            });
888 >        if (createIncomplete) f.completeExceptionally(ex1);
889 >
890 >        checkCompletedWithWrappedException(g, ex2);
891 >        assertEquals(1, a.get());
892 >    }}
893 >
894 >    /**
895 >     * handle action completes normally with function value on normal
896 >     * completion of source
897 >     */
898 >    public void testHandle_normalCompletion() {
899 >        for (ExecutionMode m : ExecutionMode.values())
900 >        for (boolean createIncomplete : new boolean[] { true, false })
901 >        for (Integer v1 : new Integer[] { 1, null })
902 >    {
903 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
904 >        final AtomicInteger a = new AtomicInteger(0);
905 >        if (!createIncomplete) f.complete(v1);
906 >        final CompletableFuture<Integer> g = m.handle
907 >            (f,
908 >             (Integer x, Throwable t) -> {
909 >                m.checkExecutionMode();
910 >                threadAssertSame(x, v1);
911 >                threadAssertNull(t);
912 >                a.getAndIncrement();
913 >                return inc(v1);
914 >            });
915 >        if (createIncomplete) f.complete(v1);
916 >
917 >        checkCompletedNormally(g, inc(v1));
918 >        checkCompletedNormally(f, v1);
919 >        assertEquals(1, a.get());
920 >    }}
921  
922      /**
923 <     * applyToEither result completes exceptionally after exceptional
924 <     * completion of either source
923 >     * handle action completes normally with function value on
924 >     * exceptional completion of source
925       */
926 <    public void testApplyToEither2() {
927 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
928 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
929 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
930 <        f.completeExceptionally(new CFException());
931 <        f2.complete(one);
932 <        checkCompletedWithWrappedCFException(g);
933 <
934 <        f = new CompletableFuture<Integer>();
935 <        f2 = new CompletableFuture<Integer>();
936 <        f2.completeExceptionally(new CFException());
937 <        g = f.applyToEither(f2, inc);
938 <        checkCompletedWithWrappedCFException(g);
939 <    }
926 >    public void testHandle_exceptionalCompletion() {
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 CompletableFuture<Integer> f = new CompletableFuture<>();
932 >        final AtomicInteger a = new AtomicInteger(0);
933 >        final CFException ex = new CFException();
934 >        if (!createIncomplete) f.completeExceptionally(ex);
935 >        final CompletableFuture<Integer> g = m.handle
936 >            (f,
937 >             (Integer x, Throwable t) -> {
938 >                m.checkExecutionMode();
939 >                threadAssertNull(x);
940 >                threadAssertSame(t, ex);
941 >                a.getAndIncrement();
942 >                return v1;
943 >            });
944 >        if (createIncomplete) f.completeExceptionally(ex);
945 >
946 >        checkCompletedNormally(g, v1);
947 >        checkCompletedExceptionally(f, ex);
948 >        assertEquals(1, a.get());
949 >    }}
950 >
951 >    /**
952 >     * handle action completes normally with function value on
953 >     * cancelled source
954 >     */
955 >    public void testHandle_sourceCancelled() {
956 >        for (ExecutionMode m : ExecutionMode.values())
957 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
958 >        for (boolean createIncomplete : new boolean[] { true, false })
959 >        for (Integer v1 : new Integer[] { 1, null })
960 >    {
961 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
962 >        final AtomicInteger a = new AtomicInteger(0);
963 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
964 >        final CompletableFuture<Integer> g = m.handle
965 >            (f,
966 >             (Integer x, Throwable t) -> {
967 >                m.checkExecutionMode();
968 >                threadAssertNull(x);
969 >                threadAssertTrue(t instanceof CancellationException);
970 >                a.getAndIncrement();
971 >                return v1;
972 >            });
973 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
974  
975 <    /**
976 <     * applyToEither result completes exceptionally if action does
977 <     */
978 <    public void testApplyToEither3() {
875 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
876 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
877 <        FailingFunction r = new FailingFunction();
878 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
879 <        f2.complete(two);
880 <        checkCompletedWithWrappedCFException(g);
881 <    }
975 >        checkCompletedNormally(g, v1);
976 >        checkCancelled(f);
977 >        assertEquals(1, a.get());
978 >    }}
979  
980      /**
981 <     * applyToEither result completes exceptionally if either source cancelled
981 >     * handle result completes exceptionally if action does
982       */
983 <    public void testApplyToEither4() {
984 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
985 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
986 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
987 <        assertTrue(f.cancel(true));
988 <        checkCompletedWithWrappedCancellationException(g);
989 <        f = new CompletableFuture<Integer>();
990 <        f2 = new CompletableFuture<Integer>();
991 <        assertTrue(f2.cancel(true));
992 <        checkCompletedWithWrappedCancellationException(g);
993 <    }
983 >    public void testHandle_sourceFailedActionFailed() {
984 >        for (ExecutionMode m : ExecutionMode.values())
985 >        for (boolean createIncomplete : new boolean[] { true, false })
986 >    {
987 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
988 >        final AtomicInteger a = new AtomicInteger(0);
989 >        final CFException ex1 = new CFException();
990 >        final CFException ex2 = new CFException();
991 >        if (!createIncomplete) f.completeExceptionally(ex1);
992 >        final CompletableFuture<Integer> g = m.handle
993 >            (f,
994 >             (Integer x, Throwable t) -> {
995 >                m.checkExecutionMode();
996 >                threadAssertNull(x);
997 >                threadAssertSame(ex1, t);
998 >                a.getAndIncrement();
999 >                throw ex2;
1000 >            });
1001 >        if (createIncomplete) f.completeExceptionally(ex1);
1002 >
1003 >        checkCompletedWithWrappedException(g, ex2);
1004 >        checkCompletedExceptionally(f, ex1);
1005 >        assertEquals(1, a.get());
1006 >    }}
1007 >
1008 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1009 >        for (ExecutionMode m : ExecutionMode.values())
1010 >        for (boolean createIncomplete : new boolean[] { true, false })
1011 >        for (Integer v1 : new Integer[] { 1, null })
1012 >    {
1013 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1014 >        final AtomicInteger a = new AtomicInteger(0);
1015 >        final CFException ex = new CFException();
1016 >        if (!createIncomplete) f.complete(v1);
1017 >        final CompletableFuture<Integer> g = m.handle
1018 >            (f,
1019 >             (Integer x, Throwable t) -> {
1020 >                m.checkExecutionMode();
1021 >                threadAssertSame(x, v1);
1022 >                threadAssertNull(t);
1023 >                a.getAndIncrement();
1024 >                throw ex;
1025 >            });
1026 >        if (createIncomplete) f.complete(v1);
1027 >
1028 >        checkCompletedWithWrappedException(g, ex);
1029 >        checkCompletedNormally(f, v1);
1030 >        assertEquals(1, a.get());
1031 >    }}
1032  
1033      /**
1034 <     * acceptEither result completes normally after normal completion
900 <     * of either source
1034 >     * runAsync completes after running Runnable
1035       */
1036 <    public void testAcceptEither() {
1037 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1038 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1039 <        IncAction r = new IncAction();
1040 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1041 <        f.complete(one);
1042 <        checkCompletedNormally(g, null);
1043 <        f2.complete(one);
1044 <        checkCompletedNormally(g, null);
1045 <        assertEquals(r.value, 2);
1046 <
1047 <        r = new IncAction();
1048 <        f = new CompletableFuture<Integer>();
915 <        f.complete(one);
916 <        f2 = new CompletableFuture<Integer>();
917 <        g = f.acceptEither(f2, r);
918 <        checkCompletedNormally(g, null);
919 <        assertEquals(r.value, 2);
920 <    }
1036 >    public void testRunAsync_normalCompletion() {
1037 >        ExecutionMode[] executionModes = {
1038 >            ExecutionMode.ASYNC,
1039 >            ExecutionMode.EXECUTOR,
1040 >        };
1041 >        for (ExecutionMode m : executionModes)
1042 >    {
1043 >        final Noop r = new Noop(m);
1044 >        final CompletableFuture<Void> f = m.runAsync(r);
1045 >        assertNull(f.join());
1046 >        checkCompletedNormally(f, null);
1047 >        r.assertInvoked();
1048 >    }}
1049  
1050      /**
1051 <     * acceptEither result completes exceptionally after exceptional
924 <     * completion of either source
1051 >     * failing runAsync completes exceptionally after running Runnable
1052       */
1053 <    public void testAcceptEither2() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1055 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1056 <        IncAction r = new IncAction();
1057 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1058 <        f.completeExceptionally(new CFException());
1059 <        f2.complete(one);
1060 <        checkCompletedWithWrappedCFException(g);
1061 <
1062 <        r = new IncAction();
1063 <        f = new CompletableFuture<Integer>();
1064 <        f2 = new CompletableFuture<Integer>();
938 <        f2.completeExceptionally(new CFException());
939 <        g = f.acceptEither(f2, r);
940 <        checkCompletedWithWrappedCFException(g);
941 <    }
1053 >    public void testRunAsync_exceptionalCompletion() {
1054 >        ExecutionMode[] executionModes = {
1055 >            ExecutionMode.ASYNC,
1056 >            ExecutionMode.EXECUTOR,
1057 >        };
1058 >        for (ExecutionMode m : executionModes)
1059 >    {
1060 >        final FailingRunnable r = new FailingRunnable(m);
1061 >        final CompletableFuture<Void> f = m.runAsync(r);
1062 >        checkCompletedWithWrappedCFException(f);
1063 >        r.assertInvoked();
1064 >    }}
1065  
1066      /**
1067 <     * acceptEither result completes exceptionally if action does
1067 >     * supplyAsync completes with result of supplier
1068       */
1069 <    public void testAcceptEither3() {
1070 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1071 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1072 <        FailingConsumer r = new FailingConsumer();
1073 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1074 <        f2.complete(two);
1075 <        checkCompletedWithWrappedCFException(g);
1076 <    }
1069 >    public void testSupplyAsync_normalCompletion() {
1070 >        ExecutionMode[] executionModes = {
1071 >            ExecutionMode.ASYNC,
1072 >            ExecutionMode.EXECUTOR,
1073 >        };
1074 >        for (ExecutionMode m : executionModes)
1075 >        for (Integer v1 : new Integer[] { 1, null })
1076 >    {
1077 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1078 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1079 >        assertSame(v1, f.join());
1080 >        checkCompletedNormally(f, v1);
1081 >        r.assertInvoked();
1082 >    }}
1083  
1084      /**
1085 <     * acceptEither result completes exceptionally if either source cancelled
1085 >     * Failing supplyAsync completes exceptionally
1086       */
1087 <    public void testAcceptEither4() {
1088 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1089 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1090 <        IncAction r = new IncAction();
1091 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1092 <        assertTrue(f.cancel(true));
1093 <        checkCompletedWithWrappedCancellationException(g);
1094 <        f = new CompletableFuture<Integer>();
1095 <        f2 = new CompletableFuture<Integer>();
1096 <        assertTrue(f2.cancel(true));
1097 <        checkCompletedWithWrappedCancellationException(g);
1098 <    }
1087 >    public void testSupplyAsync_exceptionalCompletion() {
1088 >        ExecutionMode[] executionModes = {
1089 >            ExecutionMode.ASYNC,
1090 >            ExecutionMode.EXECUTOR,
1091 >        };
1092 >        for (ExecutionMode m : executionModes)
1093 >    {
1094 >        FailingSupplier r = new FailingSupplier(m);
1095 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1096 >        checkCompletedWithWrappedCFException(f);
1097 >        r.assertInvoked();
1098 >    }}
1099  
1100 +    // seq completion methods
1101  
1102      /**
1103 <     * runAfterEither result completes normally after normal completion
974 <     * of either source
1103 >     * thenRun result completes normally after normal completion of source
1104       */
1105 <    public void testRunAfterEither() {
1106 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1107 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1108 <        Noop r = new Noop();
1109 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1110 <        f.complete(one);
1111 <        checkCompletedNormally(g, null);
1112 <        f2.complete(one);
1113 <        checkCompletedNormally(g, null);
1114 <        assertTrue(r.ran);
1105 >    public void testThenRun_normalCompletion() {
1106 >        for (ExecutionMode m : ExecutionMode.values())
1107 >        for (boolean createIncomplete : new boolean[] { true, false })
1108 >        for (Integer v1 : new Integer[] { 1, null })
1109 >    {
1110 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1111 >        final Noop r = new Noop(m);
1112 >        if (!createIncomplete) f.complete(v1);
1113 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1114 >        if (createIncomplete) {
1115 >            checkIncomplete(g);
1116 >            f.complete(v1);
1117 >        }
1118  
987        r = new Noop();
988        f = new CompletableFuture<Integer>();
989        f.complete(one);
990        f2 = new CompletableFuture<Integer>();
991        g = f.runAfterEither(f2, r);
1119          checkCompletedNormally(g, null);
1120 <        assertTrue(r.ran);
1121 <    }
1122 <
996 <    /**
997 <     * runAfterEither result completes exceptionally after exceptional
998 <     * completion of either source
999 <     */
1000 <    public void testRunAfterEither2() {
1001 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1002 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1003 <        Noop r = new Noop();
1004 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1005 <        f.completeExceptionally(new CFException());
1006 <        f2.complete(one);
1007 <        checkCompletedWithWrappedCFException(g);
1008 <
1009 <        r = new Noop();
1010 <        f = new CompletableFuture<Integer>();
1011 <        f2 = new CompletableFuture<Integer>();
1012 <        f2.completeExceptionally(new CFException());
1013 <        g = f.runAfterEither(f2, r);
1014 <        checkCompletedWithWrappedCFException(g);
1015 <    }
1016 <
1017 <    /**
1018 <     * runAfterEither result completes exceptionally if action does
1019 <     */
1020 <    public void testRunAfterEither3() {
1021 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1022 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1023 <        FailingNoop r = new FailingNoop();
1024 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1025 <        f2.complete(two);
1026 <        checkCompletedWithWrappedCFException(g);
1027 <    }
1120 >        checkCompletedNormally(f, v1);
1121 >        r.assertInvoked();
1122 >    }}
1123  
1124      /**
1125 <     * runAfterEither result completes exceptionally if either source cancelled
1031 <     */
1032 <    public void testRunAfterEither4() {
1033 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1034 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1035 <        Noop r = new Noop();
1036 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1037 <        assertTrue(f.cancel(true));
1038 <        checkCompletedWithWrappedCancellationException(g);
1039 <        f = new CompletableFuture<Integer>();
1040 <        f2 = new CompletableFuture<Integer>();
1041 <        assertTrue(f2.cancel(true));
1042 <        checkCompletedWithWrappedCancellationException(g);
1043 <    }
1044 <
1045 <    /**
1046 <     * thenCompose result completes normally after normal completion of source
1047 <     */
1048 <    public void testThenCompose() {
1049 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1050 <        CompletableFutureInc r = new CompletableFutureInc();
1051 <        CompletableFuture<Integer> g = f.thenCompose(r);
1052 <        f.complete(one);
1053 <        checkCompletedNormally(g, two);
1054 <    }
1055 <
1056 <    /**
1057 <     * thenCompose result completes exceptionally after exceptional
1125 >     * thenRun result completes exceptionally after exceptional
1126       * completion of source
1127       */
1128 <    public void testThenCompose2() {
1129 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1130 <        CompletableFutureInc r = new CompletableFutureInc();
1131 <        CompletableFuture<Integer> g = f.thenCompose(r);
1132 <        f.completeExceptionally(new CFException());
1133 <        checkCompletedWithWrappedCFException(g);
1134 <    }
1135 <
1136 <    /**
1137 <     * thenCompose result completes exceptionally if action does
1138 <     */
1139 <    public void testThenCompose3() {
1140 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1073 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1074 <        CompletableFuture<Integer> g = f.thenCompose(r);
1075 <        f.complete(one);
1076 <        checkCompletedWithWrappedCFException(g);
1077 <    }
1078 <
1079 <    /**
1080 <     * thenCompose result completes exceptionally if source cancelled
1081 <     */
1082 <    public void testThenCompose4() {
1083 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1084 <        CompletableFutureInc r = new CompletableFutureInc();
1085 <        CompletableFuture<Integer> g = f.thenCompose(r);
1086 <        assertTrue(f.cancel(true));
1087 <        checkCompletedWithWrappedCancellationException(g);
1088 <    }
1089 <
1090 <
1091 <    // asyncs
1092 <
1093 <    /**
1094 <     * thenRunAsync result completes normally after normal completion of source
1095 <     */
1096 <    public void testThenRunAsync() {
1097 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1098 <        Noop r = new Noop();
1099 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1100 <        f.complete(null);
1101 <        checkCompletedNormally(g, null);
1128 >    public void testThenRun_exceptionalCompletion() {
1129 >        for (ExecutionMode m : ExecutionMode.values())
1130 >        for (boolean createIncomplete : new boolean[] { true, false })
1131 >    {
1132 >        final CFException ex = new CFException();
1133 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1134 >        final Noop r = new Noop(m);
1135 >        if (!createIncomplete) f.completeExceptionally(ex);
1136 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1137 >        if (createIncomplete) {
1138 >            checkIncomplete(g);
1139 >            f.completeExceptionally(ex);
1140 >        }
1141  
1142 <        // reordered version
1143 <        f = new CompletableFuture<Integer>();
1144 <        f.complete(null);
1145 <        r = new Noop();
1107 <        g = f.thenRunAsync(r);
1108 <        checkCompletedNormally(g, null);
1109 <    }
1142 >        checkCompletedWithWrappedException(g, ex);
1143 >        checkCompletedExceptionally(f, ex);
1144 >        r.assertNotInvoked();
1145 >    }}
1146  
1147      /**
1148 <     * thenRunAsync result completes exceptionally after exceptional
1113 <     * completion of source
1148 >     * thenRun result completes exceptionally if source cancelled
1149       */
1150 <    public void testThenRunAsync2() {
1151 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1152 <        Noop r = new Noop();
1153 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1154 <        f.completeExceptionally(new CFException());
1155 <        try {
1156 <            g.join();
1157 <            shouldThrow();
1158 <        } catch (Exception ok) {
1150 >    public void testThenRun_sourceCancelled() {
1151 >        for (ExecutionMode m : ExecutionMode.values())
1152 >        for (boolean createIncomplete : new boolean[] { true, false })
1153 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1154 >    {
1155 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1156 >        final Noop r = new Noop(m);
1157 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1158 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1159 >        if (createIncomplete) {
1160 >            checkIncomplete(g);
1161 >            assertTrue(f.cancel(mayInterruptIfRunning));
1162          }
1125        checkCompletedWithWrappedCFException(g);
1126    }
1163  
1128    /**
1129     * thenRunAsync result completes exceptionally if action does
1130     */
1131    public void testThenRunAsync3() {
1132        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1133        FailingNoop r = new FailingNoop();
1134        CompletableFuture<Void> g = f.thenRunAsync(r);
1135        f.complete(null);
1136        checkCompletedWithWrappedCFException(g);
1137    }
1138
1139    /**
1140     * thenRunAsync result completes exceptionally if source cancelled
1141     */
1142    public void testThenRunAsync4() {
1143        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1144        Noop r = new Noop();
1145        CompletableFuture<Void> g = f.thenRunAsync(r);
1146        assertTrue(f.cancel(true));
1164          checkCompletedWithWrappedCancellationException(g);
1165 <    }
1165 >        checkCancelled(f);
1166 >        r.assertNotInvoked();
1167 >    }}
1168  
1169      /**
1170 <     * thenApplyAsync result completes normally after normal completion of source
1170 >     * thenRun result completes exceptionally if action does
1171       */
1172 <    public void testThenApplyAsync() {
1173 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1174 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1175 <        f.complete(one);
1176 <        checkCompletedNormally(g, two);
1177 <    }
1172 >    public void testThenRun_actionFailed() {
1173 >        for (ExecutionMode m : ExecutionMode.values())
1174 >        for (boolean createIncomplete : new boolean[] { true, false })
1175 >        for (Integer v1 : new Integer[] { 1, null })
1176 >    {
1177 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 >        final FailingRunnable r = new FailingRunnable(m);
1179 >        if (!createIncomplete) f.complete(v1);
1180 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1181 >        if (createIncomplete) {
1182 >            checkIncomplete(g);
1183 >            f.complete(v1);
1184 >        }
1185  
1160    /**
1161     * thenApplyAsync result completes exceptionally after exceptional
1162     * completion of source
1163     */
1164    public void testThenApplyAsync2() {
1165        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1166        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1167        f.completeExceptionally(new CFException());
1186          checkCompletedWithWrappedCFException(g);
1187 <    }
1187 >        checkCompletedNormally(f, v1);
1188 >    }}
1189  
1190      /**
1191 <     * thenApplyAsync result completes exceptionally if action does
1191 >     * thenApply result completes normally after normal completion of source
1192       */
1193 <    public void testThenApplyAsync3() {
1194 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1195 <        FailingFunction r = new FailingFunction();
1196 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1197 <        f.complete(null);
1198 <        checkCompletedWithWrappedCFException(g);
1199 <    }
1193 >    public void testThenApply_normalCompletion() {
1194 >        for (ExecutionMode m : ExecutionMode.values())
1195 >        for (boolean createIncomplete : new boolean[] { true, false })
1196 >        for (Integer v1 : new Integer[] { 1, null })
1197 >    {
1198 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1199 >        final IncFunction r = new IncFunction(m);
1200 >        if (!createIncomplete) f.complete(v1);
1201 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1202 >        if (createIncomplete) {
1203 >            checkIncomplete(g);
1204 >            f.complete(v1);
1205 >        }
1206  
1207 <    /**
1208 <     * thenApplyAsync result completes exceptionally if source cancelled
1209 <     */
1210 <    public void testThenApplyAsync4() {
1186 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1187 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1188 <        assertTrue(f.cancel(true));
1189 <        checkCompletedWithWrappedCancellationException(g);
1190 <    }
1207 >        checkCompletedNormally(g, inc(v1));
1208 >        checkCompletedNormally(f, v1);
1209 >        r.assertValue(inc(v1));
1210 >    }}
1211  
1212      /**
1213 <     * thenAcceptAsync result completes normally after normal
1213 >     * thenApply result completes exceptionally after exceptional
1214       * completion of source
1215       */
1216 <    public void testThenAcceptAsync() {
1217 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1218 <        IncAction r = new IncAction();
1219 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1220 <        f.complete(one);
1221 <        checkCompletedNormally(g, null);
1222 <        assertEquals(r.value, 2);
1223 <    }
1216 >    public void testThenApply_exceptionalCompletion() {
1217 >        for (ExecutionMode m : ExecutionMode.values())
1218 >        for (boolean createIncomplete : new boolean[] { true, false })
1219 >    {
1220 >        final CFException ex = new CFException();
1221 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1222 >        final IncFunction r = new IncFunction(m);
1223 >        if (!createIncomplete) f.completeExceptionally(ex);
1224 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1225 >        if (createIncomplete) {
1226 >            checkIncomplete(g);
1227 >            f.completeExceptionally(ex);
1228 >        }
1229  
1230 <    /**
1231 <     * thenAcceptAsync result completes exceptionally after exceptional
1232 <     * completion of source
1233 <     */
1209 <    public void testThenAcceptAsync2() {
1210 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1211 <        IncAction r = new IncAction();
1212 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1213 <        f.completeExceptionally(new CFException());
1214 <        checkCompletedWithWrappedCFException(g);
1215 <    }
1230 >        checkCompletedWithWrappedException(g, ex);
1231 >        checkCompletedExceptionally(f, ex);
1232 >        r.assertNotInvoked();
1233 >    }}
1234  
1235      /**
1236 <     * thenAcceptAsync result completes exceptionally if action does
1236 >     * thenApply result completes exceptionally if source cancelled
1237       */
1238 <    public void testThenAcceptAsync3() {
1239 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1240 <        FailingConsumer r = new FailingConsumer();
1241 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1242 <        f.complete(null);
1243 <        checkCompletedWithWrappedCFException(g);
1244 <    }
1238 >    public void testThenApply_sourceCancelled() {
1239 >        for (ExecutionMode m : ExecutionMode.values())
1240 >        for (boolean createIncomplete : new boolean[] { true, false })
1241 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1242 >    {
1243 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1244 >        final IncFunction r = new IncFunction(m);
1245 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1246 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1247 >        if (createIncomplete) {
1248 >            checkIncomplete(g);
1249 >            assertTrue(f.cancel(mayInterruptIfRunning));
1250 >        }
1251  
1228    /**
1229     * thenAcceptAsync result completes exceptionally if source cancelled
1230     */
1231    public void testThenAcceptAsync4() {
1232        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1233        IncAction r = new IncAction();
1234        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1235        assertTrue(f.cancel(true));
1252          checkCompletedWithWrappedCancellationException(g);
1253 <    }
1254 <    /**
1255 <     * thenCombineAsync result completes normally after normal
1240 <     * completion of sources
1241 <     */
1242 <    public void testThenCombineAsync() {
1243 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1244 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1245 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1246 <        f.complete(one);
1247 <        checkIncomplete(g);
1248 <        f2.complete(two);
1249 <        checkCompletedNormally(g, three);
1250 <    }
1253 >        checkCancelled(f);
1254 >        r.assertNotInvoked();
1255 >    }}
1256  
1257      /**
1258 <     * thenCombineAsync result completes exceptionally after exceptional
1254 <     * completion of source
1258 >     * thenApply result completes exceptionally if action does
1259       */
1260 <    public void testThenCombineAsync2() {
1261 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1262 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1263 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1264 <        f.completeExceptionally(new CFException());
1265 <        f2.complete(two);
1266 <        checkCompletedWithWrappedCFException(g);
1267 <
1268 <        f = new CompletableFuture<Integer>();
1269 <        f2 = new CompletableFuture<Integer>();
1270 <        g = f.thenCombineAsync(f2, add);
1271 <        f.complete(one);
1272 <        f2.completeExceptionally(new CFException());
1269 <        checkCompletedWithWrappedCFException(g);
1270 <    }
1260 >    public void testThenApply_actionFailed() {
1261 >        for (ExecutionMode m : ExecutionMode.values())
1262 >        for (boolean createIncomplete : new boolean[] { true, false })
1263 >        for (Integer v1 : new Integer[] { 1, null })
1264 >    {
1265 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1266 >        final FailingFunction r = new FailingFunction(m);
1267 >        if (!createIncomplete) f.complete(v1);
1268 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1269 >        if (createIncomplete) {
1270 >            checkIncomplete(g);
1271 >            f.complete(v1);
1272 >        }
1273  
1272    /**
1273     * thenCombineAsync result completes exceptionally if action does
1274     */
1275    public void testThenCombineAsync3() {
1276        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1277        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1278        FailingBiFunction r = new FailingBiFunction();
1279        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1280        f.complete(one);
1281        checkIncomplete(g);
1282        f2.complete(two);
1274          checkCompletedWithWrappedCFException(g);
1275 <    }
1275 >        checkCompletedNormally(f, v1);
1276 >    }}
1277  
1278      /**
1279 <     * thenCombineAsync result completes exceptionally if either source cancelled
1279 >     * thenAccept result completes normally after normal completion of source
1280       */
1281 <    public void testThenCombineAsync4() {
1282 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1283 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1284 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1285 <        assertTrue(f.cancel(true));
1286 <        f2.complete(two);
1287 <        checkCompletedWithWrappedCancellationException(g);
1288 <
1289 <        f = new CompletableFuture<Integer>();
1290 <        f2 = new CompletableFuture<Integer>();
1291 <        g = f.thenCombineAsync(f2, add);
1292 <        f.complete(one);
1293 <        assertTrue(f2.cancel(true));
1302 <        checkCompletedWithWrappedCancellationException(g);
1303 <    }
1281 >    public void testThenAccept_normalCompletion() {
1282 >        for (ExecutionMode m : ExecutionMode.values())
1283 >        for (boolean createIncomplete : new boolean[] { true, false })
1284 >        for (Integer v1 : new Integer[] { 1, null })
1285 >    {
1286 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1287 >        final NoopConsumer r = new NoopConsumer(m);
1288 >        if (!createIncomplete) f.complete(v1);
1289 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1290 >        if (createIncomplete) {
1291 >            checkIncomplete(g);
1292 >            f.complete(v1);
1293 >        }
1294  
1305    /**
1306     * thenAcceptBothAsync result completes normally after normal
1307     * completion of sources
1308     */
1309    public void testThenAcceptBothAsync() {
1310        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1311        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1312        AddAction r = new AddAction();
1313        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1314        f.complete(one);
1315        checkIncomplete(g);
1316        f2.complete(two);
1295          checkCompletedNormally(g, null);
1296 <        assertEquals(r.value, 3);
1297 <    }
1296 >        r.assertValue(v1);
1297 >        checkCompletedNormally(f, v1);
1298 >    }}
1299  
1300      /**
1301 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1301 >     * thenAccept result completes exceptionally after exceptional
1302       * completion of source
1303       */
1304 <    public void testThenAcceptBothAsync2() {
1305 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1306 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1307 <        AddAction r = new AddAction();
1308 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1309 <        f.completeExceptionally(new CFException());
1310 <        f2.complete(two);
1311 <        checkCompletedWithWrappedCFException(g);
1312 <
1313 <        r = new AddAction();
1314 <        f = new CompletableFuture<Integer>();
1315 <        f2 = new CompletableFuture<Integer>();
1316 <        g = f.thenAcceptBothAsync(f2, r);
1338 <        f.complete(one);
1339 <        f2.completeExceptionally(new CFException());
1340 <        checkCompletedWithWrappedCFException(g);
1341 <    }
1304 >    public void testThenAccept_exceptionalCompletion() {
1305 >        for (ExecutionMode m : ExecutionMode.values())
1306 >        for (boolean createIncomplete : new boolean[] { true, false })
1307 >    {
1308 >        final CFException ex = new CFException();
1309 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1310 >        final NoopConsumer r = new NoopConsumer(m);
1311 >        if (!createIncomplete) f.completeExceptionally(ex);
1312 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1313 >        if (createIncomplete) {
1314 >            checkIncomplete(g);
1315 >            f.completeExceptionally(ex);
1316 >        }
1317  
1318 <    /**
1319 <     * thenAcceptBothAsync result completes exceptionally if action does
1320 <     */
1321 <    public void testThenAcceptBothAsync3() {
1347 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1348 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1349 <        FailingBiConsumer r = new FailingBiConsumer();
1350 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1351 <        f.complete(one);
1352 <        checkIncomplete(g);
1353 <        f2.complete(two);
1354 <        checkCompletedWithWrappedCFException(g);
1355 <    }
1318 >        checkCompletedWithWrappedException(g, ex);
1319 >        checkCompletedExceptionally(f, ex);
1320 >        r.assertNotInvoked();
1321 >    }}
1322  
1323      /**
1324 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1324 >     * thenAccept result completes exceptionally if source cancelled
1325       */
1326 <    public void testThenAcceptBothAsync4() {
1327 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1328 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1329 <        AddAction r = new AddAction();
1330 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1331 <        assertTrue(f.cancel(true));
1332 <        f2.complete(two);
1333 <        checkCompletedWithWrappedCancellationException(g);
1326 >    public void testThenAccept_sourceCancelled() {
1327 >        for (ExecutionMode m : ExecutionMode.values())
1328 >        for (boolean createIncomplete : new boolean[] { true, false })
1329 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1330 >    {
1331 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1332 >        final NoopConsumer r = new NoopConsumer(m);
1333 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1334 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1335 >        if (createIncomplete) {
1336 >            checkIncomplete(g);
1337 >            assertTrue(f.cancel(mayInterruptIfRunning));
1338 >        }
1339  
1369        r = new AddAction();
1370        f = new CompletableFuture<Integer>();
1371        f2 = new CompletableFuture<Integer>();
1372        g = f.thenAcceptBothAsync(f2, r);
1373        f.complete(one);
1374        assertTrue(f2.cancel(true));
1340          checkCompletedWithWrappedCancellationException(g);
1341 <    }
1342 <
1343 <    /**
1379 <     * runAfterBothAsync result completes normally after normal
1380 <     * completion of sources
1381 <     */
1382 <    public void testRunAfterBothAsync() {
1383 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1384 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1385 <        Noop r = new Noop();
1386 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1387 <        f.complete(one);
1388 <        checkIncomplete(g);
1389 <        f2.complete(two);
1390 <        checkCompletedNormally(g, null);
1391 <        assertTrue(r.ran);
1392 <    }
1341 >        checkCancelled(f);
1342 >        r.assertNotInvoked();
1343 >    }}
1344  
1345      /**
1346 <     * runAfterBothAsync result completes exceptionally after exceptional
1396 <     * completion of source
1346 >     * thenAccept result completes exceptionally if action does
1347       */
1348 <    public void testRunAfterBothAsync2() {
1349 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1350 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1351 <        Noop r = new Noop();
1352 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1353 <        f.completeExceptionally(new CFException());
1354 <        f2.complete(two);
1355 <        checkCompletedWithWrappedCFException(g);
1356 <
1357 <        r = new Noop();
1358 <        f = new CompletableFuture<Integer>();
1359 <        f2 = new CompletableFuture<Integer>();
1360 <        g = f.runAfterBothAsync(f2, r);
1411 <        f.complete(one);
1412 <        f2.completeExceptionally(new CFException());
1413 <        checkCompletedWithWrappedCFException(g);
1414 <    }
1348 >    public void testThenAccept_actionFailed() {
1349 >        for (ExecutionMode m : ExecutionMode.values())
1350 >        for (boolean createIncomplete : new boolean[] { true, false })
1351 >        for (Integer v1 : new Integer[] { 1, null })
1352 >    {
1353 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1354 >        final FailingConsumer r = new FailingConsumer(m);
1355 >        if (!createIncomplete) f.complete(v1);
1356 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1357 >        if (createIncomplete) {
1358 >            checkIncomplete(g);
1359 >            f.complete(v1);
1360 >        }
1361  
1416    /**
1417     * runAfterBothAsync result completes exceptionally if action does
1418     */
1419    public void testRunAfterBothAsync3() {
1420        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1421        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1422        FailingNoop r = new FailingNoop();
1423        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1424        f.complete(one);
1425        checkIncomplete(g);
1426        f2.complete(two);
1362          checkCompletedWithWrappedCFException(g);
1363 <    }
1363 >        checkCompletedNormally(f, v1);
1364 >    }}
1365  
1366      /**
1367 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1367 >     * thenCombine result completes normally after normal completion
1368 >     * of sources
1369       */
1370 <    public void testRunAfterBothAsync4() {
1371 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1372 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1373 <        Noop r = new Noop();
1374 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1375 <        assertTrue(f.cancel(true));
1376 <        f2.complete(two);
1377 <        checkCompletedWithWrappedCancellationException(g);
1370 >    public void testThenCombine_normalCompletion() {
1371 >        for (ExecutionMode m : ExecutionMode.values())
1372 >        for (boolean createIncomplete : new boolean[] { true, false })
1373 >        for (boolean fFirst : new boolean[] { true, false })
1374 >        for (Integer v1 : new Integer[] { 1, null })
1375 >        for (Integer v2 : new Integer[] { 2, null })
1376 >    {
1377 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1378 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1379 >        final SubtractFunction r = new SubtractFunction(m);
1380 >
1381 >        if (fFirst) f.complete(v1); else g.complete(v2);
1382 >        if (!createIncomplete)
1383 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1384 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1385 >        if (createIncomplete) {
1386 >            checkIncomplete(h);
1387 >            r.assertNotInvoked();
1388 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1389 >        }
1390  
1391 <        r = new Noop();
1392 <        f = new CompletableFuture<Integer>();
1393 <        f2 = new CompletableFuture<Integer>();
1394 <        g = f.runAfterBothAsync(f2, r);
1395 <        f.complete(one);
1447 <        assertTrue(f2.cancel(true));
1448 <        checkCompletedWithWrappedCancellationException(g);
1449 <    }
1391 >        checkCompletedNormally(h, subtract(v1, v2));
1392 >        checkCompletedNormally(f, v1);
1393 >        checkCompletedNormally(g, v2);
1394 >        r.assertValue(subtract(v1, v2));
1395 >    }}
1396  
1397      /**
1398 <     * applyToEitherAsync result completes normally after normal
1399 <     * completion of sources
1398 >     * thenCombine result completes exceptionally after exceptional
1399 >     * completion of either source
1400       */
1401 <    public void testApplyToEitherAsync() {
1402 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1403 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1404 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1405 <        f.complete(one);
1406 <        checkCompletedNormally(g, two);
1401 >    public void testThenCombine_exceptionalCompletion() {
1402 >        for (ExecutionMode m : ExecutionMode.values())
1403 >        for (boolean createIncomplete : new boolean[] { true, false })
1404 >        for (boolean fFirst : new boolean[] { true, false })
1405 >        for (Integer v1 : new Integer[] { 1, null })
1406 >    {
1407 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 >        final CFException ex = new CFException();
1410 >        final SubtractFunction r = new SubtractFunction(m);
1411 >
1412 >        (fFirst ? f : g).complete(v1);
1413 >        if (!createIncomplete)
1414 >            (!fFirst ? f : g).completeExceptionally(ex);
1415 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1416 >        if (createIncomplete) {
1417 >            checkIncomplete(h);
1418 >            (!fFirst ? f : g).completeExceptionally(ex);
1419 >        }
1420  
1421 <        f = new CompletableFuture<Integer>();
1422 <        f.complete(one);
1423 <        f2 = new CompletableFuture<Integer>();
1424 <        g = f.applyToEitherAsync(f2, inc);
1425 <        checkCompletedNormally(g, two);
1467 <    }
1421 >        checkCompletedWithWrappedException(h, ex);
1422 >        r.assertNotInvoked();
1423 >        checkCompletedNormally(fFirst ? f : g, v1);
1424 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1425 >    }}
1426  
1427      /**
1428 <     * applyToEitherAsync result completes exceptionally after exceptional
1471 <     * completion of source
1428 >     * thenCombine result completes exceptionally if either source cancelled
1429       */
1430 <    public void testApplyToEitherAsync2() {
1431 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1432 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1433 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1434 <        f.completeExceptionally(new CFException());
1435 <        checkCompletedWithWrappedCFException(g);
1430 >    public void testThenCombine_sourceCancelled() {
1431 >        for (ExecutionMode m : ExecutionMode.values())
1432 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1433 >        for (boolean createIncomplete : new boolean[] { true, false })
1434 >        for (boolean fFirst : new boolean[] { true, false })
1435 >        for (Integer v1 : new Integer[] { 1, null })
1436 >    {
1437 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1438 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1439 >        final SubtractFunction r = new SubtractFunction(m);
1440 >
1441 >        (fFirst ? f : g).complete(v1);
1442 >        if (!createIncomplete)
1443 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1444 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1445 >        if (createIncomplete) {
1446 >            checkIncomplete(h);
1447 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1448 >        }
1449  
1450 <        f = new CompletableFuture<Integer>();
1451 <        f2 = new CompletableFuture<Integer>();
1452 <        f2.completeExceptionally(new CFException());
1453 <        g = f.applyToEitherAsync(f2, inc);
1454 <        f.complete(one);
1485 <        checkCompletedWithWrappedCFException(g);
1486 <    }
1450 >        checkCompletedWithWrappedCancellationException(h);
1451 >        checkCancelled(!fFirst ? f : g);
1452 >        r.assertNotInvoked();
1453 >        checkCompletedNormally(fFirst ? f : g, v1);
1454 >    }}
1455  
1456      /**
1457 <     * applyToEitherAsync result completes exceptionally if action does
1490 <     */
1491 <    public void testApplyToEitherAsync3() {
1492 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1493 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1494 <        FailingFunction r = new FailingFunction();
1495 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1496 <        f.complete(one);
1497 <        checkCompletedWithWrappedCFException(g);
1498 <    }
1499 <
1500 <    /**
1501 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1457 >     * thenCombine result completes exceptionally if action does
1458       */
1459 <    public void testApplyToEitherAsync4() {
1460 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1461 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1462 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1463 <        assertTrue(f.cancel(true));
1464 <        checkCompletedWithWrappedCancellationException(g);
1459 >    public void testThenCombine_actionFailed() {
1460 >        for (ExecutionMode m : ExecutionMode.values())
1461 >        for (boolean fFirst : new boolean[] { true, false })
1462 >        for (Integer v1 : new Integer[] { 1, null })
1463 >        for (Integer v2 : new Integer[] { 2, null })
1464 >    {
1465 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1466 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1467 >        final FailingBiFunction r = new FailingBiFunction(m);
1468 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1469 >
1470 >        if (fFirst) {
1471 >            f.complete(v1);
1472 >            g.complete(v2);
1473 >        } else {
1474 >            g.complete(v2);
1475 >            f.complete(v1);
1476 >        }
1477  
1478 <        f = new CompletableFuture<Integer>();
1479 <        f2 = new CompletableFuture<Integer>();
1480 <        assertTrue(f2.cancel(true));
1481 <        g = f.applyToEitherAsync(f2, inc);
1514 <        checkCompletedWithWrappedCancellationException(g);
1515 <    }
1478 >        checkCompletedWithWrappedCFException(h);
1479 >        checkCompletedNormally(f, v1);
1480 >        checkCompletedNormally(g, v2);
1481 >    }}
1482  
1483      /**
1484 <     * acceptEitherAsync result completes normally after normal
1484 >     * thenAcceptBoth result completes normally after normal
1485       * completion of sources
1486       */
1487 <    public void testAcceptEitherAsync() {
1488 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1489 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1490 <        IncAction r = new IncAction();
1491 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1492 <        f.complete(one);
1493 <        checkCompletedNormally(g, null);
1494 <        assertEquals(r.value, 2);
1487 >    public void testThenAcceptBoth_normalCompletion() {
1488 >        for (ExecutionMode m : ExecutionMode.values())
1489 >        for (boolean createIncomplete : new boolean[] { true, false })
1490 >        for (boolean fFirst : new boolean[] { true, false })
1491 >        for (Integer v1 : new Integer[] { 1, null })
1492 >        for (Integer v2 : new Integer[] { 2, null })
1493 >    {
1494 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1495 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1496 >        final SubtractAction r = new SubtractAction(m);
1497 >
1498 >        if (fFirst) f.complete(v1); else g.complete(v2);
1499 >        if (!createIncomplete)
1500 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1501 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1502 >        if (createIncomplete) {
1503 >            checkIncomplete(h);
1504 >            r.assertNotInvoked();
1505 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1506 >        }
1507  
1508 <        r = new IncAction();
1509 <        f = new CompletableFuture<Integer>();
1510 <        f.complete(one);
1511 <        f2 = new CompletableFuture<Integer>();
1512 <        g = f.acceptEitherAsync(f2, r);
1535 <        checkCompletedNormally(g, null);
1536 <        assertEquals(r.value, 2);
1537 <    }
1508 >        checkCompletedNormally(h, null);
1509 >        r.assertValue(subtract(v1, v2));
1510 >        checkCompletedNormally(f, v1);
1511 >        checkCompletedNormally(g, v2);
1512 >    }}
1513  
1514      /**
1515 <     * acceptEitherAsync result completes exceptionally after exceptional
1516 <     * completion of source
1515 >     * thenAcceptBoth result completes exceptionally after exceptional
1516 >     * completion of either source
1517       */
1518 <    public void testAcceptEitherAsync2() {
1519 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1520 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1521 <        IncAction r = new IncAction();
1522 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1523 <        f.completeExceptionally(new CFException());
1524 <        checkCompletedWithWrappedCFException(g);
1525 <
1526 <        r = new IncAction();
1527 <        f = new CompletableFuture<Integer>();
1528 <        f2 = new CompletableFuture<Integer>();
1529 <        f2.completeExceptionally(new CFException());
1530 <        g = f.acceptEitherAsync(f2, r);
1531 <        f.complete(one);
1532 <        checkCompletedWithWrappedCFException(g);
1533 <    }
1518 >    public void testThenAcceptBoth_exceptionalCompletion() {
1519 >        for (ExecutionMode m : ExecutionMode.values())
1520 >        for (boolean createIncomplete : new boolean[] { true, false })
1521 >        for (boolean fFirst : new boolean[] { true, false })
1522 >        for (Integer v1 : new Integer[] { 1, null })
1523 >    {
1524 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 >        final CFException ex = new CFException();
1527 >        final SubtractAction r = new SubtractAction(m);
1528 >
1529 >        (fFirst ? f : g).complete(v1);
1530 >        if (!createIncomplete)
1531 >            (!fFirst ? f : g).completeExceptionally(ex);
1532 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1533 >        if (createIncomplete) {
1534 >            checkIncomplete(h);
1535 >            (!fFirst ? f : g).completeExceptionally(ex);
1536 >        }
1537  
1538 <    /**
1539 <     * acceptEitherAsync result completes exceptionally if action does
1540 <     */
1541 <    public void testAcceptEitherAsync3() {
1542 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1565 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1566 <        FailingConsumer r = new FailingConsumer();
1567 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1568 <        f.complete(one);
1569 <        checkCompletedWithWrappedCFException(g);
1570 <    }
1538 >        checkCompletedWithWrappedException(h, ex);
1539 >        r.assertNotInvoked();
1540 >        checkCompletedNormally(fFirst ? f : g, v1);
1541 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1542 >    }}
1543  
1544      /**
1545 <     * acceptEitherAsync result completes exceptionally if either
1574 <     * source cancelled
1545 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1546       */
1547 <    public void testAcceptEitherAsync4() {
1548 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1549 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1550 <        IncAction r = new IncAction();
1551 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1552 <        assertTrue(f.cancel(true));
1553 <        checkCompletedWithWrappedCancellationException(g);
1547 >    public void testThenAcceptBoth_sourceCancelled() {
1548 >        for (ExecutionMode m : ExecutionMode.values())
1549 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1550 >        for (boolean createIncomplete : new boolean[] { true, false })
1551 >        for (boolean fFirst : new boolean[] { true, false })
1552 >        for (Integer v1 : new Integer[] { 1, null })
1553 >    {
1554 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1555 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1556 >        final SubtractAction r = new SubtractAction(m);
1557 >
1558 >        (fFirst ? f : g).complete(v1);
1559 >        if (!createIncomplete)
1560 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1561 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1562 >        if (createIncomplete) {
1563 >            checkIncomplete(h);
1564 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1565 >        }
1566  
1567 <        r = new IncAction();
1568 <        f = new CompletableFuture<Integer>();
1569 <        f2 = new CompletableFuture<Integer>();
1570 <        assertTrue(f2.cancel(true));
1571 <        g = f.acceptEitherAsync(f2, r);
1589 <        checkCompletedWithWrappedCancellationException(g);
1590 <    }
1567 >        checkCompletedWithWrappedCancellationException(h);
1568 >        checkCancelled(!fFirst ? f : g);
1569 >        r.assertNotInvoked();
1570 >        checkCompletedNormally(fFirst ? f : g, v1);
1571 >    }}
1572  
1573      /**
1574 <     * runAfterEitherAsync result completes normally after normal
1594 <     * completion of sources
1574 >     * thenAcceptBoth result completes exceptionally if action does
1575       */
1576 <    public void testRunAfterEitherAsync() {
1577 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1578 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1579 <        Noop r = new Noop();
1580 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1581 <        f.complete(one);
1582 <        checkCompletedNormally(g, null);
1583 <        assertTrue(r.ran);
1576 >    public void testThenAcceptBoth_actionFailed() {
1577 >        for (ExecutionMode m : ExecutionMode.values())
1578 >        for (boolean fFirst : new boolean[] { true, false })
1579 >        for (Integer v1 : new Integer[] { 1, null })
1580 >        for (Integer v2 : new Integer[] { 2, null })
1581 >    {
1582 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1583 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1584 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1585 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1586 >
1587 >        if (fFirst) {
1588 >            f.complete(v1);
1589 >            g.complete(v2);
1590 >        } else {
1591 >            g.complete(v2);
1592 >            f.complete(v1);
1593 >        }
1594  
1595 <        r = new Noop();
1596 <        f = new CompletableFuture<Integer>();
1597 <        f.complete(one);
1598 <        f2 = new CompletableFuture<Integer>();
1609 <        g = f.runAfterEitherAsync(f2, r);
1610 <        checkCompletedNormally(g, null);
1611 <        assertTrue(r.ran);
1612 <    }
1595 >        checkCompletedWithWrappedCFException(h);
1596 >        checkCompletedNormally(f, v1);
1597 >        checkCompletedNormally(g, v2);
1598 >    }}
1599  
1600      /**
1601 <     * runAfterEitherAsync result completes exceptionally after exceptional
1602 <     * completion of source
1601 >     * runAfterBoth result completes normally after normal
1602 >     * completion of sources
1603       */
1604 <    public void testRunAfterEitherAsync2() {
1605 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1606 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1607 <        Noop r = new Noop();
1608 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1609 <        f.completeExceptionally(new CFException());
1610 <        checkCompletedWithWrappedCFException(g);
1611 <
1612 <        r = new Noop();
1613 <        f = new CompletableFuture<Integer>();
1614 <        f2 = new CompletableFuture<Integer>();
1615 <        f2.completeExceptionally(new CFException());
1616 <        g = f.runAfterEitherAsync(f2, r);
1617 <        f.complete(one);
1618 <        checkCompletedWithWrappedCFException(g);
1619 <    }
1604 >    public void testRunAfterBoth_normalCompletion() {
1605 >        for (ExecutionMode m : ExecutionMode.values())
1606 >        for (boolean createIncomplete : new boolean[] { true, false })
1607 >        for (boolean fFirst : new boolean[] { true, false })
1608 >        for (Integer v1 : new Integer[] { 1, null })
1609 >        for (Integer v2 : new Integer[] { 2, null })
1610 >    {
1611 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1612 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1613 >        final Noop r = new Noop(m);
1614 >
1615 >        if (fFirst) f.complete(v1); else g.complete(v2);
1616 >        if (!createIncomplete)
1617 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1618 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1619 >        if (createIncomplete) {
1620 >            checkIncomplete(h);
1621 >            r.assertNotInvoked();
1622 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1623 >        }
1624  
1625 <    /**
1626 <     * runAfterEitherAsync result completes exceptionally if action does
1627 <     */
1628 <    public void testRunAfterEitherAsync3() {
1629 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1640 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1641 <        FailingNoop r = new FailingNoop();
1642 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1643 <        f.complete(one);
1644 <        checkCompletedWithWrappedCFException(g);
1645 <    }
1625 >        checkCompletedNormally(h, null);
1626 >        r.assertInvoked();
1627 >        checkCompletedNormally(f, v1);
1628 >        checkCompletedNormally(g, v2);
1629 >    }}
1630  
1631      /**
1632 <     * runAfterEitherAsync result completes exceptionally if either
1633 <     * source cancelled
1632 >     * runAfterBoth result completes exceptionally after exceptional
1633 >     * completion of either source
1634       */
1635 <    public void testRunAfterEitherAsync4() {
1636 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1637 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1638 <        Noop r = new Noop();
1639 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1640 <        assertTrue(f.cancel(true));
1641 <        checkCompletedWithWrappedCancellationException(g);
1635 >    public void testRunAfterBoth_exceptionalCompletion() {
1636 >        for (ExecutionMode m : ExecutionMode.values())
1637 >        for (boolean createIncomplete : new boolean[] { true, false })
1638 >        for (boolean fFirst : new boolean[] { true, false })
1639 >        for (Integer v1 : new Integer[] { 1, null })
1640 >    {
1641 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1642 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1643 >        final CFException ex = new CFException();
1644 >        final Noop r = new Noop(m);
1645 >
1646 >        (fFirst ? f : g).complete(v1);
1647 >        if (!createIncomplete)
1648 >            (!fFirst ? f : g).completeExceptionally(ex);
1649 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1650 >        if (createIncomplete) {
1651 >            checkIncomplete(h);
1652 >            (!fFirst ? f : g).completeExceptionally(ex);
1653 >        }
1654  
1655 <        r = new Noop();
1656 <        f = new CompletableFuture<Integer>();
1657 <        f2 = new CompletableFuture<Integer>();
1658 <        assertTrue(f2.cancel(true));
1659 <        g = f.runAfterEitherAsync(f2, r);
1664 <        checkCompletedWithWrappedCancellationException(g);
1665 <    }
1655 >        checkCompletedWithWrappedException(h, ex);
1656 >        r.assertNotInvoked();
1657 >        checkCompletedNormally(fFirst ? f : g, v1);
1658 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1659 >    }}
1660  
1661      /**
1662 <     * thenComposeAsync result completes normally after normal
1669 <     * completion of source
1670 <     */
1671 <    public void testThenComposeAsync() {
1672 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1673 <        CompletableFutureInc r = new CompletableFutureInc();
1674 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1675 <        f.complete(one);
1676 <        checkCompletedNormally(g, two);
1677 <    }
1678 <
1679 <    /**
1680 <     * thenComposeAsync result completes exceptionally after
1681 <     * exceptional completion of source
1662 >     * runAfterBoth result completes exceptionally if either source cancelled
1663       */
1664 <    public void testThenComposeAsync2() {
1665 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1666 <        CompletableFutureInc r = new CompletableFutureInc();
1667 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1668 <        f.completeExceptionally(new CFException());
1669 <        checkCompletedWithWrappedCFException(g);
1670 <    }
1664 >    public void testRunAfterBoth_sourceCancelled() {
1665 >        for (ExecutionMode m : ExecutionMode.values())
1666 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1667 >        for (boolean createIncomplete : new boolean[] { true, false })
1668 >        for (boolean fFirst : new boolean[] { true, false })
1669 >        for (Integer v1 : new Integer[] { 1, null })
1670 >    {
1671 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1672 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1673 >        final Noop r = new Noop(m);
1674 >
1675 >
1676 >        (fFirst ? f : g).complete(v1);
1677 >        if (!createIncomplete)
1678 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1679 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1680 >        if (createIncomplete) {
1681 >            checkIncomplete(h);
1682 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1683 >        }
1684  
1685 <    /**
1686 <     * thenComposeAsync result completes exceptionally if action does
1687 <     */
1688 <    public void testThenComposeAsync3() {
1689 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1696 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1697 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1698 <        f.complete(one);
1699 <        checkCompletedWithWrappedCFException(g);
1700 <    }
1685 >        checkCompletedWithWrappedCancellationException(h);
1686 >        checkCancelled(!fFirst ? f : g);
1687 >        r.assertNotInvoked();
1688 >        checkCompletedNormally(fFirst ? f : g, v1);
1689 >    }}
1690  
1691      /**
1692 <     * thenComposeAsync result completes exceptionally if source cancelled
1692 >     * runAfterBoth result completes exceptionally if action does
1693       */
1694 <    public void testThenComposeAsync4() {
1695 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1696 <        CompletableFutureInc r = new CompletableFutureInc();
1697 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1698 <        assertTrue(f.cancel(true));
1699 <        checkCompletedWithWrappedCancellationException(g);
1700 <    }
1701 <
1694 >    public void testRunAfterBoth_actionFailed() {
1695 >        for (ExecutionMode m : ExecutionMode.values())
1696 >        for (boolean fFirst : new boolean[] { true, false })
1697 >        for (Integer v1 : new Integer[] { 1, null })
1698 >        for (Integer v2 : new Integer[] { 2, null })
1699 >    {
1700 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1701 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1702 >        final FailingRunnable r1 = new FailingRunnable(m);
1703 >        final FailingRunnable r2 = new FailingRunnable(m);
1704 >
1705 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1706 >        if (fFirst) {
1707 >            f.complete(v1);
1708 >            g.complete(v2);
1709 >        } else {
1710 >            g.complete(v2);
1711 >            f.complete(v1);
1712 >        }
1713 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1714  
1715 <    // async with explicit executors
1715 >        checkCompletedWithWrappedCFException(h1);
1716 >        checkCompletedWithWrappedCFException(h2);
1717 >        checkCompletedNormally(f, v1);
1718 >        checkCompletedNormally(g, v2);
1719 >    }}
1720  
1721      /**
1722 <     * thenRunAsync result completes normally after normal completion of source
1722 >     * applyToEither result completes normally after normal completion
1723 >     * of either source
1724       */
1725 <    public void testThenRunAsyncE() {
1726 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1727 <        Noop r = new Noop();
1728 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1729 <        f.complete(null);
1730 <        checkCompletedNormally(g, null);
1731 <
1732 <        // reordered version
1733 <        f = new CompletableFuture<Integer>();
1734 <        f.complete(null);
1735 <        r = new Noop();
1736 <        g = f.thenRunAsync(r, new ThreadExecutor());
1737 <        checkCompletedNormally(g, null);
1738 <    }
1725 >    public void testApplyToEither_normalCompletion() {
1726 >        for (ExecutionMode m : ExecutionMode.values())
1727 >        for (Integer v1 : new Integer[] { 1, null })
1728 >        for (Integer v2 : new Integer[] { 2, null })
1729 >    {
1730 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1731 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1732 >        final IncFunction[] rs = new IncFunction[6];
1733 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1734 >
1735 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1736 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1737 >        checkIncomplete(h0);
1738 >        checkIncomplete(h1);
1739 >        rs[0].assertNotInvoked();
1740 >        rs[1].assertNotInvoked();
1741 >        f.complete(v1);
1742 >        checkCompletedNormally(h0, inc(v1));
1743 >        checkCompletedNormally(h1, inc(v1));
1744 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1745 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1746 >        checkCompletedNormally(h2, inc(v1));
1747 >        checkCompletedNormally(h3, inc(v1));
1748 >        g.complete(v2);
1749 >
1750 >        // unspecified behavior - both source completions available
1751 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1752 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1753 >        rs[4].assertValue(h4.join());
1754 >        rs[5].assertValue(h5.join());
1755 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1756 >                   Objects.equals(inc(v2), h4.join()));
1757 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1758 >                   Objects.equals(inc(v2), h5.join()));
1759 >
1760 >        checkCompletedNormally(f, v1);
1761 >        checkCompletedNormally(g, v2);
1762 >        checkCompletedNormally(h0, inc(v1));
1763 >        checkCompletedNormally(h1, inc(v1));
1764 >        checkCompletedNormally(h2, inc(v1));
1765 >        checkCompletedNormally(h3, inc(v1));
1766 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1767 >    }}
1768  
1769      /**
1770 <     * thenRunAsync result completes exceptionally after exceptional
1771 <     * completion of source
1770 >     * applyToEither result completes exceptionally after exceptional
1771 >     * completion of either source
1772       */
1773 <    public void testThenRunAsync2E() {
1774 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1775 <        Noop r = new Noop();
1776 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1777 <        f.completeExceptionally(new CFException());
1773 >    public void testApplyToEither_exceptionalCompletion() {
1774 >        for (ExecutionMode m : ExecutionMode.values())
1775 >        for (Integer v1 : new Integer[] { 1, null })
1776 >    {
1777 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1778 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 >        final CFException ex = new CFException();
1780 >        final IncFunction[] rs = new IncFunction[6];
1781 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1782 >
1783 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1784 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1785 >        checkIncomplete(h0);
1786 >        checkIncomplete(h1);
1787 >        rs[0].assertNotInvoked();
1788 >        rs[1].assertNotInvoked();
1789 >        f.completeExceptionally(ex);
1790 >        checkCompletedWithWrappedException(h0, ex);
1791 >        checkCompletedWithWrappedException(h1, ex);
1792 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1793 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1794 >        checkCompletedWithWrappedException(h2, ex);
1795 >        checkCompletedWithWrappedException(h3, ex);
1796 >        g.complete(v1);
1797 >
1798 >        // unspecified behavior - both source completions available
1799 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1800 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1801          try {
1802 <            g.join();
1803 <            shouldThrow();
1804 <        } catch (Exception ok) {
1802 >            assertEquals(inc(v1), h4.join());
1803 >            rs[4].assertValue(inc(v1));
1804 >        } catch (CompletionException ok) {
1805 >            checkCompletedWithWrappedException(h4, ex);
1806 >            rs[4].assertNotInvoked();
1807 >        }
1808 >        try {
1809 >            assertEquals(inc(v1), h5.join());
1810 >            rs[5].assertValue(inc(v1));
1811 >        } catch (CompletionException ok) {
1812 >            checkCompletedWithWrappedException(h5, ex);
1813 >            rs[5].assertNotInvoked();
1814          }
1748        checkCompletedWithWrappedCFException(g);
1749    }
1750
1751    /**
1752     * thenRunAsync result completes exceptionally if action does
1753     */
1754    public void testThenRunAsync3E() {
1755        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1756        FailingNoop r = new FailingNoop();
1757        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1758        f.complete(null);
1759        checkCompletedWithWrappedCFException(g);
1760    }
1761
1762    /**
1763     * thenRunAsync result completes exceptionally if source cancelled
1764     */
1765    public void testThenRunAsync4E() {
1766        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1767        Noop r = new Noop();
1768        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1769        assertTrue(f.cancel(true));
1770        checkCompletedWithWrappedCancellationException(g);
1771    }
1772
1773    /**
1774     * thenApplyAsync result completes normally after normal completion of source
1775     */
1776    public void testThenApplyAsyncE() {
1777        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1778        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1779        f.complete(one);
1780        checkCompletedNormally(g, two);
1781    }
1782
1783    /**
1784     * thenApplyAsync result completes exceptionally after exceptional
1785     * completion of source
1786     */
1787    public void testThenApplyAsync2E() {
1788        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1789        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1790        f.completeExceptionally(new CFException());
1791        checkCompletedWithWrappedCFException(g);
1792    }
1793
1794    /**
1795     * thenApplyAsync result completes exceptionally if action does
1796     */
1797    public void testThenApplyAsync3E() {
1798        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1799        FailingFunction r = new FailingFunction();
1800        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
1801        f.complete(null);
1802        checkCompletedWithWrappedCFException(g);
1803    }
1804
1805    /**
1806     * thenApplyAsync result completes exceptionally if source cancelled
1807     */
1808    public void testThenApplyAsync4E() {
1809        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1810        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1811        assertTrue(f.cancel(true));
1812        checkCompletedWithWrappedCancellationException(g);
1813    }
1814
1815    /**
1816     * thenAcceptAsync result completes normally after normal
1817     * completion of source
1818     */
1819    public void testThenAcceptAsyncE() {
1820        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1821        IncAction r = new IncAction();
1822        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1823        f.complete(one);
1824        checkCompletedNormally(g, null);
1825        assertEquals(r.value, 2);
1826    }
1827
1828    /**
1829     * thenAcceptAsync result completes exceptionally after exceptional
1830     * completion of source
1831     */
1832    public void testThenAcceptAsync2E() {
1833        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1834        IncAction r = new IncAction();
1835        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1836        f.completeExceptionally(new CFException());
1837        checkCompletedWithWrappedCFException(g);
1838    }
1839
1840    /**
1841     * thenAcceptAsync result completes exceptionally if action does
1842     */
1843    public void testThenAcceptAsync3E() {
1844        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1845        FailingConsumer r = new FailingConsumer();
1846        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1847        f.complete(null);
1848        checkCompletedWithWrappedCFException(g);
1849    }
1850
1851    /**
1852     * thenAcceptAsync result completes exceptionally if source cancelled
1853     */
1854    public void testThenAcceptAsync4E() {
1855        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1856        IncAction r = new IncAction();
1857        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1858        assertTrue(f.cancel(true));
1859        checkCompletedWithWrappedCancellationException(g);
1860    }
1861    /**
1862     * thenCombineAsync result completes normally after normal
1863     * completion of sources
1864     */
1865    public void testThenCombineAsyncE() {
1866        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1867        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1868        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1869        f.complete(one);
1870        checkIncomplete(g);
1871        f2.complete(two);
1872        checkCompletedNormally(g, three);
1873    }
1815  
1816 <    /**
1817 <     * thenCombineAsync result completes exceptionally after exceptional
1818 <     * completion of source
1819 <     */
1820 <    public void testThenCombineAsync2E() {
1821 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1822 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1823 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1824 <        f.completeExceptionally(new CFException());
1825 <        f2.complete(two);
1826 <        checkCompletedWithWrappedCFException(g);
1816 >        checkCompletedExceptionally(f, ex);
1817 >        checkCompletedNormally(g, v1);
1818 >        checkCompletedWithWrappedException(h0, ex);
1819 >        checkCompletedWithWrappedException(h1, ex);
1820 >        checkCompletedWithWrappedException(h2, ex);
1821 >        checkCompletedWithWrappedException(h3, ex);
1822 >        checkCompletedWithWrappedException(h4, ex);
1823 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1824 >    }}
1825 >
1826 >    public void testApplyToEither_exceptionalCompletion2() {
1827 >        for (ExecutionMode m : ExecutionMode.values())
1828 >        for (boolean fFirst : new boolean[] { true, false })
1829 >        for (Integer v1 : new Integer[] { 1, null })
1830 >    {
1831 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1832 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1833 >        final CFException ex = new CFException();
1834 >        final IncFunction[] rs = new IncFunction[6];
1835 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1836 >
1837 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1838 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1839 >        if (fFirst) {
1840 >            f.complete(v1);
1841 >            g.completeExceptionally(ex);
1842 >        } else {
1843 >            g.completeExceptionally(ex);
1844 >            f.complete(v1);
1845 >        }
1846 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1847 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1848  
1849 <        f = new CompletableFuture<Integer>();
1850 <        f2 = new CompletableFuture<Integer>();
1851 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1852 <        f.complete(one);
1853 <        f2.completeExceptionally(new CFException());
1854 <        checkCompletedWithWrappedCFException(g);
1855 <    }
1849 >        // unspecified behavior - both source completions available
1850 >        try {
1851 >            assertEquals(inc(v1), h0.join());
1852 >            rs[0].assertValue(inc(v1));
1853 >        } catch (CompletionException ok) {
1854 >            checkCompletedWithWrappedException(h0, ex);
1855 >            rs[0].assertNotInvoked();
1856 >        }
1857 >        try {
1858 >            assertEquals(inc(v1), h1.join());
1859 >            rs[1].assertValue(inc(v1));
1860 >        } catch (CompletionException ok) {
1861 >            checkCompletedWithWrappedException(h1, ex);
1862 >            rs[1].assertNotInvoked();
1863 >        }
1864 >        try {
1865 >            assertEquals(inc(v1), h2.join());
1866 >            rs[2].assertValue(inc(v1));
1867 >        } catch (CompletionException ok) {
1868 >            checkCompletedWithWrappedException(h2, ex);
1869 >            rs[2].assertNotInvoked();
1870 >        }
1871 >        try {
1872 >            assertEquals(inc(v1), h3.join());
1873 >            rs[3].assertValue(inc(v1));
1874 >        } catch (CompletionException ok) {
1875 >            checkCompletedWithWrappedException(h3, ex);
1876 >            rs[3].assertNotInvoked();
1877 >        }
1878  
1879 <    /**
1880 <     * thenCombineAsync result completes exceptionally if action does
1881 <     */
1898 <    public void testThenCombineAsync3E() {
1899 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1900 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1901 <        FailingBiFunction r = new FailingBiFunction();
1902 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
1903 <        f.complete(one);
1904 <        checkIncomplete(g);
1905 <        f2.complete(two);
1906 <        checkCompletedWithWrappedCFException(g);
1907 <    }
1879 >        checkCompletedNormally(f, v1);
1880 >        checkCompletedExceptionally(g, ex);
1881 >    }}
1882  
1883      /**
1884 <     * thenCombineAsync result completes exceptionally if either source cancelled
1884 >     * applyToEither result completes exceptionally if either source cancelled
1885       */
1886 <    public void testThenCombineAsync4E() {
1887 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1888 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1889 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1890 <        assertTrue(f.cancel(true));
1891 <        f2.complete(two);
1892 <        checkCompletedWithWrappedCancellationException(g);
1893 <
1894 <        f = new CompletableFuture<Integer>();
1895 <        f2 = new CompletableFuture<Integer>();
1896 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1897 <        f.complete(one);
1898 <        assertTrue(f2.cancel(true));
1899 <        checkCompletedWithWrappedCancellationException(g);
1900 <    }
1886 >    public void testApplyToEither_sourceCancelled() {
1887 >        for (ExecutionMode m : ExecutionMode.values())
1888 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1889 >        for (Integer v1 : new Integer[] { 1, null })
1890 >    {
1891 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1892 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1893 >        final IncFunction[] rs = new IncFunction[6];
1894 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1895 >
1896 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1897 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1898 >        checkIncomplete(h0);
1899 >        checkIncomplete(h1);
1900 >        rs[0].assertNotInvoked();
1901 >        rs[1].assertNotInvoked();
1902 >        f.cancel(mayInterruptIfRunning);
1903 >        checkCompletedWithWrappedCancellationException(h0);
1904 >        checkCompletedWithWrappedCancellationException(h1);
1905 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1906 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1907 >        checkCompletedWithWrappedCancellationException(h2);
1908 >        checkCompletedWithWrappedCancellationException(h3);
1909 >        g.complete(v1);
1910 >
1911 >        // unspecified behavior - both source completions available
1912 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1913 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1914 >        try {
1915 >            assertEquals(inc(v1), h4.join());
1916 >            rs[4].assertValue(inc(v1));
1917 >        } catch (CompletionException ok) {
1918 >            checkCompletedWithWrappedCancellationException(h4);
1919 >            rs[4].assertNotInvoked();
1920 >        }
1921 >        try {
1922 >            assertEquals(inc(v1), h5.join());
1923 >            rs[5].assertValue(inc(v1));
1924 >        } catch (CompletionException ok) {
1925 >            checkCompletedWithWrappedCancellationException(h5);
1926 >            rs[5].assertNotInvoked();
1927 >        }
1928  
1929 <    /**
1930 <     * thenAcceptBothAsync result completes normally after normal
1931 <     * completion of sources
1932 <     */
1933 <    public void testThenAcceptBothAsyncE() {
1934 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1935 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1936 <        AddAction r = new AddAction();
1937 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1938 <        f.complete(one);
1939 <        checkIncomplete(g);
1940 <        f2.complete(two);
1941 <        checkCompletedNormally(g, null);
1942 <        assertEquals(r.value, 3);
1943 <    }
1929 >        checkCancelled(f);
1930 >        checkCompletedNormally(g, v1);
1931 >        checkCompletedWithWrappedCancellationException(h0);
1932 >        checkCompletedWithWrappedCancellationException(h1);
1933 >        checkCompletedWithWrappedCancellationException(h2);
1934 >        checkCompletedWithWrappedCancellationException(h3);
1935 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1936 >    }}
1937 >
1938 >    public void testApplyToEither_sourceCancelled2() {
1939 >        for (ExecutionMode m : ExecutionMode.values())
1940 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1941 >        for (boolean fFirst : new boolean[] { true, false })
1942 >        for (Integer v1 : new Integer[] { 1, null })
1943 >    {
1944 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1945 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1946 >        final IncFunction[] rs = new IncFunction[6];
1947 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1948 >
1949 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1950 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1951 >        if (fFirst) {
1952 >            f.complete(v1);
1953 >            g.cancel(mayInterruptIfRunning);
1954 >        } else {
1955 >            g.cancel(mayInterruptIfRunning);
1956 >            f.complete(v1);
1957 >        }
1958 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1959 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1960  
1961 <    /**
1962 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1963 <     * completion of source
1964 <     */
1965 <    public void testThenAcceptBothAsync2E() {
1966 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1967 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1968 <        AddAction r = new AddAction();
1969 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1970 <        f.completeExceptionally(new CFException());
1971 <        f2.complete(two);
1972 <        checkCompletedWithWrappedCFException(g);
1961 >        // unspecified behavior - both source completions available
1962 >        try {
1963 >            assertEquals(inc(v1), h0.join());
1964 >            rs[0].assertValue(inc(v1));
1965 >        } catch (CompletionException ok) {
1966 >            checkCompletedWithWrappedCancellationException(h0);
1967 >            rs[0].assertNotInvoked();
1968 >        }
1969 >        try {
1970 >            assertEquals(inc(v1), h1.join());
1971 >            rs[1].assertValue(inc(v1));
1972 >        } catch (CompletionException ok) {
1973 >            checkCompletedWithWrappedCancellationException(h1);
1974 >            rs[1].assertNotInvoked();
1975 >        }
1976 >        try {
1977 >            assertEquals(inc(v1), h2.join());
1978 >            rs[2].assertValue(inc(v1));
1979 >        } catch (CompletionException ok) {
1980 >            checkCompletedWithWrappedCancellationException(h2);
1981 >            rs[2].assertNotInvoked();
1982 >        }
1983 >        try {
1984 >            assertEquals(inc(v1), h3.join());
1985 >            rs[3].assertValue(inc(v1));
1986 >        } catch (CompletionException ok) {
1987 >            checkCompletedWithWrappedCancellationException(h3);
1988 >            rs[3].assertNotInvoked();
1989 >        }
1990  
1991 <        r = new AddAction();
1992 <        f = new CompletableFuture<Integer>();
1993 <        f2 = new CompletableFuture<Integer>();
1960 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1961 <        f.complete(one);
1962 <        f2.completeExceptionally(new CFException());
1963 <        checkCompletedWithWrappedCFException(g);
1964 <    }
1991 >        checkCompletedNormally(f, v1);
1992 >        checkCancelled(g);
1993 >    }}
1994  
1995      /**
1996 <     * thenAcceptBothAsync result completes exceptionally if action does
1996 >     * applyToEither result completes exceptionally if action does
1997       */
1998 <    public void testThenAcceptBothAsync3E() {
1999 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2000 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2001 <        FailingBiConsumer r = new FailingBiConsumer();
2002 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2003 <        f.complete(one);
2004 <        checkIncomplete(g);
2005 <        f2.complete(two);
2006 <        checkCompletedWithWrappedCFException(g);
2007 <    }
1998 >    public void testApplyToEither_actionFailed() {
1999 >        for (ExecutionMode m : ExecutionMode.values())
2000 >        for (Integer v1 : new Integer[] { 1, null })
2001 >        for (Integer v2 : new Integer[] { 2, null })
2002 >    {
2003 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2004 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2005 >        final FailingFunction[] rs = new FailingFunction[6];
2006 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2007 >
2008 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2009 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2010 >        f.complete(v1);
2011 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2012 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2013 >        checkCompletedWithWrappedCFException(h0);
2014 >        checkCompletedWithWrappedCFException(h1);
2015 >        checkCompletedWithWrappedCFException(h2);
2016 >        checkCompletedWithWrappedCFException(h3);
2017 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2018 >
2019 >        g.complete(v2);
2020 >
2021 >        // unspecified behavior - both source completions available
2022 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2023 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2024 >
2025 >        checkCompletedWithWrappedCFException(h4);
2026 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2027 >                   Objects.equals(v2, rs[4].value));
2028 >        checkCompletedWithWrappedCFException(h5);
2029 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2030 >                   Objects.equals(v2, rs[5].value));
2031 >
2032 >        checkCompletedNormally(f, v1);
2033 >        checkCompletedNormally(g, v2);
2034 >    }}
2035  
2036      /**
2037 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2037 >     * acceptEither result completes normally after normal completion
2038 >     * of either source
2039       */
2040 <    public void testThenAcceptBothAsync4E() {
2041 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2042 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2043 <        AddAction r = new AddAction();
2044 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2045 <        assertTrue(f.cancel(true));
2046 <        f2.complete(two);
2047 <        checkCompletedWithWrappedCancellationException(g);
2048 <
2049 <        r = new AddAction();
2050 <        f = new CompletableFuture<Integer>();
2051 <        f2 = new CompletableFuture<Integer>();
2052 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2053 <        f.complete(one);
2054 <        assertTrue(f2.cancel(true));
2055 <        checkCompletedWithWrappedCancellationException(g);
2056 <    }
2040 >    public void testAcceptEither_normalCompletion() {
2041 >        for (ExecutionMode m : ExecutionMode.values())
2042 >        for (Integer v1 : new Integer[] { 1, null })
2043 >        for (Integer v2 : new Integer[] { 2, null })
2044 >    {
2045 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 >        final NoopConsumer[] rs = new NoopConsumer[6];
2048 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2049 >
2050 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2051 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2052 >        checkIncomplete(h0);
2053 >        checkIncomplete(h1);
2054 >        rs[0].assertNotInvoked();
2055 >        rs[1].assertNotInvoked();
2056 >        f.complete(v1);
2057 >        checkCompletedNormally(h0, null);
2058 >        checkCompletedNormally(h1, null);
2059 >        rs[0].assertValue(v1);
2060 >        rs[1].assertValue(v1);
2061 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2062 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2063 >        checkCompletedNormally(h2, null);
2064 >        checkCompletedNormally(h3, null);
2065 >        rs[2].assertValue(v1);
2066 >        rs[3].assertValue(v1);
2067 >        g.complete(v2);
2068 >
2069 >        // unspecified behavior - both source completions available
2070 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2071 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2072 >        checkCompletedNormally(h4, null);
2073 >        checkCompletedNormally(h5, null);
2074 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2075 >                   Objects.equals(v2, rs[4].value));
2076 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2077 >                   Objects.equals(v2, rs[5].value));
2078 >
2079 >        checkCompletedNormally(f, v1);
2080 >        checkCompletedNormally(g, v2);
2081 >        checkCompletedNormally(h0, null);
2082 >        checkCompletedNormally(h1, null);
2083 >        checkCompletedNormally(h2, null);
2084 >        checkCompletedNormally(h3, null);
2085 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2086 >    }}
2087  
2088      /**
2089 <     * runAfterBothAsync result completes normally after normal
2090 <     * completion of sources
2089 >     * acceptEither result completes exceptionally after exceptional
2090 >     * completion of either source
2091       */
2092 <    public void testRunAfterBothAsyncE() {
2093 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2094 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2095 <        Noop r = new Noop();
2096 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2097 <        f.complete(one);
2098 <        checkIncomplete(g);
2099 <        f2.complete(two);
2100 <        checkCompletedNormally(g, null);
2101 <        assertTrue(r.ran);
2102 <    }
2092 >    public void testAcceptEither_exceptionalCompletion() {
2093 >        for (ExecutionMode m : ExecutionMode.values())
2094 >        for (Integer v1 : new Integer[] { 1, null })
2095 >    {
2096 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2097 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2098 >        final CFException ex = new CFException();
2099 >        final NoopConsumer[] rs = new NoopConsumer[6];
2100 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2101 >
2102 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2103 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2104 >        checkIncomplete(h0);
2105 >        checkIncomplete(h1);
2106 >        rs[0].assertNotInvoked();
2107 >        rs[1].assertNotInvoked();
2108 >        f.completeExceptionally(ex);
2109 >        checkCompletedWithWrappedException(h0, ex);
2110 >        checkCompletedWithWrappedException(h1, ex);
2111 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2112 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2113 >        checkCompletedWithWrappedException(h2, ex);
2114 >        checkCompletedWithWrappedException(h3, ex);
2115 >
2116 >        g.complete(v1);
2117 >
2118 >        // unspecified behavior - both source completions available
2119 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2120 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2121 >        try {
2122 >            assertNull(h4.join());
2123 >            rs[4].assertValue(v1);
2124 >        } catch (CompletionException ok) {
2125 >            checkCompletedWithWrappedException(h4, ex);
2126 >            rs[4].assertNotInvoked();
2127 >        }
2128 >        try {
2129 >            assertNull(h5.join());
2130 >            rs[5].assertValue(v1);
2131 >        } catch (CompletionException ok) {
2132 >            checkCompletedWithWrappedException(h5, ex);
2133 >            rs[5].assertNotInvoked();
2134 >        }
2135  
2136 <    /**
2137 <     * runAfterBothAsync result completes exceptionally after exceptional
2138 <     * completion of source
2139 <     */
2140 <    public void testRunAfterBothAsync2E() {
2141 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2142 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2143 <        Noop r = new Noop();
2144 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2145 <        f.completeExceptionally(new CFException());
2146 <        f2.complete(two);
2147 <        checkCompletedWithWrappedCFException(g);
2136 >        checkCompletedExceptionally(f, ex);
2137 >        checkCompletedNormally(g, v1);
2138 >        checkCompletedWithWrappedException(h0, ex);
2139 >        checkCompletedWithWrappedException(h1, ex);
2140 >        checkCompletedWithWrappedException(h2, ex);
2141 >        checkCompletedWithWrappedException(h3, ex);
2142 >        checkCompletedWithWrappedException(h4, ex);
2143 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2144 >    }}
2145 >
2146 >    public void testAcceptEither_exceptionalCompletion2() {
2147 >        for (ExecutionMode m : ExecutionMode.values())
2148 >        for (boolean fFirst : new boolean[] { true, false })
2149 >        for (Integer v1 : new Integer[] { 1, null })
2150 >    {
2151 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2152 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2153 >        final CFException ex = new CFException();
2154 >        final NoopConsumer[] rs = new NoopConsumer[6];
2155 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2156 >
2157 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2158 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2159 >        if (fFirst) {
2160 >            f.complete(v1);
2161 >            g.completeExceptionally(ex);
2162 >        } else {
2163 >            g.completeExceptionally(ex);
2164 >            f.complete(v1);
2165 >        }
2166 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2167 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2168  
2169 <        r = new Noop();
2170 <        f = new CompletableFuture<Integer>();
2171 <        f2 = new CompletableFuture<Integer>();
2172 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2173 <        f.complete(one);
2174 <        f2.completeExceptionally(new CFException());
2175 <        checkCompletedWithWrappedCFException(g);
2176 <    }
2169 >        // unspecified behavior - both source completions available
2170 >        try {
2171 >            assertEquals(null, h0.join());
2172 >            rs[0].assertValue(v1);
2173 >        } catch (CompletionException ok) {
2174 >            checkCompletedWithWrappedException(h0, ex);
2175 >            rs[0].assertNotInvoked();
2176 >        }
2177 >        try {
2178 >            assertEquals(null, h1.join());
2179 >            rs[1].assertValue(v1);
2180 >        } catch (CompletionException ok) {
2181 >            checkCompletedWithWrappedException(h1, ex);
2182 >            rs[1].assertNotInvoked();
2183 >        }
2184 >        try {
2185 >            assertEquals(null, h2.join());
2186 >            rs[2].assertValue(v1);
2187 >        } catch (CompletionException ok) {
2188 >            checkCompletedWithWrappedException(h2, ex);
2189 >            rs[2].assertNotInvoked();
2190 >        }
2191 >        try {
2192 >            assertEquals(null, h3.join());
2193 >            rs[3].assertValue(v1);
2194 >        } catch (CompletionException ok) {
2195 >            checkCompletedWithWrappedException(h3, ex);
2196 >            rs[3].assertNotInvoked();
2197 >        }
2198  
2199 <    /**
2200 <     * runAfterBothAsync result completes exceptionally if action does
2201 <     */
2042 <    public void testRunAfterBothAsync3E() {
2043 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2044 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2045 <        FailingNoop r = new FailingNoop();
2046 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2047 <        f.complete(one);
2048 <        checkIncomplete(g);
2049 <        f2.complete(two);
2050 <        checkCompletedWithWrappedCFException(g);
2051 <    }
2199 >        checkCompletedNormally(f, v1);
2200 >        checkCompletedExceptionally(g, ex);
2201 >    }}
2202  
2203      /**
2204 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2204 >     * acceptEither result completes exceptionally if either source cancelled
2205       */
2206 <    public void testRunAfterBothAsync4E() {
2207 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2208 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2209 <        Noop r = new Noop();
2210 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2211 <        assertTrue(f.cancel(true));
2212 <        f2.complete(two);
2213 <        checkCompletedWithWrappedCancellationException(g);
2206 >    public void testAcceptEither_sourceCancelled() {
2207 >        for (ExecutionMode m : ExecutionMode.values())
2208 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2209 >        for (Integer v1 : new Integer[] { 1, null })
2210 >    {
2211 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2212 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2213 >        final NoopConsumer[] rs = new NoopConsumer[6];
2214 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2215 >
2216 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2217 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2218 >        checkIncomplete(h0);
2219 >        checkIncomplete(h1);
2220 >        rs[0].assertNotInvoked();
2221 >        rs[1].assertNotInvoked();
2222 >        f.cancel(mayInterruptIfRunning);
2223 >        checkCompletedWithWrappedCancellationException(h0);
2224 >        checkCompletedWithWrappedCancellationException(h1);
2225 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2226 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2227 >        checkCompletedWithWrappedCancellationException(h2);
2228 >        checkCompletedWithWrappedCancellationException(h3);
2229 >
2230 >        g.complete(v1);
2231 >
2232 >        // unspecified behavior - both source completions available
2233 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2234 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2235 >        try {
2236 >            assertNull(h4.join());
2237 >            rs[4].assertValue(v1);
2238 >        } catch (CompletionException ok) {
2239 >            checkCompletedWithWrappedCancellationException(h4);
2240 >            rs[4].assertNotInvoked();
2241 >        }
2242 >        try {
2243 >            assertNull(h5.join());
2244 >            rs[5].assertValue(v1);
2245 >        } catch (CompletionException ok) {
2246 >            checkCompletedWithWrappedCancellationException(h5);
2247 >            rs[5].assertNotInvoked();
2248 >        }
2249  
2250 <        r = new Noop();
2251 <        f = new CompletableFuture<Integer>();
2252 <        f2 = new CompletableFuture<Integer>();
2253 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2254 <        f.complete(one);
2255 <        assertTrue(f2.cancel(true));
2256 <        checkCompletedWithWrappedCancellationException(g);
2257 <    }
2250 >        checkCancelled(f);
2251 >        checkCompletedNormally(g, v1);
2252 >        checkCompletedWithWrappedCancellationException(h0);
2253 >        checkCompletedWithWrappedCancellationException(h1);
2254 >        checkCompletedWithWrappedCancellationException(h2);
2255 >        checkCompletedWithWrappedCancellationException(h3);
2256 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2257 >    }}
2258  
2259      /**
2260 <     * applyToEitherAsync result completes normally after normal
2076 <     * completion of sources
2260 >     * acceptEither result completes exceptionally if action does
2261       */
2262 <    public void testApplyToEitherAsyncE() {
2263 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2264 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2265 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2266 <        f.complete(one);
2267 <        checkCompletedNormally(g, two);
2268 <
2269 <        f = new CompletableFuture<Integer>();
2270 <        f.complete(one);
2271 <        f2 = new CompletableFuture<Integer>();
2272 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2273 <        checkCompletedNormally(g, two);
2274 <    }
2262 >    public void testAcceptEither_actionFailed() {
2263 >        for (ExecutionMode m : ExecutionMode.values())
2264 >        for (Integer v1 : new Integer[] { 1, null })
2265 >        for (Integer v2 : new Integer[] { 2, null })
2266 >    {
2267 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2268 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2269 >        final FailingConsumer[] rs = new FailingConsumer[6];
2270 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2271 >
2272 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2273 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2274 >        f.complete(v1);
2275 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2276 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2277 >        checkCompletedWithWrappedCFException(h0);
2278 >        checkCompletedWithWrappedCFException(h1);
2279 >        checkCompletedWithWrappedCFException(h2);
2280 >        checkCompletedWithWrappedCFException(h3);
2281 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2282 >
2283 >        g.complete(v2);
2284 >
2285 >        // unspecified behavior - both source completions available
2286 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2287 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2288 >
2289 >        checkCompletedWithWrappedCFException(h4);
2290 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2291 >                   Objects.equals(v2, rs[4].value));
2292 >        checkCompletedWithWrappedCFException(h5);
2293 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2294 >                   Objects.equals(v2, rs[5].value));
2295 >
2296 >        checkCompletedNormally(f, v1);
2297 >        checkCompletedNormally(g, v2);
2298 >    }}
2299  
2300      /**
2301 <     * applyToEitherAsync result completes exceptionally after exceptional
2302 <     * completion of source
2095 <     */
2096 <    public void testApplyToEitherAsync2E() {
2097 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2098 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2099 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2100 <        f.completeExceptionally(new CFException());
2101 <        checkCompletedWithWrappedCFException(g);
2102 <
2103 <        f = new CompletableFuture<Integer>();
2104 <        f2 = new CompletableFuture<Integer>();
2105 <        f2.completeExceptionally(new CFException());
2106 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2107 <        f.complete(one);
2108 <        checkCompletedWithWrappedCFException(g);
2109 <    }
2110 <
2111 <    /**
2112 <     * applyToEitherAsync result completes exceptionally if action does
2301 >     * runAfterEither result completes normally after normal completion
2302 >     * of either source
2303       */
2304 <    public void testApplyToEitherAsync3E() {
2305 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2306 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2307 <        FailingFunction r = new FailingFunction();
2308 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2309 <        f.complete(one);
2310 <        checkCompletedWithWrappedCFException(g);
2311 <    }
2304 >    public void testRunAfterEither_normalCompletion() {
2305 >        for (ExecutionMode m : ExecutionMode.values())
2306 >        for (Integer v1 : new Integer[] { 1, null })
2307 >        for (Integer v2 : new Integer[] { 2, null })
2308 >    {
2309 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2310 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2311 >        final Noop[] rs = new Noop[6];
2312 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2313 >
2314 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2315 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2316 >        checkIncomplete(h0);
2317 >        checkIncomplete(h1);
2318 >        rs[0].assertNotInvoked();
2319 >        rs[1].assertNotInvoked();
2320 >        f.complete(v1);
2321 >        checkCompletedNormally(h0, null);
2322 >        checkCompletedNormally(h1, null);
2323 >        rs[0].assertInvoked();
2324 >        rs[1].assertInvoked();
2325 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2326 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2327 >        checkCompletedNormally(h2, null);
2328 >        checkCompletedNormally(h3, null);
2329 >        rs[2].assertInvoked();
2330 >        rs[3].assertInvoked();
2331 >
2332 >        g.complete(v2);
2333 >
2334 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2335 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2336 >
2337 >        checkCompletedNormally(f, v1);
2338 >        checkCompletedNormally(g, v2);
2339 >        checkCompletedNormally(h0, null);
2340 >        checkCompletedNormally(h1, null);
2341 >        checkCompletedNormally(h2, null);
2342 >        checkCompletedNormally(h3, null);
2343 >        checkCompletedNormally(h4, null);
2344 >        checkCompletedNormally(h5, null);
2345 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2346 >    }}
2347  
2348      /**
2349 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2349 >     * runAfterEither result completes exceptionally after exceptional
2350 >     * completion of either source
2351       */
2352 <    public void testApplyToEitherAsync4E() {
2353 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2354 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2355 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2356 <        assertTrue(f.cancel(true));
2357 <        checkCompletedWithWrappedCancellationException(g);
2352 >    public void testRunAfterEither_exceptionalCompletion() {
2353 >        for (ExecutionMode m : ExecutionMode.values())
2354 >        for (Integer v1 : new Integer[] { 1, null })
2355 >    {
2356 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2357 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2358 >        final CFException ex = new CFException();
2359 >        final Noop[] rs = new Noop[6];
2360 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2361 >
2362 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2363 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2364 >        checkIncomplete(h0);
2365 >        checkIncomplete(h1);
2366 >        rs[0].assertNotInvoked();
2367 >        rs[1].assertNotInvoked();
2368 >        f.completeExceptionally(ex);
2369 >        checkCompletedWithWrappedException(h0, ex);
2370 >        checkCompletedWithWrappedException(h1, ex);
2371 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2372 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2373 >        checkCompletedWithWrappedException(h2, ex);
2374 >        checkCompletedWithWrappedException(h3, ex);
2375 >
2376 >        g.complete(v1);
2377 >
2378 >        // unspecified behavior - both source completions available
2379 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2380 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2381 >        try {
2382 >            assertNull(h4.join());
2383 >            rs[4].assertInvoked();
2384 >        } catch (CompletionException ok) {
2385 >            checkCompletedWithWrappedException(h4, ex);
2386 >            rs[4].assertNotInvoked();
2387 >        }
2388 >        try {
2389 >            assertNull(h5.join());
2390 >            rs[5].assertInvoked();
2391 >        } catch (CompletionException ok) {
2392 >            checkCompletedWithWrappedException(h5, ex);
2393 >            rs[5].assertNotInvoked();
2394 >        }
2395  
2396 <        f = new CompletableFuture<Integer>();
2397 <        f2 = new CompletableFuture<Integer>();
2398 <        assertTrue(f2.cancel(true));
2399 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2400 <        checkCompletedWithWrappedCancellationException(g);
2401 <    }
2396 >        checkCompletedExceptionally(f, ex);
2397 >        checkCompletedNormally(g, v1);
2398 >        checkCompletedWithWrappedException(h0, ex);
2399 >        checkCompletedWithWrappedException(h1, ex);
2400 >        checkCompletedWithWrappedException(h2, ex);
2401 >        checkCompletedWithWrappedException(h3, ex);
2402 >        checkCompletedWithWrappedException(h4, ex);
2403 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2404 >    }}
2405 >
2406 >    public void testRunAfterEither_exceptionalCompletion2() {
2407 >        for (ExecutionMode m : ExecutionMode.values())
2408 >        for (boolean fFirst : 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 CFException ex = new CFException();
2414 >        final Noop[] rs = new Noop[6];
2415 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2416 >
2417 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2418 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2419 >        if (fFirst) {
2420 >            f.complete(v1);
2421 >            g.completeExceptionally(ex);
2422 >        } else {
2423 >            g.completeExceptionally(ex);
2424 >            f.complete(v1);
2425 >        }
2426 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2427 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2428  
2429 <    /**
2430 <     * acceptEitherAsync result completes normally after normal
2431 <     * completion of sources
2432 <     */
2433 <    public void testAcceptEitherAsyncE() {
2434 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2435 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2436 <        IncAction r = new IncAction();
2437 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2438 <        f.complete(one);
2439 <        checkCompletedNormally(g, null);
2440 <        assertEquals(r.value, 2);
2429 >        // unspecified behavior - both source completions available
2430 >        try {
2431 >            assertEquals(null, h0.join());
2432 >            rs[0].assertInvoked();
2433 >        } catch (CompletionException ok) {
2434 >            checkCompletedWithWrappedException(h0, ex);
2435 >            rs[0].assertNotInvoked();
2436 >        }
2437 >        try {
2438 >            assertEquals(null, h1.join());
2439 >            rs[1].assertInvoked();
2440 >        } catch (CompletionException ok) {
2441 >            checkCompletedWithWrappedException(h1, ex);
2442 >            rs[1].assertNotInvoked();
2443 >        }
2444 >        try {
2445 >            assertEquals(null, h2.join());
2446 >            rs[2].assertInvoked();
2447 >        } catch (CompletionException ok) {
2448 >            checkCompletedWithWrappedException(h2, ex);
2449 >            rs[2].assertNotInvoked();
2450 >        }
2451 >        try {
2452 >            assertEquals(null, h3.join());
2453 >            rs[3].assertInvoked();
2454 >        } catch (CompletionException ok) {
2455 >            checkCompletedWithWrappedException(h3, ex);
2456 >            rs[3].assertNotInvoked();
2457 >        }
2458  
2459 <        r = new IncAction();
2460 <        f = new CompletableFuture<Integer>();
2461 <        f.complete(one);
2156 <        f2 = new CompletableFuture<Integer>();
2157 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2158 <        checkCompletedNormally(g, null);
2159 <        assertEquals(r.value, 2);
2160 <    }
2459 >        checkCompletedNormally(f, v1);
2460 >        checkCompletedExceptionally(g, ex);
2461 >    }}
2462  
2463      /**
2464 <     * acceptEitherAsync result completes exceptionally after exceptional
2164 <     * completion of source
2464 >     * runAfterEither result completes exceptionally if either source cancelled
2465       */
2466 <    public void testAcceptEitherAsync2E() {
2467 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2468 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2469 <        IncAction r = new IncAction();
2470 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2471 <        f.completeExceptionally(new CFException());
2472 <        checkCompletedWithWrappedCFException(g);
2473 <
2474 <        r = new IncAction();
2475 <        f = new CompletableFuture<Integer>();
2476 <        f2 = new CompletableFuture<Integer>();
2477 <        f2.completeExceptionally(new CFException());
2478 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2479 <        f.complete(one);
2480 <        checkCompletedWithWrappedCFException(g);
2481 <    }
2466 >    public void testRunAfterEither_sourceCancelled() {
2467 >        for (ExecutionMode m : ExecutionMode.values())
2468 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2469 >        for (Integer v1 : new Integer[] { 1, null })
2470 >    {
2471 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2472 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2473 >        final Noop[] rs = new Noop[6];
2474 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2475 >
2476 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2477 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2478 >        checkIncomplete(h0);
2479 >        checkIncomplete(h1);
2480 >        rs[0].assertNotInvoked();
2481 >        rs[1].assertNotInvoked();
2482 >        f.cancel(mayInterruptIfRunning);
2483 >        checkCompletedWithWrappedCancellationException(h0);
2484 >        checkCompletedWithWrappedCancellationException(h1);
2485 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2486 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2487 >        checkCompletedWithWrappedCancellationException(h2);
2488 >        checkCompletedWithWrappedCancellationException(h3);
2489 >
2490 >        g.complete(v1);
2491 >
2492 >        // unspecified behavior - both source completions available
2493 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2494 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2495 >        try {
2496 >            assertNull(h4.join());
2497 >            rs[4].assertInvoked();
2498 >        } catch (CompletionException ok) {
2499 >            checkCompletedWithWrappedCancellationException(h4);
2500 >            rs[4].assertNotInvoked();
2501 >        }
2502 >        try {
2503 >            assertNull(h5.join());
2504 >            rs[5].assertInvoked();
2505 >        } catch (CompletionException ok) {
2506 >            checkCompletedWithWrappedCancellationException(h5);
2507 >            rs[5].assertNotInvoked();
2508 >        }
2509  
2510 <    /**
2511 <     * acceptEitherAsync result completes exceptionally if action does
2512 <     */
2513 <    public void testAcceptEitherAsync3E() {
2514 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2515 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2516 <        FailingConsumer r = new FailingConsumer();
2517 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2191 <        f.complete(one);
2192 <        checkCompletedWithWrappedCFException(g);
2193 <    }
2510 >        checkCancelled(f);
2511 >        checkCompletedNormally(g, v1);
2512 >        checkCompletedWithWrappedCancellationException(h0);
2513 >        checkCompletedWithWrappedCancellationException(h1);
2514 >        checkCompletedWithWrappedCancellationException(h2);
2515 >        checkCompletedWithWrappedCancellationException(h3);
2516 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2517 >    }}
2518  
2519      /**
2520 <     * acceptEitherAsync result completes exceptionally if either
2197 <     * source cancelled
2520 >     * runAfterEither result completes exceptionally if action does
2521       */
2522 <    public void testAcceptEitherAsync4E() {
2523 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2524 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2525 <        IncAction r = new IncAction();
2526 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2527 <        assertTrue(f.cancel(true));
2528 <        checkCompletedWithWrappedCancellationException(g);
2529 <
2530 <        r = new IncAction();
2531 <        f = new CompletableFuture<Integer>();
2532 <        f2 = new CompletableFuture<Integer>();
2533 <        assertTrue(f2.cancel(true));
2534 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2535 <        checkCompletedWithWrappedCancellationException(g);
2536 <    }
2522 >    public void testRunAfterEither_actionFailed() {
2523 >        for (ExecutionMode m : ExecutionMode.values())
2524 >        for (Integer v1 : new Integer[] { 1, null })
2525 >        for (Integer v2 : new Integer[] { 2, null })
2526 >    {
2527 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2528 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2529 >        final FailingRunnable[] rs = new FailingRunnable[6];
2530 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2531 >
2532 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2533 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2534 >        f.complete(v1);
2535 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2536 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2537 >        checkCompletedWithWrappedCFException(h0);
2538 >        checkCompletedWithWrappedCFException(h1);
2539 >        checkCompletedWithWrappedCFException(h2);
2540 >        checkCompletedWithWrappedCFException(h3);
2541 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2542 >        g.complete(v2);
2543 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2544 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2545 >        checkCompletedWithWrappedCFException(h4);
2546 >        checkCompletedWithWrappedCFException(h5);
2547 >
2548 >        checkCompletedNormally(f, v1);
2549 >        checkCompletedNormally(g, v2);
2550 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2551 >    }}
2552  
2553      /**
2554 <     * runAfterEitherAsync result completes normally after normal
2217 <     * completion of sources
2554 >     * thenCompose result completes normally after normal completion of source
2555       */
2556 <    public void testRunAfterEitherAsyncE() {
2557 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2558 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2559 <        Noop r = new Noop();
2560 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2561 <        f.complete(one);
2562 <        checkCompletedNormally(g, null);
2563 <        assertTrue(r.ran);
2564 <
2565 <        r = new Noop();
2566 <        f = new CompletableFuture<Integer>();
2567 <        f.complete(one);
2568 <        f2 = new CompletableFuture<Integer>();
2569 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2570 <        checkCompletedNormally(g, null);
2234 <        assertTrue(r.ran);
2235 <    }
2556 >    public void testThenCompose_normalCompletion() {
2557 >        for (ExecutionMode m : ExecutionMode.values())
2558 >        for (boolean createIncomplete : new boolean[] { true, false })
2559 >        for (Integer v1 : new Integer[] { 1, null })
2560 >    {
2561 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2562 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2563 >        if (!createIncomplete) f.complete(v1);
2564 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2565 >        if (createIncomplete) f.complete(v1);
2566 >
2567 >        checkCompletedNormally(g, inc(v1));
2568 >        checkCompletedNormally(f, v1);
2569 >        r.assertValue(v1);
2570 >    }}
2571  
2572      /**
2573 <     * runAfterEitherAsync result completes exceptionally after exceptional
2573 >     * thenCompose result completes exceptionally after exceptional
2574       * completion of source
2575       */
2576 <    public void testRunAfterEitherAsync2E() {
2577 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2578 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2579 <        Noop r = new Noop();
2580 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2581 <        f.completeExceptionally(new CFException());
2582 <        checkCompletedWithWrappedCFException(g);
2583 <
2584 <        r = new Noop();
2585 <        f = new CompletableFuture<Integer>();
2586 <        f2 = new CompletableFuture<Integer>();
2587 <        f2.completeExceptionally(new CFException());
2588 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2589 <        f.complete(one);
2590 <        checkCompletedWithWrappedCFException(g);
2256 <    }
2257 <
2258 <    /**
2259 <     * runAfterEitherAsync result completes exceptionally if action does
2260 <     */
2261 <    public void testRunAfterEitherAsync3E() {
2262 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2263 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2264 <        FailingNoop r = new FailingNoop();
2265 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2266 <        f.complete(one);
2267 <        checkCompletedWithWrappedCFException(g);
2268 <    }
2269 <
2270 <    /**
2271 <     * runAfterEitherAsync result completes exceptionally if either
2272 <     * source cancelled
2273 <     */
2274 <    public void testRunAfterEitherAsync4E() {
2275 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2276 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2277 <        Noop r = new Noop();
2278 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2279 <        assertTrue(f.cancel(true));
2280 <        checkCompletedWithWrappedCancellationException(g);
2281 <
2282 <        r = new Noop();
2283 <        f = new CompletableFuture<Integer>();
2284 <        f2 = new CompletableFuture<Integer>();
2285 <        assertTrue(f2.cancel(true));
2286 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2287 <        checkCompletedWithWrappedCancellationException(g);
2288 <    }
2576 >    public void testThenCompose_exceptionalCompletion() {
2577 >        for (ExecutionMode m : ExecutionMode.values())
2578 >        for (boolean createIncomplete : new boolean[] { true, false })
2579 >    {
2580 >        final CFException ex = new CFException();
2581 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2582 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2583 >        if (!createIncomplete) f.completeExceptionally(ex);
2584 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2585 >        if (createIncomplete) f.completeExceptionally(ex);
2586 >
2587 >        checkCompletedWithWrappedException(g, ex);
2588 >        checkCompletedExceptionally(f, ex);
2589 >        r.assertNotInvoked();
2590 >    }}
2591  
2592      /**
2593 <     * thenComposeAsync result completes normally after normal
2292 <     * completion of source
2593 >     * thenCompose result completes exceptionally if action does
2594       */
2595 <    public void testThenComposeAsyncE() {
2596 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2597 <        CompletableFutureInc r = new CompletableFutureInc();
2598 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2599 <        f.complete(one);
2600 <        checkCompletedNormally(g, two);
2601 <    }
2595 >    public void testThenCompose_actionFailed() {
2596 >        for (ExecutionMode m : ExecutionMode.values())
2597 >        for (boolean createIncomplete : new boolean[] { true, false })
2598 >        for (Integer v1 : new Integer[] { 1, null })
2599 >    {
2600 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2601 >        final FailingCompletableFutureFunction r
2602 >            = new FailingCompletableFutureFunction(m);
2603 >        if (!createIncomplete) f.complete(v1);
2604 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2605 >        if (createIncomplete) f.complete(v1);
2606  
2302    /**
2303     * thenComposeAsync result completes exceptionally after
2304     * exceptional completion of source
2305     */
2306    public void testThenComposeAsync2E() {
2307        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2308        CompletableFutureInc r = new CompletableFutureInc();
2309        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2310        f.completeExceptionally(new CFException());
2607          checkCompletedWithWrappedCFException(g);
2608 <    }
2608 >        checkCompletedNormally(f, v1);
2609 >    }}
2610  
2611      /**
2612 <     * thenComposeAsync result completes exceptionally if action does
2612 >     * thenCompose result completes exceptionally if source cancelled
2613       */
2614 <    public void testThenComposeAsync3E() {
2615 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2616 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2617 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2618 <        f.complete(one);
2619 <        checkCompletedWithWrappedCFException(g);
2620 <    }
2614 >    public void testThenCompose_sourceCancelled() {
2615 >        for (ExecutionMode m : ExecutionMode.values())
2616 >        for (boolean createIncomplete : new boolean[] { true, false })
2617 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2618 >    {
2619 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2620 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2621 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2622 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2623 >        if (createIncomplete) {
2624 >            checkIncomplete(g);
2625 >            assertTrue(f.cancel(mayInterruptIfRunning));
2626 >        }
2627  
2325    /**
2326     * thenComposeAsync result completes exceptionally if source cancelled
2327     */
2328    public void testThenComposeAsync4E() {
2329        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2330        CompletableFutureInc r = new CompletableFutureInc();
2331        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2332        assertTrue(f.cancel(true));
2628          checkCompletedWithWrappedCancellationException(g);
2629 <    }
2629 >        checkCancelled(f);
2630 >    }}
2631  
2632      // other static methods
2633  
# Line 2340 | Line 2636 | public class CompletableFutureTest exten
2636       * with the value null
2637       */
2638      public void testAllOf_empty() throws Exception {
2639 <        CompletableFuture<?> f = CompletableFuture.allOf();
2639 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2640          checkCompletedNormally(f, null);
2641      }
2642  
2643      /**
2644 <     * allOf returns a future completed when all components complete
2644 >     * allOf returns a future completed normally with the value null
2645 >     * when all components complete normally
2646       */
2647 <    public void testAllOf() throws Exception {
2647 >    public void testAllOf_normal() throws Exception {
2648          for (int k = 1; k < 20; ++k) {
2649 <            CompletableFuture[] fs = new CompletableFuture[k];
2649 >            CompletableFuture<Integer>[] fs
2650 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2651              for (int i = 0; i < k; ++i)
2652 <                fs[i] = new CompletableFuture<Integer>();
2652 >                fs[i] = new CompletableFuture<>();
2653              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2654              for (int i = 0; i < k; ++i) {
2655                  checkIncomplete(f);
2656 +                checkIncomplete(CompletableFuture.allOf(fs));
2657                  fs[i].complete(one);
2658              }
2659              checkCompletedNormally(f, null);
2660 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2661 +        }
2662 +    }
2663 +
2664 +    public void testAllOf_backwards() throws Exception {
2665 +        for (int k = 1; k < 20; ++k) {
2666 +            CompletableFuture<Integer>[] fs
2667 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2668 +            for (int i = 0; i < k; ++i)
2669 +                fs[i] = new CompletableFuture<>();
2670 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2671 +            for (int i = k - 1; i >= 0; i--) {
2672 +                checkIncomplete(f);
2673 +                checkIncomplete(CompletableFuture.allOf(fs));
2674 +                fs[i].complete(one);
2675 +            }
2676 +            checkCompletedNormally(f, null);
2677 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2678          }
2679      }
2680  
# Line 2365 | Line 2682 | public class CompletableFutureTest exten
2682       * anyOf(no component futures) returns an incomplete future
2683       */
2684      public void testAnyOf_empty() throws Exception {
2685 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2685 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
2686          checkIncomplete(f);
2687      }
2688  
2689      /**
2690 <     * allOf returns a future completed when any components complete
2690 >     * anyOf returns a future completed normally with a value when
2691 >     * a component future does
2692       */
2693 <    public void testAnyOf() throws Exception {
2694 <        for (int k = 1; k < 20; ++k) {
2693 >    public void testAnyOf_normal() throws Exception {
2694 >        for (int k = 0; k < 10; ++k) {
2695              CompletableFuture[] fs = new CompletableFuture[k];
2696              for (int i = 0; i < k; ++i)
2697 <                fs[i] = new CompletableFuture<Integer>();
2697 >                fs[i] = new CompletableFuture<>();
2698              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2699              checkIncomplete(f);
2700              for (int i = 0; i < k; ++i) {
2701                  fs[i].complete(one);
2702                  checkCompletedNormally(f, one);
2703 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2704 +            }
2705 +        }
2706 +    }
2707 +
2708 +    /**
2709 +     * anyOf result completes exceptionally when any component does.
2710 +     */
2711 +    public void testAnyOf_exceptional() throws Exception {
2712 +        for (int k = 0; k < 10; ++k) {
2713 +            CompletableFuture[] fs = new CompletableFuture[k];
2714 +            for (int i = 0; i < k; ++i)
2715 +                fs[i] = new CompletableFuture<>();
2716 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2717 +            checkIncomplete(f);
2718 +            for (int i = 0; i < k; ++i) {
2719 +                fs[i].completeExceptionally(new CFException());
2720 +                checkCompletedWithWrappedCFException(f);
2721 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2722              }
2723          }
2724      }
# Line 2390 | Line 2727 | public class CompletableFutureTest exten
2727       * Completion methods throw NullPointerException with null arguments
2728       */
2729      public void testNPE() {
2730 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2731 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
2732 <        CompletableFuture h;
2733 <        try { h = f.thenApply(null); } catch (NullPointerException ok) {}
2734 <        try { h = f.thenAccept(null); } catch (NullPointerException ok) {}
2735 <        try { h = f.thenRun(null); } catch (NullPointerException ok) {}
2736 <        try { h = f.thenCombine(g, null); } catch (NullPointerException ok) {}
2737 <        try { h = f.thenCombine(null, null); } catch (NullPointerException ok) {}
2738 <        try { h = f.applyToEither(g, null); } catch (NullPointerException ok) {}
2739 <        try { h = f.applyToEither(null, null); } catch (NullPointerException ok) {}
2740 <        try { h = f.thenAcceptBoth(g, null); } catch (NullPointerException ok) {}
2741 <        try { h = f.thenAcceptBoth(null, null); } catch (NullPointerException ok) {}
2742 <        try { h = f.runAfterEither(g, null); } catch (NullPointerException ok) {}
2743 <        try { h = f.runAfterEither(null, null); } catch (NullPointerException ok) {}
2744 <        try { h = f.runAfterBoth(g, null); } catch (NullPointerException ok) {}
2745 <        try { h = f.runAfterBoth(null, null); } catch (NullPointerException ok) {}
2746 <        try { h = f.exceptionally(null); } catch (NullPointerException ok) {}
2747 <        try { h = f.handle(null); } catch (NullPointerException ok) {}
2748 <        try { h = f.thenCompose(null); } catch (NullPointerException ok) {}
2749 <
2750 <        try { h = f.thenApplyAsync(null); } catch (NullPointerException ok) {}
2751 <        try { h = f.thenAcceptAsync(null); } catch (NullPointerException ok) {}
2752 <        try { h = f.thenRunAsync(null); } catch (NullPointerException ok) {}
2753 <        try { h = f.thenCombineAsync(g, null); } catch (NullPointerException ok) {}
2754 <        try { h = f.thenCombineAsync(null, null); } catch (NullPointerException ok) {}
2755 <        try { h = f.applyToEitherAsync(g, null); } catch (NullPointerException ok) {}
2756 <        try { h = f.applyToEitherAsync(null, null); } catch (NullPointerException ok) {}
2757 <        try { h = f.thenAcceptBothAsync(g, null); } catch (NullPointerException ok) {}
2758 <        try { h = f.thenAcceptBothAsync(null, null); } catch (NullPointerException ok) {}
2759 <        try { h = f.runAfterEitherAsync(g, null); } catch (NullPointerException ok) {}
2760 <        try { h = f.runAfterEitherAsync(null, null); } catch (NullPointerException ok) {}
2761 <        try { h = f.runAfterBothAsync(g, null); } catch (NullPointerException ok) {}
2762 <        try { h = f.runAfterBothAsync(null, null); } catch (NullPointerException ok) {}
2730 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2731 >        CompletableFuture<Integer> g = new CompletableFuture<>();
2732 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2733 >        CompletableFuture<?> h;
2734 >        ThreadExecutor exec = new ThreadExecutor();
2735 >
2736 >        Runnable[] throwingActions = {
2737 >            () -> CompletableFuture.supplyAsync(null),
2738 >            () -> CompletableFuture.supplyAsync(null, exec),
2739 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2740 >
2741 >            () -> CompletableFuture.runAsync(null),
2742 >            () -> CompletableFuture.runAsync(null, exec),
2743 >            () -> CompletableFuture.runAsync(() -> {}, null),
2744 >
2745 >            () -> f.completeExceptionally(null),
2746 >
2747 >            () -> f.thenApply(null),
2748 >            () -> f.thenApplyAsync(null),
2749 >            () -> f.thenApplyAsync((x) -> x, null),
2750 >            () -> f.thenApplyAsync(null, exec),
2751 >
2752 >            () -> f.thenAccept(null),
2753 >            () -> f.thenAcceptAsync(null),
2754 >            () -> f.thenAcceptAsync((x) -> {} , null),
2755 >            () -> f.thenAcceptAsync(null, exec),
2756 >
2757 >            () -> f.thenRun(null),
2758 >            () -> f.thenRunAsync(null),
2759 >            () -> f.thenRunAsync(() -> {} , null),
2760 >            () -> f.thenRunAsync(null, exec),
2761 >
2762 >            () -> f.thenCombine(g, null),
2763 >            () -> f.thenCombineAsync(g, null),
2764 >            () -> f.thenCombineAsync(g, null, exec),
2765 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2766 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2767 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2768 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2769 >
2770 >            () -> f.thenAcceptBoth(g, null),
2771 >            () -> f.thenAcceptBothAsync(g, null),
2772 >            () -> f.thenAcceptBothAsync(g, null, exec),
2773 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2774 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2775 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2776 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2777 >
2778 >            () -> f.runAfterBoth(g, null),
2779 >            () -> f.runAfterBothAsync(g, null),
2780 >            () -> f.runAfterBothAsync(g, null, exec),
2781 >            () -> f.runAfterBoth(nullFuture, () -> {}),
2782 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2783 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2784 >            () -> f.runAfterBothAsync(g, () -> {}, null),
2785 >
2786 >            () -> f.applyToEither(g, null),
2787 >            () -> f.applyToEitherAsync(g, null),
2788 >            () -> f.applyToEitherAsync(g, null, exec),
2789 >            () -> f.applyToEither(nullFuture, (x) -> x),
2790 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2791 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2792 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
2793 >
2794 >            () -> f.acceptEither(g, null),
2795 >            () -> f.acceptEitherAsync(g, null),
2796 >            () -> f.acceptEitherAsync(g, null, exec),
2797 >            () -> f.acceptEither(nullFuture, (x) -> {}),
2798 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
2799 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
2800 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
2801 >
2802 >            () -> f.runAfterEither(g, null),
2803 >            () -> f.runAfterEitherAsync(g, null),
2804 >            () -> f.runAfterEitherAsync(g, null, exec),
2805 >            () -> f.runAfterEither(nullFuture, () -> {}),
2806 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
2807 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
2808 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
2809 >
2810 >            () -> f.thenCompose(null),
2811 >            () -> f.thenComposeAsync(null),
2812 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2813 >            () -> f.thenComposeAsync(null, exec),
2814 >
2815 >            () -> f.exceptionally(null),
2816 >
2817 >            () -> f.handle(null),
2818 >
2819 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
2820 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
2821 >            () -> CompletableFuture.allOf(f, null),
2822 >            () -> CompletableFuture.allOf(null, f),
2823 >
2824 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
2825 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
2826 >            () -> CompletableFuture.anyOf(f, null),
2827 >            () -> CompletableFuture.anyOf(null, f),
2828 >
2829 >            () -> f.obtrudeException(null),
2830 >        };
2831 >
2832 >        assertThrows(NullPointerException.class, throwingActions);
2833 >        assertEquals(0, exec.count.get());
2834 >    }
2835 >
2836 >    /**
2837 >     * toCompletableFuture returns this CompletableFuture.
2838 >     */
2839 >    public void testToCompletableFuture() {
2840 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2841 >        assertSame(f, f.toCompletableFuture());
2842 >    }
2843 >
2844 >    /**
2845 >     * whenComplete action executes on normal completion, propagating
2846 >     * source result.
2847 >     */
2848 >    public void testWhenComplete_normalCompletion1() {
2849 >        for (ExecutionMode m : ExecutionMode.values())
2850 >        for (boolean createIncomplete : new boolean[] { true, false })
2851 >        for (Integer v1 : new Integer[] { 1, null })
2852 >    {
2853 >        final AtomicInteger a = new AtomicInteger(0);
2854 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2855 >        if (!createIncomplete) f.complete(v1);
2856 >        final CompletableFuture<Integer> g = m.whenComplete
2857 >            (f,
2858 >             (Integer x, Throwable t) -> {
2859 >                m.checkExecutionMode();
2860 >                threadAssertSame(x, v1);
2861 >                threadAssertNull(t);
2862 >                a.getAndIncrement();
2863 >            });
2864 >        if (createIncomplete) f.complete(v1);
2865 >
2866 >        checkCompletedNormally(g, v1);
2867 >        checkCompletedNormally(f, v1);
2868 >        assertEquals(1, a.get());
2869 >    }}
2870 >
2871 >    /**
2872 >     * whenComplete action executes on exceptional completion, propagating
2873 >     * source result.
2874 >     */
2875 >    public void testWhenComplete_exceptionalCompletion() {
2876 >        for (ExecutionMode m : ExecutionMode.values())
2877 >        for (boolean createIncomplete : new boolean[] { true, false })
2878 >        for (Integer v1 : new Integer[] { 1, null })
2879 >    {
2880 >        final AtomicInteger a = new AtomicInteger(0);
2881 >        final CFException ex = new CFException();
2882 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2883 >        if (!createIncomplete) f.completeExceptionally(ex);
2884 >        final CompletableFuture<Integer> g = m.whenComplete
2885 >            (f,
2886 >             (Integer x, Throwable t) -> {
2887 >                m.checkExecutionMode();
2888 >                threadAssertNull(x);
2889 >                threadAssertSame(t, ex);
2890 >                a.getAndIncrement();
2891 >            });
2892 >        if (createIncomplete) f.completeExceptionally(ex);
2893 >        checkCompletedExceptionally(f, ex);
2894 >        checkCompletedWithWrappedException(g, ex);
2895 >        assertEquals(1, a.get());
2896 >    }}
2897 >
2898 >    /**
2899 >     * whenComplete action executes on cancelled source, propagating
2900 >     * CancellationException.
2901 >     */
2902 >    public void testWhenComplete_sourceCancelled() {
2903 >        for (ExecutionMode m : ExecutionMode.values())
2904 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2905 >        for (boolean createIncomplete : new boolean[] { true, false })
2906 >    {
2907 >        final AtomicInteger a = new AtomicInteger(0);
2908 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2909 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2910 >        final CompletableFuture<Integer> g = m.whenComplete
2911 >            (f,
2912 >             (Integer x, Throwable t) -> {
2913 >                m.checkExecutionMode();
2914 >                threadAssertNull(x);
2915 >                threadAssertTrue(t instanceof CancellationException);
2916 >                a.getAndIncrement();
2917 >            });
2918 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2919  
2920 <    }
2920 >        checkCompletedWithWrappedCancellationException(g);
2921 >        checkCancelled(f);
2922 >        assertEquals(1, a.get());
2923 >    }}
2924  
2925 +    /**
2926 +     * If a whenComplete action throws an exception when triggered by
2927 +     * a normal completion, it completes exceptionally
2928 +     */
2929 +    public void testWhenComplete_actionFailed() {
2930 +        for (boolean createIncomplete : new boolean[] { true, false })
2931 +        for (ExecutionMode m : ExecutionMode.values())
2932 +        for (Integer v1 : new Integer[] { 1, null })
2933 +    {
2934 +        final AtomicInteger a = new AtomicInteger(0);
2935 +        final CFException ex = new CFException();
2936 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2937 +        if (!createIncomplete) f.complete(v1);
2938 +        final CompletableFuture<Integer> g = m.whenComplete
2939 +            (f,
2940 +             (Integer x, Throwable t) -> {
2941 +                m.checkExecutionMode();
2942 +                threadAssertSame(x, v1);
2943 +                threadAssertNull(t);
2944 +                a.getAndIncrement();
2945 +                throw ex;
2946 +            });
2947 +        if (createIncomplete) f.complete(v1);
2948 +        checkCompletedNormally(f, v1);
2949 +        checkCompletedWithWrappedException(g, ex);
2950 +        assertEquals(1, a.get());
2951 +    }}
2952 +
2953 +    /**
2954 +     * If a whenComplete action throws an exception when triggered by
2955 +     * a source completion that also throws an exception, the source
2956 +     * exception takes precedence.
2957 +     */
2958 +    public void testWhenComplete_actionFailedSourceFailed() {
2959 +        for (boolean createIncomplete : new boolean[] { true, false })
2960 +        for (ExecutionMode m : ExecutionMode.values())
2961 +        for (Integer v1 : new Integer[] { 1, null })
2962 +    {
2963 +        final AtomicInteger a = new AtomicInteger(0);
2964 +        final CFException ex1 = new CFException();
2965 +        final CFException ex2 = new CFException();
2966 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2967 +
2968 +        if (!createIncomplete) f.completeExceptionally(ex1);
2969 +        final CompletableFuture<Integer> g = m.whenComplete
2970 +            (f,
2971 +             (Integer x, Throwable t) -> {
2972 +                m.checkExecutionMode();
2973 +                threadAssertSame(t, ex1);
2974 +                threadAssertNull(x);
2975 +                a.getAndIncrement();
2976 +                throw ex2;
2977 +            });
2978 +        if (createIncomplete) f.completeExceptionally(ex1);
2979 +
2980 +        checkCompletedExceptionally(f, ex1);
2981 +        checkCompletedWithWrappedException(g, ex1);
2982 +        assertEquals(1, a.get());
2983 +    }}
2984  
2985   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines