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.21 by jsr166, Mon Apr 8 16:58:17 2013 UTC vs.
Revision 1.63 by jsr166, Fri Jun 6 16:54:16 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 IncAction extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        IncAction(ExecutionMode m) { super(m); }
367 >        public void accept(Integer x) {
368 >            invoked();
369 >            value = inc(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 <    }
1085 >        checkCompletedNormally(f, v1);
1086 >        r.assertInvoked();
1087 >    }}
1088  
1089      /**
1090 <     * runAfterBoth result completes exceptionally after exceptional
1091 <     * 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 <    }
912 <
913 <    /**
914 <     * applyToEither result completes normally after normal completion
915 <     * of either source
1090 >     * thenRun result completes exceptionally after exceptional
1091 >     * completion of source
1092       */
1093 <    public void testApplyToEither() {
1094 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1095 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1096 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1097 <        f.complete(one);
1098 <        checkCompletedNormally(g, two);
1099 <        f2.complete(one);
1100 <        checkCompletedNormally(g, two);
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 <        f.complete(one);
1109 <        f2 = new CompletableFuture<Integer>();
1110 <        g = f.applyToEither(f2, inc);
930 <        checkCompletedNormally(g, two);
931 <    }
1107 >        checkCompletedWithWrappedCFException(g, ex);
1108 >        checkCompletedWithWrappedCFException(f, ex);
1109 >        r.assertNotInvoked();
1110 >    }}
1111  
1112      /**
1113 <     * applyToEither result completes exceptionally after exceptional
935 <     * completion of either source
936 <     */
937 <    public void testApplyToEither2() {
938 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
939 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
940 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
941 <        f.completeExceptionally(new CFException());
942 <        f2.complete(one);
943 <        checkCompletedWithWrappedCFException(g);
944 <
945 <        f = new CompletableFuture<Integer>();
946 <        f2 = new CompletableFuture<Integer>();
947 <        f2.completeExceptionally(new CFException());
948 <        g = f.applyToEither(f2, inc);
949 <        checkCompletedWithWrappedCFException(g);
950 <    }
951 <
952 <    /**
953 <     * 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);
1145 <
1146 <        r = new IncAction();
1147 <        f = new CompletableFuture<Integer>();
1148 <        f2 = new CompletableFuture<Integer>();
1149 <        f2.completeExceptionally(new CFException());
1020 <        g = f.acceptEither(f2, r);
1021 <        checkCompletedWithWrappedCFException(g);
1022 <    }
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  
1024    /**
1025     * 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);
1151          checkCompletedWithWrappedCFException(g);
1152 <    }
1153 <
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 <
1152 >        checkCompletedNormally(f, v1);
1153 >    }}
1154  
1155      /**
1156 <     * 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, g;
1131 <        CompletableFutureInc r;
1132 <
1133 <        f = new CompletableFuture<Integer>();
1134 <        g = f.thenCompose(r = new CompletableFutureInc());
1135 <        f.complete(one);
1136 <        checkCompletedNormally(g, two);
1137 <        assertTrue(r.ran);
1138 <
1139 <        f = new CompletableFuture<Integer>();
1140 <        f.complete(one);
1141 <        g = f.thenCompose(r = new CompletableFutureInc());
1142 <        checkCompletedNormally(g, two);
1143 <        assertTrue(r.ran);
1144 <    }
1145 <
1146 <    /**
1147 <     * thenCompose result completes exceptionally after exceptional
1148 <     * completion of source
1149 <     */
1150 <    public void testThenCompose2() {
1151 <        CompletableFuture<Integer> f, g;
1152 <        CompletableFutureInc r;
1153 <
1154 <        f = new CompletableFuture<Integer>();
1155 <        g = f.thenCompose(r = new CompletableFutureInc());
1156 <        f.completeExceptionally(new CFException());
1157 <        checkCompletedWithWrappedCFException(g);
1158 <
1159 <        f = new CompletableFuture<Integer>();
1160 <        f.completeExceptionally(new CFException());
1161 <        g = f.thenCompose(r = new CompletableFutureInc());
1162 <        checkCompletedWithWrappedCFException(g);
1163 <    }
1218 >        checkCancelled(f);
1219 >        r.assertNotInvoked();
1220 >    }}
1221  
1222      /**
1223 <     * thenCompose result completes exceptionally if action does
1223 >     * thenApply result completes exceptionally if action does
1224       */
1225 <    public void testThenCompose3() {
1226 <        CompletableFuture<Integer> f, g;
1227 <        FailingCompletableFutureFunction r;
1228 <
1229 <        f = new CompletableFuture<Integer>();
1230 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1231 <        f.complete(one);
1232 <        checkCompletedWithWrappedCFException(g);
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  
1177        f = new CompletableFuture<Integer>();
1178        f.complete(one);
1179        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1239          checkCompletedWithWrappedCFException(g);
1240 <    }
1240 >        checkCompletedNormally(f, v1);
1241 >    }}
1242  
1243      /**
1244 <     * thenCompose result completes exceptionally if source cancelled
1185 <     */
1186 <    public void testThenCompose4() {
1187 <        CompletableFuture<Integer> f, g;
1188 <        CompletableFutureInc r;
1189 <
1190 <        f = new CompletableFuture<Integer>();
1191 <        g = f.thenCompose(r = new CompletableFutureInc());
1192 <        assertTrue(f.cancel(true));
1193 <        checkCompletedWithWrappedCancellationException(g);
1194 <
1195 <        f = new CompletableFuture<Integer>();
1196 <        assertTrue(f.cancel(true));
1197 <        g = f.thenCompose(r = new CompletableFutureInc());
1198 <        checkCompletedWithWrappedCancellationException(g);
1199 <    }
1200 <
1201 <
1202 <    // asyncs
1203 <
1204 <    /**
1205 <     * 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 IncAction r = new IncAction(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  
1214        // reordered version
1215        f = new CompletableFuture<Integer>();
1216        f.complete(null);
1217        r = new Noop();
1218        g = f.thenRunAsync(r);
1260          checkCompletedNormally(g, null);
1261 <    }
1261 >        checkCompletedNormally(f, v1);
1262 >        r.assertInvoked();
1263 >        r.assertValue(inc(v1));
1264 >    }}
1265  
1266      /**
1267 <     * thenRunAsync result completes exceptionally after exceptional
1267 >     * thenAccept result completes exceptionally after exceptional
1268       * completion of source
1269       */
1270 <    public void testThenRunAsync2() {
1271 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1272 <        Noop r = new Noop();
1273 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1274 <        f.completeExceptionally(new CFException());
1275 <        try {
1276 <            g.join();
1277 <            shouldThrow();
1278 <        } catch (Exception ok) {
1270 >    public void testThenAccept_exceptionalCompletion() {
1271 >        for (ExecutionMode m : ExecutionMode.values())
1272 >        for (boolean createIncomplete : new boolean[] { true, false })
1273 >    {
1274 >        final CFException ex = new CFException();
1275 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1276 >        final IncAction r = new IncAction(m);
1277 >        if (!createIncomplete) f.completeExceptionally(ex);
1278 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1279 >        if (createIncomplete) {
1280 >            checkIncomplete(g);
1281 >            f.completeExceptionally(ex);
1282          }
1236        checkCompletedWithWrappedCFException(g);
1237    }
1283  
1284 <    /**
1285 <     * thenRunAsync result completes exceptionally if action does
1286 <     */
1287 <    public void testThenRunAsync3() {
1243 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1244 <        FailingNoop r = new FailingNoop();
1245 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1246 <        f.complete(null);
1247 <        checkCompletedWithWrappedCFException(g);
1248 <    }
1249 <
1250 <    /**
1251 <     * thenRunAsync result completes exceptionally if source cancelled
1252 <     */
1253 <    public void testThenRunAsync4() {
1254 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1255 <        Noop r = new Noop();
1256 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1257 <        assertTrue(f.cancel(true));
1258 <        checkCompletedWithWrappedCancellationException(g);
1259 <    }
1260 <
1261 <    /**
1262 <     * thenApplyAsync result completes normally after normal completion of source
1263 <     */
1264 <    public void testThenApplyAsync() {
1265 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1266 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1267 <        f.complete(one);
1268 <        checkCompletedNormally(g, two);
1269 <    }
1270 <
1271 <    /**
1272 <     * thenApplyAsync result completes exceptionally after exceptional
1273 <     * completion of source
1274 <     */
1275 <    public void testThenApplyAsync2() {
1276 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1277 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1278 <        f.completeExceptionally(new CFException());
1279 <        checkCompletedWithWrappedCFException(g);
1280 <    }
1284 >        checkCompletedWithWrappedCFException(g, ex);
1285 >        checkCompletedWithWrappedCFException(f, ex);
1286 >        r.assertNotInvoked();
1287 >    }}
1288  
1289      /**
1290 <     * thenApplyAsync result completes exceptionally if action does
1290 >     * thenAccept result completes exceptionally if source cancelled
1291       */
1292 <    public void testThenApplyAsync3() {
1293 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1294 <        FailingFunction r = new FailingFunction();
1295 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1296 <        f.complete(null);
1297 <        checkCompletedWithWrappedCFException(g);
1298 <    }
1292 >    public void testThenAccept_sourceCancelled() {
1293 >        for (ExecutionMode m : ExecutionMode.values())
1294 >        for (boolean createIncomplete : new boolean[] { true, false })
1295 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1296 >    {
1297 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1298 >        final IncAction r = new IncAction(m);
1299 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1300 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1301 >        if (createIncomplete) {
1302 >            checkIncomplete(g);
1303 >            assertTrue(f.cancel(mayInterruptIfRunning));
1304 >        }
1305  
1293    /**
1294     * thenApplyAsync result completes exceptionally if source cancelled
1295     */
1296    public void testThenApplyAsync4() {
1297        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1298        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1299        assertTrue(f.cancel(true));
1306          checkCompletedWithWrappedCancellationException(g);
1307 <    }
1308 <
1309 <    /**
1304 <     * thenAcceptAsync result completes normally after normal
1305 <     * completion of source
1306 <     */
1307 <    public void testThenAcceptAsync() {
1308 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1309 <        IncAction r = new IncAction();
1310 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1311 <        f.complete(one);
1312 <        checkCompletedNormally(g, null);
1313 <        assertEquals(r.value, 2);
1314 <    }
1307 >        checkCancelled(f);
1308 >        r.assertNotInvoked();
1309 >    }}
1310  
1311      /**
1312 <     * thenAcceptAsync result completes exceptionally after exceptional
1318 <     * completion of source
1312 >     * thenAccept result completes exceptionally if action does
1313       */
1314 <    public void testThenAcceptAsync2() {
1315 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1316 <        IncAction r = new IncAction();
1317 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1318 <        f.completeExceptionally(new CFException());
1319 <        checkCompletedWithWrappedCFException(g);
1320 <    }
1314 >    public void testThenAccept_actionFailed() {
1315 >        for (ExecutionMode m : ExecutionMode.values())
1316 >        for (boolean createIncomplete : new boolean[] { true, false })
1317 >        for (Integer v1 : new Integer[] { 1, null })
1318 >    {
1319 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1320 >        final FailingConsumer r = new FailingConsumer(m);
1321 >        if (!createIncomplete) f.complete(v1);
1322 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1323 >        if (createIncomplete) {
1324 >            checkIncomplete(g);
1325 >            f.complete(v1);
1326 >        }
1327  
1328    /**
1329     * thenAcceptAsync result completes exceptionally if action does
1330     */
1331    public void testThenAcceptAsync3() {
1332        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1333        FailingConsumer r = new FailingConsumer();
1334        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1335        f.complete(null);
1328          checkCompletedWithWrappedCFException(g);
1329 <    }
1329 >        checkCompletedNormally(f, v1);
1330 >    }}
1331  
1332      /**
1333 <     * thenAcceptAsync result completes exceptionally if source cancelled
1334 <     */
1342 <    public void testThenAcceptAsync4() {
1343 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1344 <        IncAction r = new IncAction();
1345 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1346 <        assertTrue(f.cancel(true));
1347 <        checkCompletedWithWrappedCancellationException(g);
1348 <    }
1349 <
1350 <    /**
1351 <     * thenCombineAsync result completes normally after normal
1352 <     * completion of sources
1333 >     * thenCombine result completes normally after normal completion
1334 >     * of sources
1335       */
1336 <    public void testThenCombineAsync() {
1337 <        CompletableFuture<Integer> f, g, h;
1336 >    public void testThenCombine_normalCompletion() {
1337 >        for (ExecutionMode m : ExecutionMode.values())
1338 >        for (boolean createIncomplete : new boolean[] { true, false })
1339 >        for (boolean fFirst : new boolean[] { true, false })
1340 >        for (Integer v1 : new Integer[] { 1, null })
1341 >        for (Integer v2 : new Integer[] { 2, null })
1342 >    {
1343 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1344 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1345 >        final SubtractFunction r = new SubtractFunction(m);
1346 >
1347 >        if (fFirst) f.complete(v1); else g.complete(v2);
1348 >        if (!createIncomplete)
1349 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1350 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1351 >        if (createIncomplete) {
1352 >            checkIncomplete(h);
1353 >            r.assertNotInvoked();
1354 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1355 >        }
1356  
1357 <        f = new CompletableFuture<Integer>();
1358 <        g = new CompletableFuture<Integer>();
1359 <        h = f.thenCombineAsync(g, subtract);
1360 <        f.complete(3);
1361 <        checkIncomplete(h);
1362 <        g.complete(1);
1363 <        checkCompletedNormally(h, 2);
1364 <
1365 <        f = new CompletableFuture<Integer>();
1366 <        g = new CompletableFuture<Integer>();
1367 <        h = f.thenCombineAsync(g, subtract);
1368 <        g.complete(1);
1369 <        checkIncomplete(h);
1370 <        f.complete(3);
1371 <        checkCompletedNormally(h, 2);
1372 <
1373 <        f = new CompletableFuture<Integer>();
1374 <        g = new CompletableFuture<Integer>();
1375 <        g.complete(1);
1376 <        f.complete(3);
1377 <        h = f.thenCombineAsync(g, subtract);
1378 <        checkCompletedNormally(h, 2);
1379 <    }
1357 >        checkCompletedNormally(h, subtract(v1, v2));
1358 >        checkCompletedNormally(f, v1);
1359 >        checkCompletedNormally(g, v2);
1360 >        r.assertInvoked();
1361 >    }}
1362  
1363      /**
1364 <     * thenCombineAsync result completes exceptionally after exceptional
1364 >     * thenCombine result completes exceptionally after exceptional
1365       * completion of either source
1366       */
1367 <    public void testThenCombineAsync2() {
1368 <        CompletableFuture<Integer> f, g, h;
1369 <
1370 <        f = new CompletableFuture<Integer>();
1371 <        g = new CompletableFuture<Integer>();
1372 <        h = f.thenCombineAsync(g, subtract);
1373 <        f.completeExceptionally(new CFException());
1374 <        checkIncomplete(h);
1375 <        g.complete(1);
1376 <        checkCompletedWithWrappedCFException(h);
1377 <
1378 <        f = new CompletableFuture<Integer>();
1379 <        g = new CompletableFuture<Integer>();
1380 <        h = f.thenCombineAsync(g, subtract);
1381 <        g.completeExceptionally(new CFException());
1382 <        checkIncomplete(h);
1383 <        f.complete(3);
1384 <        checkCompletedWithWrappedCFException(h);
1385 <
1404 <        f = new CompletableFuture<Integer>();
1405 <        g = new CompletableFuture<Integer>();
1406 <        g.completeExceptionally(new CFException());
1407 <        f.complete(3);
1408 <        h = f.thenCombineAsync(g, subtract);
1409 <        checkCompletedWithWrappedCFException(h);
1410 <    }
1367 >    public void testThenCombine_exceptionalCompletion() {
1368 >        for (ExecutionMode m : ExecutionMode.values())
1369 >        for (boolean createIncomplete : new boolean[] { true, false })
1370 >        for (boolean fFirst : new boolean[] { true, false })
1371 >        for (Integer v1 : new Integer[] { 1, null })
1372 >    {
1373 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1374 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1375 >        final CFException ex = new CFException();
1376 >        final SubtractFunction r = new SubtractFunction(m);
1377 >
1378 >        (fFirst ? f : g).complete(v1);
1379 >        if (!createIncomplete)
1380 >            (!fFirst ? f : g).completeExceptionally(ex);
1381 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1382 >        if (createIncomplete) {
1383 >            checkIncomplete(h);
1384 >            (!fFirst ? f : g).completeExceptionally(ex);
1385 >        }
1386  
1387 <    /**
1388 <     * thenCombineAsync result completes exceptionally if action does
1389 <     */
1390 <    public void testThenCombineAsync3() {
1391 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1417 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1418 <        FailingBiFunction r = new FailingBiFunction();
1419 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1420 <        f.complete(one);
1421 <        checkIncomplete(g);
1422 <        assertFalse(r.ran);
1423 <        f2.complete(two);
1424 <        checkCompletedWithWrappedCFException(g);
1425 <        assertTrue(r.ran);
1426 <    }
1387 >        checkCompletedWithWrappedCFException(h, ex);
1388 >        r.assertNotInvoked();
1389 >        checkCompletedNormally(fFirst ? f : g, v1);
1390 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1391 >    }}
1392  
1393      /**
1394 <     * thenCombineAsync result completes exceptionally if either source cancelled
1394 >     * thenCombine result completes exceptionally if either source cancelled
1395       */
1396 <    public void testThenCombineAsync4() {
1397 <        CompletableFuture<Integer> f, g, h;
1398 <
1399 <        f = new CompletableFuture<Integer>();
1400 <        g = new CompletableFuture<Integer>();
1401 <        h = f.thenCombineAsync(g, subtract);
1402 <        assertTrue(f.cancel(true));
1403 <        checkIncomplete(h);
1404 <        g.complete(1);
1405 <        checkCompletedWithWrappedCancellationException(h);
1406 <
1407 <        f = new CompletableFuture<Integer>();
1408 <        g = new CompletableFuture<Integer>();
1409 <        h = f.thenCombineAsync(g, subtract);
1410 <        assertTrue(g.cancel(true));
1411 <        checkIncomplete(h);
1412 <        f.complete(3);
1413 <        checkCompletedWithWrappedCancellationException(h);
1414 <
1450 <        f = new CompletableFuture<Integer>();
1451 <        g = new CompletableFuture<Integer>();
1452 <        g.complete(3);
1453 <        assertTrue(f.cancel(true));
1454 <        h = f.thenCombineAsync(g, subtract);
1455 <        checkCompletedWithWrappedCancellationException(h);
1396 >    public void testThenCombine_sourceCancelled() {
1397 >        for (ExecutionMode m : ExecutionMode.values())
1398 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 >        for (boolean createIncomplete : new boolean[] { true, false })
1400 >        for (boolean fFirst : new boolean[] { true, false })
1401 >        for (Integer v1 : new Integer[] { 1, null })
1402 >    {
1403 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1404 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1405 >        final SubtractFunction r = new SubtractFunction(m);
1406 >
1407 >        (fFirst ? f : g).complete(v1);
1408 >        if (!createIncomplete)
1409 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1410 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1411 >        if (createIncomplete) {
1412 >            checkIncomplete(h);
1413 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1414 >        }
1415  
1457        f = new CompletableFuture<Integer>();
1458        g = new CompletableFuture<Integer>();
1459        f.complete(3);
1460        assertTrue(g.cancel(true));
1461        h = f.thenCombineAsync(g, subtract);
1416          checkCompletedWithWrappedCancellationException(h);
1417 <    }
1417 >        checkCancelled(!fFirst ? f : g);
1418 >        r.assertNotInvoked();
1419 >        checkCompletedNormally(fFirst ? f : g, v1);
1420 >    }}
1421  
1422      /**
1423 <     * thenAcceptBothAsync result completes normally after normal
1467 <     * completion of sources
1468 <     */
1469 <    public void testThenAcceptBothAsync() {
1470 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1471 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1472 <        AddAction r = new AddAction();
1473 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1474 <        f.complete(one);
1475 <        checkIncomplete(g);
1476 <        f2.complete(two);
1477 <        checkCompletedNormally(g, null);
1478 <        assertEquals(r.value, 3);
1479 <    }
1480 <
1481 <    /**
1482 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1483 <     * completion of source
1484 <     */
1485 <    public void testThenAcceptBothAsync2() {
1486 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1487 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1488 <        AddAction r = new AddAction();
1489 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1490 <        f.completeExceptionally(new CFException());
1491 <        f2.complete(two);
1492 <        checkCompletedWithWrappedCFException(g);
1493 <
1494 <        r = new AddAction();
1495 <        f = new CompletableFuture<Integer>();
1496 <        f2 = new CompletableFuture<Integer>();
1497 <        g = f.thenAcceptBothAsync(f2, r);
1498 <        f.complete(one);
1499 <        f2.completeExceptionally(new CFException());
1500 <        checkCompletedWithWrappedCFException(g);
1501 <    }
1502 <
1503 <    /**
1504 <     * thenAcceptBothAsync result completes exceptionally if action does
1505 <     */
1506 <    public void testThenAcceptBothAsync3() {
1507 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1508 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1509 <        FailingBiConsumer r = new FailingBiConsumer();
1510 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1511 <        f.complete(one);
1512 <        checkIncomplete(g);
1513 <        f2.complete(two);
1514 <        checkCompletedWithWrappedCFException(g);
1515 <    }
1516 <
1517 <    /**
1518 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1423 >     * thenCombine result completes exceptionally if action does
1424       */
1425 <    public void testThenAcceptBothAsync4() {
1426 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1427 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1428 <        AddAction r = new AddAction();
1429 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1430 <        assertTrue(f.cancel(true));
1431 <        f2.complete(two);
1432 <        checkCompletedWithWrappedCancellationException(g);
1425 >    public void testThenCombine_actionFailed() {
1426 >        for (ExecutionMode m : ExecutionMode.values())
1427 >        for (boolean fFirst : new boolean[] { true, false })
1428 >        for (Integer v1 : new Integer[] { 1, null })
1429 >        for (Integer v2 : new Integer[] { 2, null })
1430 >    {
1431 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1432 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1433 >        final FailingBiFunction r = new FailingBiFunction(m);
1434 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1435 >
1436 >        if (fFirst) {
1437 >            f.complete(v1);
1438 >            g.complete(v2);
1439 >        } else {
1440 >            g.complete(v2);
1441 >            f.complete(v1);
1442 >        }
1443  
1444 <        r = new AddAction();
1445 <        f = new CompletableFuture<Integer>();
1446 <        f2 = new CompletableFuture<Integer>();
1447 <        g = f.thenAcceptBothAsync(f2, r);
1533 <        f.complete(one);
1534 <        assertTrue(f2.cancel(true));
1535 <        checkCompletedWithWrappedCancellationException(g);
1536 <    }
1444 >        checkCompletedWithWrappedCFException(h);
1445 >        checkCompletedNormally(f, v1);
1446 >        checkCompletedNormally(g, v2);
1447 >    }}
1448  
1449      /**
1450 <     * runAfterBothAsync result completes normally after normal
1450 >     * thenAcceptBoth result completes normally after normal
1451       * completion of sources
1452       */
1453 <    public void testRunAfterBothAsync() {
1454 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1455 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1456 <        Noop r = new Noop();
1457 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1458 <        f.complete(one);
1459 <        checkIncomplete(g);
1460 <        f2.complete(two);
1461 <        checkCompletedNormally(g, null);
1462 <        assertTrue(r.ran);
1463 <    }
1464 <
1465 <    /**
1466 <     * runAfterBothAsync result completes exceptionally after exceptional
1467 <     * completion of source
1468 <     */
1469 <    public void testRunAfterBothAsync2() {
1470 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1471 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1472 <        Noop r = new Noop();
1562 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1563 <        f.completeExceptionally(new CFException());
1564 <        f2.complete(two);
1565 <        checkCompletedWithWrappedCFException(g);
1566 <
1567 <        r = new Noop();
1568 <        f = new CompletableFuture<Integer>();
1569 <        f2 = new CompletableFuture<Integer>();
1570 <        g = f.runAfterBothAsync(f2, r);
1571 <        f.complete(one);
1572 <        f2.completeExceptionally(new CFException());
1573 <        checkCompletedWithWrappedCFException(g);
1574 <    }
1575 <
1576 <    /**
1577 <     * runAfterBothAsync result completes exceptionally if action does
1578 <     */
1579 <    public void testRunAfterBothAsync3() {
1580 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1581 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1582 <        FailingNoop r = new FailingNoop();
1583 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1584 <        f.complete(one);
1585 <        checkIncomplete(g);
1586 <        f2.complete(two);
1587 <        checkCompletedWithWrappedCFException(g);
1588 <    }
1589 <
1590 <    /**
1591 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1592 <     */
1593 <    public void testRunAfterBothAsync4() {
1594 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1595 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1596 <        Noop r = new Noop();
1597 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1598 <        assertTrue(f.cancel(true));
1599 <        f2.complete(two);
1600 <        checkCompletedWithWrappedCancellationException(g);
1453 >    public void testThenAcceptBoth_normalCompletion() {
1454 >        for (ExecutionMode m : ExecutionMode.values())
1455 >        for (boolean createIncomplete : new boolean[] { true, false })
1456 >        for (boolean fFirst : new boolean[] { true, false })
1457 >        for (Integer v1 : new Integer[] { 1, null })
1458 >        for (Integer v2 : new Integer[] { 2, null })
1459 >    {
1460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1462 >        final SubtractAction r = new SubtractAction(m);
1463 >
1464 >        if (fFirst) f.complete(v1); else g.complete(v2);
1465 >        if (!createIncomplete)
1466 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1467 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1468 >        if (createIncomplete) {
1469 >            checkIncomplete(h);
1470 >            r.assertNotInvoked();
1471 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1472 >        }
1473  
1474 <        r = new Noop();
1475 <        f = new CompletableFuture<Integer>();
1476 <        f2 = new CompletableFuture<Integer>();
1477 <        g = f.runAfterBothAsync(f2, r);
1478 <        f.complete(one);
1607 <        assertTrue(f2.cancel(true));
1608 <        checkCompletedWithWrappedCancellationException(g);
1609 <    }
1474 >        checkCompletedNormally(h, null);
1475 >        r.assertValue(subtract(v1, v2));
1476 >        checkCompletedNormally(f, v1);
1477 >        checkCompletedNormally(g, v2);
1478 >    }}
1479  
1480      /**
1481 <     * applyToEitherAsync result completes normally after normal
1482 <     * completion of sources
1481 >     * thenAcceptBoth result completes exceptionally after exceptional
1482 >     * completion of either source
1483       */
1484 <    public void testApplyToEitherAsync() {
1485 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1486 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1487 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1488 <        f.complete(one);
1489 <        checkCompletedNormally(g, two);
1484 >    public void testThenAcceptBoth_exceptionalCompletion() {
1485 >        for (ExecutionMode m : ExecutionMode.values())
1486 >        for (boolean createIncomplete : new boolean[] { true, false })
1487 >        for (boolean fFirst : new boolean[] { true, false })
1488 >        for (Integer v1 : new Integer[] { 1, null })
1489 >    {
1490 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1491 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1492 >        final CFException ex = new CFException();
1493 >        final SubtractAction r = new SubtractAction(m);
1494 >
1495 >        (fFirst ? f : g).complete(v1);
1496 >        if (!createIncomplete)
1497 >            (!fFirst ? f : g).completeExceptionally(ex);
1498 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1499 >        if (createIncomplete) {
1500 >            checkIncomplete(h);
1501 >            (!fFirst ? f : g).completeExceptionally(ex);
1502 >        }
1503  
1504 <        f = new CompletableFuture<Integer>();
1505 <        f.complete(one);
1506 <        f2 = new CompletableFuture<Integer>();
1507 <        g = f.applyToEitherAsync(f2, inc);
1508 <        checkCompletedNormally(g, two);
1627 <    }
1504 >        checkCompletedWithWrappedCFException(h, ex);
1505 >        r.assertNotInvoked();
1506 >        checkCompletedNormally(fFirst ? f : g, v1);
1507 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1508 >    }}
1509  
1510      /**
1511 <     * applyToEitherAsync result completes exceptionally after exceptional
1631 <     * completion of source
1511 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1512       */
1513 <    public void testApplyToEitherAsync2() {
1514 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1515 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1516 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1517 <        f.completeExceptionally(new CFException());
1518 <        checkCompletedWithWrappedCFException(g);
1519 <
1520 <        f = new CompletableFuture<Integer>();
1521 <        f2 = new CompletableFuture<Integer>();
1522 <        f2.completeExceptionally(new CFException());
1523 <        g = f.applyToEitherAsync(f2, inc);
1524 <        f.complete(one);
1525 <        checkCompletedWithWrappedCFException(g);
1526 <    }
1513 >    public void testThenAcceptBoth_sourceCancelled() {
1514 >        for (ExecutionMode m : ExecutionMode.values())
1515 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1516 >        for (boolean createIncomplete : new boolean[] { true, false })
1517 >        for (boolean fFirst : new boolean[] { true, false })
1518 >        for (Integer v1 : new Integer[] { 1, null })
1519 >    {
1520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1522 >        final SubtractAction r = new SubtractAction(m);
1523 >
1524 >        (fFirst ? f : g).complete(v1);
1525 >        if (!createIncomplete)
1526 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1527 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1528 >        if (createIncomplete) {
1529 >            checkIncomplete(h);
1530 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1531 >        }
1532  
1533 <    /**
1534 <     * applyToEitherAsync result completes exceptionally if action does
1535 <     */
1536 <    public void testApplyToEitherAsync3() {
1537 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1653 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1654 <        FailingFunction r = new FailingFunction();
1655 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1656 <        f.complete(one);
1657 <        checkCompletedWithWrappedCFException(g);
1658 <    }
1533 >        checkCompletedWithWrappedCancellationException(h);
1534 >        checkCancelled(!fFirst ? f : g);
1535 >        r.assertNotInvoked();
1536 >        checkCompletedNormally(fFirst ? f : g, v1);
1537 >    }}
1538  
1539      /**
1540 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1540 >     * thenAcceptBoth result completes exceptionally if action does
1541       */
1542 <    public void testApplyToEitherAsync4() {
1543 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1544 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1545 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1546 <        assertTrue(f.cancel(true));
1547 <        checkCompletedWithWrappedCancellationException(g);
1542 >    public void testThenAcceptBoth_actionFailed() {
1543 >        for (ExecutionMode m : ExecutionMode.values())
1544 >        for (boolean fFirst : new boolean[] { true, false })
1545 >        for (Integer v1 : new Integer[] { 1, null })
1546 >        for (Integer v2 : new Integer[] { 2, null })
1547 >    {
1548 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1549 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1550 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1551 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1552 >
1553 >        if (fFirst) {
1554 >            f.complete(v1);
1555 >            g.complete(v2);
1556 >        } else {
1557 >            g.complete(v2);
1558 >            f.complete(v1);
1559 >        }
1560  
1561 <        f = new CompletableFuture<Integer>();
1562 <        f2 = new CompletableFuture<Integer>();
1563 <        assertTrue(f2.cancel(true));
1564 <        g = f.applyToEitherAsync(f2, inc);
1674 <        checkCompletedWithWrappedCancellationException(g);
1675 <    }
1561 >        checkCompletedWithWrappedCFException(h);
1562 >        checkCompletedNormally(f, v1);
1563 >        checkCompletedNormally(g, v2);
1564 >    }}
1565  
1566      /**
1567 <     * acceptEitherAsync result completes normally after normal
1567 >     * runAfterBoth result completes normally after normal
1568       * completion of sources
1569       */
1570 <    public void testAcceptEitherAsync() {
1571 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1572 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1573 <        IncAction r = new IncAction();
1574 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1575 <        f.complete(one);
1576 <        checkCompletedNormally(g, null);
1577 <        assertEquals(r.value, 2);
1578 <
1579 <        r = new IncAction();
1580 <        f = new CompletableFuture<Integer>();
1581 <        f.complete(one);
1582 <        f2 = new CompletableFuture<Integer>();
1583 <        g = f.acceptEitherAsync(f2, r);
1584 <        checkCompletedNormally(g, null);
1585 <        assertEquals(r.value, 2);
1586 <    }
1587 <
1588 <    /**
1589 <     * acceptEitherAsync result completes exceptionally after exceptional
1701 <     * completion of source
1702 <     */
1703 <    public void testAcceptEitherAsync2() {
1704 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1705 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1706 <        IncAction r = new IncAction();
1707 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1708 <        f.completeExceptionally(new CFException());
1709 <        checkCompletedWithWrappedCFException(g);
1710 <
1711 <        r = new IncAction();
1712 <        f = new CompletableFuture<Integer>();
1713 <        f2 = new CompletableFuture<Integer>();
1714 <        f2.completeExceptionally(new CFException());
1715 <        g = f.acceptEitherAsync(f2, r);
1716 <        f.complete(one);
1717 <        checkCompletedWithWrappedCFException(g);
1718 <    }
1719 <
1720 <    /**
1721 <     * acceptEitherAsync result completes exceptionally if action does
1722 <     */
1723 <    public void testAcceptEitherAsync3() {
1724 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1725 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1726 <        FailingConsumer r = new FailingConsumer();
1727 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1728 <        f.complete(one);
1729 <        checkCompletedWithWrappedCFException(g);
1730 <    }
1731 <
1732 <    /**
1733 <     * acceptEitherAsync result completes exceptionally if either
1734 <     * source cancelled
1735 <     */
1736 <    public void testAcceptEitherAsync4() {
1737 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1738 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1739 <        IncAction r = new IncAction();
1740 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1741 <        assertTrue(f.cancel(true));
1742 <        checkCompletedWithWrappedCancellationException(g);
1570 >    public void testRunAfterBoth_normalCompletion() {
1571 >        for (ExecutionMode m : ExecutionMode.values())
1572 >        for (boolean createIncomplete : new boolean[] { true, false })
1573 >        for (boolean fFirst : new boolean[] { true, false })
1574 >        for (Integer v1 : new Integer[] { 1, null })
1575 >        for (Integer v2 : new Integer[] { 2, null })
1576 >    {
1577 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1578 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1579 >        final Noop r = new Noop(m);
1580 >
1581 >        if (fFirst) f.complete(v1); else g.complete(v2);
1582 >        if (!createIncomplete)
1583 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1584 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1585 >        if (createIncomplete) {
1586 >            checkIncomplete(h);
1587 >            r.assertNotInvoked();
1588 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1589 >        }
1590  
1591 <        r = new IncAction();
1592 <        f = new CompletableFuture<Integer>();
1593 <        f2 = new CompletableFuture<Integer>();
1594 <        assertTrue(f2.cancel(true));
1595 <        g = f.acceptEitherAsync(f2, r);
1749 <        checkCompletedWithWrappedCancellationException(g);
1750 <    }
1591 >        checkCompletedNormally(h, null);
1592 >        r.assertInvoked();
1593 >        checkCompletedNormally(f, v1);
1594 >        checkCompletedNormally(g, v2);
1595 >    }}
1596  
1597      /**
1598 <     * runAfterEitherAsync result completes normally after normal
1599 <     * completion of sources
1598 >     * runAfterBoth result completes exceptionally after exceptional
1599 >     * completion of either source
1600       */
1601 <    public void testRunAfterEitherAsync() {
1602 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1603 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1604 <        Noop r = new Noop();
1605 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1606 <        f.complete(one);
1607 <        checkCompletedNormally(g, null);
1608 <        assertTrue(r.ran);
1601 >    public void testRunAfterBoth_exceptionalCompletion() {
1602 >        for (ExecutionMode m : ExecutionMode.values())
1603 >        for (boolean createIncomplete : new boolean[] { true, false })
1604 >        for (boolean fFirst : new boolean[] { true, false })
1605 >        for (Integer v1 : new Integer[] { 1, null })
1606 >    {
1607 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1608 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1609 >        final CFException ex = new CFException();
1610 >        final Noop r = new Noop(m);
1611 >
1612 >        (fFirst ? f : g).complete(v1);
1613 >        if (!createIncomplete)
1614 >            (!fFirst ? f : g).completeExceptionally(ex);
1615 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1616 >        if (createIncomplete) {
1617 >            checkIncomplete(h);
1618 >            (!fFirst ? f : g).completeExceptionally(ex);
1619 >        }
1620  
1621 <        r = new Noop();
1622 <        f = new CompletableFuture<Integer>();
1623 <        f.complete(one);
1624 <        f2 = new CompletableFuture<Integer>();
1625 <        g = f.runAfterEitherAsync(f2, r);
1770 <        checkCompletedNormally(g, null);
1771 <        assertTrue(r.ran);
1772 <    }
1621 >        checkCompletedWithWrappedCFException(h, ex);
1622 >        r.assertNotInvoked();
1623 >        checkCompletedNormally(fFirst ? f : g, v1);
1624 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1625 >    }}
1626  
1627      /**
1628 <     * runAfterEitherAsync result completes exceptionally after exceptional
1776 <     * completion of source
1628 >     * runAfterBoth result completes exceptionally if either source cancelled
1629       */
1630 <    public void testRunAfterEitherAsync2() {
1631 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1632 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1633 <        Noop r = new Noop();
1634 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1635 <        f.completeExceptionally(new CFException());
1636 <        checkCompletedWithWrappedCFException(g);
1637 <
1638 <        r = new Noop();
1639 <        f = new CompletableFuture<Integer>();
1640 <        f2 = new CompletableFuture<Integer>();
1641 <        f2.completeExceptionally(new CFException());
1642 <        g = f.runAfterEitherAsync(f2, r);
1643 <        f.complete(one);
1644 <        checkCompletedWithWrappedCFException(g);
1645 <    }
1630 >    public void testRunAfterBoth_sourceCancelled() {
1631 >        for (ExecutionMode m : ExecutionMode.values())
1632 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1633 >        for (boolean createIncomplete : new boolean[] { true, false })
1634 >        for (boolean fFirst : new boolean[] { true, false })
1635 >        for (Integer v1 : new Integer[] { 1, null })
1636 >    {
1637 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1638 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1639 >        final Noop r = new Noop(m);
1640 >
1641 >
1642 >        (fFirst ? f : g).complete(v1);
1643 >        if (!createIncomplete)
1644 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1645 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1646 >        if (createIncomplete) {
1647 >            checkIncomplete(h);
1648 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1649 >        }
1650  
1651 <    /**
1652 <     * runAfterEitherAsync result completes exceptionally if action does
1653 <     */
1654 <    public void testRunAfterEitherAsync3() {
1655 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1800 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1801 <        FailingNoop r = new FailingNoop();
1802 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1803 <        f.complete(one);
1804 <        checkCompletedWithWrappedCFException(g);
1805 <    }
1651 >        checkCompletedWithWrappedCancellationException(h);
1652 >        checkCancelled(!fFirst ? f : g);
1653 >        r.assertNotInvoked();
1654 >        checkCompletedNormally(fFirst ? f : g, v1);
1655 >    }}
1656  
1657      /**
1658 <     * runAfterEitherAsync result completes exceptionally if either
1809 <     * source cancelled
1658 >     * runAfterBoth result completes exceptionally if action does
1659       */
1660 <    public void testRunAfterEitherAsync4() {
1661 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1662 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1663 <        Noop r = new Noop();
1664 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1665 <        assertTrue(f.cancel(true));
1666 <        checkCompletedWithWrappedCancellationException(g);
1660 >    public void testRunAfterBoth_actionFailed() {
1661 >        for (ExecutionMode m : ExecutionMode.values())
1662 >        for (boolean fFirst : new boolean[] { true, false })
1663 >        for (Integer v1 : new Integer[] { 1, null })
1664 >        for (Integer v2 : new Integer[] { 2, null })
1665 >    {
1666 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 >        final FailingRunnable r1 = new FailingRunnable(m);
1669 >        final FailingRunnable r2 = new FailingRunnable(m);
1670 >
1671 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1672 >        if (fFirst) {
1673 >            f.complete(v1);
1674 >            g.complete(v2);
1675 >        } else {
1676 >            g.complete(v2);
1677 >            f.complete(v1);
1678 >        }
1679 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1680  
1681 <        r = new Noop();
1682 <        f = new CompletableFuture<Integer>();
1683 <        f2 = new CompletableFuture<Integer>();
1684 <        assertTrue(f2.cancel(true));
1685 <        g = f.runAfterEitherAsync(f2, r);
1824 <        checkCompletedWithWrappedCancellationException(g);
1825 <    }
1681 >        checkCompletedWithWrappedCFException(h1);
1682 >        checkCompletedWithWrappedCFException(h2);
1683 >        checkCompletedNormally(f, v1);
1684 >        checkCompletedNormally(g, v2);
1685 >    }}
1686  
1687      /**
1688 <     * thenComposeAsync result completes normally after normal
1689 <     * completion of source
1688 >     * applyToEither result completes normally after normal completion
1689 >     * of either source
1690       */
1691 <    public void testThenComposeAsync() {
1692 <        CompletableFuture<Integer> f, g;
1693 <        CompletableFutureInc r;
1694 <
1695 <        f = new CompletableFuture<Integer>();
1696 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1697 <        f.complete(one);
1698 <        checkCompletedNormally(g, two);
1699 <
1700 <        f = new CompletableFuture<Integer>();
1701 <        f.complete(one);
1702 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1703 <        checkCompletedNormally(g, two);
1704 <    }
1691 >    public void testApplyToEither_normalCompletion() {
1692 >        for (ExecutionMode m : ExecutionMode.values())
1693 >        for (Integer v1 : new Integer[] { 1, null })
1694 >        for (Integer v2 : new Integer[] { 2, null })
1695 >    {
1696 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1697 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1698 >        final IncFunction[] rs = new IncFunction[6];
1699 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1700 >
1701 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1702 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1703 >        checkIncomplete(h0);
1704 >        checkIncomplete(h1);
1705 >        rs[0].assertNotInvoked();
1706 >        rs[1].assertNotInvoked();
1707 >        f.complete(v1);
1708 >        checkCompletedNormally(h0, inc(v1));
1709 >        checkCompletedNormally(h1, inc(v1));
1710 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1711 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1712 >        checkCompletedNormally(h2, inc(v1));
1713 >        checkCompletedNormally(h3, inc(v1));
1714 >        g.complete(v2);
1715 >
1716 >        // unspecified behavior - both source completions available
1717 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1718 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1719 >        rs[4].assertValue(h4.join());
1720 >        rs[5].assertValue(h5.join());
1721 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1722 >                   Objects.equals(inc(v2), h4.join()));
1723 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1724 >                   Objects.equals(inc(v2), h5.join()));
1725 >
1726 >        checkCompletedNormally(f, v1);
1727 >        checkCompletedNormally(g, v2);
1728 >        checkCompletedNormally(h0, inc(v1));
1729 >        checkCompletedNormally(h1, inc(v1));
1730 >        checkCompletedNormally(h2, inc(v1));
1731 >        checkCompletedNormally(h3, inc(v1));
1732 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1733 >    }}
1734  
1735      /**
1736 <     * thenComposeAsync result completes exceptionally after
1737 <     * exceptional completion of source
1736 >     * applyToEither result completes exceptionally after exceptional
1737 >     * completion of either source
1738       */
1739 <    public void testThenComposeAsync2() {
1740 <        CompletableFuture<Integer> f, g;
1741 <        CompletableFutureInc r;
1742 <
1743 <        f = new CompletableFuture<Integer>();
1744 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1745 <        f.completeExceptionally(new CFException());
1746 <        checkCompletedWithWrappedCFException(g);
1747 <        assertFalse(r.ran);
1739 >    public void testApplyToEither_exceptionalCompletion() {
1740 >        for (ExecutionMode m : ExecutionMode.values())
1741 >        for (Integer v1 : new Integer[] { 1, null })
1742 >    {
1743 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1744 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1745 >        final CFException ex = new CFException();
1746 >        final IncFunction[] rs = new IncFunction[6];
1747 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1748 >
1749 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1750 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1751 >        checkIncomplete(h0);
1752 >        checkIncomplete(h1);
1753 >        rs[0].assertNotInvoked();
1754 >        rs[1].assertNotInvoked();
1755 >        f.completeExceptionally(ex);
1756 >        checkCompletedWithWrappedCFException(h0, ex);
1757 >        checkCompletedWithWrappedCFException(h1, ex);
1758 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1759 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1760 >        checkCompletedWithWrappedCFException(h2, ex);
1761 >        checkCompletedWithWrappedCFException(h3, ex);
1762 >        g.complete(v1);
1763 >
1764 >        // unspecified behavior - both source completions available
1765 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1766 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1767 >        try {
1768 >            assertEquals(inc(v1), h4.join());
1769 >            rs[4].assertInvoked();
1770 >        } catch (CompletionException ok) {
1771 >            checkCompletedWithWrappedCFException(h4, ex);
1772 >            rs[4].assertNotInvoked();
1773 >        }
1774 >        try {
1775 >            assertEquals(inc(v1), h5.join());
1776 >            rs[5].assertInvoked();
1777 >        } catch (CompletionException ok) {
1778 >            checkCompletedWithWrappedCFException(h5, ex);
1779 >            rs[5].assertNotInvoked();
1780 >        }
1781  
1782 <        f = new CompletableFuture<Integer>();
1783 <        f.completeExceptionally(new CFException());
1784 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1785 <        checkCompletedWithWrappedCFException(g);
1786 <        assertFalse(r.ran);
1787 <    }
1782 >        checkCompletedWithWrappedCFException(f, ex);
1783 >        checkCompletedNormally(g, v1);
1784 >        checkCompletedWithWrappedCFException(h0, ex);
1785 >        checkCompletedWithWrappedCFException(h1, ex);
1786 >        checkCompletedWithWrappedCFException(h2, ex);
1787 >        checkCompletedWithWrappedCFException(h3, ex);
1788 >        checkCompletedWithWrappedCFException(h4, ex);
1789 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1790 >    }}
1791  
1792      /**
1793 <     * thenComposeAsync result completes exceptionally if action does
1793 >     * applyToEither result completes exceptionally if either source cancelled
1794       */
1795 <    public void testThenComposeAsync3() {
1796 <        CompletableFuture<Integer> f, g;
1797 <        FailingCompletableFutureFunction r;
1798 <
1799 <        f = new CompletableFuture<Integer>();
1800 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
1801 <        f.complete(one);
1802 <        checkCompletedWithWrappedCFException(g);
1795 >    public void testApplyToEither_sourceCancelled() {
1796 >        for (ExecutionMode m : ExecutionMode.values())
1797 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1798 >        for (Integer v1 : new Integer[] { 1, null })
1799 >    {
1800 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1801 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1802 >        final IncFunction[] rs = new IncFunction[6];
1803 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1804 >
1805 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1806 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1807 >        checkIncomplete(h0);
1808 >        checkIncomplete(h1);
1809 >        rs[0].assertNotInvoked();
1810 >        rs[1].assertNotInvoked();
1811 >        f.cancel(mayInterruptIfRunning);
1812 >        checkCompletedWithWrappedCancellationException(h0);
1813 >        checkCompletedWithWrappedCancellationException(h1);
1814 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1815 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1816 >        checkCompletedWithWrappedCancellationException(h2);
1817 >        checkCompletedWithWrappedCancellationException(h3);
1818 >        g.complete(v1);
1819 >
1820 >        // unspecified behavior - both source completions available
1821 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1822 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1823 >        try {
1824 >            assertEquals(inc(v1), h4.join());
1825 >            rs[4].assertInvoked();
1826 >        } catch (CompletionException ok) {
1827 >            checkCompletedWithWrappedCancellationException(h4);
1828 >            rs[4].assertNotInvoked();
1829 >        }
1830 >        try {
1831 >            assertEquals(inc(v1), h5.join());
1832 >            rs[5].assertInvoked();
1833 >        } catch (CompletionException ok) {
1834 >            checkCompletedWithWrappedCancellationException(h5);
1835 >            rs[5].assertNotInvoked();
1836 >        }
1837  
1838 <        f = new CompletableFuture<Integer>();
1839 <        f.complete(one);
1840 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
1841 <        checkCompletedWithWrappedCFException(g);
1842 <    }
1838 >        checkCancelled(f);
1839 >        checkCompletedNormally(g, v1);
1840 >        checkCompletedWithWrappedCancellationException(h0);
1841 >        checkCompletedWithWrappedCancellationException(h1);
1842 >        checkCompletedWithWrappedCancellationException(h2);
1843 >        checkCompletedWithWrappedCancellationException(h3);
1844 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1845 >    }}
1846  
1847      /**
1848 <     * thenComposeAsync result completes exceptionally if source cancelled
1848 >     * applyToEither result completes exceptionally if action does
1849       */
1850 <    public void testThenComposeAsync4() {
1851 <        CompletableFuture<Integer> f, g;
1852 <        CompletableFutureInc r;
1853 <
1854 <        f = new CompletableFuture<Integer>();
1855 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1856 <        assertTrue(f.cancel(true));
1857 <        checkCompletedWithWrappedCancellationException(g);
1858 <
1859 <        f = new CompletableFuture<Integer>();
1860 <        assertTrue(f.cancel(true));
1861 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1862 <        checkCompletedWithWrappedCancellationException(g);
1863 <    }
1864 <
1865 <
1866 <    // async with explicit executors
1850 >    public void testApplyToEither_actionFailed() {
1851 >        for (ExecutionMode m : ExecutionMode.values())
1852 >        for (Integer v1 : new Integer[] { 1, null })
1853 >        for (Integer v2 : new Integer[] { 2, null })
1854 >    {
1855 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1856 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 >        final FailingFunction[] rs = new FailingFunction[6];
1858 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1859 >
1860 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1861 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1862 >        f.complete(v1);
1863 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1864 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1865 >        checkCompletedWithWrappedCFException(h0);
1866 >        checkCompletedWithWrappedCFException(h1);
1867 >        checkCompletedWithWrappedCFException(h2);
1868 >        checkCompletedWithWrappedCFException(h3);
1869 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1870 >
1871 >        g.complete(v2);
1872 >
1873 >        // unspecified behavior - both source completions available
1874 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1875 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1876 >
1877 >        checkCompletedWithWrappedCFException(h4);
1878 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1879 >                   Objects.equals(v2, rs[4].value));
1880 >        checkCompletedWithWrappedCFException(h5);
1881 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1882 >                   Objects.equals(v2, rs[5].value));
1883 >
1884 >        checkCompletedNormally(f, v1);
1885 >        checkCompletedNormally(g, v2);
1886 >    }}
1887  
1888      /**
1889 <     * thenRunAsync result completes normally after normal completion of source
1889 >     * acceptEither result completes normally after normal completion
1890 >     * of either source
1891       */
1892 <    public void testThenRunAsyncE() {
1893 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1894 <        Noop r = new Noop();
1895 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1896 <        f.complete(null);
1897 <        checkCompletedNormally(g, null);
1898 <
1899 <        // reordered version
1900 <        f = new CompletableFuture<Integer>();
1901 <        f.complete(null);
1902 <        r = new Noop();
1903 <        g = f.thenRunAsync(r, new ThreadExecutor());
1904 <        checkCompletedNormally(g, null);
1905 <    }
1892 >    public void testAcceptEither_normalCompletion() {
1893 >        for (ExecutionMode m : ExecutionMode.values())
1894 >        for (Integer v1 : new Integer[] { 1, null })
1895 >        for (Integer v2 : new Integer[] { 2, null })
1896 >    {
1897 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1898 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 >        final IncAction[] rs = new IncAction[6];
1900 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1901 >
1902 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1903 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1904 >        checkIncomplete(h0);
1905 >        checkIncomplete(h1);
1906 >        rs[0].assertNotInvoked();
1907 >        rs[1].assertNotInvoked();
1908 >        f.complete(v1);
1909 >        checkCompletedNormally(h0, null);
1910 >        checkCompletedNormally(h1, null);
1911 >        rs[0].assertValue(inc(v1));
1912 >        rs[1].assertValue(inc(v1));
1913 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1914 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1915 >        checkCompletedNormally(h2, null);
1916 >        checkCompletedNormally(h3, null);
1917 >        rs[2].assertValue(inc(v1));
1918 >        rs[3].assertValue(inc(v1));
1919 >        g.complete(v2);
1920 >
1921 >        // unspecified behavior - both source completions available
1922 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1923 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1924 >        checkCompletedNormally(h4, null);
1925 >        checkCompletedNormally(h5, null);
1926 >        assertTrue(Objects.equals(inc(v1), rs[4].value) ||
1927 >                   Objects.equals(inc(v2), rs[4].value));
1928 >        assertTrue(Objects.equals(inc(v1), rs[5].value) ||
1929 >                   Objects.equals(inc(v2), rs[5].value));
1930 >
1931 >        checkCompletedNormally(f, v1);
1932 >        checkCompletedNormally(g, v2);
1933 >        checkCompletedNormally(h0, null);
1934 >        checkCompletedNormally(h1, null);
1935 >        checkCompletedNormally(h2, null);
1936 >        checkCompletedNormally(h3, null);
1937 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1938 >    }}
1939  
1940      /**
1941 <     * thenRunAsync result completes exceptionally after exceptional
1942 <     * completion of source
1941 >     * acceptEither result completes exceptionally after exceptional
1942 >     * completion of either source
1943       */
1944 <    public void testThenRunAsync2E() {
1945 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1946 <        Noop r = new Noop();
1947 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1948 <        f.completeExceptionally(new CFException());
1944 >    public void testAcceptEither_exceptionalCompletion() {
1945 >        for (ExecutionMode m : ExecutionMode.values())
1946 >        for (Integer v1 : new Integer[] { 1, null })
1947 >    {
1948 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1949 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1950 >        final CFException ex = new CFException();
1951 >        final IncAction[] rs = new IncAction[6];
1952 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1953 >
1954 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1955 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1956 >        checkIncomplete(h0);
1957 >        checkIncomplete(h1);
1958 >        rs[0].assertNotInvoked();
1959 >        rs[1].assertNotInvoked();
1960 >        f.completeExceptionally(ex);
1961 >        checkCompletedWithWrappedCFException(h0, ex);
1962 >        checkCompletedWithWrappedCFException(h1, ex);
1963 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1964 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1965 >        checkCompletedWithWrappedCFException(h2, ex);
1966 >        checkCompletedWithWrappedCFException(h3, ex);
1967 >
1968 >        g.complete(v1);
1969 >
1970 >        // unspecified behavior - both source completions available
1971 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1972 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1973          try {
1974 <            g.join();
1975 <            shouldThrow();
1976 <        } catch (Exception ok) {
1974 >            assertNull(h4.join());
1975 >            rs[4].assertValue(inc(v1));
1976 >        } catch (CompletionException ok) {
1977 >            checkCompletedWithWrappedCFException(h4, ex);
1978 >            rs[4].assertNotInvoked();
1979 >        }
1980 >        try {
1981 >            assertNull(h5.join());
1982 >            rs[5].assertValue(inc(v1));
1983 >        } catch (CompletionException ok) {
1984 >            checkCompletedWithWrappedCFException(h5, ex);
1985 >            rs[5].assertNotInvoked();
1986          }
1938        checkCompletedWithWrappedCFException(g);
1939    }
1987  
1988 <    /**
1989 <     * thenRunAsync result completes exceptionally if action does
1990 <     */
1991 <    public void testThenRunAsync3E() {
1992 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1993 <        FailingNoop r = new FailingNoop();
1994 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1995 <        f.complete(null);
1996 <        checkCompletedWithWrappedCFException(g);
1950 <    }
1988 >        checkCompletedWithWrappedCFException(f, ex);
1989 >        checkCompletedNormally(g, v1);
1990 >        checkCompletedWithWrappedCFException(h0, ex);
1991 >        checkCompletedWithWrappedCFException(h1, ex);
1992 >        checkCompletedWithWrappedCFException(h2, ex);
1993 >        checkCompletedWithWrappedCFException(h3, ex);
1994 >        checkCompletedWithWrappedCFException(h4, ex);
1995 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1996 >    }}
1997  
1998      /**
1999 <     * thenRunAsync result completes exceptionally if source cancelled
1954 <     */
1955 <    public void testThenRunAsync4E() {
1956 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1957 <        Noop r = new Noop();
1958 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1959 <        assertTrue(f.cancel(true));
1960 <        checkCompletedWithWrappedCancellationException(g);
1961 <    }
1962 <
1963 <    /**
1964 <     * thenApplyAsync result completes normally after normal completion of source
1999 >     * acceptEither result completes exceptionally if either source cancelled
2000       */
2001 <    public void testThenApplyAsyncE() {
2002 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2003 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2004 <        f.complete(one);
2005 <        checkCompletedNormally(g, two);
2006 <    }
2001 >    public void testAcceptEither_sourceCancelled() {
2002 >        for (ExecutionMode m : ExecutionMode.values())
2003 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2004 >        for (Integer v1 : new Integer[] { 1, null })
2005 >    {
2006 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2007 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2008 >        final IncAction[] rs = new IncAction[6];
2009 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2010 >
2011 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2012 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2013 >        checkIncomplete(h0);
2014 >        checkIncomplete(h1);
2015 >        rs[0].assertNotInvoked();
2016 >        rs[1].assertNotInvoked();
2017 >        f.cancel(mayInterruptIfRunning);
2018 >        checkCompletedWithWrappedCancellationException(h0);
2019 >        checkCompletedWithWrappedCancellationException(h1);
2020 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2021 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2022 >        checkCompletedWithWrappedCancellationException(h2);
2023 >        checkCompletedWithWrappedCancellationException(h3);
2024 >
2025 >        g.complete(v1);
2026 >
2027 >        // unspecified behavior - both source completions available
2028 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2029 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2030 >        try {
2031 >            assertNull(h4.join());
2032 >            rs[4].assertValue(inc(v1));
2033 >        } catch (CompletionException ok) {
2034 >            checkCompletedWithWrappedCancellationException(h4);
2035 >            rs[4].assertNotInvoked();
2036 >        }
2037 >        try {
2038 >            assertNull(h5.join());
2039 >            rs[5].assertValue(inc(v1));
2040 >        } catch (CompletionException ok) {
2041 >            checkCompletedWithWrappedCancellationException(h5);
2042 >            rs[5].assertNotInvoked();
2043 >        }
2044  
2045 <    /**
2046 <     * thenApplyAsync result completes exceptionally after exceptional
2047 <     * completion of source
2048 <     */
2049 <    public void testThenApplyAsync2E() {
2050 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2051 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2052 <        f.completeExceptionally(new CFException());
1981 <        checkCompletedWithWrappedCFException(g);
1982 <    }
2045 >        checkCancelled(f);
2046 >        checkCompletedNormally(g, v1);
2047 >        checkCompletedWithWrappedCancellationException(h0);
2048 >        checkCompletedWithWrappedCancellationException(h1);
2049 >        checkCompletedWithWrappedCancellationException(h2);
2050 >        checkCompletedWithWrappedCancellationException(h3);
2051 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2052 >    }}
2053  
2054      /**
2055 <     * thenApplyAsync result completes exceptionally if action does
2055 >     * acceptEither result completes exceptionally if action does
2056       */
2057 <    public void testThenApplyAsync3E() {
2058 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2059 <        FailingFunction r = new FailingFunction();
2060 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2061 <        f.complete(null);
2062 <        checkCompletedWithWrappedCFException(g);
2063 <    }
2057 >    public void testAcceptEither_actionFailed() {
2058 >        for (ExecutionMode m : ExecutionMode.values())
2059 >        for (Integer v1 : new Integer[] { 1, null })
2060 >        for (Integer v2 : new Integer[] { 2, null })
2061 >    {
2062 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2063 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 >        final FailingConsumer[] rs = new FailingConsumer[6];
2065 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(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 >        f.complete(v1);
2070 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2071 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2072 >        checkCompletedWithWrappedCFException(h0);
2073 >        checkCompletedWithWrappedCFException(h1);
2074 >        checkCompletedWithWrappedCFException(h2);
2075 >        checkCompletedWithWrappedCFException(h3);
2076 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2077 >
2078 >        g.complete(v2);
2079 >
2080 >        // unspecified behavior - both source completions available
2081 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2082 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2083 >
2084 >        checkCompletedWithWrappedCFException(h4);
2085 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2086 >                   Objects.equals(v2, rs[4].value));
2087 >        checkCompletedWithWrappedCFException(h5);
2088 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2089 >                   Objects.equals(v2, rs[5].value));
2090 >
2091 >        checkCompletedNormally(f, v1);
2092 >        checkCompletedNormally(g, v2);
2093 >    }}
2094  
2095      /**
2096 <     * thenApplyAsync result completes exceptionally if source cancelled
2096 >     * runAfterEither result completes normally after normal completion
2097 >     * of either source
2098       */
2099 <    public void testThenApplyAsync4E() {
2100 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2101 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2102 <        assertTrue(f.cancel(true));
2103 <        checkCompletedWithWrappedCancellationException(g);
2104 <    }
2099 >    public void testRunAfterEither_normalCompletion1() {
2100 >        for (ExecutionMode m : ExecutionMode.values())
2101 >        for (Integer v1 : new Integer[] { 1, null })
2102 >        for (Integer v2 : new Integer[] { 2, null })
2103 >    {
2104 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2105 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2106 >        final Noop r = new Noop(m);
2107 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2108 >
2109 >        f.complete(v1);
2110 >        checkCompletedNormally(h, null);
2111 >        r.assertInvoked();
2112 >        g.complete(v2);
2113 >
2114 >        checkCompletedNormally(f, v1);
2115 >        checkCompletedNormally(g, v2);
2116 >        checkCompletedNormally(h, null);
2117 >        r.assertInvoked();
2118 >    }}
2119 >
2120 >    public void testRunAfterEither_normalCompletion2() {
2121 >        for (ExecutionMode m : ExecutionMode.values())
2122 >        for (Integer v1 : new Integer[] { 1, null })
2123 >        for (Integer v2 : new Integer[] { 2, null })
2124 >    {
2125 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2126 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2127 >        final Noop r = new Noop(m);
2128 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2129 >
2130 >        g.complete(v2);
2131 >        checkCompletedNormally(h, null);
2132 >        r.assertInvoked();
2133 >        f.complete(v1);
2134 >
2135 >        checkCompletedNormally(f, v1);
2136 >        checkCompletedNormally(g, v2);
2137 >        checkCompletedNormally(h, null);
2138 >        r.assertInvoked();
2139 >        }}
2140 >
2141 >    public void testRunAfterEither_normalCompletion3() {
2142 >        for (ExecutionMode m : ExecutionMode.values())
2143 >        for (Integer v1 : new Integer[] { 1, null })
2144 >        for (Integer v2 : new Integer[] { 2, null })
2145 >    {
2146 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2147 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2148 >        final Noop r = new Noop(m);
2149 >
2150 >        f.complete(v1);
2151 >        g.complete(v2);
2152 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2153 >
2154 >        checkCompletedNormally(h, null);
2155 >        checkCompletedNormally(f, v1);
2156 >        checkCompletedNormally(g, v2);
2157 >        r.assertInvoked();
2158 >    }}
2159  
2160      /**
2161 <     * thenAcceptAsync result completes normally after normal
2162 <     * completion of source
2161 >     * runAfterEither result completes exceptionally after exceptional
2162 >     * completion of either source
2163       */
2164 <    public void testThenAcceptAsyncE() {
2165 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2166 <        IncAction r = new IncAction();
2167 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2168 <        f.complete(one);
2169 <        checkCompletedNormally(g, null);
2170 <        assertEquals(r.value, 2);
2171 <    }
2164 >    public void testRunAfterEither_exceptionalCompletion1() {
2165 >        for (ExecutionMode m : ExecutionMode.values())
2166 >        for (Integer v1 : new Integer[] { 1, null })
2167 >    {
2168 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2169 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2170 >        final Noop r = new Noop(m);
2171 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2172 >        final CFException ex = new CFException();
2173 >
2174 >        f.completeExceptionally(ex);
2175 >        checkCompletedWithWrappedCFException(h, ex);
2176 >        g.complete(v1);
2177 >
2178 >        r.assertNotInvoked();
2179 >        checkCompletedNormally(g, v1);
2180 >        checkCompletedWithWrappedCFException(f, ex);
2181 >        checkCompletedWithWrappedCFException(h, ex);
2182 >    }}
2183 >
2184 >    public void testRunAfterEither_exceptionalCompletion2() {
2185 >        for (ExecutionMode m : ExecutionMode.values())
2186 >        for (Integer v1 : new Integer[] { 1, null })
2187 >    {
2188 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2189 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2190 >        final Noop r = new Noop(m);
2191 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2192 >        final CFException ex = new CFException();
2193 >
2194 >        g.completeExceptionally(ex);
2195 >        checkCompletedWithWrappedCFException(h, ex);
2196 >        f.complete(v1);
2197 >
2198 >        r.assertNotInvoked();
2199 >        checkCompletedNormally(f, v1);
2200 >        checkCompletedWithWrappedCFException(g, ex);
2201 >        checkCompletedWithWrappedCFException(h, ex);
2202 >    }}
2203 >
2204 >    public void testRunAfterEither_exceptionalCompletion3() {
2205 >        for (ExecutionMode m : ExecutionMode.values())
2206 >        for (Integer v1 : new Integer[] { 1, null })
2207 >    {
2208 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2209 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 >        final Noop r = new Noop(m);
2211 >        final CFException ex = new CFException();
2212 >
2213 >        g.completeExceptionally(ex);
2214 >        f.complete(v1);
2215 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2216  
2217 <    /**
2218 <     * thenAcceptAsync result completes exceptionally after exceptional
2219 <     * completion of source
2220 <     */
2221 <    public void testThenAcceptAsync2E() {
2222 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2223 <        IncAction r = new IncAction();
2224 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2225 <        f.completeExceptionally(new CFException());
2027 <        checkCompletedWithWrappedCFException(g);
2028 <    }
2217 >        // unspecified behavior
2218 >        Integer v;
2219 >        try {
2220 >            assertNull(h.join());
2221 >            r.assertInvoked();
2222 >        } catch (CompletionException ok) {
2223 >            checkCompletedWithWrappedCFException(h, ex);
2224 >            r.assertNotInvoked();
2225 >        }
2226  
2227 <    /**
2228 <     * thenAcceptAsync result completes exceptionally if action does
2229 <     */
2230 <    public void testThenAcceptAsync3E() {
2231 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2232 <        FailingConsumer r = new FailingConsumer();
2233 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2234 <        f.complete(null);
2235 <        checkCompletedWithWrappedCFException(g);
2236 <    }
2227 >        checkCompletedWithWrappedCFException(g, ex);
2228 >        checkCompletedNormally(f, v1);
2229 >    }}
2230 >
2231 >    public void testRunAfterEither_exceptionalCompletion4() {
2232 >        for (ExecutionMode m : ExecutionMode.values())
2233 >        for (Integer v1 : new Integer[] { 1, null })
2234 >    {
2235 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2236 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2237 >        final Noop r = new Noop(m);
2238 >        final CFException ex = new CFException();
2239 >
2240 >        f.completeExceptionally(ex);
2241 >        g.complete(v1);
2242 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2243  
2244 <    /**
2245 <     * thenAcceptAsync result completes exceptionally if source cancelled
2246 <     */
2247 <    public void testThenAcceptAsync4E() {
2248 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2249 <        IncAction r = new IncAction();
2250 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2251 <        assertTrue(f.cancel(true));
2252 <        checkCompletedWithWrappedCancellationException(g);
2050 <    }
2244 >        // unspecified behavior
2245 >        Integer v;
2246 >        try {
2247 >            assertNull(h.join());
2248 >            r.assertInvoked();
2249 >        } catch (CompletionException ok) {
2250 >            checkCompletedWithWrappedCFException(h, ex);
2251 >            r.assertNotInvoked();
2252 >        }
2253  
2254 <    /**
2255 <     * thenCombineAsync result completes normally after normal
2256 <     * completion of sources
2055 <     */
2056 <    public void testThenCombineAsyncE() {
2057 <        CompletableFuture<Integer> f, g, h;
2058 <        ThreadExecutor e = new ThreadExecutor();
2059 <        int count = 0;
2060 <
2061 <        f = new CompletableFuture<Integer>();
2062 <        g = new CompletableFuture<Integer>();
2063 <        h = f.thenCombineAsync(g, subtract, e);
2064 <        f.complete(3);
2065 <        checkIncomplete(h);
2066 <        g.complete(1);
2067 <        checkCompletedNormally(h, 2);
2068 <        assertEquals(++count, e.count.get());
2069 <
2070 <        f = new CompletableFuture<Integer>();
2071 <        g = new CompletableFuture<Integer>();
2072 <        h = f.thenCombineAsync(g, subtract, e);
2073 <        g.complete(1);
2074 <        checkIncomplete(h);
2075 <        f.complete(3);
2076 <        checkCompletedNormally(h, 2);
2077 <        assertEquals(++count, e.count.get());
2078 <
2079 <        f = new CompletableFuture<Integer>();
2080 <        g = new CompletableFuture<Integer>();
2081 <        g.complete(1);
2082 <        f.complete(3);
2083 <        h = f.thenCombineAsync(g, subtract, e);
2084 <        checkCompletedNormally(h, 2);
2085 <        assertEquals(++count, e.count.get());
2086 <    }
2254 >        checkCompletedWithWrappedCFException(f, ex);
2255 >        checkCompletedNormally(g, v1);
2256 >    }}
2257  
2258      /**
2259 <     * thenCombineAsync result completes exceptionally after exceptional
2090 <     * completion of either source
2259 >     * runAfterEither result completes exceptionally if action does
2260       */
2261 <    public void testThenCombineAsync2E() {
2262 <        CompletableFuture<Integer> f, g, h;
2263 <        ThreadExecutor e = new ThreadExecutor();
2264 <        int count = 0;
2265 <
2266 <        f = new CompletableFuture<Integer>();
2267 <        g = new CompletableFuture<Integer>();
2268 <        h = f.thenCombineAsync(g, subtract, e);
2269 <        f.completeExceptionally(new CFException());
2101 <        checkIncomplete(h);
2102 <        g.complete(1);
2103 <        checkCompletedWithWrappedCFException(h);
2261 >    public void testRunAfterEither_actionFailed1() {
2262 >        for (ExecutionMode m : ExecutionMode.values())
2263 >        for (Integer v1 : new Integer[] { 1, null })
2264 >        for (Integer v2 : new Integer[] { 2, null })
2265 >    {
2266 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2267 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2268 >        final FailingRunnable r = new FailingRunnable(m);
2269 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2270  
2271 <        f = new CompletableFuture<Integer>();
2106 <        g = new CompletableFuture<Integer>();
2107 <        h = f.thenCombineAsync(g, subtract, e);
2108 <        g.completeExceptionally(new CFException());
2109 <        checkIncomplete(h);
2110 <        f.complete(3);
2271 >        f.complete(v1);
2272          checkCompletedWithWrappedCFException(h);
2273 +        g.complete(v2);
2274 +        checkCompletedNormally(f, v1);
2275 +        checkCompletedNormally(g, v2);
2276 +    }}
2277 +
2278 +    public void testRunAfterEither_actionFailed2() {
2279 +        for (ExecutionMode m : ExecutionMode.values())
2280 +        for (Integer v1 : new Integer[] { 1, null })
2281 +        for (Integer v2 : new Integer[] { 2, null })
2282 +    {
2283 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2284 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2285 +        final FailingRunnable r = new FailingRunnable(m);
2286 +        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2287  
2288 <        f = new CompletableFuture<Integer>();
2114 <        g = new CompletableFuture<Integer>();
2115 <        g.completeExceptionally(new CFException());
2116 <        h = f.thenCombineAsync(g, subtract, e);
2117 <        checkIncomplete(h);
2118 <        f.complete(3);
2288 >        g.complete(v2);
2289          checkCompletedWithWrappedCFException(h);
2290 <
2291 <        assertEquals(0, e.count.get());
2292 <    }
2290 >        f.complete(v1);
2291 >        checkCompletedNormally(f, v1);
2292 >        checkCompletedNormally(g, v2);
2293 >    }}
2294  
2295      /**
2296 <     * thenCombineAsync result completes exceptionally if action does
2126 <     */
2127 <    public void testThenCombineAsync3E() {
2128 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2129 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2130 <        FailingBiFunction r = new FailingBiFunction();
2131 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2132 <        f.complete(one);
2133 <        checkIncomplete(g);
2134 <        assertFalse(r.ran);
2135 <        f2.complete(two);
2136 <        checkCompletedWithWrappedCFException(g);
2137 <        assertTrue(r.ran);
2138 <    }
2139 <
2140 <    /**
2141 <     * thenCombineAsync result completes exceptionally if either source cancelled
2296 >     * runAfterEither result completes exceptionally if either source cancelled
2297       */
2298 <    public void testThenCombineAsync4E() {
2299 <        CompletableFuture<Integer> f, g, h;
2300 <        ThreadExecutor e = new ThreadExecutor();
2298 >    public void testRunAfterEither_sourceCancelled1() {
2299 >        for (ExecutionMode m : ExecutionMode.values())
2300 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2301 >        for (Integer v1 : new Integer[] { 1, null })
2302 >    {
2303 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2304 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2305 >        final Noop r = new Noop(m);
2306 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2307  
2308 <        f = new CompletableFuture<Integer>();
2148 <        g = new CompletableFuture<Integer>();
2149 <        h = f.thenCombineAsync(g, subtract, e);
2150 <        assertTrue(f.cancel(true));
2151 <        checkIncomplete(h);
2152 <        g.complete(1);
2308 >        assertTrue(f.cancel(mayInterruptIfRunning));
2309          checkCompletedWithWrappedCancellationException(h);
2310 +        g.complete(v1);
2311  
2312 <        f = new CompletableFuture<Integer>();
2313 <        g = new CompletableFuture<Integer>();
2314 <        h = f.thenCombineAsync(g, subtract, e);
2158 <        assertTrue(g.cancel(true));
2159 <        checkIncomplete(h);
2160 <        f.complete(3);
2312 >        checkCancelled(f);
2313 >        r.assertNotInvoked();
2314 >        checkCompletedNormally(g, v1);
2315          checkCompletedWithWrappedCancellationException(h);
2316 +    }}
2317  
2318 <        f = new CompletableFuture<Integer>();
2319 <        g = new CompletableFuture<Integer>();
2320 <        assertTrue(g.cancel(true));
2321 <        h = f.thenCombineAsync(g, subtract, e);
2322 <        checkIncomplete(h);
2323 <        f.complete(3);
2324 <        checkCompletedWithWrappedCancellationException(h);
2318 >    public void testRunAfterEither_sourceCancelled2() {
2319 >        for (ExecutionMode m : ExecutionMode.values())
2320 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2321 >        for (Integer v1 : new Integer[] { 1, null })
2322 >    {
2323 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2324 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2325 >        final Noop r = new Noop(m);
2326 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2327  
2328 <        f = new CompletableFuture<Integer>();
2172 <        g = new CompletableFuture<Integer>();
2173 <        assertTrue(f.cancel(true));
2174 <        assertTrue(g.cancel(true));
2175 <        h = f.thenCombineAsync(g, subtract, e);
2328 >        assertTrue(g.cancel(mayInterruptIfRunning));
2329          checkCompletedWithWrappedCancellationException(h);
2330 +        f.complete(v1);
2331  
2332 <        assertEquals(0, e.count.get());
2333 <    }
2334 <
2335 <    /**
2336 <     * thenAcceptBothAsync result completes normally after normal
2183 <     * completion of sources
2184 <     */
2185 <    public void testThenAcceptBothAsyncE() {
2186 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2187 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2188 <        AddAction r = new AddAction();
2189 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2190 <        f.complete(one);
2191 <        checkIncomplete(g);
2192 <        f2.complete(two);
2193 <        checkCompletedNormally(g, null);
2194 <        assertEquals(r.value, 3);
2195 <    }
2196 <
2197 <    /**
2198 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2199 <     * completion of source
2200 <     */
2201 <    public void testThenAcceptBothAsync2E() {
2202 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2203 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2204 <        AddAction r = new AddAction();
2205 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2206 <        f.completeExceptionally(new CFException());
2207 <        f2.complete(two);
2208 <        checkCompletedWithWrappedCFException(g);
2209 <
2210 <        r = new AddAction();
2211 <        f = new CompletableFuture<Integer>();
2212 <        f2 = new CompletableFuture<Integer>();
2213 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2214 <        f.complete(one);
2215 <        f2.completeExceptionally(new CFException());
2216 <        checkCompletedWithWrappedCFException(g);
2217 <    }
2218 <
2219 <    /**
2220 <     * thenAcceptBothAsync result completes exceptionally if action does
2221 <     */
2222 <    public void testThenAcceptBothAsync3E() {
2223 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2224 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2225 <        FailingBiConsumer r = new FailingBiConsumer();
2226 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2227 <        f.complete(one);
2228 <        checkIncomplete(g);
2229 <        f2.complete(two);
2230 <        checkCompletedWithWrappedCFException(g);
2231 <    }
2232 <
2233 <    /**
2234 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2235 <     */
2236 <    public void testThenAcceptBothAsync4E() {
2237 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2238 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2239 <        AddAction r = new AddAction();
2240 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2241 <        assertTrue(f.cancel(true));
2242 <        f2.complete(two);
2243 <        checkCompletedWithWrappedCancellationException(g);
2244 <
2245 <        r = new AddAction();
2246 <        f = new CompletableFuture<Integer>();
2247 <        f2 = new CompletableFuture<Integer>();
2248 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2249 <        f.complete(one);
2250 <        assertTrue(f2.cancel(true));
2251 <        checkCompletedWithWrappedCancellationException(g);
2252 <    }
2253 <
2254 <    /**
2255 <     * runAfterBothAsync result completes normally after normal
2256 <     * completion of sources
2257 <     */
2258 <    public void testRunAfterBothAsyncE() {
2259 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2260 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2261 <        Noop r = new Noop();
2262 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2263 <        f.complete(one);
2264 <        checkIncomplete(g);
2265 <        f2.complete(two);
2266 <        checkCompletedNormally(g, null);
2267 <        assertTrue(r.ran);
2268 <    }
2269 <
2270 <    /**
2271 <     * runAfterBothAsync result completes exceptionally after exceptional
2272 <     * completion of source
2273 <     */
2274 <    public void testRunAfterBothAsync2E() {
2275 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2276 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2277 <        Noop r = new Noop();
2278 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2279 <        f.completeExceptionally(new CFException());
2280 <        f2.complete(two);
2281 <        checkCompletedWithWrappedCFException(g);
2282 <
2283 <        r = new Noop();
2284 <        f = new CompletableFuture<Integer>();
2285 <        f2 = new CompletableFuture<Integer>();
2286 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2287 <        f.complete(one);
2288 <        f2.completeExceptionally(new CFException());
2289 <        checkCompletedWithWrappedCFException(g);
2290 <    }
2291 <
2292 <    /**
2293 <     * runAfterBothAsync result completes exceptionally if action does
2294 <     */
2295 <    public void testRunAfterBothAsync3E() {
2296 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2297 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2298 <        FailingNoop r = new FailingNoop();
2299 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2300 <        f.complete(one);
2301 <        checkIncomplete(g);
2302 <        f2.complete(two);
2303 <        checkCompletedWithWrappedCFException(g);
2304 <    }
2305 <
2306 <    /**
2307 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2308 <     */
2309 <    public void testRunAfterBothAsync4E() {
2310 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2311 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2312 <        Noop r = new Noop();
2313 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2314 <        assertTrue(f.cancel(true));
2315 <        f2.complete(two);
2316 <        checkCompletedWithWrappedCancellationException(g);
2317 <
2318 <        r = new Noop();
2319 <        f = new CompletableFuture<Integer>();
2320 <        f2 = new CompletableFuture<Integer>();
2321 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2322 <        f.complete(one);
2323 <        assertTrue(f2.cancel(true));
2324 <        checkCompletedWithWrappedCancellationException(g);
2325 <    }
2326 <
2327 <    /**
2328 <     * applyToEitherAsync result completes normally after normal
2329 <     * completion of sources
2330 <     */
2331 <    public void testApplyToEitherAsyncE() {
2332 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2333 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2334 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2335 <        f.complete(one);
2336 <        checkCompletedNormally(g, two);
2337 <
2338 <        f = new CompletableFuture<Integer>();
2339 <        f.complete(one);
2340 <        f2 = new CompletableFuture<Integer>();
2341 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2342 <        checkCompletedNormally(g, two);
2343 <    }
2344 <
2345 <    /**
2346 <     * applyToEitherAsync result completes exceptionally after exceptional
2347 <     * completion of source
2348 <     */
2349 <    public void testApplyToEitherAsync2E() {
2350 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2351 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2352 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2353 <        f.completeExceptionally(new CFException());
2354 <        checkCompletedWithWrappedCFException(g);
2355 <
2356 <        f = new CompletableFuture<Integer>();
2357 <        f2 = new CompletableFuture<Integer>();
2358 <        f2.completeExceptionally(new CFException());
2359 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2360 <        f.complete(one);
2361 <        checkCompletedWithWrappedCFException(g);
2362 <    }
2363 <
2364 <    /**
2365 <     * applyToEitherAsync result completes exceptionally if action does
2366 <     */
2367 <    public void testApplyToEitherAsync3E() {
2368 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2369 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2370 <        FailingFunction r = new FailingFunction();
2371 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2372 <        f.complete(one);
2373 <        checkCompletedWithWrappedCFException(g);
2374 <    }
2375 <
2376 <    /**
2377 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2378 <     */
2379 <    public void testApplyToEitherAsync4E() {
2380 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2381 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2382 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2383 <        assertTrue(f.cancel(true));
2384 <        checkCompletedWithWrappedCancellationException(g);
2385 <
2386 <        f = new CompletableFuture<Integer>();
2387 <        f2 = new CompletableFuture<Integer>();
2388 <        assertTrue(f2.cancel(true));
2389 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2390 <        checkCompletedWithWrappedCancellationException(g);
2391 <    }
2392 <
2393 <    /**
2394 <     * acceptEitherAsync result completes normally after normal
2395 <     * completion of sources
2396 <     */
2397 <    public void testAcceptEitherAsyncE() {
2398 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2399 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2400 <        IncAction r = new IncAction();
2401 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2402 <        f.complete(one);
2403 <        checkCompletedNormally(g, null);
2404 <        assertEquals(r.value, 2);
2405 <
2406 <        r = new IncAction();
2407 <        f = new CompletableFuture<Integer>();
2408 <        f.complete(one);
2409 <        f2 = new CompletableFuture<Integer>();
2410 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2411 <        checkCompletedNormally(g, null);
2412 <        assertEquals(r.value, 2);
2413 <    }
2332 >        checkCancelled(g);
2333 >        r.assertNotInvoked();
2334 >        checkCompletedNormally(f, v1);
2335 >        checkCompletedWithWrappedCancellationException(h);
2336 >    }}
2337  
2338 <    /**
2339 <     * acceptEitherAsync result completes exceptionally after exceptional
2340 <     * completion of source
2341 <     */
2342 <    public void testAcceptEitherAsync2E() {
2343 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2344 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2345 <        IncAction r = new IncAction();
2346 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2347 <        f.completeExceptionally(new CFException());
2348 <        checkCompletedWithWrappedCFException(g);
2338 >    public void testRunAfterEither_sourceCancelled3() {
2339 >        for (ExecutionMode m : ExecutionMode.values())
2340 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2341 >        for (Integer v1 : new Integer[] { 1, null })
2342 >    {
2343 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2344 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 >        final Noop r = new Noop(m);
2346 >
2347 >        assertTrue(g.cancel(mayInterruptIfRunning));
2348 >        f.complete(v1);
2349 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2350  
2351 <        r = new IncAction();
2352 <        f = new CompletableFuture<Integer>();
2353 <        f2 = new CompletableFuture<Integer>();
2354 <        f2.completeExceptionally(new CFException());
2355 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2356 <        f.complete(one);
2357 <        checkCompletedWithWrappedCFException(g);
2358 <    }
2351 >        // unspecified behavior
2352 >        Integer v;
2353 >        try {
2354 >            assertNull(h.join());
2355 >            r.assertInvoked();
2356 >        } catch (CompletionException ok) {
2357 >            checkCompletedWithWrappedCancellationException(h);
2358 >            r.assertNotInvoked();
2359 >        }
2360  
2361 <    /**
2362 <     * acceptEitherAsync result completes exceptionally if action does
2363 <     */
2364 <    public void testAcceptEitherAsync3E() {
2365 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2366 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2367 <        FailingConsumer r = new FailingConsumer();
2368 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2369 <        f.complete(one);
2370 <        checkCompletedWithWrappedCFException(g);
2371 <    }
2361 >        checkCancelled(g);
2362 >        checkCompletedNormally(f, v1);
2363 >    }}
2364 >
2365 >    public void testRunAfterEither_sourceCancelled4() {
2366 >        for (ExecutionMode m : ExecutionMode.values())
2367 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2368 >        for (Integer v1 : new Integer[] { 1, null })
2369 >    {
2370 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2371 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 >        final Noop r = new Noop(m);
2373 >
2374 >        assertTrue(f.cancel(mayInterruptIfRunning));
2375 >        g.complete(v1);
2376 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2377  
2378 <    /**
2379 <     * acceptEitherAsync result completes exceptionally if either
2380 <     * source cancelled
2381 <     */
2382 <    public void testAcceptEitherAsync4E() {
2383 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2384 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2385 <        IncAction r = new IncAction();
2386 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2457 <        assertTrue(f.cancel(true));
2458 <        checkCompletedWithWrappedCancellationException(g);
2378 >        // unspecified behavior
2379 >        Integer v;
2380 >        try {
2381 >            assertNull(h.join());
2382 >            r.assertInvoked();
2383 >        } catch (CompletionException ok) {
2384 >            checkCompletedWithWrappedCancellationException(h);
2385 >            r.assertNotInvoked();
2386 >        }
2387  
2388 <        r = new IncAction();
2389 <        f = new CompletableFuture<Integer>();
2390 <        f2 = new CompletableFuture<Integer>();
2463 <        assertTrue(f2.cancel(true));
2464 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2465 <        checkCompletedWithWrappedCancellationException(g);
2466 <    }
2388 >        checkCancelled(f);
2389 >        checkCompletedNormally(g, v1);
2390 >    }}
2391  
2392      /**
2393 <     * runAfterEitherAsync result completes normally after normal
2470 <     * completion of sources
2393 >     * thenCompose result completes normally after normal completion of source
2394       */
2395 <    public void testRunAfterEitherAsyncE() {
2396 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2397 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2398 <        Noop r = new Noop();
2399 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2400 <        f.complete(one);
2401 <        checkCompletedNormally(g, null);
2402 <        assertTrue(r.ran);
2403 <
2404 <        r = new Noop();
2405 <        f = new CompletableFuture<Integer>();
2406 <        f.complete(one);
2407 <        f2 = new CompletableFuture<Integer>();
2408 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2409 <        checkCompletedNormally(g, null);
2487 <        assertTrue(r.ran);
2488 <    }
2395 >    public void testThenCompose_normalCompletion() {
2396 >        for (ExecutionMode m : ExecutionMode.values())
2397 >        for (boolean createIncomplete : new boolean[] { true, false })
2398 >        for (Integer v1 : new Integer[] { 1, null })
2399 >    {
2400 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2401 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2402 >        if (!createIncomplete) f.complete(v1);
2403 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2404 >        if (createIncomplete) f.complete(v1);
2405 >
2406 >        checkCompletedNormally(g, inc(v1));
2407 >        checkCompletedNormally(f, v1);
2408 >        r.assertInvoked();
2409 >    }}
2410  
2411      /**
2412 <     * runAfterEitherAsync result completes exceptionally after exceptional
2412 >     * thenCompose result completes exceptionally after exceptional
2413       * completion of source
2414       */
2415 <    public void testRunAfterEitherAsync2E() {
2416 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2417 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2418 <        Noop r = new Noop();
2419 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2420 <        f.completeExceptionally(new CFException());
2421 <        checkCompletedWithWrappedCFException(g);
2422 <
2423 <        r = new Noop();
2424 <        f = new CompletableFuture<Integer>();
2425 <        f2 = new CompletableFuture<Integer>();
2426 <        f2.completeExceptionally(new CFException());
2427 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2428 <        f.complete(one);
2429 <        checkCompletedWithWrappedCFException(g);
2509 <    }
2415 >    public void testThenCompose_exceptionalCompletion() {
2416 >        for (ExecutionMode m : ExecutionMode.values())
2417 >        for (boolean createIncomplete : new boolean[] { true, false })
2418 >    {
2419 >        final CFException ex = new CFException();
2420 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2422 >        if (!createIncomplete) f.completeExceptionally(ex);
2423 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2424 >        if (createIncomplete) f.completeExceptionally(ex);
2425 >
2426 >        checkCompletedWithWrappedCFException(g, ex);
2427 >        checkCompletedWithWrappedCFException(f, ex);
2428 >        r.assertNotInvoked();
2429 >    }}
2430  
2431      /**
2432 <     * runAfterEitherAsync result completes exceptionally if action does
2513 <     */
2514 <    public void testRunAfterEitherAsync3E() {
2515 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2516 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2517 <        FailingNoop r = new FailingNoop();
2518 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2519 <        f.complete(one);
2520 <        checkCompletedWithWrappedCFException(g);
2521 <    }
2522 <
2523 <    /**
2524 <     * runAfterEitherAsync result completes exceptionally if either
2525 <     * source cancelled
2432 >     * thenCompose result completes exceptionally if action does
2433       */
2434 <    public void testRunAfterEitherAsync4E() {
2435 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2436 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2437 <        Noop r = new Noop();
2438 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2439 <        assertTrue(f.cancel(true));
2440 <        checkCompletedWithWrappedCancellationException(g);
2434 >    public void testThenCompose_actionFailed() {
2435 >        for (ExecutionMode m : ExecutionMode.values())
2436 >        for (boolean createIncomplete : new boolean[] { true, false })
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >    {
2439 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2440 >        final FailingCompletableFutureFunction r
2441 >            = new FailingCompletableFutureFunction(m);
2442 >        if (!createIncomplete) f.complete(v1);
2443 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2444 >        if (createIncomplete) f.complete(v1);
2445  
2535        r = new Noop();
2536        f = new CompletableFuture<Integer>();
2537        f2 = new CompletableFuture<Integer>();
2538        assertTrue(f2.cancel(true));
2539        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2540        checkCompletedWithWrappedCancellationException(g);
2541    }
2542
2543    /**
2544     * thenComposeAsync result completes normally after normal
2545     * completion of source
2546     */
2547    public void testThenComposeAsyncE() {
2548        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2549        CompletableFutureInc r = new CompletableFutureInc();
2550        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2551        f.complete(one);
2552        checkCompletedNormally(g, two);
2553    }
2554
2555    /**
2556     * thenComposeAsync result completes exceptionally after
2557     * exceptional completion of source
2558     */
2559    public void testThenComposeAsync2E() {
2560        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2561        CompletableFutureInc r = new CompletableFutureInc();
2562        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2563        f.completeExceptionally(new CFException());
2446          checkCompletedWithWrappedCFException(g);
2447 <    }
2447 >        checkCompletedNormally(f, v1);
2448 >    }}
2449  
2450      /**
2451 <     * thenComposeAsync result completes exceptionally if action does
2451 >     * thenCompose result completes exceptionally if source cancelled
2452       */
2453 <    public void testThenComposeAsync3E() {
2454 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2455 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2456 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2457 <        f.complete(one);
2458 <        checkCompletedWithWrappedCFException(g);
2459 <    }
2453 >    public void testThenCompose_sourceCancelled() {
2454 >        for (ExecutionMode m : ExecutionMode.values())
2455 >        for (boolean createIncomplete : new boolean[] { true, false })
2456 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2457 >    {
2458 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2459 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2460 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2461 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2462 >        if (createIncomplete) {
2463 >            checkIncomplete(g);
2464 >            assertTrue(f.cancel(mayInterruptIfRunning));
2465 >        }
2466  
2578    /**
2579     * thenComposeAsync result completes exceptionally if source cancelled
2580     */
2581    public void testThenComposeAsync4E() {
2582        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2583        CompletableFutureInc r = new CompletableFutureInc();
2584        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2585        assertTrue(f.cancel(true));
2467          checkCompletedWithWrappedCancellationException(g);
2468 <    }
2468 >        checkCancelled(f);
2469 >    }}
2470  
2471      // other static methods
2472  
# Line 2593 | Line 2475 | public class CompletableFutureTest exten
2475       * with the value null
2476       */
2477      public void testAllOf_empty() throws Exception {
2478 <        CompletableFuture<?> f = CompletableFuture.allOf();
2478 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2479          checkCompletedNormally(f, null);
2480      }
2481  
2482      /**
2483 <     * allOf returns a future completed when all components complete
2483 >     * allOf returns a future completed normally with the value null
2484 >     * when all components complete normally
2485       */
2486 <    public void testAllOf() throws Exception {
2486 >    public void testAllOf_normal() throws Exception {
2487          for (int k = 1; k < 20; ++k) {
2488 <            CompletableFuture[] fs = new CompletableFuture[k];
2488 >            CompletableFuture<Integer>[] fs
2489 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2490              for (int i = 0; i < k; ++i)
2491 <                fs[i] = new CompletableFuture<Integer>();
2491 >                fs[i] = new CompletableFuture<>();
2492              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2493              for (int i = 0; i < k; ++i) {
2494                  checkIncomplete(f);
2495 +                checkIncomplete(CompletableFuture.allOf(fs));
2496                  fs[i].complete(one);
2497              }
2498              checkCompletedNormally(f, null);
2499 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2500 +        }
2501 +    }
2502 +
2503 +    public void testAllOf_backwards() throws Exception {
2504 +        for (int k = 1; k < 20; ++k) {
2505 +            CompletableFuture<Integer>[] fs
2506 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2507 +            for (int i = 0; i < k; ++i)
2508 +                fs[i] = new CompletableFuture<>();
2509 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2510 +            for (int i = k - 1; i >= 0; i--) {
2511 +                checkIncomplete(f);
2512 +                checkIncomplete(CompletableFuture.allOf(fs));
2513 +                fs[i].complete(one);
2514 +            }
2515 +            checkCompletedNormally(f, null);
2516 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2517          }
2518      }
2519  
# Line 2618 | Line 2521 | public class CompletableFutureTest exten
2521       * anyOf(no component futures) returns an incomplete future
2522       */
2523      public void testAnyOf_empty() throws Exception {
2524 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2524 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
2525          checkIncomplete(f);
2526      }
2527  
2528      /**
2529 <     * anyOf returns a future completed when any components complete
2529 >     * anyOf returns a future completed normally with a value when
2530 >     * a component future does
2531       */
2532 <    public void testAnyOf() throws Exception {
2533 <        for (int k = 1; k < 20; ++k) {
2532 >    public void testAnyOf_normal() throws Exception {
2533 >        for (int k = 0; k < 10; ++k) {
2534              CompletableFuture[] fs = new CompletableFuture[k];
2535              for (int i = 0; i < k; ++i)
2536 <                fs[i] = new CompletableFuture<Integer>();
2536 >                fs[i] = new CompletableFuture<>();
2537              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2538              checkIncomplete(f);
2539              for (int i = 0; i < k; ++i) {
2540                  fs[i].complete(one);
2541                  checkCompletedNormally(f, one);
2542 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2543 +            }
2544 +        }
2545 +    }
2546 +
2547 +    /**
2548 +     * anyOf result completes exceptionally when any component does.
2549 +     */
2550 +    public void testAnyOf_exceptional() throws Exception {
2551 +        for (int k = 0; k < 10; ++k) {
2552 +            CompletableFuture[] fs = new CompletableFuture[k];
2553 +            for (int i = 0; i < k; ++i)
2554 +                fs[i] = new CompletableFuture<>();
2555 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2556 +            checkIncomplete(f);
2557 +            for (int i = 0; i < k; ++i) {
2558 +                fs[i].completeExceptionally(new CFException());
2559 +                checkCompletedWithWrappedCFException(f);
2560 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2561              }
2562          }
2563      }
# Line 2643 | Line 2566 | public class CompletableFutureTest exten
2566       * Completion methods throw NullPointerException with null arguments
2567       */
2568      public void testNPE() {
2569 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2570 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
2569 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2570 >        CompletableFuture<Integer> g = new CompletableFuture<>();
2571          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2572          CompletableFuture<?> h;
2573          ThreadExecutor exec = new ThreadExecutor();
2574  
2575          Runnable[] throwingActions = {
2576 <            () -> { CompletableFuture.supplyAsync(null); },
2577 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2578 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2579 <
2580 <            () -> { CompletableFuture.runAsync(null); },
2581 <            () -> { CompletableFuture.runAsync(null, exec); },
2582 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
2583 <
2584 <            () -> { f.completeExceptionally(null); },
2585 <
2586 <            () -> { f.thenApply(null); },
2587 <            () -> { f.thenApplyAsync(null); },
2588 <            () -> { f.thenApplyAsync((x) -> x, null); },
2589 <            () -> { f.thenApplyAsync(null, exec); },
2590 <
2591 <            () -> { f.thenAccept(null); },
2592 <            () -> { f.thenAcceptAsync(null); },
2593 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2594 <            () -> { f.thenAcceptAsync(null, exec); },
2595 <
2596 <            () -> { f.thenRun(null); },
2597 <            () -> { f.thenRunAsync(null); },
2598 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2599 <            () -> { f.thenRunAsync(null, exec); },
2600 <
2601 <            () -> { f.thenCombine(g, null); },
2602 <            () -> { f.thenCombineAsync(g, null); },
2603 <            () -> { f.thenCombineAsync(g, null, exec); },
2604 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2605 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2606 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2607 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2608 <
2609 <            () -> { f.thenAcceptBoth(g, null); },
2610 <            () -> { f.thenAcceptBothAsync(g, null); },
2611 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
2612 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2613 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2614 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2615 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2616 <
2617 <            () -> { f.runAfterBoth(g, null); },
2618 <            () -> { f.runAfterBothAsync(g, null); },
2619 <            () -> { f.runAfterBothAsync(g, null, exec); },
2620 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2621 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2622 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2623 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2624 <
2625 <            () -> { f.applyToEither(g, null); },
2626 <            () -> { f.applyToEitherAsync(g, null); },
2627 <            () -> { f.applyToEitherAsync(g, null, exec); },
2628 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
2629 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2630 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2631 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2632 <
2633 <            () -> { f.acceptEither(g, null); },
2634 <            () -> { f.acceptEitherAsync(g, null); },
2635 <            () -> { f.acceptEitherAsync(g, null, exec); },
2636 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2637 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2638 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2639 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2640 <
2641 <            () -> { f.runAfterEither(g, null); },
2642 <            () -> { f.runAfterEitherAsync(g, null); },
2643 <            () -> { f.runAfterEitherAsync(g, null, exec); },
2644 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
2645 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
2646 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
2647 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
2648 <
2649 <            () -> { f.thenCompose(null); },
2650 <            () -> { f.thenComposeAsync(null); },
2651 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
2652 <            () -> { f.thenComposeAsync(null, exec); },
2653 <
2654 <            () -> { f.exceptionally(null); },
2655 <
2656 <            () -> { f.handle(null); },
2657 <
2658 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
2659 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
2660 <            () -> { CompletableFuture.allOf(f, null); },
2661 <            () -> { CompletableFuture.allOf(null, f); },
2662 <
2663 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
2664 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
2665 <            () -> { CompletableFuture.anyOf(f, null); },
2666 <            () -> { CompletableFuture.anyOf(null, f); },
2576 >            () -> CompletableFuture.supplyAsync(null),
2577 >            () -> CompletableFuture.supplyAsync(null, exec),
2578 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2579 >
2580 >            () -> CompletableFuture.runAsync(null),
2581 >            () -> CompletableFuture.runAsync(null, exec),
2582 >            () -> CompletableFuture.runAsync(() -> {}, null),
2583 >
2584 >            () -> f.completeExceptionally(null),
2585 >
2586 >            () -> f.thenApply(null),
2587 >            () -> f.thenApplyAsync(null),
2588 >            () -> f.thenApplyAsync((x) -> x, null),
2589 >            () -> f.thenApplyAsync(null, exec),
2590 >
2591 >            () -> f.thenAccept(null),
2592 >            () -> f.thenAcceptAsync(null),
2593 >            () -> f.thenAcceptAsync((x) -> {} , null),
2594 >            () -> f.thenAcceptAsync(null, exec),
2595 >
2596 >            () -> f.thenRun(null),
2597 >            () -> f.thenRunAsync(null),
2598 >            () -> f.thenRunAsync(() -> {} , null),
2599 >            () -> f.thenRunAsync(null, exec),
2600 >
2601 >            () -> f.thenCombine(g, null),
2602 >            () -> f.thenCombineAsync(g, null),
2603 >            () -> f.thenCombineAsync(g, null, exec),
2604 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2605 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2606 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2607 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2608 >
2609 >            () -> f.thenAcceptBoth(g, null),
2610 >            () -> f.thenAcceptBothAsync(g, null),
2611 >            () -> f.thenAcceptBothAsync(g, null, exec),
2612 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2613 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2614 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2615 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2616 >
2617 >            () -> f.runAfterBoth(g, null),
2618 >            () -> f.runAfterBothAsync(g, null),
2619 >            () -> f.runAfterBothAsync(g, null, exec),
2620 >            () -> f.runAfterBoth(nullFuture, () -> {}),
2621 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2622 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2623 >            () -> f.runAfterBothAsync(g, () -> {}, null),
2624 >
2625 >            () -> f.applyToEither(g, null),
2626 >            () -> f.applyToEitherAsync(g, null),
2627 >            () -> f.applyToEitherAsync(g, null, exec),
2628 >            () -> f.applyToEither(nullFuture, (x) -> x),
2629 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2630 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2631 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
2632 >
2633 >            () -> f.acceptEither(g, null),
2634 >            () -> f.acceptEitherAsync(g, null),
2635 >            () -> f.acceptEitherAsync(g, null, exec),
2636 >            () -> f.acceptEither(nullFuture, (x) -> {}),
2637 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
2638 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
2639 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
2640 >
2641 >            () -> f.runAfterEither(g, null),
2642 >            () -> f.runAfterEitherAsync(g, null),
2643 >            () -> f.runAfterEitherAsync(g, null, exec),
2644 >            () -> f.runAfterEither(nullFuture, () -> {}),
2645 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
2646 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
2647 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
2648 >
2649 >            () -> f.thenCompose(null),
2650 >            () -> f.thenComposeAsync(null),
2651 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2652 >            () -> f.thenComposeAsync(null, exec),
2653 >
2654 >            () -> f.exceptionally(null),
2655 >
2656 >            () -> f.handle(null),
2657 >
2658 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
2659 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
2660 >            () -> CompletableFuture.allOf(f, null),
2661 >            () -> CompletableFuture.allOf(null, f),
2662 >
2663 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
2664 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
2665 >            () -> CompletableFuture.anyOf(f, null),
2666 >            () -> CompletableFuture.anyOf(null, f),
2667 >
2668 >            () -> f.obtrudeException(null),
2669          };
2670  
2671          assertThrows(NullPointerException.class, throwingActions);
2672          assertEquals(0, exec.count.get());
2673      }
2674  
2675 +    /**
2676 +     * toCompletableFuture returns this CompletableFuture.
2677 +     */
2678 +    public void testToCompletableFuture() {
2679 +        CompletableFuture<Integer> f = new CompletableFuture<>();
2680 +        assertSame(f, f.toCompletableFuture());
2681 +    }
2682 +
2683 +    /**
2684 +     * whenComplete action executes on normal completion, propagating
2685 +     * source result.
2686 +     */
2687 +    public void testWhenComplete_normalCompletion1() {
2688 +        for (ExecutionMode m : ExecutionMode.values())
2689 +        for (boolean createIncomplete : new boolean[] { true, false })
2690 +        for (Integer v1 : new Integer[] { 1, null })
2691 +    {
2692 +        final AtomicInteger a = new AtomicInteger(0);
2693 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 +        if (!createIncomplete) f.complete(v1);
2695 +        final CompletableFuture<Integer> g = m.whenComplete
2696 +            (f,
2697 +             (Integer x, Throwable t) -> {
2698 +                threadAssertSame(x, v1);
2699 +                threadAssertNull(t);
2700 +                a.getAndIncrement();
2701 +            });
2702 +        if (createIncomplete) f.complete(v1);
2703 +
2704 +        checkCompletedNormally(g, v1);
2705 +        checkCompletedNormally(f, v1);
2706 +        assertEquals(1, a.get());
2707 +    }}
2708 +
2709 +    /**
2710 +     * whenComplete action executes on exceptional completion, propagating
2711 +     * source result.
2712 +     */
2713 +    public void testWhenComplete_exceptionalCompletion() {
2714 +        for (ExecutionMode m : ExecutionMode.values())
2715 +        for (boolean createIncomplete : new boolean[] { true, false })
2716 +        for (Integer v1 : new Integer[] { 1, null })
2717 +    {
2718 +        final AtomicInteger a = new AtomicInteger(0);
2719 +        final CFException ex = new CFException();
2720 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2721 +        if (!createIncomplete) f.completeExceptionally(ex);
2722 +        final CompletableFuture<Integer> g = m.whenComplete
2723 +            (f,
2724 +             (Integer x, Throwable t) -> {
2725 +                threadAssertNull(x);
2726 +                threadAssertSame(t, ex);
2727 +                a.getAndIncrement();
2728 +            });
2729 +        if (createIncomplete) f.completeExceptionally(ex);
2730 +        checkCompletedWithWrappedCFException(f, ex);
2731 +        checkCompletedWithWrappedCFException(g, ex);
2732 +        assertEquals(1, a.get());
2733 +    }}
2734 +
2735 +    /**
2736 +     * whenComplete action executes on cancelled source, propagating
2737 +     * CancellationException.
2738 +     */
2739 +    public void testWhenComplete_sourceCancelled() {
2740 +        for (ExecutionMode m : ExecutionMode.values())
2741 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2742 +        for (boolean createIncomplete : new boolean[] { true, false })
2743 +    {
2744 +        final AtomicInteger a = new AtomicInteger(0);
2745 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2746 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2747 +        final CompletableFuture<Integer> g = m.whenComplete
2748 +            (f,
2749 +             (Integer x, Throwable t) -> {
2750 +                threadAssertNull(x);
2751 +                threadAssertTrue(t instanceof CancellationException);
2752 +                a.getAndIncrement();
2753 +            });
2754 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2755 +
2756 +        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2757 +        checkCompletedWithWrappedCancellationException(g);
2758 +        checkCancelled(f);
2759 +        assertEquals(1, a.get());
2760 +    }}
2761 +
2762 +    /**
2763 +     * If a whenComplete action throws an exception when triggered by
2764 +     * a normal completion, it completes exceptionally
2765 +     */
2766 +    public void testWhenComplete_actionFailed() {
2767 +        for (boolean createIncomplete : new boolean[] { true, false })
2768 +        for (ExecutionMode m : ExecutionMode.values())
2769 +        for (Integer v1 : new Integer[] { 1, null })
2770 +    {
2771 +        final AtomicInteger a = new AtomicInteger(0);
2772 +        final CFException ex = new CFException();
2773 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2774 +        if (!createIncomplete) f.complete(v1);
2775 +        final CompletableFuture<Integer> g = m.whenComplete
2776 +            (f,
2777 +             (Integer x, Throwable t) -> {
2778 +                threadAssertSame(x, v1);
2779 +                threadAssertNull(t);
2780 +                a.getAndIncrement();
2781 +                throw ex;
2782 +            });
2783 +        if (createIncomplete) f.complete(v1);
2784 +        checkCompletedNormally(f, v1);
2785 +        checkCompletedWithWrappedCFException(g, ex);
2786 +        assertEquals(1, a.get());
2787 +    }}
2788 +
2789 +    /**
2790 +     * If a whenComplete action throws an exception when triggered by
2791 +     * a source completion that also throws an exception, the source
2792 +     * exception takes precedence.
2793 +     */
2794 +    public void testWhenComplete_actionFailedSourceFailed() {
2795 +        for (boolean createIncomplete : new boolean[] { true, false })
2796 +        for (ExecutionMode m : ExecutionMode.values())
2797 +        for (Integer v1 : new Integer[] { 1, null })
2798 +    {
2799 +        final AtomicInteger a = new AtomicInteger(0);
2800 +        final CFException ex1 = new CFException();
2801 +        final CFException ex2 = new CFException();
2802 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2803 +
2804 +        if (!createIncomplete) f.completeExceptionally(ex1);
2805 +        final CompletableFuture<Integer> g = m.whenComplete
2806 +            (f,
2807 +             (Integer x, Throwable t) -> {
2808 +                threadAssertSame(t, ex1);
2809 +                threadAssertNull(x);
2810 +                a.getAndIncrement();
2811 +                throw ex2;
2812 +            });
2813 +        if (createIncomplete) f.completeExceptionally(ex1);
2814 +
2815 +        checkCompletedWithWrappedCFException(f, ex1);
2816 +        checkCompletedWithWrappedCFException(g, ex1);
2817 +        assertEquals(1, a.get());
2818 +    }}
2819 +
2820   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines