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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines