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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines