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.40 by jsr166, Mon Jun 2 01:11:53 2014 UTC vs.
Revision 1.123 by jsr166, Tue Sep 8 19:45:35 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines