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.14 by jsr166, Mon Apr 1 20:06:25 2013 UTC vs.
Revision 1.76 by jsr166, Sat Jun 7 21:45:13 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines