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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines