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.87 by jsr166, Mon Jun 16 21:14:16 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);
1683 <        } else {
1684 <            g.complete(v2);
1685 <            f.complete(v1);
1430 <        }
1431 <
1432 <        checkCompletedWithWrappedCFException(h);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683 >        r1.assertInvoked();
1684 >        r2.assertInvoked();
1685 >        r3.assertInvoked();
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688      }}
# Line 1440 | Line 1693 | public class CompletableFutureTest exten
1693       */
1694      public void testThenAcceptBoth_normalCompletion() {
1695          for (ExecutionMode m : ExecutionMode.values())
1443        for (boolean createIncomplete : new boolean[] { true, false })
1696          for (boolean fFirst : new boolean[] { true, false })
1697          for (Integer v1 : new Integer[] { 1, null })
1698          for (Integer v2 : new Integer[] { 2, null })
1699      {
1700          final CompletableFuture<Integer> f = new CompletableFuture<>();
1701          final CompletableFuture<Integer> g = new CompletableFuture<>();
1702 <        final SubtractAction r = new SubtractAction(m);
1703 <
1704 <        if (fFirst) f.complete(v1); else g.complete(v2);
1705 <        if (!createIncomplete)
1706 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1707 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1708 <        if (createIncomplete) {
1709 <            checkIncomplete(h);
1710 <            assertEquals(0, r.invocationCount);
1711 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1712 <        }
1713 <
1714 <        checkCompletedNormally(h, null);
1715 <        assertEquals(subtract(v1, v2), r.value);
1702 >        final SubtractAction r1 = new SubtractAction(m);
1703 >        final SubtractAction r2 = new SubtractAction(m);
1704 >        final SubtractAction r3 = new SubtractAction(m);
1705 >
1706 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1707 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1708 >        final Integer w1 =  fFirst ? v1 : v2;
1709 >        final Integer w2 = !fFirst ? v1 : v2;
1710 >
1711 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1712 >        assertTrue(fst.complete(w1));
1713 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1714 >        checkIncomplete(h1);
1715 >        checkIncomplete(h2);
1716 >        r1.assertNotInvoked();
1717 >        r2.assertNotInvoked();
1718 >        assertTrue(snd.complete(w2));
1719 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1720 >
1721 >        checkCompletedNormally(h1, null);
1722 >        checkCompletedNormally(h2, null);
1723 >        checkCompletedNormally(h3, null);
1724 >        r1.assertValue(subtract(v1, v2));
1725 >        r2.assertValue(subtract(v1, v2));
1726 >        r3.assertValue(subtract(v1, v2));
1727          checkCompletedNormally(f, v1);
1728          checkCompletedNormally(g, v2);
1729      }}
# Line 1469 | Line 1732 | public class CompletableFutureTest exten
1732       * thenAcceptBoth result completes exceptionally after exceptional
1733       * completion of either source
1734       */
1735 <    public void testThenAcceptBoth_exceptionalCompletion() {
1735 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1736          for (ExecutionMode m : ExecutionMode.values())
1474        for (boolean createIncomplete : new boolean[] { true, false })
1737          for (boolean fFirst : new boolean[] { true, false })
1738 +        for (boolean failFirst : new boolean[] { true, false })
1739          for (Integer v1 : new Integer[] { 1, null })
1740      {
1741          final CompletableFuture<Integer> f = new CompletableFuture<>();
1742          final CompletableFuture<Integer> g = new CompletableFuture<>();
1743          final CFException ex = new CFException();
1744 <        final SubtractAction r = new SubtractAction(m);
1745 <
1746 <        (fFirst ? f : g).complete(v1);
1747 <        if (!createIncomplete)
1748 <            (!fFirst ? f : g).completeExceptionally(ex);
1749 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1750 <        if (createIncomplete) {
1751 <            checkIncomplete(h);
1752 <            (!fFirst ? f : g).completeExceptionally(ex);
1753 <        }
1754 <
1755 <        checkCompletedWithWrappedCFException(h, ex);
1756 <        assertEquals(0, r.invocationCount);
1757 <        checkCompletedNormally(fFirst ? f : g, v1);
1758 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1744 >        final SubtractAction r1 = new SubtractAction(m);
1745 >        final SubtractAction r2 = new SubtractAction(m);
1746 >        final SubtractAction r3 = new SubtractAction(m);
1747 >
1748 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1749 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1750 >        final Callable<Boolean> complete1 = failFirst ?
1751 >            () -> fst.completeExceptionally(ex) :
1752 >            () -> fst.complete(v1);
1753 >        final Callable<Boolean> complete2 = failFirst ?
1754 >            () -> snd.complete(v1) :
1755 >            () -> snd.completeExceptionally(ex);
1756 >
1757 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1758 >        assertTrue(complete1.call());
1759 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1760 >        checkIncomplete(h1);
1761 >        checkIncomplete(h2);
1762 >        assertTrue(complete2.call());
1763 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1764 >
1765 >        checkCompletedWithWrappedException(h1, ex);
1766 >        checkCompletedWithWrappedException(h2, ex);
1767 >        checkCompletedWithWrappedException(h3, ex);
1768 >        r1.assertNotInvoked();
1769 >        r2.assertNotInvoked();
1770 >        r3.assertNotInvoked();
1771 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1772 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1773      }}
1774  
1775      /**
1776       * thenAcceptBoth result completes exceptionally if either source cancelled
1777       */
1778 <    public void testThenAcceptBoth_sourceCancelled() {
1778 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1779          for (ExecutionMode m : ExecutionMode.values())
1780          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1504        for (boolean createIncomplete : new boolean[] { true, false })
1781          for (boolean fFirst : new boolean[] { true, false })
1782 +        for (boolean failFirst : new boolean[] { true, false })
1783          for (Integer v1 : new Integer[] { 1, null })
1784      {
1785          final CompletableFuture<Integer> f = new CompletableFuture<>();
1786          final CompletableFuture<Integer> g = new CompletableFuture<>();
1787 <        final SubtractAction r = new SubtractAction(m);
1788 <
1789 <        (fFirst ? f : g).complete(v1);
1790 <        if (!createIncomplete)
1791 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1792 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1793 <        if (createIncomplete) {
1794 <            checkIncomplete(h);
1795 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1796 <        }
1797 <
1798 <        checkCompletedWithWrappedCancellationException(h);
1799 <        checkCancelled(!fFirst ? f : g);
1800 <        assertEquals(0, r.invocationCount);
1801 <        checkCompletedNormally(fFirst ? f : g, v1);
1787 >        final SubtractAction r1 = new SubtractAction(m);
1788 >        final SubtractAction r2 = new SubtractAction(m);
1789 >        final SubtractAction r3 = new SubtractAction(m);
1790 >
1791 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1792 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1793 >        final Callable<Boolean> complete1 = failFirst ?
1794 >            () -> fst.cancel(mayInterruptIfRunning) :
1795 >            () -> fst.complete(v1);
1796 >        final Callable<Boolean> complete2 = failFirst ?
1797 >            () -> snd.complete(v1) :
1798 >            () -> snd.cancel(mayInterruptIfRunning);
1799 >
1800 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1801 >        assertTrue(complete1.call());
1802 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1803 >        checkIncomplete(h1);
1804 >        checkIncomplete(h2);
1805 >        assertTrue(complete2.call());
1806 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1807 >
1808 >        checkCompletedWithWrappedCancellationException(h1);
1809 >        checkCompletedWithWrappedCancellationException(h2);
1810 >        checkCompletedWithWrappedCancellationException(h3);
1811 >        r1.assertNotInvoked();
1812 >        r2.assertNotInvoked();
1813 >        r3.assertNotInvoked();
1814 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1815 >        checkCancelled(failFirst ? fst : snd);
1816      }}
1817  
1818      /**
# Line 1535 | Line 1826 | public class CompletableFutureTest exten
1826      {
1827          final CompletableFuture<Integer> f = new CompletableFuture<>();
1828          final CompletableFuture<Integer> g = new CompletableFuture<>();
1829 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1830 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1831 <
1832 <        if (fFirst) {
1833 <            f.complete(v1);
1834 <            g.complete(v2);
1835 <        } else {
1836 <            g.complete(v2);
1837 <            f.complete(v1);
1838 <        }
1829 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1830 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1831 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1832 >
1833 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1834 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1835 >        final Integer w1 =  fFirst ? v1 : v2;
1836 >        final Integer w2 = !fFirst ? v1 : v2;
1837 >
1838 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1839 >        assertTrue(fst.complete(w1));
1840 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1841 >        assertTrue(snd.complete(w2));
1842 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1843  
1844 <        checkCompletedWithWrappedCFException(h);
1844 >        checkCompletedWithWrappedCFException(h1);
1845 >        checkCompletedWithWrappedCFException(h2);
1846 >        checkCompletedWithWrappedCFException(h3);
1847 >        r1.assertInvoked();
1848 >        r2.assertInvoked();
1849 >        r3.assertInvoked();
1850          checkCompletedNormally(f, v1);
1851          checkCompletedNormally(g, v2);
1852      }}
# Line 1557 | Line 1857 | public class CompletableFutureTest exten
1857       */
1858      public void testRunAfterBoth_normalCompletion() {
1859          for (ExecutionMode m : ExecutionMode.values())
1560        for (boolean createIncomplete : new boolean[] { true, false })
1860          for (boolean fFirst : new boolean[] { true, false })
1861          for (Integer v1 : new Integer[] { 1, null })
1862          for (Integer v2 : new Integer[] { 2, null })
1863      {
1864          final CompletableFuture<Integer> f = new CompletableFuture<>();
1865          final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 <        final Noop r = new Noop(m);
1867 <
1868 <        if (fFirst) f.complete(v1); else g.complete(v2);
1869 <        if (!createIncomplete)
1870 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1871 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1872 <        if (createIncomplete) {
1873 <            checkIncomplete(h);
1874 <            assertEquals(0, r.invocationCount);
1875 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1876 <        }
1877 <
1878 <        checkCompletedNormally(h, null);
1879 <        assertEquals(1, r.invocationCount);
1866 >        final Noop r1 = new Noop(m);
1867 >        final Noop r2 = new Noop(m);
1868 >        final Noop r3 = new Noop(m);
1869 >
1870 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1871 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1872 >        final Integer w1 =  fFirst ? v1 : v2;
1873 >        final Integer w2 = !fFirst ? v1 : v2;
1874 >
1875 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1876 >        assertTrue(fst.complete(w1));
1877 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1878 >        checkIncomplete(h1);
1879 >        checkIncomplete(h2);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        assertTrue(snd.complete(w2));
1883 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1884 >
1885 >        checkCompletedNormally(h1, null);
1886 >        checkCompletedNormally(h2, null);
1887 >        checkCompletedNormally(h3, null);
1888 >        r1.assertInvoked();
1889 >        r2.assertInvoked();
1890 >        r3.assertInvoked();
1891          checkCompletedNormally(f, v1);
1892          checkCompletedNormally(g, v2);
1893      }}
# Line 1586 | Line 1896 | public class CompletableFutureTest exten
1896       * runAfterBoth result completes exceptionally after exceptional
1897       * completion of either source
1898       */
1899 <    public void testRunAfterBoth_exceptionalCompletion() {
1899 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1900          for (ExecutionMode m : ExecutionMode.values())
1591        for (boolean createIncomplete : new boolean[] { true, false })
1901          for (boolean fFirst : new boolean[] { true, false })
1902 +        for (boolean failFirst : new boolean[] { true, false })
1903          for (Integer v1 : new Integer[] { 1, null })
1904      {
1905          final CompletableFuture<Integer> f = new CompletableFuture<>();
1906          final CompletableFuture<Integer> g = new CompletableFuture<>();
1907          final CFException ex = new CFException();
1908 <        final Noop r = new Noop(m);
1909 <
1910 <        (fFirst ? f : g).complete(v1);
1911 <        if (!createIncomplete)
1912 <            (!fFirst ? f : g).completeExceptionally(ex);
1913 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1914 <        if (createIncomplete) {
1915 <            checkIncomplete(h);
1916 <            (!fFirst ? f : g).completeExceptionally(ex);
1917 <        }
1918 <
1919 <        checkCompletedWithWrappedCFException(h, ex);
1920 <        assertEquals(0, r.invocationCount);
1921 <        checkCompletedNormally(fFirst ? f : g, v1);
1922 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1908 >        final Noop r1 = new Noop(m);
1909 >        final Noop r2 = new Noop(m);
1910 >        final Noop r3 = new Noop(m);
1911 >
1912 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1913 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1914 >        final Callable<Boolean> complete1 = failFirst ?
1915 >            () -> fst.completeExceptionally(ex) :
1916 >            () -> fst.complete(v1);
1917 >        final Callable<Boolean> complete2 = failFirst ?
1918 >            () -> snd.complete(v1) :
1919 >            () -> snd.completeExceptionally(ex);
1920 >
1921 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1922 >        assertTrue(complete1.call());
1923 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1924 >        checkIncomplete(h1);
1925 >        checkIncomplete(h2);
1926 >        assertTrue(complete2.call());
1927 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1928 >
1929 >        checkCompletedWithWrappedException(h1, ex);
1930 >        checkCompletedWithWrappedException(h2, ex);
1931 >        checkCompletedWithWrappedException(h3, ex);
1932 >        r1.assertNotInvoked();
1933 >        r2.assertNotInvoked();
1934 >        r3.assertNotInvoked();
1935 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1936 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1937      }}
1938  
1939      /**
1940       * runAfterBoth result completes exceptionally if either source cancelled
1941       */
1942 <    public void testRunAfterBoth_sourceCancelled() {
1942 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1943          for (ExecutionMode m : ExecutionMode.values())
1944          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1621        for (boolean createIncomplete : new boolean[] { true, false })
1945          for (boolean fFirst : new boolean[] { true, false })
1946 +        for (boolean failFirst : new boolean[] { true, false })
1947          for (Integer v1 : new Integer[] { 1, null })
1948      {
1949          final CompletableFuture<Integer> f = new CompletableFuture<>();
1950          final CompletableFuture<Integer> g = new CompletableFuture<>();
1951 <        final Noop r = new Noop(m);
1952 <
1953 <
1954 <        (fFirst ? f : g).complete(v1);
1955 <        if (!createIncomplete)
1956 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1957 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1958 <        if (createIncomplete) {
1959 <            checkIncomplete(h);
1960 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1961 <        }
1962 <
1963 <        checkCompletedWithWrappedCancellationException(h);
1964 <        checkCancelled(!fFirst ? f : g);
1965 <        assertEquals(0, r.invocationCount);
1966 <        checkCompletedNormally(fFirst ? f : g, v1);
1951 >        final Noop r1 = new Noop(m);
1952 >        final Noop r2 = new Noop(m);
1953 >        final Noop r3 = new Noop(m);
1954 >
1955 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1956 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1957 >        final Callable<Boolean> complete1 = failFirst ?
1958 >            () -> fst.cancel(mayInterruptIfRunning) :
1959 >            () -> fst.complete(v1);
1960 >        final Callable<Boolean> complete2 = failFirst ?
1961 >            () -> snd.complete(v1) :
1962 >            () -> snd.cancel(mayInterruptIfRunning);
1963 >
1964 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1965 >        assertTrue(complete1.call());
1966 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1967 >        checkIncomplete(h1);
1968 >        checkIncomplete(h2);
1969 >        assertTrue(complete2.call());
1970 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1971 >
1972 >        checkCompletedWithWrappedCancellationException(h1);
1973 >        checkCompletedWithWrappedCancellationException(h2);
1974 >        checkCompletedWithWrappedCancellationException(h3);
1975 >        r1.assertNotInvoked();
1976 >        r2.assertNotInvoked();
1977 >        r3.assertNotInvoked();
1978 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1979 >        checkCancelled(failFirst ? fst : snd);
1980      }}
1981  
1982      /**
# Line 1653 | Line 1990 | public class CompletableFutureTest exten
1990      {
1991          final CompletableFuture<Integer> f = new CompletableFuture<>();
1992          final CompletableFuture<Integer> g = new CompletableFuture<>();
1993 <        final FailingRunnable r = new FailingRunnable(m);
1994 <
1995 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1996 <        if (fFirst) {
1997 <            f.complete(v1);
1998 <            g.complete(v2);
1999 <        } else {
2000 <            g.complete(v2);
2001 <            f.complete(v1);
2002 <        }
2003 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1993 >        final FailingRunnable r1 = new FailingRunnable(m);
1994 >        final FailingRunnable r2 = new FailingRunnable(m);
1995 >        final FailingRunnable r3 = new FailingRunnable(m);
1996 >
1997 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1998 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1999 >        final Integer w1 =  fFirst ? v1 : v2;
2000 >        final Integer w2 = !fFirst ? v1 : v2;
2001 >
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(fst.complete(w1));
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        assertTrue(snd.complete(w2));
2006 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2007  
2008          checkCompletedWithWrappedCFException(h1);
2009          checkCompletedWithWrappedCFException(h2);
2010 +        checkCompletedWithWrappedCFException(h3);
2011 +        r1.assertInvoked();
2012 +        r2.assertInvoked();
2013 +        r3.assertInvoked();
2014          checkCompletedNormally(f, v1);
2015          checkCompletedNormally(g, v2);
2016      }}
# Line 1677 | Line 2021 | public class CompletableFutureTest exten
2021       */
2022      public void testApplyToEither_normalCompletion() {
2023          for (ExecutionMode m : ExecutionMode.values())
1680        for (boolean createIncomplete : new boolean[] { true, false })
1681        for (boolean fFirst : new boolean[] { true, false })
1682        for (Integer v1 : new Integer[] { 1, null })
1683        for (Integer v2 : new Integer[] { 2, null })
1684    {
1685        final CompletableFuture<Integer> f = new CompletableFuture<>();
1686        final CompletableFuture<Integer> g = new CompletableFuture<>();
1687        final IncFunction r = new IncFunction(m);
1688
1689        if (!createIncomplete)
1690            if (fFirst) f.complete(v1); else g.complete(v2);
1691        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1692        if (createIncomplete) {
1693            checkIncomplete(h);
1694            assertEquals(0, r.invocationCount);
1695            if (fFirst) f.complete(v1); else g.complete(v2);
1696        }
1697        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1698        if (!fFirst) f.complete(v1); else g.complete(v2);
1699
1700        checkCompletedNormally(f, v1);
1701        checkCompletedNormally(g, v2);
1702        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 })
2024          for (Integer v1 : new Integer[] { 1, null })
2025          for (Integer v2 : new Integer[] { 2, null })
2026      {
2027          final CompletableFuture<Integer> f = new CompletableFuture<>();
2028          final CompletableFuture<Integer> g = new CompletableFuture<>();
2029 <        final IncFunction r = new IncFunction(m);
2029 >        final IncFunction[] rs = new IncFunction[6];
2030 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2031  
2032 <        if (fFirst) {
2033 <            f.complete(v1);
2034 <            g.complete(v2);
2035 <        } else {
2036 <            g.complete(v2);
2037 <            f.complete(v1);
2038 <        }
2032 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2033 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2034 >        checkIncomplete(h0);
2035 >        checkIncomplete(h1);
2036 >        rs[0].assertNotInvoked();
2037 >        rs[1].assertNotInvoked();
2038 >        f.complete(v1);
2039 >        checkCompletedNormally(h0, inc(v1));
2040 >        checkCompletedNormally(h1, inc(v1));
2041 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2042 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2043 >        checkCompletedNormally(h2, inc(v1));
2044 >        checkCompletedNormally(h3, inc(v1));
2045 >        g.complete(v2);
2046  
2047 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2047 >        // unspecified behavior - both source completions available
2048 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2049 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2050 >        rs[4].assertValue(h4.join());
2051 >        rs[5].assertValue(h5.join());
2052 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2053 >                   Objects.equals(inc(v2), h4.join()));
2054 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2055 >                   Objects.equals(inc(v2), h5.join()));
2056  
2057          checkCompletedNormally(f, v1);
2058          checkCompletedNormally(g, v2);
2059 <
2060 <        // unspecified behavior
2061 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2062 <                   Objects.equals(h.join(), inc(v2)));
2063 <        assertEquals(1, r.invocationCount);
2059 >        checkCompletedNormally(h0, inc(v1));
2060 >        checkCompletedNormally(h1, inc(v1));
2061 >        checkCompletedNormally(h2, inc(v1));
2062 >        checkCompletedNormally(h3, inc(v1));
2063 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2064      }}
2065  
2066      /**
2067       * applyToEither result completes exceptionally after exceptional
2068       * completion of either source
2069       */
2070 <    public void testApplyToEither_exceptionalCompletion1() {
2070 >    public void testApplyToEither_exceptionalCompletion() {
2071          for (ExecutionMode m : ExecutionMode.values())
1740        for (boolean createIncomplete : new boolean[] { true, false })
1741        for (boolean fFirst : new boolean[] { true, false })
2072          for (Integer v1 : new Integer[] { 1, null })
2073      {
2074          final CompletableFuture<Integer> f = new CompletableFuture<>();
2075          final CompletableFuture<Integer> g = new CompletableFuture<>();
2076          final CFException ex = new CFException();
2077 <        final IncFunction r = new IncFunction(m);
2077 >        final IncFunction[] rs = new IncFunction[6];
2078 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2079  
2080 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
2081 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2082 <        if (createIncomplete) {
2083 <            checkIncomplete(h);
2084 <            assertEquals(0, r.invocationCount);
2085 <            (fFirst ? f : g).completeExceptionally(ex);
2080 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2081 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2082 >        checkIncomplete(h0);
2083 >        checkIncomplete(h1);
2084 >        rs[0].assertNotInvoked();
2085 >        rs[1].assertNotInvoked();
2086 >        f.completeExceptionally(ex);
2087 >        checkCompletedWithWrappedException(h0, ex);
2088 >        checkCompletedWithWrappedException(h1, ex);
2089 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2090 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2091 >        checkCompletedWithWrappedException(h2, ex);
2092 >        checkCompletedWithWrappedException(h3, ex);
2093 >        g.complete(v1);
2094 >
2095 >        // unspecified behavior - both source completions available
2096 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2097 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2098 >        try {
2099 >            assertEquals(inc(v1), h4.join());
2100 >            rs[4].assertValue(inc(v1));
2101 >        } catch (CompletionException ok) {
2102 >            checkCompletedWithWrappedException(h4, ex);
2103 >            rs[4].assertNotInvoked();
2104 >        }
2105 >        try {
2106 >            assertEquals(inc(v1), h5.join());
2107 >            rs[5].assertValue(inc(v1));
2108 >        } catch (CompletionException ok) {
2109 >            checkCompletedWithWrappedException(h5, ex);
2110 >            rs[5].assertNotInvoked();
2111          }
2112  
2113 <        checkCompletedWithWrappedCFException(h, ex);
2114 <        (!fFirst ? f : g).complete(v1);
2115 <
2116 <        assertEquals(0, r.invocationCount);
2117 <        checkCompletedNormally(!fFirst ? f : g, v1);
2118 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
2119 <        checkCompletedWithWrappedCFException(h, ex);
2113 >        checkCompletedExceptionally(f, ex);
2114 >        checkCompletedNormally(g, v1);
2115 >        checkCompletedWithWrappedException(h0, ex);
2116 >        checkCompletedWithWrappedException(h1, ex);
2117 >        checkCompletedWithWrappedException(h2, ex);
2118 >        checkCompletedWithWrappedException(h3, ex);
2119 >        checkCompletedWithWrappedException(h4, ex);
2120 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2121      }}
2122  
2123      public void testApplyToEither_exceptionalCompletion2() {
2124          for (ExecutionMode m : ExecutionMode.values())
1768        for (boolean reverseArgs : new boolean[] { true, false })
2125          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<>();
1774        final IncFunction r1 = new IncFunction(m);
1775        final IncFunction r2 = new IncFunction(m);
2130          final CFException ex = new CFException();
2131 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
2132 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1779 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1780 <        if (fFirst) {
1781 <            f.complete(v1);
1782 <            g.completeExceptionally(ex);
1783 <        } else {
1784 <            g.completeExceptionally(ex);
1785 <            f.complete(v1);
1786 <        }
1787 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2131 >        final IncFunction[] rs = new IncFunction[6];
2132 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2133  
2134 <        // unspecified behavior
2134 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2135 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2136 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2137 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2138 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2139 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2140 >
2141 >        // unspecified behavior - both source completions available
2142 >        try {
2143 >            assertEquals(inc(v1), h0.join());
2144 >            rs[0].assertValue(inc(v1));
2145 >        } catch (CompletionException ok) {
2146 >            checkCompletedWithWrappedException(h0, ex);
2147 >            rs[0].assertNotInvoked();
2148 >        }
2149          try {
2150              assertEquals(inc(v1), h1.join());
2151 <            assertEquals(1, r1.invocationCount);
2151 >            rs[1].assertValue(inc(v1));
2152          } catch (CompletionException ok) {
2153 <            checkCompletedWithWrappedCFException(h1, ex);
2154 <            assertEquals(0, r1.invocationCount);
2153 >            checkCompletedWithWrappedException(h1, ex);
2154 >            rs[1].assertNotInvoked();
2155          }
1797
2156          try {
2157              assertEquals(inc(v1), h2.join());
2158 <            assertEquals(1, r2.invocationCount);
2158 >            rs[2].assertValue(inc(v1));
2159          } catch (CompletionException ok) {
2160 <            checkCompletedWithWrappedCFException(h2, ex);
2161 <            assertEquals(0, r2.invocationCount);
2160 >            checkCompletedWithWrappedException(h2, ex);
2161 >            rs[2].assertNotInvoked();
2162 >        }
2163 >        try {
2164 >            assertEquals(inc(v1), h3.join());
2165 >            rs[3].assertValue(inc(v1));
2166 >        } catch (CompletionException ok) {
2167 >            checkCompletedWithWrappedException(h3, ex);
2168 >            rs[3].assertNotInvoked();
2169          }
2170  
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);
2171          checkCompletedNormally(f, v1);
2172 <        checkCompletedNormally(g, v2);
2172 >        checkCompletedExceptionally(g, ex);
2173      }}
2174  
2175      /**
2176       * applyToEither result completes exceptionally if either source cancelled
2177       */
2178 <    public void testApplyToEither_sourceCancelled1() {
2178 >    public void testApplyToEither_sourceCancelled() {
2179          for (ExecutionMode m : ExecutionMode.values())
2180          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1853        for (boolean createIncomplete : new boolean[] { true, false })
1854        for (boolean fFirst : new boolean[] { true, false })
2181          for (Integer v1 : new Integer[] { 1, null })
2182      {
2183          final CompletableFuture<Integer> f = new CompletableFuture<>();
2184          final CompletableFuture<Integer> g = new CompletableFuture<>();
2185 <        final IncFunction r = new IncFunction(m);
2185 >        final IncFunction[] rs = new IncFunction[6];
2186 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2187  
2188 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2189 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2190 <        if (createIncomplete) {
2191 <            checkIncomplete(h);
2192 <            assertEquals(0, r.invocationCount);
2193 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2188 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2189 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2190 >        checkIncomplete(h0);
2191 >        checkIncomplete(h1);
2192 >        rs[0].assertNotInvoked();
2193 >        rs[1].assertNotInvoked();
2194 >        f.cancel(mayInterruptIfRunning);
2195 >        checkCompletedWithWrappedCancellationException(h0);
2196 >        checkCompletedWithWrappedCancellationException(h1);
2197 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2198 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2199 >        checkCompletedWithWrappedCancellationException(h2);
2200 >        checkCompletedWithWrappedCancellationException(h3);
2201 >        g.complete(v1);
2202 >
2203 >        // unspecified behavior - both source completions available
2204 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2205 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2206 >        try {
2207 >            assertEquals(inc(v1), h4.join());
2208 >            rs[4].assertValue(inc(v1));
2209 >        } catch (CompletionException ok) {
2210 >            checkCompletedWithWrappedCancellationException(h4);
2211 >            rs[4].assertNotInvoked();
2212 >        }
2213 >        try {
2214 >            assertEquals(inc(v1), h5.join());
2215 >            rs[5].assertValue(inc(v1));
2216 >        } catch (CompletionException ok) {
2217 >            checkCompletedWithWrappedCancellationException(h5);
2218 >            rs[5].assertNotInvoked();
2219          }
2220  
2221 <        checkCompletedWithWrappedCancellationException(h);
2222 <        (!fFirst ? f : g).complete(v1);
2223 <
2224 <        assertEquals(0, r.invocationCount);
2225 <        checkCompletedNormally(!fFirst ? f : g, v1);
2226 <        checkCancelled(fFirst ? f : g);
2227 <        checkCompletedWithWrappedCancellationException(h);
2221 >        checkCancelled(f);
2222 >        checkCompletedNormally(g, v1);
2223 >        checkCompletedWithWrappedCancellationException(h0);
2224 >        checkCompletedWithWrappedCancellationException(h1);
2225 >        checkCompletedWithWrappedCancellationException(h2);
2226 >        checkCompletedWithWrappedCancellationException(h3);
2227 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2228      }}
2229  
2230      public void testApplyToEither_sourceCancelled2() {
2231          for (ExecutionMode m : ExecutionMode.values())
2232          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1881        for (boolean reverseArgs : new boolean[] { true, false })
2233          for (boolean fFirst : new boolean[] { true, false })
2234          for (Integer v1 : new Integer[] { 1, null })
2235      {
2236          final CompletableFuture<Integer> f = new CompletableFuture<>();
2237          final CompletableFuture<Integer> g = new CompletableFuture<>();
2238 <        final IncFunction r1 = new IncFunction(m);
2239 <        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);
2238 >        final IncFunction[] rs = new IncFunction[6];
2239 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2240  
2241 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2242 <        if (fFirst) {
2243 <            f.complete(v1);
2244 <            assertTrue(g.cancel(mayInterruptIfRunning));
2245 <        } else {
2246 <            assertTrue(g.cancel(mayInterruptIfRunning));
1899 <            f.complete(v1);
1900 <        }
1901 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2241 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2242 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2243 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2244 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2245 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2246 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2247  
2248 <        // unspecified behavior
2248 >        // unspecified behavior - both source completions available
2249 >        try {
2250 >            assertEquals(inc(v1), h0.join());
2251 >            rs[0].assertValue(inc(v1));
2252 >        } catch (CompletionException ok) {
2253 >            checkCompletedWithWrappedCancellationException(h0);
2254 >            rs[0].assertNotInvoked();
2255 >        }
2256          try {
2257              assertEquals(inc(v1), h1.join());
2258 <            assertEquals(1, r1.invocationCount);
2258 >            rs[1].assertValue(inc(v1));
2259          } catch (CompletionException ok) {
2260              checkCompletedWithWrappedCancellationException(h1);
2261 <            assertEquals(0, r1.invocationCount);
2261 >            rs[1].assertNotInvoked();
2262          }
1911
2263          try {
2264              assertEquals(inc(v1), h2.join());
2265 <            assertEquals(1, r2.invocationCount);
2265 >            rs[2].assertValue(inc(v1));
2266          } catch (CompletionException ok) {
2267              checkCompletedWithWrappedCancellationException(h2);
2268 <            assertEquals(0, r2.invocationCount);
2268 >            rs[2].assertNotInvoked();
2269 >        }
2270 >        try {
2271 >            assertEquals(inc(v1), h3.join());
2272 >            rs[3].assertValue(inc(v1));
2273 >        } catch (CompletionException ok) {
2274 >            checkCompletedWithWrappedCancellationException(h3);
2275 >            rs[3].assertNotInvoked();
2276          }
2277  
1920        checkCancelled(g);
2278          checkCompletedNormally(f, v1);
2279 +        checkCancelled(g);
2280      }}
2281  
2282      /**
2283 <     * acceptEither result completes normally after normal completion
1926 <     * of either source
2283 >     * applyToEither result completes exceptionally if action does
2284       */
2285 <    public void testAcceptEither_normalCompletion1() {
2285 >    public void testApplyToEither_actionFailed() {
2286          for (ExecutionMode m : ExecutionMode.values())
2287          for (Integer v1 : new Integer[] { 1, null })
2288          for (Integer v2 : new Integer[] { 2, null })
2289      {
2290          final CompletableFuture<Integer> f = new CompletableFuture<>();
2291          final CompletableFuture<Integer> g = new CompletableFuture<>();
2292 <        final IncAction r = new IncAction();
2293 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2292 >        final FailingFunction[] rs = new FailingFunction[6];
2293 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2294  
2295 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2296 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2297          f.complete(v1);
2298 <        checkCompletedNormally(h, null);
2299 <        assertEquals(inc(v1), r.value);
2300 <        g.complete(v2);
2301 <
2302 <        checkCompletedNormally(f, v1);
2303 <        checkCompletedNormally(g, v2);
2304 <        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);
2298 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2299 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2300 >        checkCompletedWithWrappedCFException(h0);
2301 >        checkCompletedWithWrappedCFException(h1);
2302 >        checkCompletedWithWrappedCFException(h2);
2303 >        checkCompletedWithWrappedCFException(h3);
2304 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2305  
2306          g.complete(v2);
2307 <        checkCompletedNormally(h, null);
2308 <        assertEquals(inc(v2), r.value);
2309 <        f.complete(v1);
2307 >
2308 >        // unspecified behavior - both source completions available
2309 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2310 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2311 >
2312 >        checkCompletedWithWrappedCFException(h4);
2313 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2314 >                   Objects.equals(v2, rs[4].value));
2315 >        checkCompletedWithWrappedCFException(h5);
2316 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2317 >                   Objects.equals(v2, rs[5].value));
2318  
2319          checkCompletedNormally(f, v1);
2320          checkCompletedNormally(g, v2);
1965        checkCompletedNormally(h, null);
2321      }}
2322  
2323 <    public void testAcceptEither_normalCompletion3() {
2323 >    /**
2324 >     * acceptEither result completes normally after normal completion
2325 >     * of either source
2326 >     */
2327 >    public void testAcceptEither_normalCompletion() {
2328          for (ExecutionMode m : ExecutionMode.values())
2329          for (Integer v1 : new Integer[] { 1, null })
2330          for (Integer v2 : new Integer[] { 2, null })
2331      {
2332          final CompletableFuture<Integer> f = new CompletableFuture<>();
2333          final CompletableFuture<Integer> g = new CompletableFuture<>();
2334 <        final IncAction r = new IncAction();
2334 >        final NoopConsumer[] rs = new NoopConsumer[6];
2335 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2336  
2337 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2338 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2339 +        checkIncomplete(h0);
2340 +        checkIncomplete(h1);
2341 +        rs[0].assertNotInvoked();
2342 +        rs[1].assertNotInvoked();
2343          f.complete(v1);
2344 +        checkCompletedNormally(h0, null);
2345 +        checkCompletedNormally(h1, null);
2346 +        rs[0].assertValue(v1);
2347 +        rs[1].assertValue(v1);
2348 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2349 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2350 +        checkCompletedNormally(h2, null);
2351 +        checkCompletedNormally(h3, null);
2352 +        rs[2].assertValue(v1);
2353 +        rs[3].assertValue(v1);
2354          g.complete(v2);
1979        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2355  
2356 <        checkCompletedNormally(h, null);
2356 >        // unspecified behavior - both source completions available
2357 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2358 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2359 >        checkCompletedNormally(h4, null);
2360 >        checkCompletedNormally(h5, null);
2361 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2362 >                   Objects.equals(v2, rs[4].value));
2363 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2364 >                   Objects.equals(v2, rs[5].value));
2365 >
2366          checkCompletedNormally(f, v1);
2367          checkCompletedNormally(g, v2);
2368 <
2369 <        // unspecified behavior
2370 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2371 <                   Objects.equals(r.value, inc(v2)));
2368 >        checkCompletedNormally(h0, null);
2369 >        checkCompletedNormally(h1, null);
2370 >        checkCompletedNormally(h2, null);
2371 >        checkCompletedNormally(h3, null);
2372 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2373      }}
2374  
2375      /**
2376       * acceptEither result completes exceptionally after exceptional
2377       * completion of either source
2378       */
2379 <    public void testAcceptEither_exceptionalCompletion1() {
2379 >    public void testAcceptEither_exceptionalCompletion() {
2380          for (ExecutionMode m : ExecutionMode.values())
2381          for (Integer v1 : new Integer[] { 1, null })
2382      {
2383          final CompletableFuture<Integer> f = new CompletableFuture<>();
2384          final CompletableFuture<Integer> g = new CompletableFuture<>();
2000        final IncAction r = new IncAction();
2001        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2390 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2391 +        checkIncomplete(h0);
2392 +        checkIncomplete(h1);
2393 +        rs[0].assertNotInvoked();
2394 +        rs[1].assertNotInvoked();
2395          f.completeExceptionally(ex);
2396 <        checkCompletedWithWrappedCFException(h, ex);
2396 >        checkCompletedWithWrappedException(h0, ex);
2397 >        checkCompletedWithWrappedException(h1, ex);
2398 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2399 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2400 >        checkCompletedWithWrappedException(h2, ex);
2401 >        checkCompletedWithWrappedException(h3, ex);
2402 >
2403          g.complete(v1);
2404  
2405 <        assertEquals(0, r.invocationCount);
2405 >        // unspecified behavior - both source completions available
2406 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2407 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2408 >        try {
2409 >            assertNull(h4.join());
2410 >            rs[4].assertValue(v1);
2411 >        } catch (CompletionException ok) {
2412 >            checkCompletedWithWrappedException(h4, ex);
2413 >            rs[4].assertNotInvoked();
2414 >        }
2415 >        try {
2416 >            assertNull(h5.join());
2417 >            rs[5].assertValue(v1);
2418 >        } catch (CompletionException ok) {
2419 >            checkCompletedWithWrappedException(h5, ex);
2420 >            rs[5].assertNotInvoked();
2421 >        }
2422 >
2423 >        checkCompletedExceptionally(f, ex);
2424          checkCompletedNormally(g, v1);
2425 <        checkCompletedWithWrappedCFException(f, ex);
2426 <        checkCompletedWithWrappedCFException(h, ex);
2425 >        checkCompletedWithWrappedException(h0, ex);
2426 >        checkCompletedWithWrappedException(h1, ex);
2427 >        checkCompletedWithWrappedException(h2, ex);
2428 >        checkCompletedWithWrappedException(h3, ex);
2429 >        checkCompletedWithWrappedException(h4, ex);
2430 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2431      }}
2432  
2433      public void testAcceptEither_exceptionalCompletion2() {
2434          for (ExecutionMode m : ExecutionMode.values())
2435 +        for (boolean fFirst : 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<>();
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();
2440          final CFException ex = new CFException();
2441 +        final NoopConsumer[] rs = new NoopConsumer[6];
2442 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2443  
2444 <        g.completeExceptionally(ex);
2445 <        f.complete(v1);
2446 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2445 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2446 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2447 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2448 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2449 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2450  
2451 <        // unspecified behavior
2048 <        Integer v;
2451 >        // unspecified behavior - both source completions available
2452          try {
2453 <            assertNull(h.join());
2454 <            assertEquals(1, r.invocationCount);
2052 <            assertEquals(inc(v1), r.value);
2453 >            assertEquals(null, h0.join());
2454 >            rs[0].assertValue(v1);
2455          } catch (CompletionException ok) {
2456 <            checkCompletedWithWrappedCFException(h, ex);
2457 <            assertEquals(0, r.invocationCount);
2456 >            checkCompletedWithWrappedException(h0, ex);
2457 >            rs[0].assertNotInvoked();
2458          }
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;
2459          try {
2460 <            assertNull(h.join());
2461 <            assertEquals(1, r.invocationCount);
2080 <            assertEquals(inc(v1), r.value);
2460 >            assertEquals(null, h1.join());
2461 >            rs[1].assertValue(v1);
2462          } catch (CompletionException ok) {
2463 <            checkCompletedWithWrappedCFException(h, ex);
2464 <            assertEquals(0, r.invocationCount);
2463 >            checkCompletedWithWrappedException(h1, ex);
2464 >            rs[1].assertNotInvoked();
2465 >        }
2466 >        try {
2467 >            assertEquals(null, h2.join());
2468 >            rs[2].assertValue(v1);
2469 >        } catch (CompletionException ok) {
2470 >            checkCompletedWithWrappedException(h2, ex);
2471 >            rs[2].assertNotInvoked();
2472 >        }
2473 >        try {
2474 >            assertEquals(null, h3.join());
2475 >            rs[3].assertValue(v1);
2476 >        } catch (CompletionException ok) {
2477 >            checkCompletedWithWrappedException(h3, ex);
2478 >            rs[3].assertNotInvoked();
2479          }
2480  
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);
2481          checkCompletedNormally(f, v1);
2482 <        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);
2123 <        checkCompletedNormally(f, v1);
2124 <        checkCompletedNormally(g, v2);
2482 >        checkCompletedExceptionally(g, ex);
2483      }}
2484  
2485      /**
2486       * acceptEither result completes exceptionally if either source cancelled
2487       */
2488 <    public void testAcceptEither_sourceCancelled1() {
2131 <        for (ExecutionMode m : ExecutionMode.values())
2132 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2133 <        for (Integer v1 : new Integer[] { 1, null })
2134 <    {
2135 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2137 <        final IncAction r = new IncAction();
2138 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2139 <
2140 <        assertTrue(f.cancel(mayInterruptIfRunning));
2141 <        checkCompletedWithWrappedCancellationException(h);
2142 <        g.complete(v1);
2143 <
2144 <        checkCancelled(f);
2145 <        assertEquals(0, r.invocationCount);
2146 <        checkCompletedNormally(g, v1);
2147 <        checkCompletedWithWrappedCancellationException(h);
2148 <    }}
2149 <
2150 <    public void testAcceptEither_sourceCancelled2() {
2488 >    public void testAcceptEither_sourceCancelled() {
2489          for (ExecutionMode m : ExecutionMode.values())
2490          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2491          for (Integer v1 : new Integer[] { 1, null })
2492      {
2493          final CompletableFuture<Integer> f = new CompletableFuture<>();
2494          final CompletableFuture<Integer> g = new CompletableFuture<>();
2495 <        final IncAction r = new IncAction();
2496 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2495 >        final NoopConsumer[] rs = new NoopConsumer[6];
2496 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2497  
2498 <        assertTrue(g.cancel(mayInterruptIfRunning));
2499 <        checkCompletedWithWrappedCancellationException(h);
2500 <        f.complete(v1);
2501 <
2502 <        checkCancelled(g);
2503 <        assertEquals(0, r.invocationCount);
2504 <        checkCompletedNormally(f, v1);
2505 <        checkCompletedWithWrappedCancellationException(h);
2506 <    }}
2507 <
2508 <    public void testAcceptEither_sourceCancelled3() {
2509 <        for (ExecutionMode m : ExecutionMode.values())
2510 <        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();
2498 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2499 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2500 >        checkIncomplete(h0);
2501 >        checkIncomplete(h1);
2502 >        rs[0].assertNotInvoked();
2503 >        rs[1].assertNotInvoked();
2504 >        f.cancel(mayInterruptIfRunning);
2505 >        checkCompletedWithWrappedCancellationException(h0);
2506 >        checkCompletedWithWrappedCancellationException(h1);
2507 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2508 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2509 >        checkCompletedWithWrappedCancellationException(h2);
2510 >        checkCompletedWithWrappedCancellationException(h3);
2511  
2512 <        assertTrue(g.cancel(mayInterruptIfRunning));
2180 <        f.complete(v1);
2181 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2512 >        g.complete(v1);
2513  
2514 <        // unspecified behavior
2515 <        Integer v;
2514 >        // unspecified behavior - both source completions available
2515 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2516 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2517          try {
2518 <            assertNull(h.join());
2519 <            assertEquals(1, r.invocationCount);
2188 <            assertEquals(inc(v1), r.value);
2518 >            assertNull(h4.join());
2519 >            rs[4].assertValue(v1);
2520          } catch (CompletionException ok) {
2521 <            checkCompletedWithWrappedCancellationException(h);
2522 <            assertEquals(0, r.invocationCount);
2521 >            checkCompletedWithWrappedCancellationException(h4);
2522 >            rs[4].assertNotInvoked();
2523          }
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;
2524          try {
2525 <            assertNull(h.join());
2526 <            assertEquals(1, r.invocationCount);
2216 <            assertEquals(inc(v1), r.value);
2525 >            assertNull(h5.join());
2526 >            rs[5].assertValue(v1);
2527          } catch (CompletionException ok) {
2528 <            checkCompletedWithWrappedCancellationException(h);
2529 <            assertEquals(0, r.invocationCount);
2528 >            checkCompletedWithWrappedCancellationException(h5);
2529 >            rs[5].assertNotInvoked();
2530          }
2531  
2532          checkCancelled(f);
2533          checkCompletedNormally(g, v1);
2534 +        checkCompletedWithWrappedCancellationException(h0);
2535 +        checkCompletedWithWrappedCancellationException(h1);
2536 +        checkCompletedWithWrappedCancellationException(h2);
2537 +        checkCompletedWithWrappedCancellationException(h3);
2538 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2539      }}
2540  
2541      /**
2542 <     * runAfterEither result completes normally after normal completion
2228 <     * of either source
2542 >     * acceptEither result completes exceptionally if action does
2543       */
2544 <    public void testRunAfterEither_normalCompletion1() {
2544 >    public void testAcceptEither_actionFailed() {
2545          for (ExecutionMode m : ExecutionMode.values())
2546          for (Integer v1 : new Integer[] { 1, null })
2547          for (Integer v2 : new Integer[] { 2, null })
2548      {
2549          final CompletableFuture<Integer> f = new CompletableFuture<>();
2550          final CompletableFuture<Integer> g = new CompletableFuture<>();
2551 <        final Noop r = new Noop(m);
2552 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2551 >        final FailingConsumer[] rs = new FailingConsumer[6];
2552 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2553  
2554 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2555 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2556          f.complete(v1);
2557 <        checkCompletedNormally(h, null);
2558 <        assertEquals(1, r.invocationCount);
2557 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2558 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2559 >        checkCompletedWithWrappedCFException(h0);
2560 >        checkCompletedWithWrappedCFException(h1);
2561 >        checkCompletedWithWrappedCFException(h2);
2562 >        checkCompletedWithWrappedCFException(h3);
2563 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2564 >
2565          g.complete(v2);
2566  
2567 +        // unspecified behavior - both source completions available
2568 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2569 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2570 +
2571 +        checkCompletedWithWrappedCFException(h4);
2572 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2573 +                   Objects.equals(v2, rs[4].value));
2574 +        checkCompletedWithWrappedCFException(h5);
2575 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2576 +                   Objects.equals(v2, rs[5].value));
2577 +
2578          checkCompletedNormally(f, v1);
2579          checkCompletedNormally(g, v2);
2247        checkCompletedNormally(h, null);
2248        assertEquals(1, r.invocationCount);
2580      }}
2581  
2582 <    public void testRunAfterEither_normalCompletion2() {
2582 >    /**
2583 >     * runAfterEither result completes normally after normal completion
2584 >     * of either source
2585 >     */
2586 >    public void testRunAfterEither_normalCompletion() {
2587          for (ExecutionMode m : ExecutionMode.values())
2588          for (Integer v1 : new Integer[] { 1, null })
2589          for (Integer v2 : new Integer[] { 2, null })
2590      {
2591          final CompletableFuture<Integer> f = new CompletableFuture<>();
2592          final CompletableFuture<Integer> g = new CompletableFuture<>();
2593 <        final Noop r = new Noop(m);
2594 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2593 >        final Noop[] rs = new Noop[6];
2594 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2595  
2596 <        g.complete(v2);
2597 <        checkCompletedNormally(h, null);
2598 <        assertEquals(1, r.invocationCount);
2596 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2597 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2598 >        checkIncomplete(h0);
2599 >        checkIncomplete(h1);
2600 >        rs[0].assertNotInvoked();
2601 >        rs[1].assertNotInvoked();
2602          f.complete(v1);
2603 +        checkCompletedNormally(h0, null);
2604 +        checkCompletedNormally(h1, null);
2605 +        rs[0].assertInvoked();
2606 +        rs[1].assertInvoked();
2607 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2608 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2609 +        checkCompletedNormally(h2, null);
2610 +        checkCompletedNormally(h3, null);
2611 +        rs[2].assertInvoked();
2612 +        rs[3].assertInvoked();
2613  
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);
2614          g.complete(v2);
2283        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2615  
2616 <        checkCompletedNormally(h, null);
2616 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2617 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2618 >
2619          checkCompletedNormally(f, v1);
2620          checkCompletedNormally(g, v2);
2621 <        assertEquals(1, r.invocationCount);
2621 >        checkCompletedNormally(h0, null);
2622 >        checkCompletedNormally(h1, null);
2623 >        checkCompletedNormally(h2, null);
2624 >        checkCompletedNormally(h3, null);
2625 >        checkCompletedNormally(h4, null);
2626 >        checkCompletedNormally(h5, null);
2627 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2628      }}
2629  
2630      /**
2631       * runAfterEither result completes exceptionally after exceptional
2632       * completion of either source
2633       */
2634 <    public void testRunAfterEither_exceptionalCompletion1() {
2634 >    public void testRunAfterEither_exceptionalCompletion() {
2635          for (ExecutionMode m : ExecutionMode.values())
2636          for (Integer v1 : new Integer[] { 1, null })
2637      {
2638          final CompletableFuture<Integer> f = new CompletableFuture<>();
2639          final CompletableFuture<Integer> g = new CompletableFuture<>();
2301        final Noop r = new Noop(m);
2302        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.completeExceptionally(ex);
2645 <        checkCompletedWithWrappedCFException(h, ex);
2646 <        g.complete(v1);
2644 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2645 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2646 >        checkIncomplete(h0);
2647 >        checkIncomplete(h1);
2648 >        rs[0].assertNotInvoked();
2649 >        rs[1].assertNotInvoked();
2650 >        assertTrue(f.completeExceptionally(ex));
2651 >        checkCompletedWithWrappedException(h0, ex);
2652 >        checkCompletedWithWrappedException(h1, ex);
2653 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2654 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2655 >        checkCompletedWithWrappedException(h2, ex);
2656 >        checkCompletedWithWrappedException(h3, ex);
2657  
2658 <        assertEquals(0, r.invocationCount);
2310 <        checkCompletedNormally(g, v1);
2311 <        checkCompletedWithWrappedCFException(f, ex);
2312 <        checkCompletedWithWrappedCFException(h, ex);
2313 <    }}
2658 >        assertTrue(g.complete(v1));
2659  
2660 <    public void testRunAfterEither_exceptionalCompletion2() {
2661 <        for (ExecutionMode m : ExecutionMode.values())
2662 <        for (Integer v1 : new Integer[] { 1, null })
2318 <    {
2319 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2320 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2321 <        final Noop r = new Noop(m);
2322 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2323 <        final CFException ex = new CFException();
2324 <
2325 <        g.completeExceptionally(ex);
2326 <        checkCompletedWithWrappedCFException(h, ex);
2327 <        f.complete(v1);
2328 <
2329 <        assertEquals(0, r.invocationCount);
2330 <        checkCompletedNormally(f, v1);
2331 <        checkCompletedWithWrappedCFException(g, ex);
2332 <        checkCompletedWithWrappedCFException(h, ex);
2333 <    }}
2334 <
2335 <    public void testRunAfterEither_exceptionalCompletion3() {
2336 <        for (ExecutionMode m : ExecutionMode.values())
2337 <        for (Integer v1 : new Integer[] { 1, null })
2338 <    {
2339 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2340 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2341 <        final Noop r = new Noop(m);
2342 <        final CFException ex = new CFException();
2343 <
2344 <        g.completeExceptionally(ex);
2345 <        f.complete(v1);
2346 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2347 <
2348 <        // unspecified behavior
2349 <        Integer v;
2660 >        // unspecified behavior - both source completions available
2661 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2662 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2663          try {
2664 <            assertNull(h.join());
2665 <            assertEquals(1, r.invocationCount);
2664 >            assertNull(h4.join());
2665 >            rs[4].assertInvoked();
2666          } catch (CompletionException ok) {
2667 <            checkCompletedWithWrappedCFException(h, ex);
2668 <            assertEquals(0, r.invocationCount);
2667 >            checkCompletedWithWrappedException(h4, ex);
2668 >            rs[4].assertNotInvoked();
2669          }
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;
2670          try {
2671 <            assertNull(h.join());
2672 <            assertEquals(1, r.invocationCount);
2671 >            assertNull(h5.join());
2672 >            rs[5].assertInvoked();
2673          } catch (CompletionException ok) {
2674 <            checkCompletedWithWrappedCFException(h, ex);
2675 <            assertEquals(0, r.invocationCount);
2674 >            checkCompletedWithWrappedException(h5, ex);
2675 >            rs[5].assertNotInvoked();
2676          }
2677  
2678 <        checkCompletedWithWrappedCFException(f, ex);
2678 >        checkCompletedExceptionally(f, ex);
2679          checkCompletedNormally(g, v1);
2680 +        checkCompletedWithWrappedException(h0, ex);
2681 +        checkCompletedWithWrappedException(h1, ex);
2682 +        checkCompletedWithWrappedException(h2, ex);
2683 +        checkCompletedWithWrappedException(h3, ex);
2684 +        checkCompletedWithWrappedException(h4, ex);
2685 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2686      }}
2687  
2688 <    /**
2390 <     * runAfterEither result completes exceptionally if action does
2391 <     */
2392 <    public void testRunAfterEither_actionFailed1() {
2688 >    public void testRunAfterEither_exceptionalCompletion2() {
2689          for (ExecutionMode m : ExecutionMode.values())
2690 +        for (boolean fFirst : new boolean[] { true, false })
2691          for (Integer v1 : new Integer[] { 1, null })
2395        for (Integer v2 : new Integer[] { 2, null })
2692      {
2693          final CompletableFuture<Integer> f = new CompletableFuture<>();
2694          final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 <        final FailingRunnable r = new FailingRunnable(m);
2696 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2695 >        final CFException ex = new CFException();
2696 >        final Noop[] rs = new Noop[6];
2697 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2698  
2699 <        f.complete(v1);
2700 <        checkCompletedWithWrappedCFException(h);
2701 <        g.complete(v2);
2702 <        checkCompletedNormally(f, v1);
2703 <        checkCompletedNormally(g, v2);
2704 <    }}
2699 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2700 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2701 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2702 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2703 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2704 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2705  
2706 <    public void testRunAfterEither_actionFailed2() {
2707 <        for (ExecutionMode m : ExecutionMode.values())
2708 <        for (Integer v1 : new Integer[] { 1, null })
2709 <        for (Integer v2 : new Integer[] { 2, null })
2710 <    {
2711 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2712 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2713 <        final FailingRunnable r = new FailingRunnable(m);
2714 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2706 >        // unspecified behavior - both source completions available
2707 >        try {
2708 >            assertEquals(null, h0.join());
2709 >            rs[0].assertInvoked();
2710 >        } catch (CompletionException ok) {
2711 >            checkCompletedWithWrappedException(h0, ex);
2712 >            rs[0].assertNotInvoked();
2713 >        }
2714 >        try {
2715 >            assertEquals(null, h1.join());
2716 >            rs[1].assertInvoked();
2717 >        } catch (CompletionException ok) {
2718 >            checkCompletedWithWrappedException(h1, ex);
2719 >            rs[1].assertNotInvoked();
2720 >        }
2721 >        try {
2722 >            assertEquals(null, h2.join());
2723 >            rs[2].assertInvoked();
2724 >        } catch (CompletionException ok) {
2725 >            checkCompletedWithWrappedException(h2, ex);
2726 >            rs[2].assertNotInvoked();
2727 >        }
2728 >        try {
2729 >            assertEquals(null, h3.join());
2730 >            rs[3].assertInvoked();
2731 >        } catch (CompletionException ok) {
2732 >            checkCompletedWithWrappedException(h3, ex);
2733 >            rs[3].assertNotInvoked();
2734 >        }
2735  
2419        g.complete(v2);
2420        checkCompletedWithWrappedCFException(h);
2421        f.complete(v1);
2736          checkCompletedNormally(f, v1);
2737 <        checkCompletedNormally(g, v2);
2737 >        checkCompletedExceptionally(g, ex);
2738      }}
2739  
2740      /**
2741       * runAfterEither result completes exceptionally if either source cancelled
2742       */
2743 <    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() {
2450 <        for (ExecutionMode m : ExecutionMode.values())
2451 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2452 <        for (Integer v1 : new Integer[] { 1, null })
2453 <    {
2454 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2455 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2456 <        final Noop r = new Noop(m);
2457 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2458 <
2459 <        assertTrue(g.cancel(mayInterruptIfRunning));
2460 <        checkCompletedWithWrappedCancellationException(h);
2461 <        f.complete(v1);
2462 <
2463 <        checkCancelled(g);
2464 <        assertEquals(0, r.invocationCount);
2465 <        checkCompletedNormally(f, v1);
2466 <        checkCompletedWithWrappedCancellationException(h);
2467 <    }}
2468 <
2469 <    public void testRunAfterEither_sourceCancelled3() {
2743 >    public void testRunAfterEither_sourceCancelled() {
2744          for (ExecutionMode m : ExecutionMode.values())
2745          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2746          for (Integer v1 : new Integer[] { 1, null })
2747      {
2748          final CompletableFuture<Integer> f = new CompletableFuture<>();
2749          final CompletableFuture<Integer> g = new CompletableFuture<>();
2750 <        final Noop r = new Noop(m);
2751 <
2478 <        assertTrue(g.cancel(mayInterruptIfRunning));
2479 <        f.complete(v1);
2480 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2750 >        final Noop[] rs = new Noop[6];
2751 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2752  
2753 <        // unspecified behavior
2754 <        Integer v;
2753 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2754 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2755 >        checkIncomplete(h0);
2756 >        checkIncomplete(h1);
2757 >        rs[0].assertNotInvoked();
2758 >        rs[1].assertNotInvoked();
2759 >        f.cancel(mayInterruptIfRunning);
2760 >        checkCompletedWithWrappedCancellationException(h0);
2761 >        checkCompletedWithWrappedCancellationException(h1);
2762 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2763 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2764 >        checkCompletedWithWrappedCancellationException(h2);
2765 >        checkCompletedWithWrappedCancellationException(h3);
2766 >
2767 >        assertTrue(g.complete(v1));
2768 >
2769 >        // unspecified behavior - both source completions available
2770 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2771 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2772 >        try {
2773 >            assertNull(h4.join());
2774 >            rs[4].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedCancellationException(h4);
2777 >            rs[4].assertNotInvoked();
2778 >        }
2779          try {
2780 <            assertNull(h.join());
2781 <            assertEquals(1, r.invocationCount);
2780 >            assertNull(h5.join());
2781 >            rs[5].assertInvoked();
2782          } catch (CompletionException ok) {
2783 <            checkCompletedWithWrappedCancellationException(h);
2784 <            assertEquals(0, r.invocationCount);
2783 >            checkCompletedWithWrappedCancellationException(h5);
2784 >            rs[5].assertNotInvoked();
2785          }
2786  
2787 <        checkCancelled(g);
2788 <        checkCompletedNormally(f, v1);
2787 >        checkCancelled(f);
2788 >        checkCompletedNormally(g, v1);
2789 >        checkCompletedWithWrappedCancellationException(h0);
2790 >        checkCompletedWithWrappedCancellationException(h1);
2791 >        checkCompletedWithWrappedCancellationException(h2);
2792 >        checkCompletedWithWrappedCancellationException(h3);
2793 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2794      }}
2795  
2796 <    public void testRunAfterEither_sourceCancelled4() {
2796 >    /**
2797 >     * runAfterEither result completes exceptionally if action does
2798 >     */
2799 >    public void testRunAfterEither_actionFailed() {
2800          for (ExecutionMode m : ExecutionMode.values())
2498        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2801          for (Integer v1 : new Integer[] { 1, null })
2802 +        for (Integer v2 : new Integer[] { 2, null })
2803      {
2804          final CompletableFuture<Integer> f = new CompletableFuture<>();
2805          final CompletableFuture<Integer> g = new CompletableFuture<>();
2806 <        final Noop r = new Noop(m);
2806 >        final FailingRunnable[] rs = new FailingRunnable[6];
2807 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2808  
2809 <        assertTrue(f.cancel(mayInterruptIfRunning));
2810 <        g.complete(v1);
2811 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2812 <
2813 <        // unspecified behavior
2814 <        Integer v;
2815 <        try {
2816 <            assertNull(h.join());
2817 <            assertEquals(1, r.invocationCount);
2818 <        } catch (CompletionException ok) {
2819 <            checkCompletedWithWrappedCancellationException(h);
2820 <            assertEquals(0, r.invocationCount);
2821 <        }
2809 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2810 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2811 >        assertTrue(f.complete(v1));
2812 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2813 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2814 >        checkCompletedWithWrappedCFException(h0);
2815 >        checkCompletedWithWrappedCFException(h1);
2816 >        checkCompletedWithWrappedCFException(h2);
2817 >        checkCompletedWithWrappedCFException(h3);
2818 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2819 >        assertTrue(g.complete(v2));
2820 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2821 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2822 >        checkCompletedWithWrappedCFException(h4);
2823 >        checkCompletedWithWrappedCFException(h5);
2824  
2825 <        checkCancelled(f);
2826 <        checkCompletedNormally(g, v1);
2825 >        checkCompletedNormally(f, v1);
2826 >        checkCompletedNormally(g, v2);
2827 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2828      }}
2829  
2830      /**
# Line 2530 | Line 2837 | public class CompletableFutureTest exten
2837      {
2838          final CompletableFuture<Integer> f = new CompletableFuture<>();
2839          final CompletableFutureInc r = new CompletableFutureInc(m);
2840 <        if (!createIncomplete) f.complete(v1);
2840 >        if (!createIncomplete) assertTrue(f.complete(v1));
2841          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2842 <        if (createIncomplete) f.complete(v1);
2842 >        if (createIncomplete) assertTrue(f.complete(v1));
2843  
2844          checkCompletedNormally(g, inc(v1));
2845          checkCompletedNormally(f, v1);
2846 <        assertEquals(1, r.invocationCount);
2846 >        r.assertValue(v1);
2847      }}
2848  
2849      /**
# Line 2554 | Line 2861 | public class CompletableFutureTest exten
2861          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2862          if (createIncomplete) f.completeExceptionally(ex);
2863  
2864 <        checkCompletedWithWrappedCFException(g, ex);
2865 <        checkCompletedWithWrappedCFException(f, ex);
2866 <        assertEquals(0, r.invocationCount);
2864 >        checkCompletedWithWrappedException(g, ex);
2865 >        checkCompletedExceptionally(f, ex);
2866 >        r.assertNotInvoked();
2867      }}
2868  
2869      /**
# Line 2570 | Line 2877 | public class CompletableFutureTest exten
2877          final CompletableFuture<Integer> f = new CompletableFuture<>();
2878          final FailingCompletableFutureFunction r
2879              = new FailingCompletableFutureFunction(m);
2880 <        if (!createIncomplete) f.complete(v1);
2880 >        if (!createIncomplete) assertTrue(f.complete(v1));
2881          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2882 <        if (createIncomplete) f.complete(v1);
2882 >        if (createIncomplete) assertTrue(f.complete(v1));
2883  
2884          checkCompletedWithWrappedCFException(g);
2885          checkCompletedNormally(f, v1);
# Line 2615 | Line 2922 | public class CompletableFutureTest exten
2922       * when all components complete normally
2923       */
2924      public void testAllOf_normal() throws Exception {
2925 <        for (int k = 1; k < 20; ++k) {
2925 >        for (int k = 1; k < 20; k++) {
2926              CompletableFuture<Integer>[] fs
2927                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2928 <            for (int i = 0; i < k; ++i)
2928 >            for (int i = 0; i < k; i++)
2929                  fs[i] = new CompletableFuture<>();
2930              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2931 <            for (int i = 0; i < k; ++i) {
2931 >            for (int i = 0; i < k; i++) {
2932                  checkIncomplete(f);
2933                  checkIncomplete(CompletableFuture.allOf(fs));
2934                  fs[i].complete(one);
# Line 2632 | Line 2939 | public class CompletableFutureTest exten
2939      }
2940  
2941      public void testAllOf_backwards() throws Exception {
2942 <        for (int k = 1; k < 20; ++k) {
2942 >        for (int k = 1; k < 20; k++) {
2943              CompletableFuture<Integer>[] fs
2944                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2945 <            for (int i = 0; i < k; ++i)
2945 >            for (int i = 0; i < k; i++)
2946                  fs[i] = new CompletableFuture<>();
2947              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2948              for (int i = k - 1; i >= 0; i--) {
# Line 2652 | Line 2959 | public class CompletableFutureTest exten
2959       * anyOf(no component futures) returns an incomplete future
2960       */
2961      public void testAnyOf_empty() throws Exception {
2962 +        for (Integer v1 : new Integer[] { 1, null })
2963 +    {
2964          CompletableFuture<Object> f = CompletableFuture.anyOf();
2965          checkIncomplete(f);
2966 <    }
2966 >
2967 >        f.complete(v1);
2968 >        checkCompletedNormally(f, v1);
2969 >    }}
2970  
2971      /**
2972       * anyOf returns a future completed normally with a value when
2973       * a component future does
2974       */
2975      public void testAnyOf_normal() throws Exception {
2976 <        for (int k = 0; k < 10; ++k) {
2976 >        for (int k = 0; k < 10; k++) {
2977              CompletableFuture[] fs = new CompletableFuture[k];
2978 <            for (int i = 0; i < k; ++i)
2978 >            for (int i = 0; i < k; i++)
2979                  fs[i] = new CompletableFuture<>();
2980              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2981              checkIncomplete(f);
2982 <            for (int i = 0; i < k; ++i) {
2983 <                fs[i].complete(one);
2984 <                checkCompletedNormally(f, one);
2985 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2982 >            for (int i = 0; i < k; i++) {
2983 >                fs[i].complete(i);
2984 >                checkCompletedNormally(f, 0);
2985 >                int x = (int) CompletableFuture.anyOf(fs).join();
2986 >                assertTrue(0 <= x && x <= i);
2987 >            }
2988 >        }
2989 >    }
2990 >    public void testAnyOf_normal_backwards() throws Exception {
2991 >        for (int k = 0; k < 10; k++) {
2992 >            CompletableFuture[] fs = new CompletableFuture[k];
2993 >            for (int i = 0; i < k; i++)
2994 >                fs[i] = new CompletableFuture<>();
2995 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2996 >            checkIncomplete(f);
2997 >            for (int i = k - 1; i >= 0; i--) {
2998 >                fs[i].complete(i);
2999 >                checkCompletedNormally(f, k - 1);
3000 >                int x = (int) CompletableFuture.anyOf(fs).join();
3001 >                assertTrue(i <= x && x <= k - 1);
3002              }
3003          }
3004      }
# Line 2679 | Line 3007 | public class CompletableFutureTest exten
3007       * anyOf result completes exceptionally when any component does.
3008       */
3009      public void testAnyOf_exceptional() throws Exception {
3010 <        for (int k = 0; k < 10; ++k) {
3010 >        for (int k = 0; k < 10; k++) {
3011              CompletableFuture[] fs = new CompletableFuture[k];
3012 <            for (int i = 0; i < k; ++i)
3012 >            CFException[] exs = new CFException[k];
3013 >            for (int i = 0; i < k; i++) {
3014                  fs[i] = new CompletableFuture<>();
3015 +                exs[i] = new CFException();
3016 +            }
3017              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3018              checkIncomplete(f);
3019 <            for (int i = 0; i < k; ++i) {
3020 <                fs[i].completeExceptionally(new CFException());
3021 <                checkCompletedWithWrappedCFException(f);
3019 >            for (int i = 0; i < k; i++) {
3020 >                fs[i].completeExceptionally(exs[i]);
3021 >                checkCompletedWithWrappedException(f, exs[0]);
3022 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3023 >            }
3024 >        }
3025 >    }
3026 >
3027 >    public void testAnyOf_exceptional_backwards() throws Exception {
3028 >        for (int k = 0; k < 10; k++) {
3029 >            CompletableFuture[] fs = new CompletableFuture[k];
3030 >            CFException[] exs = new CFException[k];
3031 >            for (int i = 0; i < k; i++) {
3032 >                fs[i] = new CompletableFuture<>();
3033 >                exs[i] = new CFException();
3034 >            }
3035 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3036 >            checkIncomplete(f);
3037 >            for (int i = k - 1; i >= 0; i--) {
3038 >                fs[i].completeExceptionally(exs[i]);
3039 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3040                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3041              }
3042          }
# Line 2811 | Line 3160 | public class CompletableFutureTest exten
3160          assertSame(f, f.toCompletableFuture());
3161      }
3162  
3163 <    /**
2815 <     * whenComplete action executes on normal completion, propagating
2816 <     * source result.
2817 <     */
2818 <    public void testWhenComplete_normalCompletion1() {
2819 <        for (ExecutionMode m : ExecutionMode.values())
2820 <        for (boolean createIncomplete : new boolean[] { true, false })
2821 <        for (Integer v1 : new Integer[] { 1, null })
2822 <    {
2823 <        final AtomicInteger a = new AtomicInteger(0);
2824 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2825 <        if (!createIncomplete) f.complete(v1);
2826 <        final CompletableFuture<Integer> g = m.whenComplete
2827 <            (f,
2828 <             (Integer x, Throwable t) -> {
2829 <                threadAssertSame(x, v1);
2830 <                threadAssertNull(t);
2831 <                a.getAndIncrement();
2832 <            });
2833 <        if (createIncomplete) f.complete(v1);
3163 >    //--- tests of implementation details; not part of official tck ---
3164  
3165 <        checkCompletedNormally(g, v1);
3166 <        checkCompletedNormally(f, v1);
3167 <        assertEquals(1, a.get());
3168 <    }}
3165 >    Object resultOf(CompletableFuture<?> f) {
3166 >        try {
3167 >            java.lang.reflect.Field resultField
3168 >                = CompletableFuture.class.getDeclaredField("result");
3169 >            resultField.setAccessible(true);
3170 >            return resultField.get(f);
3171 >        } catch (Throwable t) { throw new AssertionError(t); }
3172 >    }
3173  
3174 <    /**
3175 <     * whenComplete action executes on exceptional completion, propagating
2842 <     * source result.
2843 <     */
2844 <    public void testWhenComplete_exceptionalCompletion() {
3174 >    public void testExceptionPropagationReusesResultObject() {
3175 >        if (!testImplementationDetails) return;
3176          for (ExecutionMode m : ExecutionMode.values())
2846        for (boolean createIncomplete : new boolean[] { true, false })
2847        for (Integer v1 : new Integer[] { 1, null })
3177      {
2849        final AtomicInteger a = new AtomicInteger(0);
3178          final CFException ex = new CFException();
3179 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3180 <        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 <    }}
3179 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3180 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3181  
3182 <    /**
3183 <     * 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));
3182 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> dependentFactories
3183 >            = new ArrayList<>();
3184  
3185 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3186 <        checkCompletedWithWrappedCancellationException(g);
3187 <        checkCancelled(f);
2890 <        assertEquals(1, a.get());
2891 <    }}
3185 >        dependentFactories.add((y) -> m.thenRun(y, new Noop(m)));
3186 >        dependentFactories.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3187 >        dependentFactories.add((y) -> m.thenApply(y, new IncFunction(m)));
3188  
3189 <    /**
3190 <     * If a whenComplete action throws an exception when triggered by
3191 <     * 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 <    }}
3189 >        dependentFactories.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3190 >        dependentFactories.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3191 >        dependentFactories.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3192  
3193 <    /**
3194 <     * If a whenComplete action throws an exception when triggered by
3195 <     * 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<>();
3193 >        dependentFactories.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3194 >        dependentFactories.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3195 >        dependentFactories.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3196  
3197 <        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);
3197 >        dependentFactories.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3198  
3199 <        checkCompletedWithWrappedCFException(f, ex1);
3200 <        checkCompletedWithWrappedCFException(g, ex1);
3201 <        assertEquals(1, a.get());
3199 >        dependentFactories.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3200 >
3201 >        dependentFactories.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3202 >        dependentFactories.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3203 >
3204 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3205 >                 dependentFactory : dependentFactories) {
3206 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3207 >            f.completeExceptionally(ex);
3208 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3209 >            checkCompletedWithWrappedException(src, ex);
3210 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3211 >            checkCompletedWithWrappedException(dep, ex);
3212 >            assertSame(resultOf(src), resultOf(dep));
3213 >        }
3214 >
3215 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3216 >                 dependentFactory : dependentFactories) {
3217 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3218 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3219 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3220 >            f.completeExceptionally(ex);
3221 >            checkCompletedWithWrappedException(src, ex);
3222 >            checkCompletedWithWrappedException(dep, ex);
3223 >            assertSame(resultOf(src), resultOf(dep));
3224 >        }
3225 >
3226 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3227 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3228 >                 dependentFactory : dependentFactories) {
3229 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3230 >            f.cancel(mayInterruptIfRunning);
3231 >            checkCancelled(f);
3232 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3233 >            checkCompletedWithWrappedCancellationException(src);
3234 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3235 >            checkCompletedWithWrappedCancellationException(dep);
3236 >            assertSame(resultOf(src), resultOf(dep));
3237 >        }
3238 >
3239 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3240 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3241 >                 dependentFactory : dependentFactories) {
3242 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3243 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3244 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3245 >            f.cancel(mayInterruptIfRunning);
3246 >            checkCancelled(f);
3247 >            checkCompletedWithWrappedCancellationException(src);
3248 >            checkCompletedWithWrappedCancellationException(dep);
3249 >            assertSame(resultOf(src), resultOf(dep));
3250 >        }
3251      }}
3252  
3253   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines