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.57 by jsr166, Mon Jun 2 22:48:50 2014 UTC vs.
Revision 1.95 by jsr166, Wed Jun 25 15:32:10 2014 UTC

# Line 57 | Line 57 | public class CompletableFutureTest exten
57      }
58  
59      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
60 <        try {
61 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
60 >        checkTimedGet(f, value);
61 >
62          try {
63              assertEquals(value, f.join());
64          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 76 | Line 75 | public class CompletableFutureTest exten
75      }
76  
77      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
78 +        long startTime = System.nanoTime();
79 +        long timeoutMillis = LONG_DELAY_MS;
80          try {
81 <            f.get(LONG_DELAY_MS, MILLISECONDS);
81 >            f.get(timeoutMillis, MILLISECONDS);
82              shouldThrow();
83          } catch (ExecutionException success) {
84              assertTrue(success.getCause() instanceof CFException);
85          } catch (Throwable fail) { threadUnexpectedException(fail); }
86 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
87 +
88          try {
89              f.join();
90              shouldThrow();
# Line 105 | Line 108 | public class CompletableFutureTest exten
108          assertTrue(f.toString().contains("[Completed exceptionally]"));
109      }
110  
111 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
112 <                                              CFException ex) {
111 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
112 >                                                      Throwable ex) {
113 >        long startTime = System.nanoTime();
114 >        long timeoutMillis = LONG_DELAY_MS;
115          try {
116 <            f.get(LONG_DELAY_MS, MILLISECONDS);
116 >            f.get(timeoutMillis, MILLISECONDS);
117              shouldThrow();
118          } catch (ExecutionException success) {
119              assertSame(ex, success.getCause());
120          } catch (Throwable fail) { threadUnexpectedException(fail); }
121 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
122 +
123          try {
124              f.join();
125              shouldThrow();
# Line 131 | Line 138 | public class CompletableFutureTest exten
138          } catch (ExecutionException success) {
139              assertSame(ex, success.getCause());
140          } catch (Throwable fail) { threadUnexpectedException(fail); }
141 +
142          assertTrue(f.isDone());
143          assertFalse(f.isCancelled());
144          assertTrue(f.toString().contains("[Completed exceptionally]"));
145      }
146  
147 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
148 +                                                Throwable ex) {
149 +        checkCompletedExceptionallyWithRootCause(f, ex);
150 +        try {
151 +            CompletableFuture<Throwable> spy = f.handle
152 +                ((U u, Throwable t) -> t);
153 +            assertTrue(spy.join() instanceof CompletionException);
154 +            assertSame(ex, spy.join().getCause());
155 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
156 +    }
157 +
158 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
159 +        checkCompletedExceptionallyWithRootCause(f, ex);
160 +        try {
161 +            CompletableFuture<Throwable> spy = f.handle
162 +                ((U u, Throwable t) -> t);
163 +            assertSame(ex, spy.join());
164 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
165 +    }
166 +
167      void checkCancelled(CompletableFuture<?> f) {
168 +        long startTime = System.nanoTime();
169 +        long timeoutMillis = LONG_DELAY_MS;
170          try {
171 <            f.get(LONG_DELAY_MS, MILLISECONDS);
171 >            f.get(timeoutMillis, MILLISECONDS);
172              shouldThrow();
173          } catch (CancellationException success) {
174          } catch (Throwable fail) { threadUnexpectedException(fail); }
175 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
176 +
177          try {
178              f.join();
179              shouldThrow();
# Line 162 | Line 194 | public class CompletableFutureTest exten
194      }
195  
196      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
197 +        long startTime = System.nanoTime();
198 +        long timeoutMillis = LONG_DELAY_MS;
199          try {
200 <            f.get(LONG_DELAY_MS, MILLISECONDS);
200 >            f.get(timeoutMillis, MILLISECONDS);
201              shouldThrow();
202          } catch (ExecutionException success) {
203              assertTrue(success.getCause() instanceof CancellationException);
204          } catch (Throwable fail) { threadUnexpectedException(fail); }
205 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
206 +
207          try {
208              f.join();
209              shouldThrow();
# Line 206 | Line 242 | public class CompletableFutureTest exten
242       * isCancelled, join, get, and getNow
243       */
244      public void testComplete() {
245 +        for (Integer v1 : new Integer[] { 1, null })
246 +    {
247          CompletableFuture<Integer> f = new CompletableFuture<>();
248          checkIncomplete(f);
249 <        f.complete(one);
250 <        checkCompletedNormally(f, one);
251 <    }
249 >        assertTrue(f.complete(v1));
250 >        assertFalse(f.complete(v1));
251 >        checkCompletedNormally(f, v1);
252 >    }}
253  
254      /**
255       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 257 | public class CompletableFutureTest exten
257       */
258      public void testCompleteExceptionally() {
259          CompletableFuture<Integer> f = new CompletableFuture<>();
260 +        CFException ex = new CFException();
261          checkIncomplete(f);
262 <        f.completeExceptionally(new CFException());
263 <        checkCompletedWithWrappedCFException(f);
262 >        f.completeExceptionally(ex);
263 >        checkCompletedExceptionally(f, ex);
264      }
265  
266      /**
# Line 228 | Line 268 | public class CompletableFutureTest exten
268       * methods isDone, isCancelled, join, get, and getNow
269       */
270      public void testCancel() {
271 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
272 +    {
273          CompletableFuture<Integer> f = new CompletableFuture<>();
274          checkIncomplete(f);
275          assertTrue(f.cancel(true));
276 +        assertTrue(f.cancel(true));
277          checkCancelled(f);
278 <    }
278 >    }}
279  
280      /**
281       * obtrudeValue forces completion with given value
# Line 240 | Line 283 | public class CompletableFutureTest exten
283      public void testObtrudeValue() {
284          CompletableFuture<Integer> f = new CompletableFuture<>();
285          checkIncomplete(f);
286 <        f.complete(one);
286 >        assertTrue(f.complete(one));
287          checkCompletedNormally(f, one);
288          f.obtrudeValue(three);
289          checkCompletedNormally(f, three);
# Line 261 | Line 304 | public class CompletableFutureTest exten
304       * obtrudeException forces completion with given exception
305       */
306      public void testObtrudeException() {
307 <        CompletableFuture<Integer> f = new CompletableFuture<>();
308 <        checkIncomplete(f);
309 <        f.complete(one);
310 <        checkCompletedNormally(f, one);
311 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
307 >        for (Integer v1 : new Integer[] { 1, null })
308 >    {
309 >        CFException ex;
310 >        CompletableFuture<Integer> f;
311 >
312          f = new CompletableFuture<>();
313 <        f.obtrudeException(new CFException());
314 <        checkCompletedWithWrappedCFException(f);
313 >        assertTrue(f.complete(v1));
314 >        for (int i = 0; i < 2; i++) {
315 >            f.obtrudeException(ex = new CFException());
316 >            checkCompletedExceptionally(f, ex);
317 >        }
318 >
319          f = new CompletableFuture<>();
320 +        for (int i = 0; i < 2; i++) {
321 +            f.obtrudeException(ex = new CFException());
322 +            checkCompletedExceptionally(f, ex);
323 +        }
324 +
325 +        f = new CompletableFuture<>();
326 +        f.completeExceptionally(ex = new CFException());
327 +        f.obtrudeValue(v1);
328 +        checkCompletedNormally(f, v1);
329 +        f.obtrudeException(ex = new CFException());
330 +        checkCompletedExceptionally(f, ex);
331          f.completeExceptionally(new CFException());
332 <        f.obtrudeValue(four);
333 <        checkCompletedNormally(f, four);
334 <        f.obtrudeException(new CFException());
335 <        checkCompletedWithWrappedCFException(f);
279 <    }
332 >        checkCompletedExceptionally(f, ex);
333 >        assertFalse(f.complete(v1));
334 >        checkCompletedExceptionally(f, ex);
335 >    }}
336  
337      /**
338       * getNumberOfDependents returns number of dependent tasks
339       */
340      public void testGetNumberOfDependents() {
341 +        for (ExecutionMode m : ExecutionMode.values())
342 +        for (Integer v1 : new Integer[] { 1, null })
343 +    {
344          CompletableFuture<Integer> f = new CompletableFuture<>();
345          assertEquals(0, f.getNumberOfDependents());
346 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
346 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
347          assertEquals(1, f.getNumberOfDependents());
348          assertEquals(0, g.getNumberOfDependents());
349 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
349 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
350          assertEquals(2, f.getNumberOfDependents());
351 <        f.complete(1);
351 >        assertEquals(0, h.getNumberOfDependents());
352 >        assertTrue(f.complete(v1));
353          checkCompletedNormally(g, null);
354 +        checkCompletedNormally(h, null);
355          assertEquals(0, f.getNumberOfDependents());
356          assertEquals(0, g.getNumberOfDependents());
357 <    }
357 >        assertEquals(0, h.getNumberOfDependents());
358 >    }}
359  
360      /**
361       * toString indicates current completion state
# Line 304 | Line 366 | public class CompletableFutureTest exten
366          f = new CompletableFuture<String>();
367          assertTrue(f.toString().contains("[Not completed]"));
368  
369 <        f.complete("foo");
369 >        assertTrue(f.complete("foo"));
370          assertTrue(f.toString().contains("[Completed normally]"));
371  
372          f = new CompletableFuture<String>();
373 <        f.completeExceptionally(new IndexOutOfBoundsException());
373 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
374          assertTrue(f.toString().contains("[Completed exceptionally]"));
375 +
376 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
377 +            f = new CompletableFuture<String>();
378 +            assertTrue(f.cancel(mayInterruptIfRunning));
379 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
380 +        }
381      }
382  
383      /**
# Line 320 | Line 388 | public class CompletableFutureTest exten
388          checkCompletedNormally(f, "test");
389      }
390  
391 <    // Choose non-commutative actions for better coverage
391 >    abstract class CheckedAction {
392 >        int invocationCount = 0;
393 >        final ExecutionMode m;
394 >        CheckedAction(ExecutionMode m) { this.m = m; }
395 >        void invoked() {
396 >            m.checkExecutionMode();
397 >            assertEquals(0, invocationCount++);
398 >        }
399 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
400 >        void assertInvoked() { assertEquals(1, invocationCount); }
401 >    }
402  
403 <    // A non-commutative function that handles and produces null values as well.
404 <    static Integer subtract(Integer x, Integer y) {
405 <        return (x == null && y == null) ? null :
406 <            ((x == null) ? 42 : x.intValue())
407 <            - ((y == null) ? 99 : y.intValue());
403 >    abstract class CheckedIntegerAction extends CheckedAction {
404 >        Integer value;
405 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
406 >        void assertValue(Integer expected) {
407 >            assertInvoked();
408 >            assertEquals(expected, value);
409 >        }
410 >    }
411 >
412 >    class IntegerSupplier extends CheckedAction
413 >        implements Supplier<Integer>
414 >    {
415 >        final Integer value;
416 >        IntegerSupplier(ExecutionMode m, Integer value) {
417 >            super(m);
418 >            this.value = value;
419 >        }
420 >        public Integer get() {
421 >            invoked();
422 >            return value;
423 >        }
424      }
425  
426      // A function that handles and produces null values as well.
# Line 334 | Line 428 | public class CompletableFutureTest exten
428          return (x == null) ? null : x + 1;
429      }
430  
431 <    static final Supplier<Integer> supplyOne =
432 <        () -> Integer.valueOf(1);
433 <    static final Function<Integer, Integer> inc =
434 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        Integer value;
431 >    class NoopConsumer extends CheckedIntegerAction
432 >        implements Consumer<Integer>
433 >    {
434 >        NoopConsumer(ExecutionMode m) { super(m); }
435          public void accept(Integer x) {
436 <            invocationCount++;
437 <            value = inc(x);
436 >            invoked();
437 >            value = x;
438          }
439      }
440 <    static final class IncFunction implements Function<Integer,Integer> {
441 <        final ExecutionMode m;
442 <        int invocationCount = 0;
443 <        Integer value;
444 <        IncFunction(ExecutionMode m) { this.m = m; }
440 >
441 >    class IncFunction extends CheckedIntegerAction
442 >        implements Function<Integer,Integer>
443 >    {
444 >        IncFunction(ExecutionMode m) { super(m); }
445          public Integer apply(Integer x) {
446 <            m.checkExecutionMode();
358 <            invocationCount++;
446 >            invoked();
447              return value = inc(x);
448          }
449      }
450 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
451 <        final ExecutionMode m;
452 <        int invocationCount = 0;
453 <        Integer value;
454 <        // Check this action was invoked exactly once when result is computed.
455 <        SubtractAction(ExecutionMode m) { this.m = m; }
450 >
451 >    // Choose non-commutative actions for better coverage
452 >    // A non-commutative function that handles and produces null values as well.
453 >    static Integer subtract(Integer x, Integer y) {
454 >        return (x == null && y == null) ? null :
455 >            ((x == null) ? 42 : x.intValue())
456 >            - ((y == null) ? 99 : y.intValue());
457 >    }
458 >
459 >    class SubtractAction extends CheckedIntegerAction
460 >        implements BiConsumer<Integer, Integer>
461 >    {
462 >        SubtractAction(ExecutionMode m) { super(m); }
463          public void accept(Integer x, Integer y) {
464 <            m.checkExecutionMode();
370 <            invocationCount++;
464 >            invoked();
465              value = subtract(x, y);
466          }
467      }
468 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
469 <        final ExecutionMode m;
470 <        int invocationCount = 0;
471 <        Integer value;
472 <        // Check this action was invoked exactly once when result is computed.
379 <        SubtractFunction(ExecutionMode m) { this.m = m; }
468 >
469 >    class SubtractFunction extends CheckedIntegerAction
470 >        implements BiFunction<Integer, Integer, Integer>
471 >    {
472 >        SubtractFunction(ExecutionMode m) { super(m); }
473          public Integer apply(Integer x, Integer y) {
474 <            m.checkExecutionMode();
382 <            invocationCount++;
474 >            invoked();
475              return value = subtract(x, y);
476          }
477      }
478 <    static final class Noop implements Runnable {
479 <        final ExecutionMode m;
480 <        int invocationCount = 0;
389 <        Noop(ExecutionMode m) { this.m = m; }
478 >
479 >    class Noop extends CheckedAction implements Runnable {
480 >        Noop(ExecutionMode m) { super(m); }
481          public void run() {
482 <            m.checkExecutionMode();
392 <            invocationCount++;
482 >            invoked();
483          }
484      }
485  
486 <    static final class FailingSupplier implements Supplier<Integer> {
487 <        final ExecutionMode m;
488 <        int invocationCount = 0;
489 <        FailingSupplier(ExecutionMode m) { this.m = m; }
486 >    class FailingSupplier extends CheckedAction
487 >        implements Supplier<Integer>
488 >    {
489 >        FailingSupplier(ExecutionMode m) { super(m); }
490          public Integer get() {
491 <            m.checkExecutionMode();
402 <            invocationCount++;
491 >            invoked();
492              throw new CFException();
493          }
494      }
495 <    static final class FailingConsumer implements Consumer<Integer> {
496 <        final ExecutionMode m;
497 <        int invocationCount = 0;
498 <        FailingConsumer(ExecutionMode m) { this.m = m; }
495 >
496 >    class FailingConsumer extends CheckedIntegerAction
497 >        implements Consumer<Integer>
498 >    {
499 >        FailingConsumer(ExecutionMode m) { super(m); }
500          public void accept(Integer x) {
501 <            m.checkExecutionMode();
502 <            invocationCount++;
501 >            invoked();
502 >            value = x;
503              throw new CFException();
504          }
505      }
506 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
507 <        final ExecutionMode m;
508 <        int invocationCount = 0;
509 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
506 >
507 >    class FailingBiConsumer extends CheckedIntegerAction
508 >        implements BiConsumer<Integer, Integer>
509 >    {
510 >        FailingBiConsumer(ExecutionMode m) { super(m); }
511          public void accept(Integer x, Integer y) {
512 <            m.checkExecutionMode();
513 <            invocationCount++;
512 >            invoked();
513 >            value = subtract(x, y);
514              throw new CFException();
515          }
516      }
517 <    static final class FailingFunction implements Function<Integer, Integer> {
518 <        final ExecutionMode m;
519 <        int invocationCount = 0;
520 <        FailingFunction(ExecutionMode m) { this.m = m; }
517 >
518 >    class FailingFunction extends CheckedIntegerAction
519 >        implements Function<Integer, Integer>
520 >    {
521 >        FailingFunction(ExecutionMode m) { super(m); }
522          public Integer apply(Integer x) {
523 <            m.checkExecutionMode();
524 <            invocationCount++;
523 >            invoked();
524 >            value = x;
525              throw new CFException();
526          }
527      }
528 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
529 <        final ExecutionMode m;
530 <        int invocationCount = 0;
531 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
528 >
529 >    class FailingBiFunction extends CheckedIntegerAction
530 >        implements BiFunction<Integer, Integer, Integer>
531 >    {
532 >        FailingBiFunction(ExecutionMode m) { super(m); }
533          public Integer apply(Integer x, Integer y) {
534 <            m.checkExecutionMode();
535 <            invocationCount++;
534 >            invoked();
535 >            value = subtract(x, y);
536              throw new CFException();
537          }
538      }
539 <    static final class FailingRunnable implements Runnable {
540 <        final ExecutionMode m;
541 <        int invocationCount = 0;
449 <        FailingRunnable(ExecutionMode m) { this.m = m; }
539 >
540 >    class FailingRunnable extends CheckedAction implements Runnable {
541 >        FailingRunnable(ExecutionMode m) { super(m); }
542          public void run() {
543 <            m.checkExecutionMode();
452 <            invocationCount++;
543 >            invoked();
544              throw new CFException();
545          }
546      }
547  
548 <    static final class CompletableFutureInc
549 <        implements Function<Integer, CompletableFuture<Integer>> {
550 <        final ExecutionMode m;
551 <        int invocationCount = 0;
552 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
548 >
549 >    class CompletableFutureInc extends CheckedIntegerAction
550 >        implements Function<Integer, CompletableFuture<Integer>>
551 >    {
552 >        CompletableFutureInc(ExecutionMode m) { super(m); }
553          public CompletableFuture<Integer> apply(Integer x) {
554 <            m.checkExecutionMode();
555 <            invocationCount++;
554 >            invoked();
555 >            value = x;
556              CompletableFuture<Integer> f = new CompletableFuture<>();
557 <            f.complete(inc(x));
557 >            assertTrue(f.complete(inc(x)));
558              return f;
559          }
560      }
561  
562 <    static final class FailingCompletableFutureFunction
563 <        implements Function<Integer, CompletableFuture<Integer>> {
564 <        final ExecutionMode m;
565 <        int invocationCount = 0;
475 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
562 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
563 >        implements Function<Integer, CompletableFuture<Integer>>
564 >    {
565 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
566          public CompletableFuture<Integer> apply(Integer x) {
567 <            m.checkExecutionMode();
568 <            invocationCount++;
567 >            invoked();
568 >            value = x;
569              throw new CFException();
570          }
571      }
# Line 496 | Line 586 | public class CompletableFutureTest exten
586  
587      /**
588       * Permits the testing of parallel code for the 3 different
589 <     * execution modes without repeating all the testing code.
589 >     * execution modes without copy/pasting all the test methods.
590       */
591      enum ExecutionMode {
592 <        DEFAULT {
592 >        SYNC {
593              public void checkExecutionMode() {
594 +                assertFalse(ThreadExecutor.startedCurrentThread());
595                  assertNull(ForkJoinTask.getPool());
596              }
597              public CompletableFuture<Void> runAsync(Runnable a) {
598                  throw new UnsupportedOperationException();
599              }
600 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
601 +                throw new UnsupportedOperationException();
602 +            }
603              public <T> CompletableFuture<Void> thenRun
604                  (CompletableFuture<T> f, Runnable a) {
605                  return f.thenRun(a);
# Line 577 | Line 671 | public class CompletableFutureTest exten
671              public CompletableFuture<Void> runAsync(Runnable a) {
672                  return CompletableFuture.runAsync(a);
673              }
674 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
675 +                return CompletableFuture.supplyAsync(a);
676 +            }
677              public <T> CompletableFuture<Void> thenRun
678                  (CompletableFuture<T> f, Runnable a) {
679                  return f.thenRunAsync(a);
# Line 647 | Line 744 | public class CompletableFutureTest exten
744              public CompletableFuture<Void> runAsync(Runnable a) {
745                  return CompletableFuture.runAsync(a, new ThreadExecutor());
746              }
747 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
748 +                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
749 +            }
750              public <T> CompletableFuture<Void> thenRun
751                  (CompletableFuture<T> f, Runnable a) {
752                  return f.thenRunAsync(a, new ThreadExecutor());
# Line 712 | Line 812 | public class CompletableFutureTest exten
812  
813          public abstract void checkExecutionMode();
814          public abstract CompletableFuture<Void> runAsync(Runnable a);
815 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
816          public abstract <T> CompletableFuture<Void> thenRun
817              (CompletableFuture<T> f, Runnable a);
818          public abstract <T> CompletableFuture<Void> thenAccept
# Line 761 | Line 862 | public class CompletableFutureTest exten
862      {
863          final AtomicInteger a = new AtomicInteger(0);
864          final CompletableFuture<Integer> f = new CompletableFuture<>();
865 <        if (!createIncomplete) f.complete(v1);
865 >        if (!createIncomplete) assertTrue(f.complete(v1));
866          final CompletableFuture<Integer> g = f.exceptionally
867              ((Throwable t) -> {
868                  // Should not be called
869                  a.getAndIncrement();
870                  throw new AssertionError();
871              });
872 <        if (createIncomplete) f.complete(v1);
872 >        if (createIncomplete) assertTrue(f.complete(v1));
873  
874          checkCompletedNormally(g, v1);
875          checkCompletedNormally(f, v1);
876          assertEquals(0, a.get());
877      }}
878  
778
879      /**
880       * exceptionally action completes with function value on source
881       * exception
# Line 790 | Line 890 | public class CompletableFutureTest exten
890          if (!createIncomplete) f.completeExceptionally(ex);
891          final CompletableFuture<Integer> g = f.exceptionally
892              ((Throwable t) -> {
893 <                ExecutionMode.DEFAULT.checkExecutionMode();
893 >                ExecutionMode.SYNC.checkExecutionMode();
894                  threadAssertSame(t, ex);
895                  a.getAndIncrement();
896                  return v1;
# Line 812 | Line 912 | public class CompletableFutureTest exten
912          if (!createIncomplete) f.completeExceptionally(ex1);
913          final CompletableFuture<Integer> g = f.exceptionally
914              ((Throwable t) -> {
915 <                ExecutionMode.DEFAULT.checkExecutionMode();
915 >                ExecutionMode.SYNC.checkExecutionMode();
916 >                threadAssertSame(t, ex1);
917 >                a.getAndIncrement();
918 >                throw ex2;
919 >            });
920 >        if (createIncomplete) f.completeExceptionally(ex1);
921 >
922 >        checkCompletedWithWrappedException(g, ex2);
923 >        assertEquals(1, a.get());
924 >    }}
925 >
926 >    /**
927 >     * whenComplete action executes on normal completion, propagating
928 >     * source result.
929 >     */
930 >    public void testWhenComplete_normalCompletion1() {
931 >        for (ExecutionMode m : ExecutionMode.values())
932 >        for (boolean createIncomplete : new boolean[] { true, false })
933 >        for (Integer v1 : new Integer[] { 1, null })
934 >    {
935 >        final AtomicInteger a = new AtomicInteger(0);
936 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
937 >        if (!createIncomplete) assertTrue(f.complete(v1));
938 >        final CompletableFuture<Integer> g = m.whenComplete
939 >            (f,
940 >             (Integer x, Throwable t) -> {
941 >                m.checkExecutionMode();
942 >                threadAssertSame(x, v1);
943 >                threadAssertNull(t);
944 >                a.getAndIncrement();
945 >            });
946 >        if (createIncomplete) assertTrue(f.complete(v1));
947 >
948 >        checkCompletedNormally(g, v1);
949 >        checkCompletedNormally(f, v1);
950 >        assertEquals(1, a.get());
951 >    }}
952 >
953 >    /**
954 >     * whenComplete action executes on exceptional completion, propagating
955 >     * source result.
956 >     */
957 >    public void testWhenComplete_exceptionalCompletion() {
958 >        for (ExecutionMode m : ExecutionMode.values())
959 >        for (boolean createIncomplete : new boolean[] { true, false })
960 >        for (Integer v1 : new Integer[] { 1, null })
961 >    {
962 >        final AtomicInteger a = new AtomicInteger(0);
963 >        final CFException ex = new CFException();
964 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
965 >        if (!createIncomplete) f.completeExceptionally(ex);
966 >        final CompletableFuture<Integer> g = m.whenComplete
967 >            (f,
968 >             (Integer x, Throwable t) -> {
969 >                m.checkExecutionMode();
970 >                threadAssertNull(x);
971 >                threadAssertSame(t, ex);
972 >                a.getAndIncrement();
973 >            });
974 >        if (createIncomplete) f.completeExceptionally(ex);
975 >
976 >        checkCompletedWithWrappedException(g, ex);
977 >        checkCompletedExceptionally(f, ex);
978 >        assertEquals(1, a.get());
979 >    }}
980 >
981 >    /**
982 >     * whenComplete action executes on cancelled source, propagating
983 >     * CancellationException.
984 >     */
985 >    public void testWhenComplete_sourceCancelled() {
986 >        for (ExecutionMode m : ExecutionMode.values())
987 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
988 >        for (boolean createIncomplete : new boolean[] { true, false })
989 >    {
990 >        final AtomicInteger a = new AtomicInteger(0);
991 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
992 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
993 >        final CompletableFuture<Integer> g = m.whenComplete
994 >            (f,
995 >             (Integer x, Throwable t) -> {
996 >                m.checkExecutionMode();
997 >                threadAssertNull(x);
998 >                threadAssertTrue(t instanceof CancellationException);
999 >                a.getAndIncrement();
1000 >            });
1001 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1002 >
1003 >        checkCompletedWithWrappedCancellationException(g);
1004 >        checkCancelled(f);
1005 >        assertEquals(1, a.get());
1006 >    }}
1007 >
1008 >    /**
1009 >     * If a whenComplete action throws an exception when triggered by
1010 >     * a normal completion, it completes exceptionally
1011 >     */
1012 >    public void testWhenComplete_actionFailed() {
1013 >        for (boolean createIncomplete : new boolean[] { true, false })
1014 >        for (ExecutionMode m : ExecutionMode.values())
1015 >        for (Integer v1 : new Integer[] { 1, null })
1016 >    {
1017 >        final AtomicInteger a = new AtomicInteger(0);
1018 >        final CFException ex = new CFException();
1019 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1020 >        if (!createIncomplete) assertTrue(f.complete(v1));
1021 >        final CompletableFuture<Integer> g = m.whenComplete
1022 >            (f,
1023 >             (Integer x, Throwable t) -> {
1024 >                m.checkExecutionMode();
1025 >                threadAssertSame(x, v1);
1026 >                threadAssertNull(t);
1027 >                a.getAndIncrement();
1028 >                throw ex;
1029 >            });
1030 >        if (createIncomplete) assertTrue(f.complete(v1));
1031 >
1032 >        checkCompletedWithWrappedException(g, ex);
1033 >        checkCompletedNormally(f, v1);
1034 >        assertEquals(1, a.get());
1035 >    }}
1036 >
1037 >    /**
1038 >     * If a whenComplete action throws an exception when triggered by
1039 >     * a source completion that also throws an exception, the source
1040 >     * exception takes precedence.
1041 >     */
1042 >    public void testWhenComplete_actionFailedSourceFailed() {
1043 >        for (boolean createIncomplete : new boolean[] { true, false })
1044 >        for (ExecutionMode m : ExecutionMode.values())
1045 >        for (Integer v1 : new Integer[] { 1, null })
1046 >    {
1047 >        final AtomicInteger a = new AtomicInteger(0);
1048 >        final CFException ex1 = new CFException();
1049 >        final CFException ex2 = new CFException();
1050 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1051 >
1052 >        if (!createIncomplete) f.completeExceptionally(ex1);
1053 >        final CompletableFuture<Integer> g = m.whenComplete
1054 >            (f,
1055 >             (Integer x, Throwable t) -> {
1056 >                m.checkExecutionMode();
1057                  threadAssertSame(t, ex1);
1058 +                threadAssertNull(x);
1059                  a.getAndIncrement();
1060                  throw ex2;
1061              });
1062          if (createIncomplete) f.completeExceptionally(ex1);
1063  
1064 <        checkCompletedWithWrappedCFException(g, ex2);
1064 >        checkCompletedWithWrappedException(g, ex1);
1065 >        checkCompletedExceptionally(f, ex1);
1066          assertEquals(1, a.get());
1067      }}
1068  
# Line 834 | Line 1077 | public class CompletableFutureTest exten
1077      {
1078          final CompletableFuture<Integer> f = new CompletableFuture<>();
1079          final AtomicInteger a = new AtomicInteger(0);
1080 <        if (!createIncomplete) f.complete(v1);
1080 >        if (!createIncomplete) assertTrue(f.complete(v1));
1081          final CompletableFuture<Integer> g = m.handle
1082              (f,
1083               (Integer x, Throwable t) -> {
# Line 844 | Line 1087 | public class CompletableFutureTest exten
1087                  a.getAndIncrement();
1088                  return inc(v1);
1089              });
1090 <        if (createIncomplete) f.complete(v1);
1090 >        if (createIncomplete) assertTrue(f.complete(v1));
1091  
1092          checkCompletedNormally(g, inc(v1));
1093          checkCompletedNormally(f, v1);
# Line 876 | Line 1119 | public class CompletableFutureTest exten
1119          if (createIncomplete) f.completeExceptionally(ex);
1120  
1121          checkCompletedNormally(g, v1);
1122 <        checkCompletedWithWrappedCFException(f, ex);
1122 >        checkCompletedExceptionally(f, ex);
1123          assertEquals(1, a.get());
1124      }}
1125  
# Line 932 | Line 1175 | public class CompletableFutureTest exten
1175              });
1176          if (createIncomplete) f.completeExceptionally(ex1);
1177  
1178 <        checkCompletedWithWrappedCFException(g, ex2);
1179 <        checkCompletedWithWrappedCFException(f, ex1);
1178 >        checkCompletedWithWrappedException(g, ex2);
1179 >        checkCompletedExceptionally(f, ex1);
1180          assertEquals(1, a.get());
1181      }}
1182  
# Line 945 | Line 1188 | public class CompletableFutureTest exten
1188          final CompletableFuture<Integer> f = new CompletableFuture<>();
1189          final AtomicInteger a = new AtomicInteger(0);
1190          final CFException ex = new CFException();
1191 <        if (!createIncomplete) f.complete(v1);
1191 >        if (!createIncomplete) assertTrue(f.complete(v1));
1192          final CompletableFuture<Integer> g = m.handle
1193              (f,
1194               (Integer x, Throwable t) -> {
# Line 955 | Line 1198 | public class CompletableFutureTest exten
1198                  a.getAndIncrement();
1199                  throw ex;
1200              });
1201 <        if (createIncomplete) f.complete(v1);
1201 >        if (createIncomplete) assertTrue(f.complete(v1));
1202  
1203 <        checkCompletedWithWrappedCFException(g, ex);
1203 >        checkCompletedWithWrappedException(g, ex);
1204          checkCompletedNormally(f, v1);
1205          assertEquals(1, a.get());
1206      }}
# Line 976 | Line 1219 | public class CompletableFutureTest exten
1219          final CompletableFuture<Void> f = m.runAsync(r);
1220          assertNull(f.join());
1221          checkCompletedNormally(f, null);
1222 <        assertEquals(1, r.invocationCount);
1222 >        r.assertInvoked();
1223      }}
1224  
1225      /**
# Line 992 | Line 1235 | public class CompletableFutureTest exten
1235          final FailingRunnable r = new FailingRunnable(m);
1236          final CompletableFuture<Void> f = m.runAsync(r);
1237          checkCompletedWithWrappedCFException(f);
1238 <        assertEquals(1, r.invocationCount);
1238 >        r.assertInvoked();
1239      }}
1240  
1241      /**
1242       * supplyAsync completes with result of supplier
1243       */
1244 <    public void testSupplyAsync() {
1245 <        CompletableFuture<Integer> f;
1246 <        f = CompletableFuture.supplyAsync(supplyOne);
1247 <        assertEquals(f.join(), one);
1248 <        checkCompletedNormally(f, one);
1249 <    }
1250 <
1251 <    /**
1252 <     * supplyAsync with executor completes with result of supplier
1253 <     */
1254 <    public void testSupplyAsync2() {
1255 <        CompletableFuture<Integer> f;
1256 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1257 <        assertEquals(f.join(), one);
1015 <        checkCompletedNormally(f, one);
1016 <    }
1244 >    public void testSupplyAsync_normalCompletion() {
1245 >        ExecutionMode[] executionModes = {
1246 >            ExecutionMode.ASYNC,
1247 >            ExecutionMode.EXECUTOR,
1248 >        };
1249 >        for (ExecutionMode m : executionModes)
1250 >        for (Integer v1 : new Integer[] { 1, null })
1251 >    {
1252 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1253 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1254 >        assertSame(v1, f.join());
1255 >        checkCompletedNormally(f, v1);
1256 >        r.assertInvoked();
1257 >    }}
1258  
1259      /**
1260       * Failing supplyAsync completes exceptionally
1261       */
1262 <    public void testSupplyAsync3() {
1263 <        FailingSupplier r = new FailingSupplier(ExecutionMode.ASYNC);
1264 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1262 >    public void testSupplyAsync_exceptionalCompletion() {
1263 >        ExecutionMode[] executionModes = {
1264 >            ExecutionMode.ASYNC,
1265 >            ExecutionMode.EXECUTOR,
1266 >        };
1267 >        for (ExecutionMode m : executionModes)
1268 >    {
1269 >        FailingSupplier r = new FailingSupplier(m);
1270 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1271          checkCompletedWithWrappedCFException(f);
1272 <        assertEquals(1, r.invocationCount);
1273 <    }
1272 >        r.assertInvoked();
1273 >    }}
1274  
1275      // seq completion methods
1276  
# Line 1032 | Line 1279 | public class CompletableFutureTest exten
1279       */
1280      public void testThenRun_normalCompletion() {
1281          for (ExecutionMode m : ExecutionMode.values())
1035        for (boolean createIncomplete : new boolean[] { true, false })
1282          for (Integer v1 : new Integer[] { 1, null })
1283      {
1284          final CompletableFuture<Integer> f = new CompletableFuture<>();
1285 <        final Noop r = new Noop(m);
1286 <        if (!createIncomplete) f.complete(v1);
1041 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1042 <        if (createIncomplete) {
1043 <            checkIncomplete(g);
1044 <            f.complete(v1);
1045 <        }
1285 >        final Noop[] rs = new Noop[6];
1286 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1287  
1288 <        checkCompletedNormally(g, null);
1288 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1289 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1290 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1291 >        checkIncomplete(h0);
1292 >        checkIncomplete(h1);
1293 >        checkIncomplete(h2);
1294 >        assertTrue(f.complete(v1));
1295 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1296 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1297 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1298 >
1299 >        checkCompletedNormally(h0, null);
1300 >        checkCompletedNormally(h1, null);
1301 >        checkCompletedNormally(h2, null);
1302 >        checkCompletedNormally(h3, null);
1303 >        checkCompletedNormally(h4, null);
1304 >        checkCompletedNormally(h5, null);
1305          checkCompletedNormally(f, v1);
1306 <        assertEquals(1, r.invocationCount);
1306 >        for (Noop r : rs) r.assertInvoked();
1307      }}
1308  
1309      /**
# Line 1055 | Line 1312 | public class CompletableFutureTest exten
1312       */
1313      public void testThenRun_exceptionalCompletion() {
1314          for (ExecutionMode m : ExecutionMode.values())
1058        for (boolean createIncomplete : new boolean[] { true, false })
1315      {
1316          final CFException ex = new CFException();
1317          final CompletableFuture<Integer> f = new CompletableFuture<>();
1318 <        final Noop r = new Noop(m);
1319 <        if (!createIncomplete) f.completeExceptionally(ex);
1064 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1065 <        if (createIncomplete) {
1066 <            checkIncomplete(g);
1067 <            f.completeExceptionally(ex);
1068 <        }
1318 >        final Noop[] rs = new Noop[6];
1319 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1320  
1321 <        checkCompletedWithWrappedCFException(g, ex);
1322 <        checkCompletedWithWrappedCFException(f, ex);
1323 <        assertEquals(0, r.invocationCount);
1321 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1322 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1323 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1324 >        checkIncomplete(h0);
1325 >        checkIncomplete(h1);
1326 >        checkIncomplete(h2);
1327 >        assertTrue(f.completeExceptionally(ex));
1328 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1329 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1330 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1331 >
1332 >        checkCompletedWithWrappedException(h0, ex);
1333 >        checkCompletedWithWrappedException(h1, ex);
1334 >        checkCompletedWithWrappedException(h2, ex);
1335 >        checkCompletedWithWrappedException(h3, ex);
1336 >        checkCompletedWithWrappedException(h4, ex);
1337 >        checkCompletedWithWrappedException(h5, ex);
1338 >        checkCompletedExceptionally(f, ex);
1339 >        for (Noop r : rs) r.assertNotInvoked();
1340      }}
1341  
1342      /**
# Line 1077 | Line 1344 | public class CompletableFutureTest exten
1344       */
1345      public void testThenRun_sourceCancelled() {
1346          for (ExecutionMode m : ExecutionMode.values())
1080        for (boolean createIncomplete : new boolean[] { true, false })
1347          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1348      {
1349          final CompletableFuture<Integer> f = new CompletableFuture<>();
1350 <        final Noop r = new Noop(m);
1351 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1086 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1087 <        if (createIncomplete) {
1088 <            checkIncomplete(g);
1089 <            assertTrue(f.cancel(mayInterruptIfRunning));
1090 <        }
1350 >        final Noop[] rs = new Noop[6];
1351 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1352  
1353 <        checkCompletedWithWrappedCancellationException(g);
1353 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1354 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1355 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1356 >        checkIncomplete(h0);
1357 >        checkIncomplete(h1);
1358 >        checkIncomplete(h2);
1359 >        assertTrue(f.cancel(mayInterruptIfRunning));
1360 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1361 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1362 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1363 >
1364 >        checkCompletedWithWrappedCancellationException(h0);
1365 >        checkCompletedWithWrappedCancellationException(h1);
1366 >        checkCompletedWithWrappedCancellationException(h2);
1367 >        checkCompletedWithWrappedCancellationException(h3);
1368 >        checkCompletedWithWrappedCancellationException(h4);
1369 >        checkCompletedWithWrappedCancellationException(h5);
1370          checkCancelled(f);
1371 <        assertEquals(0, r.invocationCount);
1371 >        for (Noop r : rs) r.assertNotInvoked();
1372      }}
1373  
1374      /**
# Line 1099 | Line 1376 | public class CompletableFutureTest exten
1376       */
1377      public void testThenRun_actionFailed() {
1378          for (ExecutionMode m : ExecutionMode.values())
1102        for (boolean createIncomplete : new boolean[] { true, false })
1379          for (Integer v1 : new Integer[] { 1, null })
1380      {
1381          final CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        final FailingRunnable r = new FailingRunnable(m);
1383 <        if (!createIncomplete) f.complete(v1);
1108 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1109 <        if (createIncomplete) {
1110 <            checkIncomplete(g);
1111 <            f.complete(v1);
1112 <        }
1382 >        final FailingRunnable[] rs = new FailingRunnable[6];
1383 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1384  
1385 <        checkCompletedWithWrappedCFException(g);
1385 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1386 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1387 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1388 >        assertTrue(f.complete(v1));
1389 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1390 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1391 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1392 >
1393 >        checkCompletedWithWrappedCFException(h0);
1394 >        checkCompletedWithWrappedCFException(h1);
1395 >        checkCompletedWithWrappedCFException(h2);
1396 >        checkCompletedWithWrappedCFException(h3);
1397 >        checkCompletedWithWrappedCFException(h4);
1398 >        checkCompletedWithWrappedCFException(h5);
1399          checkCompletedNormally(f, v1);
1400      }}
1401  
# Line 1120 | Line 1404 | public class CompletableFutureTest exten
1404       */
1405      public void testThenApply_normalCompletion() {
1406          for (ExecutionMode m : ExecutionMode.values())
1123        for (boolean createIncomplete : new boolean[] { true, false })
1407          for (Integer v1 : new Integer[] { 1, null })
1408      {
1409          final CompletableFuture<Integer> f = new CompletableFuture<>();
1410 <        final IncFunction r = new IncFunction(m);
1411 <        if (!createIncomplete) f.complete(v1);
1129 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1130 <        if (createIncomplete) {
1131 <            checkIncomplete(g);
1132 <            f.complete(v1);
1133 <        }
1410 >        final IncFunction[] rs = new IncFunction[4];
1411 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1412  
1413 <        checkCompletedNormally(g, inc(v1));
1413 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1414 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1415 >        checkIncomplete(h0);
1416 >        checkIncomplete(h1);
1417 >        assertTrue(f.complete(v1));
1418 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1419 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1420 >
1421 >        checkCompletedNormally(h0, inc(v1));
1422 >        checkCompletedNormally(h1, inc(v1));
1423 >        checkCompletedNormally(h2, inc(v1));
1424 >        checkCompletedNormally(h3, inc(v1));
1425          checkCompletedNormally(f, v1);
1426 <        assertEquals(1, r.invocationCount);
1426 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1427      }}
1428  
1429      /**
# Line 1143 | Line 1432 | public class CompletableFutureTest exten
1432       */
1433      public void testThenApply_exceptionalCompletion() {
1434          for (ExecutionMode m : ExecutionMode.values())
1146        for (boolean createIncomplete : new boolean[] { true, false })
1435      {
1436          final CFException ex = new CFException();
1437          final CompletableFuture<Integer> f = new CompletableFuture<>();
1438 <        final IncFunction r = new IncFunction(m);
1439 <        if (!createIncomplete) f.completeExceptionally(ex);
1152 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1153 <        if (createIncomplete) {
1154 <            checkIncomplete(g);
1155 <            f.completeExceptionally(ex);
1156 <        }
1438 >        final IncFunction[] rs = new IncFunction[4];
1439 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1440  
1441 <        checkCompletedWithWrappedCFException(g, ex);
1442 <        checkCompletedWithWrappedCFException(f, ex);
1443 <        assertEquals(0, r.invocationCount);
1441 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1442 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1443 >        assertTrue(f.completeExceptionally(ex));
1444 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1445 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1446 >
1447 >        checkCompletedWithWrappedException(h0, ex);
1448 >        checkCompletedWithWrappedException(h1, ex);
1449 >        checkCompletedWithWrappedException(h2, ex);
1450 >        checkCompletedWithWrappedException(h3, ex);
1451 >        checkCompletedExceptionally(f, ex);
1452 >        for (IncFunction r : rs) r.assertNotInvoked();
1453      }}
1454  
1455      /**
# Line 1165 | Line 1457 | public class CompletableFutureTest exten
1457       */
1458      public void testThenApply_sourceCancelled() {
1459          for (ExecutionMode m : ExecutionMode.values())
1168        for (boolean createIncomplete : new boolean[] { true, false })
1460          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1461      {
1462          final CompletableFuture<Integer> f = new CompletableFuture<>();
1463 <        final IncFunction r = new IncFunction(m);
1464 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1174 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1175 <        if (createIncomplete) {
1176 <            checkIncomplete(g);
1177 <            assertTrue(f.cancel(mayInterruptIfRunning));
1178 <        }
1463 >        final IncFunction[] rs = new IncFunction[4];
1464 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1465  
1466 <        checkCompletedWithWrappedCancellationException(g);
1466 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1467 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1468 >        assertTrue(f.cancel(mayInterruptIfRunning));
1469 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1470 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1471 >
1472 >        checkCompletedWithWrappedCancellationException(h0);
1473 >        checkCompletedWithWrappedCancellationException(h1);
1474 >        checkCompletedWithWrappedCancellationException(h2);
1475 >        checkCompletedWithWrappedCancellationException(h3);
1476          checkCancelled(f);
1477 <        assertEquals(0, r.invocationCount);
1477 >        for (IncFunction r : rs) r.assertNotInvoked();
1478      }}
1479  
1480      /**
# Line 1187 | Line 1482 | public class CompletableFutureTest exten
1482       */
1483      public void testThenApply_actionFailed() {
1484          for (ExecutionMode m : ExecutionMode.values())
1190        for (boolean createIncomplete : new boolean[] { true, false })
1485          for (Integer v1 : new Integer[] { 1, null })
1486      {
1487          final CompletableFuture<Integer> f = new CompletableFuture<>();
1488 <        final FailingFunction r = new FailingFunction(m);
1489 <        if (!createIncomplete) f.complete(v1);
1196 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1197 <        if (createIncomplete) {
1198 <            checkIncomplete(g);
1199 <            f.complete(v1);
1200 <        }
1488 >        final FailingFunction[] rs = new FailingFunction[4];
1489 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1490  
1491 <        checkCompletedWithWrappedCFException(g);
1491 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1492 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1493 >        assertTrue(f.complete(v1));
1494 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1495 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1496 >
1497 >        checkCompletedWithWrappedCFException(h0);
1498 >        checkCompletedWithWrappedCFException(h1);
1499 >        checkCompletedWithWrappedCFException(h2);
1500 >        checkCompletedWithWrappedCFException(h3);
1501          checkCompletedNormally(f, v1);
1502      }}
1503  
# Line 1208 | Line 1506 | public class CompletableFutureTest exten
1506       */
1507      public void testThenAccept_normalCompletion() {
1508          for (ExecutionMode m : ExecutionMode.values())
1211        for (boolean createIncomplete : new boolean[] { true, false })
1509          for (Integer v1 : new Integer[] { 1, null })
1510      {
1511          final CompletableFuture<Integer> f = new CompletableFuture<>();
1512 <        final IncAction r = new IncAction();
1513 <        if (!createIncomplete) f.complete(v1);
1217 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1218 <        if (createIncomplete) {
1219 <            checkIncomplete(g);
1220 <            f.complete(v1);
1221 <        }
1512 >        final NoopConsumer[] rs = new NoopConsumer[4];
1513 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1514  
1515 <        checkCompletedNormally(g, null);
1515 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1516 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1517 >        checkIncomplete(h0);
1518 >        checkIncomplete(h1);
1519 >        assertTrue(f.complete(v1));
1520 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1521 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1522 >
1523 >        checkCompletedNormally(h0, null);
1524 >        checkCompletedNormally(h1, null);
1525 >        checkCompletedNormally(h2, null);
1526 >        checkCompletedNormally(h3, null);
1527          checkCompletedNormally(f, v1);
1528 <        assertEquals(1, r.invocationCount);
1226 <        assertEquals(inc(v1), r.value);
1528 >        for (NoopConsumer r : rs) r.assertValue(v1);
1529      }}
1530  
1531      /**
# Line 1232 | Line 1534 | public class CompletableFutureTest exten
1534       */
1535      public void testThenAccept_exceptionalCompletion() {
1536          for (ExecutionMode m : ExecutionMode.values())
1235        for (boolean createIncomplete : new boolean[] { true, false })
1537      {
1538          final CFException ex = new CFException();
1539          final CompletableFuture<Integer> f = new CompletableFuture<>();
1540 <        final IncAction r = new IncAction();
1541 <        if (!createIncomplete) f.completeExceptionally(ex);
1241 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1242 <        if (createIncomplete) {
1243 <            checkIncomplete(g);
1244 <            f.completeExceptionally(ex);
1245 <        }
1540 >        final NoopConsumer[] rs = new NoopConsumer[4];
1541 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1542  
1543 <        checkCompletedWithWrappedCFException(g, ex);
1544 <        checkCompletedWithWrappedCFException(f, ex);
1545 <        assertEquals(0, r.invocationCount);
1543 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1544 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1545 >        assertTrue(f.completeExceptionally(ex));
1546 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1547 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1548 >
1549 >        checkCompletedWithWrappedException(h0, ex);
1550 >        checkCompletedWithWrappedException(h1, ex);
1551 >        checkCompletedWithWrappedException(h2, ex);
1552 >        checkCompletedWithWrappedException(h3, ex);
1553 >        checkCompletedExceptionally(f, ex);
1554 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1555      }}
1556  
1557      /**
1558 <     * thenAccept result completes exceptionally if action does
1558 >     * thenAccept result completes exceptionally if source cancelled
1559       */
1560 <    public void testThenAccept_actionFailed() {
1560 >    public void testThenAccept_sourceCancelled() {
1561          for (ExecutionMode m : ExecutionMode.values())
1562 <        for (boolean createIncomplete : new boolean[] { true, false })
1258 <        for (Integer v1 : new Integer[] { 1, null })
1562 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1563      {
1564          final CompletableFuture<Integer> f = new CompletableFuture<>();
1565 <        final FailingConsumer r = new FailingConsumer(m);
1566 <        if (!createIncomplete) f.complete(v1);
1263 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1264 <        if (createIncomplete) {
1265 <            checkIncomplete(g);
1266 <            f.complete(v1);
1267 <        }
1565 >        final NoopConsumer[] rs = new NoopConsumer[4];
1566 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1567  
1568 <        checkCompletedWithWrappedCFException(g);
1569 <        checkCompletedNormally(f, v1);
1568 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1569 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1570 >        assertTrue(f.cancel(mayInterruptIfRunning));
1571 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1572 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1573 >
1574 >        checkCompletedWithWrappedCancellationException(h0);
1575 >        checkCompletedWithWrappedCancellationException(h1);
1576 >        checkCompletedWithWrappedCancellationException(h2);
1577 >        checkCompletedWithWrappedCancellationException(h3);
1578 >        checkCancelled(f);
1579 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1580      }}
1581  
1582      /**
1583 <     * thenAccept result completes exceptionally if source cancelled
1583 >     * thenAccept result completes exceptionally if action does
1584       */
1585 <    public void testThenAccept_sourceCancelled() {
1585 >    public void testThenAccept_actionFailed() {
1586          for (ExecutionMode m : ExecutionMode.values())
1587 <        for (boolean createIncomplete : new boolean[] { true, false })
1279 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1587 >        for (Integer v1 : new Integer[] { 1, null })
1588      {
1589          final CompletableFuture<Integer> f = new CompletableFuture<>();
1590 <        final IncAction r = new IncAction();
1591 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1284 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1285 <        if (createIncomplete) {
1286 <            checkIncomplete(g);
1287 <            assertTrue(f.cancel(mayInterruptIfRunning));
1288 <        }
1590 >        final FailingConsumer[] rs = new FailingConsumer[4];
1591 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1592  
1593 <        checkCompletedWithWrappedCancellationException(g);
1594 <        checkCancelled(f);
1595 <        assertEquals(0, r.invocationCount);
1593 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1594 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1595 >        assertTrue(f.complete(v1));
1596 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1597 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1598 >
1599 >        checkCompletedWithWrappedCFException(h0);
1600 >        checkCompletedWithWrappedCFException(h1);
1601 >        checkCompletedWithWrappedCFException(h2);
1602 >        checkCompletedWithWrappedCFException(h3);
1603 >        checkCompletedNormally(f, v1);
1604      }}
1605  
1606      /**
# Line 1298 | Line 1609 | public class CompletableFutureTest exten
1609       */
1610      public void testThenCombine_normalCompletion() {
1611          for (ExecutionMode m : ExecutionMode.values())
1301        for (boolean createIncomplete : new boolean[] { true, false })
1612          for (boolean fFirst : new boolean[] { true, false })
1613          for (Integer v1 : new Integer[] { 1, null })
1614          for (Integer v2 : new Integer[] { 2, null })
1615      {
1616          final CompletableFuture<Integer> f = new CompletableFuture<>();
1617          final CompletableFuture<Integer> g = new CompletableFuture<>();
1618 <        final SubtractFunction r = new SubtractFunction(m);
1618 >        final SubtractFunction[] rs = new SubtractFunction[6];
1619 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1620  
1621 <        if (fFirst) f.complete(v1); else g.complete(v2);
1622 <        if (!createIncomplete)
1623 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1624 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1625 <        if (createIncomplete) {
1626 <            checkIncomplete(h);
1627 <            assertEquals(0, r.invocationCount);
1628 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1629 <        }
1621 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1622 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1623 >        final Integer w1 =  fFirst ? v1 : v2;
1624 >        final Integer w2 = !fFirst ? v1 : v2;
1625 >
1626 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1627 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1628 >        assertTrue(fst.complete(w1));
1629 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1630 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1631 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1632 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1633 >        checkCompletedNormally(h1, subtract(w1, w1));
1634 >        checkCompletedNormally(h3, subtract(w1, w1));
1635 >        rs[1].assertValue(subtract(w1, w1));
1636 >        rs[3].assertValue(subtract(w1, w1));
1637 >        assertTrue(snd.complete(w2));
1638 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1639 >
1640 >        checkCompletedNormally(h0, subtract(v1, v2));
1641 >        checkCompletedNormally(h2, subtract(v1, v2));
1642 >        checkCompletedNormally(h4, subtract(v1, v2));
1643 >        rs[0].assertValue(subtract(v1, v2));
1644 >        rs[2].assertValue(subtract(v1, v2));
1645 >        rs[4].assertValue(subtract(v1, v2));
1646  
1320        checkCompletedNormally(h, subtract(v1, v2));
1647          checkCompletedNormally(f, v1);
1648          checkCompletedNormally(g, v2);
1323        assertEquals(1, r.invocationCount);
1649      }}
1650  
1651      /**
1652       * thenCombine result completes exceptionally after exceptional
1653       * completion of either source
1654       */
1655 <    public void testThenCombine_exceptionalCompletion() {
1655 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1656          for (ExecutionMode m : ExecutionMode.values())
1332        for (boolean createIncomplete : new boolean[] { true, false })
1657          for (boolean fFirst : new boolean[] { true, false })
1658 +        for (boolean failFirst : new boolean[] { true, false })
1659          for (Integer v1 : new Integer[] { 1, null })
1660      {
1661          final CompletableFuture<Integer> f = new CompletableFuture<>();
1662          final CompletableFuture<Integer> g = new CompletableFuture<>();
1663          final CFException ex = new CFException();
1664 <        final SubtractFunction r = new SubtractFunction(m);
1665 <
1666 <        (fFirst ? f : g).complete(v1);
1667 <        if (!createIncomplete)
1668 <            (!fFirst ? f : g).completeExceptionally(ex);
1669 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1670 <        if (createIncomplete) {
1671 <            checkIncomplete(h);
1672 <            (!fFirst ? f : g).completeExceptionally(ex);
1673 <        }
1674 <
1675 <        checkCompletedWithWrappedCFException(h, ex);
1676 <        assertEquals(0, r.invocationCount);
1677 <        checkCompletedNormally(fFirst ? f : g, v1);
1678 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1664 >        final SubtractFunction r1 = new SubtractFunction(m);
1665 >        final SubtractFunction r2 = new SubtractFunction(m);
1666 >        final SubtractFunction r3 = new SubtractFunction(m);
1667 >
1668 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1669 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1670 >        final Callable<Boolean> complete1 = failFirst ?
1671 >            () -> fst.completeExceptionally(ex) :
1672 >            () -> fst.complete(v1);
1673 >        final Callable<Boolean> complete2 = failFirst ?
1674 >            () -> snd.complete(v1) :
1675 >            () -> snd.completeExceptionally(ex);
1676 >
1677 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1678 >        assertTrue(complete1.call());
1679 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1680 >        checkIncomplete(h1);
1681 >        checkIncomplete(h2);
1682 >        assertTrue(complete2.call());
1683 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1684 >
1685 >        checkCompletedWithWrappedException(h1, ex);
1686 >        checkCompletedWithWrappedException(h2, ex);
1687 >        checkCompletedWithWrappedException(h3, ex);
1688 >        r1.assertNotInvoked();
1689 >        r2.assertNotInvoked();
1690 >        r3.assertNotInvoked();
1691 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1692 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1693      }}
1694  
1695      /**
1696 <     * thenCombine result completes exceptionally if action does
1696 >     * thenCombine result completes exceptionally if either source cancelled
1697       */
1698 <    public void testThenCombine_actionFailed() {
1698 >    public void testThenCombine_sourceCancelled() throws Throwable {
1699          for (ExecutionMode m : ExecutionMode.values())
1700 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1701          for (boolean fFirst : new boolean[] { true, false })
1702 +        for (boolean failFirst : new boolean[] { true, false })
1703          for (Integer v1 : new Integer[] { 1, null })
1363        for (Integer v2 : new Integer[] { 2, null })
1704      {
1705          final CompletableFuture<Integer> f = new CompletableFuture<>();
1706          final CompletableFuture<Integer> g = new CompletableFuture<>();
1707 <        final FailingBiFunction r = new FailingBiFunction(m);
1708 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1709 <
1710 <        if (fFirst) {
1711 <            f.complete(v1);
1712 <            g.complete(v2);
1713 <        } else {
1714 <            g.complete(v2);
1715 <            f.complete(v1);
1716 <        }
1717 <
1718 <        checkCompletedWithWrappedCFException(h);
1719 <        checkCompletedNormally(f, v1);
1720 <        checkCompletedNormally(g, v2);
1707 >        final SubtractFunction r1 = new SubtractFunction(m);
1708 >        final SubtractFunction r2 = new SubtractFunction(m);
1709 >        final SubtractFunction r3 = new SubtractFunction(m);
1710 >
1711 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1712 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1713 >        final Callable<Boolean> complete1 = failFirst ?
1714 >            () -> fst.cancel(mayInterruptIfRunning) :
1715 >            () -> fst.complete(v1);
1716 >        final Callable<Boolean> complete2 = failFirst ?
1717 >            () -> snd.complete(v1) :
1718 >            () -> snd.cancel(mayInterruptIfRunning);
1719 >
1720 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1721 >        assertTrue(complete1.call());
1722 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1723 >        checkIncomplete(h1);
1724 >        checkIncomplete(h2);
1725 >        assertTrue(complete2.call());
1726 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1727 >
1728 >        checkCompletedWithWrappedCancellationException(h1);
1729 >        checkCompletedWithWrappedCancellationException(h2);
1730 >        checkCompletedWithWrappedCancellationException(h3);
1731 >        r1.assertNotInvoked();
1732 >        r2.assertNotInvoked();
1733 >        r3.assertNotInvoked();
1734 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1735 >        checkCancelled(failFirst ? fst : snd);
1736      }}
1737  
1738      /**
1739 <     * thenCombine result completes exceptionally if either source cancelled
1739 >     * thenCombine result completes exceptionally if action does
1740       */
1741 <    public void testThenCombine_sourceCancelled() {
1741 >    public void testThenCombine_actionFailed() {
1742          for (ExecutionMode m : ExecutionMode.values())
1388        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1389        for (boolean createIncomplete : new boolean[] { true, false })
1743          for (boolean fFirst : new boolean[] { true, false })
1744          for (Integer v1 : new Integer[] { 1, null })
1745 +        for (Integer v2 : new Integer[] { 2, null })
1746      {
1747          final CompletableFuture<Integer> f = new CompletableFuture<>();
1748          final CompletableFuture<Integer> g = new CompletableFuture<>();
1749 <        final SubtractFunction r = new SubtractFunction(m);
1749 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1750 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1751 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1752 >
1753 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1754 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1755 >        final Integer w1 =  fFirst ? v1 : v2;
1756 >        final Integer w2 = !fFirst ? v1 : v2;
1757 >
1758 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1759 >        assertTrue(fst.complete(w1));
1760 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1761 >        assertTrue(snd.complete(w2));
1762 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1763  
1764 <        (fFirst ? f : g).complete(v1);
1765 <        if (!createIncomplete)
1766 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1767 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1768 <        if (createIncomplete) {
1769 <            checkIncomplete(h);
1770 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1771 <        }
1405 <
1406 <        checkCompletedWithWrappedCancellationException(h);
1407 <        checkCancelled(!fFirst ? f : g);
1408 <        assertEquals(0, r.invocationCount);
1409 <        checkCompletedNormally(fFirst ? f : g, v1);
1764 >        checkCompletedWithWrappedCFException(h1);
1765 >        checkCompletedWithWrappedCFException(h2);
1766 >        checkCompletedWithWrappedCFException(h3);
1767 >        r1.assertInvoked();
1768 >        r2.assertInvoked();
1769 >        r3.assertInvoked();
1770 >        checkCompletedNormally(f, v1);
1771 >        checkCompletedNormally(g, v2);
1772      }}
1773  
1774      /**
# Line 1415 | Line 1777 | public class CompletableFutureTest exten
1777       */
1778      public void testThenAcceptBoth_normalCompletion() {
1779          for (ExecutionMode m : ExecutionMode.values())
1418        for (boolean createIncomplete : new boolean[] { true, false })
1780          for (boolean fFirst : new boolean[] { true, false })
1781          for (Integer v1 : new Integer[] { 1, null })
1782          for (Integer v2 : new Integer[] { 2, null })
1783      {
1784          final CompletableFuture<Integer> f = new CompletableFuture<>();
1785          final CompletableFuture<Integer> g = new CompletableFuture<>();
1786 <        final SubtractAction r = new SubtractAction(m);
1787 <
1788 <        if (fFirst) f.complete(v1); else g.complete(v2);
1789 <        if (!createIncomplete)
1790 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1791 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1792 <        if (createIncomplete) {
1793 <            checkIncomplete(h);
1794 <            assertEquals(0, r.invocationCount);
1795 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1796 <        }
1797 <
1798 <        checkCompletedNormally(h, null);
1799 <        assertEquals(subtract(v1, v2), r.value);
1786 >        final SubtractAction r1 = new SubtractAction(m);
1787 >        final SubtractAction r2 = new SubtractAction(m);
1788 >        final SubtractAction r3 = new SubtractAction(m);
1789 >
1790 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1791 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1792 >        final Integer w1 =  fFirst ? v1 : v2;
1793 >        final Integer w2 = !fFirst ? v1 : v2;
1794 >
1795 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1796 >        assertTrue(fst.complete(w1));
1797 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1798 >        checkIncomplete(h1);
1799 >        checkIncomplete(h2);
1800 >        r1.assertNotInvoked();
1801 >        r2.assertNotInvoked();
1802 >        assertTrue(snd.complete(w2));
1803 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1804 >
1805 >        checkCompletedNormally(h1, null);
1806 >        checkCompletedNormally(h2, null);
1807 >        checkCompletedNormally(h3, null);
1808 >        r1.assertValue(subtract(v1, v2));
1809 >        r2.assertValue(subtract(v1, v2));
1810 >        r3.assertValue(subtract(v1, v2));
1811          checkCompletedNormally(f, v1);
1812          checkCompletedNormally(g, v2);
1813      }}
# Line 1444 | Line 1816 | public class CompletableFutureTest exten
1816       * thenAcceptBoth result completes exceptionally after exceptional
1817       * completion of either source
1818       */
1819 <    public void testThenAcceptBoth_exceptionalCompletion() {
1819 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1820          for (ExecutionMode m : ExecutionMode.values())
1449        for (boolean createIncomplete : new boolean[] { true, false })
1821          for (boolean fFirst : new boolean[] { true, false })
1822 +        for (boolean failFirst : new boolean[] { true, false })
1823          for (Integer v1 : new Integer[] { 1, null })
1824      {
1825          final CompletableFuture<Integer> f = new CompletableFuture<>();
1826          final CompletableFuture<Integer> g = new CompletableFuture<>();
1827          final CFException ex = new CFException();
1828 <        final SubtractAction r = new SubtractAction(m);
1829 <
1830 <        (fFirst ? f : g).complete(v1);
1831 <        if (!createIncomplete)
1832 <            (!fFirst ? f : g).completeExceptionally(ex);
1833 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1834 <        if (createIncomplete) {
1835 <            checkIncomplete(h);
1836 <            (!fFirst ? f : g).completeExceptionally(ex);
1837 <        }
1838 <
1839 <        checkCompletedWithWrappedCFException(h, ex);
1840 <        assertEquals(0, r.invocationCount);
1841 <        checkCompletedNormally(fFirst ? f : g, v1);
1842 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1828 >        final SubtractAction r1 = new SubtractAction(m);
1829 >        final SubtractAction r2 = new SubtractAction(m);
1830 >        final SubtractAction r3 = new SubtractAction(m);
1831 >
1832 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1833 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1834 >        final Callable<Boolean> complete1 = failFirst ?
1835 >            () -> fst.completeExceptionally(ex) :
1836 >            () -> fst.complete(v1);
1837 >        final Callable<Boolean> complete2 = failFirst ?
1838 >            () -> snd.complete(v1) :
1839 >            () -> snd.completeExceptionally(ex);
1840 >
1841 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1842 >        assertTrue(complete1.call());
1843 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1844 >        checkIncomplete(h1);
1845 >        checkIncomplete(h2);
1846 >        assertTrue(complete2.call());
1847 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1848 >
1849 >        checkCompletedWithWrappedException(h1, ex);
1850 >        checkCompletedWithWrappedException(h2, ex);
1851 >        checkCompletedWithWrappedException(h3, ex);
1852 >        r1.assertNotInvoked();
1853 >        r2.assertNotInvoked();
1854 >        r3.assertNotInvoked();
1855 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1856 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1857      }}
1858  
1859      /**
1860 <     * thenAcceptBoth result completes exceptionally if action does
1860 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1861       */
1862 <    public void testThenAcceptBoth_actionFailed() {
1862 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1863          for (ExecutionMode m : ExecutionMode.values())
1864 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1865          for (boolean fFirst : new boolean[] { true, false })
1866 +        for (boolean failFirst : new boolean[] { true, false })
1867          for (Integer v1 : new Integer[] { 1, null })
1480        for (Integer v2 : new Integer[] { 2, null })
1868      {
1869          final CompletableFuture<Integer> f = new CompletableFuture<>();
1870          final CompletableFuture<Integer> g = new CompletableFuture<>();
1871 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1872 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1873 <
1874 <        if (fFirst) {
1875 <            f.complete(v1);
1876 <            g.complete(v2);
1877 <        } else {
1878 <            g.complete(v2);
1879 <            f.complete(v1);
1880 <        }
1881 <
1882 <        checkCompletedWithWrappedCFException(h);
1883 <        checkCompletedNormally(f, v1);
1884 <        checkCompletedNormally(g, v2);
1871 >        final SubtractAction r1 = new SubtractAction(m);
1872 >        final SubtractAction r2 = new SubtractAction(m);
1873 >        final SubtractAction r3 = new SubtractAction(m);
1874 >
1875 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1876 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1877 >        final Callable<Boolean> complete1 = failFirst ?
1878 >            () -> fst.cancel(mayInterruptIfRunning) :
1879 >            () -> fst.complete(v1);
1880 >        final Callable<Boolean> complete2 = failFirst ?
1881 >            () -> snd.complete(v1) :
1882 >            () -> snd.cancel(mayInterruptIfRunning);
1883 >
1884 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1885 >        assertTrue(complete1.call());
1886 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1887 >        checkIncomplete(h1);
1888 >        checkIncomplete(h2);
1889 >        assertTrue(complete2.call());
1890 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1891 >
1892 >        checkCompletedWithWrappedCancellationException(h1);
1893 >        checkCompletedWithWrappedCancellationException(h2);
1894 >        checkCompletedWithWrappedCancellationException(h3);
1895 >        r1.assertNotInvoked();
1896 >        r2.assertNotInvoked();
1897 >        r3.assertNotInvoked();
1898 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1899 >        checkCancelled(failFirst ? fst : snd);
1900      }}
1901  
1902      /**
1903 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1903 >     * thenAcceptBoth result completes exceptionally if action does
1904       */
1905 <    public void testThenAcceptBoth_sourceCancelled() {
1905 >    public void testThenAcceptBoth_actionFailed() {
1906          for (ExecutionMode m : ExecutionMode.values())
1505        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1506        for (boolean createIncomplete : new boolean[] { true, false })
1907          for (boolean fFirst : new boolean[] { true, false })
1908          for (Integer v1 : new Integer[] { 1, null })
1909 +        for (Integer v2 : new Integer[] { 2, null })
1910      {
1911          final CompletableFuture<Integer> f = new CompletableFuture<>();
1912          final CompletableFuture<Integer> g = new CompletableFuture<>();
1913 <        final SubtractAction r = new SubtractAction(m);
1913 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1914 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1915 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1916 >
1917 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1918 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1919 >        final Integer w1 =  fFirst ? v1 : v2;
1920 >        final Integer w2 = !fFirst ? v1 : v2;
1921 >
1922 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1923 >        assertTrue(fst.complete(w1));
1924 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1925 >        assertTrue(snd.complete(w2));
1926 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1927  
1928 <        (fFirst ? f : g).complete(v1);
1929 <        if (!createIncomplete)
1930 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1931 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1932 <        if (createIncomplete) {
1933 <            checkIncomplete(h);
1934 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1935 <        }
1522 <
1523 <        checkCompletedWithWrappedCancellationException(h);
1524 <        checkCancelled(!fFirst ? f : g);
1525 <        assertEquals(0, r.invocationCount);
1526 <        checkCompletedNormally(fFirst ? f : g, v1);
1928 >        checkCompletedWithWrappedCFException(h1);
1929 >        checkCompletedWithWrappedCFException(h2);
1930 >        checkCompletedWithWrappedCFException(h3);
1931 >        r1.assertInvoked();
1932 >        r2.assertInvoked();
1933 >        r3.assertInvoked();
1934 >        checkCompletedNormally(f, v1);
1935 >        checkCompletedNormally(g, v2);
1936      }}
1937  
1938      /**
# Line 1532 | Line 1941 | public class CompletableFutureTest exten
1941       */
1942      public void testRunAfterBoth_normalCompletion() {
1943          for (ExecutionMode m : ExecutionMode.values())
1535        for (boolean createIncomplete : new boolean[] { true, false })
1944          for (boolean fFirst : new boolean[] { true, false })
1945          for (Integer v1 : new Integer[] { 1, null })
1946          for (Integer v2 : new Integer[] { 2, null })
1947      {
1948          final CompletableFuture<Integer> f = new CompletableFuture<>();
1949          final CompletableFuture<Integer> g = new CompletableFuture<>();
1950 <        final Noop r = new Noop(m);
1951 <
1952 <        if (fFirst) f.complete(v1); else g.complete(v2);
1953 <        if (!createIncomplete)
1954 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1955 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1956 <        if (createIncomplete) {
1957 <            checkIncomplete(h);
1958 <            assertEquals(0, r.invocationCount);
1959 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1960 <        }
1961 <
1962 <        checkCompletedNormally(h, null);
1963 <        assertEquals(1, r.invocationCount);
1950 >        final Noop r1 = new Noop(m);
1951 >        final Noop r2 = new Noop(m);
1952 >        final Noop r3 = new Noop(m);
1953 >
1954 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1955 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1956 >        final Integer w1 =  fFirst ? v1 : v2;
1957 >        final Integer w2 = !fFirst ? v1 : v2;
1958 >
1959 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1960 >        assertTrue(fst.complete(w1));
1961 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1962 >        checkIncomplete(h1);
1963 >        checkIncomplete(h2);
1964 >        r1.assertNotInvoked();
1965 >        r2.assertNotInvoked();
1966 >        assertTrue(snd.complete(w2));
1967 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1968 >
1969 >        checkCompletedNormally(h1, null);
1970 >        checkCompletedNormally(h2, null);
1971 >        checkCompletedNormally(h3, null);
1972 >        r1.assertInvoked();
1973 >        r2.assertInvoked();
1974 >        r3.assertInvoked();
1975          checkCompletedNormally(f, v1);
1976          checkCompletedNormally(g, v2);
1977      }}
# Line 1561 | Line 1980 | public class CompletableFutureTest exten
1980       * runAfterBoth result completes exceptionally after exceptional
1981       * completion of either source
1982       */
1983 <    public void testRunAfterBoth_exceptionalCompletion() {
1983 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1984          for (ExecutionMode m : ExecutionMode.values())
1566        for (boolean createIncomplete : new boolean[] { true, false })
1985          for (boolean fFirst : new boolean[] { true, false })
1986 +        for (boolean failFirst : new boolean[] { true, false })
1987          for (Integer v1 : new Integer[] { 1, null })
1988      {
1989          final CompletableFuture<Integer> f = new CompletableFuture<>();
1990          final CompletableFuture<Integer> g = new CompletableFuture<>();
1991          final CFException ex = new CFException();
1992 <        final Noop r = new Noop(m);
1993 <
1994 <        (fFirst ? f : g).complete(v1);
1995 <        if (!createIncomplete)
1996 <            (!fFirst ? f : g).completeExceptionally(ex);
1997 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1998 <        if (createIncomplete) {
1999 <            checkIncomplete(h);
2000 <            (!fFirst ? f : g).completeExceptionally(ex);
2001 <        }
2002 <
2003 <        checkCompletedWithWrappedCFException(h, ex);
2004 <        assertEquals(0, r.invocationCount);
2005 <        checkCompletedNormally(fFirst ? f : g, v1);
2006 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
2007 <    }}
2008 <
2009 <    /**
2010 <     * runAfterBoth result completes exceptionally if action does
2011 <     */
2012 <    public void testRunAfterBoth_actionFailed() {
2013 <        for (ExecutionMode m : ExecutionMode.values())
2014 <        for (boolean fFirst : new boolean[] { true, false })
2015 <        for (Integer v1 : new Integer[] { 1, null })
2016 <        for (Integer v2 : new Integer[] { 2, null })
2017 <    {
2018 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2019 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2020 <        final FailingRunnable r = new FailingRunnable(m);
1602 <
1603 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1604 <        if (fFirst) {
1605 <            f.complete(v1);
1606 <            g.complete(v2);
1607 <        } else {
1608 <            g.complete(v2);
1609 <            f.complete(v1);
1610 <        }
1611 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1612 <
1613 <        checkCompletedWithWrappedCFException(h1);
1614 <        checkCompletedWithWrappedCFException(h2);
1615 <        checkCompletedNormally(f, v1);
1616 <        checkCompletedNormally(g, v2);
1992 >        final Noop r1 = new Noop(m);
1993 >        final Noop r2 = new Noop(m);
1994 >        final Noop r3 = new Noop(m);
1995 >
1996 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1997 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1998 >        final Callable<Boolean> complete1 = failFirst ?
1999 >            () -> fst.completeExceptionally(ex) :
2000 >            () -> fst.complete(v1);
2001 >        final Callable<Boolean> complete2 = failFirst ?
2002 >            () -> snd.complete(v1) :
2003 >            () -> snd.completeExceptionally(ex);
2004 >
2005 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2006 >        assertTrue(complete1.call());
2007 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2008 >        checkIncomplete(h1);
2009 >        checkIncomplete(h2);
2010 >        assertTrue(complete2.call());
2011 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2012 >
2013 >        checkCompletedWithWrappedException(h1, ex);
2014 >        checkCompletedWithWrappedException(h2, ex);
2015 >        checkCompletedWithWrappedException(h3, ex);
2016 >        r1.assertNotInvoked();
2017 >        r2.assertNotInvoked();
2018 >        r3.assertNotInvoked();
2019 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2020 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2021      }}
2022  
2023      /**
2024       * runAfterBoth result completes exceptionally if either source cancelled
2025       */
2026 <    public void testRunAfterBoth_sourceCancelled() {
2026 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2027          for (ExecutionMode m : ExecutionMode.values())
2028          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1625        for (boolean createIncomplete : new boolean[] { true, false })
2029          for (boolean fFirst : new boolean[] { true, false })
2030 +        for (boolean failFirst : new boolean[] { true, false })
2031          for (Integer v1 : new Integer[] { 1, null })
2032      {
2033          final CompletableFuture<Integer> f = new CompletableFuture<>();
2034          final CompletableFuture<Integer> g = new CompletableFuture<>();
2035 <        final Noop r = new Noop(m);
2036 <
2037 <
2038 <        (fFirst ? f : g).complete(v1);
2039 <        if (!createIncomplete)
2040 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2041 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2042 <        if (createIncomplete) {
2043 <            checkIncomplete(h);
2044 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2045 <        }
2046 <
2047 <        checkCompletedWithWrappedCancellationException(h);
2048 <        checkCancelled(!fFirst ? f : g);
2049 <        assertEquals(0, r.invocationCount);
2050 <        checkCompletedNormally(fFirst ? f : g, v1);
2035 >        final Noop r1 = new Noop(m);
2036 >        final Noop r2 = new Noop(m);
2037 >        final Noop r3 = new Noop(m);
2038 >
2039 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2040 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2041 >        final Callable<Boolean> complete1 = failFirst ?
2042 >            () -> fst.cancel(mayInterruptIfRunning) :
2043 >            () -> fst.complete(v1);
2044 >        final Callable<Boolean> complete2 = failFirst ?
2045 >            () -> snd.complete(v1) :
2046 >            () -> snd.cancel(mayInterruptIfRunning);
2047 >
2048 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2049 >        assertTrue(complete1.call());
2050 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2051 >        checkIncomplete(h1);
2052 >        checkIncomplete(h2);
2053 >        assertTrue(complete2.call());
2054 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2055 >
2056 >        checkCompletedWithWrappedCancellationException(h1);
2057 >        checkCompletedWithWrappedCancellationException(h2);
2058 >        checkCompletedWithWrappedCancellationException(h3);
2059 >        r1.assertNotInvoked();
2060 >        r2.assertNotInvoked();
2061 >        r3.assertNotInvoked();
2062 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2063 >        checkCancelled(failFirst ? fst : snd);
2064      }}
2065  
2066      /**
2067 <     * applyToEither result completes normally after normal completion
1651 <     * of either source
2067 >     * runAfterBoth result completes exceptionally if action does
2068       */
2069 <    public void testApplyToEither_normalCompletion() {
2069 >    public void testRunAfterBoth_actionFailed() {
2070          for (ExecutionMode m : ExecutionMode.values())
1655        for (boolean createIncomplete : new boolean[] { true, false })
2071          for (boolean fFirst : new boolean[] { true, false })
2072          for (Integer v1 : new Integer[] { 1, null })
2073          for (Integer v2 : new Integer[] { 2, null })
2074      {
2075          final CompletableFuture<Integer> f = new CompletableFuture<>();
2076          final CompletableFuture<Integer> g = new CompletableFuture<>();
2077 <        final IncFunction r = new IncFunction(m);
2078 <
2079 <        if (!createIncomplete)
2080 <            if (fFirst) f.complete(v1); else g.complete(v2);
2081 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2082 <        if (createIncomplete) {
2083 <            checkIncomplete(h);
2084 <            assertEquals(0, r.invocationCount);
2085 <            if (fFirst) f.complete(v1); else g.complete(v2);
2086 <        }
2087 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
2088 <        if (!fFirst) f.complete(v1); else g.complete(v2);
2077 >        final FailingRunnable r1 = new FailingRunnable(m);
2078 >        final FailingRunnable r2 = new FailingRunnable(m);
2079 >        final FailingRunnable r3 = new FailingRunnable(m);
2080 >
2081 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2082 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2083 >        final Integer w1 =  fFirst ? v1 : v2;
2084 >        final Integer w2 = !fFirst ? v1 : v2;
2085 >
2086 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2087 >        assertTrue(fst.complete(w1));
2088 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2089 >        assertTrue(snd.complete(w2));
2090 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2091  
2092 +        checkCompletedWithWrappedCFException(h1);
2093 +        checkCompletedWithWrappedCFException(h2);
2094 +        checkCompletedWithWrappedCFException(h3);
2095 +        r1.assertInvoked();
2096 +        r2.assertInvoked();
2097 +        r3.assertInvoked();
2098          checkCompletedNormally(f, v1);
2099          checkCompletedNormally(g, v2);
1677        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
2100      }}
2101  
2102 <    public void testApplyToEither_normalCompletionBothAvailable() {
2102 >    /**
2103 >     * applyToEither result completes normally after normal completion
2104 >     * of either source
2105 >     */
2106 >    public void testApplyToEither_normalCompletion() {
2107          for (ExecutionMode m : ExecutionMode.values())
1682        for (boolean fFirst : new boolean[] { true, false })
2108          for (Integer v1 : new Integer[] { 1, null })
2109          for (Integer v2 : new Integer[] { 2, null })
2110      {
2111          final CompletableFuture<Integer> f = new CompletableFuture<>();
2112          final CompletableFuture<Integer> g = new CompletableFuture<>();
2113 <        final IncFunction r = new IncFunction(m);
2113 >        final IncFunction[] rs = new IncFunction[6];
2114 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2115  
2116 <        if (fFirst) {
2117 <            f.complete(v1);
2118 <            g.complete(v2);
2119 <        } else {
2120 <            g.complete(v2);
2121 <            f.complete(v1);
2122 <        }
2116 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2117 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2118 >        checkIncomplete(h0);
2119 >        checkIncomplete(h1);
2120 >        rs[0].assertNotInvoked();
2121 >        rs[1].assertNotInvoked();
2122 >        f.complete(v1);
2123 >        checkCompletedNormally(h0, inc(v1));
2124 >        checkCompletedNormally(h1, inc(v1));
2125 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2126 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2127 >        checkCompletedNormally(h2, inc(v1));
2128 >        checkCompletedNormally(h3, inc(v1));
2129 >        g.complete(v2);
2130  
2131 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2131 >        // unspecified behavior - both source completions available
2132 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2133 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2134 >        rs[4].assertValue(h4.join());
2135 >        rs[5].assertValue(h5.join());
2136 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2137 >                   Objects.equals(inc(v2), h4.join()));
2138 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2139 >                   Objects.equals(inc(v2), h5.join()));
2140  
2141          checkCompletedNormally(f, v1);
2142          checkCompletedNormally(g, v2);
2143 <
2144 <        // unspecified behavior
2145 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2146 <                   Objects.equals(h.join(), inc(v2)));
2147 <        assertEquals(1, r.invocationCount);
2143 >        checkCompletedNormally(h0, inc(v1));
2144 >        checkCompletedNormally(h1, inc(v1));
2145 >        checkCompletedNormally(h2, inc(v1));
2146 >        checkCompletedNormally(h3, inc(v1));
2147 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2148      }}
2149  
2150      /**
2151       * applyToEither result completes exceptionally after exceptional
2152       * completion of either source
2153       */
2154 <    public void testApplyToEither_exceptionalCompletion1() {
2154 >    public void testApplyToEither_exceptionalCompletion() {
2155          for (ExecutionMode m : ExecutionMode.values())
1715        for (boolean createIncomplete : new boolean[] { true, false })
1716        for (boolean fFirst : new boolean[] { true, false })
2156          for (Integer v1 : new Integer[] { 1, null })
2157      {
2158          final CompletableFuture<Integer> f = new CompletableFuture<>();
2159          final CompletableFuture<Integer> g = new CompletableFuture<>();
2160          final CFException ex = new CFException();
2161 <        final IncFunction r = new IncFunction(m);
2161 >        final IncFunction[] rs = new IncFunction[6];
2162 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2163  
2164 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
2165 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2166 <        if (createIncomplete) {
2167 <            checkIncomplete(h);
2168 <            assertEquals(0, r.invocationCount);
2169 <            (fFirst ? f : g).completeExceptionally(ex);
2164 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2165 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2166 >        checkIncomplete(h0);
2167 >        checkIncomplete(h1);
2168 >        rs[0].assertNotInvoked();
2169 >        rs[1].assertNotInvoked();
2170 >        f.completeExceptionally(ex);
2171 >        checkCompletedWithWrappedException(h0, ex);
2172 >        checkCompletedWithWrappedException(h1, ex);
2173 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2174 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2175 >        checkCompletedWithWrappedException(h2, ex);
2176 >        checkCompletedWithWrappedException(h3, ex);
2177 >        g.complete(v1);
2178 >
2179 >        // unspecified behavior - both source completions available
2180 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2181 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2182 >        try {
2183 >            assertEquals(inc(v1), h4.join());
2184 >            rs[4].assertValue(inc(v1));
2185 >        } catch (CompletionException ok) {
2186 >            checkCompletedWithWrappedException(h4, ex);
2187 >            rs[4].assertNotInvoked();
2188 >        }
2189 >        try {
2190 >            assertEquals(inc(v1), h5.join());
2191 >            rs[5].assertValue(inc(v1));
2192 >        } catch (CompletionException ok) {
2193 >            checkCompletedWithWrappedException(h5, ex);
2194 >            rs[5].assertNotInvoked();
2195          }
2196  
2197 <        checkCompletedWithWrappedCFException(h, ex);
2198 <        (!fFirst ? f : g).complete(v1);
2199 <
2200 <        assertEquals(0, r.invocationCount);
2201 <        checkCompletedNormally(!fFirst ? f : g, v1);
2202 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
2203 <        checkCompletedWithWrappedCFException(h, ex);
2197 >        checkCompletedExceptionally(f, ex);
2198 >        checkCompletedNormally(g, v1);
2199 >        checkCompletedWithWrappedException(h0, ex);
2200 >        checkCompletedWithWrappedException(h1, ex);
2201 >        checkCompletedWithWrappedException(h2, ex);
2202 >        checkCompletedWithWrappedException(h3, ex);
2203 >        checkCompletedWithWrappedException(h4, ex);
2204 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2205      }}
2206  
2207      public void testApplyToEither_exceptionalCompletion2() {
2208          for (ExecutionMode m : ExecutionMode.values())
1743        for (boolean reverseArgs : new boolean[] { true, false })
2209          for (boolean fFirst : new boolean[] { true, false })
2210          for (Integer v1 : new Integer[] { 1, null })
2211      {
2212          final CompletableFuture<Integer> f = new CompletableFuture<>();
2213          final CompletableFuture<Integer> g = new CompletableFuture<>();
1749        final IncFunction r1 = new IncFunction(m);
1750        final IncFunction r2 = new IncFunction(m);
2214          final CFException ex = new CFException();
2215 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
2216 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1754 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1755 <        if (fFirst) {
1756 <            f.complete(v1);
1757 <            g.completeExceptionally(ex);
1758 <        } else {
1759 <            g.completeExceptionally(ex);
1760 <            f.complete(v1);
1761 <        }
1762 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2215 >        final IncFunction[] rs = new IncFunction[6];
2216 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2217  
2218 <        // unspecified behavior
2218 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2219 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2220 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2221 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2222 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2223 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2224 >
2225 >        // unspecified behavior - both source completions available
2226 >        try {
2227 >            assertEquals(inc(v1), h0.join());
2228 >            rs[0].assertValue(inc(v1));
2229 >        } catch (CompletionException ok) {
2230 >            checkCompletedWithWrappedException(h0, ex);
2231 >            rs[0].assertNotInvoked();
2232 >        }
2233          try {
2234              assertEquals(inc(v1), h1.join());
2235 <            assertEquals(1, r1.invocationCount);
2235 >            rs[1].assertValue(inc(v1));
2236          } catch (CompletionException ok) {
2237 <            checkCompletedWithWrappedCFException(h1, ex);
2238 <            assertEquals(0, r1.invocationCount);
2237 >            checkCompletedWithWrappedException(h1, ex);
2238 >            rs[1].assertNotInvoked();
2239          }
1772
2240          try {
2241              assertEquals(inc(v1), h2.join());
2242 <            assertEquals(1, r2.invocationCount);
2242 >            rs[2].assertValue(inc(v1));
2243          } catch (CompletionException ok) {
2244 <            checkCompletedWithWrappedCFException(h2, ex);
2245 <            assertEquals(0, r2.invocationCount);
2244 >            checkCompletedWithWrappedException(h2, ex);
2245 >            rs[2].assertNotInvoked();
2246 >        }
2247 >        try {
2248 >            assertEquals(inc(v1), h3.join());
2249 >            rs[3].assertValue(inc(v1));
2250 >        } catch (CompletionException ok) {
2251 >            checkCompletedWithWrappedException(h3, ex);
2252 >            rs[3].assertNotInvoked();
2253          }
2254  
1781        checkCompletedWithWrappedCFException(g, ex);
1782        checkCompletedNormally(f, v1);
1783    }}
1784
1785    /**
1786     * applyToEither result completes exceptionally if action does
1787     */
1788    public void testApplyToEither_actionFailed1() {
1789        for (ExecutionMode m : ExecutionMode.values())
1790        for (Integer v1 : new Integer[] { 1, null })
1791        for (Integer v2 : new Integer[] { 2, null })
1792    {
1793        final CompletableFuture<Integer> f = new CompletableFuture<>();
1794        final CompletableFuture<Integer> g = new CompletableFuture<>();
1795        final FailingFunction r = new FailingFunction(m);
1796        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1797
1798        f.complete(v1);
1799        checkCompletedWithWrappedCFException(h);
1800        g.complete(v2);
1801        checkCompletedNormally(f, v1);
1802        checkCompletedNormally(g, v2);
1803    }}
1804
1805    public void testApplyToEither_actionFailed2() {
1806        for (ExecutionMode m : ExecutionMode.values())
1807        for (Integer v1 : new Integer[] { 1, null })
1808        for (Integer v2 : new Integer[] { 2, null })
1809    {
1810        final CompletableFuture<Integer> f = new CompletableFuture<>();
1811        final CompletableFuture<Integer> g = new CompletableFuture<>();
1812        final FailingFunction r = new FailingFunction(m);
1813        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1814
1815        g.complete(v2);
1816        checkCompletedWithWrappedCFException(h);
1817        f.complete(v1);
2255          checkCompletedNormally(f, v1);
2256 <        checkCompletedNormally(g, v2);
2256 >        checkCompletedExceptionally(g, ex);
2257      }}
2258  
2259      /**
2260       * applyToEither result completes exceptionally if either source cancelled
2261       */
2262 <    public void testApplyToEither_sourceCancelled1() {
2262 >    public void testApplyToEither_sourceCancelled() {
2263          for (ExecutionMode m : ExecutionMode.values())
2264          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1828        for (boolean createIncomplete : new boolean[] { true, false })
1829        for (boolean fFirst : new boolean[] { true, false })
2265          for (Integer v1 : new Integer[] { 1, null })
2266      {
2267          final CompletableFuture<Integer> f = new CompletableFuture<>();
2268          final CompletableFuture<Integer> g = new CompletableFuture<>();
2269 <        final IncFunction r = new IncFunction(m);
2269 >        final IncFunction[] rs = new IncFunction[6];
2270 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2271  
2272 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2273 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2274 <        if (createIncomplete) {
2275 <            checkIncomplete(h);
2276 <            assertEquals(0, r.invocationCount);
2277 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2272 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2273 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2274 >        checkIncomplete(h0);
2275 >        checkIncomplete(h1);
2276 >        rs[0].assertNotInvoked();
2277 >        rs[1].assertNotInvoked();
2278 >        f.cancel(mayInterruptIfRunning);
2279 >        checkCompletedWithWrappedCancellationException(h0);
2280 >        checkCompletedWithWrappedCancellationException(h1);
2281 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2282 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2283 >        checkCompletedWithWrappedCancellationException(h2);
2284 >        checkCompletedWithWrappedCancellationException(h3);
2285 >        g.complete(v1);
2286 >
2287 >        // unspecified behavior - both source completions available
2288 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2289 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2290 >        try {
2291 >            assertEquals(inc(v1), h4.join());
2292 >            rs[4].assertValue(inc(v1));
2293 >        } catch (CompletionException ok) {
2294 >            checkCompletedWithWrappedCancellationException(h4);
2295 >            rs[4].assertNotInvoked();
2296 >        }
2297 >        try {
2298 >            assertEquals(inc(v1), h5.join());
2299 >            rs[5].assertValue(inc(v1));
2300 >        } catch (CompletionException ok) {
2301 >            checkCompletedWithWrappedCancellationException(h5);
2302 >            rs[5].assertNotInvoked();
2303          }
2304  
2305 <        checkCompletedWithWrappedCancellationException(h);
2306 <        (!fFirst ? f : g).complete(v1);
2307 <
2308 <        assertEquals(0, r.invocationCount);
2309 <        checkCompletedNormally(!fFirst ? f : g, v1);
2310 <        checkCancelled(fFirst ? f : g);
2311 <        checkCompletedWithWrappedCancellationException(h);
2305 >        checkCancelled(f);
2306 >        checkCompletedNormally(g, v1);
2307 >        checkCompletedWithWrappedCancellationException(h0);
2308 >        checkCompletedWithWrappedCancellationException(h1);
2309 >        checkCompletedWithWrappedCancellationException(h2);
2310 >        checkCompletedWithWrappedCancellationException(h3);
2311 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2312      }}
2313  
2314      public void testApplyToEither_sourceCancelled2() {
2315          for (ExecutionMode m : ExecutionMode.values())
2316          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1856        for (boolean reverseArgs : new boolean[] { true, false })
2317          for (boolean fFirst : new boolean[] { true, false })
2318          for (Integer v1 : new Integer[] { 1, null })
2319      {
2320          final CompletableFuture<Integer> f = new CompletableFuture<>();
2321          final CompletableFuture<Integer> g = new CompletableFuture<>();
2322 <        final IncFunction r1 = new IncFunction(m);
2323 <        final IncFunction r2 = new IncFunction(m);
1864 <        final CFException ex = new CFException();
1865 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1866 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2322 >        final IncFunction[] rs = new IncFunction[6];
2323 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2324  
2325 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2326 <        if (fFirst) {
2327 <            f.complete(v1);
2328 <            assertTrue(g.cancel(mayInterruptIfRunning));
2329 <        } else {
2330 <            assertTrue(g.cancel(mayInterruptIfRunning));
1874 <            f.complete(v1);
1875 <        }
1876 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2325 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2326 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2327 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2328 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2329 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2330 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2331  
2332 <        // unspecified behavior
2332 >        // unspecified behavior - both source completions available
2333 >        try {
2334 >            assertEquals(inc(v1), h0.join());
2335 >            rs[0].assertValue(inc(v1));
2336 >        } catch (CompletionException ok) {
2337 >            checkCompletedWithWrappedCancellationException(h0);
2338 >            rs[0].assertNotInvoked();
2339 >        }
2340          try {
2341              assertEquals(inc(v1), h1.join());
2342 <            assertEquals(1, r1.invocationCount);
2342 >            rs[1].assertValue(inc(v1));
2343          } catch (CompletionException ok) {
2344              checkCompletedWithWrappedCancellationException(h1);
2345 <            assertEquals(0, r1.invocationCount);
2345 >            rs[1].assertNotInvoked();
2346          }
1886
2347          try {
2348              assertEquals(inc(v1), h2.join());
2349 <            assertEquals(1, r2.invocationCount);
2349 >            rs[2].assertValue(inc(v1));
2350          } catch (CompletionException ok) {
2351              checkCompletedWithWrappedCancellationException(h2);
2352 <            assertEquals(0, r2.invocationCount);
2352 >            rs[2].assertNotInvoked();
2353 >        }
2354 >        try {
2355 >            assertEquals(inc(v1), h3.join());
2356 >            rs[3].assertValue(inc(v1));
2357 >        } catch (CompletionException ok) {
2358 >            checkCompletedWithWrappedCancellationException(h3);
2359 >            rs[3].assertNotInvoked();
2360          }
2361  
1895        checkCancelled(g);
2362          checkCompletedNormally(f, v1);
2363 +        checkCancelled(g);
2364      }}
2365  
2366      /**
2367 <     * acceptEither result completes normally after normal completion
1901 <     * of either source
2367 >     * applyToEither result completes exceptionally if action does
2368       */
2369 <    public void testAcceptEither_normalCompletion1() {
2369 >    public void testApplyToEither_actionFailed() {
2370          for (ExecutionMode m : ExecutionMode.values())
2371          for (Integer v1 : new Integer[] { 1, null })
2372          for (Integer v2 : new Integer[] { 2, null })
2373      {
2374          final CompletableFuture<Integer> f = new CompletableFuture<>();
2375          final CompletableFuture<Integer> g = new CompletableFuture<>();
2376 <        final IncAction r = new IncAction();
2377 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2376 >        final FailingFunction[] rs = new FailingFunction[6];
2377 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2378  
2379 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2380 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2381          f.complete(v1);
2382 <        checkCompletedNormally(h, null);
2383 <        assertEquals(inc(v1), r.value);
2384 <        g.complete(v2);
2385 <
2386 <        checkCompletedNormally(f, v1);
2387 <        checkCompletedNormally(g, v2);
2388 <        checkCompletedNormally(h, null);
1921 <    }}
1922 <
1923 <    public void testAcceptEither_normalCompletion2() {
1924 <        for (ExecutionMode m : ExecutionMode.values())
1925 <        for (Integer v1 : new Integer[] { 1, null })
1926 <        for (Integer v2 : new Integer[] { 2, null })
1927 <    {
1928 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1929 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1930 <        final IncAction r = new IncAction();
1931 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2382 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2383 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2384 >        checkCompletedWithWrappedCFException(h0);
2385 >        checkCompletedWithWrappedCFException(h1);
2386 >        checkCompletedWithWrappedCFException(h2);
2387 >        checkCompletedWithWrappedCFException(h3);
2388 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2389  
2390          g.complete(v2);
2391 <        checkCompletedNormally(h, null);
2392 <        assertEquals(inc(v2), r.value);
2393 <        f.complete(v1);
2391 >
2392 >        // unspecified behavior - both source completions available
2393 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2394 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2395 >
2396 >        checkCompletedWithWrappedCFException(h4);
2397 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2398 >                   Objects.equals(v2, rs[4].value));
2399 >        checkCompletedWithWrappedCFException(h5);
2400 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2401 >                   Objects.equals(v2, rs[5].value));
2402  
2403          checkCompletedNormally(f, v1);
2404          checkCompletedNormally(g, v2);
1940        checkCompletedNormally(h, null);
2405      }}
2406  
2407 <    public void testAcceptEither_normalCompletion3() {
2407 >    /**
2408 >     * acceptEither result completes normally after normal completion
2409 >     * of either source
2410 >     */
2411 >    public void testAcceptEither_normalCompletion() {
2412          for (ExecutionMode m : ExecutionMode.values())
2413          for (Integer v1 : new Integer[] { 1, null })
2414          for (Integer v2 : new Integer[] { 2, null })
2415      {
2416          final CompletableFuture<Integer> f = new CompletableFuture<>();
2417          final CompletableFuture<Integer> g = new CompletableFuture<>();
2418 <        final IncAction r = new IncAction();
2418 >        final NoopConsumer[] rs = new NoopConsumer[6];
2419 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2420  
2421 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2422 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2423 +        checkIncomplete(h0);
2424 +        checkIncomplete(h1);
2425 +        rs[0].assertNotInvoked();
2426 +        rs[1].assertNotInvoked();
2427          f.complete(v1);
2428 +        checkCompletedNormally(h0, null);
2429 +        checkCompletedNormally(h1, null);
2430 +        rs[0].assertValue(v1);
2431 +        rs[1].assertValue(v1);
2432 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2433 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2434 +        checkCompletedNormally(h2, null);
2435 +        checkCompletedNormally(h3, null);
2436 +        rs[2].assertValue(v1);
2437 +        rs[3].assertValue(v1);
2438          g.complete(v2);
1954        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2439  
2440 <        checkCompletedNormally(h, null);
2440 >        // unspecified behavior - both source completions available
2441 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2442 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2443 >        checkCompletedNormally(h4, null);
2444 >        checkCompletedNormally(h5, null);
2445 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2446 >                   Objects.equals(v2, rs[4].value));
2447 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2448 >                   Objects.equals(v2, rs[5].value));
2449 >
2450          checkCompletedNormally(f, v1);
2451          checkCompletedNormally(g, v2);
2452 <
2453 <        // unspecified behavior
2454 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2455 <                   Objects.equals(r.value, inc(v2)));
2452 >        checkCompletedNormally(h0, null);
2453 >        checkCompletedNormally(h1, null);
2454 >        checkCompletedNormally(h2, null);
2455 >        checkCompletedNormally(h3, null);
2456 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2457      }}
2458  
2459      /**
2460       * acceptEither result completes exceptionally after exceptional
2461       * completion of either source
2462       */
2463 <    public void testAcceptEither_exceptionalCompletion1() {
2463 >    public void testAcceptEither_exceptionalCompletion() {
2464          for (ExecutionMode m : ExecutionMode.values())
2465          for (Integer v1 : new Integer[] { 1, null })
2466      {
2467          final CompletableFuture<Integer> f = new CompletableFuture<>();
2468          final CompletableFuture<Integer> g = new CompletableFuture<>();
1975        final IncAction r = new IncAction();
1976        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2469          final CFException ex = new CFException();
2470 +        final NoopConsumer[] rs = new NoopConsumer[6];
2471 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2472  
2473 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2474 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2475 +        checkIncomplete(h0);
2476 +        checkIncomplete(h1);
2477 +        rs[0].assertNotInvoked();
2478 +        rs[1].assertNotInvoked();
2479          f.completeExceptionally(ex);
2480 <        checkCompletedWithWrappedCFException(h, ex);
2480 >        checkCompletedWithWrappedException(h0, ex);
2481 >        checkCompletedWithWrappedException(h1, ex);
2482 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2483 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2484 >        checkCompletedWithWrappedException(h2, ex);
2485 >        checkCompletedWithWrappedException(h3, ex);
2486 >
2487          g.complete(v1);
2488  
2489 <        assertEquals(0, r.invocationCount);
2489 >        // unspecified behavior - both source completions available
2490 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2491 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2492 >        try {
2493 >            assertNull(h4.join());
2494 >            rs[4].assertValue(v1);
2495 >        } catch (CompletionException ok) {
2496 >            checkCompletedWithWrappedException(h4, ex);
2497 >            rs[4].assertNotInvoked();
2498 >        }
2499 >        try {
2500 >            assertNull(h5.join());
2501 >            rs[5].assertValue(v1);
2502 >        } catch (CompletionException ok) {
2503 >            checkCompletedWithWrappedException(h5, ex);
2504 >            rs[5].assertNotInvoked();
2505 >        }
2506 >
2507 >        checkCompletedExceptionally(f, ex);
2508          checkCompletedNormally(g, v1);
2509 <        checkCompletedWithWrappedCFException(f, ex);
2510 <        checkCompletedWithWrappedCFException(h, ex);
2509 >        checkCompletedWithWrappedException(h0, ex);
2510 >        checkCompletedWithWrappedException(h1, ex);
2511 >        checkCompletedWithWrappedException(h2, ex);
2512 >        checkCompletedWithWrappedException(h3, ex);
2513 >        checkCompletedWithWrappedException(h4, ex);
2514 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2515      }}
2516  
2517      public void testAcceptEither_exceptionalCompletion2() {
2518          for (ExecutionMode m : ExecutionMode.values())
2519 +        for (boolean fFirst : new boolean[] { true, false })
2520          for (Integer v1 : new Integer[] { 1, null })
2521      {
2522          final CompletableFuture<Integer> f = new CompletableFuture<>();
2523          final CompletableFuture<Integer> g = new CompletableFuture<>();
1995        final IncAction r = new IncAction();
1996        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1997        final CFException ex = new CFException();
1998
1999        g.completeExceptionally(ex);
2000        checkCompletedWithWrappedCFException(h, ex);
2001        f.complete(v1);
2002
2003        assertEquals(0, r.invocationCount);
2004        checkCompletedNormally(f, v1);
2005        checkCompletedWithWrappedCFException(g, ex);
2006        checkCompletedWithWrappedCFException(h, ex);
2007    }}
2008
2009    public void testAcceptEither_exceptionalCompletion3() {
2010        for (ExecutionMode m : ExecutionMode.values())
2011        for (Integer v1 : new Integer[] { 1, null })
2012    {
2013        final CompletableFuture<Integer> f = new CompletableFuture<>();
2014        final CompletableFuture<Integer> g = new CompletableFuture<>();
2015        final IncAction r = new IncAction();
2524          final CFException ex = new CFException();
2525 +        final NoopConsumer[] rs = new NoopConsumer[6];
2526 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2527  
2528 <        g.completeExceptionally(ex);
2529 <        f.complete(v1);
2530 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2528 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2529 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2530 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2531 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2532 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2533 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2534  
2535 <        // unspecified behavior
2023 <        Integer v;
2535 >        // unspecified behavior - both source completions available
2536          try {
2537 <            assertNull(h.join());
2538 <            assertEquals(1, r.invocationCount);
2027 <            assertEquals(inc(v1), r.value);
2537 >            assertEquals(null, h0.join());
2538 >            rs[0].assertValue(v1);
2539          } catch (CompletionException ok) {
2540 <            checkCompletedWithWrappedCFException(h, ex);
2541 <            assertEquals(0, r.invocationCount);
2540 >            checkCompletedWithWrappedException(h0, ex);
2541 >            rs[0].assertNotInvoked();
2542          }
2032
2033        checkCompletedWithWrappedCFException(g, ex);
2034        checkCompletedNormally(f, v1);
2035    }}
2036
2037    public void testAcceptEither_exceptionalCompletion4() {
2038        for (ExecutionMode m : ExecutionMode.values())
2039        for (Integer v1 : new Integer[] { 1, null })
2040    {
2041        final CompletableFuture<Integer> f = new CompletableFuture<>();
2042        final CompletableFuture<Integer> g = new CompletableFuture<>();
2043        final IncAction r = new IncAction();
2044        final CFException ex = new CFException();
2045
2046        f.completeExceptionally(ex);
2047        g.complete(v1);
2048        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2049
2050        // unspecified behavior
2051        Integer v;
2543          try {
2544 <            assertNull(h.join());
2545 <            assertEquals(1, r.invocationCount);
2055 <            assertEquals(inc(v1), r.value);
2544 >            assertEquals(null, h1.join());
2545 >            rs[1].assertValue(v1);
2546          } catch (CompletionException ok) {
2547 <            checkCompletedWithWrappedCFException(h, ex);
2548 <            assertEquals(0, r.invocationCount);
2547 >            checkCompletedWithWrappedException(h1, ex);
2548 >            rs[1].assertNotInvoked();
2549 >        }
2550 >        try {
2551 >            assertEquals(null, h2.join());
2552 >            rs[2].assertValue(v1);
2553 >        } catch (CompletionException ok) {
2554 >            checkCompletedWithWrappedException(h2, ex);
2555 >            rs[2].assertNotInvoked();
2556 >        }
2557 >        try {
2558 >            assertEquals(null, h3.join());
2559 >            rs[3].assertValue(v1);
2560 >        } catch (CompletionException ok) {
2561 >            checkCompletedWithWrappedException(h3, ex);
2562 >            rs[3].assertNotInvoked();
2563          }
2564  
2061        checkCompletedWithWrappedCFException(f, ex);
2062        checkCompletedNormally(g, v1);
2063    }}
2064
2065    /**
2066     * acceptEither result completes exceptionally if action does
2067     */
2068    public void testAcceptEither_actionFailed1() {
2069        for (ExecutionMode m : ExecutionMode.values())
2070        for (Integer v1 : new Integer[] { 1, null })
2071        for (Integer v2 : new Integer[] { 2, null })
2072    {
2073        final CompletableFuture<Integer> f = new CompletableFuture<>();
2074        final CompletableFuture<Integer> g = new CompletableFuture<>();
2075        final FailingConsumer r = new FailingConsumer(m);
2076        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2077
2078        f.complete(v1);
2079        checkCompletedWithWrappedCFException(h);
2080        g.complete(v2);
2081        checkCompletedNormally(f, v1);
2082        checkCompletedNormally(g, v2);
2083    }}
2084
2085    public void testAcceptEither_actionFailed2() {
2086        for (ExecutionMode m : ExecutionMode.values())
2087        for (Integer v1 : new Integer[] { 1, null })
2088        for (Integer v2 : new Integer[] { 2, null })
2089    {
2090        final CompletableFuture<Integer> f = new CompletableFuture<>();
2091        final CompletableFuture<Integer> g = new CompletableFuture<>();
2092        final FailingConsumer r = new FailingConsumer(m);
2093        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2094
2095        g.complete(v2);
2096        checkCompletedWithWrappedCFException(h);
2097        f.complete(v1);
2565          checkCompletedNormally(f, v1);
2566 <        checkCompletedNormally(g, v2);
2566 >        checkCompletedExceptionally(g, ex);
2567      }}
2568  
2569      /**
2570       * acceptEither result completes exceptionally if either source cancelled
2571       */
2572 <    public void testAcceptEither_sourceCancelled1() {
2572 >    public void testAcceptEither_sourceCancelled() {
2573          for (ExecutionMode m : ExecutionMode.values())
2574          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2575          for (Integer v1 : new Integer[] { 1, null })
2576      {
2577          final CompletableFuture<Integer> f = new CompletableFuture<>();
2578          final CompletableFuture<Integer> g = new CompletableFuture<>();
2579 <        final IncAction r = new IncAction();
2580 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2579 >        final NoopConsumer[] rs = new NoopConsumer[6];
2580 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2581  
2582 <        assertTrue(f.cancel(mayInterruptIfRunning));
2583 <        checkCompletedWithWrappedCancellationException(h);
2584 <        g.complete(v1);
2582 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2583 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2584 >        checkIncomplete(h0);
2585 >        checkIncomplete(h1);
2586 >        rs[0].assertNotInvoked();
2587 >        rs[1].assertNotInvoked();
2588 >        f.cancel(mayInterruptIfRunning);
2589 >        checkCompletedWithWrappedCancellationException(h0);
2590 >        checkCompletedWithWrappedCancellationException(h1);
2591 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2592 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2593 >        checkCompletedWithWrappedCancellationException(h2);
2594 >        checkCompletedWithWrappedCancellationException(h3);
2595  
2596 <        checkCancelled(f);
2120 <        assertEquals(0, r.invocationCount);
2121 <        checkCompletedNormally(g, v1);
2122 <        checkCompletedWithWrappedCancellationException(h);
2123 <    }}
2124 <
2125 <    public void testAcceptEither_sourceCancelled2() {
2126 <        for (ExecutionMode m : ExecutionMode.values())
2127 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2128 <        for (Integer v1 : new Integer[] { 1, null })
2129 <    {
2130 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2131 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2132 <        final IncAction r = new IncAction();
2133 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2134 <
2135 <        assertTrue(g.cancel(mayInterruptIfRunning));
2136 <        checkCompletedWithWrappedCancellationException(h);
2137 <        f.complete(v1);
2138 <
2139 <        checkCancelled(g);
2140 <        assertEquals(0, r.invocationCount);
2141 <        checkCompletedNormally(f, v1);
2142 <        checkCompletedWithWrappedCancellationException(h);
2143 <    }}
2144 <
2145 <    public void testAcceptEither_sourceCancelled3() {
2146 <        for (ExecutionMode m : ExecutionMode.values())
2147 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2148 <        for (Integer v1 : new Integer[] { 1, null })
2149 <    {
2150 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2151 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2152 <        final IncAction r = new IncAction();
2153 <
2154 <        assertTrue(g.cancel(mayInterruptIfRunning));
2155 <        f.complete(v1);
2156 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2596 >        g.complete(v1);
2597  
2598 <        // unspecified behavior
2599 <        Integer v;
2598 >        // unspecified behavior - both source completions available
2599 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2600 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2601          try {
2602 <            assertNull(h.join());
2603 <            assertEquals(1, r.invocationCount);
2163 <            assertEquals(inc(v1), r.value);
2602 >            assertNull(h4.join());
2603 >            rs[4].assertValue(v1);
2604          } catch (CompletionException ok) {
2605 <            checkCompletedWithWrappedCancellationException(h);
2606 <            assertEquals(0, r.invocationCount);
2605 >            checkCompletedWithWrappedCancellationException(h4);
2606 >            rs[4].assertNotInvoked();
2607          }
2168
2169        checkCancelled(g);
2170        checkCompletedNormally(f, v1);
2171    }}
2172
2173    public void testAcceptEither_sourceCancelled4() {
2174        for (ExecutionMode m : ExecutionMode.values())
2175        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2176        for (Integer v1 : new Integer[] { 1, null })
2177    {
2178        final CompletableFuture<Integer> f = new CompletableFuture<>();
2179        final CompletableFuture<Integer> g = new CompletableFuture<>();
2180        final IncAction r = new IncAction();
2181
2182        assertTrue(f.cancel(mayInterruptIfRunning));
2183        g.complete(v1);
2184        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2185
2186        // unspecified behavior
2187        Integer v;
2608          try {
2609 <            assertNull(h.join());
2610 <            assertEquals(1, r.invocationCount);
2191 <            assertEquals(inc(v1), r.value);
2609 >            assertNull(h5.join());
2610 >            rs[5].assertValue(v1);
2611          } catch (CompletionException ok) {
2612 <            checkCompletedWithWrappedCancellationException(h);
2613 <            assertEquals(0, r.invocationCount);
2612 >            checkCompletedWithWrappedCancellationException(h5);
2613 >            rs[5].assertNotInvoked();
2614          }
2615  
2616          checkCancelled(f);
2617          checkCompletedNormally(g, v1);
2618 +        checkCompletedWithWrappedCancellationException(h0);
2619 +        checkCompletedWithWrappedCancellationException(h1);
2620 +        checkCompletedWithWrappedCancellationException(h2);
2621 +        checkCompletedWithWrappedCancellationException(h3);
2622 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2623      }}
2624  
2625      /**
2626 <     * runAfterEither result completes normally after normal completion
2203 <     * of either source
2626 >     * acceptEither result completes exceptionally if action does
2627       */
2628 <    public void testRunAfterEither_normalCompletion1() {
2628 >    public void testAcceptEither_actionFailed() {
2629          for (ExecutionMode m : ExecutionMode.values())
2630          for (Integer v1 : new Integer[] { 1, null })
2631          for (Integer v2 : new Integer[] { 2, null })
2632      {
2633          final CompletableFuture<Integer> f = new CompletableFuture<>();
2634          final CompletableFuture<Integer> g = new CompletableFuture<>();
2635 <        final Noop r = new Noop(m);
2636 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2635 >        final FailingConsumer[] rs = new FailingConsumer[6];
2636 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2637  
2638 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2639 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2640          f.complete(v1);
2641 <        checkCompletedNormally(h, null);
2642 <        assertEquals(1, r.invocationCount);
2641 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2642 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2643 >        checkCompletedWithWrappedCFException(h0);
2644 >        checkCompletedWithWrappedCFException(h1);
2645 >        checkCompletedWithWrappedCFException(h2);
2646 >        checkCompletedWithWrappedCFException(h3);
2647 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2648 >
2649          g.complete(v2);
2650  
2651 +        // unspecified behavior - both source completions available
2652 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2653 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2654 +
2655 +        checkCompletedWithWrappedCFException(h4);
2656 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2657 +                   Objects.equals(v2, rs[4].value));
2658 +        checkCompletedWithWrappedCFException(h5);
2659 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2660 +                   Objects.equals(v2, rs[5].value));
2661 +
2662          checkCompletedNormally(f, v1);
2663          checkCompletedNormally(g, v2);
2222        checkCompletedNormally(h, null);
2223        assertEquals(1, r.invocationCount);
2664      }}
2665  
2666 <    public void testRunAfterEither_normalCompletion2() {
2666 >    /**
2667 >     * runAfterEither result completes normally after normal completion
2668 >     * of either source
2669 >     */
2670 >    public void testRunAfterEither_normalCompletion() {
2671          for (ExecutionMode m : ExecutionMode.values())
2672          for (Integer v1 : new Integer[] { 1, null })
2673          for (Integer v2 : new Integer[] { 2, null })
2674      {
2675          final CompletableFuture<Integer> f = new CompletableFuture<>();
2676          final CompletableFuture<Integer> g = new CompletableFuture<>();
2677 <        final Noop r = new Noop(m);
2678 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2677 >        final Noop[] rs = new Noop[6];
2678 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2679  
2680 <        g.complete(v2);
2681 <        checkCompletedNormally(h, null);
2682 <        assertEquals(1, r.invocationCount);
2680 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2681 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2682 >        checkIncomplete(h0);
2683 >        checkIncomplete(h1);
2684 >        rs[0].assertNotInvoked();
2685 >        rs[1].assertNotInvoked();
2686          f.complete(v1);
2687 +        checkCompletedNormally(h0, null);
2688 +        checkCompletedNormally(h1, null);
2689 +        rs[0].assertInvoked();
2690 +        rs[1].assertInvoked();
2691 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2692 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2693 +        checkCompletedNormally(h2, null);
2694 +        checkCompletedNormally(h3, null);
2695 +        rs[2].assertInvoked();
2696 +        rs[3].assertInvoked();
2697  
2241        checkCompletedNormally(f, v1);
2242        checkCompletedNormally(g, v2);
2243        checkCompletedNormally(h, null);
2244        assertEquals(1, r.invocationCount);
2245        }}
2246
2247    public void testRunAfterEither_normalCompletion3() {
2248        for (ExecutionMode m : ExecutionMode.values())
2249        for (Integer v1 : new Integer[] { 1, null })
2250        for (Integer v2 : new Integer[] { 2, null })
2251    {
2252        final CompletableFuture<Integer> f = new CompletableFuture<>();
2253        final CompletableFuture<Integer> g = new CompletableFuture<>();
2254        final Noop r = new Noop(m);
2255
2256        f.complete(v1);
2698          g.complete(v2);
2258        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699  
2700 <        checkCompletedNormally(h, null);
2700 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2701 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2702 >
2703          checkCompletedNormally(f, v1);
2704          checkCompletedNormally(g, v2);
2705 <        assertEquals(1, r.invocationCount);
2705 >        checkCompletedNormally(h0, null);
2706 >        checkCompletedNormally(h1, null);
2707 >        checkCompletedNormally(h2, null);
2708 >        checkCompletedNormally(h3, null);
2709 >        checkCompletedNormally(h4, null);
2710 >        checkCompletedNormally(h5, null);
2711 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2712      }}
2713  
2714      /**
2715       * runAfterEither result completes exceptionally after exceptional
2716       * completion of either source
2717       */
2718 <    public void testRunAfterEither_exceptionalCompletion1() {
2718 >    public void testRunAfterEither_exceptionalCompletion() {
2719          for (ExecutionMode m : ExecutionMode.values())
2720          for (Integer v1 : new Integer[] { 1, null })
2721      {
2722          final CompletableFuture<Integer> f = new CompletableFuture<>();
2723          final CompletableFuture<Integer> g = new CompletableFuture<>();
2276        final Noop r = new Noop(m);
2277        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2724          final CFException ex = new CFException();
2725 +        final Noop[] rs = new Noop[6];
2726 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2727  
2728 <        f.completeExceptionally(ex);
2729 <        checkCompletedWithWrappedCFException(h, ex);
2730 <        g.complete(v1);
2728 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2729 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2730 >        checkIncomplete(h0);
2731 >        checkIncomplete(h1);
2732 >        rs[0].assertNotInvoked();
2733 >        rs[1].assertNotInvoked();
2734 >        assertTrue(f.completeExceptionally(ex));
2735 >        checkCompletedWithWrappedException(h0, ex);
2736 >        checkCompletedWithWrappedException(h1, ex);
2737 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2738 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2739 >        checkCompletedWithWrappedException(h2, ex);
2740 >        checkCompletedWithWrappedException(h3, ex);
2741  
2742 <        assertEquals(0, r.invocationCount);
2285 <        checkCompletedNormally(g, v1);
2286 <        checkCompletedWithWrappedCFException(f, ex);
2287 <        checkCompletedWithWrappedCFException(h, ex);
2288 <    }}
2289 <
2290 <    public void testRunAfterEither_exceptionalCompletion2() {
2291 <        for (ExecutionMode m : ExecutionMode.values())
2292 <        for (Integer v1 : new Integer[] { 1, null })
2293 <    {
2294 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2295 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2296 <        final Noop r = new Noop(m);
2297 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2298 <        final CFException ex = new CFException();
2299 <
2300 <        g.completeExceptionally(ex);
2301 <        checkCompletedWithWrappedCFException(h, ex);
2302 <        f.complete(v1);
2303 <
2304 <        assertEquals(0, r.invocationCount);
2305 <        checkCompletedNormally(f, v1);
2306 <        checkCompletedWithWrappedCFException(g, ex);
2307 <        checkCompletedWithWrappedCFException(h, ex);
2308 <    }}
2309 <
2310 <    public void testRunAfterEither_exceptionalCompletion3() {
2311 <        for (ExecutionMode m : ExecutionMode.values())
2312 <        for (Integer v1 : new Integer[] { 1, null })
2313 <    {
2314 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2315 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2316 <        final Noop r = new Noop(m);
2317 <        final CFException ex = new CFException();
2318 <
2319 <        g.completeExceptionally(ex);
2320 <        f.complete(v1);
2321 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2742 >        assertTrue(g.complete(v1));
2743  
2744 <        // unspecified behavior
2745 <        Integer v;
2744 >        // unspecified behavior - both source completions available
2745 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2746 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2747          try {
2748 <            assertNull(h.join());
2749 <            assertEquals(1, r.invocationCount);
2748 >            assertNull(h4.join());
2749 >            rs[4].assertInvoked();
2750          } catch (CompletionException ok) {
2751 <            checkCompletedWithWrappedCFException(h, ex);
2752 <            assertEquals(0, r.invocationCount);
2751 >            checkCompletedWithWrappedException(h4, ex);
2752 >            rs[4].assertNotInvoked();
2753          }
2332
2333        checkCompletedWithWrappedCFException(g, ex);
2334        checkCompletedNormally(f, v1);
2335    }}
2336
2337    public void testRunAfterEither_exceptionalCompletion4() {
2338        for (ExecutionMode m : ExecutionMode.values())
2339        for (Integer v1 : new Integer[] { 1, null })
2340    {
2341        final CompletableFuture<Integer> f = new CompletableFuture<>();
2342        final CompletableFuture<Integer> g = new CompletableFuture<>();
2343        final Noop r = new Noop(m);
2344        final CFException ex = new CFException();
2345
2346        f.completeExceptionally(ex);
2347        g.complete(v1);
2348        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2349
2350        // unspecified behavior
2351        Integer v;
2754          try {
2755 <            assertNull(h.join());
2756 <            assertEquals(1, r.invocationCount);
2755 >            assertNull(h5.join());
2756 >            rs[5].assertInvoked();
2757          } catch (CompletionException ok) {
2758 <            checkCompletedWithWrappedCFException(h, ex);
2759 <            assertEquals(0, r.invocationCount);
2758 >            checkCompletedWithWrappedException(h5, ex);
2759 >            rs[5].assertNotInvoked();
2760          }
2761  
2762 <        checkCompletedWithWrappedCFException(f, ex);
2762 >        checkCompletedExceptionally(f, ex);
2763          checkCompletedNormally(g, v1);
2764 +        checkCompletedWithWrappedException(h0, ex);
2765 +        checkCompletedWithWrappedException(h1, ex);
2766 +        checkCompletedWithWrappedException(h2, ex);
2767 +        checkCompletedWithWrappedException(h3, ex);
2768 +        checkCompletedWithWrappedException(h4, ex);
2769 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2770      }}
2771  
2772 <    /**
2365 <     * runAfterEither result completes exceptionally if action does
2366 <     */
2367 <    public void testRunAfterEither_actionFailed1() {
2772 >    public void testRunAfterEither_exceptionalCompletion2() {
2773          for (ExecutionMode m : ExecutionMode.values())
2774 +        for (boolean fFirst : new boolean[] { true, false })
2775          for (Integer v1 : new Integer[] { 1, null })
2370        for (Integer v2 : new Integer[] { 2, null })
2776      {
2777          final CompletableFuture<Integer> f = new CompletableFuture<>();
2778          final CompletableFuture<Integer> g = new CompletableFuture<>();
2779 <        final FailingRunnable r = new FailingRunnable(m);
2780 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2779 >        final CFException ex = new CFException();
2780 >        final Noop[] rs = new Noop[6];
2781 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2782  
2783 <        f.complete(v1);
2784 <        checkCompletedWithWrappedCFException(h);
2785 <        g.complete(v2);
2786 <        checkCompletedNormally(f, v1);
2787 <        checkCompletedNormally(g, v2);
2788 <    }}
2783 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2784 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2785 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2786 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2787 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2788 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2789  
2790 <    public void testRunAfterEither_actionFailed2() {
2791 <        for (ExecutionMode m : ExecutionMode.values())
2792 <        for (Integer v1 : new Integer[] { 1, null })
2793 <        for (Integer v2 : new Integer[] { 2, null })
2794 <    {
2795 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2796 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2797 <        final FailingRunnable r = new FailingRunnable(m);
2798 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2790 >        // unspecified behavior - both source completions available
2791 >        try {
2792 >            assertEquals(null, h0.join());
2793 >            rs[0].assertInvoked();
2794 >        } catch (CompletionException ok) {
2795 >            checkCompletedWithWrappedException(h0, ex);
2796 >            rs[0].assertNotInvoked();
2797 >        }
2798 >        try {
2799 >            assertEquals(null, h1.join());
2800 >            rs[1].assertInvoked();
2801 >        } catch (CompletionException ok) {
2802 >            checkCompletedWithWrappedException(h1, ex);
2803 >            rs[1].assertNotInvoked();
2804 >        }
2805 >        try {
2806 >            assertEquals(null, h2.join());
2807 >            rs[2].assertInvoked();
2808 >        } catch (CompletionException ok) {
2809 >            checkCompletedWithWrappedException(h2, ex);
2810 >            rs[2].assertNotInvoked();
2811 >        }
2812 >        try {
2813 >            assertEquals(null, h3.join());
2814 >            rs[3].assertInvoked();
2815 >        } catch (CompletionException ok) {
2816 >            checkCompletedWithWrappedException(h3, ex);
2817 >            rs[3].assertNotInvoked();
2818 >        }
2819  
2394        g.complete(v2);
2395        checkCompletedWithWrappedCFException(h);
2396        f.complete(v1);
2820          checkCompletedNormally(f, v1);
2821 <        checkCompletedNormally(g, v2);
2821 >        checkCompletedExceptionally(g, ex);
2822      }}
2823  
2824      /**
2825       * runAfterEither result completes exceptionally if either source cancelled
2826       */
2827 <    public void testRunAfterEither_sourceCancelled1() {
2405 <        for (ExecutionMode m : ExecutionMode.values())
2406 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2407 <        for (Integer v1 : new Integer[] { 1, null })
2408 <    {
2409 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2410 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2411 <        final Noop r = new Noop(m);
2412 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2413 <
2414 <        assertTrue(f.cancel(mayInterruptIfRunning));
2415 <        checkCompletedWithWrappedCancellationException(h);
2416 <        g.complete(v1);
2417 <
2418 <        checkCancelled(f);
2419 <        assertEquals(0, r.invocationCount);
2420 <        checkCompletedNormally(g, v1);
2421 <        checkCompletedWithWrappedCancellationException(h);
2422 <    }}
2423 <
2424 <    public void testRunAfterEither_sourceCancelled2() {
2425 <        for (ExecutionMode m : ExecutionMode.values())
2426 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2427 <        for (Integer v1 : new Integer[] { 1, null })
2428 <    {
2429 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2430 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2431 <        final Noop r = new Noop(m);
2432 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2433 <
2434 <        assertTrue(g.cancel(mayInterruptIfRunning));
2435 <        checkCompletedWithWrappedCancellationException(h);
2436 <        f.complete(v1);
2437 <
2438 <        checkCancelled(g);
2439 <        assertEquals(0, r.invocationCount);
2440 <        checkCompletedNormally(f, v1);
2441 <        checkCompletedWithWrappedCancellationException(h);
2442 <    }}
2443 <
2444 <    public void testRunAfterEither_sourceCancelled3() {
2827 >    public void testRunAfterEither_sourceCancelled() {
2828          for (ExecutionMode m : ExecutionMode.values())
2829          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2830          for (Integer v1 : new Integer[] { 1, null })
2831      {
2832          final CompletableFuture<Integer> f = new CompletableFuture<>();
2833          final CompletableFuture<Integer> g = new CompletableFuture<>();
2834 <        final Noop r = new Noop(m);
2834 >        final Noop[] rs = new Noop[6];
2835 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2836  
2837 <        assertTrue(g.cancel(mayInterruptIfRunning));
2838 <        f.complete(v1);
2839 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2840 <
2841 <        // unspecified behavior
2842 <        Integer v;
2837 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2838 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2839 >        checkIncomplete(h0);
2840 >        checkIncomplete(h1);
2841 >        rs[0].assertNotInvoked();
2842 >        rs[1].assertNotInvoked();
2843 >        f.cancel(mayInterruptIfRunning);
2844 >        checkCompletedWithWrappedCancellationException(h0);
2845 >        checkCompletedWithWrappedCancellationException(h1);
2846 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2847 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2848 >        checkCompletedWithWrappedCancellationException(h2);
2849 >        checkCompletedWithWrappedCancellationException(h3);
2850 >
2851 >        assertTrue(g.complete(v1));
2852 >
2853 >        // unspecified behavior - both source completions available
2854 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2855 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2856          try {
2857 <            assertNull(h.join());
2858 <            assertEquals(1, r.invocationCount);
2857 >            assertNull(h4.join());
2858 >            rs[4].assertInvoked();
2859          } catch (CompletionException ok) {
2860 <            checkCompletedWithWrappedCancellationException(h);
2861 <            assertEquals(0, r.invocationCount);
2860 >            checkCompletedWithWrappedCancellationException(h4);
2861 >            rs[4].assertNotInvoked();
2862 >        }
2863 >        try {
2864 >            assertNull(h5.join());
2865 >            rs[5].assertInvoked();
2866 >        } catch (CompletionException ok) {
2867 >            checkCompletedWithWrappedCancellationException(h5);
2868 >            rs[5].assertNotInvoked();
2869          }
2870  
2871 <        checkCancelled(g);
2872 <        checkCompletedNormally(f, v1);
2871 >        checkCancelled(f);
2872 >        checkCompletedNormally(g, v1);
2873 >        checkCompletedWithWrappedCancellationException(h0);
2874 >        checkCompletedWithWrappedCancellationException(h1);
2875 >        checkCompletedWithWrappedCancellationException(h2);
2876 >        checkCompletedWithWrappedCancellationException(h3);
2877 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2878      }}
2879  
2880 <    public void testRunAfterEither_sourceCancelled4() {
2880 >    /**
2881 >     * runAfterEither result completes exceptionally if action does
2882 >     */
2883 >    public void testRunAfterEither_actionFailed() {
2884          for (ExecutionMode m : ExecutionMode.values())
2473        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2885          for (Integer v1 : new Integer[] { 1, null })
2886 +        for (Integer v2 : new Integer[] { 2, null })
2887      {
2888          final CompletableFuture<Integer> f = new CompletableFuture<>();
2889          final CompletableFuture<Integer> g = new CompletableFuture<>();
2890 <        final Noop r = new Noop(m);
2890 >        final FailingRunnable[] rs = new FailingRunnable[6];
2891 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2892  
2893 <        assertTrue(f.cancel(mayInterruptIfRunning));
2894 <        g.complete(v1);
2895 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2896 <
2897 <        // unspecified behavior
2898 <        Integer v;
2899 <        try {
2900 <            assertNull(h.join());
2901 <            assertEquals(1, r.invocationCount);
2902 <        } catch (CompletionException ok) {
2903 <            checkCompletedWithWrappedCancellationException(h);
2904 <            assertEquals(0, r.invocationCount);
2905 <        }
2893 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2894 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2895 >        assertTrue(f.complete(v1));
2896 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2897 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2898 >        checkCompletedWithWrappedCFException(h0);
2899 >        checkCompletedWithWrappedCFException(h1);
2900 >        checkCompletedWithWrappedCFException(h2);
2901 >        checkCompletedWithWrappedCFException(h3);
2902 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2903 >        assertTrue(g.complete(v2));
2904 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2905 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2906 >        checkCompletedWithWrappedCFException(h4);
2907 >        checkCompletedWithWrappedCFException(h5);
2908  
2909 <        checkCancelled(f);
2910 <        checkCompletedNormally(g, v1);
2909 >        checkCompletedNormally(f, v1);
2910 >        checkCompletedNormally(g, v2);
2911 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2912      }}
2913  
2914      /**
# Line 2505 | Line 2921 | public class CompletableFutureTest exten
2921      {
2922          final CompletableFuture<Integer> f = new CompletableFuture<>();
2923          final CompletableFutureInc r = new CompletableFutureInc(m);
2924 <        if (!createIncomplete) f.complete(v1);
2924 >        if (!createIncomplete) assertTrue(f.complete(v1));
2925          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2926 <        if (createIncomplete) f.complete(v1);
2926 >        if (createIncomplete) assertTrue(f.complete(v1));
2927  
2928          checkCompletedNormally(g, inc(v1));
2929          checkCompletedNormally(f, v1);
2930 <        assertEquals(1, r.invocationCount);
2930 >        r.assertValue(v1);
2931      }}
2932  
2933      /**
# Line 2529 | Line 2945 | public class CompletableFutureTest exten
2945          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2946          if (createIncomplete) f.completeExceptionally(ex);
2947  
2948 <        checkCompletedWithWrappedCFException(g, ex);
2949 <        checkCompletedWithWrappedCFException(f, ex);
2950 <        assertEquals(0, r.invocationCount);
2948 >        checkCompletedWithWrappedException(g, ex);
2949 >        checkCompletedExceptionally(f, ex);
2950 >        r.assertNotInvoked();
2951      }}
2952  
2953      /**
# Line 2545 | Line 2961 | public class CompletableFutureTest exten
2961          final CompletableFuture<Integer> f = new CompletableFuture<>();
2962          final FailingCompletableFutureFunction r
2963              = new FailingCompletableFutureFunction(m);
2964 <        if (!createIncomplete) f.complete(v1);
2964 >        if (!createIncomplete) assertTrue(f.complete(v1));
2965          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2966 <        if (createIncomplete) f.complete(v1);
2966 >        if (createIncomplete) assertTrue(f.complete(v1));
2967  
2968          checkCompletedWithWrappedCFException(g);
2969          checkCompletedNormally(f, v1);
# Line 2590 | Line 3006 | public class CompletableFutureTest exten
3006       * when all components complete normally
3007       */
3008      public void testAllOf_normal() throws Exception {
3009 <        for (int k = 1; k < 20; ++k) {
3010 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3011 <            for (int i = 0; i < k; ++i)
3009 >        for (int k = 1; k < 10; k++) {
3010 >            CompletableFuture<Integer>[] fs
3011 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3012 >            for (int i = 0; i < k; i++)
3013                  fs[i] = new CompletableFuture<>();
3014              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3015 <            for (int i = 0; i < k; ++i) {
3015 >            for (int i = 0; i < k; i++) {
3016                  checkIncomplete(f);
3017                  checkIncomplete(CompletableFuture.allOf(fs));
3018                  fs[i].complete(one);
# Line 2605 | Line 3022 | public class CompletableFutureTest exten
3022          }
3023      }
3024  
3025 +    public void testAllOf_backwards() throws Exception {
3026 +        for (int k = 1; k < 10; k++) {
3027 +            CompletableFuture<Integer>[] fs
3028 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3029 +            for (int i = 0; i < k; i++)
3030 +                fs[i] = new CompletableFuture<>();
3031 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3032 +            for (int i = k - 1; i >= 0; i--) {
3033 +                checkIncomplete(f);
3034 +                checkIncomplete(CompletableFuture.allOf(fs));
3035 +                fs[i].complete(one);
3036 +            }
3037 +            checkCompletedNormally(f, null);
3038 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3039 +        }
3040 +    }
3041 +
3042 +    public void testAllOf_exceptional() throws Exception {
3043 +        for (int k = 1; k < 10; k++) {
3044 +            CompletableFuture<Integer>[] fs
3045 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3046 +            CFException ex = new CFException();
3047 +            for (int i = 0; i < k; i++)
3048 +                fs[i] = new CompletableFuture<>();
3049 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3050 +            for (int i = 0; i < k; i++) {
3051 +                checkIncomplete(f);
3052 +                checkIncomplete(CompletableFuture.allOf(fs));
3053 +                if (i != k/2) {
3054 +                    fs[i].complete(i);
3055 +                    checkCompletedNormally(fs[i], i);
3056 +                } else {
3057 +                    fs[i].completeExceptionally(ex);
3058 +                    checkCompletedExceptionally(fs[i], ex);
3059 +                }
3060 +            }
3061 +            checkCompletedWithWrappedException(f, ex);
3062 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3063 +        }
3064 +    }
3065 +
3066      /**
3067       * anyOf(no component futures) returns an incomplete future
3068       */
3069      public void testAnyOf_empty() throws Exception {
3070 +        for (Integer v1 : new Integer[] { 1, null })
3071 +    {
3072          CompletableFuture<Object> f = CompletableFuture.anyOf();
3073          checkIncomplete(f);
3074 <    }
3074 >
3075 >        f.complete(v1);
3076 >        checkCompletedNormally(f, v1);
3077 >    }}
3078  
3079      /**
3080       * anyOf returns a future completed normally with a value when
3081       * a component future does
3082       */
3083      public void testAnyOf_normal() throws Exception {
3084 <        for (int k = 0; k < 10; ++k) {
3084 >        for (int k = 0; k < 10; k++) {
3085              CompletableFuture[] fs = new CompletableFuture[k];
3086 <            for (int i = 0; i < k; ++i)
3086 >            for (int i = 0; i < k; i++)
3087                  fs[i] = new CompletableFuture<>();
3088              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3089              checkIncomplete(f);
3090 <            for (int i = 0; i < k; ++i) {
3091 <                fs[i].complete(one);
3092 <                checkCompletedNormally(f, one);
3093 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3090 >            for (int i = 0; i < k; i++) {
3091 >                fs[i].complete(i);
3092 >                checkCompletedNormally(f, 0);
3093 >                int x = (int) CompletableFuture.anyOf(fs).join();
3094 >                assertTrue(0 <= x && x <= i);
3095 >            }
3096 >        }
3097 >    }
3098 >    public void testAnyOf_normal_backwards() throws Exception {
3099 >        for (int k = 0; k < 10; k++) {
3100 >            CompletableFuture[] fs = new CompletableFuture[k];
3101 >            for (int i = 0; i < k; i++)
3102 >                fs[i] = new CompletableFuture<>();
3103 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3104 >            checkIncomplete(f);
3105 >            for (int i = k - 1; i >= 0; i--) {
3106 >                fs[i].complete(i);
3107 >                checkCompletedNormally(f, k - 1);
3108 >                int x = (int) CompletableFuture.anyOf(fs).join();
3109 >                assertTrue(i <= x && x <= k - 1);
3110              }
3111          }
3112      }
# Line 2636 | Line 3115 | public class CompletableFutureTest exten
3115       * anyOf result completes exceptionally when any component does.
3116       */
3117      public void testAnyOf_exceptional() throws Exception {
3118 <        for (int k = 0; k < 10; ++k) {
3118 >        for (int k = 0; k < 10; k++) {
3119 >            CompletableFuture[] fs = new CompletableFuture[k];
3120 >            CFException[] exs = new CFException[k];
3121 >            for (int i = 0; i < k; i++) {
3122 >                fs[i] = new CompletableFuture<>();
3123 >                exs[i] = new CFException();
3124 >            }
3125 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3126 >            checkIncomplete(f);
3127 >            for (int i = 0; i < k; i++) {
3128 >                fs[i].completeExceptionally(exs[i]);
3129 >                checkCompletedWithWrappedException(f, exs[0]);
3130 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3131 >            }
3132 >        }
3133 >    }
3134 >
3135 >    public void testAnyOf_exceptional_backwards() throws Exception {
3136 >        for (int k = 0; k < 10; k++) {
3137              CompletableFuture[] fs = new CompletableFuture[k];
3138 <            for (int i = 0; i < k; ++i)
3138 >            CFException[] exs = new CFException[k];
3139 >            for (int i = 0; i < k; i++) {
3140                  fs[i] = new CompletableFuture<>();
3141 +                exs[i] = new CFException();
3142 +            }
3143              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3144              checkIncomplete(f);
3145 <            for (int i = 0; i < k; ++i) {
3146 <                fs[i].completeExceptionally(new CFException());
3147 <                checkCompletedWithWrappedCFException(f);
3145 >            for (int i = k - 1; i >= 0; i--) {
3146 >                fs[i].completeExceptionally(exs[i]);
3147 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3148                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3149              }
3150          }
# Line 2663 | Line 3163 | public class CompletableFutureTest exten
3163          Runnable[] throwingActions = {
3164              () -> CompletableFuture.supplyAsync(null),
3165              () -> CompletableFuture.supplyAsync(null, exec),
3166 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3166 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3167  
3168              () -> CompletableFuture.runAsync(null),
3169              () -> CompletableFuture.runAsync(null, exec),
# Line 2768 | Line 3268 | public class CompletableFutureTest exten
3268          assertSame(f, f.toCompletableFuture());
3269      }
3270  
3271 <    /**
2772 <     * whenComplete action executes on normal completion, propagating
2773 <     * source result.
2774 <     */
2775 <    public void testWhenComplete_normalCompletion1() {
2776 <        for (ExecutionMode m : ExecutionMode.values())
2777 <        for (boolean createIncomplete : new boolean[] { true, false })
2778 <        for (Integer v1 : new Integer[] { 1, null })
2779 <    {
2780 <        final AtomicInteger a = new AtomicInteger(0);
2781 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2782 <        if (!createIncomplete) f.complete(v1);
2783 <        final CompletableFuture<Integer> g = m.whenComplete
2784 <            (f,
2785 <             (Integer x, Throwable t) -> {
2786 <                threadAssertSame(x, v1);
2787 <                threadAssertNull(t);
2788 <                a.getAndIncrement();
2789 <            });
2790 <        if (createIncomplete) f.complete(v1);
3271 >    //--- tests of implementation details; not part of official tck ---
3272  
3273 <        checkCompletedNormally(g, v1);
3274 <        checkCompletedNormally(f, v1);
3275 <        assertEquals(1, a.get());
3276 <    }}
3273 >    Object resultOf(CompletableFuture<?> f) {
3274 >        try {
3275 >            java.lang.reflect.Field resultField
3276 >                = CompletableFuture.class.getDeclaredField("result");
3277 >            resultField.setAccessible(true);
3278 >            return resultField.get(f);
3279 >        } catch (Throwable t) { throw new AssertionError(t); }
3280 >    }
3281  
3282 <    /**
3283 <     * whenComplete action executes on exceptional completion, propagating
2799 <     * source result.
2800 <     */
2801 <    public void testWhenComplete_exceptionalCompletion() {
3282 >    public void testExceptionPropagationReusesResultObject() {
3283 >        if (!testImplementationDetails) return;
3284          for (ExecutionMode m : ExecutionMode.values())
2803        for (boolean createIncomplete : new boolean[] { true, false })
2804        for (Integer v1 : new Integer[] { 1, null })
3285      {
2806        final AtomicInteger a = new AtomicInteger(0);
3286          final CFException ex = new CFException();
3287 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3288 <        if (!createIncomplete) f.completeExceptionally(ex);
2810 <        final CompletableFuture<Integer> g = m.whenComplete
2811 <            (f,
2812 <             (Integer x, Throwable t) -> {
2813 <                threadAssertNull(x);
2814 <                threadAssertSame(t, ex);
2815 <                a.getAndIncrement();
2816 <            });
2817 <        if (createIncomplete) f.completeExceptionally(ex);
2818 <        checkCompletedWithWrappedCFException(f, ex);
2819 <        checkCompletedWithWrappedCFException(g, ex);
2820 <        assertEquals(1, a.get());
2821 <    }}
3287 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3288 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3289  
3290 <    /**
3291 <     * whenComplete action executes on cancelled source, propagating
2825 <     * CancellationException.
2826 <     */
2827 <    public void testWhenComplete_sourceCancelled() {
2828 <        for (ExecutionMode m : ExecutionMode.values())
2829 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2830 <        for (boolean createIncomplete : new boolean[] { true, false })
2831 <    {
2832 <        final AtomicInteger a = new AtomicInteger(0);
2833 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2834 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2835 <        final CompletableFuture<Integer> g = m.whenComplete
2836 <            (f,
2837 <             (Integer x, Throwable t) -> {
2838 <                threadAssertNull(x);
2839 <                threadAssertTrue(t instanceof CancellationException);
2840 <                a.getAndIncrement();
2841 <            });
2842 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3290 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3291 >            = new ArrayList<>();
3292  
3293 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3294 <        checkCompletedWithWrappedCancellationException(g);
3295 <        checkCancelled(f);
2847 <        assertEquals(1, a.get());
2848 <    }}
3293 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3294 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3295 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3296  
3297 <    /**
3298 <     * If a whenComplete action throws an exception when triggered by
3299 <     * a normal completion, it completes exceptionally
2853 <     */
2854 <    public void testWhenComplete_actionFailed() {
2855 <        for (boolean createIncomplete : new boolean[] { true, false })
2856 <        for (ExecutionMode m : ExecutionMode.values())
2857 <        for (Integer v1 : new Integer[] { 1, null })
2858 <    {
2859 <        final AtomicInteger a = new AtomicInteger(0);
2860 <        final CFException ex = new CFException();
2861 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2862 <        if (!createIncomplete) f.complete(v1);
2863 <        final CompletableFuture<Integer> g = m.whenComplete
2864 <            (f,
2865 <             (Integer x, Throwable t) -> {
2866 <                threadAssertSame(x, v1);
2867 <                threadAssertNull(t);
2868 <                a.getAndIncrement();
2869 <                throw ex;
2870 <            });
2871 <        if (createIncomplete) f.complete(v1);
2872 <        checkCompletedNormally(f, v1);
2873 <        checkCompletedWithWrappedCFException(g, ex);
2874 <        assertEquals(1, a.get());
2875 <    }}
3297 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3298 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3299 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3300  
3301 <    /**
3302 <     * If a whenComplete action throws an exception when triggered by
3303 <     * a source completion that also throws an exception, the source
2880 <     * exception takes precedence.
2881 <     */
2882 <    public void testWhenComplete_actionFailedSourceFailed() {
2883 <        for (boolean createIncomplete : new boolean[] { true, false })
2884 <        for (ExecutionMode m : ExecutionMode.values())
2885 <        for (Integer v1 : new Integer[] { 1, null })
2886 <    {
2887 <        final AtomicInteger a = new AtomicInteger(0);
2888 <        final CFException ex1 = new CFException();
2889 <        final CFException ex2 = new CFException();
2890 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3301 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3302 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3303 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3304  
3305 <        if (!createIncomplete) f.completeExceptionally(ex1);
2893 <        final CompletableFuture<Integer> g = m.whenComplete
2894 <            (f,
2895 <             (Integer x, Throwable t) -> {
2896 <                threadAssertSame(t, ex1);
2897 <                threadAssertNull(x);
2898 <                a.getAndIncrement();
2899 <                throw ex2;
2900 <            });
2901 <        if (createIncomplete) f.completeExceptionally(ex1);
3305 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3306  
3307 <        checkCompletedWithWrappedCFException(f, ex1);
3308 <        checkCompletedWithWrappedCFException(g, ex1);
3309 <        assertEquals(1, a.get());
3307 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3308 >
3309 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3310 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3311 >
3312 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3313 >                 fun : funs) {
3314 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3315 >            f.completeExceptionally(ex);
3316 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3317 >            checkCompletedWithWrappedException(src, ex);
3318 >            CompletableFuture<?> dep = fun.apply(src);
3319 >            checkCompletedWithWrappedException(dep, ex);
3320 >            assertSame(resultOf(src), resultOf(dep));
3321 >        }
3322 >
3323 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3324 >                 fun : funs) {
3325 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3326 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3327 >            CompletableFuture<?> dep = fun.apply(src);
3328 >            f.completeExceptionally(ex);
3329 >            checkCompletedWithWrappedException(src, ex);
3330 >            checkCompletedWithWrappedException(dep, ex);
3331 >            assertSame(resultOf(src), resultOf(dep));
3332 >        }
3333 >
3334 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3335 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3336 >                 fun : funs) {
3337 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3338 >            f.cancel(mayInterruptIfRunning);
3339 >            checkCancelled(f);
3340 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3341 >            checkCompletedWithWrappedCancellationException(src);
3342 >            CompletableFuture<?> dep = fun.apply(src);
3343 >            checkCompletedWithWrappedCancellationException(dep);
3344 >            assertSame(resultOf(src), resultOf(dep));
3345 >        }
3346 >
3347 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3348 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3349 >                 fun : funs) {
3350 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3351 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3352 >            CompletableFuture<?> dep = fun.apply(src);
3353 >            f.cancel(mayInterruptIfRunning);
3354 >            checkCancelled(f);
3355 >            checkCompletedWithWrappedCancellationException(src);
3356 >            checkCompletedWithWrappedCancellationException(dep);
3357 >            assertSame(resultOf(src), resultOf(dep));
3358 >        }
3359      }}
3360  
3361   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines