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.48 by jsr166, Mon Jun 2 19:07:14 2014 UTC vs.
Revision 1.162 by jsr166, Sun Jul 3 15:27:28 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;
25 < import static java.util.concurrent.TimeUnit.SECONDS;
26 < import java.util.*;
27 < import java.util.function.Supplier;
28 < import java.util.function.Consumer;
37 > import java.util.concurrent.atomic.AtomicReference;
38   import java.util.function.BiConsumer;
30 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 44 | 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 57 | 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));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
76 >        checkTimedGet(f, value);
77 >
78          try {
79              assertEquals(value, f.join());
80          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 75 | 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) {
95 <            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 {
98 <            f.get();
99 <            shouldThrow();
100 <        } catch (ExecutionException success) {
101 <            assertTrue(success.getCause() instanceof CFException);
102 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
103 <        assertTrue(f.isDone());
104 <        assertFalse(f.isCancelled());
105 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
106 <    }
111 >        checker.accept(cause);
112  
113 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              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 155 | Line 192 | public class CompletableFutureTest exten
192              shouldThrow();
193          } catch (CancellationException success) {
194          } catch (Throwable fail) { threadUnexpectedException(fail); }
158        assertTrue(f.isDone());
159        assertTrue(f.isCompletedExceptionally());
160        assertTrue(f.isCancelled());
161        assertTrue(f.toString().contains("[Completed exceptionally]"));
162    }
195  
196 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
197 <        try {
166 <            f.get(LONG_DELAY_MS, MILLISECONDS);
167 <            shouldThrow();
168 <        } catch (ExecutionException success) {
169 <            assertTrue(success.getCause() instanceof CancellationException);
170 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
171 <        try {
172 <            f.join();
173 <            shouldThrow();
174 <        } catch (CompletionException success) {
175 <            assertTrue(success.getCause() instanceof CancellationException);
176 <        }
177 <        try {
178 <            f.getNow(null);
179 <            shouldThrow();
180 <        } catch (CompletionException success) {
181 <            assertTrue(success.getCause() instanceof CancellationException);
182 <        }
183 <        try {
184 <            f.get();
185 <            shouldThrow();
186 <        } catch (ExecutionException success) {
187 <            assertTrue(success.getCause() instanceof CancellationException);
188 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
196 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
197 >
198          assertTrue(f.isDone());
190        assertFalse(f.isCancelled());
199          assertTrue(f.isCompletedExceptionally());
200 +        assertTrue(f.isCancelled());
201          assertTrue(f.toString().contains("[Completed exceptionally]"));
202      }
203  
# Line 206 | 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 218 | 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 228 | 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 240 | 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 261 | 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());
269 <        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);
279 <    }
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 304 | 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 320 | 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 334 | 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);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        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 528 | Line 657 | public class CompletableFutureTest exten
657  
658          ASYNC {
659              public void checkExecutionMode() {
660 <                assertSame(ForkJoinPool.commonPool(),
661 <                           ForkJoinTask.getPool());
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) {
# Line 596 | Line 731 | public class CompletableFutureTest exten
731  
732          EXECUTOR {
733              public void checkExecutionMode() {
734 <                //TODO
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) {
# Line 662 | Line 803 | public class CompletableFutureTest exten
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 711 | 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) -> {
717                // 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  
728
871      /**
872       * exceptionally action completes with function value on source
873       * exception
# Line 740 | 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 750 | 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 })
755        for (Integer v1 : new Integer[] { 1, null })
902      {
903          final AtomicInteger a = new AtomicInteger(0);
904          final CFException ex1 = new CFException();
# Line 761 | 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 <        checkCompletedWithWrappedCFException(g, ex2);
917 >        checkCompletedWithWrappedException(g, ex2);
918 >        checkCompletedExceptionally(f, ex1);
919          assertEquals(1, a.get());
920      }}
921  
922      /**
923 <     * handle action completes normally with function value on normal
924 <     * completion of source
923 >     * whenComplete action executes on normal completion, propagating
924 >     * source result.
925       */
926 <    public void testHandle_normalCompletion() {
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      {
783        final CompletableFuture<Integer> f = new CompletableFuture<>();
931          final AtomicInteger a = new AtomicInteger(0);
932 <        if (!createIncomplete) f.complete(v1);
933 <        final CompletableFuture<Integer> g = m.handle
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 x, Throwable t) -> {
937 <                threadAssertSame(x, v1);
936 >             (Integer result, Throwable t) -> {
937 >                m.checkExecutionMode();
938 >                threadAssertSame(result, v1);
939                  threadAssertNull(t);
940                  a.getAndIncrement();
792                return inc(v1);
941              });
942 <        if (createIncomplete) f.complete(v1);
942 >        if (createIncomplete) assertTrue(f.complete(v1));
943  
944 <        checkCompletedNormally(g, inc(v1));
944 >        checkCompletedNormally(g, v1);
945          checkCompletedNormally(f, v1);
946          assertEquals(1, a.get());
947      }}
948  
949      /**
950 <     * handle action completes normally with function value on
951 <     * exceptional completion of source
950 >     * whenComplete action executes on exceptional completion, propagating
951 >     * source result.
952       */
953 <    public void testHandle_exceptionalCompletion() {
953 >    public void testWhenComplete_exceptionalCompletion() {
954          for (ExecutionMode m : ExecutionMode.values())
955          for (boolean createIncomplete : new boolean[] { true, false })
808        for (Integer v1 : new Integer[] { 1, null })
956      {
810        final CompletableFuture<Integer> f = new CompletableFuture<>();
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.handle
961 >        final CompletableFuture<Integer> g = m.whenComplete
962              (f,
963 <             (Integer x, Throwable t) -> {
964 <                threadAssertNull(x);
963 >             (Integer result, Throwable t) -> {
964 >                m.checkExecutionMode();
965 >                threadAssertNull(result);
966                  threadAssertSame(t, ex);
967                  a.getAndIncrement();
820                return v1;
968              });
969          if (createIncomplete) f.completeExceptionally(ex);
970  
971 <        checkCompletedNormally(g, v1);
972 <        checkCompletedWithWrappedCFException(f, ex);
971 >        checkCompletedWithWrappedException(g, ex);
972 >        checkCompletedExceptionally(f, ex);
973          assertEquals(1, a.get());
974      }}
975  
976      /**
977 <     * handle action completes normally with function value on
978 <     * cancelled source
977 >     * whenComplete action executes on cancelled source, propagating
978 >     * CancellationException.
979       */
980 <    public void testHandle_sourceCancelled() {
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 })
837        for (Integer v1 : new Integer[] { 1, null })
984      {
839        final CompletableFuture<Integer> f = new CompletableFuture<>();
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.handle
988 >        final CompletableFuture<Integer> g = m.whenComplete
989              (f,
990 <             (Integer x, Throwable t) -> {
991 <                threadAssertNull(x);
990 >             (Integer result, Throwable t) -> {
991 >                m.checkExecutionMode();
992 >                threadAssertNull(result);
993                  threadAssertTrue(t instanceof CancellationException);
994                  a.getAndIncrement();
848                return v1;
995              });
996          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
997  
998 <        checkCompletedNormally(g, v1);
998 >        checkCompletedWithWrappedCancellationException(g);
999          checkCancelled(f);
1000          assertEquals(1, a.get());
1001      }}
1002  
1003      /**
1004 <     * handle result completes exceptionally if action does
1004 >     * If a whenComplete action throws an exception when triggered by
1005 >     * a normal completion, it completes exceptionally
1006       */
1007 <    public void testHandle_sourceFailedActionFailed() {
861 <        for (ExecutionMode m : ExecutionMode.values())
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.handle
1047 >        final CompletableFuture<Integer> g = m.whenComplete
1048              (f,
1049 <             (Integer x, Throwable t) -> {
1050 <                threadAssertNull(x);
1051 <                threadAssertSame(ex1, t);
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);
1059 <        checkCompletedWithWrappedCFException(f, ex1);
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  
1067 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1067 >    /**
1068 >     * handle action completes normally with function value on normal
1069 >     * completion of source
1070 >     */
1071 >    public void testHandle_normalCompletion() {
1072          for (ExecutionMode m : ExecutionMode.values())
1073          for (boolean createIncomplete : new boolean[] { true, false })
1074          for (Integer v1 : new Integer[] { 1, null })
1075      {
1076          final CompletableFuture<Integer> f = new CompletableFuture<>();
1077          final AtomicInteger a = new AtomicInteger(0);
1078 <        final CFException ex = new CFException();
892 <        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 <                throw ex;
1086 >                return inc(v1);
1087              });
1088 <        if (createIncomplete) f.complete(v1);
1088 >        if (createIncomplete) assertTrue(f.complete(v1));
1089  
1090 <        checkCompletedWithWrappedCFException(g, ex);
1090 >        checkCompletedNormally(g, inc(v1));
1091          checkCompletedNormally(f, v1);
1092          assertEquals(1, a.get());
1093      }}
1094  
1095      /**
1096 <     * runAsync completes after running Runnable
1097 <     */
911 <    public void testRunAsync() {
912 <        Noop r = new Noop();
913 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
914 <        assertNull(f.join());
915 <        assertEquals(1, r.invocationCount);
916 <        checkCompletedNormally(f, null);
917 <    }
918 <
919 <    /**
920 <     * runAsync with executor completes after running Runnable
921 <     */
922 <    public void testRunAsync2() {
923 <        Noop r = new Noop();
924 <        ThreadExecutor exec = new ThreadExecutor();
925 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
926 <        assertNull(f.join());
927 <        assertEquals(1, r.invocationCount);
928 <        checkCompletedNormally(f, null);
929 <        assertEquals(1, exec.count.get());
930 <    }
931 <
932 <    /**
933 <     * failing runAsync completes exceptionally after running Runnable
934 <     */
935 <    public void testRunAsync3() {
936 <        FailingNoop r = new FailingNoop();
937 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938 <        checkCompletedWithWrappedCFException(f);
939 <        assertEquals(1, r.invocationCount);
940 <    }
941 <
942 <    /**
943 <     * supplyAsync completes with result of supplier
944 <     */
945 <    public void testSupplyAsync() {
946 <        CompletableFuture<Integer> f;
947 <        f = CompletableFuture.supplyAsync(supplyOne);
948 <        assertEquals(f.join(), one);
949 <        checkCompletedNormally(f, one);
950 <    }
951 <
952 <    /**
953 <     * supplyAsync with executor completes with result of supplier
954 <     */
955 <    public void testSupplyAsync2() {
956 <        CompletableFuture<Integer> f;
957 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
958 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
961 <
962 <    /**
963 <     * Failing supplyAsync completes exceptionally
964 <     */
965 <    public void testSupplyAsync3() {
966 <        FailingSupplier r = new FailingSupplier();
967 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
968 <        checkCompletedWithWrappedCFException(f);
969 <        assertEquals(1, r.invocationCount);
970 <    }
971 <
972 <    // seq completion methods
973 <
974 <    /**
975 <     * thenRun result completes normally after normal completion of source
1096 >     * handle action completes normally with function value on
1097 >     * exceptional completion of source
1098       */
1099 <    public void testThenRun_normalCompletion() {
1099 >    public void testHandle_exceptionalCompletion() {
1100          for (ExecutionMode m : ExecutionMode.values())
1101          for (boolean createIncomplete : new boolean[] { true, false })
1102          for (Integer v1 : new Integer[] { 1, null })
1103      {
1104          final CompletableFuture<Integer> f = new CompletableFuture<>();
1105 <        final Noop r = new Noop();
984 <        if (!createIncomplete) f.complete(v1);
985 <        final CompletableFuture<Void> g = m.thenRun(f, r);
986 <        if (createIncomplete) f.complete(v1);
987 <
988 <        checkCompletedNormally(g, null);
989 <        checkCompletedNormally(f, v1);
990 <        assertEquals(1, r.invocationCount);
991 <    }}
992 <
993 <    /**
994 <     * thenRun result completes exceptionally after exceptional
995 <     * completion of source
996 <     */
997 <    public void testThenRun_exceptionalCompletion() {
998 <        for (ExecutionMode m : ExecutionMode.values())
999 <        for (boolean createIncomplete : new boolean[] { true, false })
1000 <    {
1105 >        final AtomicInteger a = new AtomicInteger(0);
1106          final CFException ex = new CFException();
1002        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003        final Noop r = new Noop();
1107          if (!createIncomplete) f.completeExceptionally(ex);
1108 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1108 >        final CompletableFuture<Integer> g = m.handle
1109 >            (f,
1110 >             (Integer result, Throwable t) -> {
1111 >                m.checkExecutionMode();
1112 >                threadAssertNull(result);
1113 >                threadAssertSame(t, ex);
1114 >                a.getAndIncrement();
1115 >                return v1;
1116 >            });
1117          if (createIncomplete) f.completeExceptionally(ex);
1118  
1119 <        checkCompletedWithWrappedCFException(g, ex);
1120 <        checkCompletedWithWrappedCFException(f, ex);
1121 <        assertEquals(0, r.invocationCount);
1119 >        checkCompletedNormally(g, v1);
1120 >        checkCompletedExceptionally(f, ex);
1121 >        assertEquals(1, a.get());
1122      }}
1123  
1124      /**
1125 <     * thenRun result completes exceptionally if source cancelled
1125 >     * handle action completes normally with function value on
1126 >     * cancelled source
1127       */
1128 <    public void testThenRun_sourceCancelled() {
1128 >    public void testHandle_sourceCancelled() {
1129          for (ExecutionMode m : ExecutionMode.values())
1018        for (boolean createIncomplete : new boolean[] { true, false })
1130          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1131 +        for (boolean createIncomplete : new boolean[] { true, false })
1132 +        for (Integer v1 : new Integer[] { 1, null })
1133      {
1134          final CompletableFuture<Integer> f = new CompletableFuture<>();
1135 <        final Noop r = new Noop();
1135 >        final AtomicInteger a = new AtomicInteger(0);
1136          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1137 <        final CompletableFuture<Void> g = f.thenRun(r);
1137 >        final CompletableFuture<Integer> g = m.handle
1138 >            (f,
1139 >             (Integer result, Throwable t) -> {
1140 >                m.checkExecutionMode();
1141 >                threadAssertNull(result);
1142 >                threadAssertTrue(t instanceof CancellationException);
1143 >                a.getAndIncrement();
1144 >                return v1;
1145 >            });
1146          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1147  
1148 <        checkCompletedWithWrappedCancellationException(g);
1148 >        checkCompletedNormally(g, v1);
1149          checkCancelled(f);
1150 <        assertEquals(0, r.invocationCount);
1150 >        assertEquals(1, a.get());
1151      }}
1152  
1153      /**
1154 <     * thenRun 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 testThenRun_actionFailed() {
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 FailingNoop r = new FailingNoop();
1164 <        if (!createIncomplete) f.complete(v1);
1165 <        final CompletableFuture<Void> g = f.thenRun(r);
1166 <        if (createIncomplete) f.complete(v1);
1163 >        final AtomicInteger a = new AtomicInteger(0);
1164 >        final CFException ex = new CFException();
1165 >        if (!createIncomplete) assertTrue(f.complete(v1));
1166 >        final CompletableFuture<Integer> g = m.handle
1167 >            (f,
1168 >             (Integer result, Throwable t) -> {
1169 >                m.checkExecutionMode();
1170 >                threadAssertSame(result, v1);
1171 >                threadAssertNull(t);
1172 >                a.getAndIncrement();
1173 >                throw ex;
1174 >            });
1175 >        if (createIncomplete) assertTrue(f.complete(v1));
1176  
1177 <        checkCompletedWithWrappedCFException(g);
1177 >        checkCompletedWithWrappedException(g, ex);
1178          checkCompletedNormally(f, v1);
1179 +        assertEquals(1, a.get());
1180      }}
1181  
1182      /**
1183 <     * thenApply result completes normally after normal completion of source
1184 <     */
1185 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1059 <
1060 <    /**
1061 <     * thenApply result completes exceptionally after exceptional
1062 <     * completion of source
1063 <     */
1064 <    public void testThenApply2() {
1065 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1066 <        CompletableFuture<Integer> g = f.thenApply(inc);
1067 <        f.completeExceptionally(new CFException());
1068 <        checkCompletedWithWrappedCFException(g);
1069 <    }
1070 <
1071 <    /**
1072 <     * thenApply result completes exceptionally if action does
1073 <     */
1074 <    public void testThenApply3() {
1075 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1077 <        f.complete(one);
1078 <        checkCompletedWithWrappedCFException(g);
1079 <    }
1080 <
1081 <    /**
1082 <     * thenApply result completes exceptionally if source cancelled
1083 <     */
1084 <    public void testThenApply4() {
1085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1086 <        CompletableFuture<Integer> g = f.thenApply(inc);
1087 <        assertTrue(f.cancel(true));
1088 <        checkCompletedWithWrappedCancellationException(g);
1089 <    }
1090 <
1091 <    /**
1092 <     * thenAccept result completes normally after normal completion of source
1093 <     */
1094 <    public void testThenAccept() {
1095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1096 <        IncAction r = new IncAction();
1097 <        CompletableFuture<Void> g = f.thenAccept(r);
1098 <        f.complete(one);
1099 <        checkCompletedNormally(g, null);
1100 <        assertEquals(r.value, (Integer) 2);
1101 <    }
1102 <
1103 <    /**
1104 <     * thenAccept result completes exceptionally after exceptional
1105 <     * completion of source
1106 <     */
1107 <    public void testThenAccept2() {
1108 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1109 <        IncAction r = new IncAction();
1110 <        CompletableFuture<Void> g = f.thenAccept(r);
1111 <        f.completeExceptionally(new CFException());
1112 <        checkCompletedWithWrappedCFException(g);
1113 <    }
1114 <
1115 <    /**
1116 <     * thenAccept result completes exceptionally if action does
1117 <     */
1118 <    public void testThenAccept3() {
1119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1120 <        FailingConsumer r = new FailingConsumer();
1121 <        CompletableFuture<Void> g = f.thenAccept(r);
1122 <        f.complete(one);
1123 <        checkCompletedWithWrappedCFException(g);
1124 <        assertEquals(1, r.invocationCount);
1125 <    }
1126 <
1127 <    /**
1128 <     * thenAccept result completes exceptionally if source cancelled
1129 <     */
1130 <    public void testThenAccept4() {
1131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1132 <        IncAction r = new IncAction();
1133 <        CompletableFuture<Void> g = f.thenAccept(r);
1134 <        assertTrue(f.cancel(true));
1135 <        checkCompletedWithWrappedCancellationException(g);
1136 <    }
1137 <
1138 <    /**
1139 <     * thenCombine result completes normally after normal completion
1140 <     * of sources
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 testThenCombine_normalCompletion1() {
1187 >    public void testHandle_sourceFailedActionFailed() {
1188          for (boolean createIncomplete : new boolean[] { true, false })
1144        for (boolean fFirst : new boolean[] { true, false })
1189          for (ExecutionMode m : ExecutionMode.values())
1146        for (Integer v1 : new Integer[] { 1, null })
1147        for (Integer v2 : new Integer[] { 2, null })
1190      {
1191 +        final AtomicInteger a = new AtomicInteger(0);
1192 +        final CFException ex1 = new CFException();
1193 +        final CFException ex2 = new CFException();
1194          final CompletableFuture<Integer> f = new CompletableFuture<>();
1150        final CompletableFuture<Integer> g = new CompletableFuture<>();
1151        final SubtractFunction r = new SubtractFunction();
1152        CompletableFuture<Integer> h = null;
1153        if (createIncomplete) h = m.thenCombine(f, g, r);
1195  
1196 <        if (fFirst)
1197 <            f.complete(v1);
1198 <        else
1199 <            g.complete(v2);
1200 <        if (createIncomplete) checkIncomplete(h);
1201 <        assertEquals(0, r.invocationCount);
1202 <        if (!fFirst)
1203 <            f.complete(v1);
1204 <        else
1205 <            g.complete(v2);
1206 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1196 >        if (!createIncomplete) f.completeExceptionally(ex1);
1197 >        final CompletableFuture<Integer> g = m.handle
1198 >            (f,
1199 >             (Integer result, Throwable t) -> {
1200 >                m.checkExecutionMode();
1201 >                threadAssertNull(result);
1202 >                threadAssertSame(ex1, t);
1203 >                a.getAndIncrement();
1204 >                throw ex2;
1205 >            });
1206 >        if (createIncomplete) f.completeExceptionally(ex1);
1207  
1208 <        checkCompletedNormally(h, subtract(v1, v2));
1209 <        checkCompletedNormally(f, v1);
1210 <        checkCompletedNormally(g, v2);
1170 <        assertEquals(1, r.invocationCount);
1208 >        checkCompletedWithWrappedException(g, ex2);
1209 >        checkCompletedExceptionally(f, ex1);
1210 >        assertEquals(1, a.get());
1211      }}
1212  
1213      /**
1214 <     * thenCombine result completes exceptionally after exceptional
1175 <     * completion of either source
1214 >     * runAsync completes after running Runnable
1215       */
1216 <    public void testThenCombine_exceptionalCompletion1() {
1217 <        for (ExecutionMode m : ExecutionMode.values())
1218 <        for (Integer v1 : new Integer[] { 1, null })
1216 >    public void testRunAsync_normalCompletion() {
1217 >        ExecutionMode[] executionModes = {
1218 >            ExecutionMode.ASYNC,
1219 >            ExecutionMode.EXECUTOR,
1220 >        };
1221 >        for (ExecutionMode m : executionModes)
1222      {
1223 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1224 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1225 <        final SubtractFunction r = new SubtractFunction();
1226 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1227 <        final CFException ex = new CFException();
1186 <
1187 <        f.completeExceptionally(ex);
1188 <        checkIncomplete(h);
1189 <        g.complete(v1);
1190 <
1191 <        checkCompletedWithWrappedCFException(h, ex);
1192 <        checkCompletedWithWrappedCFException(f, ex);
1193 <        assertEquals(0, r.invocationCount);
1194 <        checkCompletedNormally(g, v1);
1223 >        final Noop r = new Noop(m);
1224 >        final CompletableFuture<Void> f = m.runAsync(r);
1225 >        assertNull(f.join());
1226 >        checkCompletedNormally(f, null);
1227 >        r.assertInvoked();
1228      }}
1229  
1230 <    public void testThenCombine_exceptionalCompletion2() {
1231 <        for (ExecutionMode m : ExecutionMode.values())
1232 <        for (Integer v1 : new Integer[] { 1, null })
1230 >    /**
1231 >     * failing runAsync completes exceptionally after running Runnable
1232 >     */
1233 >    public void testRunAsync_exceptionalCompletion() {
1234 >        ExecutionMode[] executionModes = {
1235 >            ExecutionMode.ASYNC,
1236 >            ExecutionMode.EXECUTOR,
1237 >        };
1238 >        for (ExecutionMode m : executionModes)
1239      {
1240 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1241 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1242 <        final SubtractFunction r = new SubtractFunction();
1243 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1205 <        final CFException ex = new CFException();
1206 <
1207 <        g.completeExceptionally(ex);
1208 <        checkIncomplete(h);
1209 <        f.complete(v1);
1210 <
1211 <        checkCompletedWithWrappedCFException(h, ex);
1212 <        checkCompletedWithWrappedCFException(g, ex);
1213 <        assertEquals(0, r.invocationCount);
1214 <        checkCompletedNormally(f, v1);
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 <    public void testThenCombine_exceptionalCompletion3() {
1247 <        for (ExecutionMode m : ExecutionMode.values())
1248 <        for (Integer v1 : new Integer[] { 1, null })
1249 <    {
1250 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1251 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1252 <        final SubtractFunction r = new SubtractFunction();
1253 <        final CFException ex = new CFException();
1225 <
1226 <        g.completeExceptionally(ex);
1227 <        f.complete(v1);
1228 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkCompletedWithWrappedCFException(h, ex);
1256 <        checkCompletedWithWrappedCFException(g, ex);
1232 <        assertEquals(0, r.invocationCount);
1233 <        checkCompletedNormally(f, v1);
1234 <    }}
1255 >        assertEquals(1, e.count.get());
1256 >    }
1257  
1258 <    public void testThenCombine_exceptionalCompletion4() {
1259 <        for (ExecutionMode m : ExecutionMode.values())
1258 >    /**
1259 >     * supplyAsync completes with result of supplier
1260 >     */
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 CompletableFuture<Integer> f = new CompletableFuture<>();
1270 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1271 <        final SubtractFunction r = new SubtractFunction();
1272 <        final CFException ex = new CFException();
1273 <
1245 <        f.completeExceptionally(ex);
1246 <        g.complete(v1);
1247 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1248 <
1249 <        checkCompletedWithWrappedCFException(h, ex);
1250 <        checkCompletedWithWrappedCFException(f, ex);
1251 <        assertEquals(0, r.invocationCount);
1252 <        checkCompletedNormally(g, v1);
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 <     * thenCombine result completes exceptionally if action does
1277 >     * Failing supplyAsync completes exceptionally
1278       */
1279 <    public void testThenCombine_actionFailed1() {
1280 <        for (ExecutionMode m : ExecutionMode.values())
1281 <        for (Integer v1 : new Integer[] { 1, null })
1282 <        for (Integer v2 : new Integer[] { 2, null })
1279 >    public void testSupplyAsync_exceptionalCompletion() {
1280 >        ExecutionMode[] executionModes = {
1281 >            ExecutionMode.ASYNC,
1282 >            ExecutionMode.EXECUTOR,
1283 >        };
1284 >        for (ExecutionMode m : executionModes)
1285      {
1286 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1287 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1288 <        final FailingBiFunction r = new FailingBiFunction();
1289 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1267 <
1268 <        f.complete(v1);
1269 <        checkIncomplete(h);
1270 <        g.complete(v2);
1271 <
1272 <        checkCompletedWithWrappedCFException(h);
1273 <        checkCompletedNormally(f, v1);
1274 <        checkCompletedNormally(g, v2);
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 testThenCombine_actionFailed2() {
1293 <        for (ExecutionMode m : ExecutionMode.values())
1294 <        for (Integer v1 : new Integer[] { 1, null })
1295 <        for (Integer v2 : new Integer[] { 2, null })
1296 <    {
1297 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1299 <        final FailingBiFunction r = new FailingBiFunction();
1285 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        g.complete(v2);
1302 <        checkIncomplete(h);
1289 <        f.complete(v1);
1301 >        assertEquals(1, e.count.get());
1302 >    }
1303  
1304 <        checkCompletedWithWrappedCFException(h);
1292 <        checkCompletedNormally(f, v1);
1293 <        checkCompletedNormally(g, v2);
1294 <    }}
1304 >    // seq completion methods
1305  
1306      /**
1307 <     * thenCombine result completes exceptionally if either source cancelled
1307 >     * thenRun result completes normally after normal completion of source
1308       */
1309 <    public void testThenCombine_sourceCancelled1() {
1300 <        for (ExecutionMode m : ExecutionMode.values())
1301 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 <        for (Integer v1 : new Integer[] { 1, null })
1303 <    {
1304 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1305 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1306 <        final SubtractFunction r = new SubtractFunction();
1307 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1308 <
1309 <        assertTrue(f.cancel(mayInterruptIfRunning));
1310 <        checkIncomplete(h);
1311 <        g.complete(v1);
1312 <
1313 <        checkCompletedWithWrappedCancellationException(h);
1314 <        checkCancelled(f);
1315 <        assertEquals(0, r.invocationCount);
1316 <        checkCompletedNormally(g, v1);
1317 <    }}
1318 <
1319 <    public void testThenCombine_sourceCancelled2() {
1309 >    public void testThenRun_normalCompletion() {
1310          for (ExecutionMode m : ExecutionMode.values())
1321        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1311          for (Integer v1 : new Integer[] { 1, null })
1312      {
1313          final CompletableFuture<Integer> f = new CompletableFuture<>();
1314 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1315 <        final SubtractFunction r = new SubtractFunction();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1314 >        final Noop[] rs = new Noop[6];
1315 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1316  
1317 <        assertTrue(g.cancel(mayInterruptIfRunning));
1318 <        checkIncomplete(h);
1319 <        f.complete(v1);
1320 <
1321 <        checkCompletedWithWrappedCancellationException(h);
1322 <        checkCancelled(g);
1323 <        assertEquals(0, r.invocationCount);
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 <    public void testThenCombine_sourceCancelled3() {
1338 >    /**
1339 >     * thenRun result completes exceptionally after exceptional
1340 >     * completion of source
1341 >     */
1342 >    public void testThenRun_exceptionalCompletion() {
1343          for (ExecutionMode m : ExecutionMode.values())
1341        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1342        for (Integer v1 : new Integer[] { 1, null })
1344      {
1345 +        final CFException ex = new CFException();
1346          final CompletableFuture<Integer> f = new CompletableFuture<>();
1347 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1348 <        final SubtractFunction r = new SubtractFunction();
1347 <
1348 <        assertTrue(g.cancel(mayInterruptIfRunning));
1349 <        f.complete(v1);
1350 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1347 >        final Noop[] rs = new Noop[6];
1348 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1349  
1350 <        checkCompletedWithWrappedCancellationException(h);
1351 <        checkCancelled(g);
1352 <        assertEquals(0, r.invocationCount);
1353 <        checkCompletedNormally(f, v1);
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 <    public void testThenCombine_sourceCancelled4() {
1371 >    /**
1372 >     * thenRun result completes exceptionally if source cancelled
1373 >     */
1374 >    public void testThenRun_sourceCancelled() {
1375          for (ExecutionMode m : ExecutionMode.values())
1376          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361        for (Integer v1 : new Integer[] { 1, null })
1377      {
1378          final CompletableFuture<Integer> f = new CompletableFuture<>();
1379 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1380 <        final SubtractFunction r = new SubtractFunction();
1379 >        final Noop[] rs = new Noop[6];
1380 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1381  
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 <        g.complete(v1);
1390 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1391 <
1392 <        checkCompletedWithWrappedCancellationException(h);
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 <        assertEquals(0, r.invocationCount);
1374 <        checkCompletedNormally(g, v1);
1400 >        for (Noop r : rs) r.assertNotInvoked();
1401      }}
1402  
1403      /**
1404 <     * thenAcceptBoth result completes normally after normal
1379 <     * completion of sources
1404 >     * thenRun result completes exceptionally if action does
1405       */
1406 <    public void testThenAcceptBoth_normalCompletion1() {
1382 <        for (ExecutionMode m : ExecutionMode.values())
1383 <        for (Integer v1 : new Integer[] { 1, null })
1384 <        for (Integer v2 : new Integer[] { 2, null })
1385 <    {
1386 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1387 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1388 <        final SubtractAction r = new SubtractAction();
1389 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1390 <
1391 <        f.complete(v1);
1392 <        checkIncomplete(h);
1393 <        assertEquals(0, r.invocationCount);
1394 <        g.complete(v2);
1395 <
1396 <        checkCompletedNormally(h, null);
1397 <        assertEquals(subtract(v1, v2), r.value);
1398 <        checkCompletedNormally(f, v1);
1399 <        checkCompletedNormally(g, v2);
1400 <    }}
1401 <
1402 <    public void testThenAcceptBoth_normalCompletion2() {
1403 <        for (ExecutionMode m : ExecutionMode.values())
1404 <        for (Integer v1 : new Integer[] { 1, null })
1405 <        for (Integer v2 : new Integer[] { 2, null })
1406 <    {
1407 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 <        final SubtractAction r = new SubtractAction();
1410 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1411 <
1412 <        g.complete(v2);
1413 <        checkIncomplete(h);
1414 <        assertEquals(0, r.invocationCount);
1415 <        f.complete(v1);
1416 <
1417 <        checkCompletedNormally(h, null);
1418 <        assertEquals(subtract(v1, v2), r.value);
1419 <        checkCompletedNormally(f, v1);
1420 <        checkCompletedNormally(g, v2);
1421 <    }}
1422 <
1423 <    public void testThenAcceptBoth_normalCompletion3() {
1406 >    public void testThenRun_actionFailed() {
1407          for (ExecutionMode m : ExecutionMode.values())
1408          for (Integer v1 : new Integer[] { 1, null })
1426        for (Integer v2 : new Integer[] { 2, null })
1409      {
1410          final CompletableFuture<Integer> f = new CompletableFuture<>();
1411 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1412 <        final SubtractAction r = new SubtractAction();
1431 <
1432 <        g.complete(v2);
1433 <        f.complete(v1);
1434 <        final CompletableFuture<Void> h = m.thenAcceptBoth(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, null);
1415 <        assertEquals(subtract(v1, v2), r.value);
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);
1439        checkCompletedNormally(g, v2);
1429      }}
1430  
1431 <    public void testThenAcceptBoth_normalCompletion4() {
1431 >    /**
1432 >     * thenApply result completes normally after normal completion of source
1433 >     */
1434 >    public void testThenApply_normalCompletion() {
1435          for (ExecutionMode m : ExecutionMode.values())
1436          for (Integer v1 : new Integer[] { 1, null })
1445        for (Integer v2 : new Integer[] { 2, null })
1437      {
1438          final CompletableFuture<Integer> f = new CompletableFuture<>();
1439 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1440 <        final SubtractAction r = new SubtractAction();
1439 >        final IncFunction[] rs = new IncFunction[4];
1440 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1441  
1442 <        f.complete(v1);
1443 <        g.complete(v2);
1444 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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(h, null);
1451 <        assertEquals(subtract(v1, v2), r.value);
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 <        checkCompletedNormally(g, v2);
1455 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1456      }}
1457  
1458      /**
1459 <     * thenAcceptBoth result completes exceptionally after exceptional
1460 <     * completion of either source
1459 >     * thenApply result completes exceptionally after exceptional
1460 >     * completion of source
1461       */
1462 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1462 >    public void testThenApply_exceptionalCompletion() {
1463          for (ExecutionMode m : ExecutionMode.values())
1467        for (Integer v1 : new Integer[] { 1, null })
1464      {
1469        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471        final SubtractAction r = new SubtractAction();
1472        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1465          final CFException ex = new CFException();
1474
1475        f.completeExceptionally(ex);
1476        checkIncomplete(h);
1477        g.complete(v1);
1478
1479        checkCompletedWithWrappedCFException(h, ex);
1480        checkCompletedWithWrappedCFException(f, ex);
1481        assertEquals(0, r.invocationCount);
1482        checkCompletedNormally(g, v1);
1483    }}
1484
1485    public void testThenAcceptBoth_exceptionalCompletion2() {
1486        for (ExecutionMode m : ExecutionMode.values())
1487        for (Integer v1 : new Integer[] { 1, null })
1488    {
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1468 <        final SubtractAction r = new SubtractAction();
1492 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1493 <        final CFException ex = new CFException();
1494 <
1495 <        g.completeExceptionally(ex);
1496 <        checkIncomplete(h);
1497 <        f.complete(v1);
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(g, ex);
1472 <        assertEquals(0, r.invocationCount);
1473 <        checkCompletedNormally(f, v1);
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 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1484 >    /**
1485 >     * thenApply result completes exceptionally if source cancelled
1486 >     */
1487 >    public void testThenApply_sourceCancelled() {
1488          for (ExecutionMode m : ExecutionMode.values())
1489 <        for (Integer v1 : new Integer[] { 1, null })
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 SubtractAction r = new SubtractAction();
1512 <        final CFException ex = new CFException();
1492 >        final IncFunction[] rs = new IncFunction[4];
1493 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1494  
1495 <        g.completeExceptionally(ex);
1496 <        f.complete(v1);
1497 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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, ex);
1502 <        checkCompletedWithWrappedCFException(g, ex);
1503 <        assertEquals(0, r.invocationCount);
1504 <        checkCompletedNormally(f, v1);
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 testThenAcceptBoth_exceptionalCompletion4() {
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      {
1516          final CompletableFuture<Integer> f = new CompletableFuture<>();
1517 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1518 <        final SubtractAction r = new SubtractAction();
1531 <        final CFException ex = new CFException();
1517 >        final FailingFunction[] rs = new FailingFunction[4];
1518 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1519  
1520 <        f.completeExceptionally(ex);
1521 <        g.complete(v1);
1522 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        checkCompletedWithWrappedCFException(h, ex);
1527 <        checkCompletedWithWrappedCFException(f, ex);
1528 <        assertEquals(0, r.invocationCount);
1529 <        checkCompletedNormally(g, v1);
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      }}
1532  
1533      /**
1534 <     * thenAcceptBoth result completes exceptionally if action does
1534 >     * thenAccept result completes normally after normal completion of source
1535       */
1536 <    public void testThenAcceptBoth_actionFailed1() {
1536 >    public void testThenAccept_normalCompletion() {
1537          for (ExecutionMode m : ExecutionMode.values())
1538          for (Integer v1 : new Integer[] { 1, null })
1549        for (Integer v2 : new Integer[] { 2, null })
1539      {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1542 <        final FailingBiConsumer r = new FailingBiConsumer();
1554 <        final CompletableFuture<Void> h = m.thenAcceptBoth(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 <        f.complete(v1);
1545 <        checkIncomplete(h);
1546 <        g.complete(v2);
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 <        checkCompletedWithWrappedCFException(h);
1552 >        checkCompletedNormally(h0, null);
1553 >        checkCompletedNormally(h1, null);
1554 >        checkCompletedNormally(h2, null);
1555 >        checkCompletedNormally(h3, null);
1556          checkCompletedNormally(f, v1);
1557 <        checkCompletedNormally(g, v2);
1557 >        for (NoopConsumer r : rs) r.assertValue(v1);
1558      }}
1559  
1560 <    public void testThenAcceptBoth_actionFailed2() {
1560 >    /**
1561 >     * thenAccept result completes exceptionally after exceptional
1562 >     * completion of source
1563 >     */
1564 >    public void testThenAccept_exceptionalCompletion() {
1565          for (ExecutionMode m : ExecutionMode.values())
1567        for (Integer v1 : new Integer[] { 1, null })
1568        for (Integer v2 : new Integer[] { 2, null })
1566      {
1567 +        final CFException ex = new CFException();
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1570 <        final FailingBiConsumer r = new FailingBiConsumer();
1573 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1574 <
1575 <        g.complete(v2);
1576 <        checkIncomplete(h);
1577 <        f.complete(v1);
1569 >        final NoopConsumer[] rs = new NoopConsumer[4];
1570 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1571  
1572 <        checkCompletedWithWrappedCFException(h);
1573 <        checkCompletedNormally(f, v1);
1574 <        checkCompletedNormally(g, v2);
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      /**
1587 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1587 >     * thenAccept result completes exceptionally if source cancelled
1588       */
1589 <    public void testThenAcceptBoth_sourceCancelled1() {
1589 >    public void testThenAccept_sourceCancelled() {
1590          for (ExecutionMode m : ExecutionMode.values())
1591          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590        for (Integer v1 : new Integer[] { 1, null })
1592      {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1595 <        final SubtractAction r = new SubtractAction();
1595 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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 <        checkIncomplete(h);
1601 <        g.complete(v1);
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);
1604 <        checkCompletedNormally(g, v1);
1608 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1609      }}
1610  
1611 <    public void testThenAcceptBoth_sourceCancelled2() {
1611 >    /**
1612 >     * thenAccept result completes exceptionally if action does
1613 >     */
1614 >    public void testThenAccept_actionFailed() {
1615          for (ExecutionMode m : ExecutionMode.values())
1609        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1616          for (Integer v1 : new Integer[] { 1, null })
1617      {
1618          final CompletableFuture<Integer> f = new CompletableFuture<>();
1619 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1620 <        final SubtractAction r = new SubtractAction();
1615 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1619 >        final FailingConsumer[] rs = new FailingConsumer[4];
1620 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1621  
1622 <        assertTrue(g.cancel(mayInterruptIfRunning));
1623 <        checkIncomplete(h);
1624 <        f.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
1629 <        checkCancelled(g);
1630 <        assertEquals(0, r.invocationCount);
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      }}
1634  
1635 <    public void testThenAcceptBoth_sourceCancelled3() {
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 mayInterruptIfRunning : new boolean[] { true, false })
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      {
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 <        assertTrue(g.cancel(mayInterruptIfRunning));
1651 <        f.complete(v1);
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  
1640        checkCompletedWithWrappedCancellationException(h);
1641        checkCancelled(g);
1642        assertEquals(0, r.invocationCount);
1676          checkCompletedNormally(f, v1);
1677 <    }}
1645 <
1646 <    public void testThenAcceptBoth_sourceCancelled4() {
1647 <        for (ExecutionMode m : ExecutionMode.values())
1648 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1649 <        for (Integer v1 : new Integer[] { 1, null })
1650 <    {
1651 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1652 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1653 <        final SubtractAction r = new SubtractAction();
1654 <
1655 <        assertTrue(f.cancel(mayInterruptIfRunning));
1656 <        g.complete(v1);
1657 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1658 <
1659 <        checkCompletedWithWrappedCancellationException(h);
1660 <        checkCancelled(f);
1661 <        assertEquals(0, r.invocationCount);
1662 <        checkCompletedNormally(g, v1);
1677 >        checkCompletedNormally(g, v2);
1678      }}
1679  
1680      /**
1681 <     * runAfterBoth result completes normally after normal
1682 <     * completion of sources
1681 >     * thenCombine result completes exceptionally after exceptional
1682 >     * completion of either source
1683       */
1684 <    public void testRunAfterBoth_normalCompletion1() {
1684 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1685          for (ExecutionMode m : ExecutionMode.values())
1686 +        for (boolean fFirst : new boolean[] { true, false })
1687 +        for (boolean failFirst : new boolean[] { true, false })
1688          for (Integer v1 : new Integer[] { 1, null })
1672        for (Integer v2 : new Integer[] { 2, null })
1689      {
1690          final CompletableFuture<Integer> f = new CompletableFuture<>();
1691          final CompletableFuture<Integer> g = new CompletableFuture<>();
1692 <        final Noop r = new Noop();
1693 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1694 <
1695 <        f.complete(v1);
1696 <        checkIncomplete(h);
1697 <        assertEquals(0, r.invocationCount);
1698 <        g.complete(v2);
1699 <
1700 <        checkCompletedNormally(h, null);
1701 <        assertEquals(1, r.invocationCount);
1702 <        checkCompletedNormally(f, v1);
1703 <        checkCompletedNormally(g, v2);
1692 >        final CFException ex = new CFException();
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 <    public void testRunAfterBoth_normalCompletion2() {
1724 >    /**
1725 >     * thenCombine result completes exceptionally if either source cancelled
1726 >     */
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 })
1693        for (Integer v2 : new Integer[] { 2, null })
1733      {
1734          final CompletableFuture<Integer> f = new CompletableFuture<>();
1735          final CompletableFuture<Integer> g = new CompletableFuture<>();
1736 <        final Noop r = new Noop();
1737 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1738 <
1739 <        g.complete(v2);
1740 <        checkIncomplete(h);
1741 <        assertEquals(0, r.invocationCount);
1742 <        f.complete(v1);
1743 <
1744 <        checkCompletedNormally(h, null);
1745 <        assertEquals(1, r.invocationCount);
1746 <        checkCompletedNormally(f, v1);
1747 <        checkCompletedNormally(g, v2);
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 testRunAfterBoth_normalCompletion3() {
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      {
1776          final CompletableFuture<Integer> f = new CompletableFuture<>();
1777          final CompletableFuture<Integer> g = new CompletableFuture<>();
1778 <        final Noop r = new Noop();
1779 <
1780 <        g.complete(v2);
1781 <        f.complete(v1);
1782 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1783 <
1784 <        checkCompletedNormally(h, null);
1785 <        assertEquals(1, r.invocationCount);
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      }}
1802  
1803 <    public void testRunAfterBoth_normalCompletion4() {
1803 >    /**
1804 >     * thenAcceptBoth result completes normally after normal
1805 >     * completion of sources
1806 >     */
1807 >    public void testThenAcceptBoth_normalCompletion() {
1808          for (ExecutionMode m : ExecutionMode.values())
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 Noop r = new Noop();
1816 <
1817 <        f.complete(v1);
1818 <        g.complete(v2);
1819 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1820 <
1821 <        checkCompletedNormally(h, null);
1822 <        assertEquals(1, 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          checkCompletedNormally(g, v2);
1842      }}
1843  
1844      /**
1845 <     * runAfterBoth result completes exceptionally after exceptional
1845 >     * thenAcceptBoth result completes exceptionally after exceptional
1846       * completion of either source
1847       */
1848 <    public void testRunAfterBoth_exceptionalCompletion1() {
1754 <        for (ExecutionMode m : ExecutionMode.values())
1755 <        for (Integer v1 : new Integer[] { 1, null })
1756 <    {
1757 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1758 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1759 <        final Noop r = new Noop();
1760 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761 <        final CFException ex = new CFException();
1762 <
1763 <        f.completeExceptionally(ex);
1764 <        checkIncomplete(h);
1765 <        g.complete(v1);
1766 <
1767 <        checkCompletedWithWrappedCFException(h, ex);
1768 <        checkCompletedWithWrappedCFException(f, ex);
1769 <        assertEquals(0, r.invocationCount);
1770 <        checkCompletedNormally(g, v1);
1771 <    }}
1772 <
1773 <    public void testRunAfterBoth_exceptionalCompletion2() {
1774 <        for (ExecutionMode m : ExecutionMode.values())
1775 <        for (Integer v1 : new Integer[] { 1, null })
1776 <    {
1777 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1778 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 <        final Noop r = new Noop();
1780 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1781 <        final CFException ex = new CFException();
1782 <
1783 <        g.completeExceptionally(ex);
1784 <        checkIncomplete(h);
1785 <        f.complete(v1);
1786 <
1787 <        checkCompletedWithWrappedCFException(h, ex);
1788 <        checkCompletedWithWrappedCFException(g, ex);
1789 <        assertEquals(0, r.invocationCount);
1790 <        checkCompletedNormally(f, v1);
1791 <    }}
1792 <
1793 <    public void testRunAfterBoth_exceptionalCompletion3() {
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      {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1799        final Noop r = new Noop();
1856          final CFException ex = new CFException();
1857 <
1858 <        g.completeExceptionally(ex);
1859 <        f.complete(v1);
1860 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1861 <
1862 <        checkCompletedWithWrappedCFException(h, ex);
1863 <        checkCompletedWithWrappedCFException(g, ex);
1864 <        assertEquals(0, r.invocationCount);
1865 <        checkCompletedNormally(f, v1);
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_exceptionalCompletion4() {
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      {
1898          final CompletableFuture<Integer> f = new CompletableFuture<>();
1899          final CompletableFuture<Integer> g = new CompletableFuture<>();
1900 <        final Noop r = new Noop();
1901 <        final CFException ex = new CFException();
1902 <
1903 <        f.completeExceptionally(ex);
1904 <        g.complete(v1);
1905 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1906 <
1907 <        checkCompletedWithWrappedCFException(h, ex);
1908 <        checkCompletedWithWrappedCFException(f, ex);
1909 <        assertEquals(0, r.invocationCount);
1910 <        checkCompletedNormally(g, v1);
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      /**
1932 <     * runAfterBoth result completes exceptionally if action does
1932 >     * thenAcceptBoth result completes exceptionally if action does
1933       */
1934 <    public void testRunAfterBoth_actionFailed1() {
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      {
1940          final CompletableFuture<Integer> f = new CompletableFuture<>();
1941          final CompletableFuture<Integer> g = new CompletableFuture<>();
1942 <        final FailingNoop r = new FailingNoop();
1943 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1944 <
1945 <        f.complete(v1);
1946 <        checkIncomplete(h);
1947 <        g.complete(v2);
1948 <
1949 <        checkCompletedWithWrappedCFException(h);
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      }}
1966  
1967 <    public void testRunAfterBoth_actionFailed2() {
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      {
1977          final CompletableFuture<Integer> f = new CompletableFuture<>();
1978          final CompletableFuture<Integer> g = new CompletableFuture<>();
1979 <        final FailingNoop r = new FailingNoop();
1980 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1981 <
1982 <        g.complete(v2);
1983 <        checkIncomplete(h);
1984 <        f.complete(v1);
1985 <
1986 <        checkCompletedWithWrappedCFException(h);
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      }}
2007  
2008      /**
2009 <     * runAfterBoth result completes exceptionally if either source cancelled
2009 >     * runAfterBoth result completes exceptionally after exceptional
2010 >     * completion of either source
2011       */
2012 <    public void testRunAfterBoth_sourceCancelled1() {
1876 <        for (ExecutionMode m : ExecutionMode.values())
1877 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1878 <        for (Integer v1 : new Integer[] { 1, null })
1879 <    {
1880 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882 <        final Noop r = new Noop();
1883 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1884 <
1885 <        assertTrue(f.cancel(mayInterruptIfRunning));
1886 <        checkIncomplete(h);
1887 <        g.complete(v1);
1888 <
1889 <        checkCompletedWithWrappedCancellationException(h);
1890 <        checkCancelled(f);
1891 <        assertEquals(0, r.invocationCount);
1892 <        checkCompletedNormally(g, v1);
1893 <    }}
1894 <
1895 <    public void testRunAfterBoth_sourceCancelled2() {
1896 <        for (ExecutionMode m : ExecutionMode.values())
1897 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1898 <        for (Integer v1 : new Integer[] { 1, null })
1899 <    {
1900 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902 <        final Noop r = new Noop();
1903 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1904 <
1905 <        assertTrue(g.cancel(mayInterruptIfRunning));
1906 <        checkIncomplete(h);
1907 <        f.complete(v1);
1908 <
1909 <        checkCompletedWithWrappedCancellationException(h);
1910 <        checkCancelled(g);
1911 <        assertEquals(0, r.invocationCount);
1912 <        checkCompletedNormally(f, v1);
1913 <    }}
1914 <
1915 <    public void testRunAfterBoth_sourceCancelled3() {
2012 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2013          for (ExecutionMode m : ExecutionMode.values())
2014 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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<>();
2020 <        final Noop r = new Noop();
2021 <
2022 <        assertTrue(g.cancel(mayInterruptIfRunning));
2023 <        f.complete(v1);
2024 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2025 <
2026 <        checkCompletedWithWrappedCancellationException(h);
2027 <        checkCancelled(g);
2028 <        assertEquals(0, r.invocationCount);
2029 <        checkCompletedNormally(f, v1);
2020 >        final CFException ex = new CFException();
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 <    public void testRunAfterBoth_sourceCancelled4() {
2052 >    /**
2053 >     * runAfterBoth result completes exceptionally if either source cancelled
2054 >     */
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      {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final Noop r = new Noop();
2065 <
2066 <        assertTrue(f.cancel(mayInterruptIfRunning));
2067 <        g.complete(v1);
2068 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2069 <
2070 <        checkCompletedWithWrappedCancellationException(h);
2071 <        checkCancelled(f);
2072 <        assertEquals(0, r.invocationCount);
2073 <        checkCompletedNormally(g, v1);
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 <     * applyToEither result completes normally after normal completion
1955 <     * of either source
2096 >     * runAfterBoth result completes exceptionally if action does
2097       */
2098 <    public void testApplyToEither_normalCompletion1() {
2098 >    public void testRunAfterBoth_actionFailed() {
2099          for (ExecutionMode m : ExecutionMode.values())
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 IncFunction r = new IncFunction();
2107 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2108 <
2109 <        f.complete(v1);
2110 <        checkCompletedNormally(h, inc(v1));
2111 <        g.complete(v2);
2112 <
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          checkCompletedNormally(g, v2);
1973        checkCompletedNormally(h, inc(v1));
2129      }}
2130  
2131 <    public void testApplyToEither_normalCompletion2() {
2131 >    /**
2132 >     * applyToEither result completes normally after normal completion
2133 >     * of either source
2134 >     */
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      {
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);
1987        checkCompletedNormally(h, inc(v2));
1988        f.complete(v1);
2159  
2160 <        checkCompletedNormally(f, v1);
2161 <        checkCompletedNormally(g, v2);
2162 <        checkCompletedNormally(h, inc(v2));
2163 <        }}
2164 <
2165 <    public void testApplyToEither_normalCompletion3() {
2166 <        for (ExecutionMode m : ExecutionMode.values())
2167 <        for (Integer v1 : new Integer[] { 1, null })
2168 <        for (Integer v2 : new Integer[] { 2, null })
1999 <    {
2000 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 <        final IncFunction r = new IncFunction();
2003 <
2004 <        f.complete(v1);
2005 <        g.complete(v2);
2006 <        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);
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      {
2187          final CompletableFuture<Integer> f = new CompletableFuture<>();
2188          final CompletableFuture<Integer> g = new CompletableFuture<>();
2027        final IncFunction r = new IncFunction();
2028        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);
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 >        }
2218 >        try {
2219 >            assertEquals(inc(v1), h5.join());
2220 >            rs[5].assertValue(inc(v1));
2221 >        } catch (CompletionException ok) {
2222 >            checkCompletedWithWrappedException(h5, ex);
2223 >            rs[5].assertNotInvoked();
2224 >        }
2225 >
2226 >        checkCompletedExceptionally(f, ex);
2227          checkCompletedNormally(g, v1);
2228 <        checkCompletedWithWrappedCFException(f, ex);
2229 <        checkCompletedWithWrappedCFException(h, ex);
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_exceptionalCompletion2() {
2237          for (ExecutionMode m : ExecutionMode.values())
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<>();
2047        final IncFunction r = new IncFunction();
2048        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        g.completeExceptionally(ex);
2248 <        checkCompletedWithWrappedCFException(h, ex);
2249 <        f.complete(v1);
2250 <
2251 <        assertEquals(0, r.invocationCount);
2252 <        checkCompletedNormally(f, v1);
2057 <        checkCompletedWithWrappedCFException(g, ex);
2058 <        checkCompletedWithWrappedCFException(h, ex);
2059 <    }}
2060 <
2061 <    public void testApplyToEither_exceptionalCompletion3() {
2062 <        for (ExecutionMode m : ExecutionMode.values())
2063 <        for (Integer v1 : new Integer[] { 1, null })
2064 <    {
2065 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067 <        final IncFunction r = new IncFunction();
2068 <        final CFException ex = new CFException();
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 <        g.completeExceptionally(ex);
2071 <        f.complete(v1);
2072 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2073 <
2074 <        // unspecified behavior
2075 <        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          }
2083
2084        checkCompletedWithWrappedCFException(g, ex);
2085        checkCompletedNormally(f, v1);
2086    }}
2087
2088    public void testApplyToEither_exceptionalCompletion4() {
2089        for (ExecutionMode m : ExecutionMode.values())
2090        for (Integer v1 : new Integer[] { 1, null })
2091    {
2092        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094        final IncFunction r = new IncFunction();
2095        final CFException ex = new CFException();
2096
2097        f.completeExceptionally(ex);
2098        g.complete(v1);
2099        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2100
2101        // unspecified behavior
2102        Integer v;
2262          try {
2263 <            assertEquals(inc(v1), h.join());
2264 <            assertEquals(1, r.invocationCount);
2263 >            assertEquals(inc(v1), h1.join());
2264 >            rs[1].assertValue(inc(v1));
2265          } catch (CompletionException ok) {
2266 <            checkCompletedWithWrappedCFException(h, ex);
2267 <            assertEquals(0, r.invocationCount);
2266 >            checkCompletedWithWrappedException(h1, ex);
2267 >            rs[1].assertNotInvoked();
2268 >        }
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          }
2283  
2111        checkCompletedWithWrappedCFException(f, ex);
2112        checkCompletedNormally(g, v1);
2113    }}
2114
2115    /**
2116     * applyToEither result completes exceptionally if action does
2117     */
2118    public void testApplyToEither_actionFailed1() {
2119        for (ExecutionMode m : ExecutionMode.values())
2120        for (Integer v1 : new Integer[] { 1, null })
2121        for (Integer v2 : new Integer[] { 2, null })
2122    {
2123        final CompletableFuture<Integer> f = new CompletableFuture<>();
2124        final CompletableFuture<Integer> g = new CompletableFuture<>();
2125        final FailingFunction r = new FailingFunction();
2126        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127
2128        f.complete(v1);
2129        checkCompletedWithWrappedCFException(h);
2130        g.complete(v2);
2131        checkCompletedNormally(f, v1);
2132        checkCompletedNormally(g, v2);
2133    }}
2134
2135    public void testApplyToEither_actionFailed2() {
2136        for (ExecutionMode m : ExecutionMode.values())
2137        for (Integer v1 : new Integer[] { 1, null })
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 FailingFunction r = new FailingFunction();
2143        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144
2145        g.complete(v2);
2146        checkCompletedWithWrappedCFException(h);
2147        f.complete(v1);
2284          checkCompletedNormally(f, v1);
2285 <        checkCompletedNormally(g, v2);
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      {
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);
2170        assertEquals(0, r.invocationCount);
2335          checkCompletedNormally(g, v1);
2336 <        checkCompletedWithWrappedCancellationException(h);
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 (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);
2184 <
2185 <        assertTrue(g.cancel(mayInterruptIfRunning));
2186 <        checkCompletedWithWrappedCancellationException(h);
2187 <        f.complete(v1);
2188 <
2189 <        checkCancelled(g);
2190 <        assertEquals(0, r.invocationCount);
2191 <        checkCompletedNormally(f, v1);
2192 <        checkCompletedWithWrappedCancellationException(h);
2193 <    }}
2194 <
2195 <    public void testApplyToEither_sourceCancelled3() {
2196 <        for (ExecutionMode m : ExecutionMode.values())
2197 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 <        for (Integer v1 : new Integer[] { 1, null })
2199 <    {
2200 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2201 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2202 <        final IncFunction r = new IncFunction();
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 <        f.complete(v1);
2356 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        // unspecified behavior
2209 <        Integer v;
2361 >        // unspecified behavior - both source completions available
2362          try {
2363 <            assertEquals(inc(v1), h.join());
2364 <            assertEquals(1, r.invocationCount);
2363 >            assertEquals(inc(v1), h0.join());
2364 >            rs[0].assertValue(inc(v1));
2365          } catch (CompletionException ok) {
2366 <            checkCompletedWithWrappedCancellationException(h);
2367 <            assertEquals(0, r.invocationCount);
2366 >            checkCompletedWithWrappedCancellationException(h0);
2367 >            rs[0].assertNotInvoked();
2368 >        }
2369 >        try {
2370 >            assertEquals(inc(v1), h1.join());
2371 >            rs[1].assertValue(inc(v1));
2372 >        } catch (CompletionException ok) {
2373 >            checkCompletedWithWrappedCancellationException(h1);
2374 >            rs[1].assertNotInvoked();
2375 >        }
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          }
2217
2218        checkCancelled(g);
2219        checkCompletedNormally(f, v1);
2220    }}
2221
2222    public void testApplyToEither_sourceCancelled4() {
2223        for (ExecutionMode m : ExecutionMode.values())
2224        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225        for (Integer v1 : new Integer[] { 1, null })
2226    {
2227        final CompletableFuture<Integer> f = new CompletableFuture<>();
2228        final CompletableFuture<Integer> g = new CompletableFuture<>();
2229        final IncFunction r = new IncFunction();
2230
2231        assertTrue(f.cancel(mayInterruptIfRunning));
2232        g.complete(v1);
2233        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2234
2235        // unspecified behavior
2236        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);
2391 >        checkCompletedNormally(f, v1);
2392 >        checkCancelled(g);
2393      }}
2394  
2395      /**
2396 <     * acceptEither result completes normally after normal completion
2251 <     * 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      {
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);
2413 <        g.complete(v2);
2414 <
2415 <        checkCompletedNormally(f, v1);
2416 <        checkCompletedNormally(g, v2);
2417 <        checkCompletedNormally(h, null);
2271 <    }}
2272 <
2273 <    public void testAcceptEither_normalCompletion2() {
2274 <        for (ExecutionMode m : ExecutionMode.values())
2275 <        for (Integer v1 : new Integer[] { 1, null })
2276 <        for (Integer v2 : new Integer[] { 2, null })
2277 <    {
2278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 <        final IncAction r = new IncAction();
2281 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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 <        checkCompletedNormally(h, null);
2421 <        assertEquals(inc(v2), r.value);
2422 <        f.complete(v1);
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);
2290        checkCompletedNormally(h, null);
2434      }}
2435  
2436 <    public void testAcceptEither_normalCompletion3() {
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      {
2445          final CompletableFuture<Integer> f = new CompletableFuture<>();
2446          final CompletableFuture<Integer> g = new CompletableFuture<>();
2447 <        final IncAction r = new IncAction();
2447 >        final NoopConsumer[] rs = new NoopConsumer[6];
2448 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2449  
2450 <        f.complete(v1);
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);
2304        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2468  
2469 <        checkCompletedNormally(h, null);
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 >
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)));
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      {
2496          final CompletableFuture<Integer> f = new CompletableFuture<>();
2497          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325        final IncAction r = new IncAction();
2326        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);
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          g.complete(v1);
2517  
2518 <        assertEquals(0, r.invocationCount);
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 >        }
2528 >        try {
2529 >            assertNull(h5.join());
2530 >            rs[5].assertValue(v1);
2531 >        } catch (CompletionException ok) {
2532 >            checkCompletedWithWrappedException(h5, ex);
2533 >            rs[5].assertNotInvoked();
2534 >        }
2535 >
2536 >        checkCompletedExceptionally(f, ex);
2537          checkCompletedNormally(g, v1);
2538 <        checkCompletedWithWrappedCFException(f, ex);
2539 <        checkCompletedWithWrappedCFException(h, ex);
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_exceptionalCompletion2() {
2547          for (ExecutionMode m : ExecutionMode.values())
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<>();
2345        final IncAction r = new IncAction();
2346        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347        final CFException ex = new CFException();
2348
2349        g.completeExceptionally(ex);
2350        checkCompletedWithWrappedCFException(h, ex);
2351        f.complete(v1);
2352
2353        assertEquals(0, r.invocationCount);
2354        checkCompletedNormally(f, v1);
2355        checkCompletedWithWrappedCFException(g, ex);
2356        checkCompletedWithWrappedCFException(h, ex);
2357    }}
2358
2359    public void testAcceptEither_exceptionalCompletion3() {
2360        for (ExecutionMode m : ExecutionMode.values())
2361        for (Integer v1 : new Integer[] { 1, null })
2362    {
2363        final CompletableFuture<Integer> f = new CompletableFuture<>();
2364        final CompletableFuture<Integer> g = new CompletableFuture<>();
2365        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 <        g.completeExceptionally(ex);
2558 <        f.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
2373 <        Integer v;
2564 >        // unspecified behavior - both source completions available
2565          try {
2566 <            assertNull(h.join());
2567 <            assertEquals(1, r.invocationCount);
2377 <            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          }
2382
2383        checkCompletedWithWrappedCFException(g, ex);
2384        checkCompletedNormally(f, v1);
2385    }}
2386
2387    public void testAcceptEither_exceptionalCompletion4() {
2388        for (ExecutionMode m : ExecutionMode.values())
2389        for (Integer v1 : new Integer[] { 1, null })
2390    {
2391        final CompletableFuture<Integer> f = new CompletableFuture<>();
2392        final CompletableFuture<Integer> g = new CompletableFuture<>();
2393        final IncAction r = new IncAction();
2394        final CFException ex = new CFException();
2395
2396        f.completeExceptionally(ex);
2397        g.complete(v1);
2398        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2399
2400        // unspecified behavior
2401        Integer v;
2572          try {
2573 <            assertNull(h.join());
2574 <            assertEquals(1, r.invocationCount);
2405 <            assertEquals(inc(v1), r.value);
2573 >            assertEquals(null, h1.join());
2574 >            rs[1].assertValue(v1);
2575          } catch (CompletionException ok) {
2576 <            checkCompletedWithWrappedCFException(h, ex);
2577 <            assertEquals(0, r.invocationCount);
2576 >            checkCompletedWithWrappedException(h1, ex);
2577 >            rs[1].assertNotInvoked();
2578 >        }
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          }
2593  
2411        checkCompletedWithWrappedCFException(f, ex);
2412        checkCompletedNormally(g, v1);
2413    }}
2414
2415    /**
2416     * acceptEither result completes exceptionally if action does
2417     */
2418    public void testAcceptEither_actionFailed1() {
2419        for (ExecutionMode m : ExecutionMode.values())
2420        for (Integer v1 : new Integer[] { 1, null })
2421        for (Integer v2 : new Integer[] { 2, null })
2422    {
2423        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425        final FailingConsumer r = new FailingConsumer();
2426        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427
2428        f.complete(v1);
2429        checkCompletedWithWrappedCFException(h);
2430        g.complete(v2);
2431        checkCompletedNormally(f, v1);
2432        checkCompletedNormally(g, v2);
2433    }}
2434
2435    public void testAcceptEither_actionFailed2() {
2436        for (ExecutionMode m : ExecutionMode.values())
2437        for (Integer v1 : new Integer[] { 1, null })
2438        for (Integer v2 : new Integer[] { 2, null })
2439    {
2440        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442        final FailingConsumer r = new FailingConsumer();
2443        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444
2445        g.complete(v2);
2446        checkCompletedWithWrappedCFException(h);
2447        f.complete(v1);
2594          checkCompletedNormally(f, v1);
2595 <        checkCompletedNormally(g, v2);
2595 >        checkCompletedExceptionally(g, ex);
2596      }}
2597  
2598      /**
2599       * acceptEither result completes exceptionally if either source cancelled
2600       */
2601 <    public void testAcceptEither_sourceCancelled1() {
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      {
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(f.cancel(mayInterruptIfRunning));
2612 <        checkCompletedWithWrappedCancellationException(h);
2613 <        g.complete(v1);
2614 <
2615 <        checkCancelled(f);
2616 <        assertEquals(0, r.invocationCount);
2617 <        checkCompletedNormally(g, v1);
2618 <        checkCompletedWithWrappedCancellationException(h);
2619 <    }}
2620 <
2621 <    public void testAcceptEither_sourceCancelled2() {
2622 <        for (ExecutionMode m : ExecutionMode.values())
2623 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2478 <        for (Integer v1 : new Integer[] { 1, null })
2479 <    {
2480 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2481 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2482 <        final IncAction r = new IncAction();
2483 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2484 <
2485 <        assertTrue(g.cancel(mayInterruptIfRunning));
2486 <        checkCompletedWithWrappedCancellationException(h);
2487 <        f.complete(v1);
2488 <
2489 <        checkCancelled(g);
2490 <        assertEquals(0, r.invocationCount);
2491 <        checkCompletedNormally(f, v1);
2492 <        checkCompletedWithWrappedCancellationException(h);
2493 <    }}
2494 <
2495 <    public void testAcceptEither_sourceCancelled3() {
2496 <        for (ExecutionMode m : ExecutionMode.values())
2497 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2498 <        for (Integer v1 : new Integer[] { 1, null })
2499 <    {
2500 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2501 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2502 <        final IncAction r = new IncAction();
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 <        assertTrue(g.cancel(mayInterruptIfRunning));
2505 <        f.complete(v1);
2506 <        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);
2513 <            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          }
2518
2519        checkCancelled(g);
2520        checkCompletedNormally(f, v1);
2521    }}
2522
2523    public void testAcceptEither_sourceCancelled4() {
2524        for (ExecutionMode m : ExecutionMode.values())
2525        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526        for (Integer v1 : new Integer[] { 1, null })
2527    {
2528        final CompletableFuture<Integer> f = new CompletableFuture<>();
2529        final CompletableFuture<Integer> g = new CompletableFuture<>();
2530        final IncAction r = new IncAction();
2531
2532        assertTrue(f.cancel(mayInterruptIfRunning));
2533        g.complete(v1);
2534        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535
2536        // unspecified behavior
2537        Integer v;
2637          try {
2638 <            assertNull(h.join());
2639 <            assertEquals(1, r.invocationCount);
2541 <            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 +        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
2553 <     * 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      {
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);
2572        checkCompletedNormally(h, null);
2573        assertEquals(1, r.invocationCount);
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 +        for (boolean pushNop : new boolean[] { true, false })
2704      {
2705          final CompletableFuture<Integer> f = new CompletableFuture<>();
2706          final CompletableFuture<Integer> g = new CompletableFuture<>();
2707 <        final Noop r = new Noop();
2708 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2707 >        final Noop[] rs = new Noop[6];
2708 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2709  
2710 <        g.complete(v2);
2711 <        checkCompletedNormally(h, null);
2712 <        assertEquals(1, r.invocationCount);
2710 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2711 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2712 >        checkIncomplete(h0);
2713 >        checkIncomplete(h1);
2714 >        rs[0].assertNotInvoked();
2715 >        rs[1].assertNotInvoked();
2716 >        if (pushNop) {          // ad hoc test of intra-completion interference
2717 >            m.thenRun(f, () -> {});
2718 >            m.thenRun(g, () -> {});
2719 >        }
2720          f.complete(v1);
2721 +        checkCompletedNormally(h0, null);
2722 +        checkCompletedNormally(h1, null);
2723 +        rs[0].assertInvoked();
2724 +        rs[1].assertInvoked();
2725 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2726 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2727 +        checkCompletedNormally(h2, null);
2728 +        checkCompletedNormally(h3, null);
2729 +        rs[2].assertInvoked();
2730 +        rs[3].assertInvoked();
2731  
2591        checkCompletedNormally(f, v1);
2592        checkCompletedNormally(g, v2);
2593        checkCompletedNormally(h, null);
2594        assertEquals(1, r.invocationCount);
2595        }}
2596
2597    public void testRunAfterEither_normalCompletion3() {
2598        for (ExecutionMode m : ExecutionMode.values())
2599        for (Integer v1 : new Integer[] { 1, null })
2600        for (Integer v2 : new Integer[] { 2, null })
2601    {
2602        final CompletableFuture<Integer> f = new CompletableFuture<>();
2603        final CompletableFuture<Integer> g = new CompletableFuture<>();
2604        final Noop r = new Noop();
2605
2606        f.complete(v1);
2732          g.complete(v2);
2608        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2733  
2734 <        checkCompletedNormally(h, null);
2734 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2735 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2736 >
2737          checkCompletedNormally(f, v1);
2738          checkCompletedNormally(g, v2);
2739 <        assertEquals(1, r.invocationCount);
2739 >        checkCompletedNormally(h0, null);
2740 >        checkCompletedNormally(h1, null);
2741 >        checkCompletedNormally(h2, null);
2742 >        checkCompletedNormally(h3, null);
2743 >        checkCompletedNormally(h4, null);
2744 >        checkCompletedNormally(h5, null);
2745 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2746      }}
2747  
2748      /**
2749       * runAfterEither result completes exceptionally after exceptional
2750       * completion of either source
2751       */
2752 <    public void testRunAfterEither_exceptionalCompletion1() {
2752 >    public void testRunAfterEither_exceptionalCompletion() {
2753          for (ExecutionMode m : ExecutionMode.values())
2754          for (Integer v1 : new Integer[] { 1, null })
2755      {
2756          final CompletableFuture<Integer> f = new CompletableFuture<>();
2757          final CompletableFuture<Integer> g = new CompletableFuture<>();
2626        final Noop r = new Noop();
2627        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2758          final CFException ex = new CFException();
2759 +        final Noop[] rs = new Noop[6];
2760 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2761  
2762 <        f.completeExceptionally(ex);
2763 <        checkCompletedWithWrappedCFException(h, ex);
2764 <        g.complete(v1);
2762 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2763 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2764 >        checkIncomplete(h0);
2765 >        checkIncomplete(h1);
2766 >        rs[0].assertNotInvoked();
2767 >        rs[1].assertNotInvoked();
2768 >        assertTrue(f.completeExceptionally(ex));
2769 >        checkCompletedWithWrappedException(h0, ex);
2770 >        checkCompletedWithWrappedException(h1, ex);
2771 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2772 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2773 >        checkCompletedWithWrappedException(h2, ex);
2774 >        checkCompletedWithWrappedException(h3, ex);
2775 >
2776 >        assertTrue(g.complete(v1));
2777 >
2778 >        // unspecified behavior - both source completions available
2779 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2780 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2781 >        try {
2782 >            assertNull(h4.join());
2783 >            rs[4].assertInvoked();
2784 >        } catch (CompletionException ok) {
2785 >            checkCompletedWithWrappedException(h4, ex);
2786 >            rs[4].assertNotInvoked();
2787 >        }
2788 >        try {
2789 >            assertNull(h5.join());
2790 >            rs[5].assertInvoked();
2791 >        } catch (CompletionException ok) {
2792 >            checkCompletedWithWrappedException(h5, ex);
2793 >            rs[5].assertNotInvoked();
2794 >        }
2795  
2796 <        assertEquals(0, r.invocationCount);
2796 >        checkCompletedExceptionally(f, ex);
2797          checkCompletedNormally(g, v1);
2798 <        checkCompletedWithWrappedCFException(f, ex);
2799 <        checkCompletedWithWrappedCFException(h, ex);
2798 >        checkCompletedWithWrappedException(h0, ex);
2799 >        checkCompletedWithWrappedException(h1, ex);
2800 >        checkCompletedWithWrappedException(h2, ex);
2801 >        checkCompletedWithWrappedException(h3, ex);
2802 >        checkCompletedWithWrappedException(h4, ex);
2803 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2804      }}
2805  
2806      public void testRunAfterEither_exceptionalCompletion2() {
2807          for (ExecutionMode m : ExecutionMode.values())
2808 +        for (boolean fFirst : new boolean[] { true, false })
2809          for (Integer v1 : new Integer[] { 1, null })
2810      {
2811          final CompletableFuture<Integer> f = new CompletableFuture<>();
2812          final CompletableFuture<Integer> g = new CompletableFuture<>();
2646        final Noop r = new Noop();
2647        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2648        final CFException ex = new CFException();
2649
2650        g.completeExceptionally(ex);
2651        checkCompletedWithWrappedCFException(h, ex);
2652        f.complete(v1);
2653
2654        assertEquals(0, r.invocationCount);
2655        checkCompletedNormally(f, v1);
2656        checkCompletedWithWrappedCFException(g, ex);
2657        checkCompletedWithWrappedCFException(h, ex);
2658    }}
2659
2660    public void testRunAfterEither_exceptionalCompletion3() {
2661        for (ExecutionMode m : ExecutionMode.values())
2662        for (Integer v1 : new Integer[] { 1, null })
2663    {
2664        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665        final CompletableFuture<Integer> g = new CompletableFuture<>();
2666        final Noop r = new Noop();
2813          final CFException ex = new CFException();
2814 +        final Noop[] rs = new Noop[6];
2815 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2816  
2817 <        g.completeExceptionally(ex);
2818 <        f.complete(v1);
2819 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2817 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2818 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2819 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2820 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2821 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2822 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2823  
2824 <        // unspecified behavior
2674 <        Integer v;
2824 >        // unspecified behavior - both source completions available
2825          try {
2826 <            assertNull(h.join());
2827 <            assertEquals(1, r.invocationCount);
2826 >            assertEquals(null, h0.join());
2827 >            rs[0].assertInvoked();
2828          } catch (CompletionException ok) {
2829 <            checkCompletedWithWrappedCFException(h, ex);
2830 <            assertEquals(0, r.invocationCount);
2829 >            checkCompletedWithWrappedException(h0, ex);
2830 >            rs[0].assertNotInvoked();
2831          }
2682
2683        checkCompletedWithWrappedCFException(g, ex);
2684        checkCompletedNormally(f, v1);
2685    }}
2686
2687    public void testRunAfterEither_exceptionalCompletion4() {
2688        for (ExecutionMode m : ExecutionMode.values())
2689        for (Integer v1 : new Integer[] { 1, null })
2690    {
2691        final CompletableFuture<Integer> f = new CompletableFuture<>();
2692        final CompletableFuture<Integer> g = new CompletableFuture<>();
2693        final Noop r = new Noop();
2694        final CFException ex = new CFException();
2695
2696        f.completeExceptionally(ex);
2697        g.complete(v1);
2698        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699
2700        // unspecified behavior
2701        Integer v;
2832          try {
2833 <            assertNull(h.join());
2834 <            assertEquals(1, r.invocationCount);
2833 >            assertEquals(null, h1.join());
2834 >            rs[1].assertInvoked();
2835          } catch (CompletionException ok) {
2836 <            checkCompletedWithWrappedCFException(h, ex);
2837 <            assertEquals(0, r.invocationCount);
2836 >            checkCompletedWithWrappedException(h1, ex);
2837 >            rs[1].assertNotInvoked();
2838 >        }
2839 >        try {
2840 >            assertEquals(null, h2.join());
2841 >            rs[2].assertInvoked();
2842 >        } catch (CompletionException ok) {
2843 >            checkCompletedWithWrappedException(h2, ex);
2844 >            rs[2].assertNotInvoked();
2845 >        }
2846 >        try {
2847 >            assertEquals(null, h3.join());
2848 >            rs[3].assertInvoked();
2849 >        } catch (CompletionException ok) {
2850 >            checkCompletedWithWrappedException(h3, ex);
2851 >            rs[3].assertNotInvoked();
2852          }
2853  
2710        checkCompletedWithWrappedCFException(f, ex);
2711        checkCompletedNormally(g, v1);
2712    }}
2713
2714    /**
2715     * runAfterEither result completes exceptionally if action does
2716     */
2717    public void testRunAfterEither_actionFailed1() {
2718        for (ExecutionMode m : ExecutionMode.values())
2719        for (Integer v1 : new Integer[] { 1, null })
2720        for (Integer v2 : new Integer[] { 2, null })
2721    {
2722        final CompletableFuture<Integer> f = new CompletableFuture<>();
2723        final CompletableFuture<Integer> g = new CompletableFuture<>();
2724        final FailingNoop r = new FailingNoop();
2725        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2726
2727        f.complete(v1);
2728        checkCompletedWithWrappedCFException(h);
2729        g.complete(v2);
2730        checkCompletedNormally(f, v1);
2731        checkCompletedNormally(g, v2);
2732    }}
2733
2734    public void testRunAfterEither_actionFailed2() {
2735        for (ExecutionMode m : ExecutionMode.values())
2736        for (Integer v1 : new Integer[] { 1, null })
2737        for (Integer v2 : new Integer[] { 2, null })
2738    {
2739        final CompletableFuture<Integer> f = new CompletableFuture<>();
2740        final CompletableFuture<Integer> g = new CompletableFuture<>();
2741        final FailingNoop r = new FailingNoop();
2742        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2743
2744        g.complete(v2);
2745        checkCompletedWithWrappedCFException(h);
2746        f.complete(v1);
2854          checkCompletedNormally(f, v1);
2855 <        checkCompletedNormally(g, v2);
2855 >        checkCompletedExceptionally(g, ex);
2856      }}
2857  
2858      /**
2859       * runAfterEither result completes exceptionally if either source cancelled
2860       */
2861 <    public void testRunAfterEither_sourceCancelled1() {
2755 <        for (ExecutionMode m : ExecutionMode.values())
2756 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2757 <        for (Integer v1 : new Integer[] { 1, null })
2758 <    {
2759 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2760 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2761 <        final Noop r = new Noop();
2762 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2763 <
2764 <        assertTrue(f.cancel(mayInterruptIfRunning));
2765 <        checkCompletedWithWrappedCancellationException(h);
2766 <        g.complete(v1);
2767 <
2768 <        checkCancelled(f);
2769 <        assertEquals(0, r.invocationCount);
2770 <        checkCompletedNormally(g, v1);
2771 <        checkCompletedWithWrappedCancellationException(h);
2772 <    }}
2773 <
2774 <    public void testRunAfterEither_sourceCancelled2() {
2775 <        for (ExecutionMode m : ExecutionMode.values())
2776 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2777 <        for (Integer v1 : new Integer[] { 1, null })
2778 <    {
2779 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2780 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2781 <        final Noop r = new Noop();
2782 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2783 <
2784 <        assertTrue(g.cancel(mayInterruptIfRunning));
2785 <        checkCompletedWithWrappedCancellationException(h);
2786 <        f.complete(v1);
2787 <
2788 <        checkCancelled(g);
2789 <        assertEquals(0, r.invocationCount);
2790 <        checkCompletedNormally(f, v1);
2791 <        checkCompletedWithWrappedCancellationException(h);
2792 <    }}
2793 <
2794 <    public void testRunAfterEither_sourceCancelled3() {
2861 >    public void testRunAfterEither_sourceCancelled() {
2862          for (ExecutionMode m : ExecutionMode.values())
2863          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2864          for (Integer v1 : new Integer[] { 1, null })
2865      {
2866          final CompletableFuture<Integer> f = new CompletableFuture<>();
2867          final CompletableFuture<Integer> g = new CompletableFuture<>();
2868 <        final Noop r = new Noop();
2869 <
2803 <        assertTrue(g.cancel(mayInterruptIfRunning));
2804 <        f.complete(v1);
2805 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2868 >        final Noop[] rs = new Noop[6];
2869 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2870  
2871 <        // unspecified behavior
2872 <        Integer v;
2871 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2872 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2873 >        checkIncomplete(h0);
2874 >        checkIncomplete(h1);
2875 >        rs[0].assertNotInvoked();
2876 >        rs[1].assertNotInvoked();
2877 >        f.cancel(mayInterruptIfRunning);
2878 >        checkCompletedWithWrappedCancellationException(h0);
2879 >        checkCompletedWithWrappedCancellationException(h1);
2880 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2881 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2882 >        checkCompletedWithWrappedCancellationException(h2);
2883 >        checkCompletedWithWrappedCancellationException(h3);
2884 >
2885 >        assertTrue(g.complete(v1));
2886 >
2887 >        // unspecified behavior - both source completions available
2888 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2889 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2890          try {
2891 <            assertNull(h.join());
2892 <            assertEquals(1, r.invocationCount);
2891 >            assertNull(h4.join());
2892 >            rs[4].assertInvoked();
2893          } catch (CompletionException ok) {
2894 <            checkCompletedWithWrappedCancellationException(h);
2895 <            assertEquals(0, r.invocationCount);
2894 >            checkCompletedWithWrappedCancellationException(h4);
2895 >            rs[4].assertNotInvoked();
2896 >        }
2897 >        try {
2898 >            assertNull(h5.join());
2899 >            rs[5].assertInvoked();
2900 >        } catch (CompletionException ok) {
2901 >            checkCompletedWithWrappedCancellationException(h5);
2902 >            rs[5].assertNotInvoked();
2903          }
2904  
2905 <        checkCancelled(g);
2906 <        checkCompletedNormally(f, v1);
2905 >        checkCancelled(f);
2906 >        checkCompletedNormally(g, v1);
2907 >        checkCompletedWithWrappedCancellationException(h0);
2908 >        checkCompletedWithWrappedCancellationException(h1);
2909 >        checkCompletedWithWrappedCancellationException(h2);
2910 >        checkCompletedWithWrappedCancellationException(h3);
2911 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2912      }}
2913  
2914 <    public void testRunAfterEither_sourceCancelled4() {
2914 >    /**
2915 >     * runAfterEither result completes exceptionally if action does
2916 >     */
2917 >    public void testRunAfterEither_actionFailed() {
2918          for (ExecutionMode m : ExecutionMode.values())
2823        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2919          for (Integer v1 : new Integer[] { 1, null })
2920 +        for (Integer v2 : new Integer[] { 2, null })
2921      {
2922          final CompletableFuture<Integer> f = new CompletableFuture<>();
2923          final CompletableFuture<Integer> g = new CompletableFuture<>();
2924 <        final Noop r = new Noop();
2925 <
2830 <        assertTrue(f.cancel(mayInterruptIfRunning));
2831 <        g.complete(v1);
2832 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2924 >        final FailingRunnable[] rs = new FailingRunnable[6];
2925 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2926  
2927 <        // unspecified behavior
2928 <        Integer v;
2929 <        try {
2930 <            assertNull(h.join());
2931 <            assertEquals(1, r.invocationCount);
2932 <        } catch (CompletionException ok) {
2933 <            checkCompletedWithWrappedCancellationException(h);
2934 <            assertEquals(0, r.invocationCount);
2935 <        }
2927 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2928 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2929 >        assertTrue(f.complete(v1));
2930 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2931 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2932 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2933 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2934 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2935 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2936 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2937 >        assertTrue(g.complete(v2));
2938 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2939 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2940 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2941 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2942  
2943 <        checkCancelled(f);
2944 <        checkCompletedNormally(g, v1);
2943 >        checkCompletedNormally(f, v1);
2944 >        checkCompletedNormally(g, v2);
2945 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2946      }}
2947  
2948      /**
# Line 2854 | Line 2954 | public class CompletableFutureTest exten
2954          for (Integer v1 : new Integer[] { 1, null })
2955      {
2956          final CompletableFuture<Integer> f = new CompletableFuture<>();
2957 <        final CompletableFutureInc r = new CompletableFutureInc();
2958 <        if (!createIncomplete) f.complete(v1);
2959 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2960 <        if (createIncomplete) f.complete(v1);
2957 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2958 >        if (!createIncomplete) assertTrue(f.complete(v1));
2959 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2960 >        if (createIncomplete) assertTrue(f.complete(v1));
2961  
2962          checkCompletedNormally(g, inc(v1));
2963          checkCompletedNormally(f, v1);
2964 <        assertEquals(1, r.invocationCount);
2964 >        r.assertValue(v1);
2965      }}
2966  
2967      /**
# Line 2873 | Line 2973 | public class CompletableFutureTest exten
2973          for (boolean createIncomplete : new boolean[] { true, false })
2974      {
2975          final CFException ex = new CFException();
2976 <        final CompletableFutureInc r = new CompletableFutureInc();
2976 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2977          final CompletableFuture<Integer> f = new CompletableFuture<>();
2978          if (!createIncomplete) f.completeExceptionally(ex);
2979 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2979 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2980          if (createIncomplete) f.completeExceptionally(ex);
2981  
2982 <        checkCompletedWithWrappedCFException(g, ex);
2983 <        checkCompletedWithWrappedCFException(f, ex);
2984 <        assertEquals(0, r.invocationCount);
2982 >        checkCompletedWithWrappedException(g, ex);
2983 >        checkCompletedExceptionally(f, ex);
2984 >        r.assertNotInvoked();
2985      }}
2986  
2987      /**
# Line 2894 | Line 2994 | public class CompletableFutureTest exten
2994      {
2995          final CompletableFuture<Integer> f = new CompletableFuture<>();
2996          final FailingCompletableFutureFunction r
2997 <            = new FailingCompletableFutureFunction();
2998 <        if (!createIncomplete) f.complete(v1);
2999 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3000 <        if (createIncomplete) f.complete(v1);
2997 >            = new FailingCompletableFutureFunction(m);
2998 >        if (!createIncomplete) assertTrue(f.complete(v1));
2999 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3000 >        if (createIncomplete) assertTrue(f.complete(v1));
3001  
3002 <        checkCompletedWithWrappedCFException(g);
3002 >        checkCompletedWithWrappedException(g, r.ex);
3003          checkCompletedNormally(f, v1);
3004      }}
3005  
# Line 2912 | Line 3012 | public class CompletableFutureTest exten
3012          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3013      {
3014          final CompletableFuture<Integer> f = new CompletableFuture<>();
3015 <        final CompletableFutureInc r = new CompletableFutureInc();
3015 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3016          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3017 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3018 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3017 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3018 >        if (createIncomplete) {
3019 >            checkIncomplete(g);
3020 >            assertTrue(f.cancel(mayInterruptIfRunning));
3021 >        }
3022  
3023          checkCompletedWithWrappedCancellationException(g);
3024          checkCancelled(f);
3025      }}
3026  
2924    // asyncs
2925
3027      /**
3028 <     * thenApplyAsync result completes normally after normal completion of source
3028 >     * thenCompose result completes exceptionally if the result of the action does
3029       */
3030 <    public void testThenApplyAsync() {
3031 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3032 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3033 <        f.complete(one);
3034 <        checkCompletedNormally(g, two);
3035 <    }
3036 <
3037 <    /**
3038 <     * thenApplyAsync result completes exceptionally after exceptional
3039 <     * completion of source
3040 <     */
3041 <    public void testThenApplyAsync2() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3044 <        f.completeExceptionally(new CFException());
3045 <        checkCompletedWithWrappedCFException(g);
3046 <    }
3047 <
3048 <    /**
3049 <     * thenApplyAsync result completes exceptionally if action does
3050 <     */
3051 <    public void testThenApplyAsync3() {
3052 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3053 <        FailingFunction r = new FailingFunction();
3054 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3055 <        f.complete(null);
3056 <        checkCompletedWithWrappedCFException(g);
3057 <    }
3058 <
3059 <    /**
3060 <     * thenApplyAsync result completes exceptionally if source cancelled
3061 <     */
3062 <    public void testThenApplyAsync4() {
3063 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3064 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3065 <        assertTrue(f.cancel(true));
3066 <        checkCompletedWithWrappedCancellationException(g);
3067 <    }
3068 <
3069 <    /**
3070 <     * thenAcceptAsync result completes normally after normal
3071 <     * completion of source
3072 <     */
2972 <    public void testThenAcceptAsync() {
2973 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2974 <        IncAction r = new IncAction();
2975 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2976 <        f.complete(one);
2977 <        checkCompletedNormally(g, null);
2978 <        assertEquals(r.value, (Integer) 2);
2979 <    }
2980 <
2981 <    /**
2982 <     * thenAcceptAsync result completes exceptionally after exceptional
2983 <     * completion of source
2984 <     */
2985 <    public void testThenAcceptAsync2() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 <        IncAction r = new IncAction();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989 <        f.completeExceptionally(new CFException());
2990 <        checkCompletedWithWrappedCFException(g);
2991 <    }
2992 <
2993 <    /**
2994 <     * thenAcceptAsync result completes exceptionally if action does
2995 <     */
2996 <    public void testThenAcceptAsync3() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 <        FailingConsumer r = new FailingConsumer();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000 <        f.complete(null);
3001 <        checkCompletedWithWrappedCFException(g);
3002 <    }
3003 <
3004 <    /**
3005 <     * thenAcceptAsync result completes exceptionally if source cancelled
3006 <     */
3007 <    public void testThenAcceptAsync4() {
3008 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3009 <        IncAction r = new IncAction();
3010 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3011 <        assertTrue(f.cancel(true));
3012 <        checkCompletedWithWrappedCancellationException(g);
3013 <    }
3014 <
3015 <    // async with explicit executors
3016 <
3017 <    /**
3018 <     * thenApplyAsync result completes normally after normal completion of source
3019 <     */
3020 <    public void testThenApplyAsyncE() {
3021 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3022 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3023 <        f.complete(one);
3024 <        checkCompletedNormally(g, two);
3025 <    }
3026 <
3027 <    /**
3028 <     * thenApplyAsync result completes exceptionally after exceptional
3029 <     * completion of source
3030 <     */
3031 <    public void testThenApplyAsync2E() {
3032 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3033 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3034 <        f.completeExceptionally(new CFException());
3035 <        checkCompletedWithWrappedCFException(g);
3036 <    }
3037 <
3038 <    /**
3039 <     * thenApplyAsync result completes exceptionally if action does
3040 <     */
3041 <    public void testThenApplyAsync3E() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        FailingFunction r = new FailingFunction();
3044 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3045 <        f.complete(null);
3046 <        checkCompletedWithWrappedCFException(g);
3047 <    }
3048 <
3049 <    /**
3050 <     * thenApplyAsync result completes exceptionally if source cancelled
3051 <     */
3052 <    public void testThenApplyAsync4E() {
3053 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3054 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3055 <        assertTrue(f.cancel(true));
3056 <        checkCompletedWithWrappedCancellationException(g);
3057 <    }
3058 <
3059 <    /**
3060 <     * thenAcceptAsync result completes normally after normal
3061 <     * completion of source
3062 <     */
3063 <    public void testThenAcceptAsyncE() {
3064 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3065 <        IncAction r = new IncAction();
3066 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3067 <        f.complete(one);
3068 <        checkCompletedNormally(g, null);
3069 <        assertEquals(r.value, (Integer) 2);
3070 <    }
3071 <
3072 <    /**
3073 <     * thenAcceptAsync result completes exceptionally after exceptional
3074 <     * completion of source
3075 <     */
3076 <    public void testThenAcceptAsync2E() {
3077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3078 <        IncAction r = new IncAction();
3079 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3080 <        f.completeExceptionally(new CFException());
3081 <        checkCompletedWithWrappedCFException(g);
3082 <    }
3083 <
3084 <    /**
3085 <     * thenAcceptAsync result completes exceptionally if action does
3086 <     */
3087 <    public void testThenAcceptAsync3E() {
3088 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3089 <        FailingConsumer r = new FailingConsumer();
3090 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3091 <        f.complete(null);
3092 <        checkCompletedWithWrappedCFException(g);
3093 <    }
3030 >    public void testThenCompose_actionReturnsFailingFuture() {
3031 >        for (ExecutionMode m : ExecutionMode.values())
3032 >        for (int order = 0; order < 6; order++)
3033 >        for (Integer v1 : new Integer[] { 1, null })
3034 >    {
3035 >        final CFException ex = new CFException();
3036 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3037 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3038 >        final CompletableFuture<Integer> h;
3039 >        // Test all permutations of orders
3040 >        switch (order) {
3041 >        case 0:
3042 >            assertTrue(f.complete(v1));
3043 >            assertTrue(g.completeExceptionally(ex));
3044 >            h = m.thenCompose(f, (x -> g));
3045 >            break;
3046 >        case 1:
3047 >            assertTrue(f.complete(v1));
3048 >            h = m.thenCompose(f, (x -> g));
3049 >            assertTrue(g.completeExceptionally(ex));
3050 >            break;
3051 >        case 2:
3052 >            assertTrue(g.completeExceptionally(ex));
3053 >            assertTrue(f.complete(v1));
3054 >            h = m.thenCompose(f, (x -> g));
3055 >            break;
3056 >        case 3:
3057 >            assertTrue(g.completeExceptionally(ex));
3058 >            h = m.thenCompose(f, (x -> g));
3059 >            assertTrue(f.complete(v1));
3060 >            break;
3061 >        case 4:
3062 >            h = m.thenCompose(f, (x -> g));
3063 >            assertTrue(f.complete(v1));
3064 >            assertTrue(g.completeExceptionally(ex));
3065 >            break;
3066 >        case 5:
3067 >            h = m.thenCompose(f, (x -> g));
3068 >            assertTrue(f.complete(v1));
3069 >            assertTrue(g.completeExceptionally(ex));
3070 >            break;
3071 >        default: throw new AssertionError();
3072 >        }
3073  
3074 <    /**
3075 <     * thenAcceptAsync result completes exceptionally if source cancelled
3076 <     */
3077 <    public void testThenAcceptAsync4E() {
3099 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3100 <        IncAction r = new IncAction();
3101 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3102 <        assertTrue(f.cancel(true));
3103 <        checkCompletedWithWrappedCancellationException(g);
3104 <    }
3074 >        checkCompletedExceptionally(g, ex);
3075 >        checkCompletedWithWrappedException(h, ex);
3076 >        checkCompletedNormally(f, v1);
3077 >    }}
3078  
3079      // other static methods
3080  
# Line 3119 | Line 3092 | public class CompletableFutureTest exten
3092       * when all components complete normally
3093       */
3094      public void testAllOf_normal() throws Exception {
3095 <        for (int k = 1; k < 20; ++k) {
3096 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3097 <            for (int i = 0; i < k; ++i)
3095 >        for (int k = 1; k < 10; k++) {
3096 >            CompletableFuture<Integer>[] fs
3097 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3098 >            for (int i = 0; i < k; i++)
3099 >                fs[i] = new CompletableFuture<>();
3100 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3101 >            for (int i = 0; i < k; i++) {
3102 >                checkIncomplete(f);
3103 >                checkIncomplete(CompletableFuture.allOf(fs));
3104 >                fs[i].complete(one);
3105 >            }
3106 >            checkCompletedNormally(f, null);
3107 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3108 >        }
3109 >    }
3110 >
3111 >    public void testAllOf_normal_backwards() throws Exception {
3112 >        for (int k = 1; k < 10; k++) {
3113 >            CompletableFuture<Integer>[] fs
3114 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3115 >            for (int i = 0; i < k; i++)
3116                  fs[i] = new CompletableFuture<>();
3117              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3118 <            for (int i = 0; i < k; ++i) {
3118 >            for (int i = k - 1; i >= 0; i--) {
3119                  checkIncomplete(f);
3120                  checkIncomplete(CompletableFuture.allOf(fs));
3121                  fs[i].complete(one);
# Line 3134 | Line 3125 | public class CompletableFutureTest exten
3125          }
3126      }
3127  
3128 +    public void testAllOf_exceptional() throws Exception {
3129 +        for (int k = 1; k < 10; k++) {
3130 +            CompletableFuture<Integer>[] fs
3131 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3132 +            CFException ex = new CFException();
3133 +            for (int i = 0; i < k; i++)
3134 +                fs[i] = new CompletableFuture<>();
3135 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3136 +            for (int i = 0; i < k; i++) {
3137 +                checkIncomplete(f);
3138 +                checkIncomplete(CompletableFuture.allOf(fs));
3139 +                if (i != k / 2) {
3140 +                    fs[i].complete(i);
3141 +                    checkCompletedNormally(fs[i], i);
3142 +                } else {
3143 +                    fs[i].completeExceptionally(ex);
3144 +                    checkCompletedExceptionally(fs[i], ex);
3145 +                }
3146 +            }
3147 +            checkCompletedWithWrappedException(f, ex);
3148 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3149 +        }
3150 +    }
3151 +
3152      /**
3153       * anyOf(no component futures) returns an incomplete future
3154       */
3155      public void testAnyOf_empty() throws Exception {
3156 +        for (Integer v1 : new Integer[] { 1, null })
3157 +    {
3158          CompletableFuture<Object> f = CompletableFuture.anyOf();
3159          checkIncomplete(f);
3160 <    }
3160 >
3161 >        f.complete(v1);
3162 >        checkCompletedNormally(f, v1);
3163 >    }}
3164  
3165      /**
3166       * anyOf returns a future completed normally with a value when
3167       * a component future does
3168       */
3169      public void testAnyOf_normal() throws Exception {
3170 <        for (int k = 0; k < 10; ++k) {
3170 >        for (int k = 0; k < 10; k++) {
3171              CompletableFuture[] fs = new CompletableFuture[k];
3172 <            for (int i = 0; i < k; ++i)
3172 >            for (int i = 0; i < k; i++)
3173                  fs[i] = new CompletableFuture<>();
3174              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3175              checkIncomplete(f);
3176 <            for (int i = 0; i < k; ++i) {
3177 <                fs[i].complete(one);
3178 <                checkCompletedNormally(f, one);
3179 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3176 >            for (int i = 0; i < k; i++) {
3177 >                fs[i].complete(i);
3178 >                checkCompletedNormally(f, 0);
3179 >                int x = (int) CompletableFuture.anyOf(fs).join();
3180 >                assertTrue(0 <= x && x <= i);
3181 >            }
3182 >        }
3183 >    }
3184 >    public void testAnyOf_normal_backwards() throws Exception {
3185 >        for (int k = 0; k < 10; k++) {
3186 >            CompletableFuture[] fs = new CompletableFuture[k];
3187 >            for (int i = 0; i < k; i++)
3188 >                fs[i] = new CompletableFuture<>();
3189 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3190 >            checkIncomplete(f);
3191 >            for (int i = k - 1; i >= 0; i--) {
3192 >                fs[i].complete(i);
3193 >                checkCompletedNormally(f, k - 1);
3194 >                int x = (int) CompletableFuture.anyOf(fs).join();
3195 >                assertTrue(i <= x && x <= k - 1);
3196              }
3197          }
3198      }
# Line 3165 | Line 3201 | public class CompletableFutureTest exten
3201       * anyOf result completes exceptionally when any component does.
3202       */
3203      public void testAnyOf_exceptional() throws Exception {
3204 <        for (int k = 0; k < 10; ++k) {
3204 >        for (int k = 0; k < 10; k++) {
3205 >            CompletableFuture[] fs = new CompletableFuture[k];
3206 >            CFException[] exs = new CFException[k];
3207 >            for (int i = 0; i < k; i++) {
3208 >                fs[i] = new CompletableFuture<>();
3209 >                exs[i] = new CFException();
3210 >            }
3211 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3212 >            checkIncomplete(f);
3213 >            for (int i = 0; i < k; i++) {
3214 >                fs[i].completeExceptionally(exs[i]);
3215 >                checkCompletedWithWrappedException(f, exs[0]);
3216 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3217 >            }
3218 >        }
3219 >    }
3220 >
3221 >    public void testAnyOf_exceptional_backwards() throws Exception {
3222 >        for (int k = 0; k < 10; k++) {
3223              CompletableFuture[] fs = new CompletableFuture[k];
3224 <            for (int i = 0; i < k; ++i)
3224 >            CFException[] exs = new CFException[k];
3225 >            for (int i = 0; i < k; i++) {
3226                  fs[i] = new CompletableFuture<>();
3227 +                exs[i] = new CFException();
3228 +            }
3229              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3230              checkIncomplete(f);
3231 <            for (int i = 0; i < k; ++i) {
3232 <                fs[i].completeExceptionally(new CFException());
3233 <                checkCompletedWithWrappedCFException(f);
3231 >            for (int i = k - 1; i >= 0; i--) {
3232 >                fs[i].completeExceptionally(exs[i]);
3233 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3234                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3235              }
3236          }
# Line 3186 | Line 3243 | public class CompletableFutureTest exten
3243          CompletableFuture<Integer> f = new CompletableFuture<>();
3244          CompletableFuture<Integer> g = new CompletableFuture<>();
3245          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3189        CompletableFuture<?> h;
3246          ThreadExecutor exec = new ThreadExecutor();
3247  
3248          Runnable[] throwingActions = {
3249              () -> CompletableFuture.supplyAsync(null),
3250              () -> CompletableFuture.supplyAsync(null, exec),
3251 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3251 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3252  
3253              () -> CompletableFuture.runAsync(null),
3254              () -> CompletableFuture.runAsync(null, exec),
# Line 3265 | Line 3321 | public class CompletableFutureTest exten
3321  
3322              () -> f.thenCompose(null),
3323              () -> f.thenComposeAsync(null),
3324 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3324 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3325              () -> f.thenComposeAsync(null, exec),
3326  
3327              () -> f.exceptionally(null),
# Line 3283 | Line 3339 | public class CompletableFutureTest exten
3339              () -> CompletableFuture.anyOf(null, f),
3340  
3341              () -> f.obtrudeException(null),
3342 +
3343 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3344 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3345 +            () -> CompletableFuture.delayedExecutor(1L, null),
3346 +
3347 +            () -> f.orTimeout(1L, null),
3348 +            () -> f.completeOnTimeout(42, 1L, null),
3349 +
3350 +            () -> CompletableFuture.failedFuture(null),
3351 +            () -> CompletableFuture.failedStage(null),
3352          };
3353  
3354          assertThrows(NullPointerException.class, throwingActions);
# Line 3290 | Line 3356 | public class CompletableFutureTest exten
3356      }
3357  
3358      /**
3359 +     * Test submissions to an executor that rejects all tasks.
3360 +     */
3361 +    public void testRejectingExecutor() {
3362 +        for (Integer v : new Integer[] { 1, null })
3363 +    {
3364 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3365 +
3366 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3367 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3368 +
3369 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3370 +
3371 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3372 +        srcs.add(complete);
3373 +        srcs.add(incomplete);
3374 +
3375 +        for (CompletableFuture<Integer> src : srcs) {
3376 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3377 +            fs.add(src.thenRunAsync(() -> {}, e));
3378 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3379 +            fs.add(src.thenApplyAsync((z) -> z, e));
3380 +
3381 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3382 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3383 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3384 +
3385 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3386 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3387 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3388 +
3389 +            fs.add(src.thenComposeAsync((z) -> null, e));
3390 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3391 +            fs.add(src.handleAsync((z, t) -> null, e));
3392 +
3393 +            for (CompletableFuture<?> future : fs) {
3394 +                if (src.isDone())
3395 +                    checkCompletedWithWrappedException(future, e.ex);
3396 +                else
3397 +                    checkIncomplete(future);
3398 +            }
3399 +            futures.addAll(fs);
3400 +        }
3401 +
3402 +        {
3403 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3404 +
3405 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3406 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3407 +
3408 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3409 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3410 +
3411 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3412 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3413 +
3414 +            for (CompletableFuture<?> future : fs)
3415 +                checkIncomplete(future);
3416 +            futures.addAll(fs);
3417 +        }
3418 +
3419 +        {
3420 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3421 +
3422 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3423 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3424 +
3425 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3426 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3427 +
3428 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3429 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3430 +
3431 +            for (CompletableFuture<?> future : fs)
3432 +                checkCompletedWithWrappedException(future, e.ex);
3433 +            futures.addAll(fs);
3434 +        }
3435 +
3436 +        incomplete.complete(v);
3437 +
3438 +        for (CompletableFuture<?> future : futures)
3439 +            checkCompletedWithWrappedException(future, e.ex);
3440 +
3441 +        assertEquals(futures.size(), e.count.get());
3442 +    }}
3443 +
3444 +    /**
3445 +     * Test submissions to an executor that rejects all tasks, but
3446 +     * should never be invoked because the dependent future is
3447 +     * explicitly completed.
3448 +     */
3449 +    public void testRejectingExecutorNeverInvoked() {
3450 +        for (Integer v : new Integer[] { 1, null })
3451 +    {
3452 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3453 +
3454 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3455 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3456 +
3457 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3458 +
3459 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3460 +        srcs.add(complete);
3461 +        srcs.add(incomplete);
3462 +
3463 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3464 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3465 +        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3466 +        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3467 +
3468 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3469 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3470 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3471 +
3472 +        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3473 +        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3474 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3475 +
3476 +        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3477 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3478 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3479 +
3480 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3481 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3482 +
3483 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3484 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3485 +
3486 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3487 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3488 +
3489 +        for (CompletableFuture<?> future : fs)
3490 +            checkIncomplete(future);
3491 +
3492 +        for (CompletableFuture<?> future : fs)
3493 +            future.complete(null);
3494 +
3495 +        incomplete.complete(v);
3496 +
3497 +        for (CompletableFuture<?> future : fs)
3498 +            checkCompletedNormally(future, null);
3499 +
3500 +        assertEquals(0, e.count.get());
3501 +    }}
3502 +
3503 +    /**
3504       * toCompletableFuture returns this CompletableFuture.
3505       */
3506      public void testToCompletableFuture() {
# Line 3297 | Line 3508 | public class CompletableFutureTest exten
3508          assertSame(f, f.toCompletableFuture());
3509      }
3510  
3511 +    // jdk9
3512 +
3513      /**
3514 <     * whenComplete action executes on normal completion, propagating
3302 <     * source result.
3514 >     * newIncompleteFuture returns an incomplete CompletableFuture
3515       */
3516 <    public void testWhenComplete_normalCompletion1() {
3305 <        for (ExecutionMode m : ExecutionMode.values())
3306 <        for (boolean createIncomplete : new boolean[] { true, false })
3516 >    public void testNewIncompleteFuture() {
3517          for (Integer v1 : new Integer[] { 1, null })
3518      {
3519 <        final AtomicInteger a = new AtomicInteger(0);
3520 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3521 <        if (!createIncomplete) f.complete(v1);
3522 <        final CompletableFuture<Integer> g = m.whenComplete
3523 <            (f,
3314 <             (Integer x, Throwable t) -> {
3315 <                threadAssertSame(x, v1);
3316 <                threadAssertNull(t);
3317 <                a.getAndIncrement();
3318 <            });
3319 <        if (createIncomplete) f.complete(v1);
3320 <
3321 <        checkCompletedNormally(g, v1);
3519 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3520 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3521 >        checkIncomplete(f);
3522 >        checkIncomplete(g);
3523 >        f.complete(v1);
3524          checkCompletedNormally(f, v1);
3525 <        assertEquals(1, a.get());
3525 >        checkIncomplete(g);
3526 >        g.complete(v1);
3527 >        checkCompletedNormally(g, v1);
3528 >        assertSame(g.getClass(), CompletableFuture.class);
3529      }}
3530  
3531      /**
3532 <     * whenComplete action executes on exceptional completion, propagating
3328 <     * source result.
3532 >     * completedStage returns a completed CompletionStage
3533       */
3534 <    public void testWhenComplete_exceptionalCompletion() {
3535 <        for (ExecutionMode m : ExecutionMode.values())
3536 <        for (boolean createIncomplete : new boolean[] { true, false })
3534 >    public void testCompletedStage() {
3535 >        AtomicInteger x = new AtomicInteger(0);
3536 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3537 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3538 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3539 >        assertEquals(x.get(), 1);
3540 >        assertNull(r.get());
3541 >    }
3542 >
3543 >    /**
3544 >     * defaultExecutor by default returns the commonPool if
3545 >     * it supports more than one thread.
3546 >     */
3547 >    public void testDefaultExecutor() {
3548 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3549 >        Executor e = f.defaultExecutor();
3550 >        Executor c = ForkJoinPool.commonPool();
3551 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3552 >            assertSame(e, c);
3553 >        else
3554 >            assertNotSame(e, c);
3555 >    }
3556 >
3557 >    /**
3558 >     * failedFuture returns a CompletableFuture completed
3559 >     * exceptionally with the given Exception
3560 >     */
3561 >    public void testFailedFuture() {
3562 >        CFException ex = new CFException();
3563 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3564 >        checkCompletedExceptionally(f, ex);
3565 >    }
3566 >
3567 >    /**
3568 >     * failedFuture(null) throws NPE
3569 >     */
3570 >    public void testFailedFuture_null() {
3571 >        try {
3572 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3573 >            shouldThrow();
3574 >        } catch (NullPointerException success) {}
3575 >    }
3576 >
3577 >    /**
3578 >     * copy returns a CompletableFuture that is completed normally,
3579 >     * with the same value, when source is.
3580 >     */
3581 >    public void testCopy() {
3582 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3583 >        CompletableFuture<Integer> g = f.copy();
3584 >        checkIncomplete(f);
3585 >        checkIncomplete(g);
3586 >        f.complete(1);
3587 >        checkCompletedNormally(f, 1);
3588 >        checkCompletedNormally(g, 1);
3589 >    }
3590 >
3591 >    /**
3592 >     * copy returns a CompletableFuture that is completed exceptionally
3593 >     * when source is.
3594 >     */
3595 >    public void testCopy2() {
3596 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3597 >        CompletableFuture<Integer> g = f.copy();
3598 >        checkIncomplete(f);
3599 >        checkIncomplete(g);
3600 >        CFException ex = new CFException();
3601 >        f.completeExceptionally(ex);
3602 >        checkCompletedExceptionally(f, ex);
3603 >        checkCompletedWithWrappedException(g, ex);
3604 >    }
3605 >
3606 >    /**
3607 >     * minimalCompletionStage returns a CompletableFuture that is
3608 >     * completed normally, with the same value, when source is.
3609 >     */
3610 >    public void testMinimalCompletionStage() {
3611 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3612 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3613 >        AtomicInteger x = new AtomicInteger(0);
3614 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3615 >        checkIncomplete(f);
3616 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3617 >        f.complete(1);
3618 >        checkCompletedNormally(f, 1);
3619 >        assertEquals(x.get(), 1);
3620 >        assertNull(r.get());
3621 >    }
3622 >
3623 >    /**
3624 >     * minimalCompletionStage returns a CompletableFuture that is
3625 >     * completed exceptionally when source is.
3626 >     */
3627 >    public void testMinimalCompletionStage2() {
3628 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3629 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3630 >        AtomicInteger x = new AtomicInteger(0);
3631 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3632 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3633 >        checkIncomplete(f);
3634 >        CFException ex = new CFException();
3635 >        f.completeExceptionally(ex);
3636 >        checkCompletedExceptionally(f, ex);
3637 >        assertEquals(x.get(), 0);
3638 >        assertEquals(r.get().getCause(), ex);
3639 >    }
3640 >
3641 >    /**
3642 >     * failedStage returns a CompletionStage completed
3643 >     * exceptionally with the given Exception
3644 >     */
3645 >    public void testFailedStage() {
3646 >        CFException ex = new CFException();
3647 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3648 >        AtomicInteger x = new AtomicInteger(0);
3649 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3650 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3651 >        assertEquals(x.get(), 0);
3652 >        assertEquals(r.get(), ex);
3653 >    }
3654 >
3655 >    /**
3656 >     * completeAsync completes with value of given supplier
3657 >     */
3658 >    public void testCompleteAsync() {
3659          for (Integer v1 : new Integer[] { 1, null })
3660      {
3661 <        final AtomicInteger a = new AtomicInteger(0);
3662 <        final CFException ex = new CFException();
3663 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3664 <        if (!createIncomplete) f.completeExceptionally(ex);
3339 <        final CompletableFuture<Integer> g = m.whenComplete
3340 <            (f,
3341 <             (Integer x, Throwable t) -> {
3342 <                threadAssertNull(x);
3343 <                threadAssertSame(t, ex);
3344 <                a.getAndIncrement();
3345 <            });
3346 <        if (createIncomplete) f.completeExceptionally(ex);
3347 <        checkCompletedWithWrappedCFException(f, ex);
3348 <        checkCompletedWithWrappedCFException(g, ex);
3349 <        assertEquals(1, a.get());
3661 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3662 >        f.completeAsync(() -> v1);
3663 >        f.join();
3664 >        checkCompletedNormally(f, v1);
3665      }}
3666  
3667      /**
3668 <     * whenComplete action executes on cancelled source, propagating
3354 <     * CancellationException.
3668 >     * completeAsync completes exceptionally if given supplier throws
3669       */
3670 <    public void testWhenComplete_sourceCancelled() {
3671 <        for (ExecutionMode m : ExecutionMode.values())
3672 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3673 <        for (boolean createIncomplete : new boolean[] { true, false })
3670 >    public void testCompleteAsync2() {
3671 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3672 >        CFException ex = new CFException();
3673 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3674 >        try {
3675 >            f.join();
3676 >            shouldThrow();
3677 >        } catch (CompletionException success) {}
3678 >        checkCompletedWithWrappedException(f, ex);
3679 >    }
3680 >
3681 >    /**
3682 >     * completeAsync with given executor completes with value of given supplier
3683 >     */
3684 >    public void testCompleteAsync3() {
3685 >        for (Integer v1 : new Integer[] { 1, null })
3686      {
3687 <        final AtomicInteger a = new AtomicInteger(0);
3688 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3689 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3690 <        final CompletableFuture<Integer> g = m.whenComplete
3691 <            (f,
3692 <             (Integer x, Throwable t) -> {
3693 <                threadAssertNull(x);
3368 <                threadAssertTrue(t instanceof CancellationException);
3369 <                a.getAndIncrement();
3370 <            });
3371 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3687 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3688 >        ThreadExecutor executor = new ThreadExecutor();
3689 >        f.completeAsync(() -> v1, executor);
3690 >        assertSame(v1, f.join());
3691 >        checkCompletedNormally(f, v1);
3692 >        assertEquals(1, executor.count.get());
3693 >    }}
3694  
3695 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3696 <        checkCompletedWithWrappedCancellationException(g);
3697 <        checkCancelled(f);
3698 <        assertEquals(1, a.get());
3695 >    /**
3696 >     * completeAsync with given executor completes exceptionally if
3697 >     * given supplier throws
3698 >     */
3699 >    public void testCompleteAsync4() {
3700 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3701 >        CFException ex = new CFException();
3702 >        ThreadExecutor executor = new ThreadExecutor();
3703 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3704 >        try {
3705 >            f.join();
3706 >            shouldThrow();
3707 >        } catch (CompletionException success) {}
3708 >        checkCompletedWithWrappedException(f, ex);
3709 >        assertEquals(1, executor.count.get());
3710 >    }
3711 >
3712 >    /**
3713 >     * orTimeout completes with TimeoutException if not complete
3714 >     */
3715 >    public void testOrTimeout_timesOut() {
3716 >        long timeoutMillis = timeoutMillis();
3717 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3718 >        long startTime = System.nanoTime();
3719 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3720 >        checkCompletedWithTimeoutException(f);
3721 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3722 >    }
3723 >
3724 >    /**
3725 >     * orTimeout completes normally if completed before timeout
3726 >     */
3727 >    public void testOrTimeout_completed() {
3728 >        for (Integer v1 : new Integer[] { 1, null })
3729 >    {
3730 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3731 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3732 >        long startTime = System.nanoTime();
3733 >        f.complete(v1);
3734 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3735 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3736 >        g.complete(v1);
3737 >        checkCompletedNormally(f, v1);
3738 >        checkCompletedNormally(g, v1);
3739 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3740      }}
3741  
3742      /**
3743 <     * If a whenComplete action throws an exception when triggered by
3381 <     * a normal completion, it completes exceptionally
3743 >     * completeOnTimeout completes with given value if not complete
3744       */
3745 <    public void testWhenComplete_actionFailed() {
3746 <        for (boolean createIncomplete : new boolean[] { true, false })
3747 <        for (ExecutionMode m : ExecutionMode.values())
3745 >    public void testCompleteOnTimeout_timesOut() {
3746 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3747 >                       () -> testCompleteOnTimeout_timesOut(null));
3748 >    }
3749 >
3750 >    /**
3751 >     * completeOnTimeout completes with given value if not complete
3752 >     */
3753 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3754 >        long timeoutMillis = timeoutMillis();
3755 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3756 >        long startTime = System.nanoTime();
3757 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3758 >        assertSame(v, f.join());
3759 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3760 >        f.complete(99);         // should have no effect
3761 >        checkCompletedNormally(f, v);
3762 >    }
3763 >
3764 >    /**
3765 >     * completeOnTimeout has no effect if completed within timeout
3766 >     */
3767 >    public void testCompleteOnTimeout_completed() {
3768          for (Integer v1 : new Integer[] { 1, null })
3769      {
3770 <        final AtomicInteger a = new AtomicInteger(0);
3771 <        final CFException ex = new CFException();
3772 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3773 <        if (!createIncomplete) f.complete(v1);
3774 <        final CompletableFuture<Integer> g = m.whenComplete
3775 <            (f,
3776 <             (Integer x, Throwable t) -> {
3395 <                threadAssertSame(x, v1);
3396 <                threadAssertNull(t);
3397 <                a.getAndIncrement();
3398 <                throw ex;
3399 <            });
3400 <        if (createIncomplete) f.complete(v1);
3770 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3771 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3772 >        long startTime = System.nanoTime();
3773 >        f.complete(v1);
3774 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3775 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3776 >        g.complete(v1);
3777          checkCompletedNormally(f, v1);
3778 <        checkCompletedWithWrappedCFException(g, ex);
3779 <        assertEquals(1, a.get());
3778 >        checkCompletedNormally(g, v1);
3779 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3780      }}
3781  
3782      /**
3783 <     * If a whenComplete action throws an exception when triggered by
3408 <     * a source completion that also throws an exception, the source
3409 <     * exception takes precedence.
3783 >     * delayedExecutor returns an executor that delays submission
3784       */
3785 <    public void testWhenComplete_actionFailedSourceFailed() {
3786 <        for (boolean createIncomplete : new boolean[] { true, false })
3785 >    public void testDelayedExecutor() {
3786 >        testInParallel(() -> testDelayedExecutor(null, null),
3787 >                       () -> testDelayedExecutor(null, 1),
3788 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3789 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3790 >    }
3791 >
3792 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3793 >        long timeoutMillis = timeoutMillis();
3794 >        // Use an "unreasonably long" long timeout to catch lingering threads
3795 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3796 >        final Executor delayer, longDelayer;
3797 >        if (executor == null) {
3798 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3799 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3800 >        } else {
3801 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3802 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3803 >        }
3804 >        long startTime = System.nanoTime();
3805 >        CompletableFuture<Integer> f =
3806 >            CompletableFuture.supplyAsync(() -> v, delayer);
3807 >        CompletableFuture<Integer> g =
3808 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3809 >
3810 >        assertNull(g.getNow(null));
3811 >
3812 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3813 >        long millisElapsed = millisElapsedSince(startTime);
3814 >        assertTrue(millisElapsed >= timeoutMillis);
3815 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3816 >
3817 >        checkCompletedNormally(f, v);
3818 >
3819 >        checkIncomplete(g);
3820 >        assertTrue(g.cancel(true));
3821 >    }
3822 >
3823 >    //--- tests of implementation details; not part of official tck ---
3824 >
3825 >    Object resultOf(CompletableFuture<?> f) {
3826 >        SecurityManager sm = System.getSecurityManager();
3827 >        if (sm != null) {
3828 >            try {
3829 >                System.setSecurityManager(null);
3830 >            } catch (SecurityException giveUp) {
3831 >                return "Reflection not available";
3832 >            }
3833 >        }
3834 >
3835 >        try {
3836 >            java.lang.reflect.Field resultField
3837 >                = CompletableFuture.class.getDeclaredField("result");
3838 >            resultField.setAccessible(true);
3839 >            return resultField.get(f);
3840 >        } catch (Throwable t) {
3841 >            throw new AssertionError(t);
3842 >        } finally {
3843 >            if (sm != null) System.setSecurityManager(sm);
3844 >        }
3845 >    }
3846 >
3847 >    public void testExceptionPropagationReusesResultObject() {
3848 >        if (!testImplementationDetails) return;
3849          for (ExecutionMode m : ExecutionMode.values())
3414        for (Integer v1 : new Integer[] { 1, null })
3850      {
3851 <        final AtomicInteger a = new AtomicInteger(0);
3852 <        final CFException ex1 = new CFException();
3853 <        final CFException ex2 = new CFException();
3419 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3851 >        final CFException ex = new CFException();
3852 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3853 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3854  
3855 <        if (!createIncomplete) f.completeExceptionally(ex1);
3856 <        final CompletableFuture<Integer> g = m.whenComplete
3423 <            (f,
3424 <             (Integer x, Throwable t) -> {
3425 <                threadAssertSame(t, ex1);
3426 <                threadAssertNull(x);
3427 <                a.getAndIncrement();
3428 <                throw ex2;
3429 <            });
3430 <        if (createIncomplete) f.completeExceptionally(ex1);
3855 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3856 >            = new ArrayList<>();
3857  
3858 <        checkCompletedWithWrappedCFException(f, ex1);
3859 <        checkCompletedWithWrappedCFException(g, ex1);
3860 <        assertEquals(1, a.get());
3858 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3859 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3860 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3861 >
3862 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3863 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3864 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3865 >
3866 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3867 >        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3868 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3869 >        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3870 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3871 >        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3872 >
3873 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3874 >
3875 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3876 >
3877 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3878 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3879 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3880 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3881 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3882 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3883 >
3884 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3885 >                 fun : funs) {
3886 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3887 >            f.completeExceptionally(ex);
3888 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3889 >            checkCompletedWithWrappedException(src, ex);
3890 >            CompletableFuture<?> dep = fun.apply(src);
3891 >            checkCompletedWithWrappedException(dep, ex);
3892 >            assertSame(resultOf(src), resultOf(dep));
3893 >        }
3894 >
3895 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3896 >                 fun : funs) {
3897 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3898 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3899 >            CompletableFuture<?> dep = fun.apply(src);
3900 >            f.completeExceptionally(ex);
3901 >            checkCompletedWithWrappedException(src, ex);
3902 >            checkCompletedWithWrappedException(dep, ex);
3903 >            assertSame(resultOf(src), resultOf(dep));
3904 >        }
3905 >
3906 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3907 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3908 >                 fun : funs) {
3909 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3910 >            f.cancel(mayInterruptIfRunning);
3911 >            checkCancelled(f);
3912 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3913 >            checkCompletedWithWrappedCancellationException(src);
3914 >            CompletableFuture<?> dep = fun.apply(src);
3915 >            checkCompletedWithWrappedCancellationException(dep);
3916 >            assertSame(resultOf(src), resultOf(dep));
3917 >        }
3918 >
3919 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3920 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3921 >                 fun : funs) {
3922 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3923 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3924 >            CompletableFuture<?> dep = fun.apply(src);
3925 >            f.cancel(mayInterruptIfRunning);
3926 >            checkCancelled(f);
3927 >            checkCompletedWithWrappedCancellationException(src);
3928 >            checkCompletedWithWrappedCancellationException(dep);
3929 >            assertSame(resultOf(src), resultOf(dep));
3930 >        }
3931      }}
3932  
3933 +    /**
3934 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3935 +     */
3936 +    public void testMinimalCompletionStage_minimality() {
3937 +        if (!testImplementationDetails) return;
3938 +        Function<Method, String> toSignature =
3939 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3940 +        Predicate<Method> isNotStatic =
3941 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3942 +        List<Method> minimalMethods =
3943 +            Stream.of(Object.class, CompletionStage.class)
3944 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3945 +            .filter(isNotStatic)
3946 +            .collect(Collectors.toList());
3947 +        // Methods from CompletableFuture permitted NOT to throw UOE
3948 +        String[] signatureWhitelist = {
3949 +            "newIncompleteFuture[]",
3950 +            "defaultExecutor[]",
3951 +            "minimalCompletionStage[]",
3952 +            "copy[]",
3953 +        };
3954 +        Set<String> permittedMethodSignatures =
3955 +            Stream.concat(minimalMethods.stream().map(toSignature),
3956 +                          Stream.of(signatureWhitelist))
3957 +            .collect(Collectors.toSet());
3958 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3959 +            .filter(isNotStatic)
3960 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3961 +            .collect(Collectors.toList());
3962 +
3963 +        CompletionStage<Integer> minimalStage =
3964 +            new CompletableFuture<Integer>().minimalCompletionStage();
3965 +
3966 +        List<Method> bugs = new ArrayList<>();
3967 +        for (Method method : allMethods) {
3968 +            Class<?>[] parameterTypes = method.getParameterTypes();
3969 +            Object[] args = new Object[parameterTypes.length];
3970 +            // Manufacture boxed primitives for primitive params
3971 +            for (int i = 0; i < args.length; i++) {
3972 +                Class<?> type = parameterTypes[i];
3973 +                if (parameterTypes[i] == boolean.class)
3974 +                    args[i] = false;
3975 +                else if (parameterTypes[i] == int.class)
3976 +                    args[i] = 0;
3977 +                else if (parameterTypes[i] == long.class)
3978 +                    args[i] = 0L;
3979 +            }
3980 +            try {
3981 +                method.invoke(minimalStage, args);
3982 +                bugs.add(method);
3983 +            }
3984 +            catch (java.lang.reflect.InvocationTargetException expected) {
3985 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3986 +                    bugs.add(method);
3987 +                    // expected.getCause().printStackTrace();
3988 +                }
3989 +            }
3990 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3991 +        }
3992 +        if (!bugs.isEmpty())
3993 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3994 +    }
3995 +
3996 +    static class Monad {
3997 +        static class ZeroException extends RuntimeException {
3998 +            public ZeroException() { super("monadic zero"); }
3999 +        }
4000 +        // "return", "unit"
4001 +        static <T> CompletableFuture<T> unit(T value) {
4002 +            return completedFuture(value);
4003 +        }
4004 +        // monadic zero ?
4005 +        static <T> CompletableFuture<T> zero() {
4006 +            return failedFuture(new ZeroException());
4007 +        }
4008 +        // >=>
4009 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4010 +            (Function<T, CompletableFuture<U>> f,
4011 +             Function<U, CompletableFuture<V>> g) {
4012 +            return (x) -> f.apply(x).thenCompose(g);
4013 +        }
4014 +
4015 +        static void assertZero(CompletableFuture<?> f) {
4016 +            try {
4017 +                f.getNow(null);
4018 +                throw new AssertionFailedError("should throw");
4019 +            } catch (CompletionException success) {
4020 +                assertTrue(success.getCause() instanceof ZeroException);
4021 +            }
4022 +        }
4023 +
4024 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4025 +                                           CompletableFuture<T> g) {
4026 +            T fval = null, gval = null;
4027 +            Throwable fex = null, gex = null;
4028 +
4029 +            try { fval = f.get(); }
4030 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4031 +            catch (Throwable ex) { fex = ex; }
4032 +
4033 +            try { gval = g.get(); }
4034 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4035 +            catch (Throwable ex) { gex = ex; }
4036 +
4037 +            if (fex != null || gex != null)
4038 +                assertSame(fex.getClass(), gex.getClass());
4039 +            else
4040 +                assertEquals(fval, gval);
4041 +        }
4042 +
4043 +        static class PlusFuture<T> extends CompletableFuture<T> {
4044 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4045 +        }
4046 +
4047 +        /** Implements "monadic plus". */
4048 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4049 +                                             CompletableFuture<? extends T> g) {
4050 +            PlusFuture<T> plus = new PlusFuture<T>();
4051 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4052 +                try {
4053 +                    if (ex == null) {
4054 +                        if (plus.complete(result))
4055 +                            if (plus.firstFailure.get() != null)
4056 +                                plus.firstFailure.set(null);
4057 +                    }
4058 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4059 +                        if (plus.isDone())
4060 +                            plus.firstFailure.set(null);
4061 +                    }
4062 +                    else {
4063 +                        // first failure has precedence
4064 +                        Throwable first = plus.firstFailure.getAndSet(null);
4065 +
4066 +                        // may fail with "Self-suppression not permitted"
4067 +                        try { first.addSuppressed(ex); }
4068 +                        catch (Exception ignored) {}
4069 +
4070 +                        plus.completeExceptionally(first);
4071 +                    }
4072 +                } catch (Throwable unexpected) {
4073 +                    plus.completeExceptionally(unexpected);
4074 +                }
4075 +            };
4076 +            f.whenComplete(action);
4077 +            g.whenComplete(action);
4078 +            return plus;
4079 +        }
4080 +    }
4081 +
4082 +    /**
4083 +     * CompletableFuture is an additive monad - sort of.
4084 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4085 +     */
4086 +    public void testAdditiveMonad() throws Throwable {
4087 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4088 +        CompletableFuture<Long> zero = Monad.zero();
4089 +
4090 +        // Some mutually non-commutative functions
4091 +        Function<Long, CompletableFuture<Long>> triple
4092 +            = (x) -> Monad.unit(3 * x);
4093 +        Function<Long, CompletableFuture<Long>> inc
4094 +            = (x) -> Monad.unit(x + 1);
4095 +
4096 +        // unit is a right identity: m >>= unit === m
4097 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4098 +                                 inc.apply(5L));
4099 +        // unit is a left identity: (unit x) >>= f === f x
4100 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4101 +                                 inc.apply(5L));
4102 +
4103 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4104 +        Monad.assertFutureEquals(
4105 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4106 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4107 +
4108 +        // The case for CompletableFuture as an additive monad is weaker...
4109 +
4110 +        // zero is a monadic zero
4111 +        Monad.assertZero(zero);
4112 +
4113 +        // left zero: zero >>= f === zero
4114 +        Monad.assertZero(zero.thenCompose(inc));
4115 +        // right zero: f >>= (\x -> zero) === zero
4116 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4117 +
4118 +        // f plus zero === f
4119 +        Monad.assertFutureEquals(Monad.unit(5L),
4120 +                                 Monad.plus(Monad.unit(5L), zero));
4121 +        // zero plus f === f
4122 +        Monad.assertFutureEquals(Monad.unit(5L),
4123 +                                 Monad.plus(zero, Monad.unit(5L)));
4124 +        // zero plus zero === zero
4125 +        Monad.assertZero(Monad.plus(zero, zero));
4126 +        {
4127 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4128 +                                                   Monad.unit(8L));
4129 +            // non-determinism
4130 +            assertTrue(f.get() == 5L || f.get() == 8L);
4131 +        }
4132 +
4133 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4134 +        // f plus godot === f (doesn't wait for godot)
4135 +        Monad.assertFutureEquals(Monad.unit(5L),
4136 +                                 Monad.plus(Monad.unit(5L), godot));
4137 +        // godot plus f === f (doesn't wait for godot)
4138 +        Monad.assertFutureEquals(Monad.unit(5L),
4139 +                                 Monad.plus(godot, Monad.unit(5L)));
4140 +    }
4141 +
4142 +    /**
4143 +     * A single CompletableFuture with many dependents.
4144 +     * A demo of scalability - runtime is O(n).
4145 +     */
4146 +    public void testManyDependents() throws Throwable {
4147 +        final int n = expensiveTests ? 1_000_000 : 10;
4148 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4149 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4150 +        final AtomicInteger count = new AtomicInteger(0);
4151 +        for (int i = 0; i < n; i++) {
4152 +            head.thenRun(() -> count.getAndIncrement());
4153 +            head.thenAccept((x) -> count.getAndIncrement());
4154 +            head.thenApply((x) -> count.getAndIncrement());
4155 +
4156 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4157 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4158 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4159 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4160 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4161 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4162 +
4163 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4164 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4165 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4166 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4167 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4168 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4169 +        }
4170 +        head.complete(null);
4171 +        assertEquals(5 * 3 * n, count.get());
4172 +    }
4173 +
4174 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4175 +    public void testCoCompletionGarbageRetention() throws Throwable {
4176 +        final int n = expensiveTests ? 1_000_000 : 10;
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 +    /*
4217 +     * Tests below currently fail in stress mode due to memory retention.
4218 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
4219 +     */
4220 +
4221 +    /** Checks for garbage retention with anyOf. */
4222 +    public void testAnyOfGarbageRetention() throws Throwable {
4223 +        for (Integer v : new Integer[] { 1, null })
4224 +    {
4225 +        final int n = expensiveTests ? 100_000 : 10;
4226 +        CompletableFuture<Integer>[] fs
4227 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4228 +        for (int i = 0; i < fs.length; i++)
4229 +            fs[i] = new CompletableFuture<>();
4230 +        fs[fs.length - 1].complete(v);
4231 +        for (int i = 0; i < n; i++)
4232 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4233 +    }}
4234 +
4235 +    /** Checks for garbage retention with allOf. */
4236 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4237 +        final int n = expensiveTests ? 100_000 : 10;
4238 +        CompletableFuture<Integer>[] fs
4239 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4240 +        for (int i = 0; i < fs.length; i++)
4241 +            fs[i] = new CompletableFuture<>();
4242 +        for (int i = 0; i < n; i++)
4243 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4244 +    }
4245 +
4246 + //     static <U> U join(CompletionStage<U> stage) {
4247 + //         CompletableFuture<U> f = new CompletableFuture<>();
4248 + //         stage.whenComplete((v, ex) -> {
4249 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4250 + //         });
4251 + //         return f.join();
4252 + //     }
4253 +
4254 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4255 + //         CompletableFuture<U> f = new CompletableFuture<>();
4256 + //         stage.whenComplete((v, ex) -> {
4257 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4258 + //         });
4259 + //         return f.isDone();
4260 + //     }
4261 +
4262 + //     static <U> U join2(CompletionStage<U> stage) {
4263 + //         return stage.toCompletableFuture().copy().join();
4264 + //     }
4265 +
4266 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4267 + //         return stage.toCompletableFuture().copy().isDone();
4268 + //     }
4269 +
4270   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines