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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines