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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines