ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.19 by jsr166, Sun Apr 7 15:04:14 2013 UTC vs.
Revision 1.164 by jsr166, Sun Jul 3 18:58:15 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines