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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines