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.31 by jsr166, Mon Sep 9 06:48:27 2013 UTC vs.
Revision 1.100 by jsr166, Thu Jan 15 18:34:19 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines