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.19 by jsr166, Sun Apr 7 15:04:14 2013 UTC vs.
Revision 1.99 by jsr166, Wed Jan 7 07:59:20 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines