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.8 by jsr166, Fri Mar 22 22:27:04 2013 UTC vs.
Revision 1.78 by jsr166, Sat Jun 7 23:32:17 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines