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.13 by jsr166, Sun Mar 31 18:17:18 2013 UTC vs.
Revision 1.79 by jsr166, Mon Jun 16 17:08:15 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines