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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines