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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines