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.11 by jsr166, Sun Mar 31 18:14:19 2013 UTC vs.
Revision 1.126 by jsr166, Fri Oct 2 21:08:48 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines