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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines