ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.61 by jsr166, Wed Jun 4 04:34:49 2014 UTC vs.
Revision 1.80 by jsr166, Mon Jun 16 17:29:03 2014 UTC

# Line 105 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 131 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 206 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 228 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 240 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 261 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304          f = new CompletableFuture<>();
305 +        for (int i = 0; i < 2; i++) {
306 +            f.obtrudeException(ex = new CFException());
307 +            checkCompletedExceptionally(f, ex);
308 +        }
309 +
310 +        f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
279 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330          assertEquals(0, f.getNumberOfDependents());
331 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332          assertEquals(1, f.getNumberOfDependents());
333          assertEquals(0, g.getNumberOfDependents());
334 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335          assertEquals(2, f.getNumberOfDependents());
336 <        f.complete(1);
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 +        checkCompletedNormally(h, null);
340          assertEquals(0, f.getNumberOfDependents());
341          assertEquals(0, g.getNumberOfDependents());
342 <    }
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 304 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 320 | Line 373 | public class CompletableFutureTest exten
373          checkCompletedNormally(f, "test");
374      }
375  
376 <    static final class IntegerSupplier implements Supplier<Integer> {
324 <        final ExecutionMode m;
376 >    abstract class CheckedAction {
377          int invocationCount = 0;
378 +        final ExecutionMode m;
379 +        CheckedAction(ExecutionMode m) { this.m = m; }
380 +        void invoked() {
381 +            m.checkExecutionMode();
382 +            assertEquals(0, invocationCount++);
383 +        }
384 +        void assertNotInvoked() { assertEquals(0, invocationCount); }
385 +        void assertInvoked() { assertEquals(1, invocationCount); }
386 +    }
387 +
388 +    abstract class CheckedIntegerAction extends CheckedAction {
389 +        Integer value;
390 +        CheckedIntegerAction(ExecutionMode m) { super(m); }
391 +        void assertValue(Integer expected) {
392 +            assertInvoked();
393 +            assertEquals(expected, value);
394 +        }
395 +    }
396 +
397 +    class IntegerSupplier extends CheckedAction
398 +        implements Supplier<Integer>
399 +    {
400          final Integer value;
401          IntegerSupplier(ExecutionMode m, Integer value) {
402 <            this.m = m;
402 >            super(m);
403              this.value = value;
404          }
405          public Integer get() {
406 <            m.checkExecutionMode();
333 <            invocationCount++;
406 >            invoked();
407              return value;
408          }
409      }
# Line 340 | Line 413 | public class CompletableFutureTest exten
413          return (x == null) ? null : x + 1;
414      }
415  
416 <    static final class IncAction implements Consumer<Integer> {
417 <        int invocationCount = 0;
418 <        Integer value;
416 >    class NoopConsumer extends CheckedIntegerAction
417 >        implements Consumer<Integer>
418 >    {
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420          public void accept(Integer x) {
421 <            invocationCount++;
422 <            value = inc(x);
421 >            invoked();
422 >            value = x;
423          }
424      }
425 <    static final class IncFunction implements Function<Integer,Integer> {
426 <        final ExecutionMode m;
427 <        int invocationCount = 0;
428 <        Integer value;
429 <        IncFunction(ExecutionMode m) { this.m = m; }
425 >
426 >    class IncFunction extends CheckedIntegerAction
427 >        implements Function<Integer,Integer>
428 >    {
429 >        IncFunction(ExecutionMode m) { super(m); }
430          public Integer apply(Integer x) {
431 <            m.checkExecutionMode();
358 <            invocationCount++;
431 >            invoked();
432              return value = inc(x);
433          }
434      }
# Line 368 | Line 441 | public class CompletableFutureTest exten
441              - ((y == null) ? 99 : y.intValue());
442      }
443  
444 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
445 <        final ExecutionMode m;
446 <        int invocationCount = 0;
447 <        Integer value;
375 <        // Check this action was invoked exactly once when result is computed.
376 <        SubtractAction(ExecutionMode m) { this.m = m; }
444 >    class SubtractAction extends CheckedIntegerAction
445 >        implements BiConsumer<Integer, Integer>
446 >    {
447 >        SubtractAction(ExecutionMode m) { super(m); }
448          public void accept(Integer x, Integer y) {
449 <            m.checkExecutionMode();
379 <            invocationCount++;
449 >            invoked();
450              value = subtract(x, y);
451          }
452      }
453 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
454 <        final ExecutionMode m;
455 <        int invocationCount = 0;
456 <        Integer value;
457 <        // Check this action was invoked exactly once when result is computed.
388 <        SubtractFunction(ExecutionMode m) { this.m = m; }
453 >
454 >    class SubtractFunction extends CheckedIntegerAction
455 >        implements BiFunction<Integer, Integer, Integer>
456 >    {
457 >        SubtractFunction(ExecutionMode m) { super(m); }
458          public Integer apply(Integer x, Integer y) {
459 <            m.checkExecutionMode();
391 <            invocationCount++;
459 >            invoked();
460              return value = subtract(x, y);
461          }
462      }
463  
464 <    static final class Noop implements Runnable {
465 <        final ExecutionMode m;
398 <        int invocationCount = 0;
399 <        Noop(ExecutionMode m) { this.m = m; }
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466          public void run() {
467 <            m.checkExecutionMode();
402 <            invocationCount++;
467 >            invoked();
468          }
469      }
470  
471 <    static final class FailingSupplier implements Supplier<Integer> {
472 <        final ExecutionMode m;
473 <        int invocationCount = 0;
474 <        FailingSupplier(ExecutionMode m) { this.m = m; }
471 >    class FailingSupplier extends CheckedAction
472 >        implements Supplier<Integer>
473 >    {
474 >        FailingSupplier(ExecutionMode m) { super(m); }
475          public Integer get() {
476 <            m.checkExecutionMode();
412 <            invocationCount++;
476 >            invoked();
477              throw new CFException();
478          }
479      }
480 <    static final class FailingConsumer implements Consumer<Integer> {
481 <        final ExecutionMode m;
482 <        int invocationCount = 0;
483 <        FailingConsumer(ExecutionMode m) { this.m = m; }
480 >
481 >    class FailingConsumer extends CheckedIntegerAction
482 >        implements Consumer<Integer>
483 >    {
484 >        FailingConsumer(ExecutionMode m) { super(m); }
485          public void accept(Integer x) {
486 <            m.checkExecutionMode();
487 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              throw new CFException();
489          }
490      }
491 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
492 <        final ExecutionMode m;
493 <        int invocationCount = 0;
494 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
491 >
492 >    class FailingBiConsumer extends CheckedIntegerAction
493 >        implements BiConsumer<Integer, Integer>
494 >    {
495 >        FailingBiConsumer(ExecutionMode m) { super(m); }
496          public void accept(Integer x, Integer y) {
497 <            m.checkExecutionMode();
498 <            invocationCount++;
497 >            invoked();
498 >            value = subtract(x, y);
499              throw new CFException();
500          }
501      }
502 <    static final class FailingFunction implements Function<Integer, Integer> {
503 <        final ExecutionMode m;
504 <        int invocationCount = 0;
505 <        FailingFunction(ExecutionMode m) { this.m = m; }
502 >
503 >    class FailingFunction extends CheckedIntegerAction
504 >        implements Function<Integer, Integer>
505 >    {
506 >        FailingFunction(ExecutionMode m) { super(m); }
507          public Integer apply(Integer x) {
508 <            m.checkExecutionMode();
509 <            invocationCount++;
508 >            invoked();
509 >            value = x;
510              throw new CFException();
511          }
512      }
513 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
514 <        final ExecutionMode m;
515 <        int invocationCount = 0;
516 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
513 >
514 >    class FailingBiFunction extends CheckedIntegerAction
515 >        implements BiFunction<Integer, Integer, Integer>
516 >    {
517 >        FailingBiFunction(ExecutionMode m) { super(m); }
518          public Integer apply(Integer x, Integer y) {
519 <            m.checkExecutionMode();
520 <            invocationCount++;
519 >            invoked();
520 >            value = subtract(x, y);
521              throw new CFException();
522          }
523      }
524 <    static final class FailingRunnable implements Runnable {
525 <        final ExecutionMode m;
526 <        int invocationCount = 0;
459 <        FailingRunnable(ExecutionMode m) { this.m = m; }
524 >
525 >    class FailingRunnable extends CheckedAction implements Runnable {
526 >        FailingRunnable(ExecutionMode m) { super(m); }
527          public void run() {
528 <            m.checkExecutionMode();
462 <            invocationCount++;
528 >            invoked();
529              throw new CFException();
530          }
531      }
532  
533 <    static final class CompletableFutureInc
534 <        implements Function<Integer, CompletableFuture<Integer>> {
535 <        final ExecutionMode m;
536 <        int invocationCount = 0;
537 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
533 >
534 >    class CompletableFutureInc extends CheckedIntegerAction
535 >        implements Function<Integer, CompletableFuture<Integer>>
536 >    {
537 >        CompletableFutureInc(ExecutionMode m) { super(m); }
538          public CompletableFuture<Integer> apply(Integer x) {
539 <            m.checkExecutionMode();
540 <            invocationCount++;
539 >            invoked();
540 >            value = x;
541              CompletableFuture<Integer> f = new CompletableFuture<>();
542 <            f.complete(inc(x));
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
546  
547 <    static final class FailingCompletableFutureFunction
548 <        implements Function<Integer, CompletableFuture<Integer>> {
549 <        final ExecutionMode m;
550 <        int invocationCount = 0;
485 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
547 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
548 >        implements Function<Integer, CompletableFuture<Integer>>
549 >    {
550 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
551          public CompletableFuture<Integer> apply(Integer x) {
552 <            m.checkExecutionMode();
553 <            invocationCount++;
552 >            invoked();
553 >            value = x;
554              throw new CFException();
555          }
556      }
# Line 782 | Line 847 | public class CompletableFutureTest exten
847      {
848          final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        if (!createIncomplete) f.complete(v1);
850 >        if (!createIncomplete) assertTrue(f.complete(v1));
851          final CompletableFuture<Integer> g = f.exceptionally
852              ((Throwable t) -> {
853                  // Should not be called
854                  a.getAndIncrement();
855                  throw new AssertionError();
856              });
857 <        if (createIncomplete) f.complete(v1);
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859          checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861          assertEquals(0, a.get());
862      }}
863  
799
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 840 | Line 904 | public class CompletableFutureTest exten
904              });
905          if (createIncomplete) f.completeExceptionally(ex1);
906  
907 <        checkCompletedWithWrappedCFException(g, ex2);
907 >        checkCompletedWithWrappedException(g, ex2);
908 >        assertEquals(1, a.get());
909 >    }}
910 >
911 >    /**
912 >     * whenComplete action executes on normal completion, propagating
913 >     * source result.
914 >     */
915 >    public void testWhenComplete_normalCompletion1() {
916 >        for (ExecutionMode m : ExecutionMode.values())
917 >        for (boolean createIncomplete : new boolean[] { true, false })
918 >        for (Integer v1 : new Integer[] { 1, null })
919 >    {
920 >        final AtomicInteger a = new AtomicInteger(0);
921 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
922 >        if (!createIncomplete) assertTrue(f.complete(v1));
923 >        final CompletableFuture<Integer> g = m.whenComplete
924 >            (f,
925 >             (Integer x, Throwable t) -> {
926 >                m.checkExecutionMode();
927 >                threadAssertSame(x, v1);
928 >                threadAssertNull(t);
929 >                a.getAndIncrement();
930 >            });
931 >        if (createIncomplete) assertTrue(f.complete(v1));
932 >
933 >        checkCompletedNormally(g, v1);
934 >        checkCompletedNormally(f, v1);
935 >        assertEquals(1, a.get());
936 >    }}
937 >
938 >    /**
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941 >     */
942 >    public void testWhenComplete_exceptionalCompletion() {
943 >        for (ExecutionMode m : ExecutionMode.values())
944 >        for (boolean createIncomplete : new boolean[] { true, false })
945 >        for (Integer v1 : new Integer[] { 1, null })
946 >    {
947 >        final AtomicInteger a = new AtomicInteger(0);
948 >        final CFException ex = new CFException();
949 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 >        if (!createIncomplete) f.completeExceptionally(ex);
951 >        final CompletableFuture<Integer> g = m.whenComplete
952 >            (f,
953 >             (Integer x, Throwable t) -> {
954 >                m.checkExecutionMode();
955 >                threadAssertNull(x);
956 >                threadAssertSame(t, ex);
957 >                a.getAndIncrement();
958 >            });
959 >        if (createIncomplete) f.completeExceptionally(ex);
960 >
961 >        checkCompletedWithWrappedException(g, ex);
962 >        checkCompletedExceptionally(f, ex);
963 >        assertEquals(1, a.get());
964 >    }}
965 >
966 >    /**
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969 >     */
970 >    public void testWhenComplete_sourceCancelled() {
971 >        for (ExecutionMode m : ExecutionMode.values())
972 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 >        for (boolean createIncomplete : new boolean[] { true, false })
974 >    {
975 >        final AtomicInteger a = new AtomicInteger(0);
976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 >        final CompletableFuture<Integer> g = m.whenComplete
979 >            (f,
980 >             (Integer x, Throwable t) -> {
981 >                m.checkExecutionMode();
982 >                threadAssertNull(x);
983 >                threadAssertTrue(t instanceof CancellationException);
984 >                a.getAndIncrement();
985 >            });
986 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 >
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992 >
993 >    /**
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996 >     */
997 >    public void testWhenComplete_actionFailed() {
998 >        for (boolean createIncomplete : new boolean[] { true, false })
999 >        for (ExecutionMode m : ExecutionMode.values())
1000 >        for (Integer v1 : new Integer[] { 1, null })
1001 >    {
1002 >        final AtomicInteger a = new AtomicInteger(0);
1003 >        final CFException ex = new CFException();
1004 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 >        if (!createIncomplete) assertTrue(f.complete(v1));
1006 >        final CompletableFuture<Integer> g = m.whenComplete
1007 >            (f,
1008 >             (Integer x, Throwable t) -> {
1009 >                m.checkExecutionMode();
1010 >                threadAssertSame(x, v1);
1011 >                threadAssertNull(t);
1012 >                a.getAndIncrement();
1013 >                throw ex;
1014 >            });
1015 >        if (createIncomplete) assertTrue(f.complete(v1));
1016 >
1017 >        checkCompletedWithWrappedException(g, ex);
1018 >        checkCompletedNormally(f, v1);
1019 >        assertEquals(1, a.get());
1020 >    }}
1021 >
1022 >    /**
1023 >     * If a whenComplete action throws an exception when triggered by
1024 >     * a source completion that also throws an exception, the source
1025 >     * exception takes precedence.
1026 >     */
1027 >    public void testWhenComplete_actionFailedSourceFailed() {
1028 >        for (boolean createIncomplete : new boolean[] { true, false })
1029 >        for (ExecutionMode m : ExecutionMode.values())
1030 >        for (Integer v1 : new Integer[] { 1, null })
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer x, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042 >                threadAssertSame(t, ex1);
1043 >                threadAssertNull(x);
1044 >                a.getAndIncrement();
1045 >                throw ex2;
1046 >            });
1047 >        if (createIncomplete) f.completeExceptionally(ex1);
1048 >
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051          assertEquals(1, a.get());
1052      }}
1053  
# Line 855 | Line 1062 | public class CompletableFutureTest exten
1062      {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064          final AtomicInteger a = new AtomicInteger(0);
1065 <        if (!createIncomplete) f.complete(v1);
1065 >        if (!createIncomplete) assertTrue(f.complete(v1));
1066          final CompletableFuture<Integer> g = m.handle
1067              (f,
1068               (Integer x, Throwable t) -> {
# Line 865 | Line 1072 | public class CompletableFutureTest exten
1072                  a.getAndIncrement();
1073                  return inc(v1);
1074              });
1075 <        if (createIncomplete) f.complete(v1);
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077          checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
# Line 897 | Line 1104 | public class CompletableFutureTest exten
1104          if (createIncomplete) f.completeExceptionally(ex);
1105  
1106          checkCompletedNormally(g, v1);
1107 <        checkCompletedWithWrappedCFException(f, ex);
1107 >        checkCompletedExceptionally(f, ex);
1108          assertEquals(1, a.get());
1109      }}
1110  
# Line 953 | Line 1160 | public class CompletableFutureTest exten
1160              });
1161          if (createIncomplete) f.completeExceptionally(ex1);
1162  
1163 <        checkCompletedWithWrappedCFException(g, ex2);
1164 <        checkCompletedWithWrappedCFException(f, ex1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165          assertEquals(1, a.get());
1166      }}
1167  
# Line 966 | Line 1173 | public class CompletableFutureTest exten
1173          final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175          final CFException ex = new CFException();
1176 <        if (!createIncomplete) f.complete(v1);
1176 >        if (!createIncomplete) assertTrue(f.complete(v1));
1177          final CompletableFuture<Integer> g = m.handle
1178              (f,
1179               (Integer x, Throwable t) -> {
# Line 976 | Line 1183 | public class CompletableFutureTest exten
1183                  a.getAndIncrement();
1184                  throw ex;
1185              });
1186 <        if (createIncomplete) f.complete(v1);
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188 <        checkCompletedWithWrappedCFException(g, ex);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190          assertEquals(1, a.get());
1191      }}
# Line 997 | Line 1204 | public class CompletableFutureTest exten
1204          final CompletableFuture<Void> f = m.runAsync(r);
1205          assertNull(f.join());
1206          checkCompletedNormally(f, null);
1207 <        assertEquals(1, r.invocationCount);
1207 >        r.assertInvoked();
1208      }}
1209  
1210      /**
# Line 1013 | Line 1220 | public class CompletableFutureTest exten
1220          final FailingRunnable r = new FailingRunnable(m);
1221          final CompletableFuture<Void> f = m.runAsync(r);
1222          checkCompletedWithWrappedCFException(f);
1223 <        assertEquals(1, r.invocationCount);
1223 >        r.assertInvoked();
1224      }}
1225  
1226      /**
# Line 1031 | Line 1238 | public class CompletableFutureTest exten
1238          final CompletableFuture<Integer> f = m.supplyAsync(r);
1239          assertSame(v1, f.join());
1240          checkCompletedNormally(f, v1);
1241 <        assertEquals(1, r.invocationCount);
1241 >        r.assertInvoked();
1242      }}
1243  
1244      /**
# Line 1047 | Line 1254 | public class CompletableFutureTest exten
1254          FailingSupplier r = new FailingSupplier(m);
1255          CompletableFuture<Integer> f = m.supplyAsync(r);
1256          checkCompletedWithWrappedCFException(f);
1257 <        assertEquals(1, r.invocationCount);
1257 >        r.assertInvoked();
1258      }}
1259  
1260      // seq completion methods
# Line 1062 | Line 1269 | public class CompletableFutureTest exten
1269      {
1270          final CompletableFuture<Integer> f = new CompletableFuture<>();
1271          final Noop r = new Noop(m);
1272 <        if (!createIncomplete) f.complete(v1);
1272 >        if (!createIncomplete) assertTrue(f.complete(v1));
1273          final CompletableFuture<Void> g = m.thenRun(f, r);
1274          if (createIncomplete) {
1275              checkIncomplete(g);
1276 <            f.complete(v1);
1276 >            assertTrue(f.complete(v1));
1277          }
1278  
1279          checkCompletedNormally(g, null);
1280          checkCompletedNormally(f, v1);
1281 <        assertEquals(1, r.invocationCount);
1281 >        r.assertInvoked();
1282      }}
1283  
1284      /**
# Line 1092 | Line 1299 | public class CompletableFutureTest exten
1299              f.completeExceptionally(ex);
1300          }
1301  
1302 <        checkCompletedWithWrappedCFException(g, ex);
1303 <        checkCompletedWithWrappedCFException(f, ex);
1304 <        assertEquals(0, r.invocationCount);
1302 >        checkCompletedWithWrappedException(g, ex);
1303 >        checkCompletedExceptionally(f, ex);
1304 >        r.assertNotInvoked();
1305      }}
1306  
1307      /**
# Line 1116 | Line 1323 | public class CompletableFutureTest exten
1323  
1324          checkCompletedWithWrappedCancellationException(g);
1325          checkCancelled(f);
1326 <        assertEquals(0, r.invocationCount);
1326 >        r.assertNotInvoked();
1327      }}
1328  
1329      /**
# Line 1129 | Line 1336 | public class CompletableFutureTest exten
1336      {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final FailingRunnable r = new FailingRunnable(m);
1339 <        if (!createIncomplete) f.complete(v1);
1339 >        if (!createIncomplete) assertTrue(f.complete(v1));
1340          final CompletableFuture<Void> g = m.thenRun(f, r);
1341          if (createIncomplete) {
1342              checkIncomplete(g);
1343 <            f.complete(v1);
1343 >            assertTrue(f.complete(v1));
1344          }
1345  
1346          checkCompletedWithWrappedCFException(g);
# Line 1150 | Line 1357 | public class CompletableFutureTest exten
1357      {
1358          final CompletableFuture<Integer> f = new CompletableFuture<>();
1359          final IncFunction r = new IncFunction(m);
1360 <        if (!createIncomplete) f.complete(v1);
1360 >        if (!createIncomplete) assertTrue(f.complete(v1));
1361          final CompletableFuture<Integer> g = m.thenApply(f, r);
1362          if (createIncomplete) {
1363              checkIncomplete(g);
1364 <            f.complete(v1);
1364 >            assertTrue(f.complete(v1));
1365          }
1366  
1367          checkCompletedNormally(g, inc(v1));
1368          checkCompletedNormally(f, v1);
1369 <        assertEquals(1, r.invocationCount);
1369 >        r.assertValue(inc(v1));
1370      }}
1371  
1372      /**
# Line 1180 | Line 1387 | public class CompletableFutureTest exten
1387              f.completeExceptionally(ex);
1388          }
1389  
1390 <        checkCompletedWithWrappedCFException(g, ex);
1391 <        checkCompletedWithWrappedCFException(f, ex);
1392 <        assertEquals(0, r.invocationCount);
1390 >        checkCompletedWithWrappedException(g, ex);
1391 >        checkCompletedExceptionally(f, ex);
1392 >        r.assertNotInvoked();
1393      }}
1394  
1395      /**
# Line 1204 | Line 1411 | public class CompletableFutureTest exten
1411  
1412          checkCompletedWithWrappedCancellationException(g);
1413          checkCancelled(f);
1414 <        assertEquals(0, r.invocationCount);
1414 >        r.assertNotInvoked();
1415      }}
1416  
1417      /**
# Line 1217 | Line 1424 | public class CompletableFutureTest exten
1424      {
1425          final CompletableFuture<Integer> f = new CompletableFuture<>();
1426          final FailingFunction r = new FailingFunction(m);
1427 <        if (!createIncomplete) f.complete(v1);
1427 >        if (!createIncomplete) assertTrue(f.complete(v1));
1428          final CompletableFuture<Integer> g = m.thenApply(f, r);
1429          if (createIncomplete) {
1430              checkIncomplete(g);
1431 <            f.complete(v1);
1431 >            assertTrue(f.complete(v1));
1432          }
1433  
1434          checkCompletedWithWrappedCFException(g);
# Line 1237 | Line 1444 | public class CompletableFutureTest exten
1444          for (Integer v1 : new Integer[] { 1, null })
1445      {
1446          final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 <        final IncAction r = new IncAction();
1448 <        if (!createIncomplete) f.complete(v1);
1447 >        final NoopConsumer r = new NoopConsumer(m);
1448 >        if (!createIncomplete) assertTrue(f.complete(v1));
1449          final CompletableFuture<Void> g = m.thenAccept(f, r);
1450          if (createIncomplete) {
1451              checkIncomplete(g);
1452 <            f.complete(v1);
1452 >            assertTrue(f.complete(v1));
1453          }
1454  
1455          checkCompletedNormally(g, null);
1456 +        r.assertValue(v1);
1457          checkCompletedNormally(f, v1);
1250        assertEquals(1, r.invocationCount);
1251        assertEquals(inc(v1), r.value);
1458      }}
1459  
1460      /**
# Line 1261 | Line 1467 | public class CompletableFutureTest exten
1467      {
1468          final CFException ex = new CFException();
1469          final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final IncAction r = new IncAction();
1470 >        final NoopConsumer r = new NoopConsumer(m);
1471          if (!createIncomplete) f.completeExceptionally(ex);
1472          final CompletableFuture<Void> g = m.thenAccept(f, r);
1473          if (createIncomplete) {
# Line 1269 | Line 1475 | public class CompletableFutureTest exten
1475              f.completeExceptionally(ex);
1476          }
1477  
1478 <        checkCompletedWithWrappedCFException(g, ex);
1479 <        checkCompletedWithWrappedCFException(f, ex);
1480 <        assertEquals(0, r.invocationCount);
1478 >        checkCompletedWithWrappedException(g, ex);
1479 >        checkCompletedExceptionally(f, ex);
1480 >        r.assertNotInvoked();
1481      }}
1482  
1483      /**
# Line 1283 | Line 1489 | public class CompletableFutureTest exten
1489          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final IncAction r = new IncAction();
1492 >        final NoopConsumer r = new NoopConsumer(m);
1493          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494          final CompletableFuture<Void> g = m.thenAccept(f, r);
1495          if (createIncomplete) {
# Line 1293 | Line 1499 | public class CompletableFutureTest exten
1499  
1500          checkCompletedWithWrappedCancellationException(g);
1501          checkCancelled(f);
1502 <        assertEquals(0, r.invocationCount);
1502 >        r.assertNotInvoked();
1503      }}
1504  
1505      /**
# Line 1323 | Line 1529 | public class CompletableFutureTest exten
1529       */
1530      public void testThenCombine_normalCompletion() {
1531          for (ExecutionMode m : ExecutionMode.values())
1326        for (boolean createIncomplete : new boolean[] { true, false })
1532          for (boolean fFirst : new boolean[] { true, false })
1533          for (Integer v1 : new Integer[] { 1, null })
1534          for (Integer v2 : new Integer[] { 2, null })
1535      {
1536          final CompletableFuture<Integer> f = new CompletableFuture<>();
1537          final CompletableFuture<Integer> g = new CompletableFuture<>();
1538 <        final SubtractFunction r = new SubtractFunction(m);
1539 <
1540 <        if (fFirst) f.complete(v1); else g.complete(v2);
1541 <        if (!createIncomplete)
1542 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1543 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1544 <        if (createIncomplete) {
1545 <            checkIncomplete(h);
1546 <            assertEquals(0, r.invocationCount);
1547 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1548 <        }
1549 <
1550 <        checkCompletedNormally(h, subtract(v1, v2));
1538 >        final SubtractFunction r1 = new SubtractFunction(m);
1539 >        final SubtractFunction r2 = new SubtractFunction(m);
1540 >        final SubtractFunction r3 = new SubtractFunction(m);
1541 >
1542 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1543 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1544 >        final Integer w1 =  fFirst ? v1 : v2;
1545 >        final Integer w2 = !fFirst ? v1 : v2;
1546 >
1547 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1548 >        assertTrue(fst.complete(w1));
1549 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1550 >        checkIncomplete(h1);
1551 >        checkIncomplete(h2);
1552 >        r1.assertNotInvoked();
1553 >        r2.assertNotInvoked();
1554 >        assertTrue(snd.complete(w2));
1555 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1556 >
1557 >        checkCompletedNormally(h1, subtract(v1, v2));
1558 >        checkCompletedNormally(h2, subtract(v1, v2));
1559 >        checkCompletedNormally(h3, subtract(v1, v2));
1560 >        r1.assertValue(subtract(v1, v2));
1561 >        r2.assertValue(subtract(v1, v2));
1562 >        r3.assertValue(subtract(v1, v2));
1563          checkCompletedNormally(f, v1);
1564          checkCompletedNormally(g, v2);
1348        assertEquals(1, r.invocationCount);
1565      }}
1566  
1567      /**
1568       * thenCombine result completes exceptionally after exceptional
1569       * completion of either source
1570       */
1571 <    public void testThenCombine_exceptionalCompletion() {
1571 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1572          for (ExecutionMode m : ExecutionMode.values())
1357        for (boolean createIncomplete : new boolean[] { true, false })
1573          for (boolean fFirst : new boolean[] { true, false })
1574 +        for (boolean failFirst : new boolean[] { true, false })
1575          for (Integer v1 : new Integer[] { 1, null })
1576      {
1577          final CompletableFuture<Integer> f = new CompletableFuture<>();
1578          final CompletableFuture<Integer> g = new CompletableFuture<>();
1579          final CFException ex = new CFException();
1580 <        final SubtractFunction r = new SubtractFunction(m);
1581 <
1582 <        (fFirst ? f : g).complete(v1);
1583 <        if (!createIncomplete)
1584 <            (!fFirst ? f : g).completeExceptionally(ex);
1585 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1586 <        if (createIncomplete) {
1587 <            checkIncomplete(h);
1588 <            (!fFirst ? f : g).completeExceptionally(ex);
1589 <        }
1590 <
1591 <        checkCompletedWithWrappedCFException(h, ex);
1592 <        assertEquals(0, r.invocationCount);
1593 <        checkCompletedNormally(fFirst ? f : g, v1);
1594 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1580 >        final SubtractFunction r1 = new SubtractFunction(m);
1581 >        final SubtractFunction r2 = new SubtractFunction(m);
1582 >        final SubtractFunction r3 = new SubtractFunction(m);
1583 >
1584 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1585 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1586 >        final Callable<Boolean> complete1 = failFirst ?
1587 >            () -> fst.completeExceptionally(ex) :
1588 >            () -> fst.complete(v1);
1589 >        final Callable<Boolean> complete2 = failFirst ?
1590 >            () -> snd.complete(v1) :
1591 >            () -> snd.completeExceptionally(ex);
1592 >
1593 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1594 >        assertTrue(complete1.call());
1595 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1596 >        checkIncomplete(h1);
1597 >        checkIncomplete(h2);
1598 >        assertTrue(complete2.call());
1599 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1600 >
1601 >        checkCompletedWithWrappedException(h1, ex);
1602 >        checkCompletedWithWrappedException(h2, ex);
1603 >        checkCompletedWithWrappedException(h3, ex);
1604 >        r1.assertNotInvoked();
1605 >        r2.assertNotInvoked();
1606 >        r3.assertNotInvoked();
1607 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1608 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1609      }}
1610  
1611      /**
1612       * thenCombine result completes exceptionally if either source cancelled
1613       */
1614 <    public void testThenCombine_sourceCancelled() {
1614 >    public void testThenCombine_sourceCancelled() throws Throwable {
1615          for (ExecutionMode m : ExecutionMode.values())
1616          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1387        for (boolean createIncomplete : new boolean[] { true, false })
1617          for (boolean fFirst : new boolean[] { true, false })
1618 +        for (boolean failFirst : new boolean[] { true, false })
1619          for (Integer v1 : new Integer[] { 1, null })
1620      {
1621          final CompletableFuture<Integer> f = new CompletableFuture<>();
1622          final CompletableFuture<Integer> g = new CompletableFuture<>();
1623 <        final SubtractFunction r = new SubtractFunction(m);
1624 <
1625 <        (fFirst ? f : g).complete(v1);
1626 <        if (!createIncomplete)
1627 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1628 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1629 <        if (createIncomplete) {
1630 <            checkIncomplete(h);
1631 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1632 <        }
1633 <
1634 <        checkCompletedWithWrappedCancellationException(h);
1635 <        checkCancelled(!fFirst ? f : g);
1636 <        assertEquals(0, r.invocationCount);
1637 <        checkCompletedNormally(fFirst ? f : g, v1);
1623 >        final SubtractFunction r1 = new SubtractFunction(m);
1624 >        final SubtractFunction r2 = new SubtractFunction(m);
1625 >        final SubtractFunction r3 = new SubtractFunction(m);
1626 >
1627 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1628 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1629 >        final Callable<Boolean> complete1 = failFirst ?
1630 >            () -> fst.cancel(mayInterruptIfRunning) :
1631 >            () -> fst.complete(v1);
1632 >        final Callable<Boolean> complete2 = failFirst ?
1633 >            () -> snd.complete(v1) :
1634 >            () -> snd.cancel(mayInterruptIfRunning);
1635 >
1636 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1637 >        assertTrue(complete1.call());
1638 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1639 >        checkIncomplete(h1);
1640 >        checkIncomplete(h2);
1641 >        assertTrue(complete2.call());
1642 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1643 >
1644 >        checkCompletedWithWrappedCancellationException(h1);
1645 >        checkCompletedWithWrappedCancellationException(h2);
1646 >        checkCompletedWithWrappedCancellationException(h3);
1647 >        r1.assertNotInvoked();
1648 >        r2.assertNotInvoked();
1649 >        r3.assertNotInvoked();
1650 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1651 >        checkCancelled(failFirst ? fst : snd);
1652      }}
1653  
1654      /**
# Line 1418 | Line 1662 | public class CompletableFutureTest exten
1662      {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 <        final FailingBiFunction r = new FailingBiFunction(m);
1666 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1665 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1666 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1667 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1668 >
1669 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1670 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1671 >        final Integer w1 =  fFirst ? v1 : v2;
1672 >        final Integer w2 = !fFirst ? v1 : v2;
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(fst.complete(w1));
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        assertTrue(snd.complete(w2));
1678 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1679  
1680 <        if (fFirst) {
1681 <            f.complete(v1);
1682 <            g.complete(v2);
1427 <        } else {
1428 <            g.complete(v2);
1429 <            f.complete(v1);
1430 <        }
1431 <
1432 <        checkCompletedWithWrappedCFException(h);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683          checkCompletedNormally(f, v1);
1684          checkCompletedNormally(g, v2);
1685      }}
# Line 1440 | Line 1690 | public class CompletableFutureTest exten
1690       */
1691      public void testThenAcceptBoth_normalCompletion() {
1692          for (ExecutionMode m : ExecutionMode.values())
1443        for (boolean createIncomplete : new boolean[] { true, false })
1693          for (boolean fFirst : new boolean[] { true, false })
1694          for (Integer v1 : new Integer[] { 1, null })
1695          for (Integer v2 : new Integer[] { 2, null })
1696      {
1697          final CompletableFuture<Integer> f = new CompletableFuture<>();
1698          final CompletableFuture<Integer> g = new CompletableFuture<>();
1699 <        final SubtractAction r = new SubtractAction(m);
1700 <
1701 <        if (fFirst) f.complete(v1); else g.complete(v2);
1702 <        if (!createIncomplete)
1703 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1704 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1705 <        if (createIncomplete) {
1706 <            checkIncomplete(h);
1707 <            assertEquals(0, r.invocationCount);
1708 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1709 <        }
1710 <
1711 <        checkCompletedNormally(h, null);
1712 <        assertEquals(subtract(v1, v2), r.value);
1699 >        final SubtractAction r1 = new SubtractAction(m);
1700 >        final SubtractAction r2 = new SubtractAction(m);
1701 >        final SubtractAction r3 = new SubtractAction(m);
1702 >
1703 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1704 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1705 >        final Integer w1 =  fFirst ? v1 : v2;
1706 >        final Integer w2 = !fFirst ? v1 : v2;
1707 >
1708 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1709 >        assertTrue(fst.complete(w1));
1710 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1711 >        checkIncomplete(h1);
1712 >        checkIncomplete(h2);
1713 >        r1.assertNotInvoked();
1714 >        r2.assertNotInvoked();
1715 >        assertTrue(snd.complete(w2));
1716 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1717 >
1718 >        checkCompletedNormally(h1, null);
1719 >        checkCompletedNormally(h2, null);
1720 >        checkCompletedNormally(h3, null);
1721 >        r1.assertValue(subtract(v1, v2));
1722 >        r2.assertValue(subtract(v1, v2));
1723 >        r3.assertValue(subtract(v1, v2));
1724          checkCompletedNormally(f, v1);
1725          checkCompletedNormally(g, v2);
1726      }}
# Line 1469 | Line 1729 | public class CompletableFutureTest exten
1729       * thenAcceptBoth result completes exceptionally after exceptional
1730       * completion of either source
1731       */
1732 <    public void testThenAcceptBoth_exceptionalCompletion() {
1732 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1733          for (ExecutionMode m : ExecutionMode.values())
1474        for (boolean createIncomplete : new boolean[] { true, false })
1734          for (boolean fFirst : new boolean[] { true, false })
1735 +        for (boolean failFirst : new boolean[] { true, false })
1736          for (Integer v1 : new Integer[] { 1, null })
1737      {
1738          final CompletableFuture<Integer> f = new CompletableFuture<>();
1739          final CompletableFuture<Integer> g = new CompletableFuture<>();
1740          final CFException ex = new CFException();
1741 <        final SubtractAction r = new SubtractAction(m);
1742 <
1743 <        (fFirst ? f : g).complete(v1);
1744 <        if (!createIncomplete)
1745 <            (!fFirst ? f : g).completeExceptionally(ex);
1746 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1747 <        if (createIncomplete) {
1748 <            checkIncomplete(h);
1749 <            (!fFirst ? f : g).completeExceptionally(ex);
1750 <        }
1751 <
1752 <        checkCompletedWithWrappedCFException(h, ex);
1753 <        assertEquals(0, r.invocationCount);
1754 <        checkCompletedNormally(fFirst ? f : g, v1);
1755 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1741 >        final SubtractAction r1 = new SubtractAction(m);
1742 >        final SubtractAction r2 = new SubtractAction(m);
1743 >        final SubtractAction r3 = new SubtractAction(m);
1744 >
1745 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1746 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1747 >        final Callable<Boolean> complete1 = failFirst ?
1748 >            () -> fst.completeExceptionally(ex) :
1749 >            () -> fst.complete(v1);
1750 >        final Callable<Boolean> complete2 = failFirst ?
1751 >            () -> snd.complete(v1) :
1752 >            () -> snd.completeExceptionally(ex);
1753 >
1754 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1755 >        assertTrue(complete1.call());
1756 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1757 >        checkIncomplete(h1);
1758 >        checkIncomplete(h2);
1759 >        assertTrue(complete2.call());
1760 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1761 >
1762 >        checkCompletedWithWrappedException(h1, ex);
1763 >        checkCompletedWithWrappedException(h2, ex);
1764 >        checkCompletedWithWrappedException(h3, ex);
1765 >        r1.assertNotInvoked();
1766 >        r2.assertNotInvoked();
1767 >        r3.assertNotInvoked();
1768 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1769 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1770      }}
1771  
1772      /**
1773       * thenAcceptBoth result completes exceptionally if either source cancelled
1774       */
1775 <    public void testThenAcceptBoth_sourceCancelled() {
1775 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1776          for (ExecutionMode m : ExecutionMode.values())
1777          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1504        for (boolean createIncomplete : new boolean[] { true, false })
1778          for (boolean fFirst : new boolean[] { true, false })
1779 +        for (boolean failFirst : new boolean[] { true, false })
1780          for (Integer v1 : new Integer[] { 1, null })
1781      {
1782          final CompletableFuture<Integer> f = new CompletableFuture<>();
1783          final CompletableFuture<Integer> g = new CompletableFuture<>();
1784 <        final SubtractAction r = new SubtractAction(m);
1785 <
1786 <        (fFirst ? f : g).complete(v1);
1787 <        if (!createIncomplete)
1788 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1789 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1790 <        if (createIncomplete) {
1791 <            checkIncomplete(h);
1792 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1793 <        }
1794 <
1795 <        checkCompletedWithWrappedCancellationException(h);
1796 <        checkCancelled(!fFirst ? f : g);
1797 <        assertEquals(0, r.invocationCount);
1798 <        checkCompletedNormally(fFirst ? f : g, v1);
1784 >        final SubtractAction r1 = new SubtractAction(m);
1785 >        final SubtractAction r2 = new SubtractAction(m);
1786 >        final SubtractAction r3 = new SubtractAction(m);
1787 >
1788 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1789 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1790 >        final Callable<Boolean> complete1 = failFirst ?
1791 >            () -> fst.cancel(mayInterruptIfRunning) :
1792 >            () -> fst.complete(v1);
1793 >        final Callable<Boolean> complete2 = failFirst ?
1794 >            () -> snd.complete(v1) :
1795 >            () -> snd.cancel(mayInterruptIfRunning);
1796 >
1797 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1798 >        assertTrue(complete1.call());
1799 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1800 >        checkIncomplete(h1);
1801 >        checkIncomplete(h2);
1802 >        assertTrue(complete2.call());
1803 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1804 >
1805 >        checkCompletedWithWrappedCancellationException(h1);
1806 >        checkCompletedWithWrappedCancellationException(h2);
1807 >        checkCompletedWithWrappedCancellationException(h3);
1808 >        r1.assertNotInvoked();
1809 >        r2.assertNotInvoked();
1810 >        r3.assertNotInvoked();
1811 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1812 >        checkCancelled(failFirst ? fst : snd);
1813      }}
1814  
1815      /**
# Line 1535 | Line 1823 | public class CompletableFutureTest exten
1823      {
1824          final CompletableFuture<Integer> f = new CompletableFuture<>();
1825          final CompletableFuture<Integer> g = new CompletableFuture<>();
1826 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1827 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1826 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1827 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1828 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1829 >
1830 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1831 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1832 >        final Integer w1 =  fFirst ? v1 : v2;
1833 >        final Integer w2 = !fFirst ? v1 : v2;
1834 >
1835 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1836 >        assertTrue(fst.complete(w1));
1837 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1838 >        assertTrue(snd.complete(w2));
1839 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1840  
1841 <        if (fFirst) {
1842 <            f.complete(v1);
1843 <            g.complete(v2);
1544 <        } else {
1545 <            g.complete(v2);
1546 <            f.complete(v1);
1547 <        }
1548 <
1549 <        checkCompletedWithWrappedCFException(h);
1841 >        checkCompletedWithWrappedCFException(h1);
1842 >        checkCompletedWithWrappedCFException(h2);
1843 >        checkCompletedWithWrappedCFException(h3);
1844          checkCompletedNormally(f, v1);
1845          checkCompletedNormally(g, v2);
1846      }}
# Line 1566 | Line 1860 | public class CompletableFutureTest exten
1860          final CompletableFuture<Integer> g = new CompletableFuture<>();
1861          final Noop r = new Noop(m);
1862  
1863 <        if (fFirst) f.complete(v1); else g.complete(v2);
1863 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1864          if (!createIncomplete)
1865 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1865 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1866          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1867          if (createIncomplete) {
1868              checkIncomplete(h);
1869 <            assertEquals(0, r.invocationCount);
1870 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1869 >            r.assertNotInvoked();
1870 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1871          }
1872  
1873          checkCompletedNormally(h, null);
1874 <        assertEquals(1, r.invocationCount);
1874 >        r.assertInvoked();
1875          checkCompletedNormally(f, v1);
1876          checkCompletedNormally(g, v2);
1877      }}
# Line 1597 | Line 1891 | public class CompletableFutureTest exten
1891          final CFException ex = new CFException();
1892          final Noop r = new Noop(m);
1893  
1894 <        (fFirst ? f : g).complete(v1);
1894 >        assertTrue((fFirst ? f : g).complete(v1));
1895          if (!createIncomplete)
1896 <            (!fFirst ? f : g).completeExceptionally(ex);
1896 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1897          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1898          if (createIncomplete) {
1899              checkIncomplete(h);
1900 <            (!fFirst ? f : g).completeExceptionally(ex);
1900 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1901          }
1902  
1903 <        checkCompletedWithWrappedCFException(h, ex);
1904 <        assertEquals(0, r.invocationCount);
1903 >        checkCompletedWithWrappedException(h, ex);
1904 >        r.assertNotInvoked();
1905          checkCompletedNormally(fFirst ? f : g, v1);
1906 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1906 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1907      }}
1908  
1909      /**
# Line 1626 | Line 1920 | public class CompletableFutureTest exten
1920          final CompletableFuture<Integer> g = new CompletableFuture<>();
1921          final Noop r = new Noop(m);
1922  
1923 <
1630 <        (fFirst ? f : g).complete(v1);
1923 >        assertTrue((fFirst ? f : g).complete(v1));
1924          if (!createIncomplete)
1925              assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1926          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
# Line 1638 | Line 1931 | public class CompletableFutureTest exten
1931  
1932          checkCompletedWithWrappedCancellationException(h);
1933          checkCancelled(!fFirst ? f : g);
1934 <        assertEquals(0, r.invocationCount);
1934 >        r.assertNotInvoked();
1935          checkCompletedNormally(fFirst ? f : g, v1);
1936      }}
1937  
# Line 1653 | Line 1946 | public class CompletableFutureTest exten
1946      {
1947          final CompletableFuture<Integer> f = new CompletableFuture<>();
1948          final CompletableFuture<Integer> g = new CompletableFuture<>();
1949 <        final FailingRunnable r = new FailingRunnable(m);
1949 >        final FailingRunnable r1 = new FailingRunnable(m);
1950 >        final FailingRunnable r2 = new FailingRunnable(m);
1951  
1952 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1953 <        if (fFirst) {
1954 <            f.complete(v1);
1955 <            g.complete(v2);
1662 <        } else {
1663 <            g.complete(v2);
1664 <            f.complete(v1);
1665 <        }
1666 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1952 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1953 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1954 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1955 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1956  
1957          checkCompletedWithWrappedCFException(h1);
1958          checkCompletedWithWrappedCFException(h2);
# Line 1677 | Line 1966 | public class CompletableFutureTest exten
1966       */
1967      public void testApplyToEither_normalCompletion() {
1968          for (ExecutionMode m : ExecutionMode.values())
1680        for (boolean createIncomplete : new boolean[] { true, false })
1681        for (boolean fFirst : new boolean[] { true, false })
1969          for (Integer v1 : new Integer[] { 1, null })
1970          for (Integer v2 : new Integer[] { 2, null })
1971      {
1972          final CompletableFuture<Integer> f = new CompletableFuture<>();
1973          final CompletableFuture<Integer> g = new CompletableFuture<>();
1974 <        final IncFunction r = new IncFunction(m);
1974 >        final IncFunction[] rs = new IncFunction[6];
1975 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1976  
1977 <        if (!createIncomplete)
1978 <            if (fFirst) f.complete(v1); else g.complete(v2);
1979 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1980 <        if (createIncomplete) {
1981 <            checkIncomplete(h);
1982 <            assertEquals(0, r.invocationCount);
1983 <            if (fFirst) f.complete(v1); else g.complete(v2);
1984 <        }
1985 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1986 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1987 <
1988 <        checkCompletedNormally(f, v1);
1989 <        checkCompletedNormally(g, v2);
1990 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1703 <    }}
1704 <
1705 <    public void testApplyToEither_normalCompletionBothAvailable() {
1706 <        for (ExecutionMode m : ExecutionMode.values())
1707 <        for (boolean fFirst : new boolean[] { true, false })
1708 <        for (Integer v1 : new Integer[] { 1, null })
1709 <        for (Integer v2 : new Integer[] { 2, null })
1710 <    {
1711 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1712 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1713 <        final IncFunction r = new IncFunction(m);
1714 <
1715 <        if (fFirst) {
1716 <            f.complete(v1);
1717 <            g.complete(v2);
1718 <        } else {
1719 <            g.complete(v2);
1720 <            f.complete(v1);
1721 <        }
1977 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1978 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1979 >        checkIncomplete(h0);
1980 >        checkIncomplete(h1);
1981 >        rs[0].assertNotInvoked();
1982 >        rs[1].assertNotInvoked();
1983 >        f.complete(v1);
1984 >        checkCompletedNormally(h0, inc(v1));
1985 >        checkCompletedNormally(h1, inc(v1));
1986 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1987 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1988 >        checkCompletedNormally(h2, inc(v1));
1989 >        checkCompletedNormally(h3, inc(v1));
1990 >        g.complete(v2);
1991  
1992 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1992 >        // unspecified behavior - both source completions available
1993 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1994 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1995 >        rs[4].assertValue(h4.join());
1996 >        rs[5].assertValue(h5.join());
1997 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1998 >                   Objects.equals(inc(v2), h4.join()));
1999 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2000 >                   Objects.equals(inc(v2), h5.join()));
2001  
2002          checkCompletedNormally(f, v1);
2003          checkCompletedNormally(g, v2);
2004 <
2005 <        // unspecified behavior
2006 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2007 <                   Objects.equals(h.join(), inc(v2)));
2008 <        assertEquals(1, r.invocationCount);
2004 >        checkCompletedNormally(h0, inc(v1));
2005 >        checkCompletedNormally(h1, inc(v1));
2006 >        checkCompletedNormally(h2, inc(v1));
2007 >        checkCompletedNormally(h3, inc(v1));
2008 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2009      }}
2010  
2011      /**
2012       * applyToEither result completes exceptionally after exceptional
2013       * completion of either source
2014       */
2015 <    public void testApplyToEither_exceptionalCompletion1() {
2015 >    public void testApplyToEither_exceptionalCompletion() {
2016          for (ExecutionMode m : ExecutionMode.values())
1740        for (boolean createIncomplete : new boolean[] { true, false })
1741        for (boolean fFirst : new boolean[] { true, false })
2017          for (Integer v1 : new Integer[] { 1, null })
2018      {
2019          final CompletableFuture<Integer> f = new CompletableFuture<>();
2020          final CompletableFuture<Integer> g = new CompletableFuture<>();
2021          final CFException ex = new CFException();
2022 <        final IncFunction r = new IncFunction(m);
2022 >        final IncFunction[] rs = new IncFunction[6];
2023 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2024  
2025 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
2026 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2027 <        if (createIncomplete) {
2028 <            checkIncomplete(h);
2029 <            assertEquals(0, r.invocationCount);
2030 <            (fFirst ? f : g).completeExceptionally(ex);
2031 <        }
2025 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2026 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2027 >        checkIncomplete(h0);
2028 >        checkIncomplete(h1);
2029 >        rs[0].assertNotInvoked();
2030 >        rs[1].assertNotInvoked();
2031 >        f.completeExceptionally(ex);
2032 >        checkCompletedWithWrappedException(h0, ex);
2033 >        checkCompletedWithWrappedException(h1, ex);
2034 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2035 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2036 >        checkCompletedWithWrappedException(h2, ex);
2037 >        checkCompletedWithWrappedException(h3, ex);
2038 >        g.complete(v1);
2039  
2040 <        checkCompletedWithWrappedCFException(h, ex);
2041 <        (!fFirst ? f : g).complete(v1);
2040 >        // unspecified behavior - both source completions available
2041 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2042 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2043 >        try {
2044 >            assertEquals(inc(v1), h4.join());
2045 >            rs[4].assertValue(inc(v1));
2046 >        } catch (CompletionException ok) {
2047 >            checkCompletedWithWrappedException(h4, ex);
2048 >            rs[4].assertNotInvoked();
2049 >        }
2050 >        try {
2051 >            assertEquals(inc(v1), h5.join());
2052 >            rs[5].assertValue(inc(v1));
2053 >        } catch (CompletionException ok) {
2054 >            checkCompletedWithWrappedException(h5, ex);
2055 >            rs[5].assertNotInvoked();
2056 >        }
2057  
2058 <        assertEquals(0, r.invocationCount);
2059 <        checkCompletedNormally(!fFirst ? f : g, v1);
2060 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
2061 <        checkCompletedWithWrappedCFException(h, ex);
2058 >        checkCompletedExceptionally(f, ex);
2059 >        checkCompletedNormally(g, v1);
2060 >        checkCompletedWithWrappedException(h0, ex);
2061 >        checkCompletedWithWrappedException(h1, ex);
2062 >        checkCompletedWithWrappedException(h2, ex);
2063 >        checkCompletedWithWrappedException(h3, ex);
2064 >        checkCompletedWithWrappedException(h4, ex);
2065 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2066      }}
2067  
2068      public void testApplyToEither_exceptionalCompletion2() {
2069          for (ExecutionMode m : ExecutionMode.values())
1768        for (boolean reverseArgs : new boolean[] { true, false })
2070          for (boolean fFirst : new boolean[] { true, false })
2071          for (Integer v1 : new Integer[] { 1, null })
2072      {
2073          final CompletableFuture<Integer> f = new CompletableFuture<>();
2074          final CompletableFuture<Integer> g = new CompletableFuture<>();
1774        final IncFunction r1 = new IncFunction(m);
1775        final IncFunction r2 = new IncFunction(m);
2075          final CFException ex = new CFException();
2076 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
2077 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2078 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2079 <        if (fFirst) {
2080 <            f.complete(v1);
2081 <            g.completeExceptionally(ex);
2082 <        } else {
2083 <            g.completeExceptionally(ex);
2084 <            f.complete(v1);
1786 <        }
1787 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2076 >        final IncFunction[] rs = new IncFunction[6];
2077 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2078 >
2079 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2080 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2081 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2082 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2083 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2084 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2085  
2086 <        // unspecified behavior
2086 >        // unspecified behavior - both source completions available
2087 >        try {
2088 >            assertEquals(inc(v1), h0.join());
2089 >            rs[0].assertValue(inc(v1));
2090 >        } catch (CompletionException ok) {
2091 >            checkCompletedWithWrappedException(h0, ex);
2092 >            rs[0].assertNotInvoked();
2093 >        }
2094          try {
2095              assertEquals(inc(v1), h1.join());
2096 <            assertEquals(1, r1.invocationCount);
2096 >            rs[1].assertValue(inc(v1));
2097          } catch (CompletionException ok) {
2098 <            checkCompletedWithWrappedCFException(h1, ex);
2099 <            assertEquals(0, r1.invocationCount);
2098 >            checkCompletedWithWrappedException(h1, ex);
2099 >            rs[1].assertNotInvoked();
2100          }
1797
2101          try {
2102              assertEquals(inc(v1), h2.join());
2103 <            assertEquals(1, r2.invocationCount);
2103 >            rs[2].assertValue(inc(v1));
2104          } catch (CompletionException ok) {
2105 <            checkCompletedWithWrappedCFException(h2, ex);
2106 <            assertEquals(0, r2.invocationCount);
2105 >            checkCompletedWithWrappedException(h2, ex);
2106 >            rs[2].assertNotInvoked();
2107 >        }
2108 >        try {
2109 >            assertEquals(inc(v1), h3.join());
2110 >            rs[3].assertValue(inc(v1));
2111 >        } catch (CompletionException ok) {
2112 >            checkCompletedWithWrappedException(h3, ex);
2113 >            rs[3].assertNotInvoked();
2114          }
2115  
1806        checkCompletedWithWrappedCFException(g, ex);
1807        checkCompletedNormally(f, v1);
1808    }}
1809
1810    /**
1811     * applyToEither result completes exceptionally if action does
1812     */
1813    public void testApplyToEither_actionFailed1() {
1814        for (ExecutionMode m : ExecutionMode.values())
1815        for (Integer v1 : new Integer[] { 1, null })
1816        for (Integer v2 : new Integer[] { 2, null })
1817    {
1818        final CompletableFuture<Integer> f = new CompletableFuture<>();
1819        final CompletableFuture<Integer> g = new CompletableFuture<>();
1820        final FailingFunction r = new FailingFunction(m);
1821        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1822
1823        f.complete(v1);
1824        checkCompletedWithWrappedCFException(h);
1825        g.complete(v2);
1826        checkCompletedNormally(f, v1);
1827        checkCompletedNormally(g, v2);
1828    }}
1829
1830    public void testApplyToEither_actionFailed2() {
1831        for (ExecutionMode m : ExecutionMode.values())
1832        for (Integer v1 : new Integer[] { 1, null })
1833        for (Integer v2 : new Integer[] { 2, null })
1834    {
1835        final CompletableFuture<Integer> f = new CompletableFuture<>();
1836        final CompletableFuture<Integer> g = new CompletableFuture<>();
1837        final FailingFunction r = new FailingFunction(m);
1838        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1839
1840        g.complete(v2);
1841        checkCompletedWithWrappedCFException(h);
1842        f.complete(v1);
2116          checkCompletedNormally(f, v1);
2117 <        checkCompletedNormally(g, v2);
2117 >        checkCompletedExceptionally(g, ex);
2118      }}
2119  
2120      /**
2121       * applyToEither result completes exceptionally if either source cancelled
2122       */
2123 <    public void testApplyToEither_sourceCancelled1() {
2123 >    public void testApplyToEither_sourceCancelled() {
2124          for (ExecutionMode m : ExecutionMode.values())
2125          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1853        for (boolean createIncomplete : new boolean[] { true, false })
1854        for (boolean fFirst : new boolean[] { true, false })
2126          for (Integer v1 : new Integer[] { 1, null })
2127      {
2128          final CompletableFuture<Integer> f = new CompletableFuture<>();
2129          final CompletableFuture<Integer> g = new CompletableFuture<>();
2130 <        final IncFunction r = new IncFunction(m);
2130 >        final IncFunction[] rs = new IncFunction[6];
2131 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2132  
2133 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2134 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2135 <        if (createIncomplete) {
2136 <            checkIncomplete(h);
2137 <            assertEquals(0, r.invocationCount);
2138 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2139 <        }
2133 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2134 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2135 >        checkIncomplete(h0);
2136 >        checkIncomplete(h1);
2137 >        rs[0].assertNotInvoked();
2138 >        rs[1].assertNotInvoked();
2139 >        f.cancel(mayInterruptIfRunning);
2140 >        checkCompletedWithWrappedCancellationException(h0);
2141 >        checkCompletedWithWrappedCancellationException(h1);
2142 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2143 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2144 >        checkCompletedWithWrappedCancellationException(h2);
2145 >        checkCompletedWithWrappedCancellationException(h3);
2146 >        g.complete(v1);
2147  
2148 <        checkCompletedWithWrappedCancellationException(h);
2149 <        (!fFirst ? f : g).complete(v1);
2148 >        // unspecified behavior - both source completions available
2149 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2150 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2151 >        try {
2152 >            assertEquals(inc(v1), h4.join());
2153 >            rs[4].assertValue(inc(v1));
2154 >        } catch (CompletionException ok) {
2155 >            checkCompletedWithWrappedCancellationException(h4);
2156 >            rs[4].assertNotInvoked();
2157 >        }
2158 >        try {
2159 >            assertEquals(inc(v1), h5.join());
2160 >            rs[5].assertValue(inc(v1));
2161 >        } catch (CompletionException ok) {
2162 >            checkCompletedWithWrappedCancellationException(h5);
2163 >            rs[5].assertNotInvoked();
2164 >        }
2165  
2166 <        assertEquals(0, r.invocationCount);
2167 <        checkCompletedNormally(!fFirst ? f : g, v1);
2168 <        checkCancelled(fFirst ? f : g);
2169 <        checkCompletedWithWrappedCancellationException(h);
2166 >        checkCancelled(f);
2167 >        checkCompletedNormally(g, v1);
2168 >        checkCompletedWithWrappedCancellationException(h0);
2169 >        checkCompletedWithWrappedCancellationException(h1);
2170 >        checkCompletedWithWrappedCancellationException(h2);
2171 >        checkCompletedWithWrappedCancellationException(h3);
2172 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2173      }}
2174  
2175      public void testApplyToEither_sourceCancelled2() {
2176          for (ExecutionMode m : ExecutionMode.values())
2177          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1881        for (boolean reverseArgs : new boolean[] { true, false })
2178          for (boolean fFirst : new boolean[] { true, false })
2179          for (Integer v1 : new Integer[] { 1, null })
2180      {
2181          final CompletableFuture<Integer> f = new CompletableFuture<>();
2182          final CompletableFuture<Integer> g = new CompletableFuture<>();
2183 <        final IncFunction r1 = new IncFunction(m);
2184 <        final IncFunction r2 = new IncFunction(m);
1889 <        final CFException ex = new CFException();
1890 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1891 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2183 >        final IncFunction[] rs = new IncFunction[6];
2184 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2185  
2186 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2187 <        if (fFirst) {
2188 <            f.complete(v1);
2189 <            assertTrue(g.cancel(mayInterruptIfRunning));
2190 <        } else {
2191 <            assertTrue(g.cancel(mayInterruptIfRunning));
1899 <            f.complete(v1);
1900 <        }
1901 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2186 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2187 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2188 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2189 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2190 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2191 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2192  
2193 <        // unspecified behavior
2193 >        // unspecified behavior - both source completions available
2194 >        try {
2195 >            assertEquals(inc(v1), h0.join());
2196 >            rs[0].assertValue(inc(v1));
2197 >        } catch (CompletionException ok) {
2198 >            checkCompletedWithWrappedCancellationException(h0);
2199 >            rs[0].assertNotInvoked();
2200 >        }
2201          try {
2202              assertEquals(inc(v1), h1.join());
2203 <            assertEquals(1, r1.invocationCount);
2203 >            rs[1].assertValue(inc(v1));
2204          } catch (CompletionException ok) {
2205              checkCompletedWithWrappedCancellationException(h1);
2206 <            assertEquals(0, r1.invocationCount);
2206 >            rs[1].assertNotInvoked();
2207          }
1911
2208          try {
2209              assertEquals(inc(v1), h2.join());
2210 <            assertEquals(1, r2.invocationCount);
2210 >            rs[2].assertValue(inc(v1));
2211          } catch (CompletionException ok) {
2212              checkCompletedWithWrappedCancellationException(h2);
2213 <            assertEquals(0, r2.invocationCount);
2213 >            rs[2].assertNotInvoked();
2214 >        }
2215 >        try {
2216 >            assertEquals(inc(v1), h3.join());
2217 >            rs[3].assertValue(inc(v1));
2218 >        } catch (CompletionException ok) {
2219 >            checkCompletedWithWrappedCancellationException(h3);
2220 >            rs[3].assertNotInvoked();
2221          }
2222  
1920        checkCancelled(g);
2223          checkCompletedNormally(f, v1);
2224 +        checkCancelled(g);
2225      }}
2226  
2227      /**
2228 <     * acceptEither result completes normally after normal completion
1926 <     * of either source
2228 >     * applyToEither result completes exceptionally if action does
2229       */
2230 <    public void testAcceptEither_normalCompletion1() {
2230 >    public void testApplyToEither_actionFailed() {
2231          for (ExecutionMode m : ExecutionMode.values())
2232          for (Integer v1 : new Integer[] { 1, null })
2233          for (Integer v2 : new Integer[] { 2, null })
2234      {
2235          final CompletableFuture<Integer> f = new CompletableFuture<>();
2236          final CompletableFuture<Integer> g = new CompletableFuture<>();
2237 <        final IncAction r = new IncAction();
2238 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2237 >        final FailingFunction[] rs = new FailingFunction[6];
2238 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2239  
2240 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2241 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2242          f.complete(v1);
2243 <        checkCompletedNormally(h, null);
2244 <        assertEquals(inc(v1), r.value);
2245 <        g.complete(v2);
2246 <
2247 <        checkCompletedNormally(f, v1);
2248 <        checkCompletedNormally(g, v2);
2249 <        checkCompletedNormally(h, null);
1946 <    }}
1947 <
1948 <    public void testAcceptEither_normalCompletion2() {
1949 <        for (ExecutionMode m : ExecutionMode.values())
1950 <        for (Integer v1 : new Integer[] { 1, null })
1951 <        for (Integer v2 : new Integer[] { 2, null })
1952 <    {
1953 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1954 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1955 <        final IncAction r = new IncAction();
1956 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2243 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2244 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2245 >        checkCompletedWithWrappedCFException(h0);
2246 >        checkCompletedWithWrappedCFException(h1);
2247 >        checkCompletedWithWrappedCFException(h2);
2248 >        checkCompletedWithWrappedCFException(h3);
2249 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2250  
2251          g.complete(v2);
2252 <        checkCompletedNormally(h, null);
2253 <        assertEquals(inc(v2), r.value);
2254 <        f.complete(v1);
2252 >
2253 >        // unspecified behavior - both source completions available
2254 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2255 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2256 >
2257 >        checkCompletedWithWrappedCFException(h4);
2258 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2259 >                   Objects.equals(v2, rs[4].value));
2260 >        checkCompletedWithWrappedCFException(h5);
2261 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2262 >                   Objects.equals(v2, rs[5].value));
2263  
2264          checkCompletedNormally(f, v1);
2265          checkCompletedNormally(g, v2);
1965        checkCompletedNormally(h, null);
2266      }}
2267  
2268 <    public void testAcceptEither_normalCompletion3() {
2268 >    /**
2269 >     * acceptEither result completes normally after normal completion
2270 >     * of either source
2271 >     */
2272 >    public void testAcceptEither_normalCompletion() {
2273          for (ExecutionMode m : ExecutionMode.values())
2274          for (Integer v1 : new Integer[] { 1, null })
2275          for (Integer v2 : new Integer[] { 2, null })
2276      {
2277          final CompletableFuture<Integer> f = new CompletableFuture<>();
2278          final CompletableFuture<Integer> g = new CompletableFuture<>();
2279 <        final IncAction r = new IncAction();
2279 >        final NoopConsumer[] rs = new NoopConsumer[6];
2280 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2281  
2282 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2283 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2284 +        checkIncomplete(h0);
2285 +        checkIncomplete(h1);
2286 +        rs[0].assertNotInvoked();
2287 +        rs[1].assertNotInvoked();
2288          f.complete(v1);
2289 +        checkCompletedNormally(h0, null);
2290 +        checkCompletedNormally(h1, null);
2291 +        rs[0].assertValue(v1);
2292 +        rs[1].assertValue(v1);
2293 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2294 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2295 +        checkCompletedNormally(h2, null);
2296 +        checkCompletedNormally(h3, null);
2297 +        rs[2].assertValue(v1);
2298 +        rs[3].assertValue(v1);
2299          g.complete(v2);
1979        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2300  
2301 <        checkCompletedNormally(h, null);
2301 >        // unspecified behavior - both source completions available
2302 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2303 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2304 >        checkCompletedNormally(h4, null);
2305 >        checkCompletedNormally(h5, null);
2306 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2307 >                   Objects.equals(v2, rs[4].value));
2308 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2309 >                   Objects.equals(v2, rs[5].value));
2310 >
2311          checkCompletedNormally(f, v1);
2312          checkCompletedNormally(g, v2);
2313 <
2314 <        // unspecified behavior
2315 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2316 <                   Objects.equals(r.value, inc(v2)));
2313 >        checkCompletedNormally(h0, null);
2314 >        checkCompletedNormally(h1, null);
2315 >        checkCompletedNormally(h2, null);
2316 >        checkCompletedNormally(h3, null);
2317 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2318      }}
2319  
2320      /**
2321       * acceptEither result completes exceptionally after exceptional
2322       * completion of either source
2323       */
2324 <    public void testAcceptEither_exceptionalCompletion1() {
2324 >    public void testAcceptEither_exceptionalCompletion() {
2325          for (ExecutionMode m : ExecutionMode.values())
2326          for (Integer v1 : new Integer[] { 1, null })
2327      {
2328          final CompletableFuture<Integer> f = new CompletableFuture<>();
2329          final CompletableFuture<Integer> g = new CompletableFuture<>();
2000        final IncAction r = new IncAction();
2001        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2330          final CFException ex = new CFException();
2331 +        final NoopConsumer[] rs = new NoopConsumer[6];
2332 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2333  
2334 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2335 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2336 +        checkIncomplete(h0);
2337 +        checkIncomplete(h1);
2338 +        rs[0].assertNotInvoked();
2339 +        rs[1].assertNotInvoked();
2340          f.completeExceptionally(ex);
2341 <        checkCompletedWithWrappedCFException(h, ex);
2341 >        checkCompletedWithWrappedException(h0, ex);
2342 >        checkCompletedWithWrappedException(h1, ex);
2343 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2344 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2345 >        checkCompletedWithWrappedException(h2, ex);
2346 >        checkCompletedWithWrappedException(h3, ex);
2347 >
2348          g.complete(v1);
2349  
2350 <        assertEquals(0, r.invocationCount);
2350 >        // unspecified behavior - both source completions available
2351 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2352 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2353 >        try {
2354 >            assertNull(h4.join());
2355 >            rs[4].assertValue(v1);
2356 >        } catch (CompletionException ok) {
2357 >            checkCompletedWithWrappedException(h4, ex);
2358 >            rs[4].assertNotInvoked();
2359 >        }
2360 >        try {
2361 >            assertNull(h5.join());
2362 >            rs[5].assertValue(v1);
2363 >        } catch (CompletionException ok) {
2364 >            checkCompletedWithWrappedException(h5, ex);
2365 >            rs[5].assertNotInvoked();
2366 >        }
2367 >
2368 >        checkCompletedExceptionally(f, ex);
2369          checkCompletedNormally(g, v1);
2370 <        checkCompletedWithWrappedCFException(f, ex);
2371 <        checkCompletedWithWrappedCFException(h, ex);
2370 >        checkCompletedWithWrappedException(h0, ex);
2371 >        checkCompletedWithWrappedException(h1, ex);
2372 >        checkCompletedWithWrappedException(h2, ex);
2373 >        checkCompletedWithWrappedException(h3, ex);
2374 >        checkCompletedWithWrappedException(h4, ex);
2375 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2376      }}
2377  
2378      public void testAcceptEither_exceptionalCompletion2() {
2379          for (ExecutionMode m : ExecutionMode.values())
2380 +        for (boolean fFirst : new boolean[] { true, false })
2381          for (Integer v1 : new Integer[] { 1, null })
2382      {
2383          final CompletableFuture<Integer> f = new CompletableFuture<>();
2384          final CompletableFuture<Integer> g = new CompletableFuture<>();
2020        final IncAction r = new IncAction();
2021        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2022        final CFException ex = new CFException();
2023
2024        g.completeExceptionally(ex);
2025        checkCompletedWithWrappedCFException(h, ex);
2026        f.complete(v1);
2027
2028        assertEquals(0, r.invocationCount);
2029        checkCompletedNormally(f, v1);
2030        checkCompletedWithWrappedCFException(g, ex);
2031        checkCompletedWithWrappedCFException(h, ex);
2032    }}
2033
2034    public void testAcceptEither_exceptionalCompletion3() {
2035        for (ExecutionMode m : ExecutionMode.values())
2036        for (Integer v1 : new Integer[] { 1, null })
2037    {
2038        final CompletableFuture<Integer> f = new CompletableFuture<>();
2039        final CompletableFuture<Integer> g = new CompletableFuture<>();
2040        final IncAction r = new IncAction();
2385          final CFException ex = new CFException();
2386 +        final NoopConsumer[] rs = new NoopConsumer[6];
2387 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2388  
2389 <        g.completeExceptionally(ex);
2390 <        f.complete(v1);
2391 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2389 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2390 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2391 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2392 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2393 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2394 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2395  
2396 <        // unspecified behavior
2048 <        Integer v;
2396 >        // unspecified behavior - both source completions available
2397          try {
2398 <            assertNull(h.join());
2399 <            assertEquals(1, r.invocationCount);
2052 <            assertEquals(inc(v1), r.value);
2398 >            assertEquals(null, h0.join());
2399 >            rs[0].assertValue(v1);
2400          } catch (CompletionException ok) {
2401 <            checkCompletedWithWrappedCFException(h, ex);
2402 <            assertEquals(0, r.invocationCount);
2401 >            checkCompletedWithWrappedException(h0, ex);
2402 >            rs[0].assertNotInvoked();
2403          }
2057
2058        checkCompletedWithWrappedCFException(g, ex);
2059        checkCompletedNormally(f, v1);
2060    }}
2061
2062    public void testAcceptEither_exceptionalCompletion4() {
2063        for (ExecutionMode m : ExecutionMode.values())
2064        for (Integer v1 : new Integer[] { 1, null })
2065    {
2066        final CompletableFuture<Integer> f = new CompletableFuture<>();
2067        final CompletableFuture<Integer> g = new CompletableFuture<>();
2068        final IncAction r = new IncAction();
2069        final CFException ex = new CFException();
2070
2071        f.completeExceptionally(ex);
2072        g.complete(v1);
2073        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2074
2075        // unspecified behavior
2076        Integer v;
2404          try {
2405 <            assertNull(h.join());
2406 <            assertEquals(1, r.invocationCount);
2080 <            assertEquals(inc(v1), r.value);
2405 >            assertEquals(null, h1.join());
2406 >            rs[1].assertValue(v1);
2407          } catch (CompletionException ok) {
2408 <            checkCompletedWithWrappedCFException(h, ex);
2409 <            assertEquals(0, r.invocationCount);
2408 >            checkCompletedWithWrappedException(h1, ex);
2409 >            rs[1].assertNotInvoked();
2410 >        }
2411 >        try {
2412 >            assertEquals(null, h2.join());
2413 >            rs[2].assertValue(v1);
2414 >        } catch (CompletionException ok) {
2415 >            checkCompletedWithWrappedException(h2, ex);
2416 >            rs[2].assertNotInvoked();
2417 >        }
2418 >        try {
2419 >            assertEquals(null, h3.join());
2420 >            rs[3].assertValue(v1);
2421 >        } catch (CompletionException ok) {
2422 >            checkCompletedWithWrappedException(h3, ex);
2423 >            rs[3].assertNotInvoked();
2424          }
2425  
2086        checkCompletedWithWrappedCFException(f, ex);
2087        checkCompletedNormally(g, v1);
2088    }}
2089
2090    /**
2091     * acceptEither result completes exceptionally if action does
2092     */
2093    public void testAcceptEither_actionFailed1() {
2094        for (ExecutionMode m : ExecutionMode.values())
2095        for (Integer v1 : new Integer[] { 1, null })
2096        for (Integer v2 : new Integer[] { 2, null })
2097    {
2098        final CompletableFuture<Integer> f = new CompletableFuture<>();
2099        final CompletableFuture<Integer> g = new CompletableFuture<>();
2100        final FailingConsumer r = new FailingConsumer(m);
2101        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2102
2103        f.complete(v1);
2104        checkCompletedWithWrappedCFException(h);
2105        g.complete(v2);
2106        checkCompletedNormally(f, v1);
2107        checkCompletedNormally(g, v2);
2108    }}
2109
2110    public void testAcceptEither_actionFailed2() {
2111        for (ExecutionMode m : ExecutionMode.values())
2112        for (Integer v1 : new Integer[] { 1, null })
2113        for (Integer v2 : new Integer[] { 2, null })
2114    {
2115        final CompletableFuture<Integer> f = new CompletableFuture<>();
2116        final CompletableFuture<Integer> g = new CompletableFuture<>();
2117        final FailingConsumer r = new FailingConsumer(m);
2118        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2119
2120        g.complete(v2);
2121        checkCompletedWithWrappedCFException(h);
2122        f.complete(v1);
2426          checkCompletedNormally(f, v1);
2427 <        checkCompletedNormally(g, v2);
2427 >        checkCompletedExceptionally(g, ex);
2428      }}
2429  
2430      /**
2431       * acceptEither result completes exceptionally if either source cancelled
2432       */
2433 <    public void testAcceptEither_sourceCancelled1() {
2433 >    public void testAcceptEither_sourceCancelled() {
2434          for (ExecutionMode m : ExecutionMode.values())
2435          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2436          for (Integer v1 : new Integer[] { 1, null })
2437      {
2438          final CompletableFuture<Integer> f = new CompletableFuture<>();
2439          final CompletableFuture<Integer> g = new CompletableFuture<>();
2440 <        final IncAction r = new IncAction();
2441 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2440 >        final NoopConsumer[] rs = new NoopConsumer[6];
2441 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2442  
2443 <        assertTrue(f.cancel(mayInterruptIfRunning));
2444 <        checkCompletedWithWrappedCancellationException(h);
2445 <        g.complete(v1);
2443 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2444 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2445 >        checkIncomplete(h0);
2446 >        checkIncomplete(h1);
2447 >        rs[0].assertNotInvoked();
2448 >        rs[1].assertNotInvoked();
2449 >        f.cancel(mayInterruptIfRunning);
2450 >        checkCompletedWithWrappedCancellationException(h0);
2451 >        checkCompletedWithWrappedCancellationException(h1);
2452 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2453 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2454 >        checkCompletedWithWrappedCancellationException(h2);
2455 >        checkCompletedWithWrappedCancellationException(h3);
2456  
2457 <        checkCancelled(f);
2145 <        assertEquals(0, r.invocationCount);
2146 <        checkCompletedNormally(g, v1);
2147 <        checkCompletedWithWrappedCancellationException(h);
2148 <    }}
2149 <
2150 <    public void testAcceptEither_sourceCancelled2() {
2151 <        for (ExecutionMode m : ExecutionMode.values())
2152 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2153 <        for (Integer v1 : new Integer[] { 1, null })
2154 <    {
2155 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2156 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2157 <        final IncAction r = new IncAction();
2158 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2159 <
2160 <        assertTrue(g.cancel(mayInterruptIfRunning));
2161 <        checkCompletedWithWrappedCancellationException(h);
2162 <        f.complete(v1);
2163 <
2164 <        checkCancelled(g);
2165 <        assertEquals(0, r.invocationCount);
2166 <        checkCompletedNormally(f, v1);
2167 <        checkCompletedWithWrappedCancellationException(h);
2168 <    }}
2169 <
2170 <    public void testAcceptEither_sourceCancelled3() {
2171 <        for (ExecutionMode m : ExecutionMode.values())
2172 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2173 <        for (Integer v1 : new Integer[] { 1, null })
2174 <    {
2175 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2176 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2177 <        final IncAction r = new IncAction();
2178 <
2179 <        assertTrue(g.cancel(mayInterruptIfRunning));
2180 <        f.complete(v1);
2181 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2457 >        g.complete(v1);
2458  
2459 <        // unspecified behavior
2460 <        Integer v;
2459 >        // unspecified behavior - both source completions available
2460 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2461 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2462          try {
2463 <            assertNull(h.join());
2464 <            assertEquals(1, r.invocationCount);
2188 <            assertEquals(inc(v1), r.value);
2463 >            assertNull(h4.join());
2464 >            rs[4].assertValue(v1);
2465          } catch (CompletionException ok) {
2466 <            checkCompletedWithWrappedCancellationException(h);
2467 <            assertEquals(0, r.invocationCount);
2466 >            checkCompletedWithWrappedCancellationException(h4);
2467 >            rs[4].assertNotInvoked();
2468          }
2193
2194        checkCancelled(g);
2195        checkCompletedNormally(f, v1);
2196    }}
2197
2198    public void testAcceptEither_sourceCancelled4() {
2199        for (ExecutionMode m : ExecutionMode.values())
2200        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2201        for (Integer v1 : new Integer[] { 1, null })
2202    {
2203        final CompletableFuture<Integer> f = new CompletableFuture<>();
2204        final CompletableFuture<Integer> g = new CompletableFuture<>();
2205        final IncAction r = new IncAction();
2206
2207        assertTrue(f.cancel(mayInterruptIfRunning));
2208        g.complete(v1);
2209        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2210
2211        // unspecified behavior
2212        Integer v;
2469          try {
2470 <            assertNull(h.join());
2471 <            assertEquals(1, r.invocationCount);
2216 <            assertEquals(inc(v1), r.value);
2470 >            assertNull(h5.join());
2471 >            rs[5].assertValue(v1);
2472          } catch (CompletionException ok) {
2473 <            checkCompletedWithWrappedCancellationException(h);
2474 <            assertEquals(0, r.invocationCount);
2473 >            checkCompletedWithWrappedCancellationException(h5);
2474 >            rs[5].assertNotInvoked();
2475          }
2476  
2477          checkCancelled(f);
2478          checkCompletedNormally(g, v1);
2479 +        checkCompletedWithWrappedCancellationException(h0);
2480 +        checkCompletedWithWrappedCancellationException(h1);
2481 +        checkCompletedWithWrappedCancellationException(h2);
2482 +        checkCompletedWithWrappedCancellationException(h3);
2483 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2484      }}
2485  
2486      /**
2487 <     * runAfterEither result completes normally after normal completion
2228 <     * of either source
2487 >     * acceptEither result completes exceptionally if action does
2488       */
2489 <    public void testRunAfterEither_normalCompletion1() {
2489 >    public void testAcceptEither_actionFailed() {
2490          for (ExecutionMode m : ExecutionMode.values())
2491          for (Integer v1 : new Integer[] { 1, null })
2492          for (Integer v2 : new Integer[] { 2, null })
2493      {
2494          final CompletableFuture<Integer> f = new CompletableFuture<>();
2495          final CompletableFuture<Integer> g = new CompletableFuture<>();
2496 <        final Noop r = new Noop(m);
2497 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2496 >        final FailingConsumer[] rs = new FailingConsumer[6];
2497 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2498  
2499 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2500 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2501          f.complete(v1);
2502 <        checkCompletedNormally(h, null);
2503 <        assertEquals(1, r.invocationCount);
2502 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2503 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2504 >        checkCompletedWithWrappedCFException(h0);
2505 >        checkCompletedWithWrappedCFException(h1);
2506 >        checkCompletedWithWrappedCFException(h2);
2507 >        checkCompletedWithWrappedCFException(h3);
2508 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2509 >
2510          g.complete(v2);
2511  
2512 +        // unspecified behavior - both source completions available
2513 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2514 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2515 +
2516 +        checkCompletedWithWrappedCFException(h4);
2517 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2518 +                   Objects.equals(v2, rs[4].value));
2519 +        checkCompletedWithWrappedCFException(h5);
2520 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2521 +                   Objects.equals(v2, rs[5].value));
2522 +
2523          checkCompletedNormally(f, v1);
2524          checkCompletedNormally(g, v2);
2247        checkCompletedNormally(h, null);
2248        assertEquals(1, r.invocationCount);
2525      }}
2526  
2527 <    public void testRunAfterEither_normalCompletion2() {
2527 >    /**
2528 >     * runAfterEither result completes normally after normal completion
2529 >     * of either source
2530 >     */
2531 >    public void testRunAfterEither_normalCompletion() {
2532          for (ExecutionMode m : ExecutionMode.values())
2533          for (Integer v1 : new Integer[] { 1, null })
2534          for (Integer v2 : new Integer[] { 2, null })
2535      {
2536          final CompletableFuture<Integer> f = new CompletableFuture<>();
2537          final CompletableFuture<Integer> g = new CompletableFuture<>();
2538 <        final Noop r = new Noop(m);
2539 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2538 >        final Noop[] rs = new Noop[6];
2539 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2540  
2541 <        g.complete(v2);
2542 <        checkCompletedNormally(h, null);
2543 <        assertEquals(1, r.invocationCount);
2541 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2542 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2543 >        checkIncomplete(h0);
2544 >        checkIncomplete(h1);
2545 >        rs[0].assertNotInvoked();
2546 >        rs[1].assertNotInvoked();
2547          f.complete(v1);
2548 +        checkCompletedNormally(h0, null);
2549 +        checkCompletedNormally(h1, null);
2550 +        rs[0].assertInvoked();
2551 +        rs[1].assertInvoked();
2552 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2553 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2554 +        checkCompletedNormally(h2, null);
2555 +        checkCompletedNormally(h3, null);
2556 +        rs[2].assertInvoked();
2557 +        rs[3].assertInvoked();
2558  
2266        checkCompletedNormally(f, v1);
2267        checkCompletedNormally(g, v2);
2268        checkCompletedNormally(h, null);
2269        assertEquals(1, r.invocationCount);
2270        }}
2271
2272    public void testRunAfterEither_normalCompletion3() {
2273        for (ExecutionMode m : ExecutionMode.values())
2274        for (Integer v1 : new Integer[] { 1, null })
2275        for (Integer v2 : new Integer[] { 2, null })
2276    {
2277        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279        final Noop r = new Noop(m);
2280
2281        f.complete(v1);
2559          g.complete(v2);
2283        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2560  
2561 <        checkCompletedNormally(h, null);
2561 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2562 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2563 >
2564          checkCompletedNormally(f, v1);
2565          checkCompletedNormally(g, v2);
2566 <        assertEquals(1, r.invocationCount);
2566 >        checkCompletedNormally(h0, null);
2567 >        checkCompletedNormally(h1, null);
2568 >        checkCompletedNormally(h2, null);
2569 >        checkCompletedNormally(h3, null);
2570 >        checkCompletedNormally(h4, null);
2571 >        checkCompletedNormally(h5, null);
2572 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2573      }}
2574  
2575      /**
2576       * runAfterEither result completes exceptionally after exceptional
2577       * completion of either source
2578       */
2579 <    public void testRunAfterEither_exceptionalCompletion1() {
2296 <        for (ExecutionMode m : ExecutionMode.values())
2297 <        for (Integer v1 : new Integer[] { 1, null })
2298 <    {
2299 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2301 <        final Noop r = new Noop(m);
2302 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2303 <        final CFException ex = new CFException();
2304 <
2305 <        f.completeExceptionally(ex);
2306 <        checkCompletedWithWrappedCFException(h, ex);
2307 <        g.complete(v1);
2308 <
2309 <        assertEquals(0, r.invocationCount);
2310 <        checkCompletedNormally(g, v1);
2311 <        checkCompletedWithWrappedCFException(f, ex);
2312 <        checkCompletedWithWrappedCFException(h, ex);
2313 <    }}
2314 <
2315 <    public void testRunAfterEither_exceptionalCompletion2() {
2579 >    public void testRunAfterEither_exceptionalCompletion() {
2580          for (ExecutionMode m : ExecutionMode.values())
2581          for (Integer v1 : new Integer[] { 1, null })
2582      {
2583          final CompletableFuture<Integer> f = new CompletableFuture<>();
2584          final CompletableFuture<Integer> g = new CompletableFuture<>();
2321        final Noop r = new Noop(m);
2322        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2585          final CFException ex = new CFException();
2586 +        final Noop[] rs = new Noop[6];
2587 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2588  
2589 <        g.completeExceptionally(ex);
2590 <        checkCompletedWithWrappedCFException(h, ex);
2591 <        f.complete(v1);
2592 <
2593 <        assertEquals(0, r.invocationCount);
2594 <        checkCompletedNormally(f, v1);
2595 <        checkCompletedWithWrappedCFException(g, ex);
2596 <        checkCompletedWithWrappedCFException(h, ex);
2597 <    }}
2598 <
2599 <    public void testRunAfterEither_exceptionalCompletion3() {
2600 <        for (ExecutionMode m : ExecutionMode.values())
2601 <        for (Integer v1 : new Integer[] { 1, null })
2338 <    {
2339 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2340 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2341 <        final Noop r = new Noop(m);
2342 <        final CFException ex = new CFException();
2589 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2590 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2591 >        checkIncomplete(h0);
2592 >        checkIncomplete(h1);
2593 >        rs[0].assertNotInvoked();
2594 >        rs[1].assertNotInvoked();
2595 >        assertTrue(f.completeExceptionally(ex));
2596 >        checkCompletedWithWrappedException(h0, ex);
2597 >        checkCompletedWithWrappedException(h1, ex);
2598 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2599 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2600 >        checkCompletedWithWrappedException(h2, ex);
2601 >        checkCompletedWithWrappedException(h3, ex);
2602  
2603 <        g.completeExceptionally(ex);
2345 <        f.complete(v1);
2346 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2603 >        assertTrue(g.complete(v1));
2604  
2605 <        // unspecified behavior
2606 <        Integer v;
2605 >        // unspecified behavior - both source completions available
2606 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2607 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2608          try {
2609 <            assertNull(h.join());
2610 <            assertEquals(1, r.invocationCount);
2609 >            assertNull(h4.join());
2610 >            rs[4].assertInvoked();
2611          } catch (CompletionException ok) {
2612 <            checkCompletedWithWrappedCFException(h, ex);
2613 <            assertEquals(0, r.invocationCount);
2612 >            checkCompletedWithWrappedException(h4, ex);
2613 >            rs[4].assertNotInvoked();
2614          }
2357
2358        checkCompletedWithWrappedCFException(g, ex);
2359        checkCompletedNormally(f, v1);
2360    }}
2361
2362    public void testRunAfterEither_exceptionalCompletion4() {
2363        for (ExecutionMode m : ExecutionMode.values())
2364        for (Integer v1 : new Integer[] { 1, null })
2365    {
2366        final CompletableFuture<Integer> f = new CompletableFuture<>();
2367        final CompletableFuture<Integer> g = new CompletableFuture<>();
2368        final Noop r = new Noop(m);
2369        final CFException ex = new CFException();
2370
2371        f.completeExceptionally(ex);
2372        g.complete(v1);
2373        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2374
2375        // unspecified behavior
2376        Integer v;
2615          try {
2616 <            assertNull(h.join());
2617 <            assertEquals(1, r.invocationCount);
2616 >            assertNull(h5.join());
2617 >            rs[5].assertInvoked();
2618          } catch (CompletionException ok) {
2619 <            checkCompletedWithWrappedCFException(h, ex);
2620 <            assertEquals(0, r.invocationCount);
2619 >            checkCompletedWithWrappedException(h5, ex);
2620 >            rs[5].assertNotInvoked();
2621          }
2622  
2623 <        checkCompletedWithWrappedCFException(f, ex);
2623 >        checkCompletedExceptionally(f, ex);
2624          checkCompletedNormally(g, v1);
2625 +        checkCompletedWithWrappedException(h0, ex);
2626 +        checkCompletedWithWrappedException(h1, ex);
2627 +        checkCompletedWithWrappedException(h2, ex);
2628 +        checkCompletedWithWrappedException(h3, ex);
2629 +        checkCompletedWithWrappedException(h4, ex);
2630 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2631      }}
2632  
2633 <    /**
2390 <     * runAfterEither result completes exceptionally if action does
2391 <     */
2392 <    public void testRunAfterEither_actionFailed1() {
2633 >    public void testRunAfterEither_exceptionalCompletion2() {
2634          for (ExecutionMode m : ExecutionMode.values())
2635 +        for (boolean fFirst : new boolean[] { true, false })
2636          for (Integer v1 : new Integer[] { 1, null })
2395        for (Integer v2 : new Integer[] { 2, null })
2637      {
2638          final CompletableFuture<Integer> f = new CompletableFuture<>();
2639          final CompletableFuture<Integer> g = new CompletableFuture<>();
2640 <        final FailingRunnable r = new FailingRunnable(m);
2641 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2640 >        final CFException ex = new CFException();
2641 >        final Noop[] rs = new Noop[6];
2642 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2643  
2644 <        f.complete(v1);
2645 <        checkCompletedWithWrappedCFException(h);
2646 <        g.complete(v2);
2647 <        checkCompletedNormally(f, v1);
2648 <        checkCompletedNormally(g, v2);
2649 <    }}
2644 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2645 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2646 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2647 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2648 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2649 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2650  
2651 <    public void testRunAfterEither_actionFailed2() {
2652 <        for (ExecutionMode m : ExecutionMode.values())
2653 <        for (Integer v1 : new Integer[] { 1, null })
2654 <        for (Integer v2 : new Integer[] { 2, null })
2655 <    {
2656 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2657 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 <        final FailingRunnable r = new FailingRunnable(m);
2659 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2651 >        // unspecified behavior - both source completions available
2652 >        try {
2653 >            assertEquals(null, h0.join());
2654 >            rs[0].assertInvoked();
2655 >        } catch (CompletionException ok) {
2656 >            checkCompletedWithWrappedException(h0, ex);
2657 >            rs[0].assertNotInvoked();
2658 >        }
2659 >        try {
2660 >            assertEquals(null, h1.join());
2661 >            rs[1].assertInvoked();
2662 >        } catch (CompletionException ok) {
2663 >            checkCompletedWithWrappedException(h1, ex);
2664 >            rs[1].assertNotInvoked();
2665 >        }
2666 >        try {
2667 >            assertEquals(null, h2.join());
2668 >            rs[2].assertInvoked();
2669 >        } catch (CompletionException ok) {
2670 >            checkCompletedWithWrappedException(h2, ex);
2671 >            rs[2].assertNotInvoked();
2672 >        }
2673 >        try {
2674 >            assertEquals(null, h3.join());
2675 >            rs[3].assertInvoked();
2676 >        } catch (CompletionException ok) {
2677 >            checkCompletedWithWrappedException(h3, ex);
2678 >            rs[3].assertNotInvoked();
2679 >        }
2680  
2419        g.complete(v2);
2420        checkCompletedWithWrappedCFException(h);
2421        f.complete(v1);
2681          checkCompletedNormally(f, v1);
2682 <        checkCompletedNormally(g, v2);
2682 >        checkCompletedExceptionally(g, ex);
2683      }}
2684  
2685      /**
2686       * runAfterEither result completes exceptionally if either source cancelled
2687       */
2688 <    public void testRunAfterEither_sourceCancelled1() {
2430 <        for (ExecutionMode m : ExecutionMode.values())
2431 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2432 <        for (Integer v1 : new Integer[] { 1, null })
2433 <    {
2434 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2435 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2436 <        final Noop r = new Noop(m);
2437 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2438 <
2439 <        assertTrue(f.cancel(mayInterruptIfRunning));
2440 <        checkCompletedWithWrappedCancellationException(h);
2441 <        g.complete(v1);
2442 <
2443 <        checkCancelled(f);
2444 <        assertEquals(0, r.invocationCount);
2445 <        checkCompletedNormally(g, v1);
2446 <        checkCompletedWithWrappedCancellationException(h);
2447 <    }}
2448 <
2449 <    public void testRunAfterEither_sourceCancelled2() {
2688 >    public void testRunAfterEither_sourceCancelled() {
2689          for (ExecutionMode m : ExecutionMode.values())
2690          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2691          for (Integer v1 : new Integer[] { 1, null })
2692      {
2693          final CompletableFuture<Integer> f = new CompletableFuture<>();
2694          final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 <        final Noop r = new Noop(m);
2696 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2458 <
2459 <        assertTrue(g.cancel(mayInterruptIfRunning));
2460 <        checkCompletedWithWrappedCancellationException(h);
2461 <        f.complete(v1);
2695 >        final Noop[] rs = new Noop[6];
2696 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2697  
2698 <        checkCancelled(g);
2699 <        assertEquals(0, r.invocationCount);
2700 <        checkCompletedNormally(f, v1);
2701 <        checkCompletedWithWrappedCancellationException(h);
2702 <    }}
2703 <
2704 <    public void testRunAfterEither_sourceCancelled3() {
2705 <        for (ExecutionMode m : ExecutionMode.values())
2706 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2707 <        for (Integer v1 : new Integer[] { 1, null })
2708 <    {
2709 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2710 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2711 <        final Noop r = new Noop(m);
2712 <
2713 <        assertTrue(g.cancel(mayInterruptIfRunning));
2714 <        f.complete(v1);
2715 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2716 <
2717 <        // unspecified behavior
2718 <        Integer v;
2698 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2699 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2700 >        checkIncomplete(h0);
2701 >        checkIncomplete(h1);
2702 >        rs[0].assertNotInvoked();
2703 >        rs[1].assertNotInvoked();
2704 >        f.cancel(mayInterruptIfRunning);
2705 >        checkCompletedWithWrappedCancellationException(h0);
2706 >        checkCompletedWithWrappedCancellationException(h1);
2707 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2708 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2709 >        checkCompletedWithWrappedCancellationException(h2);
2710 >        checkCompletedWithWrappedCancellationException(h3);
2711 >
2712 >        assertTrue(g.complete(v1));
2713 >
2714 >        // unspecified behavior - both source completions available
2715 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2716 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2717 >        try {
2718 >            assertNull(h4.join());
2719 >            rs[4].assertInvoked();
2720 >        } catch (CompletionException ok) {
2721 >            checkCompletedWithWrappedCancellationException(h4);
2722 >            rs[4].assertNotInvoked();
2723 >        }
2724          try {
2725 <            assertNull(h.join());
2726 <            assertEquals(1, r.invocationCount);
2725 >            assertNull(h5.join());
2726 >            rs[5].assertInvoked();
2727          } catch (CompletionException ok) {
2728 <            checkCompletedWithWrappedCancellationException(h);
2729 <            assertEquals(0, r.invocationCount);
2728 >            checkCompletedWithWrappedCancellationException(h5);
2729 >            rs[5].assertNotInvoked();
2730          }
2731  
2732 <        checkCancelled(g);
2733 <        checkCompletedNormally(f, v1);
2732 >        checkCancelled(f);
2733 >        checkCompletedNormally(g, v1);
2734 >        checkCompletedWithWrappedCancellationException(h0);
2735 >        checkCompletedWithWrappedCancellationException(h1);
2736 >        checkCompletedWithWrappedCancellationException(h2);
2737 >        checkCompletedWithWrappedCancellationException(h3);
2738 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2739      }}
2740  
2741 <    public void testRunAfterEither_sourceCancelled4() {
2741 >    /**
2742 >     * runAfterEither result completes exceptionally if action does
2743 >     */
2744 >    public void testRunAfterEither_actionFailed() {
2745          for (ExecutionMode m : ExecutionMode.values())
2498        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2746          for (Integer v1 : new Integer[] { 1, null })
2747 +        for (Integer v2 : new Integer[] { 2, null })
2748      {
2749          final CompletableFuture<Integer> f = new CompletableFuture<>();
2750          final CompletableFuture<Integer> g = new CompletableFuture<>();
2751 <        final Noop r = new Noop(m);
2751 >        final FailingRunnable[] rs = new FailingRunnable[6];
2752 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2753  
2754 <        assertTrue(f.cancel(mayInterruptIfRunning));
2755 <        g.complete(v1);
2756 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2757 <
2758 <        // unspecified behavior
2759 <        Integer v;
2760 <        try {
2761 <            assertNull(h.join());
2762 <            assertEquals(1, r.invocationCount);
2763 <        } catch (CompletionException ok) {
2764 <            checkCompletedWithWrappedCancellationException(h);
2765 <            assertEquals(0, r.invocationCount);
2766 <        }
2754 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2755 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2756 >        assertTrue(f.complete(v1));
2757 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2758 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2759 >        checkCompletedWithWrappedCFException(h0);
2760 >        checkCompletedWithWrappedCFException(h1);
2761 >        checkCompletedWithWrappedCFException(h2);
2762 >        checkCompletedWithWrappedCFException(h3);
2763 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2764 >        assertTrue(g.complete(v2));
2765 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2766 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2767 >        checkCompletedWithWrappedCFException(h4);
2768 >        checkCompletedWithWrappedCFException(h5);
2769  
2770 <        checkCancelled(f);
2771 <        checkCompletedNormally(g, v1);
2770 >        checkCompletedNormally(f, v1);
2771 >        checkCompletedNormally(g, v2);
2772 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2773      }}
2774  
2775      /**
# Line 2530 | Line 2782 | public class CompletableFutureTest exten
2782      {
2783          final CompletableFuture<Integer> f = new CompletableFuture<>();
2784          final CompletableFutureInc r = new CompletableFutureInc(m);
2785 <        if (!createIncomplete) f.complete(v1);
2785 >        if (!createIncomplete) assertTrue(f.complete(v1));
2786          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2787 <        if (createIncomplete) f.complete(v1);
2787 >        if (createIncomplete) assertTrue(f.complete(v1));
2788  
2789          checkCompletedNormally(g, inc(v1));
2790          checkCompletedNormally(f, v1);
2791 <        assertEquals(1, r.invocationCount);
2791 >        r.assertValue(v1);
2792      }}
2793  
2794      /**
# Line 2554 | Line 2806 | public class CompletableFutureTest exten
2806          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2807          if (createIncomplete) f.completeExceptionally(ex);
2808  
2809 <        checkCompletedWithWrappedCFException(g, ex);
2810 <        checkCompletedWithWrappedCFException(f, ex);
2811 <        assertEquals(0, r.invocationCount);
2809 >        checkCompletedWithWrappedException(g, ex);
2810 >        checkCompletedExceptionally(f, ex);
2811 >        r.assertNotInvoked();
2812      }}
2813  
2814      /**
# Line 2570 | Line 2822 | public class CompletableFutureTest exten
2822          final CompletableFuture<Integer> f = new CompletableFuture<>();
2823          final FailingCompletableFutureFunction r
2824              = new FailingCompletableFutureFunction(m);
2825 <        if (!createIncomplete) f.complete(v1);
2825 >        if (!createIncomplete) assertTrue(f.complete(v1));
2826          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2827 <        if (createIncomplete) f.complete(v1);
2827 >        if (createIncomplete) assertTrue(f.complete(v1));
2828  
2829          checkCompletedWithWrappedCFException(g);
2830          checkCompletedNormally(f, v1);
# Line 2811 | Line 3063 | public class CompletableFutureTest exten
3063          assertSame(f, f.toCompletableFuture());
3064      }
3065  
3066 <    /**
3067 <     * whenComplete action executes on normal completion, propagating
3068 <     * source result.
3069 <     */
3070 <    public void testWhenComplete_normalCompletion1() {
3071 <        for (ExecutionMode m : ExecutionMode.values())
3072 <        for (boolean createIncomplete : new boolean[] { true, false })
3073 <        for (Integer v1 : new Integer[] { 1, null })
3074 <    {
3075 <        final AtomicInteger a = new AtomicInteger(0);
3076 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3077 <        if (!createIncomplete) f.complete(v1);
3078 <        final CompletableFuture<Integer> g = m.whenComplete
3079 <            (f,
3080 <             (Integer x, Throwable t) -> {
3081 <                threadAssertSame(x, v1);
3082 <                threadAssertNull(t);
2831 <                a.getAndIncrement();
2832 <            });
2833 <        if (createIncomplete) f.complete(v1);
2834 <
2835 <        checkCompletedNormally(g, v1);
2836 <        checkCompletedNormally(f, v1);
2837 <        assertEquals(1, a.get());
2838 <    }}
2839 <
2840 <    /**
2841 <     * whenComplete action executes on exceptional completion, propagating
2842 <     * source result.
2843 <     */
2844 <    public void testWhenComplete_exceptionalCompletion() {
2845 <        for (ExecutionMode m : ExecutionMode.values())
2846 <        for (boolean createIncomplete : new boolean[] { true, false })
2847 <        for (Integer v1 : new Integer[] { 1, null })
2848 <    {
2849 <        final AtomicInteger a = new AtomicInteger(0);
2850 <        final CFException ex = new CFException();
2851 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2852 <        if (!createIncomplete) f.completeExceptionally(ex);
2853 <        final CompletableFuture<Integer> g = m.whenComplete
2854 <            (f,
2855 <             (Integer x, Throwable t) -> {
2856 <                threadAssertNull(x);
2857 <                threadAssertSame(t, ex);
2858 <                a.getAndIncrement();
2859 <            });
2860 <        if (createIncomplete) f.completeExceptionally(ex);
2861 <        checkCompletedWithWrappedCFException(f, ex);
2862 <        checkCompletedWithWrappedCFException(g, ex);
2863 <        assertEquals(1, a.get());
2864 <    }}
2865 <
2866 <    /**
2867 <     * whenComplete action executes on cancelled source, propagating
2868 <     * CancellationException.
2869 <     */
2870 <    public void testWhenComplete_sourceCancelled() {
2871 <        for (ExecutionMode m : ExecutionMode.values())
2872 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2873 <        for (boolean createIncomplete : new boolean[] { true, false })
2874 <    {
2875 <        final AtomicInteger a = new AtomicInteger(0);
2876 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2877 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2878 <        final CompletableFuture<Integer> g = m.whenComplete
2879 <            (f,
2880 <             (Integer x, Throwable t) -> {
2881 <                threadAssertNull(x);
2882 <                threadAssertTrue(t instanceof CancellationException);
2883 <                a.getAndIncrement();
2884 <            });
2885 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2886 <
2887 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2888 <        checkCompletedWithWrappedCancellationException(g);
2889 <        checkCancelled(f);
2890 <        assertEquals(1, a.get());
2891 <    }}
2892 <
2893 <    /**
2894 <     * If a whenComplete action throws an exception when triggered by
2895 <     * a normal completion, it completes exceptionally
2896 <     */
2897 <    public void testWhenComplete_actionFailed() {
2898 <        for (boolean createIncomplete : new boolean[] { true, false })
2899 <        for (ExecutionMode m : ExecutionMode.values())
2900 <        for (Integer v1 : new Integer[] { 1, null })
2901 <    {
2902 <        final AtomicInteger a = new AtomicInteger(0);
2903 <        final CFException ex = new CFException();
2904 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2905 <        if (!createIncomplete) f.complete(v1);
2906 <        final CompletableFuture<Integer> g = m.whenComplete
2907 <            (f,
2908 <             (Integer x, Throwable t) -> {
2909 <                threadAssertSame(x, v1);
2910 <                threadAssertNull(t);
2911 <                a.getAndIncrement();
2912 <                throw ex;
2913 <            });
2914 <        if (createIncomplete) f.complete(v1);
2915 <        checkCompletedNormally(f, v1);
2916 <        checkCompletedWithWrappedCFException(g, ex);
2917 <        assertEquals(1, a.get());
2918 <    }}
2919 <
2920 <    /**
2921 <     * If a whenComplete action throws an exception when triggered by
2922 <     * a source completion that also throws an exception, the source
2923 <     * exception takes precedence.
2924 <     */
2925 <    public void testWhenComplete_actionFailedSourceFailed() {
2926 <        for (boolean createIncomplete : new boolean[] { true, false })
2927 <        for (ExecutionMode m : ExecutionMode.values())
2928 <        for (Integer v1 : new Integer[] { 1, null })
2929 <    {
2930 <        final AtomicInteger a = new AtomicInteger(0);
2931 <        final CFException ex1 = new CFException();
2932 <        final CFException ex2 = new CFException();
2933 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2934 <
2935 <        if (!createIncomplete) f.completeExceptionally(ex1);
2936 <        final CompletableFuture<Integer> g = m.whenComplete
2937 <            (f,
2938 <             (Integer x, Throwable t) -> {
2939 <                threadAssertSame(t, ex1);
2940 <                threadAssertNull(x);
2941 <                a.getAndIncrement();
2942 <                throw ex2;
2943 <            });
2944 <        if (createIncomplete) f.completeExceptionally(ex1);
2945 <
2946 <        checkCompletedWithWrappedCFException(f, ex1);
2947 <        checkCompletedWithWrappedCFException(g, ex1);
2948 <        assertEquals(1, a.get());
2949 <    }}
3066 > //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3067 > //         for (ExecutionMode m : ExecutionMode.values())
3068 > //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3069 > //         for (Integer v1 : new Integer[] { 1, null })
3070 > //     {
3071 > //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3072 > //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3073 > //         final Noop[] rs = new Noop[2];
3074 > //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3075 > //         f.complete(v1);
3076 > //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3077 > //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3078 > //         assertTrue(g.cancel(mayInterruptIfRunning));
3079 > //         checkCompletedNormally(h0, null);
3080 > //         checkCompletedNormally(h1, null);
3081 > //         for (Noop r : rs) r.assertInvoked();
3082 > //     }}
3083  
3084   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines