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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines