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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines