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.8 by jsr166, Fri Mar 22 22:27:04 2013 UTC vs.
Revision 1.121 by jsr166, Sun Sep 6 21:14:12 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines