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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines