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.77 by jsr166, Sat Jun 7 21:46:50 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 218 | Line 239 | public class CompletableFutureTest exten
239       */
240      public void testCompleteExceptionally() {
241          CompletableFuture<Integer> f = new CompletableFuture<>();
242 +        CFException ex = new CFException();
243          checkIncomplete(f);
244 <        f.completeExceptionally(new CFException());
245 <        checkCompletedWithWrappedCFException(f);
244 >        f.completeExceptionally(ex);
245 >        checkCompletedExceptionally(f, ex);
246      }
247  
248      /**
# Line 261 | Line 283 | public class CompletableFutureTest exten
283       * obtrudeException forces completion with given exception
284       */
285      public void testObtrudeException() {
286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
287 <        checkIncomplete(f);
288 <        f.complete(one);
289 <        checkCompletedNormally(f, one);
290 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
286 >        for (Integer v1 : new Integer[] { 1, null })
287 >    {
288 >        CFException ex;
289 >        CompletableFuture<Integer> f;
290 >
291          f = new CompletableFuture<>();
292 <        f.obtrudeException(new CFException());
293 <        checkCompletedWithWrappedCFException(f);
292 >        f.complete(v1);
293 >        for (int i = 0; i < 2; i++) {
294 >            f.obtrudeException(ex = new CFException());
295 >            checkCompletedExceptionally(f, ex);
296 >        }
297 >
298 >        f = new CompletableFuture<>();
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304          f = new CompletableFuture<>();
305 +        f.completeExceptionally(ex = new CFException());
306 +        f.obtrudeValue(v1);
307 +        checkCompletedNormally(f, v1);
308 +        f.obtrudeException(ex = new CFException());
309 +        checkCompletedExceptionally(f, ex);
310          f.completeExceptionally(new CFException());
311 <        f.obtrudeValue(four);
312 <        checkCompletedNormally(f, four);
313 <        f.obtrudeException(new CFException());
314 <        checkCompletedWithWrappedCFException(f);
279 <    }
311 >        checkCompletedExceptionally(f, ex);
312 >        f.complete(v1);
313 >        checkCompletedExceptionally(f, ex);
314 >    }}
315  
316      /**
317       * getNumberOfDependents returns number of dependent tasks
318       */
319      public void testGetNumberOfDependents() {
320 +        for (ExecutionMode m : ExecutionMode.values())
321 +    {
322          CompletableFuture<Integer> f = new CompletableFuture<>();
323          assertEquals(0, f.getNumberOfDependents());
324 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
324 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
325          assertEquals(1, f.getNumberOfDependents());
326          assertEquals(0, g.getNumberOfDependents());
327 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
327 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
328          assertEquals(2, f.getNumberOfDependents());
329 +        assertEquals(0, h.getNumberOfDependents());
330          f.complete(1);
331          checkCompletedNormally(g, null);
332 +        checkCompletedNormally(h, null);
333          assertEquals(0, f.getNumberOfDependents());
334          assertEquals(0, g.getNumberOfDependents());
335 <    }
335 >        assertEquals(0, h.getNumberOfDependents());
336 >    }}
337  
338      /**
339       * toString indicates current completion state
# Line 310 | Line 350 | public class CompletableFutureTest exten
350          f = new CompletableFuture<String>();
351          f.completeExceptionally(new IndexOutOfBoundsException());
352          assertTrue(f.toString().contains("[Completed exceptionally]"));
353 +
354 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
355 +            f = new CompletableFuture<String>();
356 +            f.cancel(mayInterruptIfRunning);
357 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
358 +        }
359      }
360  
361      /**
# Line 320 | Line 366 | public class CompletableFutureTest exten
366          checkCompletedNormally(f, "test");
367      }
368  
369 <    static final class IntegerSupplier implements Supplier<Integer> {
324 <        final ExecutionMode m;
369 >    abstract class CheckedAction {
370          int invocationCount = 0;
371 +        final ExecutionMode m;
372 +        CheckedAction(ExecutionMode m) { this.m = m; }
373 +        void invoked() {
374 +            m.checkExecutionMode();
375 +            assertEquals(0, invocationCount++);
376 +        }
377 +        void assertNotInvoked() { assertEquals(0, invocationCount); }
378 +        void assertInvoked() { assertEquals(1, invocationCount); }
379 +    }
380 +
381 +    abstract class CheckedIntegerAction extends CheckedAction {
382 +        Integer value;
383 +        CheckedIntegerAction(ExecutionMode m) { super(m); }
384 +        void assertValue(Integer expected) {
385 +            assertInvoked();
386 +            assertEquals(expected, value);
387 +        }
388 +    }
389 +
390 +    class IntegerSupplier extends CheckedAction
391 +        implements Supplier<Integer>
392 +    {
393          final Integer value;
394          IntegerSupplier(ExecutionMode m, Integer value) {
395 <            this.m = m;
395 >            super(m);
396              this.value = value;
397          }
398          public Integer get() {
399 <            m.checkExecutionMode();
333 <            invocationCount++;
399 >            invoked();
400              return value;
401          }
402      }
# Line 340 | Line 406 | public class CompletableFutureTest exten
406          return (x == null) ? null : x + 1;
407      }
408  
409 <    static final class IncAction implements Consumer<Integer> {
410 <        int invocationCount = 0;
411 <        Integer value;
409 >    class NoopConsumer extends CheckedIntegerAction
410 >        implements Consumer<Integer>
411 >    {
412 >        NoopConsumer(ExecutionMode m) { super(m); }
413          public void accept(Integer x) {
414 <            invocationCount++;
415 <            value = inc(x);
414 >            invoked();
415 >            value = x;
416          }
417      }
418 <    static final class IncFunction implements Function<Integer,Integer> {
419 <        final ExecutionMode m;
420 <        int invocationCount = 0;
421 <        Integer value;
422 <        IncFunction(ExecutionMode m) { this.m = m; }
418 >
419 >    class IncFunction extends CheckedIntegerAction
420 >        implements Function<Integer,Integer>
421 >    {
422 >        IncFunction(ExecutionMode m) { super(m); }
423          public Integer apply(Integer x) {
424 <            m.checkExecutionMode();
358 <            invocationCount++;
424 >            invoked();
425              return value = inc(x);
426          }
427      }
# Line 368 | Line 434 | public class CompletableFutureTest exten
434              - ((y == null) ? 99 : y.intValue());
435      }
436  
437 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
438 <        final ExecutionMode m;
439 <        int invocationCount = 0;
440 <        Integer value;
375 <        // Check this action was invoked exactly once when result is computed.
376 <        SubtractAction(ExecutionMode m) { this.m = m; }
437 >    class SubtractAction extends CheckedIntegerAction
438 >        implements BiConsumer<Integer, Integer>
439 >    {
440 >        SubtractAction(ExecutionMode m) { super(m); }
441          public void accept(Integer x, Integer y) {
442 <            m.checkExecutionMode();
379 <            invocationCount++;
442 >            invoked();
443              value = subtract(x, y);
444          }
445      }
446 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
447 <        final ExecutionMode m;
448 <        int invocationCount = 0;
449 <        Integer value;
450 <        // Check this action was invoked exactly once when result is computed.
388 <        SubtractFunction(ExecutionMode m) { this.m = m; }
446 >
447 >    class SubtractFunction extends CheckedIntegerAction
448 >        implements BiFunction<Integer, Integer, Integer>
449 >    {
450 >        SubtractFunction(ExecutionMode m) { super(m); }
451          public Integer apply(Integer x, Integer y) {
452 <            m.checkExecutionMode();
391 <            invocationCount++;
452 >            invoked();
453              return value = subtract(x, y);
454          }
455      }
456  
457 <    static final class Noop implements Runnable {
458 <        final ExecutionMode m;
398 <        int invocationCount = 0;
399 <        Noop(ExecutionMode m) { this.m = m; }
457 >    class Noop extends CheckedAction implements Runnable {
458 >        Noop(ExecutionMode m) { super(m); }
459          public void run() {
460 <            m.checkExecutionMode();
402 <            invocationCount++;
460 >            invoked();
461          }
462      }
463  
464 <    static final class FailingSupplier implements Supplier<Integer> {
465 <        final ExecutionMode m;
466 <        int invocationCount = 0;
467 <        FailingSupplier(ExecutionMode m) { this.m = m; }
464 >    class FailingSupplier extends CheckedAction
465 >        implements Supplier<Integer>
466 >    {
467 >        FailingSupplier(ExecutionMode m) { super(m); }
468          public Integer get() {
469 <            m.checkExecutionMode();
412 <            invocationCount++;
469 >            invoked();
470              throw new CFException();
471          }
472      }
473 <    static final class FailingConsumer implements Consumer<Integer> {
474 <        final ExecutionMode m;
475 <        int invocationCount = 0;
476 <        FailingConsumer(ExecutionMode m) { this.m = m; }
473 >
474 >    class FailingConsumer extends CheckedIntegerAction
475 >        implements Consumer<Integer>
476 >    {
477 >        FailingConsumer(ExecutionMode m) { super(m); }
478          public void accept(Integer x) {
479 <            m.checkExecutionMode();
480 <            invocationCount++;
479 >            invoked();
480 >            value = x;
481              throw new CFException();
482          }
483      }
484 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
485 <        final ExecutionMode m;
486 <        int invocationCount = 0;
487 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
484 >
485 >    class FailingBiConsumer extends CheckedIntegerAction
486 >        implements BiConsumer<Integer, Integer>
487 >    {
488 >        FailingBiConsumer(ExecutionMode m) { super(m); }
489          public void accept(Integer x, Integer y) {
490 <            m.checkExecutionMode();
491 <            invocationCount++;
490 >            invoked();
491 >            value = subtract(x, y);
492              throw new CFException();
493          }
494      }
495 <    static final class FailingFunction implements Function<Integer, Integer> {
496 <        final ExecutionMode m;
497 <        int invocationCount = 0;
498 <        FailingFunction(ExecutionMode m) { this.m = m; }
495 >
496 >    class FailingFunction extends CheckedIntegerAction
497 >        implements Function<Integer, Integer>
498 >    {
499 >        FailingFunction(ExecutionMode m) { super(m); }
500          public Integer apply(Integer x) {
501 <            m.checkExecutionMode();
502 <            invocationCount++;
501 >            invoked();
502 >            value = x;
503              throw new CFException();
504          }
505      }
506 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
507 <        final ExecutionMode m;
508 <        int invocationCount = 0;
509 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
506 >
507 >    class FailingBiFunction extends CheckedIntegerAction
508 >        implements BiFunction<Integer, Integer, Integer>
509 >    {
510 >        FailingBiFunction(ExecutionMode m) { super(m); }
511          public Integer apply(Integer x, Integer y) {
512 <            m.checkExecutionMode();
513 <            invocationCount++;
512 >            invoked();
513 >            value = subtract(x, y);
514              throw new CFException();
515          }
516      }
517 <    static final class FailingRunnable implements Runnable {
518 <        final ExecutionMode m;
519 <        int invocationCount = 0;
459 <        FailingRunnable(ExecutionMode m) { this.m = m; }
517 >
518 >    class FailingRunnable extends CheckedAction implements Runnable {
519 >        FailingRunnable(ExecutionMode m) { super(m); }
520          public void run() {
521 <            m.checkExecutionMode();
462 <            invocationCount++;
521 >            invoked();
522              throw new CFException();
523          }
524      }
525  
526 <    static final class CompletableFutureInc
527 <        implements Function<Integer, CompletableFuture<Integer>> {
528 <        final ExecutionMode m;
529 <        int invocationCount = 0;
530 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
526 >
527 >    class CompletableFutureInc extends CheckedIntegerAction
528 >        implements Function<Integer, CompletableFuture<Integer>>
529 >    {
530 >        CompletableFutureInc(ExecutionMode m) { super(m); }
531          public CompletableFuture<Integer> apply(Integer x) {
532 <            m.checkExecutionMode();
533 <            invocationCount++;
532 >            invoked();
533 >            value = x;
534              CompletableFuture<Integer> f = new CompletableFuture<>();
535              f.complete(inc(x));
536              return f;
537          }
538      }
539  
540 <    static final class FailingCompletableFutureFunction
541 <        implements Function<Integer, CompletableFuture<Integer>> {
542 <        final ExecutionMode m;
543 <        int invocationCount = 0;
485 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
540 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
541 >        implements Function<Integer, CompletableFuture<Integer>>
542 >    {
543 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
544          public CompletableFuture<Integer> apply(Integer x) {
545 <            m.checkExecutionMode();
546 <            invocationCount++;
545 >            invoked();
546 >            value = x;
547              throw new CFException();
548          }
549      }
# Line 796 | Line 854 | public class CompletableFutureTest exten
854          assertEquals(0, a.get());
855      }}
856  
799
857      /**
858       * exceptionally action completes with function value on source
859       * exception
# Line 840 | Line 897 | public class CompletableFutureTest exten
897              });
898          if (createIncomplete) f.completeExceptionally(ex1);
899  
900 <        checkCompletedWithWrappedCFException(g, ex2);
900 >        checkCompletedWithWrappedException(g, ex2);
901 >        assertEquals(1, a.get());
902 >    }}
903 >
904 >    /**
905 >     * whenComplete action executes on normal completion, propagating
906 >     * source result.
907 >     */
908 >    public void testWhenComplete_normalCompletion1() {
909 >        for (ExecutionMode m : ExecutionMode.values())
910 >        for (boolean createIncomplete : new boolean[] { true, false })
911 >        for (Integer v1 : new Integer[] { 1, null })
912 >    {
913 >        final AtomicInteger a = new AtomicInteger(0);
914 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
915 >        if (!createIncomplete) f.complete(v1);
916 >        final CompletableFuture<Integer> g = m.whenComplete
917 >            (f,
918 >             (Integer x, Throwable t) -> {
919 >                m.checkExecutionMode();
920 >                threadAssertSame(x, v1);
921 >                threadAssertNull(t);
922 >                a.getAndIncrement();
923 >            });
924 >        if (createIncomplete) f.complete(v1);
925 >
926 >        checkCompletedNormally(g, v1);
927 >        checkCompletedNormally(f, v1);
928 >        assertEquals(1, a.get());
929 >    }}
930 >
931 >    /**
932 >     * whenComplete action executes on exceptional completion, propagating
933 >     * source result.
934 >     */
935 >    public void testWhenComplete_exceptionalCompletion() {
936 >        for (ExecutionMode m : ExecutionMode.values())
937 >        for (boolean createIncomplete : new boolean[] { true, false })
938 >        for (Integer v1 : new Integer[] { 1, null })
939 >    {
940 >        final AtomicInteger a = new AtomicInteger(0);
941 >        final CFException ex = new CFException();
942 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
943 >        if (!createIncomplete) f.completeExceptionally(ex);
944 >        final CompletableFuture<Integer> g = m.whenComplete
945 >            (f,
946 >             (Integer x, Throwable t) -> {
947 >                m.checkExecutionMode();
948 >                threadAssertNull(x);
949 >                threadAssertSame(t, ex);
950 >                a.getAndIncrement();
951 >            });
952 >        if (createIncomplete) f.completeExceptionally(ex);
953 >
954 >        checkCompletedWithWrappedException(g, ex);
955 >        checkCompletedExceptionally(f, ex);
956 >        assertEquals(1, a.get());
957 >    }}
958 >
959 >    /**
960 >     * whenComplete action executes on cancelled source, propagating
961 >     * CancellationException.
962 >     */
963 >    public void testWhenComplete_sourceCancelled() {
964 >        for (ExecutionMode m : ExecutionMode.values())
965 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
966 >        for (boolean createIncomplete : new boolean[] { true, false })
967 >    {
968 >        final AtomicInteger a = new AtomicInteger(0);
969 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
970 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
971 >        final CompletableFuture<Integer> g = m.whenComplete
972 >            (f,
973 >             (Integer x, Throwable t) -> {
974 >                m.checkExecutionMode();
975 >                threadAssertNull(x);
976 >                threadAssertTrue(t instanceof CancellationException);
977 >                a.getAndIncrement();
978 >            });
979 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
980 >
981 >        checkCompletedWithWrappedCancellationException(g);
982 >        checkCancelled(f);
983 >        assertEquals(1, a.get());
984 >    }}
985 >
986 >    /**
987 >     * If a whenComplete action throws an exception when triggered by
988 >     * a normal completion, it completes exceptionally
989 >     */
990 >    public void testWhenComplete_actionFailed() {
991 >        for (boolean createIncomplete : new boolean[] { true, false })
992 >        for (ExecutionMode m : ExecutionMode.values())
993 >        for (Integer v1 : new Integer[] { 1, null })
994 >    {
995 >        final AtomicInteger a = new AtomicInteger(0);
996 >        final CFException ex = new CFException();
997 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
998 >        if (!createIncomplete) f.complete(v1);
999 >        final CompletableFuture<Integer> g = m.whenComplete
1000 >            (f,
1001 >             (Integer x, Throwable t) -> {
1002 >                m.checkExecutionMode();
1003 >                threadAssertSame(x, v1);
1004 >                threadAssertNull(t);
1005 >                a.getAndIncrement();
1006 >                throw ex;
1007 >            });
1008 >        if (createIncomplete) f.complete(v1);
1009 >
1010 >        checkCompletedWithWrappedException(g, ex);
1011 >        checkCompletedNormally(f, v1);
1012 >        assertEquals(1, a.get());
1013 >    }}
1014 >
1015 >    /**
1016 >     * If a whenComplete action throws an exception when triggered by
1017 >     * a source completion that also throws an exception, the source
1018 >     * exception takes precedence.
1019 >     */
1020 >    public void testWhenComplete_actionFailedSourceFailed() {
1021 >        for (boolean createIncomplete : new boolean[] { true, false })
1022 >        for (ExecutionMode m : ExecutionMode.values())
1023 >        for (Integer v1 : new Integer[] { 1, null })
1024 >    {
1025 >        final AtomicInteger a = new AtomicInteger(0);
1026 >        final CFException ex1 = new CFException();
1027 >        final CFException ex2 = new CFException();
1028 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1029 >
1030 >        if (!createIncomplete) f.completeExceptionally(ex1);
1031 >        final CompletableFuture<Integer> g = m.whenComplete
1032 >            (f,
1033 >             (Integer x, Throwable t) -> {
1034 >                m.checkExecutionMode();
1035 >                threadAssertSame(t, ex1);
1036 >                threadAssertNull(x);
1037 >                a.getAndIncrement();
1038 >                throw ex2;
1039 >            });
1040 >        if (createIncomplete) f.completeExceptionally(ex1);
1041 >
1042 >        checkCompletedWithWrappedException(g, ex1);
1043 >        checkCompletedExceptionally(f, ex1);
1044          assertEquals(1, a.get());
1045      }}
1046  
# Line 897 | Line 1097 | public class CompletableFutureTest exten
1097          if (createIncomplete) f.completeExceptionally(ex);
1098  
1099          checkCompletedNormally(g, v1);
1100 <        checkCompletedWithWrappedCFException(f, ex);
1100 >        checkCompletedExceptionally(f, ex);
1101          assertEquals(1, a.get());
1102      }}
1103  
# Line 953 | Line 1153 | public class CompletableFutureTest exten
1153              });
1154          if (createIncomplete) f.completeExceptionally(ex1);
1155  
1156 <        checkCompletedWithWrappedCFException(g, ex2);
1157 <        checkCompletedWithWrappedCFException(f, ex1);
1156 >        checkCompletedWithWrappedException(g, ex2);
1157 >        checkCompletedExceptionally(f, ex1);
1158          assertEquals(1, a.get());
1159      }}
1160  
# Line 978 | Line 1178 | public class CompletableFutureTest exten
1178              });
1179          if (createIncomplete) f.complete(v1);
1180  
1181 <        checkCompletedWithWrappedCFException(g, ex);
1181 >        checkCompletedWithWrappedException(g, ex);
1182          checkCompletedNormally(f, v1);
1183          assertEquals(1, a.get());
1184      }}
# Line 997 | Line 1197 | public class CompletableFutureTest exten
1197          final CompletableFuture<Void> f = m.runAsync(r);
1198          assertNull(f.join());
1199          checkCompletedNormally(f, null);
1200 <        assertEquals(1, r.invocationCount);
1200 >        r.assertInvoked();
1201      }}
1202  
1203      /**
# Line 1013 | Line 1213 | public class CompletableFutureTest exten
1213          final FailingRunnable r = new FailingRunnable(m);
1214          final CompletableFuture<Void> f = m.runAsync(r);
1215          checkCompletedWithWrappedCFException(f);
1216 <        assertEquals(1, r.invocationCount);
1216 >        r.assertInvoked();
1217      }}
1218  
1219      /**
# Line 1031 | Line 1231 | public class CompletableFutureTest exten
1231          final CompletableFuture<Integer> f = m.supplyAsync(r);
1232          assertSame(v1, f.join());
1233          checkCompletedNormally(f, v1);
1234 <        assertEquals(1, r.invocationCount);
1234 >        r.assertInvoked();
1235      }}
1236  
1237      /**
# Line 1047 | Line 1247 | public class CompletableFutureTest exten
1247          FailingSupplier r = new FailingSupplier(m);
1248          CompletableFuture<Integer> f = m.supplyAsync(r);
1249          checkCompletedWithWrappedCFException(f);
1250 <        assertEquals(1, r.invocationCount);
1250 >        r.assertInvoked();
1251      }}
1252  
1253      // seq completion methods
# Line 1071 | Line 1271 | public class CompletableFutureTest exten
1271  
1272          checkCompletedNormally(g, null);
1273          checkCompletedNormally(f, v1);
1274 <        assertEquals(1, r.invocationCount);
1274 >        r.assertInvoked();
1275      }}
1276  
1277      /**
# Line 1092 | Line 1292 | public class CompletableFutureTest exten
1292              f.completeExceptionally(ex);
1293          }
1294  
1295 <        checkCompletedWithWrappedCFException(g, ex);
1296 <        checkCompletedWithWrappedCFException(f, ex);
1297 <        assertEquals(0, r.invocationCount);
1295 >        checkCompletedWithWrappedException(g, ex);
1296 >        checkCompletedExceptionally(f, ex);
1297 >        r.assertNotInvoked();
1298      }}
1299  
1300      /**
# Line 1116 | Line 1316 | public class CompletableFutureTest exten
1316  
1317          checkCompletedWithWrappedCancellationException(g);
1318          checkCancelled(f);
1319 <        assertEquals(0, r.invocationCount);
1319 >        r.assertNotInvoked();
1320      }}
1321  
1322      /**
# Line 1159 | Line 1359 | public class CompletableFutureTest exten
1359  
1360          checkCompletedNormally(g, inc(v1));
1361          checkCompletedNormally(f, v1);
1362 <        assertEquals(1, r.invocationCount);
1362 >        r.assertValue(inc(v1));
1363      }}
1364  
1365      /**
# Line 1180 | Line 1380 | public class CompletableFutureTest exten
1380              f.completeExceptionally(ex);
1381          }
1382  
1383 <        checkCompletedWithWrappedCFException(g, ex);
1384 <        checkCompletedWithWrappedCFException(f, ex);
1385 <        assertEquals(0, r.invocationCount);
1383 >        checkCompletedWithWrappedException(g, ex);
1384 >        checkCompletedExceptionally(f, ex);
1385 >        r.assertNotInvoked();
1386      }}
1387  
1388      /**
# Line 1204 | Line 1404 | public class CompletableFutureTest exten
1404  
1405          checkCompletedWithWrappedCancellationException(g);
1406          checkCancelled(f);
1407 <        assertEquals(0, r.invocationCount);
1407 >        r.assertNotInvoked();
1408      }}
1409  
1410      /**
# Line 1237 | Line 1437 | public class CompletableFutureTest exten
1437          for (Integer v1 : new Integer[] { 1, null })
1438      {
1439          final CompletableFuture<Integer> f = new CompletableFuture<>();
1440 <        final IncAction r = new IncAction();
1440 >        final NoopConsumer r = new NoopConsumer(m);
1441          if (!createIncomplete) f.complete(v1);
1442          final CompletableFuture<Void> g = m.thenAccept(f, r);
1443          if (createIncomplete) {
# Line 1246 | Line 1446 | public class CompletableFutureTest exten
1446          }
1447  
1448          checkCompletedNormally(g, null);
1449 +        r.assertValue(v1);
1450          checkCompletedNormally(f, v1);
1250        assertEquals(1, r.invocationCount);
1251        assertEquals(inc(v1), r.value);
1451      }}
1452  
1453      /**
# Line 1261 | Line 1460 | public class CompletableFutureTest exten
1460      {
1461          final CFException ex = new CFException();
1462          final CompletableFuture<Integer> f = new CompletableFuture<>();
1463 <        final IncAction r = new IncAction();
1463 >        final NoopConsumer r = new NoopConsumer(m);
1464          if (!createIncomplete) f.completeExceptionally(ex);
1465          final CompletableFuture<Void> g = m.thenAccept(f, r);
1466          if (createIncomplete) {
# Line 1269 | Line 1468 | public class CompletableFutureTest exten
1468              f.completeExceptionally(ex);
1469          }
1470  
1471 <        checkCompletedWithWrappedCFException(g, ex);
1472 <        checkCompletedWithWrappedCFException(f, ex);
1473 <        assertEquals(0, r.invocationCount);
1471 >        checkCompletedWithWrappedException(g, ex);
1472 >        checkCompletedExceptionally(f, ex);
1473 >        r.assertNotInvoked();
1474      }}
1475  
1476      /**
# Line 1283 | Line 1482 | public class CompletableFutureTest exten
1482          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1483      {
1484          final CompletableFuture<Integer> f = new CompletableFuture<>();
1485 <        final IncAction r = new IncAction();
1485 >        final NoopConsumer r = new NoopConsumer(m);
1486          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1487          final CompletableFuture<Void> g = m.thenAccept(f, r);
1488          if (createIncomplete) {
# Line 1293 | Line 1492 | public class CompletableFutureTest exten
1492  
1493          checkCompletedWithWrappedCancellationException(g);
1494          checkCancelled(f);
1495 <        assertEquals(0, r.invocationCount);
1495 >        r.assertNotInvoked();
1496      }}
1497  
1498      /**
# Line 1338 | Line 1537 | public class CompletableFutureTest exten
1537          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1538          if (createIncomplete) {
1539              checkIncomplete(h);
1540 <            assertEquals(0, r.invocationCount);
1540 >            r.assertNotInvoked();
1541              if (!fFirst) f.complete(v1); else g.complete(v2);
1542          }
1543  
1544          checkCompletedNormally(h, subtract(v1, v2));
1545          checkCompletedNormally(f, v1);
1546          checkCompletedNormally(g, v2);
1547 <        assertEquals(1, r.invocationCount);
1547 >        r.assertValue(subtract(v1, v2));
1548      }}
1549  
1550      /**
# Line 1372 | Line 1571 | public class CompletableFutureTest exten
1571              (!fFirst ? f : g).completeExceptionally(ex);
1572          }
1573  
1574 <        checkCompletedWithWrappedCFException(h, ex);
1575 <        assertEquals(0, r.invocationCount);
1574 >        checkCompletedWithWrappedException(h, ex);
1575 >        r.assertNotInvoked();
1576          checkCompletedNormally(fFirst ? f : g, v1);
1577 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1577 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1578      }}
1579  
1580      /**
# Line 1403 | Line 1602 | public class CompletableFutureTest exten
1602  
1603          checkCompletedWithWrappedCancellationException(h);
1604          checkCancelled(!fFirst ? f : g);
1605 <        assertEquals(0, r.invocationCount);
1605 >        r.assertNotInvoked();
1606          checkCompletedNormally(fFirst ? f : g, v1);
1607      }}
1608  
# Line 1455 | Line 1654 | public class CompletableFutureTest exten
1654          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1655          if (createIncomplete) {
1656              checkIncomplete(h);
1657 <            assertEquals(0, r.invocationCount);
1657 >            r.assertNotInvoked();
1658              if (!fFirst) f.complete(v1); else g.complete(v2);
1659          }
1660  
1661          checkCompletedNormally(h, null);
1662 <        assertEquals(subtract(v1, v2), r.value);
1662 >        r.assertValue(subtract(v1, v2));
1663          checkCompletedNormally(f, v1);
1664          checkCompletedNormally(g, v2);
1665      }}
# Line 1489 | Line 1688 | public class CompletableFutureTest exten
1688              (!fFirst ? f : g).completeExceptionally(ex);
1689          }
1690  
1691 <        checkCompletedWithWrappedCFException(h, ex);
1692 <        assertEquals(0, r.invocationCount);
1691 >        checkCompletedWithWrappedException(h, ex);
1692 >        r.assertNotInvoked();
1693          checkCompletedNormally(fFirst ? f : g, v1);
1694 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1694 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1695      }}
1696  
1697      /**
# Line 1520 | Line 1719 | public class CompletableFutureTest exten
1719  
1720          checkCompletedWithWrappedCancellationException(h);
1721          checkCancelled(!fFirst ? f : g);
1722 <        assertEquals(0, r.invocationCount);
1722 >        r.assertNotInvoked();
1723          checkCompletedNormally(fFirst ? f : g, v1);
1724      }}
1725  
# Line 1572 | Line 1771 | public class CompletableFutureTest exten
1771          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1772          if (createIncomplete) {
1773              checkIncomplete(h);
1774 <            assertEquals(0, r.invocationCount);
1774 >            r.assertNotInvoked();
1775              if (!fFirst) f.complete(v1); else g.complete(v2);
1776          }
1777  
1778          checkCompletedNormally(h, null);
1779 <        assertEquals(1, r.invocationCount);
1779 >        r.assertInvoked();
1780          checkCompletedNormally(f, v1);
1781          checkCompletedNormally(g, v2);
1782      }}
# Line 1606 | Line 1805 | public class CompletableFutureTest exten
1805              (!fFirst ? f : g).completeExceptionally(ex);
1806          }
1807  
1808 <        checkCompletedWithWrappedCFException(h, ex);
1809 <        assertEquals(0, r.invocationCount);
1808 >        checkCompletedWithWrappedException(h, ex);
1809 >        r.assertNotInvoked();
1810          checkCompletedNormally(fFirst ? f : g, v1);
1811 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1811 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1812      }}
1813  
1814      /**
# Line 1626 | Line 1825 | public class CompletableFutureTest exten
1825          final CompletableFuture<Integer> g = new CompletableFuture<>();
1826          final Noop r = new Noop(m);
1827  
1629
1828          (fFirst ? f : g).complete(v1);
1829          if (!createIncomplete)
1830              assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
# Line 1638 | Line 1836 | public class CompletableFutureTest exten
1836  
1837          checkCompletedWithWrappedCancellationException(h);
1838          checkCancelled(!fFirst ? f : g);
1839 <        assertEquals(0, r.invocationCount);
1839 >        r.assertNotInvoked();
1840          checkCompletedNormally(fFirst ? f : g, v1);
1841      }}
1842  
# Line 1653 | Line 1851 | public class CompletableFutureTest exten
1851      {
1852          final CompletableFuture<Integer> f = new CompletableFuture<>();
1853          final CompletableFuture<Integer> g = new CompletableFuture<>();
1854 <        final FailingRunnable r = new FailingRunnable(m);
1854 >        final FailingRunnable r1 = new FailingRunnable(m);
1855 >        final FailingRunnable r2 = new FailingRunnable(m);
1856  
1857 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1857 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1858          if (fFirst) {
1859              f.complete(v1);
1860              g.complete(v2);
# Line 1663 | Line 1862 | public class CompletableFutureTest exten
1862              g.complete(v2);
1863              f.complete(v1);
1864          }
1865 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1865 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1866  
1867          checkCompletedWithWrappedCFException(h1);
1868          checkCompletedWithWrappedCFException(h2);
# Line 1677 | Line 1876 | public class CompletableFutureTest exten
1876       */
1877      public void testApplyToEither_normalCompletion() {
1878          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 })
1879          for (Integer v1 : new Integer[] { 1, null })
1880          for (Integer v2 : new Integer[] { 2, null })
1881      {
1882          final CompletableFuture<Integer> f = new CompletableFuture<>();
1883          final CompletableFuture<Integer> g = new CompletableFuture<>();
1884 <        final IncFunction r = new IncFunction(m);
1884 >        final IncFunction[] rs = new IncFunction[6];
1885 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1886  
1887 <        if (fFirst) {
1888 <            f.complete(v1);
1889 <            g.complete(v2);
1890 <        } else {
1891 <            g.complete(v2);
1892 <            f.complete(v1);
1893 <        }
1887 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1888 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1889 >        checkIncomplete(h0);
1890 >        checkIncomplete(h1);
1891 >        rs[0].assertNotInvoked();
1892 >        rs[1].assertNotInvoked();
1893 >        f.complete(v1);
1894 >        checkCompletedNormally(h0, inc(v1));
1895 >        checkCompletedNormally(h1, inc(v1));
1896 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1897 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1898 >        checkCompletedNormally(h2, inc(v1));
1899 >        checkCompletedNormally(h3, inc(v1));
1900 >        g.complete(v2);
1901  
1902 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1902 >        // unspecified behavior - both source completions available
1903 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1904 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1905 >        rs[4].assertValue(h4.join());
1906 >        rs[5].assertValue(h5.join());
1907 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1908 >                   Objects.equals(inc(v2), h4.join()));
1909 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1910 >                   Objects.equals(inc(v2), h5.join()));
1911  
1912          checkCompletedNormally(f, v1);
1913          checkCompletedNormally(g, v2);
1914 <
1915 <        // unspecified behavior
1916 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1917 <                   Objects.equals(h.join(), inc(v2)));
1918 <        assertEquals(1, r.invocationCount);
1914 >        checkCompletedNormally(h0, inc(v1));
1915 >        checkCompletedNormally(h1, inc(v1));
1916 >        checkCompletedNormally(h2, inc(v1));
1917 >        checkCompletedNormally(h3, inc(v1));
1918 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1919      }}
1920  
1921      /**
1922       * applyToEither result completes exceptionally after exceptional
1923       * completion of either source
1924       */
1925 <    public void testApplyToEither_exceptionalCompletion1() {
1925 >    public void testApplyToEither_exceptionalCompletion() {
1926          for (ExecutionMode m : ExecutionMode.values())
1740        for (boolean createIncomplete : new boolean[] { true, false })
1741        for (boolean fFirst : new boolean[] { true, false })
1927          for (Integer v1 : new Integer[] { 1, null })
1928      {
1929          final CompletableFuture<Integer> f = new CompletableFuture<>();
1930          final CompletableFuture<Integer> g = new CompletableFuture<>();
1931          final CFException ex = new CFException();
1932 <        final IncFunction r = new IncFunction(m);
1932 >        final IncFunction[] rs = new IncFunction[6];
1933 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1934  
1935 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1936 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1937 <        if (createIncomplete) {
1938 <            checkIncomplete(h);
1939 <            assertEquals(0, r.invocationCount);
1940 <            (fFirst ? f : g).completeExceptionally(ex);
1941 <        }
1935 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1936 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1937 >        checkIncomplete(h0);
1938 >        checkIncomplete(h1);
1939 >        rs[0].assertNotInvoked();
1940 >        rs[1].assertNotInvoked();
1941 >        f.completeExceptionally(ex);
1942 >        checkCompletedWithWrappedException(h0, ex);
1943 >        checkCompletedWithWrappedException(h1, ex);
1944 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1945 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1946 >        checkCompletedWithWrappedException(h2, ex);
1947 >        checkCompletedWithWrappedException(h3, ex);
1948 >        g.complete(v1);
1949  
1950 <        checkCompletedWithWrappedCFException(h, ex);
1951 <        (!fFirst ? f : g).complete(v1);
1950 >        // unspecified behavior - both source completions available
1951 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1952 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1953 >        try {
1954 >            assertEquals(inc(v1), h4.join());
1955 >            rs[4].assertValue(inc(v1));
1956 >        } catch (CompletionException ok) {
1957 >            checkCompletedWithWrappedException(h4, ex);
1958 >            rs[4].assertNotInvoked();
1959 >        }
1960 >        try {
1961 >            assertEquals(inc(v1), h5.join());
1962 >            rs[5].assertValue(inc(v1));
1963 >        } catch (CompletionException ok) {
1964 >            checkCompletedWithWrappedException(h5, ex);
1965 >            rs[5].assertNotInvoked();
1966 >        }
1967  
1968 <        assertEquals(0, r.invocationCount);
1969 <        checkCompletedNormally(!fFirst ? f : g, v1);
1970 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1971 <        checkCompletedWithWrappedCFException(h, ex);
1968 >        checkCompletedExceptionally(f, ex);
1969 >        checkCompletedNormally(g, v1);
1970 >        checkCompletedWithWrappedException(h0, ex);
1971 >        checkCompletedWithWrappedException(h1, ex);
1972 >        checkCompletedWithWrappedException(h2, ex);
1973 >        checkCompletedWithWrappedException(h3, ex);
1974 >        checkCompletedWithWrappedException(h4, ex);
1975 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1976      }}
1977  
1978      public void testApplyToEither_exceptionalCompletion2() {
1979          for (ExecutionMode m : ExecutionMode.values())
1768        for (boolean reverseArgs : new boolean[] { true, false })
1980          for (boolean fFirst : new boolean[] { true, false })
1981          for (Integer v1 : new Integer[] { 1, null })
1982      {
1983          final CompletableFuture<Integer> f = new CompletableFuture<>();
1984          final CompletableFuture<Integer> g = new CompletableFuture<>();
1774        final IncFunction r1 = new IncFunction(m);
1775        final IncFunction r2 = new IncFunction(m);
1985          final CFException ex = new CFException();
1986 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1987 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1988 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1986 >        final IncFunction[] rs = new IncFunction[6];
1987 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1988 >
1989 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1990 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1991          if (fFirst) {
1992              f.complete(v1);
1993              g.completeExceptionally(ex);
# Line 1784 | Line 1995 | public class CompletableFutureTest exten
1995              g.completeExceptionally(ex);
1996              f.complete(v1);
1997          }
1998 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1998 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1999 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2000  
2001 <        // unspecified behavior
2001 >        // unspecified behavior - both source completions available
2002 >        try {
2003 >            assertEquals(inc(v1), h0.join());
2004 >            rs[0].assertValue(inc(v1));
2005 >        } catch (CompletionException ok) {
2006 >            checkCompletedWithWrappedException(h0, ex);
2007 >            rs[0].assertNotInvoked();
2008 >        }
2009          try {
2010              assertEquals(inc(v1), h1.join());
2011 <            assertEquals(1, r1.invocationCount);
2011 >            rs[1].assertValue(inc(v1));
2012          } catch (CompletionException ok) {
2013 <            checkCompletedWithWrappedCFException(h1, ex);
2014 <            assertEquals(0, r1.invocationCount);
2013 >            checkCompletedWithWrappedException(h1, ex);
2014 >            rs[1].assertNotInvoked();
2015          }
1797
2016          try {
2017              assertEquals(inc(v1), h2.join());
2018 <            assertEquals(1, r2.invocationCount);
2018 >            rs[2].assertValue(inc(v1));
2019          } catch (CompletionException ok) {
2020 <            checkCompletedWithWrappedCFException(h2, ex);
2021 <            assertEquals(0, r2.invocationCount);
2020 >            checkCompletedWithWrappedException(h2, ex);
2021 >            rs[2].assertNotInvoked();
2022 >        }
2023 >        try {
2024 >            assertEquals(inc(v1), h3.join());
2025 >            rs[3].assertValue(inc(v1));
2026 >        } catch (CompletionException ok) {
2027 >            checkCompletedWithWrappedException(h3, ex);
2028 >            rs[3].assertNotInvoked();
2029          }
2030  
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);
2031          checkCompletedNormally(f, v1);
2032 <        checkCompletedNormally(g, v2);
2032 >        checkCompletedExceptionally(g, ex);
2033      }}
2034  
2035      /**
2036       * applyToEither result completes exceptionally if either source cancelled
2037       */
2038 <    public void testApplyToEither_sourceCancelled1() {
2038 >    public void testApplyToEither_sourceCancelled() {
2039          for (ExecutionMode m : ExecutionMode.values())
2040          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1853        for (boolean createIncomplete : new boolean[] { true, false })
1854        for (boolean fFirst : new boolean[] { true, false })
2041          for (Integer v1 : new Integer[] { 1, null })
2042      {
2043          final CompletableFuture<Integer> f = new CompletableFuture<>();
2044          final CompletableFuture<Integer> g = new CompletableFuture<>();
2045 <        final IncFunction r = new IncFunction(m);
2045 >        final IncFunction[] rs = new IncFunction[6];
2046 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2047  
2048 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2049 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2050 <        if (createIncomplete) {
2051 <            checkIncomplete(h);
2052 <            assertEquals(0, r.invocationCount);
2053 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2054 <        }
2048 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2049 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2050 >        checkIncomplete(h0);
2051 >        checkIncomplete(h1);
2052 >        rs[0].assertNotInvoked();
2053 >        rs[1].assertNotInvoked();
2054 >        f.cancel(mayInterruptIfRunning);
2055 >        checkCompletedWithWrappedCancellationException(h0);
2056 >        checkCompletedWithWrappedCancellationException(h1);
2057 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2058 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2059 >        checkCompletedWithWrappedCancellationException(h2);
2060 >        checkCompletedWithWrappedCancellationException(h3);
2061 >        g.complete(v1);
2062  
2063 <        checkCompletedWithWrappedCancellationException(h);
2064 <        (!fFirst ? f : g).complete(v1);
2063 >        // unspecified behavior - both source completions available
2064 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2065 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2066 >        try {
2067 >            assertEquals(inc(v1), h4.join());
2068 >            rs[4].assertValue(inc(v1));
2069 >        } catch (CompletionException ok) {
2070 >            checkCompletedWithWrappedCancellationException(h4);
2071 >            rs[4].assertNotInvoked();
2072 >        }
2073 >        try {
2074 >            assertEquals(inc(v1), h5.join());
2075 >            rs[5].assertValue(inc(v1));
2076 >        } catch (CompletionException ok) {
2077 >            checkCompletedWithWrappedCancellationException(h5);
2078 >            rs[5].assertNotInvoked();
2079 >        }
2080  
2081 <        assertEquals(0, r.invocationCount);
2082 <        checkCompletedNormally(!fFirst ? f : g, v1);
2083 <        checkCancelled(fFirst ? f : g);
2084 <        checkCompletedWithWrappedCancellationException(h);
2081 >        checkCancelled(f);
2082 >        checkCompletedNormally(g, v1);
2083 >        checkCompletedWithWrappedCancellationException(h0);
2084 >        checkCompletedWithWrappedCancellationException(h1);
2085 >        checkCompletedWithWrappedCancellationException(h2);
2086 >        checkCompletedWithWrappedCancellationException(h3);
2087 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2088      }}
2089  
2090      public void testApplyToEither_sourceCancelled2() {
2091          for (ExecutionMode m : ExecutionMode.values())
2092          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1881        for (boolean reverseArgs : new boolean[] { true, false })
2093          for (boolean fFirst : new boolean[] { true, false })
2094          for (Integer v1 : new Integer[] { 1, null })
2095      {
2096          final CompletableFuture<Integer> f = new CompletableFuture<>();
2097          final CompletableFuture<Integer> g = new CompletableFuture<>();
2098 <        final IncFunction r1 = new IncFunction(m);
2099 <        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);
2098 >        final IncFunction[] rs = new IncFunction[6];
2099 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2100  
2101 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2101 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2102 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2103          if (fFirst) {
2104              f.complete(v1);
2105 <            assertTrue(g.cancel(mayInterruptIfRunning));
2105 >            g.cancel(mayInterruptIfRunning);
2106          } else {
2107 <            assertTrue(g.cancel(mayInterruptIfRunning));
2107 >            g.cancel(mayInterruptIfRunning);
2108              f.complete(v1);
2109          }
2110 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2110 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2111 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2112  
2113 <        // unspecified behavior
2113 >        // unspecified behavior - both source completions available
2114 >        try {
2115 >            assertEquals(inc(v1), h0.join());
2116 >            rs[0].assertValue(inc(v1));
2117 >        } catch (CompletionException ok) {
2118 >            checkCompletedWithWrappedCancellationException(h0);
2119 >            rs[0].assertNotInvoked();
2120 >        }
2121          try {
2122              assertEquals(inc(v1), h1.join());
2123 <            assertEquals(1, r1.invocationCount);
2123 >            rs[1].assertValue(inc(v1));
2124          } catch (CompletionException ok) {
2125              checkCompletedWithWrappedCancellationException(h1);
2126 <            assertEquals(0, r1.invocationCount);
2126 >            rs[1].assertNotInvoked();
2127          }
1911
2128          try {
2129              assertEquals(inc(v1), h2.join());
2130 <            assertEquals(1, r2.invocationCount);
2130 >            rs[2].assertValue(inc(v1));
2131          } catch (CompletionException ok) {
2132              checkCompletedWithWrappedCancellationException(h2);
2133 <            assertEquals(0, r2.invocationCount);
2133 >            rs[2].assertNotInvoked();
2134 >        }
2135 >        try {
2136 >            assertEquals(inc(v1), h3.join());
2137 >            rs[3].assertValue(inc(v1));
2138 >        } catch (CompletionException ok) {
2139 >            checkCompletedWithWrappedCancellationException(h3);
2140 >            rs[3].assertNotInvoked();
2141          }
2142  
1920        checkCancelled(g);
2143          checkCompletedNormally(f, v1);
2144 +        checkCancelled(g);
2145      }}
2146  
2147      /**
2148 <     * acceptEither result completes normally after normal completion
1926 <     * of either source
2148 >     * applyToEither result completes exceptionally if action does
2149       */
2150 <    public void testAcceptEither_normalCompletion1() {
2150 >    public void testApplyToEither_actionFailed() {
2151          for (ExecutionMode m : ExecutionMode.values())
2152          for (Integer v1 : new Integer[] { 1, null })
2153          for (Integer v2 : new Integer[] { 2, null })
2154      {
2155          final CompletableFuture<Integer> f = new CompletableFuture<>();
2156          final CompletableFuture<Integer> g = new CompletableFuture<>();
2157 <        final IncAction r = new IncAction();
2158 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2157 >        final FailingFunction[] rs = new FailingFunction[6];
2158 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2159  
2160 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2161 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2162          f.complete(v1);
2163 <        checkCompletedNormally(h, null);
2164 <        assertEquals(inc(v1), r.value);
2165 <        g.complete(v2);
2166 <
2167 <        checkCompletedNormally(f, v1);
2168 <        checkCompletedNormally(g, v2);
2169 <        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);
2163 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2164 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2165 >        checkCompletedWithWrappedCFException(h0);
2166 >        checkCompletedWithWrappedCFException(h1);
2167 >        checkCompletedWithWrappedCFException(h2);
2168 >        checkCompletedWithWrappedCFException(h3);
2169 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2170  
2171          g.complete(v2);
2172 <        checkCompletedNormally(h, null);
2173 <        assertEquals(inc(v2), r.value);
2174 <        f.complete(v1);
2172 >
2173 >        // unspecified behavior - both source completions available
2174 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2175 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2176 >
2177 >        checkCompletedWithWrappedCFException(h4);
2178 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2179 >                   Objects.equals(v2, rs[4].value));
2180 >        checkCompletedWithWrappedCFException(h5);
2181 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2182 >                   Objects.equals(v2, rs[5].value));
2183  
2184          checkCompletedNormally(f, v1);
2185          checkCompletedNormally(g, v2);
1965        checkCompletedNormally(h, null);
2186      }}
2187  
2188 <    public void testAcceptEither_normalCompletion3() {
2188 >    /**
2189 >     * acceptEither result completes normally after normal completion
2190 >     * of either source
2191 >     */
2192 >    public void testAcceptEither_normalCompletion() {
2193          for (ExecutionMode m : ExecutionMode.values())
2194          for (Integer v1 : new Integer[] { 1, null })
2195          for (Integer v2 : new Integer[] { 2, null })
2196      {
2197          final CompletableFuture<Integer> f = new CompletableFuture<>();
2198          final CompletableFuture<Integer> g = new CompletableFuture<>();
2199 <        final IncAction r = new IncAction();
2199 >        final NoopConsumer[] rs = new NoopConsumer[6];
2200 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2201  
2202 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2203 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2204 +        checkIncomplete(h0);
2205 +        checkIncomplete(h1);
2206 +        rs[0].assertNotInvoked();
2207 +        rs[1].assertNotInvoked();
2208          f.complete(v1);
2209 +        checkCompletedNormally(h0, null);
2210 +        checkCompletedNormally(h1, null);
2211 +        rs[0].assertValue(v1);
2212 +        rs[1].assertValue(v1);
2213 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2214 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2215 +        checkCompletedNormally(h2, null);
2216 +        checkCompletedNormally(h3, null);
2217 +        rs[2].assertValue(v1);
2218 +        rs[3].assertValue(v1);
2219          g.complete(v2);
1979        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2220  
2221 <        checkCompletedNormally(h, null);
2221 >        // unspecified behavior - both source completions available
2222 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2223 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2224 >        checkCompletedNormally(h4, null);
2225 >        checkCompletedNormally(h5, null);
2226 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2227 >                   Objects.equals(v2, rs[4].value));
2228 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2229 >                   Objects.equals(v2, rs[5].value));
2230 >
2231          checkCompletedNormally(f, v1);
2232          checkCompletedNormally(g, v2);
2233 <
2234 <        // unspecified behavior
2235 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2236 <                   Objects.equals(r.value, inc(v2)));
2233 >        checkCompletedNormally(h0, null);
2234 >        checkCompletedNormally(h1, null);
2235 >        checkCompletedNormally(h2, null);
2236 >        checkCompletedNormally(h3, null);
2237 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2238      }}
2239  
2240      /**
2241       * acceptEither result completes exceptionally after exceptional
2242       * completion of either source
2243       */
2244 <    public void testAcceptEither_exceptionalCompletion1() {
2244 >    public void testAcceptEither_exceptionalCompletion() {
2245          for (ExecutionMode m : ExecutionMode.values())
2246          for (Integer v1 : new Integer[] { 1, null })
2247      {
2248          final CompletableFuture<Integer> f = new CompletableFuture<>();
2249          final CompletableFuture<Integer> g = new CompletableFuture<>();
2000        final IncAction r = new IncAction();
2001        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2250          final CFException ex = new CFException();
2251 +        final NoopConsumer[] rs = new NoopConsumer[6];
2252 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2253  
2254 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2255 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2256 +        checkIncomplete(h0);
2257 +        checkIncomplete(h1);
2258 +        rs[0].assertNotInvoked();
2259 +        rs[1].assertNotInvoked();
2260          f.completeExceptionally(ex);
2261 <        checkCompletedWithWrappedCFException(h, ex);
2261 >        checkCompletedWithWrappedException(h0, ex);
2262 >        checkCompletedWithWrappedException(h1, ex);
2263 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2264 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2265 >        checkCompletedWithWrappedException(h2, ex);
2266 >        checkCompletedWithWrappedException(h3, ex);
2267 >
2268          g.complete(v1);
2269  
2270 <        assertEquals(0, r.invocationCount);
2270 >        // unspecified behavior - both source completions available
2271 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2272 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2273 >        try {
2274 >            assertNull(h4.join());
2275 >            rs[4].assertValue(v1);
2276 >        } catch (CompletionException ok) {
2277 >            checkCompletedWithWrappedException(h4, ex);
2278 >            rs[4].assertNotInvoked();
2279 >        }
2280 >        try {
2281 >            assertNull(h5.join());
2282 >            rs[5].assertValue(v1);
2283 >        } catch (CompletionException ok) {
2284 >            checkCompletedWithWrappedException(h5, ex);
2285 >            rs[5].assertNotInvoked();
2286 >        }
2287 >
2288 >        checkCompletedExceptionally(f, ex);
2289          checkCompletedNormally(g, v1);
2290 <        checkCompletedWithWrappedCFException(f, ex);
2291 <        checkCompletedWithWrappedCFException(h, ex);
2290 >        checkCompletedWithWrappedException(h0, ex);
2291 >        checkCompletedWithWrappedException(h1, ex);
2292 >        checkCompletedWithWrappedException(h2, ex);
2293 >        checkCompletedWithWrappedException(h3, ex);
2294 >        checkCompletedWithWrappedException(h4, ex);
2295 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2296      }}
2297  
2298      public void testAcceptEither_exceptionalCompletion2() {
2299          for (ExecutionMode m : ExecutionMode.values())
2300 +        for (boolean fFirst : new boolean[] { true, false })
2301          for (Integer v1 : new Integer[] { 1, null })
2302      {
2303          final CompletableFuture<Integer> f = new CompletableFuture<>();
2304          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();
2305          final CFException ex = new CFException();
2306 +        final NoopConsumer[] rs = new NoopConsumer[6];
2307 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2308  
2309 <        g.completeExceptionally(ex);
2310 <        f.complete(v1);
2311 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2309 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2310 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2311 >        if (fFirst) {
2312 >            f.complete(v1);
2313 >            g.completeExceptionally(ex);
2314 >        } else {
2315 >            g.completeExceptionally(ex);
2316 >            f.complete(v1);
2317 >        }
2318 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2319 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2320  
2321 <        // unspecified behavior
2048 <        Integer v;
2321 >        // unspecified behavior - both source completions available
2322          try {
2323 <            assertNull(h.join());
2324 <            assertEquals(1, r.invocationCount);
2052 <            assertEquals(inc(v1), r.value);
2323 >            assertEquals(null, h0.join());
2324 >            rs[0].assertValue(v1);
2325          } catch (CompletionException ok) {
2326 <            checkCompletedWithWrappedCFException(h, ex);
2327 <            assertEquals(0, r.invocationCount);
2326 >            checkCompletedWithWrappedException(h0, ex);
2327 >            rs[0].assertNotInvoked();
2328          }
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;
2329          try {
2330 <            assertNull(h.join());
2331 <            assertEquals(1, r.invocationCount);
2080 <            assertEquals(inc(v1), r.value);
2330 >            assertEquals(null, h1.join());
2331 >            rs[1].assertValue(v1);
2332          } catch (CompletionException ok) {
2333 <            checkCompletedWithWrappedCFException(h, ex);
2334 <            assertEquals(0, r.invocationCount);
2333 >            checkCompletedWithWrappedException(h1, ex);
2334 >            rs[1].assertNotInvoked();
2335 >        }
2336 >        try {
2337 >            assertEquals(null, h2.join());
2338 >            rs[2].assertValue(v1);
2339 >        } catch (CompletionException ok) {
2340 >            checkCompletedWithWrappedException(h2, ex);
2341 >            rs[2].assertNotInvoked();
2342 >        }
2343 >        try {
2344 >            assertEquals(null, h3.join());
2345 >            rs[3].assertValue(v1);
2346 >        } catch (CompletionException ok) {
2347 >            checkCompletedWithWrappedException(h3, ex);
2348 >            rs[3].assertNotInvoked();
2349          }
2350  
2086        checkCompletedWithWrappedCFException(f, ex);
2087        checkCompletedNormally(g, v1);
2088    }}
2089
2090    /**
2091     * acceptEither result completes exceptionally if action does
2092     */
2093    public void testAcceptEither_actionFailed1() {
2094        for (ExecutionMode m : ExecutionMode.values())
2095        for (Integer v1 : new Integer[] { 1, null })
2096        for (Integer v2 : new Integer[] { 2, null })
2097    {
2098        final CompletableFuture<Integer> f = new CompletableFuture<>();
2099        final CompletableFuture<Integer> g = new CompletableFuture<>();
2100        final FailingConsumer r = new FailingConsumer(m);
2101        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2102
2103        f.complete(v1);
2104        checkCompletedWithWrappedCFException(h);
2105        g.complete(v2);
2106        checkCompletedNormally(f, v1);
2107        checkCompletedNormally(g, v2);
2108    }}
2109
2110    public void testAcceptEither_actionFailed2() {
2111        for (ExecutionMode m : ExecutionMode.values())
2112        for (Integer v1 : new Integer[] { 1, null })
2113        for (Integer v2 : new Integer[] { 2, null })
2114    {
2115        final CompletableFuture<Integer> f = new CompletableFuture<>();
2116        final CompletableFuture<Integer> g = new CompletableFuture<>();
2117        final FailingConsumer r = new FailingConsumer(m);
2118        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2119
2120        g.complete(v2);
2121        checkCompletedWithWrappedCFException(h);
2122        f.complete(v1);
2351          checkCompletedNormally(f, v1);
2352 <        checkCompletedNormally(g, v2);
2352 >        checkCompletedExceptionally(g, ex);
2353      }}
2354  
2355      /**
2356       * acceptEither result completes exceptionally if either source cancelled
2357       */
2358 <    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() {
2358 >    public void testAcceptEither_sourceCancelled() {
2359          for (ExecutionMode m : ExecutionMode.values())
2360          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2361          for (Integer v1 : new Integer[] { 1, null })
2362      {
2363          final CompletableFuture<Integer> f = new CompletableFuture<>();
2364          final CompletableFuture<Integer> g = new CompletableFuture<>();
2365 <        final IncAction r = new IncAction();
2366 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2365 >        final NoopConsumer[] rs = new NoopConsumer[6];
2366 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2367  
2368 <        assertTrue(g.cancel(mayInterruptIfRunning));
2369 <        checkCompletedWithWrappedCancellationException(h);
2370 <        f.complete(v1);
2371 <
2372 <        checkCancelled(g);
2373 <        assertEquals(0, r.invocationCount);
2374 <        checkCompletedNormally(f, v1);
2375 <        checkCompletedWithWrappedCancellationException(h);
2376 <    }}
2377 <
2378 <    public void testAcceptEither_sourceCancelled3() {
2379 <        for (ExecutionMode m : ExecutionMode.values())
2380 <        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();
2368 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2369 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2370 >        checkIncomplete(h0);
2371 >        checkIncomplete(h1);
2372 >        rs[0].assertNotInvoked();
2373 >        rs[1].assertNotInvoked();
2374 >        f.cancel(mayInterruptIfRunning);
2375 >        checkCompletedWithWrappedCancellationException(h0);
2376 >        checkCompletedWithWrappedCancellationException(h1);
2377 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2378 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2379 >        checkCompletedWithWrappedCancellationException(h2);
2380 >        checkCompletedWithWrappedCancellationException(h3);
2381  
2382 <        assertTrue(g.cancel(mayInterruptIfRunning));
2180 <        f.complete(v1);
2181 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2382 >        g.complete(v1);
2383  
2384 <        // unspecified behavior
2385 <        Integer v;
2384 >        // unspecified behavior - both source completions available
2385 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2386 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2387          try {
2388 <            assertNull(h.join());
2389 <            assertEquals(1, r.invocationCount);
2188 <            assertEquals(inc(v1), r.value);
2388 >            assertNull(h4.join());
2389 >            rs[4].assertValue(v1);
2390          } catch (CompletionException ok) {
2391 <            checkCompletedWithWrappedCancellationException(h);
2392 <            assertEquals(0, r.invocationCount);
2391 >            checkCompletedWithWrappedCancellationException(h4);
2392 >            rs[4].assertNotInvoked();
2393          }
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;
2394          try {
2395 <            assertNull(h.join());
2396 <            assertEquals(1, r.invocationCount);
2216 <            assertEquals(inc(v1), r.value);
2395 >            assertNull(h5.join());
2396 >            rs[5].assertValue(v1);
2397          } catch (CompletionException ok) {
2398 <            checkCompletedWithWrappedCancellationException(h);
2399 <            assertEquals(0, r.invocationCount);
2398 >            checkCompletedWithWrappedCancellationException(h5);
2399 >            rs[5].assertNotInvoked();
2400          }
2401  
2402          checkCancelled(f);
2403          checkCompletedNormally(g, v1);
2404 +        checkCompletedWithWrappedCancellationException(h0);
2405 +        checkCompletedWithWrappedCancellationException(h1);
2406 +        checkCompletedWithWrappedCancellationException(h2);
2407 +        checkCompletedWithWrappedCancellationException(h3);
2408 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2409      }}
2410  
2411      /**
2412 <     * runAfterEither result completes normally after normal completion
2228 <     * of either source
2412 >     * acceptEither result completes exceptionally if action does
2413       */
2414 <    public void testRunAfterEither_normalCompletion1() {
2414 >    public void testAcceptEither_actionFailed() {
2415          for (ExecutionMode m : ExecutionMode.values())
2416          for (Integer v1 : new Integer[] { 1, null })
2417          for (Integer v2 : new Integer[] { 2, null })
2418      {
2419          final CompletableFuture<Integer> f = new CompletableFuture<>();
2420          final CompletableFuture<Integer> g = new CompletableFuture<>();
2421 <        final Noop r = new Noop(m);
2422 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2421 >        final FailingConsumer[] rs = new FailingConsumer[6];
2422 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2423  
2424 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2425 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2426          f.complete(v1);
2427 <        checkCompletedNormally(h, null);
2428 <        assertEquals(1, r.invocationCount);
2427 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2428 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2429 >        checkCompletedWithWrappedCFException(h0);
2430 >        checkCompletedWithWrappedCFException(h1);
2431 >        checkCompletedWithWrappedCFException(h2);
2432 >        checkCompletedWithWrappedCFException(h3);
2433 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2434 >
2435          g.complete(v2);
2436  
2437 +        // unspecified behavior - both source completions available
2438 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2439 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2440 +
2441 +        checkCompletedWithWrappedCFException(h4);
2442 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2443 +                   Objects.equals(v2, rs[4].value));
2444 +        checkCompletedWithWrappedCFException(h5);
2445 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2446 +                   Objects.equals(v2, rs[5].value));
2447 +
2448          checkCompletedNormally(f, v1);
2449          checkCompletedNormally(g, v2);
2247        checkCompletedNormally(h, null);
2248        assertEquals(1, r.invocationCount);
2450      }}
2451  
2452 <    public void testRunAfterEither_normalCompletion2() {
2452 >    /**
2453 >     * runAfterEither result completes normally after normal completion
2454 >     * of either source
2455 >     */
2456 >    public void testRunAfterEither_normalCompletion() {
2457          for (ExecutionMode m : ExecutionMode.values())
2458          for (Integer v1 : new Integer[] { 1, null })
2459          for (Integer v2 : new Integer[] { 2, null })
2460      {
2461          final CompletableFuture<Integer> f = new CompletableFuture<>();
2462          final CompletableFuture<Integer> g = new CompletableFuture<>();
2463 <        final Noop r = new Noop(m);
2464 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2463 >        final Noop[] rs = new Noop[6];
2464 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2465  
2466 <        g.complete(v2);
2467 <        checkCompletedNormally(h, null);
2468 <        assertEquals(1, r.invocationCount);
2466 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2467 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2468 >        checkIncomplete(h0);
2469 >        checkIncomplete(h1);
2470 >        rs[0].assertNotInvoked();
2471 >        rs[1].assertNotInvoked();
2472          f.complete(v1);
2473 +        checkCompletedNormally(h0, null);
2474 +        checkCompletedNormally(h1, null);
2475 +        rs[0].assertInvoked();
2476 +        rs[1].assertInvoked();
2477 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2478 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2479 +        checkCompletedNormally(h2, null);
2480 +        checkCompletedNormally(h3, null);
2481 +        rs[2].assertInvoked();
2482 +        rs[3].assertInvoked();
2483  
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);
2484          g.complete(v2);
2283        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2485  
2486 <        checkCompletedNormally(h, null);
2486 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2487 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2488 >
2489          checkCompletedNormally(f, v1);
2490          checkCompletedNormally(g, v2);
2491 <        assertEquals(1, r.invocationCount);
2491 >        checkCompletedNormally(h0, null);
2492 >        checkCompletedNormally(h1, null);
2493 >        checkCompletedNormally(h2, null);
2494 >        checkCompletedNormally(h3, null);
2495 >        checkCompletedNormally(h4, null);
2496 >        checkCompletedNormally(h5, null);
2497 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2498      }}
2499  
2500      /**
2501       * runAfterEither result completes exceptionally after exceptional
2502       * completion of either source
2503       */
2504 <    public void testRunAfterEither_exceptionalCompletion1() {
2504 >    public void testRunAfterEither_exceptionalCompletion() {
2505          for (ExecutionMode m : ExecutionMode.values())
2506          for (Integer v1 : new Integer[] { 1, null })
2507      {
2508          final CompletableFuture<Integer> f = new CompletableFuture<>();
2509          final CompletableFuture<Integer> g = new CompletableFuture<>();
2301        final Noop r = new Noop(m);
2302        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2510          final CFException ex = new CFException();
2511 +        final Noop[] rs = new Noop[6];
2512 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2513  
2514 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2515 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2516 +        checkIncomplete(h0);
2517 +        checkIncomplete(h1);
2518 +        rs[0].assertNotInvoked();
2519 +        rs[1].assertNotInvoked();
2520          f.completeExceptionally(ex);
2521 <        checkCompletedWithWrappedCFException(h, ex);
2521 >        checkCompletedWithWrappedException(h0, ex);
2522 >        checkCompletedWithWrappedException(h1, ex);
2523 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2524 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2525 >        checkCompletedWithWrappedException(h2, ex);
2526 >        checkCompletedWithWrappedException(h3, ex);
2527 >
2528          g.complete(v1);
2529  
2530 <        assertEquals(0, r.invocationCount);
2530 >        // unspecified behavior - both source completions available
2531 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2532 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2533 >        try {
2534 >            assertNull(h4.join());
2535 >            rs[4].assertInvoked();
2536 >        } catch (CompletionException ok) {
2537 >            checkCompletedWithWrappedException(h4, ex);
2538 >            rs[4].assertNotInvoked();
2539 >        }
2540 >        try {
2541 >            assertNull(h5.join());
2542 >            rs[5].assertInvoked();
2543 >        } catch (CompletionException ok) {
2544 >            checkCompletedWithWrappedException(h5, ex);
2545 >            rs[5].assertNotInvoked();
2546 >        }
2547 >
2548 >        checkCompletedExceptionally(f, ex);
2549          checkCompletedNormally(g, v1);
2550 <        checkCompletedWithWrappedCFException(f, ex);
2551 <        checkCompletedWithWrappedCFException(h, ex);
2550 >        checkCompletedWithWrappedException(h0, ex);
2551 >        checkCompletedWithWrappedException(h1, ex);
2552 >        checkCompletedWithWrappedException(h2, ex);
2553 >        checkCompletedWithWrappedException(h3, ex);
2554 >        checkCompletedWithWrappedException(h4, ex);
2555 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2556      }}
2557  
2558      public void testRunAfterEither_exceptionalCompletion2() {
2559          for (ExecutionMode m : ExecutionMode.values())
2560 +        for (boolean fFirst : new boolean[] { true, false })
2561          for (Integer v1 : new Integer[] { 1, null })
2562      {
2563          final CompletableFuture<Integer> f = new CompletableFuture<>();
2564          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);
2565          final CFException ex = new CFException();
2566 +        final Noop[] rs = new Noop[6];
2567 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2568  
2569 <        g.completeExceptionally(ex);
2570 <        f.complete(v1);
2571 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2569 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2570 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2571 >        if (fFirst) {
2572 >            f.complete(v1);
2573 >            g.completeExceptionally(ex);
2574 >        } else {
2575 >            g.completeExceptionally(ex);
2576 >            f.complete(v1);
2577 >        }
2578 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2579 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2580  
2581 <        // unspecified behavior
2582 <        Integer v;
2581 >        // unspecified behavior - both source completions available
2582 >        try {
2583 >            assertEquals(null, h0.join());
2584 >            rs[0].assertInvoked();
2585 >        } catch (CompletionException ok) {
2586 >            checkCompletedWithWrappedException(h0, ex);
2587 >            rs[0].assertNotInvoked();
2588 >        }
2589 >        try {
2590 >            assertEquals(null, h1.join());
2591 >            rs[1].assertInvoked();
2592 >        } catch (CompletionException ok) {
2593 >            checkCompletedWithWrappedException(h1, ex);
2594 >            rs[1].assertNotInvoked();
2595 >        }
2596 >        try {
2597 >            assertEquals(null, h2.join());
2598 >            rs[2].assertInvoked();
2599 >        } catch (CompletionException ok) {
2600 >            checkCompletedWithWrappedException(h2, ex);
2601 >            rs[2].assertNotInvoked();
2602 >        }
2603          try {
2604 <            assertNull(h.join());
2605 <            assertEquals(1, r.invocationCount);
2604 >            assertEquals(null, h3.join());
2605 >            rs[3].assertInvoked();
2606          } catch (CompletionException ok) {
2607 <            checkCompletedWithWrappedCFException(h, ex);
2608 <            assertEquals(0, r.invocationCount);
2607 >            checkCompletedWithWrappedException(h3, ex);
2608 >            rs[3].assertNotInvoked();
2609          }
2610  
2358        checkCompletedWithWrappedCFException(g, ex);
2611          checkCompletedNormally(f, v1);
2612 +        checkCompletedExceptionally(g, ex);
2613      }}
2614  
2615 <    public void testRunAfterEither_exceptionalCompletion4() {
2615 >    /**
2616 >     * runAfterEither result completes exceptionally if either source cancelled
2617 >     */
2618 >    public void testRunAfterEither_sourceCancelled() {
2619          for (ExecutionMode m : ExecutionMode.values())
2620 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2621          for (Integer v1 : new Integer[] { 1, null })
2622      {
2623          final CompletableFuture<Integer> f = new CompletableFuture<>();
2624          final CompletableFuture<Integer> g = new CompletableFuture<>();
2625 <        final Noop r = new Noop(m);
2626 <        final CFException ex = new CFException();
2625 >        final Noop[] rs = new Noop[6];
2626 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2627 >
2628 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2629 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2630 >        checkIncomplete(h0);
2631 >        checkIncomplete(h1);
2632 >        rs[0].assertNotInvoked();
2633 >        rs[1].assertNotInvoked();
2634 >        f.cancel(mayInterruptIfRunning);
2635 >        checkCompletedWithWrappedCancellationException(h0);
2636 >        checkCompletedWithWrappedCancellationException(h1);
2637 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2638 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2639 >        checkCompletedWithWrappedCancellationException(h2);
2640 >        checkCompletedWithWrappedCancellationException(h3);
2641  
2371        f.completeExceptionally(ex);
2642          g.complete(v1);
2373        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2643  
2644 <        // unspecified behavior
2645 <        Integer v;
2644 >        // unspecified behavior - both source completions available
2645 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2646 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2647 >        try {
2648 >            assertNull(h4.join());
2649 >            rs[4].assertInvoked();
2650 >        } catch (CompletionException ok) {
2651 >            checkCompletedWithWrappedCancellationException(h4);
2652 >            rs[4].assertNotInvoked();
2653 >        }
2654          try {
2655 <            assertNull(h.join());
2656 <            assertEquals(1, r.invocationCount);
2655 >            assertNull(h5.join());
2656 >            rs[5].assertInvoked();
2657          } catch (CompletionException ok) {
2658 <            checkCompletedWithWrappedCFException(h, ex);
2659 <            assertEquals(0, r.invocationCount);
2658 >            checkCompletedWithWrappedCancellationException(h5);
2659 >            rs[5].assertNotInvoked();
2660          }
2661  
2662 <        checkCompletedWithWrappedCFException(f, ex);
2662 >        checkCancelled(f);
2663          checkCompletedNormally(g, v1);
2664 +        checkCompletedWithWrappedCancellationException(h0);
2665 +        checkCompletedWithWrappedCancellationException(h1);
2666 +        checkCompletedWithWrappedCancellationException(h2);
2667 +        checkCompletedWithWrappedCancellationException(h3);
2668 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2669      }}
2670  
2671      /**
2672       * runAfterEither result completes exceptionally if action does
2673       */
2674 <    public void testRunAfterEither_actionFailed1() {
2674 >    public void testRunAfterEither_actionFailed() {
2675          for (ExecutionMode m : ExecutionMode.values())
2676          for (Integer v1 : new Integer[] { 1, null })
2677          for (Integer v2 : new Integer[] { 2, null })
2678      {
2679          final CompletableFuture<Integer> f = new CompletableFuture<>();
2680          final CompletableFuture<Integer> g = new CompletableFuture<>();
2681 <        final FailingRunnable r = new FailingRunnable(m);
2682 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2681 >        final FailingRunnable[] rs = new FailingRunnable[6];
2682 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2683  
2684 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2685 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2686          f.complete(v1);
2687 <        checkCompletedWithWrappedCFException(h);
2687 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2688 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2689 >        checkCompletedWithWrappedCFException(h0);
2690 >        checkCompletedWithWrappedCFException(h1);
2691 >        checkCompletedWithWrappedCFException(h2);
2692 >        checkCompletedWithWrappedCFException(h3);
2693 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2694          g.complete(v2);
2695 <        checkCompletedNormally(f, v1);
2696 <        checkCompletedNormally(g, v2);
2697 <    }}
2695 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2696 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2697 >        checkCompletedWithWrappedCFException(h4);
2698 >        checkCompletedWithWrappedCFException(h5);
2699  
2409    public void testRunAfterEither_actionFailed2() {
2410        for (ExecutionMode m : ExecutionMode.values())
2411        for (Integer v1 : new Integer[] { 1, null })
2412        for (Integer v2 : new Integer[] { 2, null })
2413    {
2414        final CompletableFuture<Integer> f = new CompletableFuture<>();
2415        final CompletableFuture<Integer> g = new CompletableFuture<>();
2416        final FailingRunnable r = new FailingRunnable(m);
2417        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2418
2419        g.complete(v2);
2420        checkCompletedWithWrappedCFException(h);
2421        f.complete(v1);
2700          checkCompletedNormally(f, v1);
2701          checkCompletedNormally(g, v2);
2702 <    }}
2425 <
2426 <    /**
2427 <     * runAfterEither result completes exceptionally if either source cancelled
2428 <     */
2429 <    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() {
2470 <        for (ExecutionMode m : ExecutionMode.values())
2471 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2472 <        for (Integer v1 : new Integer[] { 1, null })
2473 <    {
2474 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2475 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2476 <        final Noop r = new Noop(m);
2477 <
2478 <        assertTrue(g.cancel(mayInterruptIfRunning));
2479 <        f.complete(v1);
2480 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2481 <
2482 <        // unspecified behavior
2483 <        Integer v;
2484 <        try {
2485 <            assertNull(h.join());
2486 <            assertEquals(1, r.invocationCount);
2487 <        } catch (CompletionException ok) {
2488 <            checkCompletedWithWrappedCancellationException(h);
2489 <            assertEquals(0, r.invocationCount);
2490 <        }
2491 <
2492 <        checkCancelled(g);
2493 <        checkCompletedNormally(f, v1);
2494 <    }}
2495 <
2496 <    public void testRunAfterEither_sourceCancelled4() {
2497 <        for (ExecutionMode m : ExecutionMode.values())
2498 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2499 <        for (Integer v1 : new Integer[] { 1, null })
2500 <    {
2501 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2502 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2503 <        final Noop r = new Noop(m);
2504 <
2505 <        assertTrue(f.cancel(mayInterruptIfRunning));
2506 <        g.complete(v1);
2507 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2508 <
2509 <        // unspecified behavior
2510 <        Integer v;
2511 <        try {
2512 <            assertNull(h.join());
2513 <            assertEquals(1, r.invocationCount);
2514 <        } catch (CompletionException ok) {
2515 <            checkCompletedWithWrappedCancellationException(h);
2516 <            assertEquals(0, r.invocationCount);
2517 <        }
2518 <
2519 <        checkCancelled(f);
2520 <        checkCompletedNormally(g, v1);
2702 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2703      }}
2704  
2705      /**
# Line 2536 | Line 2718 | public class CompletableFutureTest exten
2718  
2719          checkCompletedNormally(g, inc(v1));
2720          checkCompletedNormally(f, v1);
2721 <        assertEquals(1, r.invocationCount);
2721 >        r.assertValue(v1);
2722      }}
2723  
2724      /**
# Line 2554 | Line 2736 | public class CompletableFutureTest exten
2736          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2737          if (createIncomplete) f.completeExceptionally(ex);
2738  
2739 <        checkCompletedWithWrappedCFException(g, ex);
2740 <        checkCompletedWithWrappedCFException(f, ex);
2741 <        assertEquals(0, r.invocationCount);
2739 >        checkCompletedWithWrappedException(g, ex);
2740 >        checkCompletedExceptionally(f, ex);
2741 >        r.assertNotInvoked();
2742      }}
2743  
2744      /**
# Line 2811 | Line 2993 | public class CompletableFutureTest exten
2993          assertSame(f, f.toCompletableFuture());
2994      }
2995  
2814    /**
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);
2834
2835        checkCompletedNormally(g, v1);
2836        checkCompletedNormally(f, v1);
2837        assertEquals(1, a.get());
2838    }}
2839
2840    /**
2841     * whenComplete action executes on exceptional completion, propagating
2842     * source result.
2843     */
2844    public void testWhenComplete_exceptionalCompletion() {
2845        for (ExecutionMode m : ExecutionMode.values())
2846        for (boolean createIncomplete : new boolean[] { true, false })
2847        for (Integer v1 : new Integer[] { 1, null })
2848    {
2849        final AtomicInteger a = new AtomicInteger(0);
2850        final CFException ex = new CFException();
2851        final CompletableFuture<Integer> f = new CompletableFuture<>();
2852        if (!createIncomplete) f.completeExceptionally(ex);
2853        final CompletableFuture<Integer> g = m.whenComplete
2854            (f,
2855             (Integer x, Throwable t) -> {
2856                threadAssertNull(x);
2857                threadAssertSame(t, ex);
2858                a.getAndIncrement();
2859            });
2860        if (createIncomplete) f.completeExceptionally(ex);
2861        checkCompletedWithWrappedCFException(f, ex);
2862        checkCompletedWithWrappedCFException(g, ex);
2863        assertEquals(1, a.get());
2864    }}
2865
2866    /**
2867     * whenComplete action executes on cancelled source, propagating
2868     * CancellationException.
2869     */
2870    public void testWhenComplete_sourceCancelled() {
2871        for (ExecutionMode m : ExecutionMode.values())
2872        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2873        for (boolean createIncomplete : new boolean[] { true, false })
2874    {
2875        final AtomicInteger a = new AtomicInteger(0);
2876        final CompletableFuture<Integer> f = new CompletableFuture<>();
2877        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2878        final CompletableFuture<Integer> g = m.whenComplete
2879            (f,
2880             (Integer x, Throwable t) -> {
2881                threadAssertNull(x);
2882                threadAssertTrue(t instanceof CancellationException);
2883                a.getAndIncrement();
2884            });
2885        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2886
2887        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2888        checkCompletedWithWrappedCancellationException(g);
2889        checkCancelled(f);
2890        assertEquals(1, a.get());
2891    }}
2892
2893    /**
2894     * If a whenComplete action throws an exception when triggered by
2895     * a normal completion, it completes exceptionally
2896     */
2897    public void testWhenComplete_actionFailed() {
2898        for (boolean createIncomplete : new boolean[] { true, false })
2899        for (ExecutionMode m : ExecutionMode.values())
2900        for (Integer v1 : new Integer[] { 1, null })
2901    {
2902        final AtomicInteger a = new AtomicInteger(0);
2903        final CFException ex = new CFException();
2904        final CompletableFuture<Integer> f = new CompletableFuture<>();
2905        if (!createIncomplete) f.complete(v1);
2906        final CompletableFuture<Integer> g = m.whenComplete
2907            (f,
2908             (Integer x, Throwable t) -> {
2909                threadAssertSame(x, v1);
2910                threadAssertNull(t);
2911                a.getAndIncrement();
2912                throw ex;
2913            });
2914        if (createIncomplete) f.complete(v1);
2915        checkCompletedNormally(f, v1);
2916        checkCompletedWithWrappedCFException(g, ex);
2917        assertEquals(1, a.get());
2918    }}
2919
2920    /**
2921     * If a whenComplete action throws an exception when triggered by
2922     * a source completion that also throws an exception, the source
2923     * exception takes precedence.
2924     */
2925    public void testWhenComplete_actionFailedSourceFailed() {
2926        for (boolean createIncomplete : new boolean[] { true, false })
2927        for (ExecutionMode m : ExecutionMode.values())
2928        for (Integer v1 : new Integer[] { 1, null })
2929    {
2930        final AtomicInteger a = new AtomicInteger(0);
2931        final CFException ex1 = new CFException();
2932        final CFException ex2 = new CFException();
2933        final CompletableFuture<Integer> f = new CompletableFuture<>();
2934
2935        if (!createIncomplete) f.completeExceptionally(ex1);
2936        final CompletableFuture<Integer> g = m.whenComplete
2937            (f,
2938             (Integer x, Throwable t) -> {
2939                threadAssertSame(t, ex1);
2940                threadAssertNull(x);
2941                a.getAndIncrement();
2942                throw ex2;
2943            });
2944        if (createIncomplete) f.completeExceptionally(ex1);
2945
2946        checkCompletedWithWrappedCFException(f, ex1);
2947        checkCompletedWithWrappedCFException(g, ex1);
2948        assertEquals(1, a.get());
2949    }}
2950
2996   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines