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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines