ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.46 by jsr166, Mon Jun 2 17:41:22 2014 UTC vs.
Revision 1.157 by jsr166, Mon Jun 27 02:47:42 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines