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.31 by jsr166, Mon Sep 9 06:48:27 2013 UTC vs.
Revision 1.203 by jsr166, Sat Sep 22 22:25:12 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 AtomicInteger a = new AtomicInteger(0);
930 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
931 >        if (!createIncomplete) assertTrue(f.complete(v1));
932 >        final CompletableFuture<Integer> g = m.exceptionally
933 >            (f, (Throwable t) -> {
934 >                a.getAndIncrement();
935 >                threadFail("should not be called");
936 >                return null;            // unreached
937 >            });
938 >        if (createIncomplete) assertTrue(f.complete(v1));
939 >
940 >        checkCompletedNormally(g, v1);
941 >        checkCompletedNormally(f, v1);
942 >        assertEquals(0, a.get());
943 >    }}
944  
945      /**
946 <     * acceptEither result completes normally after normal completion
947 <     * of either source
946 >     * exceptionally action completes with function value on source
947 >     * exception
948       */
949 <    public void testAcceptEither() {
950 <        CompletableFuture<Integer> f = new CompletableFuture<>();
951 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
952 <        IncAction r = new IncAction();
953 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
954 <        f.complete(one);
955 <        checkCompletedNormally(g, null);
956 <        f2.complete(one);
957 <        checkCompletedNormally(g, null);
958 <        assertEquals(r.value, 2);
959 <
960 <        r = new IncAction();
961 <        f = new CompletableFuture<>();
962 <        f.complete(one);
963 <        f2 = new CompletableFuture<>();
964 <        g = f.acceptEither(f2, r);
965 <        checkCompletedNormally(g, null);
966 <        assertEquals(r.value, 2);
967 <    }
949 >    public void testExceptionally_exceptionalCompletion() {
950 >        for (ExecutionMode m : ExecutionMode.values())
951 >        for (boolean createIncomplete : new boolean[] { true, false })
952 >        for (Integer v1 : new Integer[] { 1, null })
953 >    {
954 >        final AtomicInteger a = new AtomicInteger(0);
955 >        final CFException ex = new CFException();
956 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
957 >        if (!createIncomplete) f.completeExceptionally(ex);
958 >        final CompletableFuture<Integer> g = m.exceptionally
959 >            (f, (Throwable t) -> {
960 >                m.checkExecutionMode();
961 >                threadAssertSame(t, ex);
962 >                a.getAndIncrement();
963 >                return v1;
964 >            });
965 >        if (createIncomplete) f.completeExceptionally(ex);
966 >
967 >        checkCompletedNormally(g, v1);
968 >        assertEquals(1, a.get());
969 >    }}
970 >
971 >    /**
972 >     * If an "exceptionally action" throws an exception, it completes
973 >     * exceptionally with that exception
974 >     */
975 >    public void testExceptionally_exceptionalCompletionActionFailed() {
976 >        for (ExecutionMode m : ExecutionMode.values())
977 >        for (boolean createIncomplete : new boolean[] { true, false })
978 >    {
979 >        final AtomicInteger a = new AtomicInteger(0);
980 >        final CFException ex1 = new CFException();
981 >        final CFException ex2 = new CFException();
982 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
983 >        if (!createIncomplete) f.completeExceptionally(ex1);
984 >        final CompletableFuture<Integer> g = m.exceptionally
985 >            (f, (Throwable t) -> {
986 >                m.checkExecutionMode();
987 >                threadAssertSame(t, ex1);
988 >                a.getAndIncrement();
989 >                throw ex2;
990 >            });
991 >        if (createIncomplete) f.completeExceptionally(ex1);
992 >
993 >        checkCompletedWithWrappedException(g, ex2);
994 >        checkCompletedExceptionally(f, ex1);
995 >        assertEquals(1, a.get());
996 >    }}
997  
998      /**
999 <     * acceptEither result completes exceptionally after exceptional
1000 <     * completion of either source
999 >     * whenComplete action executes on normal completion, propagating
1000 >     * source result.
1001       */
1002 <    public void testAcceptEither2() {
1003 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1004 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1005 <        IncAction r = new IncAction();
1006 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1007 <        f.completeExceptionally(new CFException());
1008 <        f2.complete(one);
1009 <        checkCompletedWithWrappedCFException(g);
1010 <
1011 <        r = new IncAction();
1012 <        f = new CompletableFuture<>();
1013 <        f2 = new CompletableFuture<>();
1014 <        f2.completeExceptionally(new CFException());
1015 <        g = f.acceptEither(f2, r);
1016 <        checkCompletedWithWrappedCFException(g);
1017 <    }
1002 >    public void testWhenComplete_normalCompletion() {
1003 >        for (ExecutionMode m : ExecutionMode.values())
1004 >        for (boolean createIncomplete : new boolean[] { true, false })
1005 >        for (Integer v1 : new Integer[] { 1, null })
1006 >    {
1007 >        final AtomicInteger a = new AtomicInteger(0);
1008 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1009 >        if (!createIncomplete) assertTrue(f.complete(v1));
1010 >        final CompletableFuture<Integer> g = m.whenComplete
1011 >            (f,
1012 >             (Integer result, Throwable t) -> {
1013 >                m.checkExecutionMode();
1014 >                threadAssertSame(result, v1);
1015 >                threadAssertNull(t);
1016 >                a.getAndIncrement();
1017 >            });
1018 >        if (createIncomplete) assertTrue(f.complete(v1));
1019 >
1020 >        checkCompletedNormally(g, v1);
1021 >        checkCompletedNormally(f, v1);
1022 >        assertEquals(1, a.get());
1023 >    }}
1024  
1025      /**
1026 <     * acceptEither result completes exceptionally if action does
1026 >     * whenComplete action executes on exceptional completion, propagating
1027 >     * source result.
1028       */
1029 <    public void testAcceptEither3() {
1030 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1031 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1032 <        FailingConsumer r = new FailingConsumer();
1033 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1034 <        f2.complete(two);
1035 <        checkCompletedWithWrappedCFException(g);
1036 <    }
1029 >    public void testWhenComplete_exceptionalCompletion() {
1030 >        for (ExecutionMode m : ExecutionMode.values())
1031 >        for (boolean createIncomplete : new boolean[] { true, false })
1032 >    {
1033 >        final AtomicInteger a = new AtomicInteger(0);
1034 >        final CFException ex = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >        if (!createIncomplete) f.completeExceptionally(ex);
1037 >        final CompletableFuture<Integer> g = m.whenComplete
1038 >            (f,
1039 >             (Integer result, Throwable t) -> {
1040 >                m.checkExecutionMode();
1041 >                threadAssertNull(result);
1042 >                threadAssertSame(t, ex);
1043 >                a.getAndIncrement();
1044 >            });
1045 >        if (createIncomplete) f.completeExceptionally(ex);
1046 >
1047 >        checkCompletedWithWrappedException(g, ex);
1048 >        checkCompletedExceptionally(f, ex);
1049 >        assertEquals(1, a.get());
1050 >    }}
1051 >
1052 >    /**
1053 >     * whenComplete action executes on cancelled source, propagating
1054 >     * CancellationException.
1055 >     */
1056 >    public void testWhenComplete_sourceCancelled() {
1057 >        for (ExecutionMode m : ExecutionMode.values())
1058 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1059 >        for (boolean createIncomplete : new boolean[] { true, false })
1060 >    {
1061 >        final AtomicInteger a = new AtomicInteger(0);
1062 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1063 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1064 >        final CompletableFuture<Integer> g = m.whenComplete
1065 >            (f,
1066 >             (Integer result, Throwable t) -> {
1067 >                m.checkExecutionMode();
1068 >                threadAssertNull(result);
1069 >                threadAssertTrue(t instanceof CancellationException);
1070 >                a.getAndIncrement();
1071 >            });
1072 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1073  
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));
1074          checkCompletedWithWrappedCancellationException(g);
1075 <    }
1076 <
1077 <    /**
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 <    }
1075 >        checkCancelled(f);
1076 >        assertEquals(1, a.get());
1077 >    }}
1078  
1079      /**
1080 <     * runAfterEither result completes exceptionally if either source cancelled
1080 >     * If a whenComplete action throws an exception when triggered by
1081 >     * a normal completion, it completes exceptionally
1082       */
1083 <    public void testRunAfterEither4() {
1084 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1085 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1086 <        Noop r = new Noop();
1087 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1088 <        assertTrue(f.cancel(true));
1089 <        checkCompletedWithWrappedCancellationException(g);
1090 <        f = new CompletableFuture<>();
1091 <        f2 = new CompletableFuture<>();
1092 <        assertTrue(f2.cancel(true));
1093 <        checkCompletedWithWrappedCancellationException(g);
1094 <    }
1083 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1084 >        for (boolean createIncomplete : new boolean[] { true, false })
1085 >        for (ExecutionMode m : ExecutionMode.values())
1086 >        for (Integer v1 : new Integer[] { 1, null })
1087 >    {
1088 >        final AtomicInteger a = new AtomicInteger(0);
1089 >        final CFException ex = new CFException();
1090 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1091 >        if (!createIncomplete) assertTrue(f.complete(v1));
1092 >        final CompletableFuture<Integer> g = m.whenComplete
1093 >            (f,
1094 >             (Integer result, Throwable t) -> {
1095 >                m.checkExecutionMode();
1096 >                threadAssertSame(result, v1);
1097 >                threadAssertNull(t);
1098 >                a.getAndIncrement();
1099 >                throw ex;
1100 >            });
1101 >        if (createIncomplete) assertTrue(f.complete(v1));
1102 >
1103 >        checkCompletedWithWrappedException(g, ex);
1104 >        checkCompletedNormally(f, v1);
1105 >        assertEquals(1, a.get());
1106 >    }}
1107  
1108      /**
1109 <     * thenCompose result completes normally after normal completion of source
1109 >     * If a whenComplete action throws an exception when triggered by
1110 >     * a source completion that also throws an exception, the source
1111 >     * exception takes precedence (unlike handle)
1112       */
1113 <    public void testThenCompose() {
1114 <        CompletableFuture<Integer> f, g;
1115 <        CompletableFutureInc r;
1116 <
1117 <        f = new CompletableFuture<>();
1118 <        g = f.thenCompose(r = new CompletableFutureInc());
1119 <        f.complete(one);
1120 <        checkCompletedNormally(g, two);
1121 <        assertTrue(r.ran);
1122 <
1123 <        f = new CompletableFuture<>();
1124 <        f.complete(one);
1125 <        g = f.thenCompose(r = new CompletableFutureInc());
1126 <        checkCompletedNormally(g, two);
1127 <        assertTrue(r.ran);
1128 <    }
1113 >    public void testWhenComplete_sourceFailedActionFailed() {
1114 >        for (boolean createIncomplete : new boolean[] { true, false })
1115 >        for (ExecutionMode m : ExecutionMode.values())
1116 >    {
1117 >        final AtomicInteger a = new AtomicInteger(0);
1118 >        final CFException ex1 = new CFException();
1119 >        final CFException ex2 = new CFException();
1120 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1121 >
1122 >        if (!createIncomplete) f.completeExceptionally(ex1);
1123 >        final CompletableFuture<Integer> g = m.whenComplete
1124 >            (f,
1125 >             (Integer result, Throwable t) -> {
1126 >                m.checkExecutionMode();
1127 >                threadAssertSame(t, ex1);
1128 >                threadAssertNull(result);
1129 >                a.getAndIncrement();
1130 >                throw ex2;
1131 >            });
1132 >        if (createIncomplete) f.completeExceptionally(ex1);
1133 >
1134 >        checkCompletedWithWrappedException(g, ex1);
1135 >        checkCompletedExceptionally(f, ex1);
1136 >        if (testImplementationDetails) {
1137 >            assertEquals(1, ex1.getSuppressed().length);
1138 >            assertSame(ex2, ex1.getSuppressed()[0]);
1139 >        }
1140 >        assertEquals(1, a.get());
1141 >    }}
1142  
1143      /**
1144 <     * thenCompose result completes exceptionally after exceptional
1144 >     * handle action completes normally with function value on normal
1145       * completion of source
1146       */
1147 <    public void testThenCompose2() {
1148 <        CompletableFuture<Integer> f, g;
1149 <        CompletableFutureInc r;
1150 <
1151 <        f = new CompletableFuture<>();
1152 <        g = f.thenCompose(r = new CompletableFutureInc());
1153 <        f.completeExceptionally(new CFException());
1154 <        checkCompletedWithWrappedCFException(g);
1155 <
1156 <        f = new CompletableFuture<>();
1157 <        f.completeExceptionally(new CFException());
1158 <        g = f.thenCompose(r = new CompletableFutureInc());
1159 <        checkCompletedWithWrappedCFException(g);
1160 <    }
1147 >    public void testHandle_normalCompletion() {
1148 >        for (ExecutionMode m : ExecutionMode.values())
1149 >        for (boolean createIncomplete : new boolean[] { true, false })
1150 >        for (Integer v1 : new Integer[] { 1, null })
1151 >    {
1152 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1153 >        final AtomicInteger a = new AtomicInteger(0);
1154 >        if (!createIncomplete) assertTrue(f.complete(v1));
1155 >        final CompletableFuture<Integer> g = m.handle
1156 >            (f,
1157 >             (Integer result, Throwable t) -> {
1158 >                m.checkExecutionMode();
1159 >                threadAssertSame(result, v1);
1160 >                threadAssertNull(t);
1161 >                a.getAndIncrement();
1162 >                return inc(v1);
1163 >            });
1164 >        if (createIncomplete) assertTrue(f.complete(v1));
1165 >
1166 >        checkCompletedNormally(g, inc(v1));
1167 >        checkCompletedNormally(f, v1);
1168 >        assertEquals(1, a.get());
1169 >    }}
1170  
1171      /**
1172 <     * thenCompose result completes exceptionally if action does
1172 >     * handle action completes normally with function value on
1173 >     * exceptional completion of source
1174       */
1175 <    public void testThenCompose3() {
1176 <        CompletableFuture<Integer> f, g;
1177 <        FailingCompletableFutureFunction r;
1175 >    public void testHandle_exceptionalCompletion() {
1176 >        for (ExecutionMode m : ExecutionMode.values())
1177 >        for (boolean createIncomplete : new boolean[] { true, false })
1178 >        for (Integer v1 : new Integer[] { 1, null })
1179 >    {
1180 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1181 >        final AtomicInteger a = new AtomicInteger(0);
1182 >        final CFException ex = new CFException();
1183 >        if (!createIncomplete) f.completeExceptionally(ex);
1184 >        final CompletableFuture<Integer> g = m.handle
1185 >            (f,
1186 >             (Integer result, Throwable t) -> {
1187 >                m.checkExecutionMode();
1188 >                threadAssertNull(result);
1189 >                threadAssertSame(t, ex);
1190 >                a.getAndIncrement();
1191 >                return v1;
1192 >            });
1193 >        if (createIncomplete) f.completeExceptionally(ex);
1194 >
1195 >        checkCompletedNormally(g, v1);
1196 >        checkCompletedExceptionally(f, ex);
1197 >        assertEquals(1, a.get());
1198 >    }}
1199 >
1200 >    /**
1201 >     * handle action completes normally with function value on
1202 >     * cancelled source
1203 >     */
1204 >    public void testHandle_sourceCancelled() {
1205 >        for (ExecutionMode m : ExecutionMode.values())
1206 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1207 >        for (boolean createIncomplete : new boolean[] { true, false })
1208 >        for (Integer v1 : new Integer[] { 1, null })
1209 >    {
1210 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1211 >        final AtomicInteger a = new AtomicInteger(0);
1212 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1213 >        final CompletableFuture<Integer> g = m.handle
1214 >            (f,
1215 >             (Integer result, Throwable t) -> {
1216 >                m.checkExecutionMode();
1217 >                threadAssertNull(result);
1218 >                threadAssertTrue(t instanceof CancellationException);
1219 >                a.getAndIncrement();
1220 >                return v1;
1221 >            });
1222 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1223  
1224 <        f = new CompletableFuture<>();
1225 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1226 <        f.complete(one);
1227 <        checkCompletedWithWrappedCFException(g);
1294 <
1295 <        f = new CompletableFuture<>();
1296 <        f.complete(one);
1297 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1298 <        checkCompletedWithWrappedCFException(g);
1299 <    }
1224 >        checkCompletedNormally(g, v1);
1225 >        checkCancelled(f);
1226 >        assertEquals(1, a.get());
1227 >    }}
1228  
1229      /**
1230 <     * thenCompose result completes exceptionally if source cancelled
1230 >     * If a "handle action" throws an exception when triggered by
1231 >     * a normal completion, it completes exceptionally
1232       */
1233 <    public void testThenCompose4() {
1234 <        CompletableFuture<Integer> f, g;
1235 <        CompletableFutureInc r;
1236 <
1237 <        f = new CompletableFuture<>();
1238 <        g = f.thenCompose(r = new CompletableFutureInc());
1239 <        assertTrue(f.cancel(true));
1240 <        checkCompletedWithWrappedCancellationException(g);
1241 <
1242 <        f = new CompletableFuture<>();
1243 <        assertTrue(f.cancel(true));
1244 <        g = f.thenCompose(r = new CompletableFutureInc());
1245 <        checkCompletedWithWrappedCancellationException(g);
1246 <    }
1247 <
1248 <    // asyncs
1233 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1234 >        for (ExecutionMode m : ExecutionMode.values())
1235 >        for (boolean createIncomplete : new boolean[] { true, false })
1236 >        for (Integer v1 : new Integer[] { 1, null })
1237 >    {
1238 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1239 >        final AtomicInteger a = new AtomicInteger(0);
1240 >        final CFException ex = new CFException();
1241 >        if (!createIncomplete) assertTrue(f.complete(v1));
1242 >        final CompletableFuture<Integer> g = m.handle
1243 >            (f,
1244 >             (Integer result, Throwable t) -> {
1245 >                m.checkExecutionMode();
1246 >                threadAssertSame(result, v1);
1247 >                threadAssertNull(t);
1248 >                a.getAndIncrement();
1249 >                throw ex;
1250 >            });
1251 >        if (createIncomplete) assertTrue(f.complete(v1));
1252 >
1253 >        checkCompletedWithWrappedException(g, ex);
1254 >        checkCompletedNormally(f, v1);
1255 >        assertEquals(1, a.get());
1256 >    }}
1257 >
1258 >    /**
1259 >     * If a "handle action" throws an exception when triggered by
1260 >     * a source completion that also throws an exception, the action
1261 >     * exception takes precedence (unlike whenComplete)
1262 >     */
1263 >    public void testHandle_sourceFailedActionFailed() {
1264 >        for (boolean createIncomplete : new boolean[] { true, false })
1265 >        for (ExecutionMode m : ExecutionMode.values())
1266 >    {
1267 >        final AtomicInteger a = new AtomicInteger(0);
1268 >        final CFException ex1 = new CFException();
1269 >        final CFException ex2 = new CFException();
1270 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 >
1272 >        if (!createIncomplete) f.completeExceptionally(ex1);
1273 >        final CompletableFuture<Integer> g = m.handle
1274 >            (f,
1275 >             (Integer result, Throwable t) -> {
1276 >                m.checkExecutionMode();
1277 >                threadAssertNull(result);
1278 >                threadAssertSame(ex1, t);
1279 >                a.getAndIncrement();
1280 >                throw ex2;
1281 >            });
1282 >        if (createIncomplete) f.completeExceptionally(ex1);
1283 >
1284 >        checkCompletedWithWrappedException(g, ex2);
1285 >        checkCompletedExceptionally(f, ex1);
1286 >        assertEquals(1, a.get());
1287 >    }}
1288  
1289      /**
1290 <     * thenRunAsync result completes normally after normal completion of source
1290 >     * runAsync completes after running Runnable
1291       */
1292 <    public void testThenRunAsync() {
1293 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1294 <        Noop r = new Noop();
1295 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1296 <        f.complete(null);
1297 <        checkCompletedNormally(g, null);
1298 <
1299 <        // reordered version
1300 <        f = new CompletableFuture<>();
1301 <        f.complete(null);
1302 <        r = new Noop();
1303 <        g = f.thenRunAsync(r);
1304 <        checkCompletedNormally(g, null);
1337 <    }
1292 >    public void testRunAsync_normalCompletion() {
1293 >        ExecutionMode[] executionModes = {
1294 >            ExecutionMode.ASYNC,
1295 >            ExecutionMode.EXECUTOR,
1296 >        };
1297 >        for (ExecutionMode m : executionModes)
1298 >    {
1299 >        final Noop r = new Noop(m);
1300 >        final CompletableFuture<Void> f = m.runAsync(r);
1301 >        assertNull(f.join());
1302 >        checkCompletedNormally(f, null);
1303 >        r.assertInvoked();
1304 >    }}
1305  
1306      /**
1307 <     * thenRunAsync result completes exceptionally after exceptional
1341 <     * completion of source
1307 >     * failing runAsync completes exceptionally after running Runnable
1308       */
1309 <    public void testThenRunAsync2() {
1310 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1311 <        Noop r = new Noop();
1312 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1313 <        f.completeExceptionally(new CFException());
1309 >    public void testRunAsync_exceptionalCompletion() {
1310 >        ExecutionMode[] executionModes = {
1311 >            ExecutionMode.ASYNC,
1312 >            ExecutionMode.EXECUTOR,
1313 >        };
1314 >        for (ExecutionMode m : executionModes)
1315 >    {
1316 >        final FailingRunnable r = new FailingRunnable(m);
1317 >        final CompletableFuture<Void> f = m.runAsync(r);
1318 >        checkCompletedWithWrappedException(f, r.ex);
1319 >        r.assertInvoked();
1320 >    }}
1321 >
1322 >    @SuppressWarnings("FutureReturnValueIgnored")
1323 >    public void testRunAsync_rejectingExecutor() {
1324 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1325          try {
1326 <            g.join();
1326 >            CompletableFuture.runAsync(() -> {}, e);
1327              shouldThrow();
1328 <        } catch (CompletionException success) {}
1329 <        checkCompletedWithWrappedCFException(g);
1330 <    }
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 <    }
1328 >        } catch (Throwable t) {
1329 >            assertSame(e.ex, t);
1330 >        }
1331  
1332 <    /**
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);
1332 >        assertEquals(1, e.count.get());
1333      }
1334  
1335      /**
1336 <     * thenApplyAsync result completes normally after normal completion of source
1336 >     * supplyAsync completes with result of supplier
1337       */
1338 <    public void testThenApplyAsync() {
1339 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1340 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1341 <        f.complete(one);
1342 <        checkCompletedNormally(g, two);
1343 <    }
1338 >    public void testSupplyAsync_normalCompletion() {
1339 >        ExecutionMode[] executionModes = {
1340 >            ExecutionMode.ASYNC,
1341 >            ExecutionMode.EXECUTOR,
1342 >        };
1343 >        for (ExecutionMode m : executionModes)
1344 >        for (Integer v1 : new Integer[] { 1, null })
1345 >    {
1346 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1347 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1348 >        assertSame(v1, f.join());
1349 >        checkCompletedNormally(f, v1);
1350 >        r.assertInvoked();
1351 >    }}
1352  
1353      /**
1354 <     * thenApplyAsync result completes exceptionally after exceptional
1389 <     * completion of source
1354 >     * Failing supplyAsync completes exceptionally
1355       */
1356 <    public void testThenApplyAsync2() {
1357 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1358 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1359 <        f.completeExceptionally(new CFException());
1360 <        checkCompletedWithWrappedCFException(g);
1361 <    }
1356 >    public void testSupplyAsync_exceptionalCompletion() {
1357 >        ExecutionMode[] executionModes = {
1358 >            ExecutionMode.ASYNC,
1359 >            ExecutionMode.EXECUTOR,
1360 >        };
1361 >        for (ExecutionMode m : executionModes)
1362 >    {
1363 >        FailingSupplier r = new FailingSupplier(m);
1364 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1365 >        checkCompletedWithWrappedException(f, r.ex);
1366 >        r.assertInvoked();
1367 >    }}
1368 >
1369 >    @SuppressWarnings("FutureReturnValueIgnored")
1370 >    public void testSupplyAsync_rejectingExecutor() {
1371 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1372 >        try {
1373 >            CompletableFuture.supplyAsync(() -> null, e);
1374 >            shouldThrow();
1375 >        } catch (Throwable t) {
1376 >            assertSame(e.ex, t);
1377 >        }
1378  
1379 <    /**
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);
1379 >        assertEquals(1, e.count.get());
1380      }
1381  
1382 <    /**
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 <    }
1382 >    // seq completion methods
1383  
1384      /**
1385 <     * thenAcceptAsync result completes normally after normal
1421 <     * completion of source
1385 >     * thenRun result completes normally after normal completion of source
1386       */
1387 <    public void testThenAcceptAsync() {
1388 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1389 <        IncAction r = new IncAction();
1390 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1391 <        f.complete(one);
1392 <        checkCompletedNormally(g, null);
1393 <        assertEquals(r.value, 2);
1394 <    }
1387 >    public void testThenRun_normalCompletion() {
1388 >        for (ExecutionMode m : ExecutionMode.values())
1389 >        for (Integer v1 : new Integer[] { 1, null })
1390 >    {
1391 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1392 >        final Noop[] rs = new Noop[6];
1393 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1394 >
1395 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1396 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1397 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1398 >        checkIncomplete(h0);
1399 >        checkIncomplete(h1);
1400 >        checkIncomplete(h2);
1401 >        assertTrue(f.complete(v1));
1402 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1403 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1404 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1405 >
1406 >        checkCompletedNormally(h0, null);
1407 >        checkCompletedNormally(h1, null);
1408 >        checkCompletedNormally(h2, null);
1409 >        checkCompletedNormally(h3, null);
1410 >        checkCompletedNormally(h4, null);
1411 >        checkCompletedNormally(h5, null);
1412 >        checkCompletedNormally(f, v1);
1413 >        for (Noop r : rs) r.assertInvoked();
1414 >    }}
1415  
1416      /**
1417 <     * thenAcceptAsync result completes exceptionally after exceptional
1417 >     * thenRun result completes exceptionally after exceptional
1418       * completion of source
1419       */
1420 <    public void testThenAcceptAsync2() {
1421 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1422 <        IncAction r = new IncAction();
1423 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1424 <        f.completeExceptionally(new CFException());
1425 <        checkCompletedWithWrappedCFException(g);
1426 <    }
1427 <
1428 <    /**
1429 <     * thenAcceptAsync result completes exceptionally if action does
1430 <     */
1431 <    public void testThenAcceptAsync3() {
1432 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1433 <        FailingConsumer r = new FailingConsumer();
1434 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1435 <        f.complete(null);
1436 <        checkCompletedWithWrappedCFException(g);
1437 <    }
1438 <
1439 <    /**
1440 <     * thenAcceptAsync result completes exceptionally if source cancelled
1441 <     */
1442 <    public void testThenAcceptAsync4() {
1443 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1444 <        IncAction r = new IncAction();
1445 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1446 <        assertTrue(f.cancel(true));
1447 <        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 <    }
1420 >    public void testThenRun_exceptionalCompletion() {
1421 >        for (ExecutionMode m : ExecutionMode.values())
1422 >    {
1423 >        final CFException ex = new CFException();
1424 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1425 >        final Noop[] rs = new Noop[6];
1426 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1427 >
1428 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1429 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1430 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1431 >        checkIncomplete(h0);
1432 >        checkIncomplete(h1);
1433 >        checkIncomplete(h2);
1434 >        assertTrue(f.completeExceptionally(ex));
1435 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1436 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1437 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1438 >
1439 >        checkCompletedWithWrappedException(h0, ex);
1440 >        checkCompletedWithWrappedException(h1, ex);
1441 >        checkCompletedWithWrappedException(h2, ex);
1442 >        checkCompletedWithWrappedException(h3, ex);
1443 >        checkCompletedWithWrappedException(h4, ex);
1444 >        checkCompletedWithWrappedException(h5, ex);
1445 >        checkCompletedExceptionally(f, ex);
1446 >        for (Noop r : rs) r.assertNotInvoked();
1447 >    }}
1448  
1449      /**
1450 <     * thenCombineAsync result completes exceptionally if action does
1450 >     * thenRun result completes exceptionally if source cancelled
1451       */
1452 <    public void testThenCombineAsync3() {
1453 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1454 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1455 <        FailingBiFunction r = new FailingBiFunction();
1456 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1457 <        f.complete(one);
1458 <        checkIncomplete(g);
1459 <        assertFalse(r.ran);
1460 <        f2.complete(two);
1461 <        checkCompletedWithWrappedCFException(g);
1462 <        assertTrue(r.ran);
1463 <    }
1452 >    public void testThenRun_sourceCancelled() {
1453 >        for (ExecutionMode m : ExecutionMode.values())
1454 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1455 >    {
1456 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1457 >        final Noop[] rs = new Noop[6];
1458 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1459 >
1460 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1461 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1462 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1463 >        checkIncomplete(h0);
1464 >        checkIncomplete(h1);
1465 >        checkIncomplete(h2);
1466 >        assertTrue(f.cancel(mayInterruptIfRunning));
1467 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1468 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1469 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1470 >
1471 >        checkCompletedWithWrappedCancellationException(h0);
1472 >        checkCompletedWithWrappedCancellationException(h1);
1473 >        checkCompletedWithWrappedCancellationException(h2);
1474 >        checkCompletedWithWrappedCancellationException(h3);
1475 >        checkCompletedWithWrappedCancellationException(h4);
1476 >        checkCompletedWithWrappedCancellationException(h5);
1477 >        checkCancelled(f);
1478 >        for (Noop r : rs) r.assertNotInvoked();
1479 >    }}
1480  
1481      /**
1482 <     * thenCombineAsync result completes exceptionally if either source cancelled
1482 >     * thenRun result completes exceptionally if action does
1483       */
1484 <    public void testThenCombineAsync4() {
1485 <        CompletableFuture<Integer> f, g, h;
1486 <
1487 <        f = new CompletableFuture<>();
1488 <        g = new CompletableFuture<>();
1489 <        h = f.thenCombineAsync(g, subtract);
1490 <        assertTrue(f.cancel(true));
1491 <        checkIncomplete(h);
1492 <        g.complete(1);
1493 <        checkCompletedWithWrappedCancellationException(h);
1494 <
1495 <        f = new CompletableFuture<>();
1496 <        g = new CompletableFuture<>();
1497 <        h = f.thenCombineAsync(g, subtract);
1498 <        assertTrue(g.cancel(true));
1499 <        checkIncomplete(h);
1500 <        f.complete(3);
1501 <        checkCompletedWithWrappedCancellationException(h);
1502 <
1503 <        f = new CompletableFuture<>();
1504 <        g = new CompletableFuture<>();
1505 <        g.complete(3);
1506 <        assertTrue(f.cancel(true));
1507 <        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 <    }
1484 >    public void testThenRun_actionFailed() {
1485 >        for (ExecutionMode m : ExecutionMode.values())
1486 >        for (Integer v1 : new Integer[] { 1, null })
1487 >    {
1488 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1489 >        final FailingRunnable[] rs = new FailingRunnable[6];
1490 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1491 >
1492 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1493 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1494 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1495 >        assertTrue(f.complete(v1));
1496 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1497 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1498 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1499 >
1500 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1501 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1502 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1503 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1504 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1505 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1506 >        checkCompletedNormally(f, v1);
1507 >    }}
1508  
1509      /**
1510 <     * thenAcceptBothAsync result completes normally after normal
1583 <     * completion of sources
1510 >     * thenApply result completes normally after normal completion of source
1511       */
1512 <    public void testThenAcceptBothAsync() {
1513 <        CompletableFuture<Integer> f, g;
1514 <        CompletableFuture<Void> h;
1515 <        SubtractAction r;
1516 <
1517 <        f = new CompletableFuture<>();
1518 <        g = new CompletableFuture<>();
1519 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1520 <        f.complete(3);
1521 <        checkIncomplete(h);
1522 <        g.complete(1);
1523 <        checkCompletedNormally(h, null);
1524 <        assertEquals(r.value, 2);
1525 <
1526 <        f = new CompletableFuture<>();
1527 <        g = new CompletableFuture<>();
1528 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1529 <        g.complete(1);
1530 <        checkIncomplete(h);
1531 <        f.complete(3);
1532 <        checkCompletedNormally(h, null);
1533 <        assertEquals(r.value, 2);
1534 <
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 <    }
1512 >    public void testThenApply_normalCompletion() {
1513 >        for (ExecutionMode m : ExecutionMode.values())
1514 >        for (Integer v1 : new Integer[] { 1, null })
1515 >    {
1516 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1517 >        final IncFunction[] rs = new IncFunction[4];
1518 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1519 >
1520 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1521 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1522 >        checkIncomplete(h0);
1523 >        checkIncomplete(h1);
1524 >        assertTrue(f.complete(v1));
1525 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1526 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1527 >
1528 >        checkCompletedNormally(h0, inc(v1));
1529 >        checkCompletedNormally(h1, inc(v1));
1530 >        checkCompletedNormally(h2, inc(v1));
1531 >        checkCompletedNormally(h3, inc(v1));
1532 >        checkCompletedNormally(f, v1);
1533 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1534 >    }}
1535  
1536      /**
1537 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1537 >     * thenApply result completes exceptionally after exceptional
1538       * completion of source
1539       */
1540 <    public void testThenAcceptBothAsync2() {
1541 <        CompletableFuture<Integer> f, g;
1542 <        CompletableFuture<Void> h;
1543 <        SubtractAction r;
1544 <
1545 <        f = new CompletableFuture<>();
1546 <        g = new CompletableFuture<>();
1547 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1548 <        f.completeExceptionally(new CFException());
1549 <        checkIncomplete(h);
1550 <        g.complete(1);
1551 <        checkCompletedWithWrappedCFException(h);
1552 <
1553 <        f = new CompletableFuture<>();
1554 <        g = new CompletableFuture<>();
1555 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1556 <        g.completeExceptionally(new CFException());
1557 <        checkIncomplete(h);
1558 <        f.complete(3);
1559 <        checkCompletedWithWrappedCFException(h);
1560 <
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 <    }
1540 >    public void testThenApply_exceptionalCompletion() {
1541 >        for (ExecutionMode m : ExecutionMode.values())
1542 >    {
1543 >        final CFException ex = new CFException();
1544 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1545 >        final IncFunction[] rs = new IncFunction[4];
1546 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1547 >
1548 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1549 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1550 >        assertTrue(f.completeExceptionally(ex));
1551 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1552 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1553 >
1554 >        checkCompletedWithWrappedException(h0, ex);
1555 >        checkCompletedWithWrappedException(h1, ex);
1556 >        checkCompletedWithWrappedException(h2, ex);
1557 >        checkCompletedWithWrappedException(h3, ex);
1558 >        checkCompletedExceptionally(f, ex);
1559 >        for (IncFunction r : rs) r.assertNotInvoked();
1560 >    }}
1561  
1562      /**
1563 <     * thenAcceptBothAsync result completes exceptionally if action does
1563 >     * thenApply result completes exceptionally if source cancelled
1564       */
1565 <    public void testThenAcceptBothAsync3() {
1566 <        CompletableFuture<Integer> f, g;
1567 <        CompletableFuture<Void> h;
1568 <        FailingBiConsumer r;
1569 <
1570 <        f = new CompletableFuture<>();
1571 <        g = new CompletableFuture<>();
1572 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1573 <        f.complete(3);
1574 <        checkIncomplete(h);
1575 <        g.complete(1);
1576 <        checkCompletedWithWrappedCFException(h);
1577 <
1578 <        f = new CompletableFuture<>();
1579 <        g = new CompletableFuture<>();
1580 <        f.complete(3);
1581 <        g.complete(1);
1582 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1583 <        checkCompletedWithWrappedCFException(h);
1584 <    }
1565 >    public void testThenApply_sourceCancelled() {
1566 >        for (ExecutionMode m : ExecutionMode.values())
1567 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1568 >    {
1569 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1570 >        final IncFunction[] rs = new IncFunction[4];
1571 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1572 >
1573 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1574 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1575 >        assertTrue(f.cancel(mayInterruptIfRunning));
1576 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1577 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1578 >
1579 >        checkCompletedWithWrappedCancellationException(h0);
1580 >        checkCompletedWithWrappedCancellationException(h1);
1581 >        checkCompletedWithWrappedCancellationException(h2);
1582 >        checkCompletedWithWrappedCancellationException(h3);
1583 >        checkCancelled(f);
1584 >        for (IncFunction r : rs) r.assertNotInvoked();
1585 >    }}
1586  
1587      /**
1588 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1588 >     * thenApply result completes exceptionally if action does
1589       */
1590 <    public void testThenAcceptBothAsync4() {
1591 <        CompletableFuture<Integer> f, g;
1592 <        CompletableFuture<Void> h;
1593 <        SubtractAction r;
1594 <
1595 <        f = new CompletableFuture<>();
1596 <        g = new CompletableFuture<>();
1597 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1598 <        assertTrue(f.cancel(true));
1599 <        checkIncomplete(h);
1600 <        g.complete(1);
1601 <        checkCompletedWithWrappedCancellationException(h);
1602 <
1603 <        f = new CompletableFuture<>();
1604 <        g = new CompletableFuture<>();
1605 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1606 <        assertTrue(g.cancel(true));
1607 <        checkIncomplete(h);
1608 <        f.complete(3);
1609 <        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 <    }
1590 >    public void testThenApply_actionFailed() {
1591 >        for (ExecutionMode m : ExecutionMode.values())
1592 >        for (Integer v1 : new Integer[] { 1, null })
1593 >    {
1594 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1595 >        final FailingFunction[] rs = new FailingFunction[4];
1596 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1597 >
1598 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1599 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1600 >        assertTrue(f.complete(v1));
1601 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1602 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1603 >
1604 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1605 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1606 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1607 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1608 >        checkCompletedNormally(f, v1);
1609 >    }}
1610  
1611      /**
1612 <     * runAfterBothAsync result completes normally after normal
1722 <     * completion of sources
1612 >     * thenAccept result completes normally after normal completion of source
1613       */
1614 <    public void testRunAfterBothAsync() {
1615 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1616 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1617 <        Noop r = new Noop();
1618 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1619 <        f.complete(one);
1620 <        checkIncomplete(g);
1621 <        f2.complete(two);
1622 <        checkCompletedNormally(g, null);
1623 <        assertTrue(r.ran);
1624 <    }
1614 >    public void testThenAccept_normalCompletion() {
1615 >        for (ExecutionMode m : ExecutionMode.values())
1616 >        for (Integer v1 : new Integer[] { 1, null })
1617 >    {
1618 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1619 >        final NoopConsumer[] rs = new NoopConsumer[4];
1620 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1621 >
1622 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1623 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1624 >        checkIncomplete(h0);
1625 >        checkIncomplete(h1);
1626 >        assertTrue(f.complete(v1));
1627 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1628 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1629 >
1630 >        checkCompletedNormally(h0, null);
1631 >        checkCompletedNormally(h1, null);
1632 >        checkCompletedNormally(h2, null);
1633 >        checkCompletedNormally(h3, null);
1634 >        checkCompletedNormally(f, v1);
1635 >        for (NoopConsumer r : rs) r.assertValue(v1);
1636 >    }}
1637  
1638      /**
1639 <     * runAfterBothAsync result completes exceptionally after exceptional
1639 >     * thenAccept result completes exceptionally after exceptional
1640       * completion of source
1641       */
1642 <    public void testRunAfterBothAsync2() {
1643 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1644 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1645 <        Noop r = new Noop();
1646 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1647 <        f.completeExceptionally(new CFException());
1648 <        f2.complete(two);
1649 <        checkCompletedWithWrappedCFException(g);
1650 <
1651 <        r = new Noop();
1652 <        f = new CompletableFuture<>();
1653 <        f2 = new CompletableFuture<>();
1654 <        g = f.runAfterBothAsync(f2, r);
1655 <        f.complete(one);
1656 <        f2.completeExceptionally(new CFException());
1657 <        checkCompletedWithWrappedCFException(g);
1658 <    }
1642 >    public void testThenAccept_exceptionalCompletion() {
1643 >        for (ExecutionMode m : ExecutionMode.values())
1644 >    {
1645 >        final CFException ex = new CFException();
1646 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1647 >        final NoopConsumer[] rs = new NoopConsumer[4];
1648 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1649 >
1650 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1651 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1652 >        assertTrue(f.completeExceptionally(ex));
1653 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1654 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1655 >
1656 >        checkCompletedWithWrappedException(h0, ex);
1657 >        checkCompletedWithWrappedException(h1, ex);
1658 >        checkCompletedWithWrappedException(h2, ex);
1659 >        checkCompletedWithWrappedException(h3, ex);
1660 >        checkCompletedExceptionally(f, ex);
1661 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1662 >    }}
1663  
1664      /**
1665 <     * runAfterBothAsync result completes exceptionally if action does
1665 >     * thenAccept result completes exceptionally if source cancelled
1666       */
1667 <    public void testRunAfterBothAsync3() {
1668 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1669 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1670 <        FailingNoop r = new FailingNoop();
1671 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1672 <        f.complete(one);
1673 <        checkIncomplete(g);
1674 <        f2.complete(two);
1675 <        checkCompletedWithWrappedCFException(g);
1676 <    }
1667 >    public void testThenAccept_sourceCancelled() {
1668 >        for (ExecutionMode m : ExecutionMode.values())
1669 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1670 >    {
1671 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1672 >        final NoopConsumer[] rs = new NoopConsumer[4];
1673 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1674 >
1675 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1676 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1677 >        assertTrue(f.cancel(mayInterruptIfRunning));
1678 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1679 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1680 >
1681 >        checkCompletedWithWrappedCancellationException(h0);
1682 >        checkCompletedWithWrappedCancellationException(h1);
1683 >        checkCompletedWithWrappedCancellationException(h2);
1684 >        checkCompletedWithWrappedCancellationException(h3);
1685 >        checkCancelled(f);
1686 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1687 >    }}
1688  
1689      /**
1690 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1690 >     * thenAccept result completes exceptionally if action does
1691       */
1692 <    public void testRunAfterBothAsync4() {
1693 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1694 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1695 <        Noop r = new Noop();
1696 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1697 <        assertTrue(f.cancel(true));
1698 <        f2.complete(two);
1699 <        checkCompletedWithWrappedCancellationException(g);
1700 <
1701 <        r = new Noop();
1702 <        f = new CompletableFuture<>();
1703 <        f2 = new CompletableFuture<>();
1704 <        g = f.runAfterBothAsync(f2, r);
1705 <        f.complete(one);
1706 <        assertTrue(f2.cancel(true));
1707 <        checkCompletedWithWrappedCancellationException(g);
1708 <    }
1692 >    public void testThenAccept_actionFailed() {
1693 >        for (ExecutionMode m : ExecutionMode.values())
1694 >        for (Integer v1 : new Integer[] { 1, null })
1695 >    {
1696 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1697 >        final FailingConsumer[] rs = new FailingConsumer[4];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1699 >
1700 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1701 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1702 >        assertTrue(f.complete(v1));
1703 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1704 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1705 >
1706 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1707 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1708 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1709 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1710 >        checkCompletedNormally(f, v1);
1711 >    }}
1712  
1713      /**
1714 <     * applyToEitherAsync result completes normally after normal
1715 <     * completion of sources
1714 >     * thenCombine result completes normally after normal completion
1715 >     * of sources
1716       */
1717 <    public void testApplyToEitherAsync() {
1718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1719 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1720 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1721 <        f.complete(one);
1722 <        checkCompletedNormally(g, two);
1723 <
1724 <        f = new CompletableFuture<>();
1725 <        f.complete(one);
1726 <        f2 = new CompletableFuture<>();
1727 <        g = f.applyToEitherAsync(f2, inc);
1728 <        checkCompletedNormally(g, two);
1729 <    }
1717 >    public void testThenCombine_normalCompletion() {
1718 >        for (ExecutionMode m : ExecutionMode.values())
1719 >        for (boolean fFirst : new boolean[] { true, false })
1720 >        for (Integer v1 : new Integer[] { 1, null })
1721 >        for (Integer v2 : new Integer[] { 2, null })
1722 >    {
1723 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1724 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1725 >        final SubtractFunction[] rs = new SubtractFunction[6];
1726 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1727 >
1728 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1729 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1730 >        final Integer w1 =  fFirst ? v1 : v2;
1731 >        final Integer w2 = !fFirst ? v1 : v2;
1732 >
1733 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1734 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1735 >        assertTrue(fst.complete(w1));
1736 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1737 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1738 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1739 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1740 >        checkCompletedNormally(h1, subtract(w1, w1));
1741 >        checkCompletedNormally(h3, subtract(w1, w1));
1742 >        rs[1].assertValue(subtract(w1, w1));
1743 >        rs[3].assertValue(subtract(w1, w1));
1744 >        assertTrue(snd.complete(w2));
1745 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1746 >
1747 >        checkCompletedNormally(h0, subtract(v1, v2));
1748 >        checkCompletedNormally(h2, subtract(v1, v2));
1749 >        checkCompletedNormally(h4, subtract(v1, v2));
1750 >        rs[0].assertValue(subtract(v1, v2));
1751 >        rs[2].assertValue(subtract(v1, v2));
1752 >        rs[4].assertValue(subtract(v1, v2));
1753 >
1754 >        checkCompletedNormally(f, v1);
1755 >        checkCompletedNormally(g, v2);
1756 >    }}
1757  
1758      /**
1759 <     * applyToEitherAsync result completes exceptionally after exceptional
1760 <     * completion of source
1759 >     * thenCombine result completes exceptionally after exceptional
1760 >     * completion of either source
1761       */
1762 <    public void testApplyToEitherAsync2() {
1763 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1764 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1765 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1766 <        f.completeExceptionally(new CFException());
1767 <        checkCompletedWithWrappedCFException(g);
1768 <
1769 <        f = new CompletableFuture<>();
1770 <        f2 = new CompletableFuture<>();
1771 <        f2.completeExceptionally(new CFException());
1772 <        g = f.applyToEitherAsync(f2, inc);
1773 <        f.complete(one);
1774 <        checkCompletedWithWrappedCFException(g);
1775 <    }
1762 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1763 >        for (ExecutionMode m : ExecutionMode.values())
1764 >        for (boolean fFirst : new boolean[] { true, false })
1765 >        for (boolean failFirst : new boolean[] { true, false })
1766 >        for (Integer v1 : new Integer[] { 1, null })
1767 >    {
1768 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1769 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1770 >        final CFException ex = new CFException();
1771 >        final SubtractFunction r1 = new SubtractFunction(m);
1772 >        final SubtractFunction r2 = new SubtractFunction(m);
1773 >        final SubtractFunction r3 = new SubtractFunction(m);
1774 >
1775 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1776 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1777 >        final Callable<Boolean> complete1 = failFirst ?
1778 >            () -> fst.completeExceptionally(ex) :
1779 >            () -> fst.complete(v1);
1780 >        final Callable<Boolean> complete2 = failFirst ?
1781 >            () -> snd.complete(v1) :
1782 >            () -> snd.completeExceptionally(ex);
1783 >
1784 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1785 >        assertTrue(complete1.call());
1786 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1787 >        checkIncomplete(h1);
1788 >        checkIncomplete(h2);
1789 >        assertTrue(complete2.call());
1790 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1791 >
1792 >        checkCompletedWithWrappedException(h1, ex);
1793 >        checkCompletedWithWrappedException(h2, ex);
1794 >        checkCompletedWithWrappedException(h3, ex);
1795 >        r1.assertNotInvoked();
1796 >        r2.assertNotInvoked();
1797 >        r3.assertNotInvoked();
1798 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1799 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1800 >    }}
1801  
1802      /**
1803 <     * applyToEitherAsync result completes exceptionally if action does
1803 >     * thenCombine result completes exceptionally if either source cancelled
1804       */
1805 <    public void testApplyToEitherAsync3() {
1806 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1807 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1808 <        FailingFunction r = new FailingFunction();
1809 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1810 <        f.complete(one);
1811 <        checkCompletedWithWrappedCFException(g);
1812 <    }
1805 >    public void testThenCombine_sourceCancelled() throws Throwable {
1806 >        for (ExecutionMode m : ExecutionMode.values())
1807 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1808 >        for (boolean fFirst : new boolean[] { true, false })
1809 >        for (boolean failFirst : new boolean[] { true, false })
1810 >        for (Integer v1 : new Integer[] { 1, null })
1811 >    {
1812 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1813 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1814 >        final SubtractFunction r1 = new SubtractFunction(m);
1815 >        final SubtractFunction r2 = new SubtractFunction(m);
1816 >        final SubtractFunction r3 = new SubtractFunction(m);
1817 >
1818 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1819 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1820 >        final Callable<Boolean> complete1 = failFirst ?
1821 >            () -> fst.cancel(mayInterruptIfRunning) :
1822 >            () -> fst.complete(v1);
1823 >        final Callable<Boolean> complete2 = failFirst ?
1824 >            () -> snd.complete(v1) :
1825 >            () -> snd.cancel(mayInterruptIfRunning);
1826 >
1827 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1828 >        assertTrue(complete1.call());
1829 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1830 >        checkIncomplete(h1);
1831 >        checkIncomplete(h2);
1832 >        assertTrue(complete2.call());
1833 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1834 >
1835 >        checkCompletedWithWrappedCancellationException(h1);
1836 >        checkCompletedWithWrappedCancellationException(h2);
1837 >        checkCompletedWithWrappedCancellationException(h3);
1838 >        r1.assertNotInvoked();
1839 >        r2.assertNotInvoked();
1840 >        r3.assertNotInvoked();
1841 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1842 >        checkCancelled(failFirst ? fst : snd);
1843 >    }}
1844  
1845      /**
1846 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1846 >     * thenCombine result completes exceptionally if action does
1847       */
1848 <    public void testApplyToEitherAsync4() {
1849 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1850 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1851 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1852 <        assertTrue(f.cancel(true));
1853 <        checkCompletedWithWrappedCancellationException(g);
1854 <
1855 <        f = new CompletableFuture<>();
1856 <        f2 = new CompletableFuture<>();
1857 <        assertTrue(f2.cancel(true));
1858 <        g = f.applyToEitherAsync(f2, inc);
1859 <        checkCompletedWithWrappedCancellationException(g);
1860 <    }
1848 >    public void testThenCombine_actionFailed() {
1849 >        for (ExecutionMode m : ExecutionMode.values())
1850 >        for (boolean fFirst : new boolean[] { true, false })
1851 >        for (Integer v1 : new Integer[] { 1, null })
1852 >        for (Integer v2 : new Integer[] { 2, null })
1853 >    {
1854 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1855 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1857 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1858 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1859 >
1860 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1861 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1862 >        final Integer w1 =  fFirst ? v1 : v2;
1863 >        final Integer w2 = !fFirst ? v1 : v2;
1864 >
1865 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1866 >        assertTrue(fst.complete(w1));
1867 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1868 >        assertTrue(snd.complete(w2));
1869 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1870 >
1871 >        checkCompletedWithWrappedException(h1, r1.ex);
1872 >        checkCompletedWithWrappedException(h2, r2.ex);
1873 >        checkCompletedWithWrappedException(h3, r3.ex);
1874 >        r1.assertInvoked();
1875 >        r2.assertInvoked();
1876 >        r3.assertInvoked();
1877 >        checkCompletedNormally(f, v1);
1878 >        checkCompletedNormally(g, v2);
1879 >    }}
1880  
1881      /**
1882 <     * acceptEitherAsync result completes normally after normal
1882 >     * thenAcceptBoth result completes normally after normal
1883       * completion of sources
1884       */
1885 <    public void testAcceptEitherAsync() {
1886 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1887 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1888 <        IncAction r = new IncAction();
1889 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1890 <        f.complete(one);
1891 <        checkCompletedNormally(g, null);
1892 <        assertEquals(r.value, 2);
1893 <
1894 <        r = new IncAction();
1895 <        f = new CompletableFuture<>();
1896 <        f.complete(one);
1897 <        f2 = new CompletableFuture<>();
1898 <        g = f.acceptEitherAsync(f2, r);
1899 <        checkCompletedNormally(g, null);
1900 <        assertEquals(r.value, 2);
1901 <    }
1885 >    public void testThenAcceptBoth_normalCompletion() {
1886 >        for (ExecutionMode m : ExecutionMode.values())
1887 >        for (boolean fFirst : new boolean[] { true, false })
1888 >        for (Integer v1 : new Integer[] { 1, null })
1889 >        for (Integer v2 : new Integer[] { 2, null })
1890 >    {
1891 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1892 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1893 >        final SubtractAction r1 = new SubtractAction(m);
1894 >        final SubtractAction r2 = new SubtractAction(m);
1895 >        final SubtractAction r3 = new SubtractAction(m);
1896 >
1897 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1898 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1899 >        final Integer w1 =  fFirst ? v1 : v2;
1900 >        final Integer w2 = !fFirst ? v1 : v2;
1901 >
1902 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1903 >        assertTrue(fst.complete(w1));
1904 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1905 >        checkIncomplete(h1);
1906 >        checkIncomplete(h2);
1907 >        r1.assertNotInvoked();
1908 >        r2.assertNotInvoked();
1909 >        assertTrue(snd.complete(w2));
1910 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1911 >
1912 >        checkCompletedNormally(h1, null);
1913 >        checkCompletedNormally(h2, null);
1914 >        checkCompletedNormally(h3, null);
1915 >        r1.assertValue(subtract(v1, v2));
1916 >        r2.assertValue(subtract(v1, v2));
1917 >        r3.assertValue(subtract(v1, v2));
1918 >        checkCompletedNormally(f, v1);
1919 >        checkCompletedNormally(g, v2);
1920 >    }}
1921  
1922      /**
1923 <     * acceptEitherAsync result completes exceptionally after exceptional
1924 <     * completion of source
1923 >     * thenAcceptBoth result completes exceptionally after exceptional
1924 >     * completion of either source
1925       */
1926 <    public void testAcceptEitherAsync2() {
1927 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1928 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1929 <        IncAction r = new IncAction();
1930 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1931 <        f.completeExceptionally(new CFException());
1932 <        checkCompletedWithWrappedCFException(g);
1933 <
1934 <        r = new IncAction();
1935 <        f = new CompletableFuture<>();
1936 <        f2 = new CompletableFuture<>();
1937 <        f2.completeExceptionally(new CFException());
1938 <        g = f.acceptEitherAsync(f2, r);
1939 <        f.complete(one);
1940 <        checkCompletedWithWrappedCFException(g);
1941 <    }
1926 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1927 >        for (ExecutionMode m : ExecutionMode.values())
1928 >        for (boolean fFirst : new boolean[] { true, false })
1929 >        for (boolean failFirst : new boolean[] { true, false })
1930 >        for (Integer v1 : new Integer[] { 1, null })
1931 >    {
1932 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1933 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1934 >        final CFException ex = new CFException();
1935 >        final SubtractAction r1 = new SubtractAction(m);
1936 >        final SubtractAction r2 = new SubtractAction(m);
1937 >        final SubtractAction r3 = new SubtractAction(m);
1938 >
1939 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1940 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1941 >        final Callable<Boolean> complete1 = failFirst ?
1942 >            () -> fst.completeExceptionally(ex) :
1943 >            () -> fst.complete(v1);
1944 >        final Callable<Boolean> complete2 = failFirst ?
1945 >            () -> snd.complete(v1) :
1946 >            () -> snd.completeExceptionally(ex);
1947 >
1948 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1949 >        assertTrue(complete1.call());
1950 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1951 >        checkIncomplete(h1);
1952 >        checkIncomplete(h2);
1953 >        assertTrue(complete2.call());
1954 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1955 >
1956 >        checkCompletedWithWrappedException(h1, ex);
1957 >        checkCompletedWithWrappedException(h2, ex);
1958 >        checkCompletedWithWrappedException(h3, ex);
1959 >        r1.assertNotInvoked();
1960 >        r2.assertNotInvoked();
1961 >        r3.assertNotInvoked();
1962 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1963 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1964 >    }}
1965  
1966      /**
1967 <     * acceptEitherAsync result completes exceptionally if action does
1967 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1968       */
1969 <    public void testAcceptEitherAsync3() {
1970 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1971 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1972 <        FailingConsumer r = new FailingConsumer();
1973 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1974 <        f.complete(one);
1975 <        checkCompletedWithWrappedCFException(g);
1976 <    }
1969 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1970 >        for (ExecutionMode m : ExecutionMode.values())
1971 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1972 >        for (boolean fFirst : new boolean[] { true, false })
1973 >        for (boolean failFirst : new boolean[] { true, false })
1974 >        for (Integer v1 : new Integer[] { 1, null })
1975 >    {
1976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1977 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1978 >        final SubtractAction r1 = new SubtractAction(m);
1979 >        final SubtractAction r2 = new SubtractAction(m);
1980 >        final SubtractAction r3 = new SubtractAction(m);
1981 >
1982 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1983 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1984 >        final Callable<Boolean> complete1 = failFirst ?
1985 >            () -> fst.cancel(mayInterruptIfRunning) :
1986 >            () -> fst.complete(v1);
1987 >        final Callable<Boolean> complete2 = failFirst ?
1988 >            () -> snd.complete(v1) :
1989 >            () -> snd.cancel(mayInterruptIfRunning);
1990 >
1991 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1992 >        assertTrue(complete1.call());
1993 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1994 >        checkIncomplete(h1);
1995 >        checkIncomplete(h2);
1996 >        assertTrue(complete2.call());
1997 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1998 >
1999 >        checkCompletedWithWrappedCancellationException(h1);
2000 >        checkCompletedWithWrappedCancellationException(h2);
2001 >        checkCompletedWithWrappedCancellationException(h3);
2002 >        r1.assertNotInvoked();
2003 >        r2.assertNotInvoked();
2004 >        r3.assertNotInvoked();
2005 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2006 >        checkCancelled(failFirst ? fst : snd);
2007 >    }}
2008  
2009      /**
2010 <     * acceptEitherAsync result completes exceptionally if either
1916 <     * source cancelled
2010 >     * thenAcceptBoth result completes exceptionally if action does
2011       */
2012 <    public void testAcceptEitherAsync4() {
2013 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2014 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2015 <        IncAction r = new IncAction();
2016 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2017 <        assertTrue(f.cancel(true));
2018 <        checkCompletedWithWrappedCancellationException(g);
2019 <
2020 <        r = new IncAction();
2021 <        f = new CompletableFuture<>();
2022 <        f2 = new CompletableFuture<>();
2023 <        assertTrue(f2.cancel(true));
2024 <        g = f.acceptEitherAsync(f2, r);
2025 <        checkCompletedWithWrappedCancellationException(g);
2026 <    }
2012 >    public void testThenAcceptBoth_actionFailed() {
2013 >        for (ExecutionMode m : ExecutionMode.values())
2014 >        for (boolean fFirst : new boolean[] { true, false })
2015 >        for (Integer v1 : new Integer[] { 1, null })
2016 >        for (Integer v2 : new Integer[] { 2, null })
2017 >    {
2018 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2019 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2020 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
2021 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
2022 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
2023 >
2024 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2025 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2026 >        final Integer w1 =  fFirst ? v1 : v2;
2027 >        final Integer w2 = !fFirst ? v1 : v2;
2028 >
2029 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
2030 >        assertTrue(fst.complete(w1));
2031 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
2032 >        assertTrue(snd.complete(w2));
2033 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2034 >
2035 >        checkCompletedWithWrappedException(h1, r1.ex);
2036 >        checkCompletedWithWrappedException(h2, r2.ex);
2037 >        checkCompletedWithWrappedException(h3, r3.ex);
2038 >        r1.assertInvoked();
2039 >        r2.assertInvoked();
2040 >        r3.assertInvoked();
2041 >        checkCompletedNormally(f, v1);
2042 >        checkCompletedNormally(g, v2);
2043 >    }}
2044  
2045      /**
2046 <     * runAfterEitherAsync result completes normally after normal
2046 >     * runAfterBoth result completes normally after normal
2047       * completion of sources
2048       */
2049 <    public void testRunAfterEitherAsync() {
2050 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2051 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2052 <        Noop r = new Noop();
2053 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2054 <        f.complete(one);
2055 <        checkCompletedNormally(g, null);
2056 <        assertTrue(r.ran);
2057 <
2058 <        r = new Noop();
2059 <        f = new CompletableFuture<>();
2060 <        f.complete(one);
2061 <        f2 = new CompletableFuture<>();
2062 <        g = f.runAfterEitherAsync(f2, r);
2063 <        checkCompletedNormally(g, null);
2064 <        assertTrue(r.ran);
2065 <    }
2066 <
2067 <    /**
2068 <     * runAfterEitherAsync result completes exceptionally after exceptional
2069 <     * completion of source
2070 <     */
2071 <    public void testRunAfterEitherAsync2() {
2072 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2073 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2074 <        Noop r = new Noop();
2075 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2076 <        f.completeExceptionally(new CFException());
2077 <        checkCompletedWithWrappedCFException(g);
2078 <
2079 <        r = new Noop();
2080 <        f = new CompletableFuture<>();
2081 <        f2 = new CompletableFuture<>();
2082 <        f2.completeExceptionally(new CFException());
2083 <        g = f.runAfterEitherAsync(f2, r);
2084 <        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 <    }
2049 >    public void testRunAfterBoth_normalCompletion() {
2050 >        for (ExecutionMode m : ExecutionMode.values())
2051 >        for (boolean fFirst : new boolean[] { true, false })
2052 >        for (Integer v1 : new Integer[] { 1, null })
2053 >        for (Integer v2 : new Integer[] { 2, null })
2054 >    {
2055 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2056 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2057 >        final Noop r1 = new Noop(m);
2058 >        final Noop r2 = new Noop(m);
2059 >        final Noop r3 = new Noop(m);
2060 >
2061 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2062 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2063 >        final Integer w1 =  fFirst ? v1 : v2;
2064 >        final Integer w2 = !fFirst ? v1 : v2;
2065 >
2066 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2067 >        assertTrue(fst.complete(w1));
2068 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2069 >        checkIncomplete(h1);
2070 >        checkIncomplete(h2);
2071 >        r1.assertNotInvoked();
2072 >        r2.assertNotInvoked();
2073 >        assertTrue(snd.complete(w2));
2074 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2075 >
2076 >        checkCompletedNormally(h1, null);
2077 >        checkCompletedNormally(h2, null);
2078 >        checkCompletedNormally(h3, null);
2079 >        r1.assertInvoked();
2080 >        r2.assertInvoked();
2081 >        r3.assertInvoked();
2082 >        checkCompletedNormally(f, v1);
2083 >        checkCompletedNormally(g, v2);
2084 >    }}
2085  
2086      /**
2087 <     * thenComposeAsync result completes exceptionally after
2088 <     * exceptional completion of source
2087 >     * runAfterBoth result completes exceptionally after exceptional
2088 >     * completion of either source
2089       */
2090 <    public void testThenComposeAsync2() {
2091 <        CompletableFuture<Integer> f, g;
2092 <        CompletableFutureInc r;
2093 <
2094 <        f = new CompletableFuture<>();
2095 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2096 <        f.completeExceptionally(new CFException());
2097 <        checkCompletedWithWrappedCFException(g);
2098 <        assertFalse(r.ran);
2099 <
2100 <        f = new CompletableFuture<>();
2101 <        f.completeExceptionally(new CFException());
2102 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2103 <        checkCompletedWithWrappedCFException(g);
2104 <        assertFalse(r.ran);
2105 <    }
2090 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2091 >        for (ExecutionMode m : ExecutionMode.values())
2092 >        for (boolean fFirst : new boolean[] { true, false })
2093 >        for (boolean failFirst : new boolean[] { true, false })
2094 >        for (Integer v1 : new Integer[] { 1, null })
2095 >    {
2096 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2097 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2098 >        final CFException ex = new CFException();
2099 >        final Noop r1 = new Noop(m);
2100 >        final Noop r2 = new Noop(m);
2101 >        final Noop r3 = new Noop(m);
2102 >
2103 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2104 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2105 >        final Callable<Boolean> complete1 = failFirst ?
2106 >            () -> fst.completeExceptionally(ex) :
2107 >            () -> fst.complete(v1);
2108 >        final Callable<Boolean> complete2 = failFirst ?
2109 >            () -> snd.complete(v1) :
2110 >            () -> snd.completeExceptionally(ex);
2111 >
2112 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2113 >        assertTrue(complete1.call());
2114 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2115 >        checkIncomplete(h1);
2116 >        checkIncomplete(h2);
2117 >        assertTrue(complete2.call());
2118 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2119 >
2120 >        checkCompletedWithWrappedException(h1, ex);
2121 >        checkCompletedWithWrappedException(h2, ex);
2122 >        checkCompletedWithWrappedException(h3, ex);
2123 >        r1.assertNotInvoked();
2124 >        r2.assertNotInvoked();
2125 >        r3.assertNotInvoked();
2126 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2127 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2128 >    }}
2129  
2130      /**
2131 <     * thenComposeAsync result completes exceptionally if action does
2131 >     * runAfterBoth result completes exceptionally if either source cancelled
2132       */
2133 <    public void testThenComposeAsync3() {
2134 <        CompletableFuture<Integer> f, g;
2135 <        FailingCompletableFutureFunction r;
2136 <
2137 <        f = new CompletableFuture<>();
2138 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2139 <        f.complete(one);
2140 <        checkCompletedWithWrappedCFException(g);
2141 <
2142 <        f = new CompletableFuture<>();
2143 <        f.complete(one);
2144 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2145 <        checkCompletedWithWrappedCFException(g);
2146 <    }
2133 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2134 >        for (ExecutionMode m : ExecutionMode.values())
2135 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2136 >        for (boolean fFirst : new boolean[] { true, false })
2137 >        for (boolean failFirst : new boolean[] { true, false })
2138 >        for (Integer v1 : new Integer[] { 1, null })
2139 >    {
2140 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2141 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2142 >        final Noop r1 = new Noop(m);
2143 >        final Noop r2 = new Noop(m);
2144 >        final Noop r3 = new Noop(m);
2145 >
2146 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2147 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2148 >        final Callable<Boolean> complete1 = failFirst ?
2149 >            () -> fst.cancel(mayInterruptIfRunning) :
2150 >            () -> fst.complete(v1);
2151 >        final Callable<Boolean> complete2 = failFirst ?
2152 >            () -> snd.complete(v1) :
2153 >            () -> snd.cancel(mayInterruptIfRunning);
2154 >
2155 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2156 >        assertTrue(complete1.call());
2157 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2158 >        checkIncomplete(h1);
2159 >        checkIncomplete(h2);
2160 >        assertTrue(complete2.call());
2161 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2162 >
2163 >        checkCompletedWithWrappedCancellationException(h1);
2164 >        checkCompletedWithWrappedCancellationException(h2);
2165 >        checkCompletedWithWrappedCancellationException(h3);
2166 >        r1.assertNotInvoked();
2167 >        r2.assertNotInvoked();
2168 >        r3.assertNotInvoked();
2169 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2170 >        checkCancelled(failFirst ? fst : snd);
2171 >    }}
2172  
2173      /**
2174 <     * thenComposeAsync result completes exceptionally if source cancelled
2174 >     * runAfterBoth result completes exceptionally if action does
2175       */
2176 <    public void testThenComposeAsync4() {
2177 <        CompletableFuture<Integer> f, g;
2178 <        CompletableFutureInc r;
2179 <
2180 <        f = new CompletableFuture<>();
2181 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2182 <        assertTrue(f.cancel(true));
2183 <        checkCompletedWithWrappedCancellationException(g);
2184 <
2185 <        f = new CompletableFuture<>();
2186 <        assertTrue(f.cancel(true));
2187 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2188 <        checkCompletedWithWrappedCancellationException(g);
2189 <    }
2190 <
2191 <    // async with explicit executors
2176 >    public void testRunAfterBoth_actionFailed() {
2177 >        for (ExecutionMode m : ExecutionMode.values())
2178 >        for (boolean fFirst : new boolean[] { true, false })
2179 >        for (Integer v1 : new Integer[] { 1, null })
2180 >        for (Integer v2 : new Integer[] { 2, null })
2181 >    {
2182 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2183 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2184 >        final FailingRunnable r1 = new FailingRunnable(m);
2185 >        final FailingRunnable r2 = new FailingRunnable(m);
2186 >        final FailingRunnable r3 = new FailingRunnable(m);
2187 >
2188 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2189 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2190 >        final Integer w1 =  fFirst ? v1 : v2;
2191 >        final Integer w2 = !fFirst ? v1 : v2;
2192 >
2193 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2194 >        assertTrue(fst.complete(w1));
2195 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2196 >        assertTrue(snd.complete(w2));
2197 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2198 >
2199 >        checkCompletedWithWrappedException(h1, r1.ex);
2200 >        checkCompletedWithWrappedException(h2, r2.ex);
2201 >        checkCompletedWithWrappedException(h3, r3.ex);
2202 >        r1.assertInvoked();
2203 >        r2.assertInvoked();
2204 >        r3.assertInvoked();
2205 >        checkCompletedNormally(f, v1);
2206 >        checkCompletedNormally(g, v2);
2207 >    }}
2208  
2209      /**
2210 <     * thenRunAsync result completes normally after normal completion of source
2210 >     * applyToEither result completes normally after normal completion
2211 >     * of either source
2212       */
2213 <    public void testThenRunAsyncE() {
2214 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2215 <        Noop r = new Noop();
2216 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2217 <        f.complete(null);
2218 <        checkCompletedNormally(g, null);
2219 <
2220 <        // reordered version
2221 <        f = new CompletableFuture<>();
2222 <        f.complete(null);
2223 <        r = new Noop();
2224 <        g = f.thenRunAsync(r, new ThreadExecutor());
2225 <        checkCompletedNormally(g, null);
2226 <    }
2213 >    public void testApplyToEither_normalCompletion() {
2214 >        for (ExecutionMode m : ExecutionMode.values())
2215 >        for (Integer v1 : new Integer[] { 1, null })
2216 >        for (Integer v2 : new Integer[] { 2, null })
2217 >    {
2218 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2219 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2220 >        final IncFunction[] rs = new IncFunction[6];
2221 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2222 >
2223 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2224 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2225 >        checkIncomplete(h0);
2226 >        checkIncomplete(h1);
2227 >        rs[0].assertNotInvoked();
2228 >        rs[1].assertNotInvoked();
2229 >        f.complete(v1);
2230 >        checkCompletedNormally(h0, inc(v1));
2231 >        checkCompletedNormally(h1, inc(v1));
2232 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2233 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2234 >        checkCompletedNormally(h2, inc(v1));
2235 >        checkCompletedNormally(h3, inc(v1));
2236 >        g.complete(v2);
2237 >
2238 >        // unspecified behavior - both source completions available
2239 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2240 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2241 >        rs[4].assertValue(h4.join());
2242 >        rs[5].assertValue(h5.join());
2243 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2244 >                   Objects.equals(inc(v2), h4.join()));
2245 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2246 >                   Objects.equals(inc(v2), h5.join()));
2247 >
2248 >        checkCompletedNormally(f, v1);
2249 >        checkCompletedNormally(g, v2);
2250 >        checkCompletedNormally(h0, inc(v1));
2251 >        checkCompletedNormally(h1, inc(v1));
2252 >        checkCompletedNormally(h2, inc(v1));
2253 >        checkCompletedNormally(h3, inc(v1));
2254 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2255 >    }}
2256  
2257      /**
2258 <     * thenRunAsync result completes exceptionally after exceptional
2259 <     * completion of source
2258 >     * applyToEither result completes exceptionally after exceptional
2259 >     * completion of either source
2260       */
2261 <    public void testThenRunAsync2E() {
2262 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2263 <        Noop r = new Noop();
2264 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2265 <        f.completeExceptionally(new CFException());
2261 >    public void testApplyToEither_exceptionalCompletion() {
2262 >        for (ExecutionMode m : ExecutionMode.values())
2263 >        for (Integer v1 : new Integer[] { 1, null })
2264 >    {
2265 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2266 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2267 >        final CFException ex = new CFException();
2268 >        final IncFunction[] rs = new IncFunction[6];
2269 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2270 >
2271 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2272 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2273 >        checkIncomplete(h0);
2274 >        checkIncomplete(h1);
2275 >        rs[0].assertNotInvoked();
2276 >        rs[1].assertNotInvoked();
2277 >        f.completeExceptionally(ex);
2278 >        checkCompletedWithWrappedException(h0, ex);
2279 >        checkCompletedWithWrappedException(h1, ex);
2280 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2281 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2282 >        checkCompletedWithWrappedException(h2, ex);
2283 >        checkCompletedWithWrappedException(h3, ex);
2284 >        g.complete(v1);
2285 >
2286 >        // unspecified behavior - both source completions available
2287 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2288 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2289          try {
2290 <            g.join();
2291 <            shouldThrow();
2292 <        } catch (CompletionException success) {}
2293 <        checkCompletedWithWrappedCFException(g);
2294 <    }
2295 <
2296 <    /**
2297 <     * thenRunAsync result completes exceptionally if action does
2298 <     */
2299 <    public void testThenRunAsync3E() {
2300 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2301 <        FailingNoop r = new FailingNoop();
2302 <        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 <    }
2290 >            assertEquals(inc(v1), h4.join());
2291 >            rs[4].assertValue(inc(v1));
2292 >        } catch (CompletionException ok) {
2293 >            checkCompletedWithWrappedException(h4, ex);
2294 >            rs[4].assertNotInvoked();
2295 >        }
2296 >        try {
2297 >            assertEquals(inc(v1), h5.join());
2298 >            rs[5].assertValue(inc(v1));
2299 >        } catch (CompletionException ok) {
2300 >            checkCompletedWithWrappedException(h5, ex);
2301 >            rs[5].assertNotInvoked();
2302 >        }
2303  
2304 <    /**
2305 <     * thenApplyAsync result completes normally after normal completion of source
2306 <     */
2307 <    public void testThenApplyAsyncE() {
2308 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2309 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2310 <        f.complete(one);
2311 <        checkCompletedNormally(g, two);
2312 <    }
2304 >        checkCompletedExceptionally(f, ex);
2305 >        checkCompletedNormally(g, v1);
2306 >        checkCompletedWithWrappedException(h0, ex);
2307 >        checkCompletedWithWrappedException(h1, ex);
2308 >        checkCompletedWithWrappedException(h2, ex);
2309 >        checkCompletedWithWrappedException(h3, ex);
2310 >        checkCompletedWithWrappedException(h4, ex);
2311 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2312 >    }}
2313 >
2314 >    public void testApplyToEither_exceptionalCompletion2() {
2315 >        for (ExecutionMode m : ExecutionMode.values())
2316 >        for (boolean fFirst : new boolean[] { true, false })
2317 >        for (Integer v1 : new Integer[] { 1, null })
2318 >    {
2319 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2320 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2321 >        final CFException ex = new CFException();
2322 >        final IncFunction[] rs = new IncFunction[6];
2323 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2324 >
2325 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2326 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2327 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2328 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2329 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2330 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2331  
2332 <    /**
2333 <     * thenApplyAsync result completes exceptionally after exceptional
2334 <     * completion of source
2335 <     */
2336 <    public void testThenApplyAsync2E() {
2337 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2338 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2339 <        f.completeExceptionally(new CFException());
2340 <        checkCompletedWithWrappedCFException(g);
2341 <    }
2332 >        // unspecified behavior - both source completions available
2333 >        try {
2334 >            assertEquals(inc(v1), h0.join());
2335 >            rs[0].assertValue(inc(v1));
2336 >        } catch (CompletionException ok) {
2337 >            checkCompletedWithWrappedException(h0, ex);
2338 >            rs[0].assertNotInvoked();
2339 >        }
2340 >        try {
2341 >            assertEquals(inc(v1), h1.join());
2342 >            rs[1].assertValue(inc(v1));
2343 >        } catch (CompletionException ok) {
2344 >            checkCompletedWithWrappedException(h1, ex);
2345 >            rs[1].assertNotInvoked();
2346 >        }
2347 >        try {
2348 >            assertEquals(inc(v1), h2.join());
2349 >            rs[2].assertValue(inc(v1));
2350 >        } catch (CompletionException ok) {
2351 >            checkCompletedWithWrappedException(h2, ex);
2352 >            rs[2].assertNotInvoked();
2353 >        }
2354 >        try {
2355 >            assertEquals(inc(v1), h3.join());
2356 >            rs[3].assertValue(inc(v1));
2357 >        } catch (CompletionException ok) {
2358 >            checkCompletedWithWrappedException(h3, ex);
2359 >            rs[3].assertNotInvoked();
2360 >        }
2361  
2362 <    /**
2363 <     * thenApplyAsync result completes exceptionally if action does
2364 <     */
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 <    }
2362 >        checkCompletedNormally(f, v1);
2363 >        checkCompletedExceptionally(g, ex);
2364 >    }}
2365  
2366      /**
2367 <     * thenApplyAsync result completes exceptionally if source cancelled
2367 >     * applyToEither result completes exceptionally if either source cancelled
2368       */
2369 <    public void testThenApplyAsync4E() {
2370 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2371 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2372 <        assertTrue(f.cancel(true));
2373 <        checkCompletedWithWrappedCancellationException(g);
2374 <    }
2369 >    public void testApplyToEither_sourceCancelled() {
2370 >        for (ExecutionMode m : ExecutionMode.values())
2371 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2372 >        for (Integer v1 : new Integer[] { 1, null })
2373 >    {
2374 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2375 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2376 >        final IncFunction[] rs = new IncFunction[6];
2377 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2378 >
2379 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2380 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2381 >        checkIncomplete(h0);
2382 >        checkIncomplete(h1);
2383 >        rs[0].assertNotInvoked();
2384 >        rs[1].assertNotInvoked();
2385 >        f.cancel(mayInterruptIfRunning);
2386 >        checkCompletedWithWrappedCancellationException(h0);
2387 >        checkCompletedWithWrappedCancellationException(h1);
2388 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2389 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2390 >        checkCompletedWithWrappedCancellationException(h2);
2391 >        checkCompletedWithWrappedCancellationException(h3);
2392 >        g.complete(v1);
2393 >
2394 >        // unspecified behavior - both source completions available
2395 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2396 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2397 >        try {
2398 >            assertEquals(inc(v1), h4.join());
2399 >            rs[4].assertValue(inc(v1));
2400 >        } catch (CompletionException ok) {
2401 >            checkCompletedWithWrappedCancellationException(h4);
2402 >            rs[4].assertNotInvoked();
2403 >        }
2404 >        try {
2405 >            assertEquals(inc(v1), h5.join());
2406 >            rs[5].assertValue(inc(v1));
2407 >        } catch (CompletionException ok) {
2408 >            checkCompletedWithWrappedCancellationException(h5);
2409 >            rs[5].assertNotInvoked();
2410 >        }
2411  
2412 <    /**
2413 <     * thenAcceptAsync result completes normally after normal
2414 <     * completion of source
2415 <     */
2416 <    public void testThenAcceptAsyncE() {
2417 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2418 <        IncAction r = new IncAction();
2419 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2420 <        f.complete(one);
2421 <        checkCompletedNormally(g, null);
2422 <        assertEquals(r.value, 2);
2423 <    }
2412 >        checkCancelled(f);
2413 >        checkCompletedNormally(g, v1);
2414 >        checkCompletedWithWrappedCancellationException(h0);
2415 >        checkCompletedWithWrappedCancellationException(h1);
2416 >        checkCompletedWithWrappedCancellationException(h2);
2417 >        checkCompletedWithWrappedCancellationException(h3);
2418 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2419 >    }}
2420 >
2421 >    public void testApplyToEither_sourceCancelled2() {
2422 >        for (ExecutionMode m : ExecutionMode.values())
2423 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2424 >        for (boolean fFirst : new boolean[] { true, false })
2425 >        for (Integer v1 : new Integer[] { 1, null })
2426 >    {
2427 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2428 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2429 >        final IncFunction[] rs = new IncFunction[6];
2430 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2431 >
2432 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2433 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2434 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2435 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2436 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2437 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2438  
2439 <    /**
2440 <     * thenAcceptAsync result completes exceptionally after exceptional
2441 <     * completion of source
2442 <     */
2443 <    public void testThenAcceptAsync2E() {
2444 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2445 <        IncAction r = new IncAction();
2446 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2447 <        f.completeExceptionally(new CFException());
2448 <        checkCompletedWithWrappedCFException(g);
2449 <    }
2439 >        // unspecified behavior - both source completions available
2440 >        try {
2441 >            assertEquals(inc(v1), h0.join());
2442 >            rs[0].assertValue(inc(v1));
2443 >        } catch (CompletionException ok) {
2444 >            checkCompletedWithWrappedCancellationException(h0);
2445 >            rs[0].assertNotInvoked();
2446 >        }
2447 >        try {
2448 >            assertEquals(inc(v1), h1.join());
2449 >            rs[1].assertValue(inc(v1));
2450 >        } catch (CompletionException ok) {
2451 >            checkCompletedWithWrappedCancellationException(h1);
2452 >            rs[1].assertNotInvoked();
2453 >        }
2454 >        try {
2455 >            assertEquals(inc(v1), h2.join());
2456 >            rs[2].assertValue(inc(v1));
2457 >        } catch (CompletionException ok) {
2458 >            checkCompletedWithWrappedCancellationException(h2);
2459 >            rs[2].assertNotInvoked();
2460 >        }
2461 >        try {
2462 >            assertEquals(inc(v1), h3.join());
2463 >            rs[3].assertValue(inc(v1));
2464 >        } catch (CompletionException ok) {
2465 >            checkCompletedWithWrappedCancellationException(h3);
2466 >            rs[3].assertNotInvoked();
2467 >        }
2468  
2469 <    /**
2470 <     * thenAcceptAsync result completes exceptionally if action does
2471 <     */
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 <    }
2469 >        checkCompletedNormally(f, v1);
2470 >        checkCancelled(g);
2471 >    }}
2472  
2473      /**
2474 <     * thenAcceptAsync result completes exceptionally if source cancelled
2474 >     * applyToEither result completes exceptionally if action does
2475       */
2476 <    public void testThenAcceptAsync4E() {
2477 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2478 <        IncAction r = new IncAction();
2479 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2480 <        assertTrue(f.cancel(true));
2481 <        checkCompletedWithWrappedCancellationException(g);
2482 <    }
2476 >    public void testApplyToEither_actionFailed() {
2477 >        for (ExecutionMode m : ExecutionMode.values())
2478 >        for (Integer v1 : new Integer[] { 1, null })
2479 >        for (Integer v2 : new Integer[] { 2, null })
2480 >    {
2481 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2482 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2483 >        final FailingFunction[] rs = new FailingFunction[6];
2484 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2485 >
2486 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2487 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2488 >        f.complete(v1);
2489 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2490 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2491 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2492 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2493 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2494 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2495 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2496 >
2497 >        g.complete(v2);
2498 >
2499 >        // unspecified behavior - both source completions available
2500 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2501 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2502 >
2503 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2504 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2505 >                   Objects.equals(v2, rs[4].value));
2506 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2507 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2508 >                   Objects.equals(v2, rs[5].value));
2509 >
2510 >        checkCompletedNormally(f, v1);
2511 >        checkCompletedNormally(g, v2);
2512 >    }}
2513  
2514      /**
2515 <     * thenCombineAsync result completes normally after normal
2516 <     * completion of sources
2515 >     * acceptEither result completes normally after normal completion
2516 >     * of either source
2517       */
2518 <    public void testThenCombineAsyncE() {
2519 <        CompletableFuture<Integer> f, g, h;
2520 <        ThreadExecutor e = new ThreadExecutor();
2521 <        int count = 0;
2522 <
2523 <        f = new CompletableFuture<>();
2524 <        g = new CompletableFuture<>();
2525 <        h = f.thenCombineAsync(g, subtract, e);
2526 <        f.complete(3);
2527 <        checkIncomplete(h);
2528 <        g.complete(1);
2529 <        checkCompletedNormally(h, 2);
2530 <        assertEquals(++count, e.count.get());
2531 <
2532 <        f = new CompletableFuture<>();
2533 <        g = new CompletableFuture<>();
2534 <        h = f.thenCombineAsync(g, subtract, e);
2535 <        g.complete(1);
2536 <        checkIncomplete(h);
2537 <        f.complete(3);
2538 <        checkCompletedNormally(h, 2);
2539 <        assertEquals(++count, e.count.get());
2540 <
2541 <        f = new CompletableFuture<>();
2542 <        g = new CompletableFuture<>();
2543 <        g.complete(1);
2544 <        f.complete(3);
2545 <        h = f.thenCombineAsync(g, subtract, e);
2546 <        checkCompletedNormally(h, 2);
2547 <        assertEquals(++count, e.count.get());
2548 <    }
2518 >    public void testAcceptEither_normalCompletion() {
2519 >        for (ExecutionMode m : ExecutionMode.values())
2520 >        for (Integer v1 : new Integer[] { 1, null })
2521 >        for (Integer v2 : new Integer[] { 2, null })
2522 >    {
2523 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2524 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2525 >        final NoopConsumer[] rs = new NoopConsumer[6];
2526 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2527 >
2528 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2529 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2530 >        checkIncomplete(h0);
2531 >        checkIncomplete(h1);
2532 >        rs[0].assertNotInvoked();
2533 >        rs[1].assertNotInvoked();
2534 >        f.complete(v1);
2535 >        checkCompletedNormally(h0, null);
2536 >        checkCompletedNormally(h1, null);
2537 >        rs[0].assertValue(v1);
2538 >        rs[1].assertValue(v1);
2539 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2540 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2541 >        checkCompletedNormally(h2, null);
2542 >        checkCompletedNormally(h3, null);
2543 >        rs[2].assertValue(v1);
2544 >        rs[3].assertValue(v1);
2545 >        g.complete(v2);
2546 >
2547 >        // unspecified behavior - both source completions available
2548 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2549 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2550 >        checkCompletedNormally(h4, null);
2551 >        checkCompletedNormally(h5, null);
2552 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2553 >                   Objects.equals(v2, rs[4].value));
2554 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2555 >                   Objects.equals(v2, rs[5].value));
2556 >
2557 >        checkCompletedNormally(f, v1);
2558 >        checkCompletedNormally(g, v2);
2559 >        checkCompletedNormally(h0, null);
2560 >        checkCompletedNormally(h1, null);
2561 >        checkCompletedNormally(h2, null);
2562 >        checkCompletedNormally(h3, null);
2563 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2564 >    }}
2565  
2566      /**
2567 <     * thenCombineAsync result completes exceptionally after exceptional
2567 >     * acceptEither result completes exceptionally after exceptional
2568       * completion of either source
2569       */
2570 <    public void testThenCombineAsync2E() {
2571 <        CompletableFuture<Integer> f, g, h;
2572 <        ThreadExecutor e = new ThreadExecutor();
2573 <        int count = 0;
2574 <
2575 <        f = new CompletableFuture<>();
2576 <        g = new CompletableFuture<>();
2577 <        h = f.thenCombineAsync(g, subtract, e);
2578 <        f.completeExceptionally(new CFException());
2579 <        checkIncomplete(h);
2580 <        g.complete(1);
2581 <        checkCompletedWithWrappedCFException(h);
2582 <
2583 <        f = new CompletableFuture<>();
2584 <        g = new CompletableFuture<>();
2585 <        h = f.thenCombineAsync(g, subtract, e);
2586 <        g.completeExceptionally(new CFException());
2587 <        checkIncomplete(h);
2588 <        f.complete(3);
2589 <        checkCompletedWithWrappedCFException(h);
2590 <
2591 <        f = new CompletableFuture<>();
2592 <        g = new CompletableFuture<>();
2593 <        g.completeExceptionally(new CFException());
2594 <        h = f.thenCombineAsync(g, subtract, e);
2595 <        checkIncomplete(h);
2596 <        f.complete(3);
2597 <        checkCompletedWithWrappedCFException(h);
2598 <
2599 <        assertEquals(0, e.count.get());
2600 <    }
2601 <
2602 <    /**
2603 <     * thenCombineAsync result completes exceptionally if action does
2604 <     */
2605 <    public void testThenCombineAsync3E() {
2606 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2607 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2608 <        FailingBiFunction r = new FailingBiFunction();
2609 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2610 <        f.complete(one);
2611 <        checkIncomplete(g);
2612 <        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();
2570 >    public void testAcceptEither_exceptionalCompletion() {
2571 >        for (ExecutionMode m : ExecutionMode.values())
2572 >        for (Integer v1 : new Integer[] { 1, null })
2573 >    {
2574 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2575 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2576 >        final CFException ex = new CFException();
2577 >        final NoopConsumer[] rs = new NoopConsumer[6];
2578 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2579 >
2580 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2581 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2582 >        checkIncomplete(h0);
2583 >        checkIncomplete(h1);
2584 >        rs[0].assertNotInvoked();
2585 >        rs[1].assertNotInvoked();
2586 >        f.completeExceptionally(ex);
2587 >        checkCompletedWithWrappedException(h0, ex);
2588 >        checkCompletedWithWrappedException(h1, ex);
2589 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2590 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2591 >        checkCompletedWithWrappedException(h2, ex);
2592 >        checkCompletedWithWrappedException(h3, ex);
2593 >
2594 >        g.complete(v1);
2595 >
2596 >        // unspecified behavior - both source completions available
2597 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2598 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2599 >        try {
2600 >            assertNull(h4.join());
2601 >            rs[4].assertValue(v1);
2602 >        } catch (CompletionException ok) {
2603 >            checkCompletedWithWrappedException(h4, ex);
2604 >            rs[4].assertNotInvoked();
2605 >        }
2606 >        try {
2607 >            assertNull(h5.join());
2608 >            rs[5].assertValue(v1);
2609 >        } catch (CompletionException ok) {
2610 >            checkCompletedWithWrappedException(h5, ex);
2611 >            rs[5].assertNotInvoked();
2612 >        }
2613  
2614 <        f = new CompletableFuture<>();
2615 <        g = new CompletableFuture<>();
2616 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2617 <        f.complete(3);
2618 <        checkIncomplete(h);
2619 <        g.complete(1);
2620 <        checkCompletedWithWrappedCFException(h);
2614 >        checkCompletedExceptionally(f, ex);
2615 >        checkCompletedNormally(g, v1);
2616 >        checkCompletedWithWrappedException(h0, ex);
2617 >        checkCompletedWithWrappedException(h1, ex);
2618 >        checkCompletedWithWrappedException(h2, ex);
2619 >        checkCompletedWithWrappedException(h3, ex);
2620 >        checkCompletedWithWrappedException(h4, ex);
2621 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2622 >    }}
2623 >
2624 >    public void testAcceptEither_exceptionalCompletion2() {
2625 >        for (ExecutionMode m : ExecutionMode.values())
2626 >        for (boolean fFirst : new boolean[] { true, false })
2627 >        for (Integer v1 : new Integer[] { 1, null })
2628 >    {
2629 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2630 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2631 >        final CFException ex = new CFException();
2632 >        final NoopConsumer[] rs = new NoopConsumer[6];
2633 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2634 >
2635 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2636 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2637 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2638 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2639 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2640 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2641  
2642 <        f = new CompletableFuture<>();
2643 <        g = new CompletableFuture<>();
2644 <        f.complete(3);
2645 <        g.complete(1);
2646 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2647 <        checkCompletedWithWrappedCFException(h);
2642 >        // unspecified behavior - both source completions available
2643 >        try {
2644 >            assertNull(h0.join());
2645 >            rs[0].assertValue(v1);
2646 >        } catch (CompletionException ok) {
2647 >            checkCompletedWithWrappedException(h0, ex);
2648 >            rs[0].assertNotInvoked();
2649 >        }
2650 >        try {
2651 >            assertNull(h1.join());
2652 >            rs[1].assertValue(v1);
2653 >        } catch (CompletionException ok) {
2654 >            checkCompletedWithWrappedException(h1, ex);
2655 >            rs[1].assertNotInvoked();
2656 >        }
2657 >        try {
2658 >            assertNull(h2.join());
2659 >            rs[2].assertValue(v1);
2660 >        } catch (CompletionException ok) {
2661 >            checkCompletedWithWrappedException(h2, ex);
2662 >            rs[2].assertNotInvoked();
2663 >        }
2664 >        try {
2665 >            assertNull(h3.join());
2666 >            rs[3].assertValue(v1);
2667 >        } catch (CompletionException ok) {
2668 >            checkCompletedWithWrappedException(h3, ex);
2669 >            rs[3].assertNotInvoked();
2670 >        }
2671  
2672 <        assertEquals(2, e.count.get());
2673 <    }
2672 >        checkCompletedNormally(f, v1);
2673 >        checkCompletedExceptionally(g, ex);
2674 >    }}
2675  
2676      /**
2677 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2677 >     * acceptEither result completes exceptionally if either source cancelled
2678       */
2679 <    public void testThenAcceptBothAsync4E() {
2680 <        CompletableFuture<Integer> f, g;
2681 <        CompletableFuture<Void> h;
2682 <        SubtractAction r;
2683 <        ThreadExecutor e = new ThreadExecutor();
2684 <
2685 <        f = new CompletableFuture<>();
2686 <        g = new CompletableFuture<>();
2687 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2688 <        assertTrue(f.cancel(true));
2689 <        checkIncomplete(h);
2690 <        g.complete(1);
2691 <        checkCompletedWithWrappedCancellationException(h);
2692 <
2693 <        f = new CompletableFuture<>();
2694 <        g = new CompletableFuture<>();
2695 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2696 <        assertTrue(g.cancel(true));
2697 <        checkIncomplete(h);
2698 <        f.complete(3);
2699 <        checkCompletedWithWrappedCancellationException(h);
2700 <
2701 <        f = new CompletableFuture<>();
2702 <        g = new CompletableFuture<>();
2703 <        f.complete(3);
2704 <        assertTrue(g.cancel(true));
2705 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2706 <        checkCompletedWithWrappedCancellationException(h);
2707 <
2708 <        f = new CompletableFuture<>();
2709 <        g = new CompletableFuture<>();
2710 <        assertTrue(f.cancel(true));
2711 <        g.complete(3);
2712 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2713 <        checkCompletedWithWrappedCancellationException(h);
2714 <
2715 <        assertEquals(0, e.count.get());
2716 <    }
2679 >    public void testAcceptEither_sourceCancelled() {
2680 >        for (ExecutionMode m : ExecutionMode.values())
2681 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2682 >        for (Integer v1 : new Integer[] { 1, null })
2683 >    {
2684 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2685 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2686 >        final NoopConsumer[] rs = new NoopConsumer[6];
2687 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2688 >
2689 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2690 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2691 >        checkIncomplete(h0);
2692 >        checkIncomplete(h1);
2693 >        rs[0].assertNotInvoked();
2694 >        rs[1].assertNotInvoked();
2695 >        f.cancel(mayInterruptIfRunning);
2696 >        checkCompletedWithWrappedCancellationException(h0);
2697 >        checkCompletedWithWrappedCancellationException(h1);
2698 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2699 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2700 >        checkCompletedWithWrappedCancellationException(h2);
2701 >        checkCompletedWithWrappedCancellationException(h3);
2702 >
2703 >        g.complete(v1);
2704 >
2705 >        // unspecified behavior - both source completions available
2706 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2707 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2708 >        try {
2709 >            assertNull(h4.join());
2710 >            rs[4].assertValue(v1);
2711 >        } catch (CompletionException ok) {
2712 >            checkCompletedWithWrappedCancellationException(h4);
2713 >            rs[4].assertNotInvoked();
2714 >        }
2715 >        try {
2716 >            assertNull(h5.join());
2717 >            rs[5].assertValue(v1);
2718 >        } catch (CompletionException ok) {
2719 >            checkCompletedWithWrappedCancellationException(h5);
2720 >            rs[5].assertNotInvoked();
2721 >        }
2722  
2723 <    /**
2724 <     * runAfterBothAsync result completes normally after normal
2725 <     * completion of sources
2726 <     */
2727 <    public void testRunAfterBothAsyncE() {
2728 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2729 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2730 <        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 <    }
2723 >        checkCancelled(f);
2724 >        checkCompletedNormally(g, v1);
2725 >        checkCompletedWithWrappedCancellationException(h0);
2726 >        checkCompletedWithWrappedCancellationException(h1);
2727 >        checkCompletedWithWrappedCancellationException(h2);
2728 >        checkCompletedWithWrappedCancellationException(h3);
2729 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2730 >    }}
2731  
2732      /**
2733 <     * runAfterBothAsync result completes exceptionally after exceptional
2530 <     * completion of source
2733 >     * acceptEither result completes exceptionally if action does
2734       */
2735 <    public void testRunAfterBothAsync2E() {
2736 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2737 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2738 <        Noop r = new Noop();
2739 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2740 <        f.completeExceptionally(new CFException());
2741 <        f2.complete(two);
2742 <        checkCompletedWithWrappedCFException(g);
2743 <
2744 <        r = new Noop();
2745 <        f = new CompletableFuture<>();
2746 <        f2 = new CompletableFuture<>();
2747 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2748 <        f.complete(one);
2749 <        f2.completeExceptionally(new CFException());
2750 <        checkCompletedWithWrappedCFException(g);
2751 <    }
2735 >    public void testAcceptEither_actionFailed() {
2736 >        for (ExecutionMode m : ExecutionMode.values())
2737 >        for (Integer v1 : new Integer[] { 1, null })
2738 >        for (Integer v2 : new Integer[] { 2, null })
2739 >    {
2740 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2741 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2742 >        final FailingConsumer[] rs = new FailingConsumer[6];
2743 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2744 >
2745 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2746 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2747 >        f.complete(v1);
2748 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2749 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2750 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2751 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2752 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2753 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2754 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2755 >
2756 >        g.complete(v2);
2757 >
2758 >        // unspecified behavior - both source completions available
2759 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2760 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2761 >
2762 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2763 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2764 >                   Objects.equals(v2, rs[4].value));
2765 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2766 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2767 >                   Objects.equals(v2, rs[5].value));
2768 >
2769 >        checkCompletedNormally(f, v1);
2770 >        checkCompletedNormally(g, v2);
2771 >    }}
2772  
2773      /**
2774 <     * runAfterBothAsync result completes exceptionally if action does
2774 >     * runAfterEither result completes normally after normal completion
2775 >     * of either source
2776       */
2777 <    public void testRunAfterBothAsync3E() {
2778 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2779 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2780 <        FailingNoop r = new FailingNoop();
2781 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2782 <        f.complete(one);
2783 <        checkIncomplete(g);
2784 <        f2.complete(two);
2785 <        checkCompletedWithWrappedCFException(g);
2786 <    }
2777 >    public void testRunAfterEither_normalCompletion() {
2778 >        for (ExecutionMode m : ExecutionMode.values())
2779 >        for (Integer v1 : new Integer[] { 1, null })
2780 >        for (Integer v2 : new Integer[] { 2, null })
2781 >        for (boolean pushNop : new boolean[] { true, false })
2782 >    {
2783 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2784 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2785 >        final Noop[] rs = new Noop[6];
2786 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2787 >
2788 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2789 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2790 >        checkIncomplete(h0);
2791 >        checkIncomplete(h1);
2792 >        rs[0].assertNotInvoked();
2793 >        rs[1].assertNotInvoked();
2794 >        if (pushNop) {          // ad hoc test of intra-completion interference
2795 >            m.thenRun(f, () -> {});
2796 >            m.thenRun(g, () -> {});
2797 >        }
2798 >        f.complete(v1);
2799 >        checkCompletedNormally(h0, null);
2800 >        checkCompletedNormally(h1, null);
2801 >        rs[0].assertInvoked();
2802 >        rs[1].assertInvoked();
2803 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2804 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2805 >        checkCompletedNormally(h2, null);
2806 >        checkCompletedNormally(h3, null);
2807 >        rs[2].assertInvoked();
2808 >        rs[3].assertInvoked();
2809 >
2810 >        g.complete(v2);
2811 >
2812 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2813 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2814 >
2815 >        checkCompletedNormally(f, v1);
2816 >        checkCompletedNormally(g, v2);
2817 >        checkCompletedNormally(h0, null);
2818 >        checkCompletedNormally(h1, null);
2819 >        checkCompletedNormally(h2, null);
2820 >        checkCompletedNormally(h3, null);
2821 >        checkCompletedNormally(h4, null);
2822 >        checkCompletedNormally(h5, null);
2823 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2824 >    }}
2825  
2826      /**
2827 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2827 >     * runAfterEither result completes exceptionally after exceptional
2828 >     * completion of either source
2829       */
2830 <    public void testRunAfterBothAsync4E() {
2831 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2832 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2833 <        Noop r = new Noop();
2834 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2835 <        assertTrue(f.cancel(true));
2836 <        f2.complete(two);
2837 <        checkCompletedWithWrappedCancellationException(g);
2830 >    public void testRunAfterEither_exceptionalCompletion() {
2831 >        for (ExecutionMode m : ExecutionMode.values())
2832 >        for (Integer v1 : new Integer[] { 1, null })
2833 >    {
2834 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2835 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2836 >        final CFException ex = new CFException();
2837 >        final Noop[] rs = new Noop[6];
2838 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2839 >
2840 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2841 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2842 >        checkIncomplete(h0);
2843 >        checkIncomplete(h1);
2844 >        rs[0].assertNotInvoked();
2845 >        rs[1].assertNotInvoked();
2846 >        assertTrue(f.completeExceptionally(ex));
2847 >        checkCompletedWithWrappedException(h0, ex);
2848 >        checkCompletedWithWrappedException(h1, ex);
2849 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2850 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2851 >        checkCompletedWithWrappedException(h2, ex);
2852 >        checkCompletedWithWrappedException(h3, ex);
2853 >
2854 >        assertTrue(g.complete(v1));
2855 >
2856 >        // unspecified behavior - both source completions available
2857 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2858 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2859 >        try {
2860 >            assertNull(h4.join());
2861 >            rs[4].assertInvoked();
2862 >        } catch (CompletionException ok) {
2863 >            checkCompletedWithWrappedException(h4, ex);
2864 >            rs[4].assertNotInvoked();
2865 >        }
2866 >        try {
2867 >            assertNull(h5.join());
2868 >            rs[5].assertInvoked();
2869 >        } catch (CompletionException ok) {
2870 >            checkCompletedWithWrappedException(h5, ex);
2871 >            rs[5].assertNotInvoked();
2872 >        }
2873  
2874 <        r = new Noop();
2875 <        f = new CompletableFuture<>();
2876 <        f2 = new CompletableFuture<>();
2877 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2878 <        f.complete(one);
2879 <        assertTrue(f2.cancel(true));
2880 <        checkCompletedWithWrappedCancellationException(g);
2881 <    }
2874 >        checkCompletedExceptionally(f, ex);
2875 >        checkCompletedNormally(g, v1);
2876 >        checkCompletedWithWrappedException(h0, ex);
2877 >        checkCompletedWithWrappedException(h1, ex);
2878 >        checkCompletedWithWrappedException(h2, ex);
2879 >        checkCompletedWithWrappedException(h3, ex);
2880 >        checkCompletedWithWrappedException(h4, ex);
2881 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2882 >    }}
2883 >
2884 >    public void testRunAfterEither_exceptionalCompletion2() {
2885 >        for (ExecutionMode m : ExecutionMode.values())
2886 >        for (boolean fFirst : new boolean[] { true, false })
2887 >        for (Integer v1 : new Integer[] { 1, null })
2888 >    {
2889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2891 >        final CFException ex = new CFException();
2892 >        final Noop[] rs = new Noop[6];
2893 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2894 >
2895 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2896 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2897 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2898 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2899 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2900 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2901  
2902 <    /**
2903 <     * applyToEitherAsync result completes normally after normal
2904 <     * completion of sources
2905 <     */
2906 <    public void testApplyToEitherAsyncE() {
2907 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2908 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2909 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2910 <        f.complete(one);
2911 <        checkCompletedNormally(g, two);
2902 >        // unspecified behavior - both source completions available
2903 >        try {
2904 >            assertNull(h0.join());
2905 >            rs[0].assertInvoked();
2906 >        } catch (CompletionException ok) {
2907 >            checkCompletedWithWrappedException(h0, ex);
2908 >            rs[0].assertNotInvoked();
2909 >        }
2910 >        try {
2911 >            assertNull(h1.join());
2912 >            rs[1].assertInvoked();
2913 >        } catch (CompletionException ok) {
2914 >            checkCompletedWithWrappedException(h1, ex);
2915 >            rs[1].assertNotInvoked();
2916 >        }
2917 >        try {
2918 >            assertNull(h2.join());
2919 >            rs[2].assertInvoked();
2920 >        } catch (CompletionException ok) {
2921 >            checkCompletedWithWrappedException(h2, ex);
2922 >            rs[2].assertNotInvoked();
2923 >        }
2924 >        try {
2925 >            assertNull(h3.join());
2926 >            rs[3].assertInvoked();
2927 >        } catch (CompletionException ok) {
2928 >            checkCompletedWithWrappedException(h3, ex);
2929 >            rs[3].assertNotInvoked();
2930 >        }
2931  
2932 <        f = new CompletableFuture<>();
2933 <        f.complete(one);
2934 <        f2 = new CompletableFuture<>();
2599 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2600 <        checkCompletedNormally(g, two);
2601 <    }
2932 >        checkCompletedNormally(f, v1);
2933 >        checkCompletedExceptionally(g, ex);
2934 >    }}
2935  
2936      /**
2937 <     * applyToEitherAsync result completes exceptionally after exceptional
2605 <     * completion of source
2937 >     * runAfterEither result completes exceptionally if either source cancelled
2938       */
2939 <    public void testApplyToEitherAsync2E() {
2940 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2941 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2942 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2943 <        f.completeExceptionally(new CFException());
2944 <        checkCompletedWithWrappedCFException(g);
2945 <
2946 <        f = new CompletableFuture<>();
2947 <        f2 = new CompletableFuture<>();
2948 <        f2.completeExceptionally(new CFException());
2949 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2950 <        f.complete(one);
2951 <        checkCompletedWithWrappedCFException(g);
2952 <    }
2939 >    public void testRunAfterEither_sourceCancelled() {
2940 >        for (ExecutionMode m : ExecutionMode.values())
2941 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2942 >        for (Integer v1 : new Integer[] { 1, null })
2943 >    {
2944 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2945 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2946 >        final Noop[] rs = new Noop[6];
2947 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2948 >
2949 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2950 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2951 >        checkIncomplete(h0);
2952 >        checkIncomplete(h1);
2953 >        rs[0].assertNotInvoked();
2954 >        rs[1].assertNotInvoked();
2955 >        f.cancel(mayInterruptIfRunning);
2956 >        checkCompletedWithWrappedCancellationException(h0);
2957 >        checkCompletedWithWrappedCancellationException(h1);
2958 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2959 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2960 >        checkCompletedWithWrappedCancellationException(h2);
2961 >        checkCompletedWithWrappedCancellationException(h3);
2962 >
2963 >        assertTrue(g.complete(v1));
2964 >
2965 >        // unspecified behavior - both source completions available
2966 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2967 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2968 >        try {
2969 >            assertNull(h4.join());
2970 >            rs[4].assertInvoked();
2971 >        } catch (CompletionException ok) {
2972 >            checkCompletedWithWrappedCancellationException(h4);
2973 >            rs[4].assertNotInvoked();
2974 >        }
2975 >        try {
2976 >            assertNull(h5.join());
2977 >            rs[5].assertInvoked();
2978 >        } catch (CompletionException ok) {
2979 >            checkCompletedWithWrappedCancellationException(h5);
2980 >            rs[5].assertNotInvoked();
2981 >        }
2982  
2983 <    /**
2984 <     * applyToEitherAsync result completes exceptionally if action does
2985 <     */
2986 <    public void testApplyToEitherAsync3E() {
2987 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2988 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2989 <        FailingFunction r = new FailingFunction();
2990 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2630 <        f.complete(one);
2631 <        checkCompletedWithWrappedCFException(g);
2632 <    }
2983 >        checkCancelled(f);
2984 >        checkCompletedNormally(g, v1);
2985 >        checkCompletedWithWrappedCancellationException(h0);
2986 >        checkCompletedWithWrappedCancellationException(h1);
2987 >        checkCompletedWithWrappedCancellationException(h2);
2988 >        checkCompletedWithWrappedCancellationException(h3);
2989 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2990 >    }}
2991  
2992      /**
2993 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2993 >     * runAfterEither result completes exceptionally if action does
2994       */
2995 <    public void testApplyToEitherAsync4E() {
2996 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2997 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2998 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2999 <        assertTrue(f.cancel(true));
3000 <        checkCompletedWithWrappedCancellationException(g);
3001 <
3002 <        f = new CompletableFuture<>();
3003 <        f2 = new CompletableFuture<>();
3004 <        assertTrue(f2.cancel(true));
3005 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3006 <        checkCompletedWithWrappedCancellationException(g);
3007 <    }
2995 >    public void testRunAfterEither_actionFailed() {
2996 >        for (ExecutionMode m : ExecutionMode.values())
2997 >        for (Integer v1 : new Integer[] { 1, null })
2998 >        for (Integer v2 : new Integer[] { 2, null })
2999 >    {
3000 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3001 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3002 >        final FailingRunnable[] rs = new FailingRunnable[6];
3003 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
3004 >
3005 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3006 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3007 >        assertTrue(f.complete(v1));
3008 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
3009 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
3010 >        checkCompletedWithWrappedException(h0, rs[0].ex);
3011 >        checkCompletedWithWrappedException(h1, rs[1].ex);
3012 >        checkCompletedWithWrappedException(h2, rs[2].ex);
3013 >        checkCompletedWithWrappedException(h3, rs[3].ex);
3014 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
3015 >        assertTrue(g.complete(v2));
3016 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
3017 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
3018 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3019 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3020 >
3021 >        checkCompletedNormally(f, v1);
3022 >        checkCompletedNormally(g, v2);
3023 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
3024 >    }}
3025  
3026      /**
3027 <     * acceptEitherAsync result completes normally after normal
2653 <     * completion of sources
3027 >     * thenCompose result completes normally after normal completion of source
3028       */
3029 <    public void testAcceptEitherAsyncE() {
3030 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3031 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3032 <        IncAction r = new IncAction();
3033 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3034 <        f.complete(one);
3035 <        checkCompletedNormally(g, null);
3036 <        assertEquals(r.value, 2);
3037 <
3038 <        r = new IncAction();
3039 <        f = new CompletableFuture<>();
3040 <        f.complete(one);
3041 <        f2 = new CompletableFuture<>();
3042 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3043 <        checkCompletedNormally(g, null);
2670 <        assertEquals(r.value, 2);
2671 <    }
3029 >    public void testThenCompose_normalCompletion() {
3030 >        for (ExecutionMode m : ExecutionMode.values())
3031 >        for (boolean createIncomplete : new boolean[] { true, false })
3032 >        for (Integer v1 : new Integer[] { 1, null })
3033 >    {
3034 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3035 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3036 >        if (!createIncomplete) assertTrue(f.complete(v1));
3037 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3038 >        if (createIncomplete) assertTrue(f.complete(v1));
3039 >
3040 >        checkCompletedNormally(g, inc(v1));
3041 >        checkCompletedNormally(f, v1);
3042 >        r.assertValue(v1);
3043 >    }}
3044  
3045      /**
3046 <     * acceptEitherAsync result completes exceptionally after exceptional
3046 >     * thenCompose result completes exceptionally after exceptional
3047       * completion of source
3048       */
3049 <    public void testAcceptEitherAsync2E() {
3050 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3051 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3052 <        IncAction r = new IncAction();
3053 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3054 <        f.completeExceptionally(new CFException());
3055 <        checkCompletedWithWrappedCFException(g);
3056 <
3057 <        r = new IncAction();
3058 <        f = new CompletableFuture<>();
3059 <        f2 = new CompletableFuture<>();
3060 <        f2.completeExceptionally(new CFException());
3061 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3062 <        f.complete(one);
3063 <        checkCompletedWithWrappedCFException(g);
2692 <    }
3049 >    public void testThenCompose_exceptionalCompletion() {
3050 >        for (ExecutionMode m : ExecutionMode.values())
3051 >        for (boolean createIncomplete : new boolean[] { true, false })
3052 >    {
3053 >        final CFException ex = new CFException();
3054 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3055 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3056 >        if (!createIncomplete) f.completeExceptionally(ex);
3057 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3058 >        if (createIncomplete) f.completeExceptionally(ex);
3059 >
3060 >        checkCompletedWithWrappedException(g, ex);
3061 >        checkCompletedExceptionally(f, ex);
3062 >        r.assertNotInvoked();
3063 >    }}
3064  
3065      /**
3066 <     * acceptEitherAsync result completes exceptionally if action does
3066 >     * thenCompose result completes exceptionally if action does
3067       */
3068 <    public void testAcceptEitherAsync3E() {
3069 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3070 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3071 <        FailingConsumer r = new FailingConsumer();
3072 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3073 <        f.complete(one);
3074 <        checkCompletedWithWrappedCFException(g);
3075 <    }
3068 >    public void testThenCompose_actionFailed() {
3069 >        for (ExecutionMode m : ExecutionMode.values())
3070 >        for (boolean createIncomplete : new boolean[] { true, false })
3071 >        for (Integer v1 : new Integer[] { 1, null })
3072 >    {
3073 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3074 >        final FailingCompletableFutureFunction r
3075 >            = new FailingCompletableFutureFunction(m);
3076 >        if (!createIncomplete) assertTrue(f.complete(v1));
3077 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3078 >        if (createIncomplete) assertTrue(f.complete(v1));
3079 >
3080 >        checkCompletedWithWrappedException(g, r.ex);
3081 >        checkCompletedNormally(f, v1);
3082 >    }}
3083  
3084      /**
3085 <     * acceptEitherAsync result completes exceptionally if either
2708 <     * source cancelled
3085 >     * thenCompose result completes exceptionally if source cancelled
3086       */
3087 <    public void testAcceptEitherAsync4E() {
3088 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3089 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3090 <        IncAction r = new IncAction();
3091 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3092 <        assertTrue(f.cancel(true));
3093 <        checkCompletedWithWrappedCancellationException(g);
3087 >    public void testThenCompose_sourceCancelled() {
3088 >        for (ExecutionMode m : ExecutionMode.values())
3089 >        for (boolean createIncomplete : new boolean[] { true, false })
3090 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3091 >    {
3092 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3093 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3094 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3095 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3096 >        if (createIncomplete) {
3097 >            checkIncomplete(g);
3098 >            assertTrue(f.cancel(mayInterruptIfRunning));
3099 >        }
3100  
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());
3101          checkCompletedWithWrappedCancellationException(g);
3102 <    }
3102 >        checkCancelled(f);
3103 >    }}
3104  
3105      /**
3106 <     * runAfterEitherAsync result completes normally after normal
2728 <     * completion of sources
3106 >     * thenCompose result completes exceptionally if the result of the action does
3107       */
3108 <    public void testRunAfterEitherAsyncE() {
3109 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3110 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3111 <        Noop r = new Noop();
3112 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3113 <        f.complete(one);
3114 <        checkCompletedNormally(g, null);
3115 <        assertTrue(r.ran);
3108 >    public void testThenCompose_actionReturnsFailingFuture() {
3109 >        for (ExecutionMode m : ExecutionMode.values())
3110 >        for (int order = 0; order < 6; order++)
3111 >        for (Integer v1 : new Integer[] { 1, null })
3112 >    {
3113 >        final CFException ex = new CFException();
3114 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3115 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3116 >        final CompletableFuture<Integer> h;
3117 >        // Test all permutations of orders
3118 >        switch (order) {
3119 >        case 0:
3120 >            assertTrue(f.complete(v1));
3121 >            assertTrue(g.completeExceptionally(ex));
3122 >            h = m.thenCompose(f, (x -> g));
3123 >            break;
3124 >        case 1:
3125 >            assertTrue(f.complete(v1));
3126 >            h = m.thenCompose(f, (x -> g));
3127 >            assertTrue(g.completeExceptionally(ex));
3128 >            break;
3129 >        case 2:
3130 >            assertTrue(g.completeExceptionally(ex));
3131 >            assertTrue(f.complete(v1));
3132 >            h = m.thenCompose(f, (x -> g));
3133 >            break;
3134 >        case 3:
3135 >            assertTrue(g.completeExceptionally(ex));
3136 >            h = m.thenCompose(f, (x -> g));
3137 >            assertTrue(f.complete(v1));
3138 >            break;
3139 >        case 4:
3140 >            h = m.thenCompose(f, (x -> g));
3141 >            assertTrue(f.complete(v1));
3142 >            assertTrue(g.completeExceptionally(ex));
3143 >            break;
3144 >        case 5:
3145 >            h = m.thenCompose(f, (x -> g));
3146 >            assertTrue(f.complete(v1));
3147 >            assertTrue(g.completeExceptionally(ex));
3148 >            break;
3149 >        default: throw new AssertionError();
3150 >        }
3151  
3152 <        r = new Noop();
3153 <        f = new CompletableFuture<>();
3154 <        f.complete(one);
3155 <        f2 = new CompletableFuture<>();
2743 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2744 <        checkCompletedNormally(g, null);
2745 <        assertTrue(r.ran);
2746 <    }
3152 >        checkCompletedExceptionally(g, ex);
3153 >        checkCompletedWithWrappedException(h, ex);
3154 >        checkCompletedNormally(f, v1);
3155 >    }}
3156  
3157      /**
3158 <     * runAfterEitherAsync result completes exceptionally after exceptional
3158 >     * exceptionallyCompose result completes normally after normal
3159       * completion of source
3160       */
3161 <    public void testRunAfterEitherAsync2E() {
3162 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3163 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3164 <        Noop r = new Noop();
3165 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3166 <        f.completeExceptionally(new CFException());
3167 <        checkCompletedWithWrappedCFException(g);
3168 <
3169 <        r = new Noop();
3170 <        f = new CompletableFuture<>();
3171 <        f2 = new CompletableFuture<>();
3172 <        f2.completeExceptionally(new CFException());
3173 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3174 <        f.complete(one);
3175 <        checkCompletedWithWrappedCFException(g);
3176 <    }
2768 <
2769 <    /**
2770 <     * 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 <    }
3161 >    public void testExceptionallyCompose_normalCompletion() {
3162 >        for (ExecutionMode m : ExecutionMode.values())
3163 >        for (boolean createIncomplete : new boolean[] { true, false })
3164 >        for (Integer v1 : new Integer[] { 1, null })
3165 >    {
3166 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3167 >        final ExceptionalCompletableFutureFunction r =
3168 >            new ExceptionalCompletableFutureFunction(m);
3169 >        if (!createIncomplete) assertTrue(f.complete(v1));
3170 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3171 >        if (createIncomplete) assertTrue(f.complete(v1));
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 <    }
3189 <
3190 <    /**
3191 <     * thenComposeAsync result completes exceptionally after
3192 <     * exceptional completion of source
3193 <     */
3194 <    public void testThenComposeAsync2E() {
3195 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3196 <        CompletableFutureInc r = new CompletableFutureInc();
3197 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3198 <        f.completeExceptionally(new CFException());
3199 <        checkCompletedWithWrappedCFException(g);
3200 <    }
3201 <
3202 <    /**
3203 <     * thenComposeAsync result completes exceptionally if action does
3204 <     */
3205 <    public void testThenComposeAsync3E() {
3206 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3207 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3208 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3209 <        f.complete(one);
3210 <        checkCompletedWithWrappedCFException(g);
3211 <    }
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  
2836    /**
2837     * 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    }
3220  
3221      // other static methods
3222  
# Line 2860 | Line 3234 | public class CompletableFutureTest exten
3234       * when all components complete normally
3235       */
3236      public void testAllOf_normal() throws Exception {
3237 <        for (int k = 1; k < 20; ++k) {
3238 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3239 <            for (int i = 0; i < k; ++i)
3237 >        for (int k = 1; k < 10; k++) {
3238 >            CompletableFuture<Integer>[] fs
3239 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3240 >            for (int i = 0; i < k; i++)
3241 >                fs[i] = new CompletableFuture<>();
3242 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3243 >            for (int i = 0; i < k; i++) {
3244 >                checkIncomplete(f);
3245 >                checkIncomplete(CompletableFuture.allOf(fs));
3246 >                fs[i].complete(one);
3247 >            }
3248 >            checkCompletedNormally(f, null);
3249 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3250 >        }
3251 >    }
3252 >
3253 >    public void testAllOf_normal_backwards() throws Exception {
3254 >        for (int k = 1; k < 10; k++) {
3255 >            CompletableFuture<Integer>[] fs
3256 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3257 >            for (int i = 0; i < k; i++)
3258                  fs[i] = new CompletableFuture<>();
3259              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3260 <            for (int i = 0; i < k; ++i) {
3260 >            for (int i = k - 1; i >= 0; i--) {
3261                  checkIncomplete(f);
3262                  checkIncomplete(CompletableFuture.allOf(fs));
3263                  fs[i].complete(one);
# Line 2875 | Line 3267 | public class CompletableFutureTest exten
3267          }
3268      }
3269  
3270 +    public void testAllOf_exceptional() throws Exception {
3271 +        for (int k = 1; k < 10; k++) {
3272 +            CompletableFuture<Integer>[] fs
3273 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3274 +            CFException ex = new CFException();
3275 +            for (int i = 0; i < k; i++)
3276 +                fs[i] = new CompletableFuture<>();
3277 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3278 +            for (int i = 0; i < k; i++) {
3279 +                checkIncomplete(f);
3280 +                checkIncomplete(CompletableFuture.allOf(fs));
3281 +                if (i != k / 2) {
3282 +                    fs[i].complete(i);
3283 +                    checkCompletedNormally(fs[i], i);
3284 +                } else {
3285 +                    fs[i].completeExceptionally(ex);
3286 +                    checkCompletedExceptionally(fs[i], ex);
3287 +                }
3288 +            }
3289 +            checkCompletedWithWrappedException(f, ex);
3290 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3291 +        }
3292 +    }
3293 +
3294      /**
3295       * anyOf(no component futures) returns an incomplete future
3296       */
3297      public void testAnyOf_empty() throws Exception {
3298 +        for (Integer v1 : new Integer[] { 1, null })
3299 +    {
3300          CompletableFuture<Object> f = CompletableFuture.anyOf();
3301          checkIncomplete(f);
3302 <    }
3302 >
3303 >        f.complete(v1);
3304 >        checkCompletedNormally(f, v1);
3305 >    }}
3306  
3307      /**
3308       * anyOf returns a future completed normally with a value when
3309       * a component future does
3310       */
3311      public void testAnyOf_normal() throws Exception {
3312 <        for (int k = 0; k < 10; ++k) {
3312 >        for (int k = 0; k < 10; k++) {
3313              CompletableFuture[] fs = new CompletableFuture[k];
3314 <            for (int i = 0; i < k; ++i)
3314 >            for (int i = 0; i < k; i++)
3315                  fs[i] = new CompletableFuture<>();
3316              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3317              checkIncomplete(f);
3318 <            for (int i = 0; i < k; ++i) {
3319 <                fs[i].complete(one);
3320 <                checkCompletedNormally(f, one);
3321 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3318 >            for (int i = 0; i < k; i++) {
3319 >                fs[i].complete(i);
3320 >                checkCompletedNormally(f, 0);
3321 >                int x = (int) CompletableFuture.anyOf(fs).join();
3322 >                assertTrue(0 <= x && x <= i);
3323 >            }
3324 >        }
3325 >    }
3326 >    public void testAnyOf_normal_backwards() throws Exception {
3327 >        for (int k = 0; k < 10; k++) {
3328 >            CompletableFuture[] fs = new CompletableFuture[k];
3329 >            for (int i = 0; i < k; i++)
3330 >                fs[i] = new CompletableFuture<>();
3331 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3332 >            checkIncomplete(f);
3333 >            for (int i = k - 1; i >= 0; i--) {
3334 >                fs[i].complete(i);
3335 >                checkCompletedNormally(f, k - 1);
3336 >                int x = (int) CompletableFuture.anyOf(fs).join();
3337 >                assertTrue(i <= x && x <= k - 1);
3338              }
3339          }
3340      }
# Line 2906 | Line 3343 | public class CompletableFutureTest exten
3343       * anyOf result completes exceptionally when any component does.
3344       */
3345      public void testAnyOf_exceptional() throws Exception {
3346 <        for (int k = 0; k < 10; ++k) {
3346 >        for (int k = 0; k < 10; k++) {
3347 >            CompletableFuture[] fs = new CompletableFuture[k];
3348 >            CFException[] exs = new CFException[k];
3349 >            for (int i = 0; i < k; i++) {
3350 >                fs[i] = new CompletableFuture<>();
3351 >                exs[i] = new CFException();
3352 >            }
3353 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3354 >            checkIncomplete(f);
3355 >            for (int i = 0; i < k; i++) {
3356 >                fs[i].completeExceptionally(exs[i]);
3357 >                checkCompletedWithWrappedException(f, exs[0]);
3358 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3359 >            }
3360 >        }
3361 >    }
3362 >
3363 >    public void testAnyOf_exceptional_backwards() throws Exception {
3364 >        for (int k = 0; k < 10; k++) {
3365              CompletableFuture[] fs = new CompletableFuture[k];
3366 <            for (int i = 0; i < k; ++i)
3366 >            CFException[] exs = new CFException[k];
3367 >            for (int i = 0; i < k; i++) {
3368                  fs[i] = new CompletableFuture<>();
3369 +                exs[i] = new CFException();
3370 +            }
3371              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3372              checkIncomplete(f);
3373 <            for (int i = 0; i < k; ++i) {
3374 <                fs[i].completeExceptionally(new CFException());
3375 <                checkCompletedWithWrappedCFException(f);
3373 >            for (int i = k - 1; i >= 0; i--) {
3374 >                fs[i].completeExceptionally(exs[i]);
3375 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3376                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3377              }
3378          }
# Line 2923 | Line 3381 | public class CompletableFutureTest exten
3381      /**
3382       * Completion methods throw NullPointerException with null arguments
3383       */
3384 +    @SuppressWarnings("FutureReturnValueIgnored")
3385      public void testNPE() {
3386          CompletableFuture<Integer> f = new CompletableFuture<>();
3387          CompletableFuture<Integer> g = new CompletableFuture<>();
3388          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2930        CompletableFuture<?> h;
3389          ThreadExecutor exec = new ThreadExecutor();
3390  
3391          Runnable[] throwingActions = {
3392              () -> CompletableFuture.supplyAsync(null),
3393              () -> CompletableFuture.supplyAsync(null, exec),
3394 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3394 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3395  
3396              () -> CompletableFuture.runAsync(null),
3397              () -> CompletableFuture.runAsync(null, exec),
# Line 2943 | Line 3401 | public class CompletableFutureTest exten
3401  
3402              () -> f.thenApply(null),
3403              () -> f.thenApplyAsync(null),
3404 <            () -> f.thenApplyAsync((x) -> x, null),
3404 >            () -> f.thenApplyAsync(x -> x, null),
3405              () -> f.thenApplyAsync(null, exec),
3406  
3407              () -> f.thenAccept(null),
3408              () -> f.thenAcceptAsync(null),
3409 <            () -> f.thenAcceptAsync((x) -> {} , null),
3409 >            () -> f.thenAcceptAsync(x -> {} , null),
3410              () -> f.thenAcceptAsync(null, exec),
3411  
3412              () -> f.thenRun(null),
# Line 2983 | Line 3441 | public class CompletableFutureTest exten
3441              () -> f.applyToEither(g, null),
3442              () -> f.applyToEitherAsync(g, null),
3443              () -> f.applyToEitherAsync(g, null, exec),
3444 <            () -> f.applyToEither(nullFuture, (x) -> x),
3445 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3446 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3447 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3444 >            () -> f.applyToEither(nullFuture, x -> x),
3445 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3446 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3447 >            () -> f.applyToEitherAsync(g, x -> x, null),
3448  
3449              () -> f.acceptEither(g, null),
3450              () -> f.acceptEitherAsync(g, null),
3451              () -> f.acceptEitherAsync(g, null, exec),
3452 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3453 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3454 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3455 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3452 >            () -> f.acceptEither(nullFuture, x -> {}),
3453 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3454 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3455 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3456  
3457              () -> f.runAfterEither(g, null),
3458              () -> f.runAfterEitherAsync(g, null),
# Line 3006 | Line 3464 | public class CompletableFutureTest exten
3464  
3465              () -> f.thenCompose(null),
3466              () -> f.thenComposeAsync(null),
3467 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3467 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3468              () -> f.thenComposeAsync(null, exec),
3469  
3470              () -> f.exceptionally(null),
# Line 3022 | Line 3480 | public class CompletableFutureTest exten
3480              () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3481              () -> CompletableFuture.anyOf(f, null),
3482              () -> CompletableFuture.anyOf(null, f),
3483 +
3484 +            () -> f.obtrudeException(null),
3485 +
3486 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3487 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3488 +            () -> CompletableFuture.delayedExecutor(1L, null),
3489 +
3490 +            () -> f.orTimeout(1L, null),
3491 +            () -> f.completeOnTimeout(42, 1L, null),
3492 +
3493 +            () -> CompletableFuture.failedFuture(null),
3494 +            () -> CompletableFuture.failedStage(null),
3495          };
3496  
3497          assertThrows(NullPointerException.class, throwingActions);
# Line 3029 | Line 3499 | public class CompletableFutureTest exten
3499      }
3500  
3501      /**
3502 +     * Test submissions to an executor that rejects all tasks.
3503 +     */
3504 +    public void testRejectingExecutor() {
3505 +        for (Integer v : new Integer[] { 1, null })
3506 +    {
3507 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3508 +
3509 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3510 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3511 +
3512 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3513 +
3514 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3515 +        srcs.add(complete);
3516 +        srcs.add(incomplete);
3517 +
3518 +        for (CompletableFuture<Integer> src : srcs) {
3519 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3520 +            fs.add(src.thenRunAsync(() -> {}, e));
3521 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3522 +            fs.add(src.thenApplyAsync(z -> z, e));
3523 +
3524 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3525 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3526 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3527 +
3528 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3529 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3530 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3531 +
3532 +            fs.add(src.thenComposeAsync(z -> null, e));
3533 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3534 +            fs.add(src.handleAsync((z, t) -> null, e));
3535 +
3536 +            for (CompletableFuture<?> future : fs) {
3537 +                if (src.isDone())
3538 +                    checkCompletedWithWrappedException(future, e.ex);
3539 +                else
3540 +                    checkIncomplete(future);
3541 +            }
3542 +            futures.addAll(fs);
3543 +        }
3544 +
3545 +        {
3546 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3547 +
3548 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3549 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3550 +
3551 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3552 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3553 +
3554 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3555 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3556 +
3557 +            for (CompletableFuture<?> future : fs)
3558 +                checkIncomplete(future);
3559 +            futures.addAll(fs);
3560 +        }
3561 +
3562 +        {
3563 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3564 +
3565 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3566 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3567 +
3568 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3569 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3570 +
3571 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3572 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3573 +
3574 +            for (CompletableFuture<?> future : fs)
3575 +                checkCompletedWithWrappedException(future, e.ex);
3576 +            futures.addAll(fs);
3577 +        }
3578 +
3579 +        incomplete.complete(v);
3580 +
3581 +        for (CompletableFuture<?> future : futures)
3582 +            checkCompletedWithWrappedException(future, e.ex);
3583 +
3584 +        assertEquals(futures.size(), e.count.get());
3585 +    }}
3586 +
3587 +    /**
3588 +     * Test submissions to an executor that rejects all tasks, but
3589 +     * should never be invoked because the dependent future is
3590 +     * explicitly completed.
3591 +     */
3592 +    public void testRejectingExecutorNeverInvoked() {
3593 +        for (Integer v : new Integer[] { 1, null })
3594 +    {
3595 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3596 +
3597 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3598 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3599 +
3600 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3601 +
3602 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3603 +        srcs.add(complete);
3604 +        srcs.add(incomplete);
3605 +
3606 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3607 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3608 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3609 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3610 +
3611 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3612 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3613 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3614 +
3615 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3616 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3617 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3618 +
3619 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3620 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3621 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3622 +
3623 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3624 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3625 +
3626 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3627 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3628 +
3629 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3630 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3631 +
3632 +        for (CompletableFuture<?> future : fs)
3633 +            checkIncomplete(future);
3634 +
3635 +        for (CompletableFuture<?> future : fs)
3636 +            future.complete(null);
3637 +
3638 +        incomplete.complete(v);
3639 +
3640 +        for (CompletableFuture<?> future : fs)
3641 +            checkCompletedNormally(future, null);
3642 +
3643 +        assertEquals(0, e.count.get());
3644 +    }}
3645 +
3646 +    /**
3647       * toCompletableFuture returns this CompletableFuture.
3648       */
3649      public void testToCompletableFuture() {
# Line 3036 | Line 3651 | public class CompletableFutureTest exten
3651          assertSame(f, f.toCompletableFuture());
3652      }
3653  
3654 +    // jdk9
3655 +
3656      /**
3657 <     * whenComplete action executes on normal completion, propagating
3041 <     * source result.
3657 >     * newIncompleteFuture returns an incomplete CompletableFuture
3658       */
3659 <    public void testWhenComplete1() {
3660 <        final AtomicInteger a = new AtomicInteger();
3659 >    public void testNewIncompleteFuture() {
3660 >        for (Integer v1 : new Integer[] { 1, null })
3661 >    {
3662          CompletableFuture<Integer> f = new CompletableFuture<>();
3663 <        CompletableFuture<Integer> g =
3664 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3665 <        f.complete(three);
3666 <        checkCompletedNormally(f, three);
3667 <        checkCompletedNormally(g, three);
3668 <        assertEquals(a.get(), 1);
3663 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3664 >        checkIncomplete(f);
3665 >        checkIncomplete(g);
3666 >        f.complete(v1);
3667 >        checkCompletedNormally(f, v1);
3668 >        checkIncomplete(g);
3669 >        g.complete(v1);
3670 >        checkCompletedNormally(g, v1);
3671 >        assertSame(g.getClass(), CompletableFuture.class);
3672 >    }}
3673 >
3674 >    /**
3675 >     * completedStage returns a completed CompletionStage
3676 >     */
3677 >    public void testCompletedStage() {
3678 >        AtomicInteger x = new AtomicInteger(0);
3679 >        AtomicReference<Throwable> r = new AtomicReference<>();
3680 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3681 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3682 >        assertEquals(x.get(), 1);
3683 >        assertNull(r.get());
3684      }
3685  
3686      /**
3687 <     * whenComplete action executes on exceptional completion, propagating
3688 <     * source result.
3687 >     * defaultExecutor by default returns the commonPool if
3688 >     * it supports more than one thread.
3689       */
3690 <    public void testWhenComplete2() {
3059 <        final AtomicInteger a = new AtomicInteger();
3690 >    public void testDefaultExecutor() {
3691          CompletableFuture<Integer> f = new CompletableFuture<>();
3692 <        CompletableFuture<Integer> g =
3693 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3694 <        f.completeExceptionally(new CFException());
3695 <        assertTrue(f.isCompletedExceptionally());
3696 <        assertTrue(g.isCompletedExceptionally());
3697 <        assertEquals(a.get(), 1);
3692 >        Executor e = f.defaultExecutor();
3693 >        Executor c = ForkJoinPool.commonPool();
3694 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3695 >            assertSame(e, c);
3696 >        else
3697 >            assertNotSame(e, c);
3698      }
3699  
3700      /**
3701 <     * If a whenComplete action throws an exception when triggered by
3702 <     * a normal completion, it completes exceptionally
3701 >     * failedFuture returns a CompletableFuture completed
3702 >     * exceptionally with the given Exception
3703 >     */
3704 >    public void testFailedFuture() {
3705 >        CFException ex = new CFException();
3706 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3707 >        checkCompletedExceptionally(f, ex);
3708 >    }
3709 >
3710 >    /**
3711 >     * failedFuture(null) throws NPE
3712 >     */
3713 >    public void testFailedFuture_null() {
3714 >        try {
3715 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3716 >            shouldThrow();
3717 >        } catch (NullPointerException success) {}
3718 >    }
3719 >
3720 >    /**
3721 >     * copy returns a CompletableFuture that is completed normally,
3722 >     * with the same value, when source is.
3723       */
3724 <    public void testWhenComplete3() {
3724 >    public void testCopy_normalCompletion() {
3725 >        for (boolean createIncomplete : new boolean[] { true, false })
3726 >        for (Integer v1 : new Integer[] { 1, null })
3727 >    {
3728          CompletableFuture<Integer> f = new CompletableFuture<>();
3729 <        CompletableFuture<Integer> g =
3730 <            f.whenComplete((Integer x, Throwable t) ->
3731 <                           { throw new CFException(); } );
3732 <        f.complete(three);
3733 <        checkCompletedNormally(f, three);
3734 <        assertTrue(g.isCompletedExceptionally());
3735 <        checkCompletedWithWrappedCFException(g);
3729 >        if (!createIncomplete) assertTrue(f.complete(v1));
3730 >        CompletableFuture<Integer> g = f.copy();
3731 >        if (createIncomplete) {
3732 >            checkIncomplete(f);
3733 >            checkIncomplete(g);
3734 >            assertTrue(f.complete(v1));
3735 >        }
3736 >        checkCompletedNormally(f, v1);
3737 >        checkCompletedNormally(g, v1);
3738 >    }}
3739 >
3740 >    /**
3741 >     * copy returns a CompletableFuture that is completed exceptionally
3742 >     * when source is.
3743 >     */
3744 >    public void testCopy_exceptionalCompletion() {
3745 >        for (boolean createIncomplete : new boolean[] { true, false })
3746 >    {
3747 >        CFException ex = new CFException();
3748 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3749 >        if (!createIncomplete) f.completeExceptionally(ex);
3750 >        CompletableFuture<Integer> g = f.copy();
3751 >        if (createIncomplete) {
3752 >            checkIncomplete(f);
3753 >            checkIncomplete(g);
3754 >            f.completeExceptionally(ex);
3755 >        }
3756 >        checkCompletedExceptionally(f, ex);
3757 >        checkCompletedWithWrappedException(g, ex);
3758 >    }}
3759 >
3760 >    /**
3761 >     * Completion of a copy does not complete its source.
3762 >     */
3763 >    public void testCopy_oneWayPropagation() {
3764 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3765 >        assertTrue(f.copy().complete(1));
3766 >        assertTrue(f.copy().complete(null));
3767 >        assertTrue(f.copy().cancel(true));
3768 >        assertTrue(f.copy().cancel(false));
3769 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3770 >        checkIncomplete(f);
3771      }
3772  
3773      /**
3774 <     * whenCompleteAsync action executes on normal completion, propagating
3775 <     * source result.
3774 >     * minimalCompletionStage returns a CompletableFuture that is
3775 >     * completed normally, with the same value, when source is.
3776       */
3777 <    public void testWhenCompleteAsync1() {
3089 <        final AtomicInteger a = new AtomicInteger();
3777 >    public void testMinimalCompletionStage() {
3778          CompletableFuture<Integer> f = new CompletableFuture<>();
3779 <        CompletableFuture<Integer> g =
3780 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3781 <        f.complete(three);
3782 <        checkCompletedNormally(f, three);
3783 <        checkCompletedNormally(g, three);
3784 <        assertEquals(a.get(), 1);
3779 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3780 >        AtomicInteger x = new AtomicInteger(0);
3781 >        AtomicReference<Throwable> r = new AtomicReference<>();
3782 >        checkIncomplete(f);
3783 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3784 >        f.complete(1);
3785 >        checkCompletedNormally(f, 1);
3786 >        assertEquals(x.get(), 1);
3787 >        assertNull(r.get());
3788      }
3789  
3790      /**
3791 <     * whenCompleteAsync action executes on exceptional completion, propagating
3792 <     * source result.
3791 >     * minimalCompletionStage returns a CompletableFuture that is
3792 >     * completed exceptionally when source is.
3793       */
3794 <    public void testWhenCompleteAsync2() {
3104 <        final AtomicInteger a = new AtomicInteger();
3794 >    public void testMinimalCompletionStage2() {
3795          CompletableFuture<Integer> f = new CompletableFuture<>();
3796 <        CompletableFuture<Integer> g =
3797 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3798 <        f.completeExceptionally(new CFException());
3799 <        checkCompletedWithWrappedCFException(f);
3800 <        checkCompletedWithWrappedCFException(g);
3796 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3797 >        AtomicInteger x = new AtomicInteger(0);
3798 >        AtomicReference<Throwable> r = new AtomicReference<>();
3799 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3800 >        checkIncomplete(f);
3801 >        CFException ex = new CFException();
3802 >        f.completeExceptionally(ex);
3803 >        checkCompletedExceptionally(f, ex);
3804 >        assertEquals(x.get(), 0);
3805 >        assertEquals(r.get().getCause(), ex);
3806 >    }
3807 >
3808 >    /**
3809 >     * failedStage returns a CompletionStage completed
3810 >     * exceptionally with the given Exception
3811 >     */
3812 >    public void testFailedStage() {
3813 >        CFException ex = new CFException();
3814 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3815 >        AtomicInteger x = new AtomicInteger(0);
3816 >        AtomicReference<Throwable> r = new AtomicReference<>();
3817 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3818 >        assertEquals(x.get(), 0);
3819 >        assertEquals(r.get(), ex);
3820      }
3821  
3822      /**
3823 <     * If a whenCompleteAsync action throws an exception when
3115 <     * triggered by a normal completion, it completes exceptionally
3823 >     * completeAsync completes with value of given supplier
3824       */
3825 <    public void testWhenCompleteAsync3() {
3825 >    public void testCompleteAsync() {
3826 >        for (Integer v1 : new Integer[] { 1, null })
3827 >    {
3828          CompletableFuture<Integer> f = new CompletableFuture<>();
3829 <        CompletableFuture<Integer> g =
3830 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3831 <                           { throw new CFException(); } );
3832 <        f.complete(three);
3833 <        checkCompletedNormally(f, three);
3834 <        checkCompletedWithWrappedCFException(g);
3829 >        f.completeAsync(() -> v1);
3830 >        f.join();
3831 >        checkCompletedNormally(f, v1);
3832 >    }}
3833 >
3834 >    /**
3835 >     * completeAsync completes exceptionally if given supplier throws
3836 >     */
3837 >    public void testCompleteAsync2() {
3838 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3839 >        CFException ex = new CFException();
3840 >        f.completeAsync(() -> { throw ex; });
3841 >        try {
3842 >            f.join();
3843 >            shouldThrow();
3844 >        } catch (CompletionException success) {}
3845 >        checkCompletedWithWrappedException(f, ex);
3846      }
3847  
3848      /**
3849 <     * whenCompleteAsync action executes on normal completion, propagating
3129 <     * source result.
3849 >     * completeAsync with given executor completes with value of given supplier
3850       */
3851 <    public void testWhenCompleteAsync1e() {
3852 <        final AtomicInteger a = new AtomicInteger();
3853 <        ThreadExecutor exec = new ThreadExecutor();
3851 >    public void testCompleteAsync3() {
3852 >        for (Integer v1 : new Integer[] { 1, null })
3853 >    {
3854          CompletableFuture<Integer> f = new CompletableFuture<>();
3855 <        CompletableFuture<Integer> g =
3856 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3857 <                                exec);
3858 <        f.complete(three);
3859 <        checkCompletedNormally(f, three);
3860 <        checkCompletedNormally(g, three);
3861 <        assertEquals(a.get(), 1);
3855 >        ThreadExecutor executor = new ThreadExecutor();
3856 >        f.completeAsync(() -> v1, executor);
3857 >        assertSame(v1, f.join());
3858 >        checkCompletedNormally(f, v1);
3859 >        assertEquals(1, executor.count.get());
3860 >    }}
3861 >
3862 >    /**
3863 >     * completeAsync with given executor completes exceptionally if
3864 >     * given supplier throws
3865 >     */
3866 >    public void testCompleteAsync4() {
3867 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3868 >        CFException ex = new CFException();
3869 >        ThreadExecutor executor = new ThreadExecutor();
3870 >        f.completeAsync(() -> { throw ex; }, executor);
3871 >        try {
3872 >            f.join();
3873 >            shouldThrow();
3874 >        } catch (CompletionException success) {}
3875 >        checkCompletedWithWrappedException(f, ex);
3876 >        assertEquals(1, executor.count.get());
3877      }
3878  
3879      /**
3880 <     * whenCompleteAsync action executes on exceptional completion, propagating
3146 <     * source result.
3880 >     * orTimeout completes with TimeoutException if not complete
3881       */
3882 <    public void testWhenCompleteAsync2e() {
3883 <        final AtomicInteger a = new AtomicInteger();
3150 <        ThreadExecutor exec = new ThreadExecutor();
3882 >    public void testOrTimeout_timesOut() {
3883 >        long timeoutMillis = timeoutMillis();
3884          CompletableFuture<Integer> f = new CompletableFuture<>();
3885 <        CompletableFuture<Integer> g =
3886 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3887 <                                exec);
3888 <        f.completeExceptionally(new CFException());
3156 <        checkCompletedWithWrappedCFException(f);
3157 <        checkCompletedWithWrappedCFException(g);
3885 >        long startTime = System.nanoTime();
3886 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3887 >        checkCompletedWithTimeoutException(f);
3888 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3889      }
3890  
3891      /**
3892 <     * If a whenCompleteAsync action throws an exception when triggered
3162 <     * by a normal completion, it completes exceptionally
3892 >     * orTimeout completes normally if completed before timeout
3893       */
3894 <    public void testWhenCompleteAsync3e() {
3895 <        ThreadExecutor exec = new ThreadExecutor();
3894 >    public void testOrTimeout_completed() {
3895 >        for (Integer v1 : new Integer[] { 1, null })
3896 >    {
3897 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3898 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3899 >        long startTime = System.nanoTime();
3900 >        f.complete(v1);
3901 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3902 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3903 >        g.complete(v1);
3904 >        checkCompletedNormally(f, v1);
3905 >        checkCompletedNormally(g, v1);
3906 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3907 >    }}
3908 >
3909 >    /**
3910 >     * completeOnTimeout completes with given value if not complete
3911 >     */
3912 >    public void testCompleteOnTimeout_timesOut() {
3913 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3914 >                       () -> testCompleteOnTimeout_timesOut(null));
3915 >    }
3916 >
3917 >    /**
3918 >     * completeOnTimeout completes with given value if not complete
3919 >     */
3920 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3921 >        long timeoutMillis = timeoutMillis();
3922 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3923 >        long startTime = System.nanoTime();
3924 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3925 >        assertSame(v, f.join());
3926 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3927 >        f.complete(99);         // should have no effect
3928 >        checkCompletedNormally(f, v);
3929 >    }
3930 >
3931 >    /**
3932 >     * completeOnTimeout has no effect if completed within timeout
3933 >     */
3934 >    public void testCompleteOnTimeout_completed() {
3935 >        for (Integer v1 : new Integer[] { 1, null })
3936 >    {
3937          CompletableFuture<Integer> f = new CompletableFuture<>();
3938 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3939 +        long startTime = System.nanoTime();
3940 +        f.complete(v1);
3941 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3942 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3943 +        g.complete(v1);
3944 +        checkCompletedNormally(f, v1);
3945 +        checkCompletedNormally(g, v1);
3946 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3947 +    }}
3948 +
3949 +    /**
3950 +     * delayedExecutor returns an executor that delays submission
3951 +     */
3952 +    public void testDelayedExecutor() {
3953 +        testInParallel(() -> testDelayedExecutor(null, null),
3954 +                       () -> testDelayedExecutor(null, 1),
3955 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3956 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3957 +    }
3958 +
3959 +    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3960 +        long timeoutMillis = timeoutMillis();
3961 +        // Use an "unreasonably long" long timeout to catch lingering threads
3962 +        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3963 +        final Executor delayer, longDelayer;
3964 +        if (executor == null) {
3965 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3966 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3967 +        } else {
3968 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3969 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3970 +        }
3971 +        long startTime = System.nanoTime();
3972 +        CompletableFuture<Integer> f =
3973 +            CompletableFuture.supplyAsync(() -> v, delayer);
3974          CompletableFuture<Integer> g =
3975 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3976 <                                { throw new CFException(); },
3977 <                                exec);
3978 <        f.complete(three);
3979 <        checkCompletedNormally(f, three);
3980 <        checkCompletedWithWrappedCFException(g);
3975 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3976 >
3977 >        assertNull(g.getNow(null));
3978 >
3979 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3980 >        long millisElapsed = millisElapsedSince(startTime);
3981 >        assertTrue(millisElapsed >= timeoutMillis);
3982 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3983 >
3984 >        checkCompletedNormally(f, v);
3985 >
3986 >        checkIncomplete(g);
3987 >        assertTrue(g.cancel(true));
3988      }
3989  
3990 +    //--- tests of implementation details; not part of official tck ---
3991 +
3992 +    Object resultOf(CompletableFuture<?> f) {
3993 +        SecurityManager sm = System.getSecurityManager();
3994 +        if (sm != null) {
3995 +            try {
3996 +                System.setSecurityManager(null);
3997 +            } catch (SecurityException giveUp) {
3998 +                return "Reflection not available";
3999 +            }
4000 +        }
4001 +
4002 +        try {
4003 +            java.lang.reflect.Field resultField
4004 +                = CompletableFuture.class.getDeclaredField("result");
4005 +            resultField.setAccessible(true);
4006 +            return resultField.get(f);
4007 +        } catch (Throwable t) {
4008 +            throw new AssertionError(t);
4009 +        } finally {
4010 +            if (sm != null) System.setSecurityManager(sm);
4011 +        }
4012 +    }
4013 +
4014 +    public void testExceptionPropagationReusesResultObject() {
4015 +        if (!testImplementationDetails) return;
4016 +        for (ExecutionMode m : ExecutionMode.values())
4017 +    {
4018 +        final CFException ex = new CFException();
4019 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4020 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4021 +
4022 +        final Runnable noopRunnable = new Noop(m);
4023 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4024 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4025 +
4026 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4027 +            = new ArrayList<>();
4028 +
4029 +        funs.add(y -> m.thenRun(y, noopRunnable));
4030 +        funs.add(y -> m.thenAccept(y, noopConsumer));
4031 +        funs.add(y -> m.thenApply(y, incFunction));
4032 +
4033 +        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4034 +        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4035 +        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4036 +
4037 +        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4038 +        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4039 +        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4040 +        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4041 +        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4042 +        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4043 +
4044 +        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4045 +
4046 +        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4047 +
4048 +        funs.add(y -> CompletableFuture.allOf(y));
4049 +        funs.add(y -> CompletableFuture.allOf(y, v42));
4050 +        funs.add(y -> CompletableFuture.allOf(v42, y));
4051 +        funs.add(y -> CompletableFuture.anyOf(y));
4052 +        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4053 +        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4054 +
4055 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4056 +                 fun : funs) {
4057 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4058 +            f.completeExceptionally(ex);
4059 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4060 +            checkCompletedWithWrappedException(src, ex);
4061 +            CompletableFuture<?> dep = fun.apply(src);
4062 +            checkCompletedWithWrappedException(dep, ex);
4063 +            assertSame(resultOf(src), resultOf(dep));
4064 +        }
4065 +
4066 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4067 +                 fun : funs) {
4068 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4069 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4070 +            CompletableFuture<?> dep = fun.apply(src);
4071 +            f.completeExceptionally(ex);
4072 +            checkCompletedWithWrappedException(src, ex);
4073 +            checkCompletedWithWrappedException(dep, ex);
4074 +            assertSame(resultOf(src), resultOf(dep));
4075 +        }
4076 +
4077 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4078 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4079 +                 fun : funs) {
4080 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4081 +            f.cancel(mayInterruptIfRunning);
4082 +            checkCancelled(f);
4083 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4084 +            checkCompletedWithWrappedCancellationException(src);
4085 +            CompletableFuture<?> dep = fun.apply(src);
4086 +            checkCompletedWithWrappedCancellationException(dep);
4087 +            assertSame(resultOf(src), resultOf(dep));
4088 +        }
4089 +
4090 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4091 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4092 +                 fun : funs) {
4093 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4094 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4095 +            CompletableFuture<?> dep = fun.apply(src);
4096 +            f.cancel(mayInterruptIfRunning);
4097 +            checkCancelled(f);
4098 +            checkCompletedWithWrappedCancellationException(src);
4099 +            checkCompletedWithWrappedCancellationException(dep);
4100 +            assertSame(resultOf(src), resultOf(dep));
4101 +        }
4102 +    }}
4103 +
4104      /**
4105 <     * handleAsync action completes normally with function value on
3178 <     * either normal or exceptional completion of source
4105 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4106       */
4107 <    public void testHandleAsync() {
4108 <        CompletableFuture<Integer> f, g;
4109 <        IntegerHandler r;
4107 >    public void testMinimalCompletionStage_minimality() {
4108 >        if (!testImplementationDetails) return;
4109 >        Function<Method, String> toSignature =
4110 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4111 >        Predicate<Method> isNotStatic =
4112 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4113 >        List<Method> minimalMethods =
4114 >            Stream.of(Object.class, CompletionStage.class)
4115 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4116 >            .filter(isNotStatic)
4117 >            .collect(Collectors.toList());
4118 >        // Methods from CompletableFuture permitted NOT to throw UOE
4119 >        String[] signatureWhitelist = {
4120 >            "newIncompleteFuture[]",
4121 >            "defaultExecutor[]",
4122 >            "minimalCompletionStage[]",
4123 >            "copy[]",
4124 >        };
4125 >        Set<String> permittedMethodSignatures =
4126 >            Stream.concat(minimalMethods.stream().map(toSignature),
4127 >                          Stream.of(signatureWhitelist))
4128 >            .collect(Collectors.toSet());
4129 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4130 >            .filter(isNotStatic)
4131 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4132 >            .collect(Collectors.toList());
4133 >
4134 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4135 >        CompletionStage<Integer> min =
4136 >            new CompletableFuture<Integer>().minimalCompletionStage();
4137 >        stages.add(min);
4138 >        stages.add(min.thenApply(x -> x));
4139 >        stages.add(CompletableFuture.completedStage(1));
4140 >        stages.add(CompletableFuture.failedStage(new CFException()));
4141 >
4142 >        List<Method> bugs = new ArrayList<>();
4143 >        for (Method method : allMethods) {
4144 >            Class<?>[] parameterTypes = method.getParameterTypes();
4145 >            Object[] args = new Object[parameterTypes.length];
4146 >            // Manufacture boxed primitives for primitive params
4147 >            for (int i = 0; i < args.length; i++) {
4148 >                Class<?> type = parameterTypes[i];
4149 >                if (parameterTypes[i] == boolean.class)
4150 >                    args[i] = false;
4151 >                else if (parameterTypes[i] == int.class)
4152 >                    args[i] = 0;
4153 >                else if (parameterTypes[i] == long.class)
4154 >                    args[i] = 0L;
4155 >            }
4156 >            for (CompletionStage<Integer> stage : stages) {
4157 >                try {
4158 >                    method.invoke(stage, args);
4159 >                    bugs.add(method);
4160 >                }
4161 >                catch (java.lang.reflect.InvocationTargetException expected) {
4162 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4163 >                        bugs.add(method);
4164 >                        // expected.getCause().printStackTrace();
4165 >                    }
4166 >                }
4167 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4168 >            }
4169 >        }
4170 >        if (!bugs.isEmpty())
4171 >            throw new Error("Methods did not throw UOE: " + bugs);
4172 >    }
4173  
4174 <        f = new CompletableFuture<>();
4175 <        g = f.handleAsync(r = new IntegerHandler());
4176 <        assertFalse(r.ran);
4177 <        f.completeExceptionally(new CFException());
4178 <        checkCompletedWithWrappedCFException(f);
4179 <        checkCompletedNormally(g, three);
4180 <        assertTrue(r.ran);
4174 >    /**
4175 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4176 >     * is completed normally, with the same value, when source is.
4177 >     */
4178 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4179 >        for (boolean createIncomplete : new boolean[] { true, false })
4180 >        for (Integer v1 : new Integer[] { 1, null })
4181 >    {
4182 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4183 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4184 >        if (!createIncomplete) assertTrue(f.complete(v1));
4185 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4186 >        if (createIncomplete) {
4187 >            checkIncomplete(f);
4188 >            checkIncomplete(g);
4189 >            assertTrue(f.complete(v1));
4190 >        }
4191 >        checkCompletedNormally(f, v1);
4192 >        checkCompletedNormally(g, v1);
4193 >    }}
4194 >
4195 >    /**
4196 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4197 >     * is completed exceptionally when source is.
4198 >     */
4199 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4200 >        for (boolean createIncomplete : new boolean[] { true, false })
4201 >    {
4202 >        CFException ex = new CFException();
4203 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4204 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4205 >        if (!createIncomplete) f.completeExceptionally(ex);
4206 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4207 >        if (createIncomplete) {
4208 >            checkIncomplete(f);
4209 >            checkIncomplete(g);
4210 >            f.completeExceptionally(ex);
4211 >        }
4212 >        checkCompletedExceptionally(f, ex);
4213 >        checkCompletedWithWrappedException(g, ex);
4214 >    }}
4215  
4216 <        f = new CompletableFuture<>();
4217 <        g = f.handleAsync(r = new IntegerHandler());
4218 <        assertFalse(r.ran);
4219 <        f.completeExceptionally(new CFException());
4220 <        checkCompletedWithWrappedCFException(f);
4221 <        checkCompletedNormally(g, three);
4222 <        assertTrue(r.ran);
4216 >    /**
4217 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4218 >     */
4219 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4220 >        for (Integer v1 : new Integer[] { 1, null })
4221 >    {
4222 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4223 >        CompletionStage minimal = f.minimalCompletionStage();
4224 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4225 >        assertTrue(g.complete(v1));
4226 >        checkCompletedNormally(g, v1);
4227 >        checkIncomplete(f);
4228 >        checkIncomplete(minimal.toCompletableFuture());
4229 >    }}
4230  
4231 <        f = new CompletableFuture<>();
4232 <        g = f.handleAsync(r = new IntegerHandler());
4233 <        assertFalse(r.ran);
4234 <        f.complete(one);
4235 <        checkCompletedNormally(f, one);
4236 <        checkCompletedNormally(g, two);
4237 <        assertTrue(r.ran);
4231 >    /**
4232 >     * minimalStage.toCompletableFuture().join() awaits completion
4233 >     */
4234 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4235 >        for (boolean createIncomplete : new boolean[] { true, false })
4236 >        for (Integer v1 : new Integer[] { 1, null })
4237 >    {
4238 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4239 >        if (!createIncomplete) assertTrue(f.complete(v1));
4240 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4241 >        if (createIncomplete) assertTrue(f.complete(v1));
4242 >        assertEquals(v1, minimal.toCompletableFuture().join());
4243 >        assertEquals(v1, minimal.toCompletableFuture().get());
4244 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4245 >    }}
4246 >
4247 >    /**
4248 >     * Completion of a toCompletableFuture copy of a minimal stage
4249 >     * does not complete its source.
4250 >     */
4251 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4252 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4253 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4254 >        assertTrue(g.toCompletableFuture().complete(1));
4255 >        assertTrue(g.toCompletableFuture().complete(null));
4256 >        assertTrue(g.toCompletableFuture().cancel(true));
4257 >        assertTrue(g.toCompletableFuture().cancel(false));
4258 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4259 >        checkIncomplete(g.toCompletableFuture());
4260 >        f.complete(1);
4261 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4262 >    }
4263  
4264 <        f = new CompletableFuture<>();
4265 <        g = f.handleAsync(r = new IntegerHandler());
4266 <        assertFalse(r.ran);
4267 <        f.complete(one);
4268 <        checkCompletedNormally(f, one);
4269 <        checkCompletedNormally(g, two);
4270 <        assertTrue(r.ran);
4264 >    /** Demo utility method for external reliable toCompletableFuture */
4265 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4266 >        CompletableFuture<T> f = new CompletableFuture<>();
4267 >        stage.handle((T t, Throwable ex) -> {
4268 >                         if (ex != null) f.completeExceptionally(ex);
4269 >                         else f.complete(t);
4270 >                         return null;
4271 >                     });
4272 >        return f;
4273 >    }
4274 >
4275 >    /** Demo utility method to join a CompletionStage */
4276 >    static <T> T join(CompletionStage<T> stage) {
4277 >        return toCompletableFuture(stage).join();
4278      }
4279  
4280      /**
4281 <     * handleAsync action with Executor completes normally with
3219 <     * function value on either normal or exceptional completion of
3220 <     * source
4281 >     * Joining a minimal stage "by hand" works
4282       */
4283 <    public void testHandleAsync2() {
4284 <        CompletableFuture<Integer> f, g;
4285 <        ThreadExecutor exec = new ThreadExecutor();
4286 <        IntegerHandler r;
4283 >    public void testMinimalCompletionStage_join_by_hand() {
4284 >        for (boolean createIncomplete : new boolean[] { true, false })
4285 >        for (Integer v1 : new Integer[] { 1, null })
4286 >    {
4287 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4288 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4289 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4290 >        if (!createIncomplete) assertTrue(f.complete(v1));
4291 >        minimal.thenAccept(x -> g.complete(x));
4292 >        if (createIncomplete) assertTrue(f.complete(v1));
4293 >        g.join();
4294 >        checkCompletedNormally(g, v1);
4295 >        checkCompletedNormally(f, v1);
4296 >        assertEquals(v1, join(minimal));
4297 >    }}
4298 >
4299 >    static class Monad {
4300 >        static class ZeroException extends RuntimeException {
4301 >            public ZeroException() { super("monadic zero"); }
4302 >        }
4303 >        // "return", "unit"
4304 >        static <T> CompletableFuture<T> unit(T value) {
4305 >            return completedFuture(value);
4306 >        }
4307 >        // monadic zero ?
4308 >        static <T> CompletableFuture<T> zero() {
4309 >            return failedFuture(new ZeroException());
4310 >        }
4311 >        // >=>
4312 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4313 >            (Function<T, CompletableFuture<U>> f,
4314 >             Function<U, CompletableFuture<V>> g) {
4315 >            return x -> f.apply(x).thenCompose(g);
4316 >        }
4317  
4318 <        f = new CompletableFuture<>();
4319 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4320 <        assertFalse(r.ran);
4321 <        f.completeExceptionally(new CFException());
4322 <        checkCompletedWithWrappedCFException(f);
4323 <        checkCompletedNormally(g, three);
4324 <        assertTrue(r.ran);
4318 >        static void assertZero(CompletableFuture<?> f) {
4319 >            try {
4320 >                f.getNow(null);
4321 >                throw new AssertionError("should throw");
4322 >            } catch (CompletionException success) {
4323 >                assertTrue(success.getCause() instanceof ZeroException);
4324 >            }
4325 >        }
4326  
4327 <        f = new CompletableFuture<>();
4328 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4329 <        assertFalse(r.ran);
4330 <        f.completeExceptionally(new CFException());
4331 <        checkCompletedWithWrappedCFException(f);
4332 <        checkCompletedNormally(g, three);
4333 <        assertTrue(r.ran);
4327 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4328 >                                           CompletableFuture<T> g) {
4329 >            T fval = null, gval = null;
4330 >            Throwable fex = null, gex = null;
4331 >
4332 >            try { fval = f.get(); }
4333 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4334 >            catch (Throwable ex) { fex = ex; }
4335 >
4336 >            try { gval = g.get(); }
4337 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4338 >            catch (Throwable ex) { gex = ex; }
4339 >
4340 >            if (fex != null || gex != null)
4341 >                assertSame(fex.getClass(), gex.getClass());
4342 >            else
4343 >                assertEquals(fval, gval);
4344 >        }
4345  
4346 <        f = new CompletableFuture<>();
4347 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4348 <        assertFalse(r.ran);
3246 <        f.complete(one);
3247 <        checkCompletedNormally(f, one);
3248 <        checkCompletedNormally(g, two);
3249 <        assertTrue(r.ran);
4346 >        static class PlusFuture<T> extends CompletableFuture<T> {
4347 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4348 >        }
4349  
4350 <        f = new CompletableFuture<>();
4351 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4352 <        assertFalse(r.ran);
4353 <        f.complete(one);
4354 <        checkCompletedNormally(f, one);
4355 <        checkCompletedNormally(g, two);
4356 <        assertTrue(r.ran);
4350 >        /** Implements "monadic plus". */
4351 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4352 >                                             CompletableFuture<? extends T> g) {
4353 >            PlusFuture<T> plus = new PlusFuture<T>();
4354 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4355 >                try {
4356 >                    if (ex == null) {
4357 >                        if (plus.complete(result))
4358 >                            if (plus.firstFailure.get() != null)
4359 >                                plus.firstFailure.set(null);
4360 >                    }
4361 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4362 >                        if (plus.isDone())
4363 >                            plus.firstFailure.set(null);
4364 >                    }
4365 >                    else {
4366 >                        // first failure has precedence
4367 >                        Throwable first = plus.firstFailure.getAndSet(null);
4368 >
4369 >                        // may fail with "Self-suppression not permitted"
4370 >                        try { first.addSuppressed(ex); }
4371 >                        catch (Exception ignored) {}
4372 >
4373 >                        plus.completeExceptionally(first);
4374 >                    }
4375 >                } catch (Throwable unexpected) {
4376 >                    plus.completeExceptionally(unexpected);
4377 >                }
4378 >            };
4379 >            f.whenComplete(action);
4380 >            g.whenComplete(action);
4381 >            return plus;
4382 >        }
4383      }
4384  
4385 +    /**
4386 +     * CompletableFuture is an additive monad - sort of.
4387 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4388 +     */
4389 +    public void testAdditiveMonad() throws Throwable {
4390 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4391 +        CompletableFuture<Long> zero = Monad.zero();
4392 +
4393 +        // Some mutually non-commutative functions
4394 +        Function<Long, CompletableFuture<Long>> triple
4395 +            = x -> Monad.unit(3 * x);
4396 +        Function<Long, CompletableFuture<Long>> inc
4397 +            = x -> Monad.unit(x + 1);
4398 +
4399 +        // unit is a right identity: m >>= unit === m
4400 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4401 +                                 inc.apply(5L));
4402 +        // unit is a left identity: (unit x) >>= f === f x
4403 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4404 +                                 inc.apply(5L));
4405 +
4406 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4407 +        Monad.assertFutureEquals(
4408 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4409 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4410 +
4411 +        // The case for CompletableFuture as an additive monad is weaker...
4412 +
4413 +        // zero is a monadic zero
4414 +        Monad.assertZero(zero);
4415 +
4416 +        // left zero: zero >>= f === zero
4417 +        Monad.assertZero(zero.thenCompose(inc));
4418 +        // right zero: f >>= (\x -> zero) === zero
4419 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4420 +
4421 +        // f plus zero === f
4422 +        Monad.assertFutureEquals(Monad.unit(5L),
4423 +                                 Monad.plus(Monad.unit(5L), zero));
4424 +        // zero plus f === f
4425 +        Monad.assertFutureEquals(Monad.unit(5L),
4426 +                                 Monad.plus(zero, Monad.unit(5L)));
4427 +        // zero plus zero === zero
4428 +        Monad.assertZero(Monad.plus(zero, zero));
4429 +        {
4430 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4431 +                                                   Monad.unit(8L));
4432 +            // non-determinism
4433 +            assertTrue(f.get() == 5L || f.get() == 8L);
4434 +        }
4435 +
4436 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4437 +        // f plus godot === f (doesn't wait for godot)
4438 +        Monad.assertFutureEquals(Monad.unit(5L),
4439 +                                 Monad.plus(Monad.unit(5L), godot));
4440 +        // godot plus f === f (doesn't wait for godot)
4441 +        Monad.assertFutureEquals(Monad.unit(5L),
4442 +                                 Monad.plus(godot, Monad.unit(5L)));
4443 +    }
4444 +
4445 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4446 +    @SuppressWarnings("FutureReturnValueIgnored")
4447 +    public void testRecursiveChains() throws Throwable {
4448 +        for (ExecutionMode m : ExecutionMode.values())
4449 +        for (boolean addDeadEnds : new boolean[] { true, false })
4450 +    {
4451 +        final int val = 42;
4452 +        final int n = expensiveTests ? 1_000 : 2;
4453 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4454 +        CompletableFuture<Integer> tail = head;
4455 +        for (int i = 0; i < n; i++) {
4456 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4457 +            tail = m.thenApply(tail, v -> v + 1);
4458 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4459 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4460 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4461 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4462 +        }
4463 +        head.complete(val);
4464 +        assertEquals(val + 3 * n, (int) tail.join());
4465 +    }}
4466 +
4467 +    /**
4468 +     * A single CompletableFuture with many dependents.
4469 +     * A demo of scalability - runtime is O(n).
4470 +     */
4471 +    @SuppressWarnings("FutureReturnValueIgnored")
4472 +    public void testManyDependents() throws Throwable {
4473 +        final int n = expensiveTests ? 1_000_000 : 10;
4474 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4475 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4476 +        final AtomicInteger count = new AtomicInteger(0);
4477 +        for (int i = 0; i < n; i++) {
4478 +            head.thenRun(() -> count.getAndIncrement());
4479 +            head.thenAccept(x -> count.getAndIncrement());
4480 +            head.thenApply(x -> count.getAndIncrement());
4481 +
4482 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4483 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4484 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4485 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4486 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4487 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4488 +
4489 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4490 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4491 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4492 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4493 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4494 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4495 +        }
4496 +        head.complete(null);
4497 +        assertEquals(5 * 3 * n, count.get());
4498 +    }
4499 +
4500 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4501 +    @SuppressWarnings("FutureReturnValueIgnored")
4502 +    public void testCoCompletionGarbageRetention() throws Throwable {
4503 +        final int n = expensiveTests ? 1_000_000 : 10;
4504 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4505 +        CompletableFuture<Integer> f;
4506 +        for (int i = 0; i < n; i++) {
4507 +            f = new CompletableFuture<>();
4508 +            f.runAfterEither(incomplete, () -> {});
4509 +            f.complete(null);
4510 +
4511 +            f = new CompletableFuture<>();
4512 +            f.acceptEither(incomplete, x -> {});
4513 +            f.complete(null);
4514 +
4515 +            f = new CompletableFuture<>();
4516 +            f.applyToEither(incomplete, x -> x);
4517 +            f.complete(null);
4518 +
4519 +            f = new CompletableFuture<>();
4520 +            CompletableFuture.anyOf(f, incomplete);
4521 +            f.complete(null);
4522 +        }
4523 +
4524 +        for (int i = 0; i < n; i++) {
4525 +            f = new CompletableFuture<>();
4526 +            incomplete.runAfterEither(f, () -> {});
4527 +            f.complete(null);
4528 +
4529 +            f = new CompletableFuture<>();
4530 +            incomplete.acceptEither(f, x -> {});
4531 +            f.complete(null);
4532 +
4533 +            f = new CompletableFuture<>();
4534 +            incomplete.applyToEither(f, x -> x);
4535 +            f.complete(null);
4536 +
4537 +            f = new CompletableFuture<>();
4538 +            CompletableFuture.anyOf(incomplete, f);
4539 +            f.complete(null);
4540 +        }
4541 +    }
4542 +
4543 +    /**
4544 +     * Reproduction recipe for:
4545 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4546 +     * 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
4547 +     */
4548 +    public void testAnyOfGarbageRetention() throws Throwable {
4549 +        for (Integer v : new Integer[] { 1, null })
4550 +    {
4551 +        final int n = expensiveTests ? 100_000 : 10;
4552 +        CompletableFuture<Integer>[] fs
4553 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4554 +        for (int i = 0; i < fs.length; i++)
4555 +            fs[i] = new CompletableFuture<>();
4556 +        fs[fs.length - 1].complete(v);
4557 +        for (int i = 0; i < n; i++)
4558 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4559 +    }}
4560 +
4561 +    /**
4562 +     * Checks for garbage retention with allOf.
4563 +     *
4564 +     * As of 2016-07, fails with OOME:
4565 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4566 +     */
4567 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4568 +        final int n = expensiveTests ? 100_000 : 10;
4569 +        CompletableFuture<Integer>[] fs
4570 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4571 +        for (int i = 0; i < fs.length; i++)
4572 +            fs[i] = new CompletableFuture<>();
4573 +        for (int i = 0; i < n; i++)
4574 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4575 +    }
4576 +
4577 +    /**
4578 +     * Checks for garbage retention when a dependent future is
4579 +     * cancelled and garbage-collected.
4580 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4581 +     *
4582 +     * As of 2016-07, fails with OOME:
4583 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4584 +     */
4585 +    public void testCancelledGarbageRetention() throws Throwable {
4586 +        final int n = expensiveTests ? 100_000 : 10;
4587 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4588 +        for (int i = 0; i < n; i++)
4589 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4590 +    }
4591 +
4592 +    /**
4593 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4594 +     * is invoked many times.
4595 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4596 +     *
4597 +     * As of 2016-07, fails with OOME:
4598 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4599 +     */
4600 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4601 +        final int n = expensiveTests ? 900_000 : 10;
4602 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4603 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4604 +        for (int i = 0; i < n; i++)
4605 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4606 +    }
4607 +
4608 + //     static <U> U join(CompletionStage<U> stage) {
4609 + //         CompletableFuture<U> f = new CompletableFuture<>();
4610 + //         stage.whenComplete((v, ex) -> {
4611 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4612 + //         });
4613 + //         return f.join();
4614 + //     }
4615 +
4616 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4617 + //         CompletableFuture<U> f = new CompletableFuture<>();
4618 + //         stage.whenComplete((v, ex) -> {
4619 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4620 + //         });
4621 + //         return f.isDone();
4622 + //     }
4623 +
4624 + //     static <U> U join2(CompletionStage<U> stage) {
4625 + //         return stage.toCompletableFuture().copy().join();
4626 + //     }
4627 +
4628 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4629 + //         return stage.toCompletableFuture().copy().isDone();
4630 + //     }
4631 +
4632 +    // For testing default implementations
4633 +    // Only non-default interface methods defined.
4634 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4635 +        final CompletableFuture<T> cf;
4636 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4637 +        public CompletableFuture<T> toCompletableFuture() {
4638 +            return cf; }
4639 +        public CompletionStage<Void> thenRun
4640 +            (Runnable action) {
4641 +            return cf.thenRun(action); }
4642 +        public CompletionStage<Void> thenRunAsync
4643 +            (Runnable action) {
4644 +            return cf.thenRunAsync(action); }
4645 +        public CompletionStage<Void> thenRunAsync
4646 +            (Runnable action,
4647 +             Executor executor) {
4648 +            return cf.thenRunAsync(action, executor); }
4649 +        public CompletionStage<Void> thenAccept
4650 +            (Consumer<? super T> action) {
4651 +            return cf.thenAccept(action); }
4652 +        public CompletionStage<Void> thenAcceptAsync
4653 +            (Consumer<? super T> action) {
4654 +            return cf.thenAcceptAsync(action); }
4655 +        public CompletionStage<Void> thenAcceptAsync
4656 +            (Consumer<? super T> action,
4657 +             Executor executor) {
4658 +            return cf.thenAcceptAsync(action, executor); }
4659 +        public <U> CompletionStage<U> thenApply
4660 +            (Function<? super T,? extends U> a) {
4661 +            return cf.thenApply(a); }
4662 +        public <U> CompletionStage<U> thenApplyAsync
4663 +            (Function<? super T,? extends U> fn) {
4664 +            return cf.thenApplyAsync(fn); }
4665 +        public <U> CompletionStage<U> thenApplyAsync
4666 +            (Function<? super T,? extends U> fn,
4667 +             Executor executor) {
4668 +            return cf.thenApplyAsync(fn, executor); }
4669 +        public <U,V> CompletionStage<V> thenCombine
4670 +            (CompletionStage<? extends U> other,
4671 +             BiFunction<? super T,? super U,? extends V> fn) {
4672 +            return cf.thenCombine(other, fn); }
4673 +        public <U,V> CompletionStage<V> thenCombineAsync
4674 +            (CompletionStage<? extends U> other,
4675 +             BiFunction<? super T,? super U,? extends V> fn) {
4676 +            return cf.thenCombineAsync(other, fn); }
4677 +        public <U,V> CompletionStage<V> thenCombineAsync
4678 +            (CompletionStage<? extends U> other,
4679 +             BiFunction<? super T,? super U,? extends V> fn,
4680 +             Executor executor) {
4681 +            return cf.thenCombineAsync(other, fn, executor); }
4682 +        public <U> CompletionStage<Void> thenAcceptBoth
4683 +            (CompletionStage<? extends U> other,
4684 +             BiConsumer<? super T, ? super U> action) {
4685 +            return cf.thenAcceptBoth(other, action); }
4686 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4687 +            (CompletionStage<? extends U> other,
4688 +             BiConsumer<? super T, ? super U> action) {
4689 +            return cf.thenAcceptBothAsync(other, action); }
4690 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4691 +            (CompletionStage<? extends U> other,
4692 +             BiConsumer<? super T, ? super U> action,
4693 +             Executor executor) {
4694 +            return cf.thenAcceptBothAsync(other, action, executor); }
4695 +        public CompletionStage<Void> runAfterBoth
4696 +            (CompletionStage<?> other,
4697 +             Runnable action) {
4698 +            return cf.runAfterBoth(other, action); }
4699 +        public CompletionStage<Void> runAfterBothAsync
4700 +            (CompletionStage<?> other,
4701 +             Runnable action) {
4702 +            return cf.runAfterBothAsync(other, action); }
4703 +        public CompletionStage<Void> runAfterBothAsync
4704 +            (CompletionStage<?> other,
4705 +             Runnable action,
4706 +             Executor executor) {
4707 +            return cf.runAfterBothAsync(other, action, executor); }
4708 +        public <U> CompletionStage<U> applyToEither
4709 +            (CompletionStage<? extends T> other,
4710 +             Function<? super T, U> fn) {
4711 +            return cf.applyToEither(other, fn); }
4712 +        public <U> CompletionStage<U> applyToEitherAsync
4713 +            (CompletionStage<? extends T> other,
4714 +             Function<? super T, U> fn) {
4715 +            return cf.applyToEitherAsync(other, fn); }
4716 +        public <U> CompletionStage<U> applyToEitherAsync
4717 +            (CompletionStage<? extends T> other,
4718 +             Function<? super T, U> fn,
4719 +             Executor executor) {
4720 +            return cf.applyToEitherAsync(other, fn, executor); }
4721 +        public CompletionStage<Void> acceptEither
4722 +            (CompletionStage<? extends T> other,
4723 +             Consumer<? super T> action) {
4724 +            return cf.acceptEither(other, action); }
4725 +        public CompletionStage<Void> acceptEitherAsync
4726 +            (CompletionStage<? extends T> other,
4727 +             Consumer<? super T> action) {
4728 +            return cf.acceptEitherAsync(other, action); }
4729 +        public CompletionStage<Void> acceptEitherAsync
4730 +            (CompletionStage<? extends T> other,
4731 +             Consumer<? super T> action,
4732 +             Executor executor) {
4733 +            return cf.acceptEitherAsync(other, action, executor); }
4734 +        public CompletionStage<Void> runAfterEither
4735 +            (CompletionStage<?> other,
4736 +             Runnable action) {
4737 +            return cf.runAfterEither(other, action); }
4738 +        public CompletionStage<Void> runAfterEitherAsync
4739 +            (CompletionStage<?> other,
4740 +             Runnable action) {
4741 +            return cf.runAfterEitherAsync(other, action); }
4742 +        public CompletionStage<Void> runAfterEitherAsync
4743 +            (CompletionStage<?> other,
4744 +             Runnable action,
4745 +             Executor executor) {
4746 +            return cf.runAfterEitherAsync(other, action, executor); }
4747 +        public <U> CompletionStage<U> thenCompose
4748 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4749 +            return cf.thenCompose(fn); }
4750 +        public <U> CompletionStage<U> thenComposeAsync
4751 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4752 +            return cf.thenComposeAsync(fn); }
4753 +        public <U> CompletionStage<U> thenComposeAsync
4754 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4755 +             Executor executor) {
4756 +            return cf.thenComposeAsync(fn, executor); }
4757 +        public <U> CompletionStage<U> handle
4758 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4759 +            return cf.handle(fn); }
4760 +        public <U> CompletionStage<U> handleAsync
4761 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4762 +            return cf.handleAsync(fn); }
4763 +        public <U> CompletionStage<U> handleAsync
4764 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4765 +             Executor executor) {
4766 +            return cf.handleAsync(fn, executor); }
4767 +        public CompletionStage<T> whenComplete
4768 +            (BiConsumer<? super T, ? super Throwable> action) {
4769 +            return cf.whenComplete(action); }
4770 +        public CompletionStage<T> whenCompleteAsync
4771 +            (BiConsumer<? super T, ? super Throwable> action) {
4772 +            return cf.whenCompleteAsync(action); }
4773 +        public CompletionStage<T> whenCompleteAsync
4774 +            (BiConsumer<? super T, ? super Throwable> action,
4775 +             Executor executor) {
4776 +            return cf.whenCompleteAsync(action, executor); }
4777 +        public CompletionStage<T> exceptionally
4778 +            (Function<Throwable, ? extends T> fn) {
4779 +            return cf.exceptionally(fn); }
4780 +    }
4781 +
4782 +    /**
4783 +     * default-implemented exceptionallyAsync action completes with
4784 +     * function value on source exception
4785 +     */
4786 +    public void testDefaulExceptionallyAsync_exceptionalCompletion() {
4787 +        for (boolean createIncomplete : new boolean[] { true, false })
4788 +        for (Integer v1 : new Integer[] { 1, null })
4789 +    {
4790 +        final AtomicInteger a = new AtomicInteger(0);
4791 +        final CFException ex = new CFException();
4792 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4793 +        final DelegatedCompletionStage<Integer> d =
4794 +            new DelegatedCompletionStage<Integer>(f);
4795 +        if (!createIncomplete) f.completeExceptionally(ex);
4796 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4797 +            ((Throwable t) -> {
4798 +                threadAssertSame(t, ex);
4799 +                a.getAndIncrement();
4800 +                return v1;
4801 +            });
4802 +        if (createIncomplete) f.completeExceptionally(ex);
4803 +
4804 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4805 +        assertEquals(1, a.get());
4806 +    }}
4807 +
4808 +    /**
4809 +     * Under default implementation, if an "exceptionally action"
4810 +     * throws an exception, it completes exceptionally with that
4811 +     * exception
4812 +     */
4813 +    public void testDefaulExceptionallyAsync_exceptionalCompletionActionFailed() {
4814 +        for (boolean createIncomplete : new boolean[] { true, false })
4815 +    {
4816 +        final AtomicInteger a = new AtomicInteger(0);
4817 +        final CFException ex1 = new CFException();
4818 +        final CFException ex2 = new CFException();
4819 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4820 +        final DelegatedCompletionStage<Integer> d =
4821 +            new DelegatedCompletionStage<Integer>(f);
4822 +        if (!createIncomplete) f.completeExceptionally(ex1);
4823 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4824 +            ((Throwable t) -> {
4825 +                threadAssertSame(t, ex1);
4826 +                a.getAndIncrement();
4827 +                throw ex2;
4828 +            });
4829 +        if (createIncomplete) f.completeExceptionally(ex1);
4830 +
4831 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4832 +        checkCompletedExceptionally(f, ex1);
4833 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4834 +        assertEquals(1, a.get());
4835 +    }}
4836 +
4837 +    /**
4838 +     * default exceptionallyCompose result completes normally after normal
4839 +     * completion of source
4840 +     */
4841 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4842 +        for (boolean createIncomplete : new boolean[] { true, false })
4843 +        for (Integer v1 : new Integer[] { 1, null })
4844 +    {
4845 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4846 +        final ExceptionalCompletableFutureFunction r =
4847 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4848 +        final DelegatedCompletionStage<Integer> d =
4849 +            new DelegatedCompletionStage<Integer>(f);
4850 +        if (!createIncomplete) assertTrue(f.complete(v1));
4851 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4852 +        if (createIncomplete) assertTrue(f.complete(v1));
4853 +
4854 +        checkCompletedNormally(f, v1);
4855 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4856 +        r.assertNotInvoked();
4857 +    }}
4858 +
4859 +    /**
4860 +     * default-implemented exceptionallyCompose result completes
4861 +     * normally after exceptional completion of source
4862 +     */
4863 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4864 +        for (boolean createIncomplete : new boolean[] { true, false })
4865 +    {
4866 +        final CFException ex = new CFException();
4867 +        final ExceptionalCompletableFutureFunction r =
4868 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4869 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4870 +        final DelegatedCompletionStage<Integer> d =
4871 +            new DelegatedCompletionStage<Integer>(f);
4872 +        if (!createIncomplete) f.completeExceptionally(ex);
4873 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4874 +        if (createIncomplete) f.completeExceptionally(ex);
4875 +
4876 +        checkCompletedExceptionally(f, ex);
4877 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4878 +        r.assertInvoked();
4879 +    }}
4880 +
4881 +    /**
4882 +     * default-implemented exceptionallyCompose completes
4883 +     * exceptionally on exception if action does
4884 +     */
4885 +    public void testDefaultExceptionallyCompose_actionFailed() {
4886 +        for (boolean createIncomplete : new boolean[] { true, false })
4887 +        for (Integer v1 : new Integer[] { 1, null })
4888 +    {
4889 +        final CFException ex = new CFException();
4890 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4891 +        final FailingExceptionalCompletableFutureFunction r
4892 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4893 +        final DelegatedCompletionStage<Integer> d =
4894 +            new DelegatedCompletionStage<Integer>(f);
4895 +        if (!createIncomplete) f.completeExceptionally(ex);
4896 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4897 +        if (createIncomplete) f.completeExceptionally(ex);
4898 +
4899 +        checkCompletedExceptionally(f, ex);
4900 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4901 +        r.assertInvoked();
4902 +    }}
4903 +
4904 +    /**
4905 +     * default exceptionallyComposeAsync result completes normally after normal
4906 +     * completion of source
4907 +     */
4908 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4909 +        for (boolean createIncomplete : new boolean[] { true, false })
4910 +        for (Integer v1 : new Integer[] { 1, null })
4911 +    {
4912 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4913 +        final ExceptionalCompletableFutureFunction r =
4914 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4915 +        final DelegatedCompletionStage<Integer> d =
4916 +            new DelegatedCompletionStage<Integer>(f);
4917 +        if (!createIncomplete) assertTrue(f.complete(v1));
4918 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4919 +        if (createIncomplete) assertTrue(f.complete(v1));
4920 +
4921 +        checkCompletedNormally(f, v1);
4922 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4923 +        r.assertNotInvoked();
4924 +    }}
4925 +
4926 +    /**
4927 +     * default-implemented exceptionallyComposeAsync result completes
4928 +     * normally after exceptional completion of source
4929 +     */
4930 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4931 +        for (boolean createIncomplete : new boolean[] { true, false })
4932 +    {
4933 +        final CFException ex = new CFException();
4934 +        final ExceptionalCompletableFutureFunction r =
4935 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4936 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4937 +        final DelegatedCompletionStage<Integer> d =
4938 +            new DelegatedCompletionStage<Integer>(f);
4939 +        if (!createIncomplete) f.completeExceptionally(ex);
4940 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4941 +        if (createIncomplete) f.completeExceptionally(ex);
4942 +
4943 +        checkCompletedExceptionally(f, ex);
4944 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4945 +        r.assertInvoked();
4946 +    }}
4947 +
4948 +    /**
4949 +     * default-implemented exceptionallyComposeAsync completes
4950 +     * exceptionally on exception if action does
4951 +     */
4952 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
4953 +        for (boolean createIncomplete : new boolean[] { true, false })
4954 +        for (Integer v1 : new Integer[] { 1, null })
4955 +    {
4956 +        final CFException ex = new CFException();
4957 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4958 +        final FailingExceptionalCompletableFutureFunction r
4959 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4960 +        final DelegatedCompletionStage<Integer> d =
4961 +            new DelegatedCompletionStage<Integer>(f);
4962 +        if (!createIncomplete) f.completeExceptionally(ex);
4963 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4964 +        if (createIncomplete) f.completeExceptionally(ex);
4965 +
4966 +        checkCompletedExceptionally(f, ex);
4967 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4968 +        r.assertInvoked();
4969 +    }}
4970 +
4971 +
4972 +    /**
4973 +     * default exceptionallyComposeAsync result completes normally after normal
4974 +     * completion of source
4975 +     */
4976 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
4977 +        for (boolean createIncomplete : new boolean[] { true, false })
4978 +        for (Integer v1 : new Integer[] { 1, null })
4979 +    {
4980 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4981 +        final ExceptionalCompletableFutureFunction r =
4982 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
4983 +        final DelegatedCompletionStage<Integer> d =
4984 +            new DelegatedCompletionStage<Integer>(f);
4985 +        if (!createIncomplete) assertTrue(f.complete(v1));
4986 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
4987 +        if (createIncomplete) assertTrue(f.complete(v1));
4988 +
4989 +        checkCompletedNormally(f, v1);
4990 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4991 +        r.assertNotInvoked();
4992 +    }}
4993 +
4994 +    /**
4995 +     * default-implemented exceptionallyComposeAsync result completes
4996 +     * normally after exceptional completion of source
4997 +     */
4998 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
4999 +        for (boolean createIncomplete : new boolean[] { true, false })
5000 +    {
5001 +        final CFException ex = new CFException();
5002 +        final ExceptionalCompletableFutureFunction r =
5003 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5004 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5005 +        final DelegatedCompletionStage<Integer> d =
5006 +            new DelegatedCompletionStage<Integer>(f);
5007 +        if (!createIncomplete) f.completeExceptionally(ex);
5008 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
5009 +        if (createIncomplete) f.completeExceptionally(ex);
5010 +
5011 +        checkCompletedExceptionally(f, ex);
5012 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5013 +        r.assertInvoked();
5014 +    }}
5015 +
5016 +    /**
5017 +     * default-implemented exceptionallyComposeAsync completes
5018 +     * exceptionally on exception if action does
5019 +     */
5020 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5021 +        for (boolean createIncomplete : new boolean[] { true, false })
5022 +        for (Integer v1 : new Integer[] { 1, null })
5023 +    {
5024 +        final CFException ex = new CFException();
5025 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5026 +        final FailingExceptionalCompletableFutureFunction r
5027 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5028 +        final DelegatedCompletionStage<Integer> d =
5029 +            new DelegatedCompletionStage<Integer>(f);
5030 +        if (!createIncomplete) f.completeExceptionally(ex);
5031 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r,  new ThreadExecutor());
5032 +        if (createIncomplete) f.completeExceptionally(ex);
5033 +
5034 +        checkCompletedExceptionally(f, ex);
5035 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5036 +        r.assertInvoked();
5037 +    }}
5038 +
5039   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines