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.36 by jsr166, Sun Jun 1 23:12:45 2014 UTC vs.
Revision 1.95 by jsr166, Wed Jun 25 15:32:10 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines