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.15 by jsr166, Wed Apr 3 16:59:57 2013 UTC vs.
Revision 1.91 by jsr166, Tue Jun 17 20:34:18 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19 + import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 55 | Line 58 | public class CompletableFutureTest exten
58  
59      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
60          try {
61 +            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
63 +        try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
66          try {
# Line 63 | Line 69 | public class CompletableFutureTest exten
69          try {
70              assertEquals(value, f.get());
71          } catch (Throwable fail) { threadUnexpectedException(fail); }
66        try {
67            assertEquals(value, f.get(0L, SECONDS));
68        } catch (Throwable fail) { threadUnexpectedException(fail); }
72          assertTrue(f.isDone());
73          assertFalse(f.isCancelled());
74 +        assertFalse(f.isCompletedExceptionally());
75          assertTrue(f.toString().contains("[Completed normally]"));
76      }
77  
78      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
79          try {
80 +            f.get(LONG_DELAY_MS, MILLISECONDS);
81 +            shouldThrow();
82 +        } catch (ExecutionException success) {
83 +            assertTrue(success.getCause() instanceof CFException);
84 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
85 +        try {
86              f.join();
87              shouldThrow();
88          } catch (CompletionException success) {
# Line 90 | Line 100 | public class CompletableFutureTest exten
100          } catch (ExecutionException success) {
101              assertTrue(success.getCause() instanceof CFException);
102          } catch (Throwable fail) { threadUnexpectedException(fail); }
103 +        assertTrue(f.isDone());
104 +        assertFalse(f.isCancelled());
105 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
106 +    }
107 +
108 +    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 +                                                      Throwable ex) {
110          try {
111 <            f.get(0L, SECONDS);
111 >            f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
113          } catch (ExecutionException success) {
114 <            assertTrue(success.getCause() instanceof CFException);
114 >            assertSame(ex, success.getCause());
115          } catch (Throwable fail) { threadUnexpectedException(fail); }
116 +        try {
117 +            f.join();
118 +            shouldThrow();
119 +        } catch (CompletionException success) {
120 +            assertSame(ex, success.getCause());
121 +        }
122 +        try {
123 +            f.getNow(null);
124 +            shouldThrow();
125 +        } catch (CompletionException success) {
126 +            assertSame(ex, success.getCause());
127 +        }
128 +        try {
129 +            f.get();
130 +            shouldThrow();
131 +        } catch (ExecutionException success) {
132 +            assertSame(ex, success.getCause());
133 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162 +            f.get(LONG_DELAY_MS, MILLISECONDS);
163 +            shouldThrow();
164 +        } catch (CancellationException success) {
165 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
166 +        try {
167              f.join();
168              shouldThrow();
169          } catch (CancellationException success) {}
# Line 115 | Line 176 | public class CompletableFutureTest exten
176              shouldThrow();
177          } catch (CancellationException success) {
178          } catch (Throwable fail) { threadUnexpectedException(fail); }
118        try {
119            f.get(0L, SECONDS);
120            shouldThrow();
121        } catch (CancellationException success) {
122        } catch (Throwable fail) { threadUnexpectedException(fail); }
179          assertTrue(f.isDone());
180 +        assertTrue(f.isCompletedExceptionally());
181          assertTrue(f.isCancelled());
182          assertTrue(f.toString().contains("[Completed exceptionally]"));
183      }
184  
185      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
186          try {
187 +            f.get(LONG_DELAY_MS, MILLISECONDS);
188 +            shouldThrow();
189 +        } catch (ExecutionException success) {
190 +            assertTrue(success.getCause() instanceof CancellationException);
191 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
192 +        try {
193              f.join();
194              shouldThrow();
195          } catch (CompletionException success) {
# Line 144 | Line 207 | public class CompletableFutureTest exten
207          } catch (ExecutionException success) {
208              assertTrue(success.getCause() instanceof CancellationException);
209          } catch (Throwable fail) { threadUnexpectedException(fail); }
147        try {
148            f.get(0L, SECONDS);
149            shouldThrow();
150        } catch (ExecutionException success) {
151            assertTrue(success.getCause() instanceof CancellationException);
152        } catch (Throwable fail) { threadUnexpectedException(fail); }
210          assertTrue(f.isDone());
211          assertFalse(f.isCancelled());
212 +        assertTrue(f.isCompletedExceptionally());
213          assertTrue(f.toString().contains("[Completed exceptionally]"));
214      }
215  
# Line 160 | Line 218 | public class CompletableFutureTest exten
218       * by methods isDone, isCancelled, and getNow
219       */
220      public void testConstructor() {
221 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
221 >        CompletableFuture<Integer> f = new CompletableFuture<>();
222          checkIncomplete(f);
223      }
224  
# Line 169 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
230 >        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 191 | 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 222 | 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 266 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 282 | Line 373 | public class CompletableFutureTest exten
373          checkCompletedNormally(f, "test");
374      }
375  
376 <    static final Supplier<Integer> supplyOne =
377 <        () -> Integer.valueOf(1);
378 <    static final Function<Integer, Integer> inc =
379 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
380 <    static final BiFunction<Integer, Integer, Integer> add =
381 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() + y.intValue());
382 <    static final class IncAction implements Consumer<Integer> {
383 <        int value;
384 <        public void accept(Integer x) { value = x.intValue() + 1; }
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 >    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 >    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 >        public Integer get() {
406 >            invoked();
407 >            return value;
408 >        }
409 >    }
410 >
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 >    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 >    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 >    // 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 <    static final class AddAction implements BiConsumer<Integer, Integer> {
444 <        int value;
443 >
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 <            value = x.intValue() + y.intValue();
449 >            invoked();
450 >            value = subtract(x, y);
451          }
452      }
453 <    static final class Noop implements Runnable {
454 <        boolean ran;
455 <        public void run() { ran = true; }
453 >
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 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466 >        public void run() {
467 >            invoked();
468 >        }
469      }
470  
471 <    static final class FailingSupplier implements Supplier<Integer> {
472 <        boolean ran;
473 <        public Integer get() { ran = true; throw new CFException(); }
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 <    static final class FailingConsumer implements Consumer<Integer> {
481 <        boolean ran;
482 <        public void accept(Integer x) { ran = true; throw new CFException(); }
480 >
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 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
492 <        boolean ran;
493 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
491 >
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 <    static final class FailingFunction implements Function<Integer, Integer> {
503 <        boolean ran;
504 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
502 >
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 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
514 <        boolean ran;
515 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
513 >
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 <    static final class FailingNoop implements Runnable {
525 <        boolean ran;
526 <        public void run() { ran = true; throw new CFException(); }
524 >
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  
533 <    static final class CompletableFutureInc implements Function<Integer, CompletableFuture<Integer>> {
533 >
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 <            CompletableFuture<Integer> f = new CompletableFuture<Integer>();
540 <            f.complete(Integer.valueOf(x.intValue() + 1));
539 >            invoked();
540 >            value = x;
541 >            CompletableFuture<Integer> f = new CompletableFuture<>();
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
546  
547 <    static final class FailingCompletableFutureFunction implements Function<Integer, CompletableFuture<Integer>> {
548 <        boolean ran;
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 <            ran = true; throw new CFException();
552 >            invoked();
553 >            value = x;
554 >            throw new CFException();
555          }
556      }
557  
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          public void execute(Runnable r) {
567 <            new Thread(r).start();
567 >            count.getAndIncrement();
568 >            new Thread(tg, r).start();
569          }
570      }
571  
572 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
573 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
574 <    }
572 >    /**
573 >     * Permits the testing of parallel code for the 3 different
574 >     * execution modes without copy/pasting all the test methods.
575 >     */
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 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
652 <        boolean ran;
653 <        public Integer apply(Integer x, Throwable t) {
654 <            ran = true;
655 <            return (t == null) ? two : three;
656 <        }
657 <    }
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 >        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 +        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       * exceptionally action completes with function value on source
866 <     * exception;  otherwise with source value
866 >     * exception
867       */
868 <    public void testExceptionally() {
869 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
870 <        ExceptionToInteger r = new ExceptionToInteger();
871 <        CompletableFuture<Integer> g = f.exceptionally(r);
872 <        f.completeExceptionally(new CFException());
873 <        checkCompletedNormally(g, three);
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  
988 <        f = new CompletableFuture<Integer>();
989 <        r = new ExceptionToInteger();
990 <        g = f.exceptionally(r);
991 <        f.complete(one);
381 <        checkCompletedNormally(g, one);
382 <    }
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992  
993      /**
994 <     * handle action completes normally with function value on either
995 <     * normal or exceptional completion of source
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996       */
997 <    public void testHandle() {
998 <        CompletableFuture<Integer> f, g;
999 <        IntegerHandler r;
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 <        f = new CompletableFuture<Integer>();
1083 <        f.completeExceptionally(new CFException());
1084 <        g = f.handle(r = new IntegerHandler());
1085 <        assertTrue(r.ran);
1086 <        checkCompletedNormally(g, three);
1087 <
1088 <        f = new CompletableFuture<Integer>();
1089 <        g = f.handle(r = new IntegerHandler());
1090 <        assertFalse(r.ran);
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedNormally(g, three);
1093 <        assertTrue(r.ran);
1082 >    /**
1083 >     * handle action completes normally with function value on
1084 >     * exceptional completion of source
1085 >     */
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 <        f = new CompletableFuture<Integer>();
1136 <        f.complete(one);
1137 <        g = f.handle(r = new IntegerHandler());
1138 <        assertTrue(r.ran);
409 <        checkCompletedNormally(g, two);
410 <
411 <        f = new CompletableFuture<Integer>();
412 <        g = f.handle(r = new IntegerHandler());
413 <        assertFalse(r.ran);
414 <        f.complete(one);
415 <        assertTrue(r.ran);
416 <        checkCompletedNormally(g, two);
417 <    }
1135 >        checkCompletedNormally(g, v1);
1136 >        checkCancelled(f);
1137 >        assertEquals(1, a.get());
1138 >    }}
1139  
1140      /**
1141 <     * runAsync completes after running Runnable
1141 >     * handle result completes exceptionally if action does
1142       */
1143 <    public void testRunAsync() {
1144 <        Noop r = new Noop();
1145 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1146 <        assertNull(f.join());
1147 <        assertTrue(r.ran);
1148 <        checkCompletedNormally(f, null);
1149 <    }
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 <     * runAsync with executor completes after running Runnable
1194 >     * runAsync completes after running Runnable
1195       */
1196 <    public void testRunAsync2() {
1197 <        Noop r = new Noop();
1198 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, new ThreadExecutor());
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());
437        assertTrue(r.ran);
1206          checkCompletedNormally(f, null);
1207 <    }
1207 >        r.assertInvoked();
1208 >    }}
1209  
1210      /**
1211       * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testRunAsync3() {
1214 <        FailingNoop r = new FailingNoop();
1215 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
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 <        assertTrue(r.ran);
1224 <    }
1223 >        r.assertInvoked();
1224 >    }}
1225  
1226      /**
1227       * supplyAsync completes with result of supplier
1228       */
1229 <    public void testSupplyAsync() {
1230 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne);
1231 <        assertEquals(f.join(), one);
1232 <    }
1233 <
1234 <    /**
1235 <     * supplyAsync with executor completes with result of supplier
1236 <     */
1237 <    public void testSupplyAsync2() {
1238 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1239 <        assertEquals(f.join(), one);
1240 <    }
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       * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testSupplyAsync3() {
1248 <        FailingSupplier r = new FailingSupplier();
1249 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
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 <        assertTrue(r.ran);
1258 <    }
1257 >        r.assertInvoked();
1258 >    }}
1259  
1260      // seq completion methods
1261  
1262      /**
1263       * thenRun result completes normally after normal completion of source
1264       */
1265 <    public void testThenRun() {
1266 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1267 <        Noop r = new Noop();
1268 <        CompletableFuture<Void> g = f.thenRun(r);
1269 <        f.complete(null);
1270 <        checkCompletedNormally(g, null);
1271 <        // reordered version
1272 <        f = new CompletableFuture<Integer>();
1273 <        f.complete(null);
1274 <        r = new Noop();
1275 <        g = f.thenRun(r);
1276 <        checkCompletedNormally(g, null);
1277 <    }
1265 >    public void testThenRun_normalCompletion() {
1266 >        for (ExecutionMode m : ExecutionMode.values())
1267 >        for (Integer v1 : new Integer[] { 1, null })
1268 >    {
1269 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272 >
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290 >        checkCompletedNormally(f, v1);
1291 >        for (Noop r : rs) r.assertInvoked();
1292 >    }}
1293  
1294      /**
1295       * thenRun result completes exceptionally after exceptional
1296       * completion of source
1297       */
1298 <    public void testThenRun2() {
1299 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1300 <        Noop r = new Noop();
1301 <        CompletableFuture<Void> g = f.thenRun(r);
1302 <        f.completeExceptionally(new CFException());
1303 <        checkCompletedWithWrappedCFException(g);
1304 <    }
1298 >    public void testThenRun_exceptionalCompletion() {
1299 >        for (ExecutionMode m : ExecutionMode.values())
1300 >    {
1301 >        final CFException ex = new CFException();
1302 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305 >
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323 >        checkCompletedExceptionally(f, ex);
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325 >    }}
1326  
1327      /**
1328 <     * thenRun result completes exceptionally if action does
1328 >     * thenRun result completes exceptionally if source cancelled
1329       */
1330 <    public void testThenRun3() {
1331 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1332 <        FailingNoop r = new FailingNoop();
1333 <        CompletableFuture<Void> g = f.thenRun(r);
1334 <        f.complete(null);
1335 <        checkCompletedWithWrappedCFException(g);
1336 <    }
1330 >    public void testThenRun_sourceCancelled() {
1331 >        for (ExecutionMode m : ExecutionMode.values())
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 >    {
1334 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337 >
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355 >        checkCancelled(f);
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357 >    }}
1358  
1359      /**
1360 <     * thenRun result completes exceptionally if source cancelled
1360 >     * thenRun result completes exceptionally if action does
1361       */
1362 <    public void testThenRun4() {
1363 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1364 <        Noop r = new Noop();
1365 <        CompletableFuture<Void> g = f.thenRun(r);
1366 <        assertTrue(f.cancel(true));
1367 <        checkCompletedWithWrappedCancellationException(g);
1368 <    }
1362 >    public void testThenRun_actionFailed() {
1363 >        for (ExecutionMode m : ExecutionMode.values())
1364 >        for (Integer v1 : new Integer[] { 1, null })
1365 >    {
1366 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369 >
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        assertTrue(f.complete(v1));
1374 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1375 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1376 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1377 >
1378 >        checkCompletedWithWrappedCFException(h0);
1379 >        checkCompletedWithWrappedCFException(h1);
1380 >        checkCompletedWithWrappedCFException(h2);
1381 >        checkCompletedWithWrappedCFException(h3);
1382 >        checkCompletedWithWrappedCFException(h4);
1383 >        checkCompletedWithWrappedCFException(h5);
1384 >        checkCompletedNormally(f, v1);
1385 >    }}
1386  
1387      /**
1388       * thenApply result completes normally after normal completion of source
1389       */
1390 <    public void testThenApply() {
1391 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1392 <        CompletableFuture<Integer> g = f.thenApply(inc);
1393 <        f.complete(one);
1394 <        checkCompletedNormally(g, two);
1395 <    }
1390 >    public void testThenApply_normalCompletion() {
1391 >        for (ExecutionMode m : ExecutionMode.values())
1392 >        for (Integer v1 : new Integer[] { 1, null })
1393 >    {
1394 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 >        final IncFunction[] rs = new IncFunction[4];
1396 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1397 >
1398 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1399 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1400 >        checkIncomplete(h0);
1401 >        checkIncomplete(h1);
1402 >        assertTrue(f.complete(v1));
1403 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1404 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1405 >
1406 >        checkCompletedNormally(h0, inc(v1));
1407 >        checkCompletedNormally(h1, inc(v1));
1408 >        checkCompletedNormally(h2, inc(v1));
1409 >        checkCompletedNormally(h3, inc(v1));
1410 >        checkCompletedNormally(f, v1);
1411 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1412 >    }}
1413  
1414      /**
1415       * thenApply result completes exceptionally after exceptional
1416       * completion of source
1417       */
1418 <    public void testThenApply2() {
1419 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1420 <        CompletableFuture<Integer> g = f.thenApply(inc);
1421 <        f.completeExceptionally(new CFException());
1422 <        checkCompletedWithWrappedCFException(g);
1423 <    }
1418 >    public void testThenApply_exceptionalCompletion() {
1419 >        for (ExecutionMode m : ExecutionMode.values())
1420 >    {
1421 >        final CFException ex = new CFException();
1422 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 >        final IncFunction[] rs = new IncFunction[4];
1424 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1425 >
1426 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1427 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1428 >        assertTrue(f.completeExceptionally(ex));
1429 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1430 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1431 >
1432 >        checkCompletedWithWrappedException(h0, ex);
1433 >        checkCompletedWithWrappedException(h1, ex);
1434 >        checkCompletedWithWrappedException(h2, ex);
1435 >        checkCompletedWithWrappedException(h3, ex);
1436 >        checkCompletedExceptionally(f, ex);
1437 >        for (IncFunction r : rs) r.assertNotInvoked();
1438 >    }}
1439  
1440      /**
1441 <     * thenApply result completes exceptionally if action does
1441 >     * thenApply result completes exceptionally if source cancelled
1442       */
1443 <    public void testThenApply3() {
1444 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1445 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1446 <        f.complete(one);
1447 <        checkCompletedWithWrappedCFException(g);
1448 <    }
1443 >    public void testThenApply_sourceCancelled() {
1444 >        for (ExecutionMode m : ExecutionMode.values())
1445 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1446 >    {
1447 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 >        final IncFunction[] rs = new IncFunction[4];
1449 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1450 >
1451 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1452 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1453 >        assertTrue(f.cancel(mayInterruptIfRunning));
1454 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1455 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1456 >
1457 >        checkCompletedWithWrappedCancellationException(h0);
1458 >        checkCompletedWithWrappedCancellationException(h1);
1459 >        checkCompletedWithWrappedCancellationException(h2);
1460 >        checkCompletedWithWrappedCancellationException(h3);
1461 >        checkCancelled(f);
1462 >        for (IncFunction r : rs) r.assertNotInvoked();
1463 >    }}
1464  
1465      /**
1466 <     * thenApply result completes exceptionally if source cancelled
1466 >     * thenApply result completes exceptionally if action does
1467       */
1468 <    public void testThenApply4() {
1469 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1470 <        CompletableFuture<Integer> g = f.thenApply(inc);
1471 <        assertTrue(f.cancel(true));
1472 <        checkCompletedWithWrappedCancellationException(g);
1473 <    }
1468 >    public void testThenApply_actionFailed() {
1469 >        for (ExecutionMode m : ExecutionMode.values())
1470 >        for (Integer v1 : new Integer[] { 1, null })
1471 >    {
1472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 >        final FailingFunction[] rs = new FailingFunction[4];
1474 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1475 >
1476 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1477 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1478 >        assertTrue(f.complete(v1));
1479 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1480 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1481 >
1482 >        checkCompletedWithWrappedCFException(h0);
1483 >        checkCompletedWithWrappedCFException(h1);
1484 >        checkCompletedWithWrappedCFException(h2);
1485 >        checkCompletedWithWrappedCFException(h3);
1486 >        checkCompletedNormally(f, v1);
1487 >    }}
1488  
1489      /**
1490       * thenAccept result completes normally after normal completion of source
1491       */
1492 <    public void testThenAccept() {
1493 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1494 <        IncAction r = new IncAction();
1495 <        CompletableFuture<Void> g = f.thenAccept(r);
1496 <        f.complete(one);
1492 >    public void testThenAccept_normalCompletion() {
1493 >        for (ExecutionMode m : ExecutionMode.values())
1494 >        for (boolean createIncomplete : new boolean[] { true, false })
1495 >        for (Integer v1 : new Integer[] { 1, null })
1496 >    {
1497 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1498 >        final NoopConsumer r = new NoopConsumer(m);
1499 >        if (!createIncomplete) assertTrue(f.complete(v1));
1500 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1501 >        if (createIncomplete) {
1502 >            checkIncomplete(g);
1503 >            assertTrue(f.complete(v1));
1504 >        }
1505 >
1506          checkCompletedNormally(g, null);
1507 <        assertEquals(r.value, 2);
1508 <    }
1507 >        r.assertValue(v1);
1508 >        checkCompletedNormally(f, v1);
1509 >    }}
1510  
1511      /**
1512       * thenAccept result completes exceptionally after exceptional
1513       * completion of source
1514       */
1515 <    public void testThenAccept2() {
1516 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1517 <        IncAction r = new IncAction();
1518 <        CompletableFuture<Void> g = f.thenAccept(r);
1519 <        f.completeExceptionally(new CFException());
1520 <        checkCompletedWithWrappedCFException(g);
1521 <    }
1515 >    public void testThenAccept_exceptionalCompletion() {
1516 >        for (ExecutionMode m : ExecutionMode.values())
1517 >        for (boolean createIncomplete : new boolean[] { true, false })
1518 >    {
1519 >        final CFException ex = new CFException();
1520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1521 >        final NoopConsumer r = new NoopConsumer(m);
1522 >        if (!createIncomplete) f.completeExceptionally(ex);
1523 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1524 >        if (createIncomplete) {
1525 >            checkIncomplete(g);
1526 >            f.completeExceptionally(ex);
1527 >        }
1528  
1529 <    /**
1530 <     * thenAccept result completes exceptionally if action does
1531 <     */
1532 <    public void testThenAccept3() {
599 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
600 <        FailingConsumer r = new FailingConsumer();
601 <        CompletableFuture<Void> g = f.thenAccept(r);
602 <        f.complete(one);
603 <        checkCompletedWithWrappedCFException(g);
604 <        assertTrue(r.ran);
605 <    }
1529 >        checkCompletedWithWrappedException(g, ex);
1530 >        checkCompletedExceptionally(f, ex);
1531 >        r.assertNotInvoked();
1532 >    }}
1533  
1534      /**
1535       * thenAccept result completes exceptionally if source cancelled
1536       */
1537 <    public void testThenAccept4() {
1538 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1539 <        IncAction r = new IncAction();
1540 <        CompletableFuture<Void> g = f.thenAccept(r);
1541 <        assertTrue(f.cancel(true));
1537 >    public void testThenAccept_sourceCancelled() {
1538 >        for (ExecutionMode m : ExecutionMode.values())
1539 >        for (boolean createIncomplete : new boolean[] { true, false })
1540 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1541 >    {
1542 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1543 >        final NoopConsumer r = new NoopConsumer(m);
1544 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1545 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1546 >        if (createIncomplete) {
1547 >            checkIncomplete(g);
1548 >            assertTrue(f.cancel(mayInterruptIfRunning));
1549 >        }
1550 >
1551          checkCompletedWithWrappedCancellationException(g);
1552 <    }
1552 >        checkCancelled(f);
1553 >        r.assertNotInvoked();
1554 >    }}
1555 >
1556 >    /**
1557 >     * thenAccept result completes exceptionally if action does
1558 >     */
1559 >    public void testThenAccept_actionFailed() {
1560 >        for (ExecutionMode m : ExecutionMode.values())
1561 >        for (boolean createIncomplete : new boolean[] { true, false })
1562 >        for (Integer v1 : new Integer[] { 1, null })
1563 >    {
1564 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1565 >        final FailingConsumer r = new FailingConsumer(m);
1566 >        if (!createIncomplete) f.complete(v1);
1567 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1568 >        if (createIncomplete) {
1569 >            checkIncomplete(g);
1570 >            f.complete(v1);
1571 >        }
1572  
1573 +        checkCompletedWithWrappedCFException(g);
1574 +        checkCompletedNormally(f, v1);
1575 +    }}
1576  
1577      /**
1578 <     * thenCombine result completes normally after normal completion of sources
1578 >     * thenCombine result completes normally after normal completion
1579 >     * of sources
1580       */
1581 <    public void testThenCombine() {
1582 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1583 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1584 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1585 <        f.complete(one);
1586 <        checkIncomplete(g);
1587 <        f2.complete(two);
1588 <        checkCompletedNormally(g, three);
1589 <
1590 <        f = new CompletableFuture<Integer>();
1591 <        f.complete(one);
1592 <        f2 = new CompletableFuture<Integer>();
1593 <        g = f.thenCombine(f2, add);
1594 <        checkIncomplete(g);
1595 <        f2.complete(two);
1596 <        checkCompletedNormally(g, three);
1597 <    }
1581 >    public void testThenCombine_normalCompletion() {
1582 >        for (ExecutionMode m : ExecutionMode.values())
1583 >        for (boolean fFirst : new boolean[] { true, false })
1584 >        for (Integer v1 : new Integer[] { 1, null })
1585 >        for (Integer v2 : new Integer[] { 2, null })
1586 >    {
1587 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1588 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1589 >        final SubtractFunction r1 = new SubtractFunction(m);
1590 >        final SubtractFunction r2 = new SubtractFunction(m);
1591 >        final SubtractFunction r3 = new SubtractFunction(m);
1592 >
1593 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1594 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1595 >        final Integer w1 =  fFirst ? v1 : v2;
1596 >        final Integer w2 = !fFirst ? v1 : v2;
1597 >
1598 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1599 >        assertTrue(fst.complete(w1));
1600 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1601 >        checkIncomplete(h1);
1602 >        checkIncomplete(h2);
1603 >        r1.assertNotInvoked();
1604 >        r2.assertNotInvoked();
1605 >        assertTrue(snd.complete(w2));
1606 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1607 >
1608 >        checkCompletedNormally(h1, subtract(v1, v2));
1609 >        checkCompletedNormally(h2, subtract(v1, v2));
1610 >        checkCompletedNormally(h3, subtract(v1, v2));
1611 >        r1.assertValue(subtract(v1, v2));
1612 >        r2.assertValue(subtract(v1, v2));
1613 >        r3.assertValue(subtract(v1, v2));
1614 >        checkCompletedNormally(f, v1);
1615 >        checkCompletedNormally(g, v2);
1616 >    }}
1617  
1618      /**
1619       * thenCombine result completes exceptionally after exceptional
1620       * completion of either source
1621       */
1622 <    public void testThenCombine2() {
1623 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1624 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1625 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1626 <        f.completeExceptionally(new CFException());
1627 <        f2.complete(two);
1628 <        checkCompletedWithWrappedCFException(g);
1629 <
1630 <        f = new CompletableFuture<Integer>();
1631 <        f.complete(one);
1632 <        f2 = new CompletableFuture<Integer>();
1633 <        g = f.thenCombine(f2, add);
1634 <        f2.completeExceptionally(new CFException());
1635 <        checkCompletedWithWrappedCFException(g);
1636 <    }
1622 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1623 >        for (ExecutionMode m : ExecutionMode.values())
1624 >        for (boolean fFirst : new boolean[] { true, false })
1625 >        for (boolean failFirst : new boolean[] { true, false })
1626 >        for (Integer v1 : new Integer[] { 1, null })
1627 >    {
1628 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1629 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1630 >        final CFException ex = new CFException();
1631 >        final SubtractFunction r1 = new SubtractFunction(m);
1632 >        final SubtractFunction r2 = new SubtractFunction(m);
1633 >        final SubtractFunction r3 = new SubtractFunction(m);
1634 >
1635 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1636 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1637 >        final Callable<Boolean> complete1 = failFirst ?
1638 >            () -> fst.completeExceptionally(ex) :
1639 >            () -> fst.complete(v1);
1640 >        final Callable<Boolean> complete2 = failFirst ?
1641 >            () -> snd.complete(v1) :
1642 >            () -> snd.completeExceptionally(ex);
1643 >
1644 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1645 >        assertTrue(complete1.call());
1646 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1647 >        checkIncomplete(h1);
1648 >        checkIncomplete(h2);
1649 >        assertTrue(complete2.call());
1650 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1651 >
1652 >        checkCompletedWithWrappedException(h1, ex);
1653 >        checkCompletedWithWrappedException(h2, ex);
1654 >        checkCompletedWithWrappedException(h3, ex);
1655 >        r1.assertNotInvoked();
1656 >        r2.assertNotInvoked();
1657 >        r3.assertNotInvoked();
1658 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1659 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1660 >    }}
1661  
1662      /**
1663 <     * thenCombine result completes exceptionally if action does
1663 >     * thenCombine result completes exceptionally if either source cancelled
1664       */
1665 <    public void testThenCombine3() {
1666 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1667 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1668 <        FailingBiFunction r = new FailingBiFunction();
1669 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1670 <        f.complete(one);
1671 <        checkIncomplete(g);
1672 <        f2.complete(two);
1673 <        checkCompletedWithWrappedCFException(g);
1674 <    }
1665 >    public void testThenCombine_sourceCancelled() throws Throwable {
1666 >        for (ExecutionMode m : ExecutionMode.values())
1667 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1668 >        for (boolean fFirst : new boolean[] { true, false })
1669 >        for (boolean failFirst : new boolean[] { true, false })
1670 >        for (Integer v1 : new Integer[] { 1, null })
1671 >    {
1672 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1673 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1674 >        final SubtractFunction r1 = new SubtractFunction(m);
1675 >        final SubtractFunction r2 = new SubtractFunction(m);
1676 >        final SubtractFunction r3 = new SubtractFunction(m);
1677 >
1678 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1679 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1680 >        final Callable<Boolean> complete1 = failFirst ?
1681 >            () -> fst.cancel(mayInterruptIfRunning) :
1682 >            () -> fst.complete(v1);
1683 >        final Callable<Boolean> complete2 = failFirst ?
1684 >            () -> snd.complete(v1) :
1685 >            () -> snd.cancel(mayInterruptIfRunning);
1686 >
1687 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1688 >        assertTrue(complete1.call());
1689 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1690 >        checkIncomplete(h1);
1691 >        checkIncomplete(h2);
1692 >        assertTrue(complete2.call());
1693 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1694 >
1695 >        checkCompletedWithWrappedCancellationException(h1);
1696 >        checkCompletedWithWrappedCancellationException(h2);
1697 >        checkCompletedWithWrappedCancellationException(h3);
1698 >        r1.assertNotInvoked();
1699 >        r2.assertNotInvoked();
1700 >        r3.assertNotInvoked();
1701 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1702 >        checkCancelled(failFirst ? fst : snd);
1703 >    }}
1704  
1705      /**
1706 <     * thenCombine result completes exceptionally if either source cancelled
1706 >     * thenCombine result completes exceptionally if action does
1707       */
1708 <    public void testThenCombine4() {
1709 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1710 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1711 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1712 <        assertTrue(f.cancel(true));
1713 <        f2.complete(two);
1714 <        checkCompletedWithWrappedCancellationException(g);
1715 <        f = new CompletableFuture<Integer>();
1716 <        f2 = new CompletableFuture<Integer>();
1717 <        g = f.thenCombine(f2, add);
1718 <        f.complete(one);
1719 <        assertTrue(f2.cancel(true));
1720 <        checkCompletedWithWrappedCancellationException(g);
1721 <    }
1708 >    public void testThenCombine_actionFailed() {
1709 >        for (ExecutionMode m : ExecutionMode.values())
1710 >        for (boolean fFirst : new boolean[] { true, false })
1711 >        for (Integer v1 : new Integer[] { 1, null })
1712 >        for (Integer v2 : new Integer[] { 2, null })
1713 >    {
1714 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1715 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1716 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1717 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1718 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1719 >
1720 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1721 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1722 >        final Integer w1 =  fFirst ? v1 : v2;
1723 >        final Integer w2 = !fFirst ? v1 : v2;
1724 >
1725 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1726 >        assertTrue(fst.complete(w1));
1727 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1728 >        assertTrue(snd.complete(w2));
1729 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1730 >
1731 >        checkCompletedWithWrappedCFException(h1);
1732 >        checkCompletedWithWrappedCFException(h2);
1733 >        checkCompletedWithWrappedCFException(h3);
1734 >        r1.assertInvoked();
1735 >        r2.assertInvoked();
1736 >        r3.assertInvoked();
1737 >        checkCompletedNormally(f, v1);
1738 >        checkCompletedNormally(g, v2);
1739 >    }}
1740  
1741      /**
1742       * thenAcceptBoth result completes normally after normal
1743       * completion of sources
1744       */
1745 <    public void testThenAcceptBoth() {
1746 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1747 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1748 <        AddAction r = new AddAction();
1749 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1750 <        f.complete(one);
1751 <        checkIncomplete(g);
1752 <        f2.complete(two);
1753 <        checkCompletedNormally(g, null);
1754 <        assertEquals(r.value, 3);
1755 <
1756 <        r = new AddAction();
1757 <        f = new CompletableFuture<Integer>();
1758 <        f.complete(one);
1759 <        f2 = new CompletableFuture<Integer>();
1760 <        g = f.thenAcceptBoth(f2, r);
1761 <        checkIncomplete(g);
1762 <        f2.complete(two);
1763 <        checkCompletedNormally(g, null);
1764 <        assertEquals(r.value, 3);
1765 <    }
1745 >    public void testThenAcceptBoth_normalCompletion() {
1746 >        for (ExecutionMode m : ExecutionMode.values())
1747 >        for (boolean fFirst : new boolean[] { true, false })
1748 >        for (Integer v1 : new Integer[] { 1, null })
1749 >        for (Integer v2 : new Integer[] { 2, null })
1750 >    {
1751 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1752 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 >        final SubtractAction r1 = new SubtractAction(m);
1754 >        final SubtractAction r2 = new SubtractAction(m);
1755 >        final SubtractAction r3 = new SubtractAction(m);
1756 >
1757 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1758 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1759 >        final Integer w1 =  fFirst ? v1 : v2;
1760 >        final Integer w2 = !fFirst ? v1 : v2;
1761 >
1762 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1763 >        assertTrue(fst.complete(w1));
1764 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1765 >        checkIncomplete(h1);
1766 >        checkIncomplete(h2);
1767 >        r1.assertNotInvoked();
1768 >        r2.assertNotInvoked();
1769 >        assertTrue(snd.complete(w2));
1770 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1771 >
1772 >        checkCompletedNormally(h1, null);
1773 >        checkCompletedNormally(h2, null);
1774 >        checkCompletedNormally(h3, null);
1775 >        r1.assertValue(subtract(v1, v2));
1776 >        r2.assertValue(subtract(v1, v2));
1777 >        r3.assertValue(subtract(v1, v2));
1778 >        checkCompletedNormally(f, v1);
1779 >        checkCompletedNormally(g, v2);
1780 >    }}
1781  
1782      /**
1783       * thenAcceptBoth result completes exceptionally after exceptional
1784       * completion of either source
1785       */
1786 <    public void testThenAcceptBoth2() {
1787 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1788 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1789 <        AddAction r = new AddAction();
1790 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1791 <        f.completeExceptionally(new CFException());
1792 <        f2.complete(two);
1793 <        checkCompletedWithWrappedCFException(g);
1794 <
1795 <        r = new AddAction();
1796 <        f = new CompletableFuture<Integer>();
1797 <        f.complete(one);
1798 <        f2 = new CompletableFuture<Integer>();
1799 <        g = f.thenAcceptBoth(f2, r);
1800 <        f2.completeExceptionally(new CFException());
1801 <        checkCompletedWithWrappedCFException(g);
1802 <    }
1786 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1787 >        for (ExecutionMode m : ExecutionMode.values())
1788 >        for (boolean fFirst : new boolean[] { true, false })
1789 >        for (boolean failFirst : new boolean[] { true, false })
1790 >        for (Integer v1 : new Integer[] { 1, null })
1791 >    {
1792 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1793 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1794 >        final CFException ex = new CFException();
1795 >        final SubtractAction r1 = new SubtractAction(m);
1796 >        final SubtractAction r2 = new SubtractAction(m);
1797 >        final SubtractAction r3 = new SubtractAction(m);
1798 >
1799 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1800 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1801 >        final Callable<Boolean> complete1 = failFirst ?
1802 >            () -> fst.completeExceptionally(ex) :
1803 >            () -> fst.complete(v1);
1804 >        final Callable<Boolean> complete2 = failFirst ?
1805 >            () -> snd.complete(v1) :
1806 >            () -> snd.completeExceptionally(ex);
1807 >
1808 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1809 >        assertTrue(complete1.call());
1810 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1811 >        checkIncomplete(h1);
1812 >        checkIncomplete(h2);
1813 >        assertTrue(complete2.call());
1814 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1815 >
1816 >        checkCompletedWithWrappedException(h1, ex);
1817 >        checkCompletedWithWrappedException(h2, ex);
1818 >        checkCompletedWithWrappedException(h3, ex);
1819 >        r1.assertNotInvoked();
1820 >        r2.assertNotInvoked();
1821 >        r3.assertNotInvoked();
1822 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1823 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1824 >    }}
1825  
1826      /**
1827 <     * thenAcceptBoth result completes exceptionally if action does
1827 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1828       */
1829 <    public void testThenAcceptBoth3() {
1830 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1831 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1832 <        FailingBiConsumer r = new FailingBiConsumer();
1833 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1834 <        f.complete(one);
1835 <        checkIncomplete(g);
1836 <        f2.complete(two);
1837 <        checkCompletedWithWrappedCFException(g);
1838 <    }
1829 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1830 >        for (ExecutionMode m : ExecutionMode.values())
1831 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1832 >        for (boolean fFirst : new boolean[] { true, false })
1833 >        for (boolean failFirst : new boolean[] { true, false })
1834 >        for (Integer v1 : new Integer[] { 1, null })
1835 >    {
1836 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1837 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1838 >        final SubtractAction r1 = new SubtractAction(m);
1839 >        final SubtractAction r2 = new SubtractAction(m);
1840 >        final SubtractAction r3 = new SubtractAction(m);
1841 >
1842 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1843 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1844 >        final Callable<Boolean> complete1 = failFirst ?
1845 >            () -> fst.cancel(mayInterruptIfRunning) :
1846 >            () -> fst.complete(v1);
1847 >        final Callable<Boolean> complete2 = failFirst ?
1848 >            () -> snd.complete(v1) :
1849 >            () -> snd.cancel(mayInterruptIfRunning);
1850 >
1851 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1852 >        assertTrue(complete1.call());
1853 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1854 >        checkIncomplete(h1);
1855 >        checkIncomplete(h2);
1856 >        assertTrue(complete2.call());
1857 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1858 >
1859 >        checkCompletedWithWrappedCancellationException(h1);
1860 >        checkCompletedWithWrappedCancellationException(h2);
1861 >        checkCompletedWithWrappedCancellationException(h3);
1862 >        r1.assertNotInvoked();
1863 >        r2.assertNotInvoked();
1864 >        r3.assertNotInvoked();
1865 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1866 >        checkCancelled(failFirst ? fst : snd);
1867 >    }}
1868  
1869      /**
1870 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1870 >     * thenAcceptBoth result completes exceptionally if action does
1871       */
1872 <    public void testThenAcceptBoth4() {
1873 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1874 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1875 <        AddAction r = new AddAction();
1876 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1877 <        assertTrue(f.cancel(true));
1878 <        f2.complete(two);
1879 <        checkCompletedWithWrappedCancellationException(g);
1880 <        f = new CompletableFuture<Integer>();
1881 <        f2 = new CompletableFuture<Integer>();
1882 <        r = new AddAction();
1883 <        g = f.thenAcceptBoth(f2, r);
1884 <        f.complete(one);
1885 <        assertTrue(f2.cancel(true));
1886 <        checkCompletedWithWrappedCancellationException(g);
1887 <    }
1872 >    public void testThenAcceptBoth_actionFailed() {
1873 >        for (ExecutionMode m : ExecutionMode.values())
1874 >        for (boolean fFirst : new boolean[] { true, false })
1875 >        for (Integer v1 : new Integer[] { 1, null })
1876 >        for (Integer v2 : new Integer[] { 2, null })
1877 >    {
1878 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1879 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1880 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1881 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1882 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1883 >
1884 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1885 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1886 >        final Integer w1 =  fFirst ? v1 : v2;
1887 >        final Integer w2 = !fFirst ? v1 : v2;
1888 >
1889 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1890 >        assertTrue(fst.complete(w1));
1891 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1892 >        assertTrue(snd.complete(w2));
1893 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1894 >
1895 >        checkCompletedWithWrappedCFException(h1);
1896 >        checkCompletedWithWrappedCFException(h2);
1897 >        checkCompletedWithWrappedCFException(h3);
1898 >        r1.assertInvoked();
1899 >        r2.assertInvoked();
1900 >        r3.assertInvoked();
1901 >        checkCompletedNormally(f, v1);
1902 >        checkCompletedNormally(g, v2);
1903 >    }}
1904  
1905      /**
1906       * runAfterBoth result completes normally after normal
1907       * completion of sources
1908       */
1909 <    public void testRunAfterBoth() {
1910 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1911 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1912 <        Noop r = new Noop();
1913 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1914 <        f.complete(one);
1915 <        checkIncomplete(g);
1916 <        f2.complete(two);
1917 <        checkCompletedNormally(g, null);
1918 <        assertTrue(r.ran);
1919 <
1920 <        r = new Noop();
1921 <        f = new CompletableFuture<Integer>();
1922 <        f.complete(one);
1923 <        f2 = new CompletableFuture<Integer>();
1924 <        g = f.runAfterBoth(f2, r);
1925 <        checkIncomplete(g);
1926 <        f2.complete(two);
1927 <        checkCompletedNormally(g, null);
1928 <        assertTrue(r.ran);
1929 <    }
1909 >    public void testRunAfterBoth_normalCompletion() {
1910 >        for (ExecutionMode m : ExecutionMode.values())
1911 >        for (boolean fFirst : new boolean[] { true, false })
1912 >        for (Integer v1 : new Integer[] { 1, null })
1913 >        for (Integer v2 : new Integer[] { 2, null })
1914 >    {
1915 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1916 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1917 >        final Noop r1 = new Noop(m);
1918 >        final Noop r2 = new Noop(m);
1919 >        final Noop r3 = new Noop(m);
1920 >
1921 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1922 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1923 >        final Integer w1 =  fFirst ? v1 : v2;
1924 >        final Integer w2 = !fFirst ? v1 : v2;
1925 >
1926 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1927 >        assertTrue(fst.complete(w1));
1928 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1929 >        checkIncomplete(h1);
1930 >        checkIncomplete(h2);
1931 >        r1.assertNotInvoked();
1932 >        r2.assertNotInvoked();
1933 >        assertTrue(snd.complete(w2));
1934 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1935 >
1936 >        checkCompletedNormally(h1, null);
1937 >        checkCompletedNormally(h2, null);
1938 >        checkCompletedNormally(h3, null);
1939 >        r1.assertInvoked();
1940 >        r2.assertInvoked();
1941 >        r3.assertInvoked();
1942 >        checkCompletedNormally(f, v1);
1943 >        checkCompletedNormally(g, v2);
1944 >    }}
1945  
1946      /**
1947       * runAfterBoth result completes exceptionally after exceptional
1948       * completion of either source
1949       */
1950 <    public void testRunAfterBoth2() {
1951 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1952 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1953 <        Noop r = new Noop();
1954 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1955 <        f.completeExceptionally(new CFException());
1956 <        f2.complete(two);
1957 <        checkCompletedWithWrappedCFException(g);
1958 <
1959 <        r = new Noop();
1960 <        f = new CompletableFuture<Integer>();
1961 <        f.complete(one);
1962 <        f2 = new CompletableFuture<Integer>();
1963 <        g = f.runAfterBoth(f2, r);
1964 <        f2.completeExceptionally(new CFException());
1965 <        checkCompletedWithWrappedCFException(g);
1966 <    }
1950 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1951 >        for (ExecutionMode m : ExecutionMode.values())
1952 >        for (boolean fFirst : new boolean[] { true, false })
1953 >        for (boolean failFirst : new boolean[] { true, false })
1954 >        for (Integer v1 : new Integer[] { 1, null })
1955 >    {
1956 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1957 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1958 >        final CFException ex = new CFException();
1959 >        final Noop r1 = new Noop(m);
1960 >        final Noop r2 = new Noop(m);
1961 >        final Noop r3 = new Noop(m);
1962 >
1963 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1964 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1965 >        final Callable<Boolean> complete1 = failFirst ?
1966 >            () -> fst.completeExceptionally(ex) :
1967 >            () -> fst.complete(v1);
1968 >        final Callable<Boolean> complete2 = failFirst ?
1969 >            () -> snd.complete(v1) :
1970 >            () -> snd.completeExceptionally(ex);
1971 >
1972 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1973 >        assertTrue(complete1.call());
1974 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1975 >        checkIncomplete(h1);
1976 >        checkIncomplete(h2);
1977 >        assertTrue(complete2.call());
1978 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1979 >
1980 >        checkCompletedWithWrappedException(h1, ex);
1981 >        checkCompletedWithWrappedException(h2, ex);
1982 >        checkCompletedWithWrappedException(h3, ex);
1983 >        r1.assertNotInvoked();
1984 >        r2.assertNotInvoked();
1985 >        r3.assertNotInvoked();
1986 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1987 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1988 >    }}
1989  
1990      /**
1991 <     * runAfterBoth result completes exceptionally if action does
1991 >     * runAfterBoth result completes exceptionally if either source cancelled
1992       */
1993 <    public void testRunAfterBoth3() {
1994 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1995 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1996 <        FailingNoop r = new FailingNoop();
1997 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1998 <        f.complete(one);
1999 <        checkIncomplete(g);
2000 <        f2.complete(two);
2001 <        checkCompletedWithWrappedCFException(g);
2002 <    }
1993 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1994 >        for (ExecutionMode m : ExecutionMode.values())
1995 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1996 >        for (boolean fFirst : new boolean[] { true, false })
1997 >        for (boolean failFirst : new boolean[] { true, false })
1998 >        for (Integer v1 : new Integer[] { 1, null })
1999 >    {
2000 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 >        final Noop r1 = new Noop(m);
2003 >        final Noop r2 = new Noop(m);
2004 >        final Noop r3 = new Noop(m);
2005 >
2006 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2007 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2008 >        final Callable<Boolean> complete1 = failFirst ?
2009 >            () -> fst.cancel(mayInterruptIfRunning) :
2010 >            () -> fst.complete(v1);
2011 >        final Callable<Boolean> complete2 = failFirst ?
2012 >            () -> snd.complete(v1) :
2013 >            () -> snd.cancel(mayInterruptIfRunning);
2014 >
2015 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2016 >        assertTrue(complete1.call());
2017 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2018 >        checkIncomplete(h1);
2019 >        checkIncomplete(h2);
2020 >        assertTrue(complete2.call());
2021 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2022 >
2023 >        checkCompletedWithWrappedCancellationException(h1);
2024 >        checkCompletedWithWrappedCancellationException(h2);
2025 >        checkCompletedWithWrappedCancellationException(h3);
2026 >        r1.assertNotInvoked();
2027 >        r2.assertNotInvoked();
2028 >        r3.assertNotInvoked();
2029 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2030 >        checkCancelled(failFirst ? fst : snd);
2031 >    }}
2032  
2033      /**
2034 <     * runAfterBoth result completes exceptionally if either source cancelled
2034 >     * runAfterBoth result completes exceptionally if action does
2035       */
2036 <    public void testRunAfterBoth4() {
2037 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2038 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2039 <        Noop r = new Noop();
2040 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
2041 <        assertTrue(f.cancel(true));
2042 <        f2.complete(two);
2043 <        checkCompletedWithWrappedCancellationException(g);
2044 <        f = new CompletableFuture<Integer>();
2045 <        f2 = new CompletableFuture<Integer>();
2046 <        r = new Noop();
2047 <        g = f.runAfterBoth(f2, r);
2048 <        f.complete(one);
2049 <        assertTrue(f2.cancel(true));
2050 <        checkCompletedWithWrappedCancellationException(g);
2051 <    }
2036 >    public void testRunAfterBoth_actionFailed() {
2037 >        for (ExecutionMode m : ExecutionMode.values())
2038 >        for (boolean fFirst : new boolean[] { true, false })
2039 >        for (Integer v1 : new Integer[] { 1, null })
2040 >        for (Integer v2 : new Integer[] { 2, null })
2041 >    {
2042 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2043 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2044 >        final FailingRunnable r1 = new FailingRunnable(m);
2045 >        final FailingRunnable r2 = new FailingRunnable(m);
2046 >        final FailingRunnable r3 = new FailingRunnable(m);
2047 >
2048 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2049 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2050 >        final Integer w1 =  fFirst ? v1 : v2;
2051 >        final Integer w2 = !fFirst ? v1 : v2;
2052 >
2053 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2054 >        assertTrue(fst.complete(w1));
2055 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2056 >        assertTrue(snd.complete(w2));
2057 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2058 >
2059 >        checkCompletedWithWrappedCFException(h1);
2060 >        checkCompletedWithWrappedCFException(h2);
2061 >        checkCompletedWithWrappedCFException(h3);
2062 >        r1.assertInvoked();
2063 >        r2.assertInvoked();
2064 >        r3.assertInvoked();
2065 >        checkCompletedNormally(f, v1);
2066 >        checkCompletedNormally(g, v2);
2067 >    }}
2068  
2069      /**
2070       * applyToEither result completes normally after normal completion
2071       * of either source
2072       */
2073 <    public void testApplyToEither() {
2074 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2075 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2076 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2077 <        f.complete(one);
2078 <        checkCompletedNormally(g, two);
2079 <        f2.complete(one);
2080 <        checkCompletedNormally(g, two);
2081 <
2082 <        f = new CompletableFuture<Integer>();
2083 <        f.complete(one);
2084 <        f2 = new CompletableFuture<Integer>();
2085 <        g = f.applyToEither(f2, inc);
2086 <        checkCompletedNormally(g, two);
2087 <    }
2073 >    public void testApplyToEither_normalCompletion() {
2074 >        for (ExecutionMode m : ExecutionMode.values())
2075 >        for (Integer v1 : new Integer[] { 1, null })
2076 >        for (Integer v2 : new Integer[] { 2, null })
2077 >    {
2078 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2079 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2080 >        final IncFunction[] rs = new IncFunction[6];
2081 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2082 >
2083 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2084 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2085 >        checkIncomplete(h0);
2086 >        checkIncomplete(h1);
2087 >        rs[0].assertNotInvoked();
2088 >        rs[1].assertNotInvoked();
2089 >        f.complete(v1);
2090 >        checkCompletedNormally(h0, inc(v1));
2091 >        checkCompletedNormally(h1, inc(v1));
2092 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2093 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2094 >        checkCompletedNormally(h2, inc(v1));
2095 >        checkCompletedNormally(h3, inc(v1));
2096 >        g.complete(v2);
2097 >
2098 >        // unspecified behavior - both source completions available
2099 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2100 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2101 >        rs[4].assertValue(h4.join());
2102 >        rs[5].assertValue(h5.join());
2103 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2104 >                   Objects.equals(inc(v2), h4.join()));
2105 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2106 >                   Objects.equals(inc(v2), h5.join()));
2107 >
2108 >        checkCompletedNormally(f, v1);
2109 >        checkCompletedNormally(g, v2);
2110 >        checkCompletedNormally(h0, inc(v1));
2111 >        checkCompletedNormally(h1, inc(v1));
2112 >        checkCompletedNormally(h2, inc(v1));
2113 >        checkCompletedNormally(h3, inc(v1));
2114 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2115 >    }}
2116  
2117      /**
2118       * applyToEither result completes exceptionally after exceptional
2119       * completion of either source
2120       */
2121 <    public void testApplyToEither2() {
2122 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2123 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2124 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2125 <        f.completeExceptionally(new CFException());
2126 <        f2.complete(one);
2127 <        checkCompletedWithWrappedCFException(g);
2121 >    public void testApplyToEither_exceptionalCompletion() {
2122 >        for (ExecutionMode m : ExecutionMode.values())
2123 >        for (Integer v1 : new Integer[] { 1, null })
2124 >    {
2125 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2126 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2127 >        final CFException ex = new CFException();
2128 >        final IncFunction[] rs = new IncFunction[6];
2129 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2130 >
2131 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2132 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2133 >        checkIncomplete(h0);
2134 >        checkIncomplete(h1);
2135 >        rs[0].assertNotInvoked();
2136 >        rs[1].assertNotInvoked();
2137 >        f.completeExceptionally(ex);
2138 >        checkCompletedWithWrappedException(h0, ex);
2139 >        checkCompletedWithWrappedException(h1, ex);
2140 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2141 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2142 >        checkCompletedWithWrappedException(h2, ex);
2143 >        checkCompletedWithWrappedException(h3, ex);
2144 >        g.complete(v1);
2145 >
2146 >        // unspecified behavior - both source completions available
2147 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2148 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2149 >        try {
2150 >            assertEquals(inc(v1), h4.join());
2151 >            rs[4].assertValue(inc(v1));
2152 >        } catch (CompletionException ok) {
2153 >            checkCompletedWithWrappedException(h4, ex);
2154 >            rs[4].assertNotInvoked();
2155 >        }
2156 >        try {
2157 >            assertEquals(inc(v1), h5.join());
2158 >            rs[5].assertValue(inc(v1));
2159 >        } catch (CompletionException ok) {
2160 >            checkCompletedWithWrappedException(h5, ex);
2161 >            rs[5].assertNotInvoked();
2162 >        }
2163  
2164 <        f = new CompletableFuture<Integer>();
2165 <        f2 = new CompletableFuture<Integer>();
2166 <        f2.completeExceptionally(new CFException());
2167 <        g = f.applyToEither(f2, inc);
2168 <        checkCompletedWithWrappedCFException(g);
2169 <    }
2164 >        checkCompletedExceptionally(f, ex);
2165 >        checkCompletedNormally(g, v1);
2166 >        checkCompletedWithWrappedException(h0, ex);
2167 >        checkCompletedWithWrappedException(h1, ex);
2168 >        checkCompletedWithWrappedException(h2, ex);
2169 >        checkCompletedWithWrappedException(h3, ex);
2170 >        checkCompletedWithWrappedException(h4, ex);
2171 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2172 >    }}
2173 >
2174 >    public void testApplyToEither_exceptionalCompletion2() {
2175 >        for (ExecutionMode m : ExecutionMode.values())
2176 >        for (boolean fFirst : new boolean[] { true, false })
2177 >        for (Integer v1 : new Integer[] { 1, null })
2178 >    {
2179 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2180 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2181 >        final CFException ex = new CFException();
2182 >        final IncFunction[] rs = new IncFunction[6];
2183 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2184 >
2185 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2186 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2187 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2188 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2189 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2190 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2191  
2192 <    /**
2193 <     * applyToEither result completes exceptionally if action does
2194 <     */
2195 <    public void testApplyToEither3() {
2196 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2197 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2198 <        FailingFunction r = new FailingFunction();
2199 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2200 <        f2.complete(two);
2201 <        checkCompletedWithWrappedCFException(g);
2202 <    }
2192 >        // unspecified behavior - both source completions available
2193 >        try {
2194 >            assertEquals(inc(v1), h0.join());
2195 >            rs[0].assertValue(inc(v1));
2196 >        } catch (CompletionException ok) {
2197 >            checkCompletedWithWrappedException(h0, ex);
2198 >            rs[0].assertNotInvoked();
2199 >        }
2200 >        try {
2201 >            assertEquals(inc(v1), h1.join());
2202 >            rs[1].assertValue(inc(v1));
2203 >        } catch (CompletionException ok) {
2204 >            checkCompletedWithWrappedException(h1, ex);
2205 >            rs[1].assertNotInvoked();
2206 >        }
2207 >        try {
2208 >            assertEquals(inc(v1), h2.join());
2209 >            rs[2].assertValue(inc(v1));
2210 >        } catch (CompletionException ok) {
2211 >            checkCompletedWithWrappedException(h2, ex);
2212 >            rs[2].assertNotInvoked();
2213 >        }
2214 >        try {
2215 >            assertEquals(inc(v1), h3.join());
2216 >            rs[3].assertValue(inc(v1));
2217 >        } catch (CompletionException ok) {
2218 >            checkCompletedWithWrappedException(h3, ex);
2219 >            rs[3].assertNotInvoked();
2220 >        }
2221  
2222 <    /**
2223 <     * applyToEither result completes exceptionally if either source cancelled
2224 <     */
910 <    public void testApplyToEither4() {
911 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
912 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
913 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
914 <        assertTrue(f.cancel(true));
915 <        checkCompletedWithWrappedCancellationException(g);
916 <        f = new CompletableFuture<Integer>();
917 <        f2 = new CompletableFuture<Integer>();
918 <        assertTrue(f2.cancel(true));
919 <        checkCompletedWithWrappedCancellationException(g);
920 <    }
2222 >        checkCompletedNormally(f, v1);
2223 >        checkCompletedExceptionally(g, ex);
2224 >    }}
2225  
2226      /**
2227 <     * acceptEither result completes normally after normal completion
924 <     * of either source
2227 >     * applyToEither result completes exceptionally if either source cancelled
2228       */
2229 <    public void testAcceptEither() {
2230 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2231 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2232 <        IncAction r = new IncAction();
2233 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2234 <        f.complete(one);
2235 <        checkCompletedNormally(g, null);
2236 <        f2.complete(one);
2237 <        checkCompletedNormally(g, null);
2238 <        assertEquals(r.value, 2);
2239 <
2240 <        r = new IncAction();
2241 <        f = new CompletableFuture<Integer>();
2242 <        f.complete(one);
2243 <        f2 = new CompletableFuture<Integer>();
2244 <        g = f.acceptEither(f2, r);
2245 <        checkCompletedNormally(g, null);
2246 <        assertEquals(r.value, 2);
2247 <    }
2229 >    public void testApplyToEither_sourceCancelled() {
2230 >        for (ExecutionMode m : ExecutionMode.values())
2231 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2232 >        for (Integer v1 : new Integer[] { 1, null })
2233 >    {
2234 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2235 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2236 >        final IncFunction[] rs = new IncFunction[6];
2237 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2238 >
2239 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2240 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2241 >        checkIncomplete(h0);
2242 >        checkIncomplete(h1);
2243 >        rs[0].assertNotInvoked();
2244 >        rs[1].assertNotInvoked();
2245 >        f.cancel(mayInterruptIfRunning);
2246 >        checkCompletedWithWrappedCancellationException(h0);
2247 >        checkCompletedWithWrappedCancellationException(h1);
2248 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2249 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2250 >        checkCompletedWithWrappedCancellationException(h2);
2251 >        checkCompletedWithWrappedCancellationException(h3);
2252 >        g.complete(v1);
2253 >
2254 >        // unspecified behavior - both source completions available
2255 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2256 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2257 >        try {
2258 >            assertEquals(inc(v1), h4.join());
2259 >            rs[4].assertValue(inc(v1));
2260 >        } catch (CompletionException ok) {
2261 >            checkCompletedWithWrappedCancellationException(h4);
2262 >            rs[4].assertNotInvoked();
2263 >        }
2264 >        try {
2265 >            assertEquals(inc(v1), h5.join());
2266 >            rs[5].assertValue(inc(v1));
2267 >        } catch (CompletionException ok) {
2268 >            checkCompletedWithWrappedCancellationException(h5);
2269 >            rs[5].assertNotInvoked();
2270 >        }
2271  
2272 <    /**
2273 <     * acceptEither result completes exceptionally after exceptional
2274 <     * completion of either source
2275 <     */
2276 <    public void testAcceptEither2() {
2277 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2278 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2279 <        IncAction r = new IncAction();
2280 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2281 <        f.completeExceptionally(new CFException());
2282 <        f2.complete(one);
2283 <        checkCompletedWithWrappedCFException(g);
2272 >        checkCancelled(f);
2273 >        checkCompletedNormally(g, v1);
2274 >        checkCompletedWithWrappedCancellationException(h0);
2275 >        checkCompletedWithWrappedCancellationException(h1);
2276 >        checkCompletedWithWrappedCancellationException(h2);
2277 >        checkCompletedWithWrappedCancellationException(h3);
2278 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2279 >    }}
2280 >
2281 >    public void testApplyToEither_sourceCancelled2() {
2282 >        for (ExecutionMode m : ExecutionMode.values())
2283 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2284 >        for (boolean fFirst : new boolean[] { true, false })
2285 >        for (Integer v1 : new Integer[] { 1, null })
2286 >    {
2287 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2288 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2289 >        final IncFunction[] rs = new IncFunction[6];
2290 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2291 >
2292 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2293 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2294 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2295 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2296 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2297 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2298  
2299 <        r = new IncAction();
2300 <        f = new CompletableFuture<Integer>();
2301 <        f2 = new CompletableFuture<Integer>();
2302 <        f2.completeExceptionally(new CFException());
2303 <        g = f.acceptEither(f2, r);
2304 <        checkCompletedWithWrappedCFException(g);
2305 <    }
2299 >        // unspecified behavior - both source completions available
2300 >        try {
2301 >            assertEquals(inc(v1), h0.join());
2302 >            rs[0].assertValue(inc(v1));
2303 >        } catch (CompletionException ok) {
2304 >            checkCompletedWithWrappedCancellationException(h0);
2305 >            rs[0].assertNotInvoked();
2306 >        }
2307 >        try {
2308 >            assertEquals(inc(v1), h1.join());
2309 >            rs[1].assertValue(inc(v1));
2310 >        } catch (CompletionException ok) {
2311 >            checkCompletedWithWrappedCancellationException(h1);
2312 >            rs[1].assertNotInvoked();
2313 >        }
2314 >        try {
2315 >            assertEquals(inc(v1), h2.join());
2316 >            rs[2].assertValue(inc(v1));
2317 >        } catch (CompletionException ok) {
2318 >            checkCompletedWithWrappedCancellationException(h2);
2319 >            rs[2].assertNotInvoked();
2320 >        }
2321 >        try {
2322 >            assertEquals(inc(v1), h3.join());
2323 >            rs[3].assertValue(inc(v1));
2324 >        } catch (CompletionException ok) {
2325 >            checkCompletedWithWrappedCancellationException(h3);
2326 >            rs[3].assertNotInvoked();
2327 >        }
2328  
2329 <    /**
2330 <     * acceptEither result completes exceptionally if action does
2331 <     */
970 <    public void testAcceptEither3() {
971 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
972 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
973 <        FailingConsumer r = new FailingConsumer();
974 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
975 <        f2.complete(two);
976 <        checkCompletedWithWrappedCFException(g);
977 <    }
2329 >        checkCompletedNormally(f, v1);
2330 >        checkCancelled(g);
2331 >    }}
2332  
2333      /**
2334 <     * acceptEither result completes exceptionally if either source cancelled
2334 >     * applyToEither result completes exceptionally if action does
2335       */
2336 <    public void testAcceptEither4() {
2337 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2338 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2339 <        IncAction r = new IncAction();
2340 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2341 <        assertTrue(f.cancel(true));
2342 <        checkCompletedWithWrappedCancellationException(g);
2343 <        f = new CompletableFuture<Integer>();
2344 <        f2 = new CompletableFuture<Integer>();
2345 <        assertTrue(f2.cancel(true));
2346 <        checkCompletedWithWrappedCancellationException(g);
2347 <    }
2348 <
2336 >    public void testApplyToEither_actionFailed() {
2337 >        for (ExecutionMode m : ExecutionMode.values())
2338 >        for (Integer v1 : new Integer[] { 1, null })
2339 >        for (Integer v2 : new Integer[] { 2, null })
2340 >    {
2341 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2342 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2343 >        final FailingFunction[] rs = new FailingFunction[6];
2344 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2345 >
2346 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2347 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2348 >        f.complete(v1);
2349 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2350 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2351 >        checkCompletedWithWrappedCFException(h0);
2352 >        checkCompletedWithWrappedCFException(h1);
2353 >        checkCompletedWithWrappedCFException(h2);
2354 >        checkCompletedWithWrappedCFException(h3);
2355 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2356 >
2357 >        g.complete(v2);
2358 >
2359 >        // unspecified behavior - both source completions available
2360 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2361 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2362 >
2363 >        checkCompletedWithWrappedCFException(h4);
2364 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2365 >                   Objects.equals(v2, rs[4].value));
2366 >        checkCompletedWithWrappedCFException(h5);
2367 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2368 >                   Objects.equals(v2, rs[5].value));
2369 >
2370 >        checkCompletedNormally(f, v1);
2371 >        checkCompletedNormally(g, v2);
2372 >    }}
2373  
2374      /**
2375 <     * runAfterEither result completes normally after normal completion
2375 >     * acceptEither result completes normally after normal completion
2376       * of either source
2377       */
2378 <    public void testRunAfterEither() {
2379 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2380 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2381 <        Noop r = new Noop();
2382 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2383 <        f.complete(one);
2384 <        checkCompletedNormally(g, null);
2385 <        f2.complete(one);
2386 <        checkCompletedNormally(g, null);
2387 <        assertTrue(r.ran);
2388 <
2389 <        r = new Noop();
2390 <        f = new CompletableFuture<Integer>();
2391 <        f.complete(one);
2392 <        f2 = new CompletableFuture<Integer>();
2393 <        g = f.runAfterEither(f2, r);
2394 <        checkCompletedNormally(g, null);
2395 <        assertTrue(r.ran);
2396 <    }
2378 >    public void testAcceptEither_normalCompletion() {
2379 >        for (ExecutionMode m : ExecutionMode.values())
2380 >        for (Integer v1 : new Integer[] { 1, null })
2381 >        for (Integer v2 : new Integer[] { 2, null })
2382 >    {
2383 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2384 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2385 >        final NoopConsumer[] rs = new NoopConsumer[6];
2386 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2387 >
2388 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2389 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2390 >        checkIncomplete(h0);
2391 >        checkIncomplete(h1);
2392 >        rs[0].assertNotInvoked();
2393 >        rs[1].assertNotInvoked();
2394 >        f.complete(v1);
2395 >        checkCompletedNormally(h0, null);
2396 >        checkCompletedNormally(h1, null);
2397 >        rs[0].assertValue(v1);
2398 >        rs[1].assertValue(v1);
2399 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2400 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2401 >        checkCompletedNormally(h2, null);
2402 >        checkCompletedNormally(h3, null);
2403 >        rs[2].assertValue(v1);
2404 >        rs[3].assertValue(v1);
2405 >        g.complete(v2);
2406 >
2407 >        // unspecified behavior - both source completions available
2408 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2409 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2410 >        checkCompletedNormally(h4, null);
2411 >        checkCompletedNormally(h5, null);
2412 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2413 >                   Objects.equals(v2, rs[4].value));
2414 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2415 >                   Objects.equals(v2, rs[5].value));
2416 >
2417 >        checkCompletedNormally(f, v1);
2418 >        checkCompletedNormally(g, v2);
2419 >        checkCompletedNormally(h0, null);
2420 >        checkCompletedNormally(h1, null);
2421 >        checkCompletedNormally(h2, null);
2422 >        checkCompletedNormally(h3, null);
2423 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2424 >    }}
2425  
2426      /**
2427 <     * runAfterEither result completes exceptionally after exceptional
2427 >     * acceptEither result completes exceptionally after exceptional
2428       * completion of either source
2429       */
2430 <    public void testRunAfterEither2() {
2431 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2432 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2433 <        Noop r = new Noop();
2434 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2435 <        f.completeExceptionally(new CFException());
2436 <        f2.complete(one);
2437 <        checkCompletedWithWrappedCFException(g);
2438 <
2439 <        r = new Noop();
2440 <        f = new CompletableFuture<Integer>();
2441 <        f2 = new CompletableFuture<Integer>();
2442 <        f2.completeExceptionally(new CFException());
2443 <        g = f.runAfterEither(f2, r);
2444 <        checkCompletedWithWrappedCFException(g);
2445 <    }
2446 <
2447 <    /**
2448 <     * runAfterEither result completes exceptionally if action does
2449 <     */
2450 <    public void testRunAfterEither3() {
2451 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2452 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2453 <        FailingNoop r = new FailingNoop();
2454 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2455 <        f2.complete(two);
2456 <        checkCompletedWithWrappedCFException(g);
2457 <    }
2458 <
1053 <    /**
1054 <     * runAfterEither result completes exceptionally if either source cancelled
1055 <     */
1056 <    public void testRunAfterEither4() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1058 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1059 <        Noop r = new Noop();
1060 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1061 <        assertTrue(f.cancel(true));
1062 <        checkCompletedWithWrappedCancellationException(g);
1063 <        f = new CompletableFuture<Integer>();
1064 <        f2 = new CompletableFuture<Integer>();
1065 <        assertTrue(f2.cancel(true));
1066 <        checkCompletedWithWrappedCancellationException(g);
1067 <    }
1068 <
1069 <    /**
1070 <     * thenCompose result completes normally after normal completion of source
1071 <     */
1072 <    public void testThenCompose() {
1073 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1074 <        CompletableFutureInc r = new CompletableFutureInc();
1075 <        CompletableFuture<Integer> g = f.thenCompose(r);
1076 <        f.complete(one);
1077 <        checkCompletedNormally(g, two);
1078 <    }
1079 <
1080 <    /**
1081 <     * thenCompose result completes exceptionally after exceptional
1082 <     * completion of source
1083 <     */
1084 <    public void testThenCompose2() {
1085 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1086 <        CompletableFutureInc r = new CompletableFutureInc();
1087 <        CompletableFuture<Integer> g = f.thenCompose(r);
1088 <        f.completeExceptionally(new CFException());
1089 <        checkCompletedWithWrappedCFException(g);
1090 <    }
1091 <
1092 <    /**
1093 <     * thenCompose result completes exceptionally if action does
1094 <     */
1095 <    public void testThenCompose3() {
1096 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1097 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1098 <        CompletableFuture<Integer> g = f.thenCompose(r);
1099 <        f.complete(one);
1100 <        checkCompletedWithWrappedCFException(g);
1101 <    }
1102 <
1103 <    /**
1104 <     * thenCompose result completes exceptionally if source cancelled
1105 <     */
1106 <    public void testThenCompose4() {
1107 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1108 <        CompletableFutureInc r = new CompletableFutureInc();
1109 <        CompletableFuture<Integer> g = f.thenCompose(r);
1110 <        assertTrue(f.cancel(true));
1111 <        checkCompletedWithWrappedCancellationException(g);
1112 <    }
1113 <
1114 <
1115 <    // asyncs
1116 <
1117 <    /**
1118 <     * thenRunAsync result completes normally after normal completion of source
1119 <     */
1120 <    public void testThenRunAsync() {
1121 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1122 <        Noop r = new Noop();
1123 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1124 <        f.complete(null);
1125 <        checkCompletedNormally(g, null);
1126 <
1127 <        // reordered version
1128 <        f = new CompletableFuture<Integer>();
1129 <        f.complete(null);
1130 <        r = new Noop();
1131 <        g = f.thenRunAsync(r);
1132 <        checkCompletedNormally(g, null);
1133 <    }
1134 <
1135 <    /**
1136 <     * thenRunAsync result completes exceptionally after exceptional
1137 <     * completion of source
1138 <     */
1139 <    public void testThenRunAsync2() {
1140 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1141 <        Noop r = new Noop();
1142 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1143 <        f.completeExceptionally(new CFException());
2430 >    public void testAcceptEither_exceptionalCompletion() {
2431 >        for (ExecutionMode m : ExecutionMode.values())
2432 >        for (Integer v1 : new Integer[] { 1, null })
2433 >    {
2434 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2435 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2436 >        final CFException ex = new CFException();
2437 >        final NoopConsumer[] rs = new NoopConsumer[6];
2438 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2439 >
2440 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2441 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2442 >        checkIncomplete(h0);
2443 >        checkIncomplete(h1);
2444 >        rs[0].assertNotInvoked();
2445 >        rs[1].assertNotInvoked();
2446 >        f.completeExceptionally(ex);
2447 >        checkCompletedWithWrappedException(h0, ex);
2448 >        checkCompletedWithWrappedException(h1, ex);
2449 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2450 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2451 >        checkCompletedWithWrappedException(h2, ex);
2452 >        checkCompletedWithWrappedException(h3, ex);
2453 >
2454 >        g.complete(v1);
2455 >
2456 >        // unspecified behavior - both source completions available
2457 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2458 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2459          try {
2460 <            g.join();
2461 <            shouldThrow();
2462 <        } catch (Exception ok) {
2460 >            assertNull(h4.join());
2461 >            rs[4].assertValue(v1);
2462 >        } catch (CompletionException ok) {
2463 >            checkCompletedWithWrappedException(h4, ex);
2464 >            rs[4].assertNotInvoked();
2465          }
1149        checkCompletedWithWrappedCFException(g);
1150    }
1151
1152    /**
1153     * thenRunAsync result completes exceptionally if action does
1154     */
1155    public void testThenRunAsync3() {
1156        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1157        FailingNoop r = new FailingNoop();
1158        CompletableFuture<Void> g = f.thenRunAsync(r);
1159        f.complete(null);
1160        checkCompletedWithWrappedCFException(g);
1161    }
1162
1163    /**
1164     * thenRunAsync result completes exceptionally if source cancelled
1165     */
1166    public void testThenRunAsync4() {
1167        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1168        Noop r = new Noop();
1169        CompletableFuture<Void> g = f.thenRunAsync(r);
1170        assertTrue(f.cancel(true));
1171        checkCompletedWithWrappedCancellationException(g);
1172    }
1173
1174    /**
1175     * thenApplyAsync result completes normally after normal completion of source
1176     */
1177    public void testThenApplyAsync() {
1178        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1179        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1180        f.complete(one);
1181        checkCompletedNormally(g, two);
1182    }
1183
1184    /**
1185     * thenApplyAsync result completes exceptionally after exceptional
1186     * completion of source
1187     */
1188    public void testThenApplyAsync2() {
1189        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1190        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1191        f.completeExceptionally(new CFException());
1192        checkCompletedWithWrappedCFException(g);
1193    }
1194
1195    /**
1196     * thenApplyAsync result completes exceptionally if action does
1197     */
1198    public void testThenApplyAsync3() {
1199        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1200        FailingFunction r = new FailingFunction();
1201        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1202        f.complete(null);
1203        checkCompletedWithWrappedCFException(g);
1204    }
1205
1206    /**
1207     * thenApplyAsync result completes exceptionally if source cancelled
1208     */
1209    public void testThenApplyAsync4() {
1210        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1211        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1212        assertTrue(f.cancel(true));
1213        checkCompletedWithWrappedCancellationException(g);
1214    }
1215
1216    /**
1217     * thenAcceptAsync result completes normally after normal
1218     * completion of source
1219     */
1220    public void testThenAcceptAsync() {
1221        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1222        IncAction r = new IncAction();
1223        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1224        f.complete(one);
1225        checkCompletedNormally(g, null);
1226        assertEquals(r.value, 2);
1227    }
1228
1229    /**
1230     * thenAcceptAsync result completes exceptionally after exceptional
1231     * completion of source
1232     */
1233    public void testThenAcceptAsync2() {
1234        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1235        IncAction r = new IncAction();
1236        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1237        f.completeExceptionally(new CFException());
1238        checkCompletedWithWrappedCFException(g);
1239    }
1240
1241    /**
1242     * thenAcceptAsync result completes exceptionally if action does
1243     */
1244    public void testThenAcceptAsync3() {
1245        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1246        FailingConsumer r = new FailingConsumer();
1247        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1248        f.complete(null);
1249        checkCompletedWithWrappedCFException(g);
1250    }
1251
1252    /**
1253     * thenAcceptAsync result completes exceptionally if source cancelled
1254     */
1255    public void testThenAcceptAsync4() {
1256        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1257        IncAction r = new IncAction();
1258        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1259        assertTrue(f.cancel(true));
1260        checkCompletedWithWrappedCancellationException(g);
1261    }
1262    /**
1263     * thenCombineAsync result completes normally after normal
1264     * completion of sources
1265     */
1266    public void testThenCombineAsync() {
1267        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1268        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1269        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1270        f.complete(one);
1271        checkIncomplete(g);
1272        f2.complete(two);
1273        checkCompletedNormally(g, three);
1274    }
1275
1276    /**
1277     * thenCombineAsync result completes exceptionally after exceptional
1278     * completion of source
1279     */
1280    public void testThenCombineAsync2() {
1281        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1282        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1283        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1284        f.completeExceptionally(new CFException());
1285        f2.complete(two);
1286        checkCompletedWithWrappedCFException(g);
1287
1288        f = new CompletableFuture<Integer>();
1289        f2 = new CompletableFuture<Integer>();
1290        g = f.thenCombineAsync(f2, add);
1291        f.complete(one);
1292        f2.completeExceptionally(new CFException());
1293        checkCompletedWithWrappedCFException(g);
1294    }
1295
1296    /**
1297     * thenCombineAsync result completes exceptionally if action does
1298     */
1299    public void testThenCombineAsync3() {
1300        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1301        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1302        FailingBiFunction r = new FailingBiFunction();
1303        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1304        f.complete(one);
1305        checkIncomplete(g);
1306        f2.complete(two);
1307        checkCompletedWithWrappedCFException(g);
1308    }
1309
1310    /**
1311     * thenCombineAsync result completes exceptionally if either source cancelled
1312     */
1313    public void testThenCombineAsync4() {
1314        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1315        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1316        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1317        assertTrue(f.cancel(true));
1318        f2.complete(two);
1319        checkCompletedWithWrappedCancellationException(g);
1320
1321        f = new CompletableFuture<Integer>();
1322        f2 = new CompletableFuture<Integer>();
1323        g = f.thenCombineAsync(f2, add);
1324        f.complete(one);
1325        assertTrue(f2.cancel(true));
1326        checkCompletedWithWrappedCancellationException(g);
1327    }
1328
1329    /**
1330     * thenAcceptBothAsync result completes normally after normal
1331     * completion of sources
1332     */
1333    public void testThenAcceptBothAsync() {
1334        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1335        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1336        AddAction r = new AddAction();
1337        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1338        f.complete(one);
1339        checkIncomplete(g);
1340        f2.complete(two);
1341        checkCompletedNormally(g, null);
1342        assertEquals(r.value, 3);
1343    }
1344
1345    /**
1346     * thenAcceptBothAsync result completes exceptionally after exceptional
1347     * completion of source
1348     */
1349    public void testThenAcceptBothAsync2() {
1350        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1351        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1352        AddAction r = new AddAction();
1353        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1354        f.completeExceptionally(new CFException());
1355        f2.complete(two);
1356        checkCompletedWithWrappedCFException(g);
1357
1358        r = new AddAction();
1359        f = new CompletableFuture<Integer>();
1360        f2 = new CompletableFuture<Integer>();
1361        g = f.thenAcceptBothAsync(f2, r);
1362        f.complete(one);
1363        f2.completeExceptionally(new CFException());
1364        checkCompletedWithWrappedCFException(g);
1365    }
1366
1367    /**
1368     * thenAcceptBothAsync result completes exceptionally if action does
1369     */
1370    public void testThenAcceptBothAsync3() {
1371        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1372        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1373        FailingBiConsumer r = new FailingBiConsumer();
1374        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1375        f.complete(one);
1376        checkIncomplete(g);
1377        f2.complete(two);
1378        checkCompletedWithWrappedCFException(g);
1379    }
1380
1381    /**
1382     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1383     */
1384    public void testThenAcceptBothAsync4() {
1385        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1386        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1387        AddAction r = new AddAction();
1388        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1389        assertTrue(f.cancel(true));
1390        f2.complete(two);
1391        checkCompletedWithWrappedCancellationException(g);
1392
1393        r = new AddAction();
1394        f = new CompletableFuture<Integer>();
1395        f2 = new CompletableFuture<Integer>();
1396        g = f.thenAcceptBothAsync(f2, r);
1397        f.complete(one);
1398        assertTrue(f2.cancel(true));
1399        checkCompletedWithWrappedCancellationException(g);
1400    }
1401
1402    /**
1403     * runAfterBothAsync result completes normally after normal
1404     * completion of sources
1405     */
1406    public void testRunAfterBothAsync() {
1407        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1408        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1409        Noop r = new Noop();
1410        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1411        f.complete(one);
1412        checkIncomplete(g);
1413        f2.complete(two);
1414        checkCompletedNormally(g, null);
1415        assertTrue(r.ran);
1416    }
1417
1418    /**
1419     * runAfterBothAsync result completes exceptionally after exceptional
1420     * completion of source
1421     */
1422    public void testRunAfterBothAsync2() {
1423        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1424        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1425        Noop r = new Noop();
1426        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1427        f.completeExceptionally(new CFException());
1428        f2.complete(two);
1429        checkCompletedWithWrappedCFException(g);
1430
1431        r = new Noop();
1432        f = new CompletableFuture<Integer>();
1433        f2 = new CompletableFuture<Integer>();
1434        g = f.runAfterBothAsync(f2, r);
1435        f.complete(one);
1436        f2.completeExceptionally(new CFException());
1437        checkCompletedWithWrappedCFException(g);
1438    }
1439
1440    /**
1441     * runAfterBothAsync result completes exceptionally if action does
1442     */
1443    public void testRunAfterBothAsync3() {
1444        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1445        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1446        FailingNoop r = new FailingNoop();
1447        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1448        f.complete(one);
1449        checkIncomplete(g);
1450        f2.complete(two);
1451        checkCompletedWithWrappedCFException(g);
1452    }
1453
1454    /**
1455     * runAfterBothAsync result completes exceptionally if either source cancelled
1456     */
1457    public void testRunAfterBothAsync4() {
1458        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1459        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1460        Noop r = new Noop();
1461        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1462        assertTrue(f.cancel(true));
1463        f2.complete(two);
1464        checkCompletedWithWrappedCancellationException(g);
1465
1466        r = new Noop();
1467        f = new CompletableFuture<Integer>();
1468        f2 = new CompletableFuture<Integer>();
1469        g = f.runAfterBothAsync(f2, r);
1470        f.complete(one);
1471        assertTrue(f2.cancel(true));
1472        checkCompletedWithWrappedCancellationException(g);
1473    }
1474
1475    /**
1476     * applyToEitherAsync result completes normally after normal
1477     * completion of sources
1478     */
1479    public void testApplyToEitherAsync() {
1480        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1481        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1482        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1483        f.complete(one);
1484        checkCompletedNormally(g, two);
1485
1486        f = new CompletableFuture<Integer>();
1487        f.complete(one);
1488        f2 = new CompletableFuture<Integer>();
1489        g = f.applyToEitherAsync(f2, inc);
1490        checkCompletedNormally(g, two);
1491    }
1492
1493    /**
1494     * applyToEitherAsync result completes exceptionally after exceptional
1495     * completion of source
1496     */
1497    public void testApplyToEitherAsync2() {
1498        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1499        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1500        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1501        f.completeExceptionally(new CFException());
1502        checkCompletedWithWrappedCFException(g);
1503
1504        f = new CompletableFuture<Integer>();
1505        f2 = new CompletableFuture<Integer>();
1506        f2.completeExceptionally(new CFException());
1507        g = f.applyToEitherAsync(f2, inc);
1508        f.complete(one);
1509        checkCompletedWithWrappedCFException(g);
1510    }
1511
1512    /**
1513     * applyToEitherAsync result completes exceptionally if action does
1514     */
1515    public void testApplyToEitherAsync3() {
1516        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1517        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1518        FailingFunction r = new FailingFunction();
1519        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1520        f.complete(one);
1521        checkCompletedWithWrappedCFException(g);
1522    }
1523
1524    /**
1525     * applyToEitherAsync result completes exceptionally if either source cancelled
1526     */
1527    public void testApplyToEitherAsync4() {
1528        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1529        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1530        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1531        assertTrue(f.cancel(true));
1532        checkCompletedWithWrappedCancellationException(g);
1533
1534        f = new CompletableFuture<Integer>();
1535        f2 = new CompletableFuture<Integer>();
1536        assertTrue(f2.cancel(true));
1537        g = f.applyToEitherAsync(f2, inc);
1538        checkCompletedWithWrappedCancellationException(g);
1539    }
1540
1541    /**
1542     * acceptEitherAsync result completes normally after normal
1543     * completion of sources
1544     */
1545    public void testAcceptEitherAsync() {
1546        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1547        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1548        IncAction r = new IncAction();
1549        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1550        f.complete(one);
1551        checkCompletedNormally(g, null);
1552        assertEquals(r.value, 2);
1553
1554        r = new IncAction();
1555        f = new CompletableFuture<Integer>();
1556        f.complete(one);
1557        f2 = new CompletableFuture<Integer>();
1558        g = f.acceptEitherAsync(f2, r);
1559        checkCompletedNormally(g, null);
1560        assertEquals(r.value, 2);
1561    }
1562
1563    /**
1564     * acceptEitherAsync result completes exceptionally after exceptional
1565     * completion of source
1566     */
1567    public void testAcceptEitherAsync2() {
1568        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1569        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1570        IncAction r = new IncAction();
1571        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1572        f.completeExceptionally(new CFException());
1573        checkCompletedWithWrappedCFException(g);
1574
1575        r = new IncAction();
1576        f = new CompletableFuture<Integer>();
1577        f2 = new CompletableFuture<Integer>();
1578        f2.completeExceptionally(new CFException());
1579        g = f.acceptEitherAsync(f2, r);
1580        f.complete(one);
1581        checkCompletedWithWrappedCFException(g);
1582    }
1583
1584    /**
1585     * acceptEitherAsync result completes exceptionally if action does
1586     */
1587    public void testAcceptEitherAsync3() {
1588        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1589        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1590        FailingConsumer r = new FailingConsumer();
1591        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1592        f.complete(one);
1593        checkCompletedWithWrappedCFException(g);
1594    }
1595
1596    /**
1597     * acceptEitherAsync result completes exceptionally if either
1598     * source cancelled
1599     */
1600    public void testAcceptEitherAsync4() {
1601        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1602        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1603        IncAction r = new IncAction();
1604        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1605        assertTrue(f.cancel(true));
1606        checkCompletedWithWrappedCancellationException(g);
1607
1608        r = new IncAction();
1609        f = new CompletableFuture<Integer>();
1610        f2 = new CompletableFuture<Integer>();
1611        assertTrue(f2.cancel(true));
1612        g = f.acceptEitherAsync(f2, r);
1613        checkCompletedWithWrappedCancellationException(g);
1614    }
1615
1616    /**
1617     * runAfterEitherAsync result completes normally after normal
1618     * completion of sources
1619     */
1620    public void testRunAfterEitherAsync() {
1621        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1622        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1623        Noop r = new Noop();
1624        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1625        f.complete(one);
1626        checkCompletedNormally(g, null);
1627        assertTrue(r.ran);
1628
1629        r = new Noop();
1630        f = new CompletableFuture<Integer>();
1631        f.complete(one);
1632        f2 = new CompletableFuture<Integer>();
1633        g = f.runAfterEitherAsync(f2, r);
1634        checkCompletedNormally(g, null);
1635        assertTrue(r.ran);
1636    }
1637
1638    /**
1639     * runAfterEitherAsync result completes exceptionally after exceptional
1640     * completion of source
1641     */
1642    public void testRunAfterEitherAsync2() {
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.completeExceptionally(new CFException());
1648        checkCompletedWithWrappedCFException(g);
1649
1650        r = new Noop();
1651        f = new CompletableFuture<Integer>();
1652        f2 = new CompletableFuture<Integer>();
1653        f2.completeExceptionally(new CFException());
1654        g = f.runAfterEitherAsync(f2, r);
1655        f.complete(one);
1656        checkCompletedWithWrappedCFException(g);
1657    }
1658
1659    /**
1660     * runAfterEitherAsync result completes exceptionally if action does
1661     */
1662    public void testRunAfterEitherAsync3() {
1663        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1664        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1665        FailingNoop r = new FailingNoop();
1666        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1667        f.complete(one);
1668        checkCompletedWithWrappedCFException(g);
1669    }
1670
1671    /**
1672     * runAfterEitherAsync result completes exceptionally if either
1673     * source cancelled
1674     */
1675    public void testRunAfterEitherAsync4() {
1676        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1677        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1678        Noop r = new Noop();
1679        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1680        assertTrue(f.cancel(true));
1681        checkCompletedWithWrappedCancellationException(g);
1682
1683        r = new Noop();
1684        f = new CompletableFuture<Integer>();
1685        f2 = new CompletableFuture<Integer>();
1686        assertTrue(f2.cancel(true));
1687        g = f.runAfterEitherAsync(f2, r);
1688        checkCompletedWithWrappedCancellationException(g);
1689    }
1690
1691    /**
1692     * thenComposeAsync result completes normally after normal
1693     * completion of source
1694     */
1695    public void testThenComposeAsync() {
1696        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1697        CompletableFutureInc r = new CompletableFutureInc();
1698        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1699        f.complete(one);
1700        checkCompletedNormally(g, two);
1701    }
1702
1703    /**
1704     * thenComposeAsync result completes exceptionally after
1705     * exceptional completion of source
1706     */
1707    public void testThenComposeAsync2() {
1708        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1709        CompletableFutureInc r = new CompletableFutureInc();
1710        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1711        f.completeExceptionally(new CFException());
1712        checkCompletedWithWrappedCFException(g);
1713    }
1714
1715    /**
1716     * thenComposeAsync result completes exceptionally if action does
1717     */
1718    public void testThenComposeAsync3() {
1719        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1720        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1721        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1722        f.complete(one);
1723        checkCompletedWithWrappedCFException(g);
1724    }
1725
1726    /**
1727     * thenComposeAsync result completes exceptionally if source cancelled
1728     */
1729    public void testThenComposeAsync4() {
1730        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1731        CompletableFutureInc r = new CompletableFutureInc();
1732        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1733        assertTrue(f.cancel(true));
1734        checkCompletedWithWrappedCancellationException(g);
1735    }
1736
1737
1738    // async with explicit executors
1739
1740    /**
1741     * thenRunAsync result completes normally after normal completion of source
1742     */
1743    public void testThenRunAsyncE() {
1744        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1745        Noop r = new Noop();
1746        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1747        f.complete(null);
1748        checkCompletedNormally(g, null);
1749
1750        // reordered version
1751        f = new CompletableFuture<Integer>();
1752        f.complete(null);
1753        r = new Noop();
1754        g = f.thenRunAsync(r, new ThreadExecutor());
1755        checkCompletedNormally(g, null);
1756    }
1757
1758    /**
1759     * thenRunAsync result completes exceptionally after exceptional
1760     * completion of source
1761     */
1762    public void testThenRunAsync2E() {
1763        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1764        Noop r = new Noop();
1765        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1766        f.completeExceptionally(new CFException());
2466          try {
2467 <            g.join();
2468 <            shouldThrow();
2469 <        } catch (Exception ok) {
2467 >            assertNull(h5.join());
2468 >            rs[5].assertValue(v1);
2469 >        } catch (CompletionException ok) {
2470 >            checkCompletedWithWrappedException(h5, ex);
2471 >            rs[5].assertNotInvoked();
2472          }
1772        checkCompletedWithWrappedCFException(g);
1773    }
1774
1775    /**
1776     * thenRunAsync result completes exceptionally if action does
1777     */
1778    public void testThenRunAsync3E() {
1779        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1780        FailingNoop r = new FailingNoop();
1781        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1782        f.complete(null);
1783        checkCompletedWithWrappedCFException(g);
1784    }
1785
1786    /**
1787     * thenRunAsync result completes exceptionally if source cancelled
1788     */
1789    public void testThenRunAsync4E() {
1790        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1791        Noop r = new Noop();
1792        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1793        assertTrue(f.cancel(true));
1794        checkCompletedWithWrappedCancellationException(g);
1795    }
1796
1797    /**
1798     * thenApplyAsync result completes normally after normal completion of source
1799     */
1800    public void testThenApplyAsyncE() {
1801        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1802        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1803        f.complete(one);
1804        checkCompletedNormally(g, two);
1805    }
1806
1807    /**
1808     * thenApplyAsync result completes exceptionally after exceptional
1809     * completion of source
1810     */
1811    public void testThenApplyAsync2E() {
1812        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1813        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1814        f.completeExceptionally(new CFException());
1815        checkCompletedWithWrappedCFException(g);
1816    }
1817
1818    /**
1819     * thenApplyAsync result completes exceptionally if action does
1820     */
1821    public void testThenApplyAsync3E() {
1822        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1823        FailingFunction r = new FailingFunction();
1824        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
1825        f.complete(null);
1826        checkCompletedWithWrappedCFException(g);
1827    }
1828
1829    /**
1830     * thenApplyAsync result completes exceptionally if source cancelled
1831     */
1832    public void testThenApplyAsync4E() {
1833        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1834        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1835        assertTrue(f.cancel(true));
1836        checkCompletedWithWrappedCancellationException(g);
1837    }
1838
1839    /**
1840     * thenAcceptAsync result completes normally after normal
1841     * completion of source
1842     */
1843    public void testThenAcceptAsyncE() {
1844        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1845        IncAction r = new IncAction();
1846        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1847        f.complete(one);
1848        checkCompletedNormally(g, null);
1849        assertEquals(r.value, 2);
1850    }
1851
1852    /**
1853     * thenAcceptAsync result completes exceptionally after exceptional
1854     * completion of source
1855     */
1856    public void testThenAcceptAsync2E() {
1857        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1858        IncAction r = new IncAction();
1859        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1860        f.completeExceptionally(new CFException());
1861        checkCompletedWithWrappedCFException(g);
1862    }
2473  
2474 <    /**
2475 <     * thenAcceptAsync result completes exceptionally if action does
2476 <     */
2477 <    public void testThenAcceptAsync3E() {
2478 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2479 <        FailingConsumer r = new FailingConsumer();
2480 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2481 <        f.complete(null);
2482 <        checkCompletedWithWrappedCFException(g);
2483 <    }
2474 >        checkCompletedExceptionally(f, ex);
2475 >        checkCompletedNormally(g, v1);
2476 >        checkCompletedWithWrappedException(h0, ex);
2477 >        checkCompletedWithWrappedException(h1, ex);
2478 >        checkCompletedWithWrappedException(h2, ex);
2479 >        checkCompletedWithWrappedException(h3, ex);
2480 >        checkCompletedWithWrappedException(h4, ex);
2481 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2482 >    }}
2483 >
2484 >    public void testAcceptEither_exceptionalCompletion2() {
2485 >        for (ExecutionMode m : ExecutionMode.values())
2486 >        for (boolean fFirst : new boolean[] { true, false })
2487 >        for (Integer v1 : new Integer[] { 1, null })
2488 >    {
2489 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2490 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2491 >        final CFException ex = new CFException();
2492 >        final NoopConsumer[] rs = new NoopConsumer[6];
2493 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2494 >
2495 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2496 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2497 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2498 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2499 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2500 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2501  
2502 <    /**
2503 <     * thenAcceptAsync result completes exceptionally if source cancelled
2504 <     */
2505 <    public void testThenAcceptAsync4E() {
2506 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2507 <        IncAction r = new IncAction();
2508 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2509 <        assertTrue(f.cancel(true));
2510 <        checkCompletedWithWrappedCancellationException(g);
2511 <    }
2512 <    /**
2513 <     * thenCombineAsync result completes normally after normal
2514 <     * completion of sources
2515 <     */
2516 <    public void testThenCombineAsyncE() {
2517 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2518 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2519 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
2520 <        f.complete(one);
2521 <        checkIncomplete(g);
2522 <        f2.complete(two);
2523 <        checkCompletedNormally(g, three);
2524 <    }
2525 <
2526 <    /**
2527 <     * thenCombineAsync result completes exceptionally after exceptional
2528 <     * completion of source
2529 <     */
2530 <    public void testThenCombineAsync2E() {
1904 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1905 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1906 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1907 <        f.completeExceptionally(new CFException());
1908 <        f2.complete(two);
1909 <        checkCompletedWithWrappedCFException(g);
1910 <
1911 <        f = new CompletableFuture<Integer>();
1912 <        f2 = new CompletableFuture<Integer>();
1913 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1914 <        f.complete(one);
1915 <        f2.completeExceptionally(new CFException());
1916 <        checkCompletedWithWrappedCFException(g);
1917 <    }
1918 <
1919 <    /**
1920 <     * thenCombineAsync result completes exceptionally if action does
1921 <     */
1922 <    public void testThenCombineAsync3E() {
1923 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1924 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1925 <        FailingBiFunction r = new FailingBiFunction();
1926 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
1927 <        f.complete(one);
1928 <        checkIncomplete(g);
1929 <        f2.complete(two);
1930 <        checkCompletedWithWrappedCFException(g);
1931 <    }
1932 <
1933 <    /**
1934 <     * thenCombineAsync result completes exceptionally if either source cancelled
1935 <     */
1936 <    public void testThenCombineAsync4E() {
1937 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1938 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1939 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1940 <        assertTrue(f.cancel(true));
1941 <        f2.complete(two);
1942 <        checkCompletedWithWrappedCancellationException(g);
1943 <
1944 <        f = new CompletableFuture<Integer>();
1945 <        f2 = new CompletableFuture<Integer>();
1946 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1947 <        f.complete(one);
1948 <        assertTrue(f2.cancel(true));
1949 <        checkCompletedWithWrappedCancellationException(g);
1950 <    }
1951 <
1952 <    /**
1953 <     * thenAcceptBothAsync result completes normally after normal
1954 <     * completion of sources
1955 <     */
1956 <    public void testThenAcceptBothAsyncE() {
1957 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1958 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1959 <        AddAction r = new AddAction();
1960 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1961 <        f.complete(one);
1962 <        checkIncomplete(g);
1963 <        f2.complete(two);
1964 <        checkCompletedNormally(g, null);
1965 <        assertEquals(r.value, 3);
1966 <    }
1967 <
1968 <    /**
1969 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1970 <     * completion of source
1971 <     */
1972 <    public void testThenAcceptBothAsync2E() {
1973 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1974 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1975 <        AddAction r = new AddAction();
1976 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1977 <        f.completeExceptionally(new CFException());
1978 <        f2.complete(two);
1979 <        checkCompletedWithWrappedCFException(g);
1980 <
1981 <        r = new AddAction();
1982 <        f = new CompletableFuture<Integer>();
1983 <        f2 = new CompletableFuture<Integer>();
1984 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1985 <        f.complete(one);
1986 <        f2.completeExceptionally(new CFException());
1987 <        checkCompletedWithWrappedCFException(g);
1988 <    }
1989 <
1990 <    /**
1991 <     * thenAcceptBothAsync result completes exceptionally if action does
1992 <     */
1993 <    public void testThenAcceptBothAsync3E() {
1994 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1995 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1996 <        FailingBiConsumer r = new FailingBiConsumer();
1997 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1998 <        f.complete(one);
1999 <        checkIncomplete(g);
2000 <        f2.complete(two);
2001 <        checkCompletedWithWrappedCFException(g);
2002 <    }
2003 <
2004 <    /**
2005 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2006 <     */
2007 <    public void testThenAcceptBothAsync4E() {
2008 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2009 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2010 <        AddAction r = new AddAction();
2011 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2012 <        assertTrue(f.cancel(true));
2013 <        f2.complete(two);
2014 <        checkCompletedWithWrappedCancellationException(g);
2015 <
2016 <        r = new AddAction();
2017 <        f = new CompletableFuture<Integer>();
2018 <        f2 = new CompletableFuture<Integer>();
2019 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2020 <        f.complete(one);
2021 <        assertTrue(f2.cancel(true));
2022 <        checkCompletedWithWrappedCancellationException(g);
2023 <    }
2024 <
2025 <    /**
2026 <     * runAfterBothAsync result completes normally after normal
2027 <     * completion of sources
2028 <     */
2029 <    public void testRunAfterBothAsyncE() {
2030 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2031 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2032 <        Noop r = new Noop();
2033 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2034 <        f.complete(one);
2035 <        checkIncomplete(g);
2036 <        f2.complete(two);
2037 <        checkCompletedNormally(g, null);
2038 <        assertTrue(r.ran);
2039 <    }
2040 <
2041 <    /**
2042 <     * runAfterBothAsync result completes exceptionally after exceptional
2043 <     * completion of source
2044 <     */
2045 <    public void testRunAfterBothAsync2E() {
2046 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2047 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2048 <        Noop r = new Noop();
2049 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2050 <        f.completeExceptionally(new CFException());
2051 <        f2.complete(two);
2052 <        checkCompletedWithWrappedCFException(g);
2053 <
2054 <        r = new Noop();
2055 <        f = new CompletableFuture<Integer>();
2056 <        f2 = new CompletableFuture<Integer>();
2057 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2058 <        f.complete(one);
2059 <        f2.completeExceptionally(new CFException());
2060 <        checkCompletedWithWrappedCFException(g);
2061 <    }
2502 >        // unspecified behavior - both source completions available
2503 >        try {
2504 >            assertEquals(null, h0.join());
2505 >            rs[0].assertValue(v1);
2506 >        } catch (CompletionException ok) {
2507 >            checkCompletedWithWrappedException(h0, ex);
2508 >            rs[0].assertNotInvoked();
2509 >        }
2510 >        try {
2511 >            assertEquals(null, h1.join());
2512 >            rs[1].assertValue(v1);
2513 >        } catch (CompletionException ok) {
2514 >            checkCompletedWithWrappedException(h1, ex);
2515 >            rs[1].assertNotInvoked();
2516 >        }
2517 >        try {
2518 >            assertEquals(null, h2.join());
2519 >            rs[2].assertValue(v1);
2520 >        } catch (CompletionException ok) {
2521 >            checkCompletedWithWrappedException(h2, ex);
2522 >            rs[2].assertNotInvoked();
2523 >        }
2524 >        try {
2525 >            assertEquals(null, h3.join());
2526 >            rs[3].assertValue(v1);
2527 >        } catch (CompletionException ok) {
2528 >            checkCompletedWithWrappedException(h3, ex);
2529 >            rs[3].assertNotInvoked();
2530 >        }
2531  
2532 <    /**
2533 <     * runAfterBothAsync result completes exceptionally if action does
2534 <     */
2066 <    public void testRunAfterBothAsync3E() {
2067 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2068 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2069 <        FailingNoop r = new FailingNoop();
2070 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2071 <        f.complete(one);
2072 <        checkIncomplete(g);
2073 <        f2.complete(two);
2074 <        checkCompletedWithWrappedCFException(g);
2075 <    }
2532 >        checkCompletedNormally(f, v1);
2533 >        checkCompletedExceptionally(g, ex);
2534 >    }}
2535  
2536      /**
2537 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2537 >     * acceptEither result completes exceptionally if either source cancelled
2538       */
2539 <    public void testRunAfterBothAsync4E() {
2540 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2541 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2542 <        Noop r = new Noop();
2543 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2544 <        assertTrue(f.cancel(true));
2545 <        f2.complete(two);
2546 <        checkCompletedWithWrappedCancellationException(g);
2547 <
2548 <        r = new Noop();
2549 <        f = new CompletableFuture<Integer>();
2550 <        f2 = new CompletableFuture<Integer>();
2551 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2552 <        f.complete(one);
2553 <        assertTrue(f2.cancel(true));
2554 <        checkCompletedWithWrappedCancellationException(g);
2555 <    }
2539 >    public void testAcceptEither_sourceCancelled() {
2540 >        for (ExecutionMode m : ExecutionMode.values())
2541 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2542 >        for (Integer v1 : new Integer[] { 1, null })
2543 >    {
2544 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2545 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2546 >        final NoopConsumer[] rs = new NoopConsumer[6];
2547 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2548 >
2549 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2550 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2551 >        checkIncomplete(h0);
2552 >        checkIncomplete(h1);
2553 >        rs[0].assertNotInvoked();
2554 >        rs[1].assertNotInvoked();
2555 >        f.cancel(mayInterruptIfRunning);
2556 >        checkCompletedWithWrappedCancellationException(h0);
2557 >        checkCompletedWithWrappedCancellationException(h1);
2558 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2559 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2560 >        checkCompletedWithWrappedCancellationException(h2);
2561 >        checkCompletedWithWrappedCancellationException(h3);
2562 >
2563 >        g.complete(v1);
2564 >
2565 >        // unspecified behavior - both source completions available
2566 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2567 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2568 >        try {
2569 >            assertNull(h4.join());
2570 >            rs[4].assertValue(v1);
2571 >        } catch (CompletionException ok) {
2572 >            checkCompletedWithWrappedCancellationException(h4);
2573 >            rs[4].assertNotInvoked();
2574 >        }
2575 >        try {
2576 >            assertNull(h5.join());
2577 >            rs[5].assertValue(v1);
2578 >        } catch (CompletionException ok) {
2579 >            checkCompletedWithWrappedCancellationException(h5);
2580 >            rs[5].assertNotInvoked();
2581 >        }
2582  
2583 <    /**
2584 <     * applyToEitherAsync result completes normally after normal
2585 <     * completion of sources
2586 <     */
2587 <    public void testApplyToEitherAsyncE() {
2588 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2589 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2590 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2106 <        f.complete(one);
2107 <        checkCompletedNormally(g, two);
2108 <
2109 <        f = new CompletableFuture<Integer>();
2110 <        f.complete(one);
2111 <        f2 = new CompletableFuture<Integer>();
2112 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2113 <        checkCompletedNormally(g, two);
2114 <    }
2583 >        checkCancelled(f);
2584 >        checkCompletedNormally(g, v1);
2585 >        checkCompletedWithWrappedCancellationException(h0);
2586 >        checkCompletedWithWrappedCancellationException(h1);
2587 >        checkCompletedWithWrappedCancellationException(h2);
2588 >        checkCompletedWithWrappedCancellationException(h3);
2589 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2590 >    }}
2591  
2592      /**
2593 <     * applyToEitherAsync result completes exceptionally after exceptional
2118 <     * completion of source
2593 >     * acceptEither result completes exceptionally if action does
2594       */
2595 <    public void testApplyToEitherAsync2E() {
2596 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2597 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2598 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2599 <        f.completeExceptionally(new CFException());
2600 <        checkCompletedWithWrappedCFException(g);
2601 <
2602 <        f = new CompletableFuture<Integer>();
2603 <        f2 = new CompletableFuture<Integer>();
2604 <        f2.completeExceptionally(new CFException());
2605 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2606 <        f.complete(one);
2607 <        checkCompletedWithWrappedCFException(g);
2608 <    }
2595 >    public void testAcceptEither_actionFailed() {
2596 >        for (ExecutionMode m : ExecutionMode.values())
2597 >        for (Integer v1 : new Integer[] { 1, null })
2598 >        for (Integer v2 : new Integer[] { 2, null })
2599 >    {
2600 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2601 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2602 >        final FailingConsumer[] rs = new FailingConsumer[6];
2603 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2604 >
2605 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2606 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2607 >        f.complete(v1);
2608 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2609 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2610 >        checkCompletedWithWrappedCFException(h0);
2611 >        checkCompletedWithWrappedCFException(h1);
2612 >        checkCompletedWithWrappedCFException(h2);
2613 >        checkCompletedWithWrappedCFException(h3);
2614 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2615 >
2616 >        g.complete(v2);
2617 >
2618 >        // unspecified behavior - both source completions available
2619 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2620 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2621 >
2622 >        checkCompletedWithWrappedCFException(h4);
2623 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2624 >                   Objects.equals(v2, rs[4].value));
2625 >        checkCompletedWithWrappedCFException(h5);
2626 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2627 >                   Objects.equals(v2, rs[5].value));
2628 >
2629 >        checkCompletedNormally(f, v1);
2630 >        checkCompletedNormally(g, v2);
2631 >    }}
2632  
2633      /**
2634 <     * applyToEitherAsync result completes exceptionally if action does
2634 >     * runAfterEither result completes normally after normal completion
2635 >     * of either source
2636       */
2637 <    public void testApplyToEitherAsync3E() {
2638 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2639 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2640 <        FailingFunction r = new FailingFunction();
2641 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2642 <        f.complete(one);
2643 <        checkCompletedWithWrappedCFException(g);
2644 <    }
2637 >    public void testRunAfterEither_normalCompletion() {
2638 >        for (ExecutionMode m : ExecutionMode.values())
2639 >        for (Integer v1 : new Integer[] { 1, null })
2640 >        for (Integer v2 : new Integer[] { 2, null })
2641 >    {
2642 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2643 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2644 >        final Noop[] rs = new Noop[6];
2645 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2646 >
2647 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2648 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2649 >        checkIncomplete(h0);
2650 >        checkIncomplete(h1);
2651 >        rs[0].assertNotInvoked();
2652 >        rs[1].assertNotInvoked();
2653 >        f.complete(v1);
2654 >        checkCompletedNormally(h0, null);
2655 >        checkCompletedNormally(h1, null);
2656 >        rs[0].assertInvoked();
2657 >        rs[1].assertInvoked();
2658 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2659 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2660 >        checkCompletedNormally(h2, null);
2661 >        checkCompletedNormally(h3, null);
2662 >        rs[2].assertInvoked();
2663 >        rs[3].assertInvoked();
2664 >
2665 >        g.complete(v2);
2666 >
2667 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2668 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2669 >
2670 >        checkCompletedNormally(f, v1);
2671 >        checkCompletedNormally(g, v2);
2672 >        checkCompletedNormally(h0, null);
2673 >        checkCompletedNormally(h1, null);
2674 >        checkCompletedNormally(h2, null);
2675 >        checkCompletedNormally(h3, null);
2676 >        checkCompletedNormally(h4, null);
2677 >        checkCompletedNormally(h5, null);
2678 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2679 >    }}
2680  
2681      /**
2682 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2682 >     * runAfterEither result completes exceptionally after exceptional
2683 >     * completion of either source
2684       */
2685 <    public void testApplyToEitherAsync4E() {
2686 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2687 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2688 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2689 <        assertTrue(f.cancel(true));
2690 <        checkCompletedWithWrappedCancellationException(g);
2685 >    public void testRunAfterEither_exceptionalCompletion() {
2686 >        for (ExecutionMode m : ExecutionMode.values())
2687 >        for (Integer v1 : new Integer[] { 1, null })
2688 >    {
2689 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2690 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2691 >        final CFException ex = new CFException();
2692 >        final Noop[] rs = new Noop[6];
2693 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2694 >
2695 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2696 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2697 >        checkIncomplete(h0);
2698 >        checkIncomplete(h1);
2699 >        rs[0].assertNotInvoked();
2700 >        rs[1].assertNotInvoked();
2701 >        assertTrue(f.completeExceptionally(ex));
2702 >        checkCompletedWithWrappedException(h0, ex);
2703 >        checkCompletedWithWrappedException(h1, ex);
2704 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2705 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2706 >        checkCompletedWithWrappedException(h2, ex);
2707 >        checkCompletedWithWrappedException(h3, ex);
2708 >
2709 >        assertTrue(g.complete(v1));
2710 >
2711 >        // unspecified behavior - both source completions available
2712 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2713 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2714 >        try {
2715 >            assertNull(h4.join());
2716 >            rs[4].assertInvoked();
2717 >        } catch (CompletionException ok) {
2718 >            checkCompletedWithWrappedException(h4, ex);
2719 >            rs[4].assertNotInvoked();
2720 >        }
2721 >        try {
2722 >            assertNull(h5.join());
2723 >            rs[5].assertInvoked();
2724 >        } catch (CompletionException ok) {
2725 >            checkCompletedWithWrappedException(h5, ex);
2726 >            rs[5].assertNotInvoked();
2727 >        }
2728  
2729 <        f = new CompletableFuture<Integer>();
2730 <        f2 = new CompletableFuture<Integer>();
2731 <        assertTrue(f2.cancel(true));
2732 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2733 <        checkCompletedWithWrappedCancellationException(g);
2734 <    }
2729 >        checkCompletedExceptionally(f, ex);
2730 >        checkCompletedNormally(g, v1);
2731 >        checkCompletedWithWrappedException(h0, ex);
2732 >        checkCompletedWithWrappedException(h1, ex);
2733 >        checkCompletedWithWrappedException(h2, ex);
2734 >        checkCompletedWithWrappedException(h3, ex);
2735 >        checkCompletedWithWrappedException(h4, ex);
2736 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2737 >    }}
2738 >
2739 >    public void testRunAfterEither_exceptionalCompletion2() {
2740 >        for (ExecutionMode m : ExecutionMode.values())
2741 >        for (boolean fFirst : new boolean[] { true, false })
2742 >        for (Integer v1 : new Integer[] { 1, null })
2743 >    {
2744 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2745 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2746 >        final CFException ex = new CFException();
2747 >        final Noop[] rs = new Noop[6];
2748 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2749 >
2750 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2751 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2752 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2753 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2754 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2755 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2756  
2757 <    /**
2758 <     * acceptEitherAsync result completes normally after normal
2759 <     * completion of sources
2760 <     */
2761 <    public void testAcceptEitherAsyncE() {
2762 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2763 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2764 <        IncAction r = new IncAction();
2765 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2766 <        f.complete(one);
2767 <        checkCompletedNormally(g, null);
2768 <        assertEquals(r.value, 2);
2757 >        // unspecified behavior - both source completions available
2758 >        try {
2759 >            assertEquals(null, h0.join());
2760 >            rs[0].assertInvoked();
2761 >        } catch (CompletionException ok) {
2762 >            checkCompletedWithWrappedException(h0, ex);
2763 >            rs[0].assertNotInvoked();
2764 >        }
2765 >        try {
2766 >            assertEquals(null, h1.join());
2767 >            rs[1].assertInvoked();
2768 >        } catch (CompletionException ok) {
2769 >            checkCompletedWithWrappedException(h1, ex);
2770 >            rs[1].assertNotInvoked();
2771 >        }
2772 >        try {
2773 >            assertEquals(null, h2.join());
2774 >            rs[2].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedException(h2, ex);
2777 >            rs[2].assertNotInvoked();
2778 >        }
2779 >        try {
2780 >            assertEquals(null, h3.join());
2781 >            rs[3].assertInvoked();
2782 >        } catch (CompletionException ok) {
2783 >            checkCompletedWithWrappedException(h3, ex);
2784 >            rs[3].assertNotInvoked();
2785 >        }
2786  
2787 <        r = new IncAction();
2788 <        f = new CompletableFuture<Integer>();
2789 <        f.complete(one);
2180 <        f2 = new CompletableFuture<Integer>();
2181 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2182 <        checkCompletedNormally(g, null);
2183 <        assertEquals(r.value, 2);
2184 <    }
2787 >        checkCompletedNormally(f, v1);
2788 >        checkCompletedExceptionally(g, ex);
2789 >    }}
2790  
2791      /**
2792 <     * acceptEitherAsync result completes exceptionally after exceptional
2188 <     * completion of source
2792 >     * runAfterEither result completes exceptionally if either source cancelled
2793       */
2794 <    public void testAcceptEitherAsync2E() {
2795 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2796 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2797 <        IncAction r = new IncAction();
2798 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2799 <        f.completeExceptionally(new CFException());
2800 <        checkCompletedWithWrappedCFException(g);
2801 <
2802 <        r = new IncAction();
2803 <        f = new CompletableFuture<Integer>();
2804 <        f2 = new CompletableFuture<Integer>();
2805 <        f2.completeExceptionally(new CFException());
2806 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2807 <        f.complete(one);
2808 <        checkCompletedWithWrappedCFException(g);
2809 <    }
2794 >    public void testRunAfterEither_sourceCancelled() {
2795 >        for (ExecutionMode m : ExecutionMode.values())
2796 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 >        for (Integer v1 : new Integer[] { 1, null })
2798 >    {
2799 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 >        final Noop[] rs = new Noop[6];
2802 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2803 >
2804 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2805 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2806 >        checkIncomplete(h0);
2807 >        checkIncomplete(h1);
2808 >        rs[0].assertNotInvoked();
2809 >        rs[1].assertNotInvoked();
2810 >        f.cancel(mayInterruptIfRunning);
2811 >        checkCompletedWithWrappedCancellationException(h0);
2812 >        checkCompletedWithWrappedCancellationException(h1);
2813 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2814 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2815 >        checkCompletedWithWrappedCancellationException(h2);
2816 >        checkCompletedWithWrappedCancellationException(h3);
2817 >
2818 >        assertTrue(g.complete(v1));
2819 >
2820 >        // unspecified behavior - both source completions available
2821 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2822 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2823 >        try {
2824 >            assertNull(h4.join());
2825 >            rs[4].assertInvoked();
2826 >        } catch (CompletionException ok) {
2827 >            checkCompletedWithWrappedCancellationException(h4);
2828 >            rs[4].assertNotInvoked();
2829 >        }
2830 >        try {
2831 >            assertNull(h5.join());
2832 >            rs[5].assertInvoked();
2833 >        } catch (CompletionException ok) {
2834 >            checkCompletedWithWrappedCancellationException(h5);
2835 >            rs[5].assertNotInvoked();
2836 >        }
2837  
2838 <    /**
2839 <     * acceptEitherAsync result completes exceptionally if action does
2840 <     */
2841 <    public void testAcceptEitherAsync3E() {
2842 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2843 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2844 <        FailingConsumer r = new FailingConsumer();
2845 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2215 <        f.complete(one);
2216 <        checkCompletedWithWrappedCFException(g);
2217 <    }
2838 >        checkCancelled(f);
2839 >        checkCompletedNormally(g, v1);
2840 >        checkCompletedWithWrappedCancellationException(h0);
2841 >        checkCompletedWithWrappedCancellationException(h1);
2842 >        checkCompletedWithWrappedCancellationException(h2);
2843 >        checkCompletedWithWrappedCancellationException(h3);
2844 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2845 >    }}
2846  
2847      /**
2848 <     * acceptEitherAsync result completes exceptionally if either
2221 <     * source cancelled
2848 >     * runAfterEither result completes exceptionally if action does
2849       */
2850 <    public void testAcceptEitherAsync4E() {
2851 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2852 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2853 <        IncAction r = new IncAction();
2854 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2855 <        assertTrue(f.cancel(true));
2856 <        checkCompletedWithWrappedCancellationException(g);
2857 <
2858 <        r = new IncAction();
2859 <        f = new CompletableFuture<Integer>();
2860 <        f2 = new CompletableFuture<Integer>();
2861 <        assertTrue(f2.cancel(true));
2862 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2863 <        checkCompletedWithWrappedCancellationException(g);
2864 <    }
2850 >    public void testRunAfterEither_actionFailed() {
2851 >        for (ExecutionMode m : ExecutionMode.values())
2852 >        for (Integer v1 : new Integer[] { 1, null })
2853 >        for (Integer v2 : new Integer[] { 2, null })
2854 >    {
2855 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2856 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2857 >        final FailingRunnable[] rs = new FailingRunnable[6];
2858 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2859 >
2860 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2861 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2862 >        assertTrue(f.complete(v1));
2863 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2864 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2865 >        checkCompletedWithWrappedCFException(h0);
2866 >        checkCompletedWithWrappedCFException(h1);
2867 >        checkCompletedWithWrappedCFException(h2);
2868 >        checkCompletedWithWrappedCFException(h3);
2869 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2870 >        assertTrue(g.complete(v2));
2871 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2872 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2873 >        checkCompletedWithWrappedCFException(h4);
2874 >        checkCompletedWithWrappedCFException(h5);
2875 >
2876 >        checkCompletedNormally(f, v1);
2877 >        checkCompletedNormally(g, v2);
2878 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2879 >    }}
2880  
2881      /**
2882 <     * runAfterEitherAsync result completes normally after normal
2241 <     * completion of sources
2882 >     * thenCompose result completes normally after normal completion of source
2883       */
2884 <    public void testRunAfterEitherAsyncE() {
2885 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2886 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2887 <        Noop r = new Noop();
2888 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2889 <        f.complete(one);
2890 <        checkCompletedNormally(g, null);
2891 <        assertTrue(r.ran);
2892 <
2893 <        r = new Noop();
2894 <        f = new CompletableFuture<Integer>();
2895 <        f.complete(one);
2896 <        f2 = new CompletableFuture<Integer>();
2897 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2898 <        checkCompletedNormally(g, null);
2258 <        assertTrue(r.ran);
2259 <    }
2884 >    public void testThenCompose_normalCompletion() {
2885 >        for (ExecutionMode m : ExecutionMode.values())
2886 >        for (boolean createIncomplete : new boolean[] { true, false })
2887 >        for (Integer v1 : new Integer[] { 1, null })
2888 >    {
2889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2891 >        if (!createIncomplete) assertTrue(f.complete(v1));
2892 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2893 >        if (createIncomplete) assertTrue(f.complete(v1));
2894 >
2895 >        checkCompletedNormally(g, inc(v1));
2896 >        checkCompletedNormally(f, v1);
2897 >        r.assertValue(v1);
2898 >    }}
2899  
2900      /**
2901 <     * runAfterEitherAsync result completes exceptionally after exceptional
2901 >     * thenCompose result completes exceptionally after exceptional
2902       * completion of source
2903       */
2904 <    public void testRunAfterEitherAsync2E() {
2905 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2906 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2907 <        Noop r = new Noop();
2908 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2909 <        f.completeExceptionally(new CFException());
2910 <        checkCompletedWithWrappedCFException(g);
2911 <
2912 <        r = new Noop();
2913 <        f = new CompletableFuture<Integer>();
2914 <        f2 = new CompletableFuture<Integer>();
2915 <        f2.completeExceptionally(new CFException());
2916 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2917 <        f.complete(one);
2918 <        checkCompletedWithWrappedCFException(g);
2280 <    }
2281 <
2282 <    /**
2283 <     * runAfterEitherAsync result completes exceptionally if action does
2284 <     */
2285 <    public void testRunAfterEitherAsync3E() {
2286 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2287 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2288 <        FailingNoop r = new FailingNoop();
2289 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2290 <        f.complete(one);
2291 <        checkCompletedWithWrappedCFException(g);
2292 <    }
2293 <
2294 <    /**
2295 <     * runAfterEitherAsync result completes exceptionally if either
2296 <     * source cancelled
2297 <     */
2298 <    public void testRunAfterEitherAsync4E() {
2299 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2300 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2301 <        Noop r = new Noop();
2302 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2303 <        assertTrue(f.cancel(true));
2304 <        checkCompletedWithWrappedCancellationException(g);
2305 <
2306 <        r = new Noop();
2307 <        f = new CompletableFuture<Integer>();
2308 <        f2 = new CompletableFuture<Integer>();
2309 <        assertTrue(f2.cancel(true));
2310 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2311 <        checkCompletedWithWrappedCancellationException(g);
2312 <    }
2904 >    public void testThenCompose_exceptionalCompletion() {
2905 >        for (ExecutionMode m : ExecutionMode.values())
2906 >        for (boolean createIncomplete : new boolean[] { true, false })
2907 >    {
2908 >        final CFException ex = new CFException();
2909 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2910 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2911 >        if (!createIncomplete) f.completeExceptionally(ex);
2912 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2913 >        if (createIncomplete) f.completeExceptionally(ex);
2914 >
2915 >        checkCompletedWithWrappedException(g, ex);
2916 >        checkCompletedExceptionally(f, ex);
2917 >        r.assertNotInvoked();
2918 >    }}
2919  
2920      /**
2921 <     * thenComposeAsync result completes normally after normal
2316 <     * completion of source
2921 >     * thenCompose result completes exceptionally if action does
2922       */
2923 <    public void testThenComposeAsyncE() {
2924 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2925 <        CompletableFutureInc r = new CompletableFutureInc();
2926 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2927 <        f.complete(one);
2928 <        checkCompletedNormally(g, two);
2929 <    }
2923 >    public void testThenCompose_actionFailed() {
2924 >        for (ExecutionMode m : ExecutionMode.values())
2925 >        for (boolean createIncomplete : new boolean[] { true, false })
2926 >        for (Integer v1 : new Integer[] { 1, null })
2927 >    {
2928 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2929 >        final FailingCompletableFutureFunction r
2930 >            = new FailingCompletableFutureFunction(m);
2931 >        if (!createIncomplete) assertTrue(f.complete(v1));
2932 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2933 >        if (createIncomplete) assertTrue(f.complete(v1));
2934  
2326    /**
2327     * thenComposeAsync result completes exceptionally after
2328     * exceptional completion of source
2329     */
2330    public void testThenComposeAsync2E() {
2331        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2332        CompletableFutureInc r = new CompletableFutureInc();
2333        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2334        f.completeExceptionally(new CFException());
2935          checkCompletedWithWrappedCFException(g);
2936 <    }
2936 >        checkCompletedNormally(f, v1);
2937 >    }}
2938  
2939      /**
2940 <     * thenComposeAsync result completes exceptionally if action does
2940 >     * thenCompose result completes exceptionally if source cancelled
2941       */
2942 <    public void testThenComposeAsync3E() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2944 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2945 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2946 <        f.complete(one);
2947 <        checkCompletedWithWrappedCFException(g);
2948 <    }
2942 >    public void testThenCompose_sourceCancelled() {
2943 >        for (ExecutionMode m : ExecutionMode.values())
2944 >        for (boolean createIncomplete : new boolean[] { true, false })
2945 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2946 >    {
2947 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2948 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2949 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2950 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2951 >        if (createIncomplete) {
2952 >            checkIncomplete(g);
2953 >            assertTrue(f.cancel(mayInterruptIfRunning));
2954 >        }
2955  
2349    /**
2350     * thenComposeAsync result completes exceptionally if source cancelled
2351     */
2352    public void testThenComposeAsync4E() {
2353        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2354        CompletableFutureInc r = new CompletableFutureInc();
2355        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2356        assertTrue(f.cancel(true));
2956          checkCompletedWithWrappedCancellationException(g);
2957 <    }
2957 >        checkCancelled(f);
2958 >    }}
2959  
2960      // other static methods
2961  
# Line 2364 | Line 2964 | public class CompletableFutureTest exten
2964       * with the value null
2965       */
2966      public void testAllOf_empty() throws Exception {
2967 <        CompletableFuture<?> f = CompletableFuture.allOf();
2967 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2968          checkCompletedNormally(f, null);
2969      }
2970  
2971      /**
2972 <     * allOf returns a future completed when all components complete
2972 >     * allOf returns a future completed normally with the value null
2973 >     * when all components complete normally
2974       */
2975 <    public void testAllOf() throws Exception {
2976 <        for (int k = 1; k < 20; ++k) {
2977 <            CompletableFuture[] fs = new CompletableFuture[k];
2978 <            for (int i = 0; i < k; ++i)
2979 <                fs[i] = new CompletableFuture<Integer>();
2975 >    public void testAllOf_normal() throws Exception {
2976 >        for (int k = 1; k < 10; k++) {
2977 >            CompletableFuture<Integer>[] fs
2978 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2979 >            for (int i = 0; i < k; i++)
2980 >                fs[i] = new CompletableFuture<>();
2981 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2982 >            for (int i = 0; i < k; i++) {
2983 >                checkIncomplete(f);
2984 >                checkIncomplete(CompletableFuture.allOf(fs));
2985 >                fs[i].complete(one);
2986 >            }
2987 >            checkCompletedNormally(f, null);
2988 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2989 >        }
2990 >    }
2991 >
2992 >    public void testAllOf_backwards() throws Exception {
2993 >        for (int k = 1; k < 10; k++) {
2994 >            CompletableFuture<Integer>[] fs
2995 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2996 >            for (int i = 0; i < k; i++)
2997 >                fs[i] = new CompletableFuture<>();
2998              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2999 <            for (int i = 0; i < k; ++i) {
2999 >            for (int i = k - 1; i >= 0; i--) {
3000                  checkIncomplete(f);
3001 +                checkIncomplete(CompletableFuture.allOf(fs));
3002                  fs[i].complete(one);
3003              }
3004              checkCompletedNormally(f, null);
3005 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3006 +        }
3007 +    }
3008 +
3009 +    public void testAllOf_exceptional() throws Exception {
3010 +        for (int k = 1; k < 10; k++) {
3011 +            CompletableFuture<Integer>[] fs
3012 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3013 +            CFException ex = new CFException();
3014 +            for (int i = 0; i < k; i++)
3015 +                fs[i] = new CompletableFuture<>();
3016 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3017 +            for (int i = 0; i < k; i++) {
3018 +                checkIncomplete(f);
3019 +                checkIncomplete(CompletableFuture.allOf(fs));
3020 +                if (i != k/2) {
3021 +                    fs[i].complete(i);
3022 +                    checkCompletedNormally(fs[i], i);
3023 +                } else {
3024 +                    fs[i].completeExceptionally(ex);
3025 +                    checkCompletedExceptionally(fs[i], ex);
3026 +                }
3027 +            }
3028 +            checkCompletedWithWrappedException(f, ex);
3029 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3030          }
3031      }
3032  
# Line 2389 | Line 3034 | public class CompletableFutureTest exten
3034       * anyOf(no component futures) returns an incomplete future
3035       */
3036      public void testAnyOf_empty() throws Exception {
3037 <        CompletableFuture<?> f = CompletableFuture.anyOf();
3037 >        for (Integer v1 : new Integer[] { 1, null })
3038 >    {
3039 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3040          checkIncomplete(f);
3041 +
3042 +        f.complete(v1);
3043 +        checkCompletedNormally(f, v1);
3044 +    }}
3045 +
3046 +    /**
3047 +     * anyOf returns a future completed normally with a value when
3048 +     * a component future does
3049 +     */
3050 +    public void testAnyOf_normal() throws Exception {
3051 +        for (int k = 0; k < 10; k++) {
3052 +            CompletableFuture[] fs = new CompletableFuture[k];
3053 +            for (int i = 0; i < k; i++)
3054 +                fs[i] = new CompletableFuture<>();
3055 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3056 +            checkIncomplete(f);
3057 +            for (int i = 0; i < k; i++) {
3058 +                fs[i].complete(i);
3059 +                checkCompletedNormally(f, 0);
3060 +                int x = (int) CompletableFuture.anyOf(fs).join();
3061 +                assertTrue(0 <= x && x <= i);
3062 +            }
3063 +        }
3064 +    }
3065 +    public void testAnyOf_normal_backwards() throws Exception {
3066 +        for (int k = 0; k < 10; k++) {
3067 +            CompletableFuture[] fs = new CompletableFuture[k];
3068 +            for (int i = 0; i < k; i++)
3069 +                fs[i] = new CompletableFuture<>();
3070 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3071 +            checkIncomplete(f);
3072 +            for (int i = k - 1; i >= 0; i--) {
3073 +                fs[i].complete(i);
3074 +                checkCompletedNormally(f, k - 1);
3075 +                int x = (int) CompletableFuture.anyOf(fs).join();
3076 +                assertTrue(i <= x && x <= k - 1);
3077 +            }
3078 +        }
3079      }
3080  
3081      /**
3082 <     * anyOf returns a future completed when any components complete
3082 >     * anyOf result completes exceptionally when any component does.
3083       */
3084 <    public void testAnyOf() throws Exception {
3085 <        for (int k = 1; k < 20; ++k) {
3084 >    public void testAnyOf_exceptional() throws Exception {
3085 >        for (int k = 0; k < 10; k++) {
3086              CompletableFuture[] fs = new CompletableFuture[k];
3087 <            for (int i = 0; i < k; ++i)
3088 <                fs[i] = new CompletableFuture<Integer>();
3087 >            CFException[] exs = new CFException[k];
3088 >            for (int i = 0; i < k; i++) {
3089 >                fs[i] = new CompletableFuture<>();
3090 >                exs[i] = new CFException();
3091 >            }
3092              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3093              checkIncomplete(f);
3094 <            for (int i = 0; i < k; ++i) {
3095 <                fs[i].complete(one);
3096 <                checkCompletedNormally(f, one);
3094 >            for (int i = 0; i < k; i++) {
3095 >                fs[i].completeExceptionally(exs[i]);
3096 >                checkCompletedWithWrappedException(f, exs[0]);
3097 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3098 >            }
3099 >        }
3100 >    }
3101 >
3102 >    public void testAnyOf_exceptional_backwards() throws Exception {
3103 >        for (int k = 0; k < 10; k++) {
3104 >            CompletableFuture[] fs = new CompletableFuture[k];
3105 >            CFException[] exs = new CFException[k];
3106 >            for (int i = 0; i < k; i++) {
3107 >                fs[i] = new CompletableFuture<>();
3108 >                exs[i] = new CFException();
3109 >            }
3110 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3111 >            checkIncomplete(f);
3112 >            for (int i = k - 1; i >= 0; i--) {
3113 >                fs[i].completeExceptionally(exs[i]);
3114 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3115 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3116              }
3117          }
3118      }
# Line 2414 | Line 3121 | public class CompletableFutureTest exten
3121       * Completion methods throw NullPointerException with null arguments
3122       */
3123      public void testNPE() {
3124 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3125 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
3124 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3125 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3126          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3127          CompletableFuture<?> h;
3128 <        Executor exec = new ThreadExecutor();
3128 >        ThreadExecutor exec = new ThreadExecutor();
3129  
3130          Runnable[] throwingActions = {
3131 <            () -> { CompletableFuture.supplyAsync(null); },
3132 <            () -> { CompletableFuture.supplyAsync(null, exec); },
3133 <            () -> { CompletableFuture.supplyAsync(() -> one, null); },
3134 <
3135 <            () -> { CompletableFuture.runAsync(null); },
3136 <            () -> { CompletableFuture.runAsync(null, exec); },
3137 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
3138 <
3139 <            () -> { f.completeExceptionally(null); },
3140 <
3141 <            () -> { f.thenApply(null); },
3142 <            () -> { f.thenApplyAsync(null); },
3143 <            () -> { f.thenApplyAsync((x) -> x, null); },
3144 <            () -> { f.thenApplyAsync(null, exec); },
3145 <
3146 <            () -> { f.thenAccept(null); },
3147 <            () -> { f.thenAcceptAsync(null); },
3148 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
3149 <            () -> { f.thenAcceptAsync(null, exec); },
3150 <
3151 <            () -> { f.thenRun(null); },
3152 <            () -> { f.thenRunAsync(null); },
3153 <            () -> { f.thenRunAsync(() -> { ; }, null); },
3154 <            () -> { f.thenRunAsync(null, exec); },
3155 <
3156 <            () -> { f.thenCombine(g, null); },
3157 <            () -> { f.thenCombineAsync(g, null); },
3158 <            () -> { f.thenCombineAsync(g, null, exec); },
3159 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
3160 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
3161 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
3162 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
3163 <
3164 <            () -> { f.thenAcceptBoth(g, null); },
3165 <            () -> { f.thenAcceptBothAsync(g, null); },
3166 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
3167 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
3168 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
3169 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
3170 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
3171 <
3172 <            () -> { f.runAfterBoth(g, null); },
3173 <            () -> { f.runAfterBothAsync(g, null); },
3174 <            () -> { f.runAfterBothAsync(g, null, exec); },
3175 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
3176 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
3177 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
3178 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
3179 <
3180 <            () -> { f.applyToEither(g, null); },
3181 <            () -> { f.applyToEitherAsync(g, null); },
3182 <            () -> { f.applyToEitherAsync(g, null, exec); },
3183 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
3184 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
3185 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
3186 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
3187 <
3188 <            () -> { f.acceptEither(g, null); },
3189 <            () -> { f.acceptEitherAsync(g, null); },
3190 <            () -> { f.acceptEitherAsync(g, null, exec); },
3191 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3192 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3193 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3194 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3195 <
3196 <            () -> { f.runAfterEither(g, null); },
3197 <            () -> { f.runAfterEitherAsync(g, null); },
3198 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3199 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3200 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3201 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3202 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3203 <
3204 <            () -> { f.thenCompose(null); },
3205 <            () -> { f.thenComposeAsync(null); },
3206 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3207 <            () -> { f.thenComposeAsync(null, exec); },
3208 <
3209 <            () -> { f.exceptionally(null); },
3210 <
3211 <            () -> { f.handle(null); },
3212 <
3213 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3214 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3215 <            () -> { CompletableFuture.allOf(f, null); },
3216 <            () -> { CompletableFuture.allOf(null, f); },
3217 <
3218 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3219 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3220 <            () -> { CompletableFuture.anyOf(f, null); },
3221 <            () -> { CompletableFuture.anyOf(null, f); },
3222 <
3223 <            // TODO: Crashes javac with lambda-8-2013-03-31...
2517 <            //() -> { CompletableFuture<?> x = f.thenAccept(null); },
2518 <            //() -> { CompletableFuture<Void> x = f.thenRun(null); },
2519 <            //() -> { CompletableFuture<Integer> x = f.thenApply(() -> { ; }); },
3131 >            () -> CompletableFuture.supplyAsync(null),
3132 >            () -> CompletableFuture.supplyAsync(null, exec),
3133 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3134 >
3135 >            () -> CompletableFuture.runAsync(null),
3136 >            () -> CompletableFuture.runAsync(null, exec),
3137 >            () -> CompletableFuture.runAsync(() -> {}, null),
3138 >
3139 >            () -> f.completeExceptionally(null),
3140 >
3141 >            () -> f.thenApply(null),
3142 >            () -> f.thenApplyAsync(null),
3143 >            () -> f.thenApplyAsync((x) -> x, null),
3144 >            () -> f.thenApplyAsync(null, exec),
3145 >
3146 >            () -> f.thenAccept(null),
3147 >            () -> f.thenAcceptAsync(null),
3148 >            () -> f.thenAcceptAsync((x) -> {} , null),
3149 >            () -> f.thenAcceptAsync(null, exec),
3150 >
3151 >            () -> f.thenRun(null),
3152 >            () -> f.thenRunAsync(null),
3153 >            () -> f.thenRunAsync(() -> {} , null),
3154 >            () -> f.thenRunAsync(null, exec),
3155 >
3156 >            () -> f.thenCombine(g, null),
3157 >            () -> f.thenCombineAsync(g, null),
3158 >            () -> f.thenCombineAsync(g, null, exec),
3159 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3160 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3161 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3162 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3163 >
3164 >            () -> f.thenAcceptBoth(g, null),
3165 >            () -> f.thenAcceptBothAsync(g, null),
3166 >            () -> f.thenAcceptBothAsync(g, null, exec),
3167 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3168 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3169 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3170 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3171 >
3172 >            () -> f.runAfterBoth(g, null),
3173 >            () -> f.runAfterBothAsync(g, null),
3174 >            () -> f.runAfterBothAsync(g, null, exec),
3175 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3176 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3177 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3178 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3179 >
3180 >            () -> f.applyToEither(g, null),
3181 >            () -> f.applyToEitherAsync(g, null),
3182 >            () -> f.applyToEitherAsync(g, null, exec),
3183 >            () -> f.applyToEither(nullFuture, (x) -> x),
3184 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3185 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3186 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3187 >
3188 >            () -> f.acceptEither(g, null),
3189 >            () -> f.acceptEitherAsync(g, null),
3190 >            () -> f.acceptEitherAsync(g, null, exec),
3191 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3192 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3193 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3194 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3195 >
3196 >            () -> f.runAfterEither(g, null),
3197 >            () -> f.runAfterEitherAsync(g, null),
3198 >            () -> f.runAfterEitherAsync(g, null, exec),
3199 >            () -> f.runAfterEither(nullFuture, () -> {}),
3200 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3201 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3202 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3203 >
3204 >            () -> f.thenCompose(null),
3205 >            () -> f.thenComposeAsync(null),
3206 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3207 >            () -> f.thenComposeAsync(null, exec),
3208 >
3209 >            () -> f.exceptionally(null),
3210 >
3211 >            () -> f.handle(null),
3212 >
3213 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3214 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3215 >            () -> CompletableFuture.allOf(f, null),
3216 >            () -> CompletableFuture.allOf(null, f),
3217 >
3218 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3219 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3220 >            () -> CompletableFuture.anyOf(f, null),
3221 >            () -> CompletableFuture.anyOf(null, f),
3222 >
3223 >            () -> f.obtrudeException(null),
3224          };
3225  
3226          assertThrows(NullPointerException.class, throwingActions);
3227 +        assertEquals(0, exec.count.get());
3228 +    }
3229 +
3230 +    /**
3231 +     * toCompletableFuture returns this CompletableFuture.
3232 +     */
3233 +    public void testToCompletableFuture() {
3234 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3235 +        assertSame(f, f.toCompletableFuture());
3236      }
3237  
3238 +    //--- tests of implementation details; not part of official tck ---
3239 +
3240 +    Object resultOf(CompletableFuture<?> f) {
3241 +        try {
3242 +            java.lang.reflect.Field resultField
3243 +                = CompletableFuture.class.getDeclaredField("result");
3244 +            resultField.setAccessible(true);
3245 +            return resultField.get(f);
3246 +        } catch (Throwable t) { throw new AssertionError(t); }
3247 +    }
3248 +
3249 +    public void testExceptionPropagationReusesResultObject() {
3250 +        if (!testImplementationDetails) return;
3251 +        for (ExecutionMode m : ExecutionMode.values())
3252 +    {
3253 +        final CFException ex = new CFException();
3254 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3255 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3256 +
3257 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3258 +            = new ArrayList<>();
3259 +
3260 +        funs.add((y) -> m.thenRun(y, new Noop(m)));
3261 +        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3262 +        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3263 +
3264 +        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3265 +        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3266 +        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3267 +
3268 +        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3269 +        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3270 +        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3271 +
3272 +        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3273 +
3274 +        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3275 +
3276 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3277 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3278 +
3279 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3280 +                 fun : funs) {
3281 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3282 +            f.completeExceptionally(ex);
3283 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3284 +            checkCompletedWithWrappedException(src, ex);
3285 +            CompletableFuture<?> dep = fun.apply(src);
3286 +            checkCompletedWithWrappedException(dep, ex);
3287 +            assertSame(resultOf(src), resultOf(dep));
3288 +        }
3289 +
3290 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3291 +                 fun : funs) {
3292 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3293 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3294 +            CompletableFuture<?> dep = fun.apply(src);
3295 +            f.completeExceptionally(ex);
3296 +            checkCompletedWithWrappedException(src, ex);
3297 +            checkCompletedWithWrappedException(dep, ex);
3298 +            assertSame(resultOf(src), resultOf(dep));
3299 +        }
3300 +
3301 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3302 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3303 +                 fun : funs) {
3304 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3305 +            f.cancel(mayInterruptIfRunning);
3306 +            checkCancelled(f);
3307 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3308 +            checkCompletedWithWrappedCancellationException(src);
3309 +            CompletableFuture<?> dep = fun.apply(src);
3310 +            checkCompletedWithWrappedCancellationException(dep);
3311 +            assertSame(resultOf(src), resultOf(dep));
3312 +        }
3313 +
3314 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3315 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3316 +                 fun : funs) {
3317 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3318 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3319 +            CompletableFuture<?> dep = fun.apply(src);
3320 +            f.cancel(mayInterruptIfRunning);
3321 +            checkCancelled(f);
3322 +            checkCompletedWithWrappedCancellationException(src);
3323 +            checkCompletedWithWrappedCancellationException(dep);
3324 +            assertSame(resultOf(src), resultOf(dep));
3325 +        }
3326 +    }}
3327 +
3328   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines