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.32 by jsr166, Mon May 26 17:25:36 2014 UTC vs.
Revision 1.209 by jsr166, Sun Sep 23 17:02:24 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines