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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines