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.63 by jsr166, Fri Jun 6 16:54:16 2014 UTC vs.
Revision 1.98 by jsr166, Wed Dec 31 19:05:42 2014 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 >
11 > import java.util.ArrayList;
12 > import java.util.List;
13 > import java.util.Objects;
14   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
15   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
16   import java.util.concurrent.CompletableFuture;
17   import java.util.concurrent.CompletionException;
18   import java.util.concurrent.CompletionStage;
19 + import java.util.concurrent.ExecutionException;
20 + import java.util.concurrent.Executor;
21   import java.util.concurrent.ForkJoinPool;
22   import java.util.concurrent.ForkJoinTask;
23   import java.util.concurrent.TimeoutException;
24   import java.util.concurrent.atomic.AtomicInteger;
24 import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 import static java.util.concurrent.TimeUnit.SECONDS;
26 import java.util.*;
27 import java.util.function.Supplier;
28 import java.util.function.Consumer;
25   import java.util.function.BiConsumer;
30 import java.util.function.Function;
26   import java.util.function.BiFunction;
27 + import java.util.function.Consumer;
28 + import java.util.function.Function;
29 + import java.util.function.Supplier;
30 +
31 + import junit.framework.Test;
32 + import junit.framework.TestSuite;
33  
34   public class CompletableFutureTest extends JSR166TestCase {
35  
# Line 57 | Line 58 | public class CompletableFutureTest exten
58      }
59  
60      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
61 <        try {
62 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
61 >        checkTimedGet(f, value);
62 >
63          try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 76 | Line 76 | public class CompletableFutureTest exten
76      }
77  
78      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
79 +        long startTime = System.nanoTime();
80 +        long timeoutMillis = LONG_DELAY_MS;
81          try {
82 <            f.get(LONG_DELAY_MS, MILLISECONDS);
82 >            f.get(timeoutMillis, MILLISECONDS);
83              shouldThrow();
84          } catch (ExecutionException success) {
85              assertTrue(success.getCause() instanceof CFException);
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
88 +
89          try {
90              f.join();
91              shouldThrow();
# Line 105 | Line 109 | public class CompletableFutureTest exten
109          assertTrue(f.toString().contains("[Completed exceptionally]"));
110      }
111  
112 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
113 <                                              CFException ex) {
112 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
113 >                                                      Throwable ex) {
114 >        long startTime = System.nanoTime();
115 >        long timeoutMillis = LONG_DELAY_MS;
116          try {
117 <            f.get(LONG_DELAY_MS, MILLISECONDS);
117 >            f.get(timeoutMillis, MILLISECONDS);
118              shouldThrow();
119          } catch (ExecutionException success) {
120              assertSame(ex, success.getCause());
121          } catch (Throwable fail) { threadUnexpectedException(fail); }
122 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
123 +
124          try {
125              f.join();
126              shouldThrow();
# Line 131 | Line 139 | public class CompletableFutureTest exten
139          } catch (ExecutionException success) {
140              assertSame(ex, success.getCause());
141          } catch (Throwable fail) { threadUnexpectedException(fail); }
142 +
143          assertTrue(f.isDone());
144          assertFalse(f.isCancelled());
145          assertTrue(f.toString().contains("[Completed exceptionally]"));
146      }
147  
148 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
149 +                                                Throwable ex) {
150 +        checkCompletedExceptionallyWithRootCause(f, ex);
151 +        try {
152 +            CompletableFuture<Throwable> spy = f.handle
153 +                ((U u, Throwable t) -> t);
154 +            assertTrue(spy.join() instanceof CompletionException);
155 +            assertSame(ex, spy.join().getCause());
156 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
157 +    }
158 +
159 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
160 +        checkCompletedExceptionallyWithRootCause(f, ex);
161 +        try {
162 +            CompletableFuture<Throwable> spy = f.handle
163 +                ((U u, Throwable t) -> t);
164 +            assertSame(ex, spy.join());
165 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
166 +    }
167 +
168      void checkCancelled(CompletableFuture<?> f) {
169 +        long startTime = System.nanoTime();
170 +        long timeoutMillis = LONG_DELAY_MS;
171          try {
172 <            f.get(LONG_DELAY_MS, MILLISECONDS);
172 >            f.get(timeoutMillis, MILLISECONDS);
173              shouldThrow();
174          } catch (CancellationException success) {
175          } catch (Throwable fail) { threadUnexpectedException(fail); }
176 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
177 +
178          try {
179              f.join();
180              shouldThrow();
# Line 162 | Line 195 | public class CompletableFutureTest exten
195      }
196  
197      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
198 +        long startTime = System.nanoTime();
199 +        long timeoutMillis = LONG_DELAY_MS;
200          try {
201 <            f.get(LONG_DELAY_MS, MILLISECONDS);
201 >            f.get(timeoutMillis, MILLISECONDS);
202              shouldThrow();
203          } catch (ExecutionException success) {
204              assertTrue(success.getCause() instanceof CancellationException);
205          } catch (Throwable fail) { threadUnexpectedException(fail); }
206 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
207 +
208          try {
209              f.join();
210              shouldThrow();
# Line 206 | Line 243 | public class CompletableFutureTest exten
243       * isCancelled, join, get, and getNow
244       */
245      public void testComplete() {
246 +        for (Integer v1 : new Integer[] { 1, null })
247 +    {
248          CompletableFuture<Integer> f = new CompletableFuture<>();
249          checkIncomplete(f);
250 <        f.complete(one);
251 <        checkCompletedNormally(f, one);
252 <    }
250 >        assertTrue(f.complete(v1));
251 >        assertFalse(f.complete(v1));
252 >        checkCompletedNormally(f, v1);
253 >    }}
254  
255      /**
256       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 258 | public class CompletableFutureTest exten
258       */
259      public void testCompleteExceptionally() {
260          CompletableFuture<Integer> f = new CompletableFuture<>();
261 +        CFException ex = new CFException();
262          checkIncomplete(f);
263 <        f.completeExceptionally(new CFException());
264 <        checkCompletedWithWrappedCFException(f);
263 >        f.completeExceptionally(ex);
264 >        checkCompletedExceptionally(f, ex);
265      }
266  
267      /**
# Line 228 | Line 269 | public class CompletableFutureTest exten
269       * methods isDone, isCancelled, join, get, and getNow
270       */
271      public void testCancel() {
272 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
273 +    {
274          CompletableFuture<Integer> f = new CompletableFuture<>();
275          checkIncomplete(f);
276          assertTrue(f.cancel(true));
277 +        assertTrue(f.cancel(true));
278          checkCancelled(f);
279 <    }
279 >    }}
280  
281      /**
282       * obtrudeValue forces completion with given value
# Line 240 | Line 284 | public class CompletableFutureTest exten
284      public void testObtrudeValue() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286          checkIncomplete(f);
287 <        f.complete(one);
287 >        assertTrue(f.complete(one));
288          checkCompletedNormally(f, one);
289          f.obtrudeValue(three);
290          checkCompletedNormally(f, three);
# Line 261 | Line 305 | public class CompletableFutureTest exten
305       * obtrudeException forces completion with given exception
306       */
307      public void testObtrudeException() {
308 <        CompletableFuture<Integer> f = new CompletableFuture<>();
309 <        checkIncomplete(f);
310 <        f.complete(one);
311 <        checkCompletedNormally(f, one);
312 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
308 >        for (Integer v1 : new Integer[] { 1, null })
309 >    {
310 >        CFException ex;
311 >        CompletableFuture<Integer> f;
312 >
313          f = new CompletableFuture<>();
314 <        f.obtrudeException(new CFException());
315 <        checkCompletedWithWrappedCFException(f);
314 >        assertTrue(f.complete(v1));
315 >        for (int i = 0; i < 2; i++) {
316 >            f.obtrudeException(ex = new CFException());
317 >            checkCompletedExceptionally(f, ex);
318 >        }
319 >
320          f = new CompletableFuture<>();
321 +        for (int i = 0; i < 2; i++) {
322 +            f.obtrudeException(ex = new CFException());
323 +            checkCompletedExceptionally(f, ex);
324 +        }
325 +
326 +        f = new CompletableFuture<>();
327 +        f.completeExceptionally(ex = new CFException());
328 +        f.obtrudeValue(v1);
329 +        checkCompletedNormally(f, v1);
330 +        f.obtrudeException(ex = new CFException());
331 +        checkCompletedExceptionally(f, ex);
332          f.completeExceptionally(new CFException());
333 <        f.obtrudeValue(four);
334 <        checkCompletedNormally(f, four);
335 <        f.obtrudeException(new CFException());
336 <        checkCompletedWithWrappedCFException(f);
279 <    }
333 >        checkCompletedExceptionally(f, ex);
334 >        assertFalse(f.complete(v1));
335 >        checkCompletedExceptionally(f, ex);
336 >    }}
337  
338      /**
339       * getNumberOfDependents returns number of dependent tasks
340       */
341      public void testGetNumberOfDependents() {
342 +        for (ExecutionMode m : ExecutionMode.values())
343 +        for (Integer v1 : new Integer[] { 1, null })
344 +    {
345          CompletableFuture<Integer> f = new CompletableFuture<>();
346          assertEquals(0, f.getNumberOfDependents());
347 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
347 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
348          assertEquals(1, f.getNumberOfDependents());
349          assertEquals(0, g.getNumberOfDependents());
350 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
350 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
351          assertEquals(2, f.getNumberOfDependents());
352 <        f.complete(1);
352 >        assertEquals(0, h.getNumberOfDependents());
353 >        assertTrue(f.complete(v1));
354          checkCompletedNormally(g, null);
355 +        checkCompletedNormally(h, null);
356          assertEquals(0, f.getNumberOfDependents());
357          assertEquals(0, g.getNumberOfDependents());
358 <    }
358 >        assertEquals(0, h.getNumberOfDependents());
359 >    }}
360  
361      /**
362       * toString indicates current completion state
# Line 304 | Line 367 | public class CompletableFutureTest exten
367          f = new CompletableFuture<String>();
368          assertTrue(f.toString().contains("[Not completed]"));
369  
370 <        f.complete("foo");
370 >        assertTrue(f.complete("foo"));
371          assertTrue(f.toString().contains("[Completed normally]"));
372  
373          f = new CompletableFuture<String>();
374 <        f.completeExceptionally(new IndexOutOfBoundsException());
374 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
375          assertTrue(f.toString().contains("[Completed exceptionally]"));
376 +
377 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
378 +            f = new CompletableFuture<String>();
379 +            assertTrue(f.cancel(mayInterruptIfRunning));
380 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
381 +        }
382      }
383  
384      /**
# Line 360 | Line 429 | public class CompletableFutureTest exten
429          return (x == null) ? null : x + 1;
430      }
431  
432 <    class IncAction extends CheckedIntegerAction
432 >    class NoopConsumer extends CheckedIntegerAction
433          implements Consumer<Integer>
434      {
435 <        IncAction(ExecutionMode m) { super(m); }
435 >        NoopConsumer(ExecutionMode m) { super(m); }
436          public void accept(Integer x) {
437              invoked();
438 <            value = inc(x);
438 >            value = x;
439          }
440      }
441  
# Line 486 | Line 555 | public class CompletableFutureTest exten
555              invoked();
556              value = x;
557              CompletableFuture<Integer> f = new CompletableFuture<>();
558 <            f.complete(inc(x));
558 >            assertTrue(f.complete(inc(x)));
559              return f;
560          }
561      }
# Line 516 | Line 585 | public class CompletableFutureTest exten
585          }
586      }
587  
588 +    static final boolean defaultExecutorIsCommonPool
589 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
590 +
591      /**
592       * Permits the testing of parallel code for the 3 different
593       * execution modes without copy/pasting all the test methods.
594       */
595      enum ExecutionMode {
596 <        DEFAULT {
596 >        SYNC {
597              public void checkExecutionMode() {
598                  assertFalse(ThreadExecutor.startedCurrentThread());
599                  assertNull(ForkJoinTask.getPool());
# Line 597 | Line 669 | public class CompletableFutureTest exten
669  
670          ASYNC {
671              public void checkExecutionMode() {
672 <                assertSame(ForkJoinPool.commonPool(),
673 <                           ForkJoinTask.getPool());
672 >                assertEquals(defaultExecutorIsCommonPool,
673 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
674              }
675              public CompletableFuture<Void> runAsync(Runnable a) {
676                  return CompletableFuture.runAsync(a);
# Line 794 | Line 866 | public class CompletableFutureTest exten
866      {
867          final AtomicInteger a = new AtomicInteger(0);
868          final CompletableFuture<Integer> f = new CompletableFuture<>();
869 <        if (!createIncomplete) f.complete(v1);
869 >        if (!createIncomplete) assertTrue(f.complete(v1));
870          final CompletableFuture<Integer> g = f.exceptionally
871              ((Throwable t) -> {
872                  // Should not be called
873                  a.getAndIncrement();
874                  throw new AssertionError();
875              });
876 <        if (createIncomplete) f.complete(v1);
876 >        if (createIncomplete) assertTrue(f.complete(v1));
877  
878          checkCompletedNormally(g, v1);
879          checkCompletedNormally(f, v1);
880          assertEquals(0, a.get());
881      }}
882  
811
883      /**
884       * exceptionally action completes with function value on source
885       * exception
# Line 823 | Line 894 | public class CompletableFutureTest exten
894          if (!createIncomplete) f.completeExceptionally(ex);
895          final CompletableFuture<Integer> g = f.exceptionally
896              ((Throwable t) -> {
897 <                ExecutionMode.DEFAULT.checkExecutionMode();
897 >                ExecutionMode.SYNC.checkExecutionMode();
898                  threadAssertSame(t, ex);
899                  a.getAndIncrement();
900                  return v1;
# Line 845 | Line 916 | public class CompletableFutureTest exten
916          if (!createIncomplete) f.completeExceptionally(ex1);
917          final CompletableFuture<Integer> g = f.exceptionally
918              ((Throwable t) -> {
919 <                ExecutionMode.DEFAULT.checkExecutionMode();
919 >                ExecutionMode.SYNC.checkExecutionMode();
920 >                threadAssertSame(t, ex1);
921 >                a.getAndIncrement();
922 >                throw ex2;
923 >            });
924 >        if (createIncomplete) f.completeExceptionally(ex1);
925 >
926 >        checkCompletedWithWrappedException(g, ex2);
927 >        assertEquals(1, a.get());
928 >    }}
929 >
930 >    /**
931 >     * whenComplete action executes on normal completion, propagating
932 >     * source result.
933 >     */
934 >    public void testWhenComplete_normalCompletion1() {
935 >        for (ExecutionMode m : ExecutionMode.values())
936 >        for (boolean createIncomplete : new boolean[] { true, false })
937 >        for (Integer v1 : new Integer[] { 1, null })
938 >    {
939 >        final AtomicInteger a = new AtomicInteger(0);
940 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
941 >        if (!createIncomplete) assertTrue(f.complete(v1));
942 >        final CompletableFuture<Integer> g = m.whenComplete
943 >            (f,
944 >             (Integer x, Throwable t) -> {
945 >                m.checkExecutionMode();
946 >                threadAssertSame(x, v1);
947 >                threadAssertNull(t);
948 >                a.getAndIncrement();
949 >            });
950 >        if (createIncomplete) assertTrue(f.complete(v1));
951 >
952 >        checkCompletedNormally(g, v1);
953 >        checkCompletedNormally(f, v1);
954 >        assertEquals(1, a.get());
955 >    }}
956 >
957 >    /**
958 >     * whenComplete action executes on exceptional completion, propagating
959 >     * source result.
960 >     */
961 >    public void testWhenComplete_exceptionalCompletion() {
962 >        for (ExecutionMode m : ExecutionMode.values())
963 >        for (boolean createIncomplete : new boolean[] { true, false })
964 >        for (Integer v1 : new Integer[] { 1, null })
965 >    {
966 >        final AtomicInteger a = new AtomicInteger(0);
967 >        final CFException ex = new CFException();
968 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
969 >        if (!createIncomplete) f.completeExceptionally(ex);
970 >        final CompletableFuture<Integer> g = m.whenComplete
971 >            (f,
972 >             (Integer x, Throwable t) -> {
973 >                m.checkExecutionMode();
974 >                threadAssertNull(x);
975 >                threadAssertSame(t, ex);
976 >                a.getAndIncrement();
977 >            });
978 >        if (createIncomplete) f.completeExceptionally(ex);
979 >
980 >        checkCompletedWithWrappedException(g, ex);
981 >        checkCompletedExceptionally(f, ex);
982 >        assertEquals(1, a.get());
983 >    }}
984 >
985 >    /**
986 >     * whenComplete action executes on cancelled source, propagating
987 >     * CancellationException.
988 >     */
989 >    public void testWhenComplete_sourceCancelled() {
990 >        for (ExecutionMode m : ExecutionMode.values())
991 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
992 >        for (boolean createIncomplete : new boolean[] { true, false })
993 >    {
994 >        final AtomicInteger a = new AtomicInteger(0);
995 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
996 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
997 >        final CompletableFuture<Integer> g = m.whenComplete
998 >            (f,
999 >             (Integer x, Throwable t) -> {
1000 >                m.checkExecutionMode();
1001 >                threadAssertNull(x);
1002 >                threadAssertTrue(t instanceof CancellationException);
1003 >                a.getAndIncrement();
1004 >            });
1005 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1006 >
1007 >        checkCompletedWithWrappedCancellationException(g);
1008 >        checkCancelled(f);
1009 >        assertEquals(1, a.get());
1010 >    }}
1011 >
1012 >    /**
1013 >     * If a whenComplete action throws an exception when triggered by
1014 >     * a normal completion, it completes exceptionally
1015 >     */
1016 >    public void testWhenComplete_actionFailed() {
1017 >        for (boolean createIncomplete : new boolean[] { true, false })
1018 >        for (ExecutionMode m : ExecutionMode.values())
1019 >        for (Integer v1 : new Integer[] { 1, null })
1020 >    {
1021 >        final AtomicInteger a = new AtomicInteger(0);
1022 >        final CFException ex = new CFException();
1023 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1024 >        if (!createIncomplete) assertTrue(f.complete(v1));
1025 >        final CompletableFuture<Integer> g = m.whenComplete
1026 >            (f,
1027 >             (Integer x, Throwable t) -> {
1028 >                m.checkExecutionMode();
1029 >                threadAssertSame(x, v1);
1030 >                threadAssertNull(t);
1031 >                a.getAndIncrement();
1032 >                throw ex;
1033 >            });
1034 >        if (createIncomplete) assertTrue(f.complete(v1));
1035 >
1036 >        checkCompletedWithWrappedException(g, ex);
1037 >        checkCompletedNormally(f, v1);
1038 >        assertEquals(1, a.get());
1039 >    }}
1040 >
1041 >    /**
1042 >     * If a whenComplete action throws an exception when triggered by
1043 >     * a source completion that also throws an exception, the source
1044 >     * exception takes precedence.
1045 >     */
1046 >    public void testWhenComplete_actionFailedSourceFailed() {
1047 >        for (boolean createIncomplete : new boolean[] { true, false })
1048 >        for (ExecutionMode m : ExecutionMode.values())
1049 >        for (Integer v1 : new Integer[] { 1, null })
1050 >    {
1051 >        final AtomicInteger a = new AtomicInteger(0);
1052 >        final CFException ex1 = new CFException();
1053 >        final CFException ex2 = new CFException();
1054 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1055 >
1056 >        if (!createIncomplete) f.completeExceptionally(ex1);
1057 >        final CompletableFuture<Integer> g = m.whenComplete
1058 >            (f,
1059 >             (Integer x, Throwable t) -> {
1060 >                m.checkExecutionMode();
1061                  threadAssertSame(t, ex1);
1062 +                threadAssertNull(x);
1063                  a.getAndIncrement();
1064                  throw ex2;
1065              });
1066          if (createIncomplete) f.completeExceptionally(ex1);
1067  
1068 <        checkCompletedWithWrappedCFException(g, ex2);
1068 >        checkCompletedWithWrappedException(g, ex1);
1069 >        checkCompletedExceptionally(f, ex1);
1070          assertEquals(1, a.get());
1071      }}
1072  
# Line 867 | Line 1081 | public class CompletableFutureTest exten
1081      {
1082          final CompletableFuture<Integer> f = new CompletableFuture<>();
1083          final AtomicInteger a = new AtomicInteger(0);
1084 <        if (!createIncomplete) f.complete(v1);
1084 >        if (!createIncomplete) assertTrue(f.complete(v1));
1085          final CompletableFuture<Integer> g = m.handle
1086              (f,
1087               (Integer x, Throwable t) -> {
# Line 877 | Line 1091 | public class CompletableFutureTest exten
1091                  a.getAndIncrement();
1092                  return inc(v1);
1093              });
1094 <        if (createIncomplete) f.complete(v1);
1094 >        if (createIncomplete) assertTrue(f.complete(v1));
1095  
1096          checkCompletedNormally(g, inc(v1));
1097          checkCompletedNormally(f, v1);
# Line 909 | Line 1123 | public class CompletableFutureTest exten
1123          if (createIncomplete) f.completeExceptionally(ex);
1124  
1125          checkCompletedNormally(g, v1);
1126 <        checkCompletedWithWrappedCFException(f, ex);
1126 >        checkCompletedExceptionally(f, ex);
1127          assertEquals(1, a.get());
1128      }}
1129  
# Line 965 | Line 1179 | public class CompletableFutureTest exten
1179              });
1180          if (createIncomplete) f.completeExceptionally(ex1);
1181  
1182 <        checkCompletedWithWrappedCFException(g, ex2);
1183 <        checkCompletedWithWrappedCFException(f, ex1);
1182 >        checkCompletedWithWrappedException(g, ex2);
1183 >        checkCompletedExceptionally(f, ex1);
1184          assertEquals(1, a.get());
1185      }}
1186  
# Line 978 | Line 1192 | public class CompletableFutureTest exten
1192          final CompletableFuture<Integer> f = new CompletableFuture<>();
1193          final AtomicInteger a = new AtomicInteger(0);
1194          final CFException ex = new CFException();
1195 <        if (!createIncomplete) f.complete(v1);
1195 >        if (!createIncomplete) assertTrue(f.complete(v1));
1196          final CompletableFuture<Integer> g = m.handle
1197              (f,
1198               (Integer x, Throwable t) -> {
# Line 988 | Line 1202 | public class CompletableFutureTest exten
1202                  a.getAndIncrement();
1203                  throw ex;
1204              });
1205 <        if (createIncomplete) f.complete(v1);
1205 >        if (createIncomplete) assertTrue(f.complete(v1));
1206  
1207 <        checkCompletedWithWrappedCFException(g, ex);
1207 >        checkCompletedWithWrappedException(g, ex);
1208          checkCompletedNormally(f, v1);
1209          assertEquals(1, a.get());
1210      }}
# Line 1069 | Line 1283 | public class CompletableFutureTest exten
1283       */
1284      public void testThenRun_normalCompletion() {
1285          for (ExecutionMode m : ExecutionMode.values())
1072        for (boolean createIncomplete : new boolean[] { true, false })
1286          for (Integer v1 : new Integer[] { 1, null })
1287      {
1288          final CompletableFuture<Integer> f = new CompletableFuture<>();
1289 <        final Noop r = new Noop(m);
1290 <        if (!createIncomplete) f.complete(v1);
1078 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1079 <        if (createIncomplete) {
1080 <            checkIncomplete(g);
1081 <            f.complete(v1);
1082 <        }
1289 >        final Noop[] rs = new Noop[6];
1290 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1291  
1292 <        checkCompletedNormally(g, null);
1292 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1293 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1294 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1295 >        checkIncomplete(h0);
1296 >        checkIncomplete(h1);
1297 >        checkIncomplete(h2);
1298 >        assertTrue(f.complete(v1));
1299 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1300 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1301 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1302 >
1303 >        checkCompletedNormally(h0, null);
1304 >        checkCompletedNormally(h1, null);
1305 >        checkCompletedNormally(h2, null);
1306 >        checkCompletedNormally(h3, null);
1307 >        checkCompletedNormally(h4, null);
1308 >        checkCompletedNormally(h5, null);
1309          checkCompletedNormally(f, v1);
1310 <        r.assertInvoked();
1310 >        for (Noop r : rs) r.assertInvoked();
1311      }}
1312  
1313      /**
# Line 1092 | Line 1316 | public class CompletableFutureTest exten
1316       */
1317      public void testThenRun_exceptionalCompletion() {
1318          for (ExecutionMode m : ExecutionMode.values())
1095        for (boolean createIncomplete : new boolean[] { true, false })
1319      {
1320          final CFException ex = new CFException();
1321          final CompletableFuture<Integer> f = new CompletableFuture<>();
1322 <        final Noop r = new Noop(m);
1323 <        if (!createIncomplete) f.completeExceptionally(ex);
1101 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1102 <        if (createIncomplete) {
1103 <            checkIncomplete(g);
1104 <            f.completeExceptionally(ex);
1105 <        }
1322 >        final Noop[] rs = new Noop[6];
1323 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1324  
1325 <        checkCompletedWithWrappedCFException(g, ex);
1326 <        checkCompletedWithWrappedCFException(f, ex);
1327 <        r.assertNotInvoked();
1325 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1326 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1327 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1328 >        checkIncomplete(h0);
1329 >        checkIncomplete(h1);
1330 >        checkIncomplete(h2);
1331 >        assertTrue(f.completeExceptionally(ex));
1332 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1333 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1334 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1335 >
1336 >        checkCompletedWithWrappedException(h0, ex);
1337 >        checkCompletedWithWrappedException(h1, ex);
1338 >        checkCompletedWithWrappedException(h2, ex);
1339 >        checkCompletedWithWrappedException(h3, ex);
1340 >        checkCompletedWithWrappedException(h4, ex);
1341 >        checkCompletedWithWrappedException(h5, ex);
1342 >        checkCompletedExceptionally(f, ex);
1343 >        for (Noop r : rs) r.assertNotInvoked();
1344      }}
1345  
1346      /**
# Line 1114 | Line 1348 | public class CompletableFutureTest exten
1348       */
1349      public void testThenRun_sourceCancelled() {
1350          for (ExecutionMode m : ExecutionMode.values())
1117        for (boolean createIncomplete : new boolean[] { true, false })
1351          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1352      {
1353          final CompletableFuture<Integer> f = new CompletableFuture<>();
1354 <        final Noop r = new Noop(m);
1355 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 <        if (createIncomplete) {
1125 <            checkIncomplete(g);
1126 <            assertTrue(f.cancel(mayInterruptIfRunning));
1127 <        }
1354 >        final Noop[] rs = new Noop[6];
1355 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1356  
1357 <        checkCompletedWithWrappedCancellationException(g);
1357 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1358 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1359 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1360 >        checkIncomplete(h0);
1361 >        checkIncomplete(h1);
1362 >        checkIncomplete(h2);
1363 >        assertTrue(f.cancel(mayInterruptIfRunning));
1364 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1365 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1366 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1367 >
1368 >        checkCompletedWithWrappedCancellationException(h0);
1369 >        checkCompletedWithWrappedCancellationException(h1);
1370 >        checkCompletedWithWrappedCancellationException(h2);
1371 >        checkCompletedWithWrappedCancellationException(h3);
1372 >        checkCompletedWithWrappedCancellationException(h4);
1373 >        checkCompletedWithWrappedCancellationException(h5);
1374          checkCancelled(f);
1375 <        r.assertNotInvoked();
1375 >        for (Noop r : rs) r.assertNotInvoked();
1376      }}
1377  
1378      /**
# Line 1136 | Line 1380 | public class CompletableFutureTest exten
1380       */
1381      public void testThenRun_actionFailed() {
1382          for (ExecutionMode m : ExecutionMode.values())
1139        for (boolean createIncomplete : new boolean[] { true, false })
1383          for (Integer v1 : new Integer[] { 1, null })
1384      {
1385          final CompletableFuture<Integer> f = new CompletableFuture<>();
1386 <        final FailingRunnable r = new FailingRunnable(m);
1387 <        if (!createIncomplete) f.complete(v1);
1145 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 <        if (createIncomplete) {
1147 <            checkIncomplete(g);
1148 <            f.complete(v1);
1149 <        }
1386 >        final FailingRunnable[] rs = new FailingRunnable[6];
1387 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1388  
1389 <        checkCompletedWithWrappedCFException(g);
1389 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1390 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1391 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1392 >        assertTrue(f.complete(v1));
1393 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1394 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1395 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1396 >
1397 >        checkCompletedWithWrappedCFException(h0);
1398 >        checkCompletedWithWrappedCFException(h1);
1399 >        checkCompletedWithWrappedCFException(h2);
1400 >        checkCompletedWithWrappedCFException(h3);
1401 >        checkCompletedWithWrappedCFException(h4);
1402 >        checkCompletedWithWrappedCFException(h5);
1403          checkCompletedNormally(f, v1);
1404      }}
1405  
# Line 1157 | Line 1408 | public class CompletableFutureTest exten
1408       */
1409      public void testThenApply_normalCompletion() {
1410          for (ExecutionMode m : ExecutionMode.values())
1160        for (boolean createIncomplete : new boolean[] { true, false })
1411          for (Integer v1 : new Integer[] { 1, null })
1412      {
1413          final CompletableFuture<Integer> f = new CompletableFuture<>();
1414 <        final IncFunction r = new IncFunction(m);
1415 <        if (!createIncomplete) f.complete(v1);
1166 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1167 <        if (createIncomplete) {
1168 <            checkIncomplete(g);
1169 <            f.complete(v1);
1170 <        }
1414 >        final IncFunction[] rs = new IncFunction[4];
1415 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1416  
1417 <        checkCompletedNormally(g, inc(v1));
1417 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1418 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1419 >        checkIncomplete(h0);
1420 >        checkIncomplete(h1);
1421 >        assertTrue(f.complete(v1));
1422 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1423 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1424 >
1425 >        checkCompletedNormally(h0, inc(v1));
1426 >        checkCompletedNormally(h1, inc(v1));
1427 >        checkCompletedNormally(h2, inc(v1));
1428 >        checkCompletedNormally(h3, inc(v1));
1429          checkCompletedNormally(f, v1);
1430 <        r.assertInvoked();
1430 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1431      }}
1432  
1433      /**
# Line 1180 | Line 1436 | public class CompletableFutureTest exten
1436       */
1437      public void testThenApply_exceptionalCompletion() {
1438          for (ExecutionMode m : ExecutionMode.values())
1183        for (boolean createIncomplete : new boolean[] { true, false })
1439      {
1440          final CFException ex = new CFException();
1441          final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 <        final IncFunction r = new IncFunction(m);
1443 <        if (!createIncomplete) f.completeExceptionally(ex);
1189 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 <        if (createIncomplete) {
1191 <            checkIncomplete(g);
1192 <            f.completeExceptionally(ex);
1193 <        }
1442 >        final IncFunction[] rs = new IncFunction[4];
1443 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1444  
1445 <        checkCompletedWithWrappedCFException(g, ex);
1446 <        checkCompletedWithWrappedCFException(f, ex);
1447 <        r.assertNotInvoked();
1445 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1446 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1447 >        assertTrue(f.completeExceptionally(ex));
1448 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1449 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1450 >
1451 >        checkCompletedWithWrappedException(h0, ex);
1452 >        checkCompletedWithWrappedException(h1, ex);
1453 >        checkCompletedWithWrappedException(h2, ex);
1454 >        checkCompletedWithWrappedException(h3, ex);
1455 >        checkCompletedExceptionally(f, ex);
1456 >        for (IncFunction r : rs) r.assertNotInvoked();
1457      }}
1458  
1459      /**
# Line 1202 | Line 1461 | public class CompletableFutureTest exten
1461       */
1462      public void testThenApply_sourceCancelled() {
1463          for (ExecutionMode m : ExecutionMode.values())
1205        for (boolean createIncomplete : new boolean[] { true, false })
1464          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1465      {
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 <        final IncFunction r = new IncFunction(m);
1468 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 <        if (createIncomplete) {
1213 <            checkIncomplete(g);
1214 <            assertTrue(f.cancel(mayInterruptIfRunning));
1215 <        }
1467 >        final IncFunction[] rs = new IncFunction[4];
1468 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1469  
1470 <        checkCompletedWithWrappedCancellationException(g);
1470 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1471 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1472 >        assertTrue(f.cancel(mayInterruptIfRunning));
1473 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1474 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1475 >
1476 >        checkCompletedWithWrappedCancellationException(h0);
1477 >        checkCompletedWithWrappedCancellationException(h1);
1478 >        checkCompletedWithWrappedCancellationException(h2);
1479 >        checkCompletedWithWrappedCancellationException(h3);
1480          checkCancelled(f);
1481 <        r.assertNotInvoked();
1481 >        for (IncFunction r : rs) r.assertNotInvoked();
1482      }}
1483  
1484      /**
# Line 1224 | Line 1486 | public class CompletableFutureTest exten
1486       */
1487      public void testThenApply_actionFailed() {
1488          for (ExecutionMode m : ExecutionMode.values())
1227        for (boolean createIncomplete : new boolean[] { true, false })
1489          for (Integer v1 : new Integer[] { 1, null })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final FailingFunction r = new FailingFunction(m);
1493 <        if (!createIncomplete) f.complete(v1);
1233 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 <        if (createIncomplete) {
1235 <            checkIncomplete(g);
1236 <            f.complete(v1);
1237 <        }
1492 >        final FailingFunction[] rs = new FailingFunction[4];
1493 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1494  
1495 <        checkCompletedWithWrappedCFException(g);
1495 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1496 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1497 >        assertTrue(f.complete(v1));
1498 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1499 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1500 >
1501 >        checkCompletedWithWrappedCFException(h0);
1502 >        checkCompletedWithWrappedCFException(h1);
1503 >        checkCompletedWithWrappedCFException(h2);
1504 >        checkCompletedWithWrappedCFException(h3);
1505          checkCompletedNormally(f, v1);
1506      }}
1507  
# Line 1245 | Line 1510 | public class CompletableFutureTest exten
1510       */
1511      public void testThenAccept_normalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1248        for (boolean createIncomplete : new boolean[] { true, false })
1513          for (Integer v1 : new Integer[] { 1, null })
1514      {
1515          final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final IncAction r = new IncAction(m);
1517 <        if (!createIncomplete) f.complete(v1);
1254 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 <        if (createIncomplete) {
1256 <            checkIncomplete(g);
1257 <            f.complete(v1);
1258 <        }
1516 >        final NoopConsumer[] rs = new NoopConsumer[4];
1517 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1518  
1519 <        checkCompletedNormally(g, null);
1519 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1520 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1521 >        checkIncomplete(h0);
1522 >        checkIncomplete(h1);
1523 >        assertTrue(f.complete(v1));
1524 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1525 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1526 >
1527 >        checkCompletedNormally(h0, null);
1528 >        checkCompletedNormally(h1, null);
1529 >        checkCompletedNormally(h2, null);
1530 >        checkCompletedNormally(h3, null);
1531          checkCompletedNormally(f, v1);
1532 <        r.assertInvoked();
1263 <        r.assertValue(inc(v1));
1532 >        for (NoopConsumer r : rs) r.assertValue(v1);
1533      }}
1534  
1535      /**
# Line 1269 | Line 1538 | public class CompletableFutureTest exten
1538       */
1539      public void testThenAccept_exceptionalCompletion() {
1540          for (ExecutionMode m : ExecutionMode.values())
1272        for (boolean createIncomplete : new boolean[] { true, false })
1541      {
1542          final CFException ex = new CFException();
1543          final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 <        final IncAction r = new IncAction(m);
1545 <        if (!createIncomplete) f.completeExceptionally(ex);
1278 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1279 <        if (createIncomplete) {
1280 <            checkIncomplete(g);
1281 <            f.completeExceptionally(ex);
1282 <        }
1544 >        final NoopConsumer[] rs = new NoopConsumer[4];
1545 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1546  
1547 <        checkCompletedWithWrappedCFException(g, ex);
1548 <        checkCompletedWithWrappedCFException(f, ex);
1549 <        r.assertNotInvoked();
1547 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1548 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1549 >        assertTrue(f.completeExceptionally(ex));
1550 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1551 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1552 >
1553 >        checkCompletedWithWrappedException(h0, ex);
1554 >        checkCompletedWithWrappedException(h1, ex);
1555 >        checkCompletedWithWrappedException(h2, ex);
1556 >        checkCompletedWithWrappedException(h3, ex);
1557 >        checkCompletedExceptionally(f, ex);
1558 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1559      }}
1560  
1561      /**
# Line 1291 | Line 1563 | public class CompletableFutureTest exten
1563       */
1564      public void testThenAccept_sourceCancelled() {
1565          for (ExecutionMode m : ExecutionMode.values())
1294        for (boolean createIncomplete : new boolean[] { true, false })
1566          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1567      {
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final IncAction r = new IncAction(m);
1570 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1300 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1301 <        if (createIncomplete) {
1302 <            checkIncomplete(g);
1303 <            assertTrue(f.cancel(mayInterruptIfRunning));
1304 <        }
1569 >        final NoopConsumer[] rs = new NoopConsumer[4];
1570 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1571  
1572 <        checkCompletedWithWrappedCancellationException(g);
1572 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1573 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1574 >        assertTrue(f.cancel(mayInterruptIfRunning));
1575 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1576 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1577 >
1578 >        checkCompletedWithWrappedCancellationException(h0);
1579 >        checkCompletedWithWrappedCancellationException(h1);
1580 >        checkCompletedWithWrappedCancellationException(h2);
1581 >        checkCompletedWithWrappedCancellationException(h3);
1582          checkCancelled(f);
1583 <        r.assertNotInvoked();
1583 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1584      }}
1585  
1586      /**
# Line 1313 | Line 1588 | public class CompletableFutureTest exten
1588       */
1589      public void testThenAccept_actionFailed() {
1590          for (ExecutionMode m : ExecutionMode.values())
1316        for (boolean createIncomplete : new boolean[] { true, false })
1591          for (Integer v1 : new Integer[] { 1, null })
1592      {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final FailingConsumer r = new FailingConsumer(m);
1595 <        if (!createIncomplete) f.complete(v1);
1322 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1323 <        if (createIncomplete) {
1324 <            checkIncomplete(g);
1325 <            f.complete(v1);
1326 <        }
1594 >        final FailingConsumer[] rs = new FailingConsumer[4];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1596  
1597 <        checkCompletedWithWrappedCFException(g);
1597 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1598 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1599 >        assertTrue(f.complete(v1));
1600 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1601 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1602 >
1603 >        checkCompletedWithWrappedCFException(h0);
1604 >        checkCompletedWithWrappedCFException(h1);
1605 >        checkCompletedWithWrappedCFException(h2);
1606 >        checkCompletedWithWrappedCFException(h3);
1607          checkCompletedNormally(f, v1);
1608      }}
1609  
# Line 1335 | Line 1613 | public class CompletableFutureTest exten
1613       */
1614      public void testThenCombine_normalCompletion() {
1615          for (ExecutionMode m : ExecutionMode.values())
1338        for (boolean createIncomplete : new boolean[] { true, false })
1616          for (boolean fFirst : new boolean[] { true, false })
1617          for (Integer v1 : new Integer[] { 1, null })
1618          for (Integer v2 : new Integer[] { 2, null })
1619      {
1620          final CompletableFuture<Integer> f = new CompletableFuture<>();
1621          final CompletableFuture<Integer> g = new CompletableFuture<>();
1622 <        final SubtractFunction r = new SubtractFunction(m);
1622 >        final SubtractFunction[] rs = new SubtractFunction[6];
1623 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1624  
1625 <        if (fFirst) f.complete(v1); else g.complete(v2);
1626 <        if (!createIncomplete)
1627 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1628 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1629 <        if (createIncomplete) {
1630 <            checkIncomplete(h);
1631 <            r.assertNotInvoked();
1632 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1633 <        }
1625 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1626 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1627 >        final Integer w1 =  fFirst ? v1 : v2;
1628 >        final Integer w2 = !fFirst ? v1 : v2;
1629 >
1630 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1631 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1632 >        assertTrue(fst.complete(w1));
1633 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1634 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1635 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1636 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1637 >        checkCompletedNormally(h1, subtract(w1, w1));
1638 >        checkCompletedNormally(h3, subtract(w1, w1));
1639 >        rs[1].assertValue(subtract(w1, w1));
1640 >        rs[3].assertValue(subtract(w1, w1));
1641 >        assertTrue(snd.complete(w2));
1642 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1643 >
1644 >        checkCompletedNormally(h0, subtract(v1, v2));
1645 >        checkCompletedNormally(h2, subtract(v1, v2));
1646 >        checkCompletedNormally(h4, subtract(v1, v2));
1647 >        rs[0].assertValue(subtract(v1, v2));
1648 >        rs[2].assertValue(subtract(v1, v2));
1649 >        rs[4].assertValue(subtract(v1, v2));
1650  
1357        checkCompletedNormally(h, subtract(v1, v2));
1651          checkCompletedNormally(f, v1);
1652          checkCompletedNormally(g, v2);
1360        r.assertInvoked();
1653      }}
1654  
1655      /**
1656       * thenCombine result completes exceptionally after exceptional
1657       * completion of either source
1658       */
1659 <    public void testThenCombine_exceptionalCompletion() {
1659 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1660          for (ExecutionMode m : ExecutionMode.values())
1369        for (boolean createIncomplete : new boolean[] { true, false })
1661          for (boolean fFirst : new boolean[] { true, false })
1662 +        for (boolean failFirst : new boolean[] { true, false })
1663          for (Integer v1 : new Integer[] { 1, null })
1664      {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667          final CFException ex = new CFException();
1668 <        final SubtractFunction r = new SubtractFunction(m);
1669 <
1670 <        (fFirst ? f : g).complete(v1);
1671 <        if (!createIncomplete)
1672 <            (!fFirst ? f : g).completeExceptionally(ex);
1673 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1674 <        if (createIncomplete) {
1675 <            checkIncomplete(h);
1676 <            (!fFirst ? f : g).completeExceptionally(ex);
1677 <        }
1678 <
1679 <        checkCompletedWithWrappedCFException(h, ex);
1680 <        r.assertNotInvoked();
1681 <        checkCompletedNormally(fFirst ? f : g, v1);
1682 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1668 >        final SubtractFunction r1 = new SubtractFunction(m);
1669 >        final SubtractFunction r2 = new SubtractFunction(m);
1670 >        final SubtractFunction r3 = new SubtractFunction(m);
1671 >
1672 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1673 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1674 >        final Callable<Boolean> complete1 = failFirst ?
1675 >            () -> fst.completeExceptionally(ex) :
1676 >            () -> fst.complete(v1);
1677 >        final Callable<Boolean> complete2 = failFirst ?
1678 >            () -> snd.complete(v1) :
1679 >            () -> snd.completeExceptionally(ex);
1680 >
1681 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1682 >        assertTrue(complete1.call());
1683 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1684 >        checkIncomplete(h1);
1685 >        checkIncomplete(h2);
1686 >        assertTrue(complete2.call());
1687 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1688 >
1689 >        checkCompletedWithWrappedException(h1, ex);
1690 >        checkCompletedWithWrappedException(h2, ex);
1691 >        checkCompletedWithWrappedException(h3, ex);
1692 >        r1.assertNotInvoked();
1693 >        r2.assertNotInvoked();
1694 >        r3.assertNotInvoked();
1695 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1696 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1697      }}
1698  
1699      /**
1700       * thenCombine result completes exceptionally if either source cancelled
1701       */
1702 <    public void testThenCombine_sourceCancelled() {
1702 >    public void testThenCombine_sourceCancelled() throws Throwable {
1703          for (ExecutionMode m : ExecutionMode.values())
1704          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399        for (boolean createIncomplete : new boolean[] { true, false })
1705          for (boolean fFirst : new boolean[] { true, false })
1706 +        for (boolean failFirst : new boolean[] { true, false })
1707          for (Integer v1 : new Integer[] { 1, null })
1708      {
1709          final CompletableFuture<Integer> f = new CompletableFuture<>();
1710          final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 <        final SubtractFunction r = new SubtractFunction(m);
1711 >        final SubtractFunction r1 = new SubtractFunction(m);
1712 >        final SubtractFunction r2 = new SubtractFunction(m);
1713 >        final SubtractFunction r3 = new SubtractFunction(m);
1714  
1715 <        (fFirst ? f : g).complete(v1);
1716 <        if (!createIncomplete)
1717 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1718 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1719 <        if (createIncomplete) {
1720 <            checkIncomplete(h);
1721 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1722 <        }
1715 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1716 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1717 >        final Callable<Boolean> complete1 = failFirst ?
1718 >            () -> fst.cancel(mayInterruptIfRunning) :
1719 >            () -> fst.complete(v1);
1720 >        final Callable<Boolean> complete2 = failFirst ?
1721 >            () -> snd.complete(v1) :
1722 >            () -> snd.cancel(mayInterruptIfRunning);
1723  
1724 <        checkCompletedWithWrappedCancellationException(h);
1725 <        checkCancelled(!fFirst ? f : g);
1726 <        r.assertNotInvoked();
1727 <        checkCompletedNormally(fFirst ? f : g, v1);
1724 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1725 >        assertTrue(complete1.call());
1726 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1727 >        checkIncomplete(h1);
1728 >        checkIncomplete(h2);
1729 >        assertTrue(complete2.call());
1730 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1731 >
1732 >        checkCompletedWithWrappedCancellationException(h1);
1733 >        checkCompletedWithWrappedCancellationException(h2);
1734 >        checkCompletedWithWrappedCancellationException(h3);
1735 >        r1.assertNotInvoked();
1736 >        r2.assertNotInvoked();
1737 >        r3.assertNotInvoked();
1738 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1739 >        checkCancelled(failFirst ? fst : snd);
1740      }}
1741  
1742      /**
# Line 1430 | Line 1750 | public class CompletableFutureTest exten
1750      {
1751          final CompletableFuture<Integer> f = new CompletableFuture<>();
1752          final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 <        final FailingBiFunction r = new FailingBiFunction(m);
1754 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1753 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1754 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1755 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1756 >
1757 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1758 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1759 >        final Integer w1 =  fFirst ? v1 : v2;
1760 >        final Integer w2 = !fFirst ? v1 : v2;
1761 >
1762 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1763 >        assertTrue(fst.complete(w1));
1764 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1765 >        assertTrue(snd.complete(w2));
1766 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1767  
1768 <        if (fFirst) {
1769 <            f.complete(v1);
1770 <            g.complete(v2);
1771 <        } else {
1772 <            g.complete(v2);
1773 <            f.complete(v1);
1442 <        }
1443 <
1444 <        checkCompletedWithWrappedCFException(h);
1768 >        checkCompletedWithWrappedCFException(h1);
1769 >        checkCompletedWithWrappedCFException(h2);
1770 >        checkCompletedWithWrappedCFException(h3);
1771 >        r1.assertInvoked();
1772 >        r2.assertInvoked();
1773 >        r3.assertInvoked();
1774          checkCompletedNormally(f, v1);
1775          checkCompletedNormally(g, v2);
1776      }}
# Line 1452 | Line 1781 | public class CompletableFutureTest exten
1781       */
1782      public void testThenAcceptBoth_normalCompletion() {
1783          for (ExecutionMode m : ExecutionMode.values())
1455        for (boolean createIncomplete : new boolean[] { true, false })
1784          for (boolean fFirst : new boolean[] { true, false })
1785          for (Integer v1 : new Integer[] { 1, null })
1786          for (Integer v2 : new Integer[] { 2, null })
1787      {
1788          final CompletableFuture<Integer> f = new CompletableFuture<>();
1789          final CompletableFuture<Integer> g = new CompletableFuture<>();
1790 <        final SubtractAction r = new SubtractAction(m);
1791 <
1792 <        if (fFirst) f.complete(v1); else g.complete(v2);
1793 <        if (!createIncomplete)
1794 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1795 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1796 <        if (createIncomplete) {
1797 <            checkIncomplete(h);
1798 <            r.assertNotInvoked();
1799 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1800 <        }
1790 >        final SubtractAction r1 = new SubtractAction(m);
1791 >        final SubtractAction r2 = new SubtractAction(m);
1792 >        final SubtractAction r3 = new SubtractAction(m);
1793 >
1794 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1795 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1796 >        final Integer w1 =  fFirst ? v1 : v2;
1797 >        final Integer w2 = !fFirst ? v1 : v2;
1798 >
1799 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1800 >        assertTrue(fst.complete(w1));
1801 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1802 >        checkIncomplete(h1);
1803 >        checkIncomplete(h2);
1804 >        r1.assertNotInvoked();
1805 >        r2.assertNotInvoked();
1806 >        assertTrue(snd.complete(w2));
1807 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1808  
1809 <        checkCompletedNormally(h, null);
1810 <        r.assertValue(subtract(v1, v2));
1809 >        checkCompletedNormally(h1, null);
1810 >        checkCompletedNormally(h2, null);
1811 >        checkCompletedNormally(h3, null);
1812 >        r1.assertValue(subtract(v1, v2));
1813 >        r2.assertValue(subtract(v1, v2));
1814 >        r3.assertValue(subtract(v1, v2));
1815          checkCompletedNormally(f, v1);
1816          checkCompletedNormally(g, v2);
1817      }}
# Line 1481 | Line 1820 | public class CompletableFutureTest exten
1820       * thenAcceptBoth result completes exceptionally after exceptional
1821       * completion of either source
1822       */
1823 <    public void testThenAcceptBoth_exceptionalCompletion() {
1823 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1824          for (ExecutionMode m : ExecutionMode.values())
1486        for (boolean createIncomplete : new boolean[] { true, false })
1825          for (boolean fFirst : new boolean[] { true, false })
1826 +        for (boolean failFirst : new boolean[] { true, false })
1827          for (Integer v1 : new Integer[] { 1, null })
1828      {
1829          final CompletableFuture<Integer> f = new CompletableFuture<>();
1830          final CompletableFuture<Integer> g = new CompletableFuture<>();
1831          final CFException ex = new CFException();
1832 <        final SubtractAction r = new SubtractAction(m);
1833 <
1834 <        (fFirst ? f : g).complete(v1);
1835 <        if (!createIncomplete)
1836 <            (!fFirst ? f : g).completeExceptionally(ex);
1837 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1838 <        if (createIncomplete) {
1839 <            checkIncomplete(h);
1840 <            (!fFirst ? f : g).completeExceptionally(ex);
1841 <        }
1842 <
1843 <        checkCompletedWithWrappedCFException(h, ex);
1844 <        r.assertNotInvoked();
1845 <        checkCompletedNormally(fFirst ? f : g, v1);
1846 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1832 >        final SubtractAction r1 = new SubtractAction(m);
1833 >        final SubtractAction r2 = new SubtractAction(m);
1834 >        final SubtractAction r3 = new SubtractAction(m);
1835 >
1836 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1837 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1838 >        final Callable<Boolean> complete1 = failFirst ?
1839 >            () -> fst.completeExceptionally(ex) :
1840 >            () -> fst.complete(v1);
1841 >        final Callable<Boolean> complete2 = failFirst ?
1842 >            () -> snd.complete(v1) :
1843 >            () -> snd.completeExceptionally(ex);
1844 >
1845 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1846 >        assertTrue(complete1.call());
1847 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1848 >        checkIncomplete(h1);
1849 >        checkIncomplete(h2);
1850 >        assertTrue(complete2.call());
1851 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1852 >
1853 >        checkCompletedWithWrappedException(h1, ex);
1854 >        checkCompletedWithWrappedException(h2, ex);
1855 >        checkCompletedWithWrappedException(h3, ex);
1856 >        r1.assertNotInvoked();
1857 >        r2.assertNotInvoked();
1858 >        r3.assertNotInvoked();
1859 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1860 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1861      }}
1862  
1863      /**
1864       * thenAcceptBoth result completes exceptionally if either source cancelled
1865       */
1866 <    public void testThenAcceptBoth_sourceCancelled() {
1866 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1867          for (ExecutionMode m : ExecutionMode.values())
1868          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1516        for (boolean createIncomplete : new boolean[] { true, false })
1869          for (boolean fFirst : new boolean[] { true, false })
1870 +        for (boolean failFirst : new boolean[] { true, false })
1871          for (Integer v1 : new Integer[] { 1, null })
1872      {
1873          final CompletableFuture<Integer> f = new CompletableFuture<>();
1874          final CompletableFuture<Integer> g = new CompletableFuture<>();
1875 <        final SubtractAction r = new SubtractAction(m);
1875 >        final SubtractAction r1 = new SubtractAction(m);
1876 >        final SubtractAction r2 = new SubtractAction(m);
1877 >        final SubtractAction r3 = new SubtractAction(m);
1878  
1879 <        (fFirst ? f : g).complete(v1);
1880 <        if (!createIncomplete)
1881 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1882 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1883 <        if (createIncomplete) {
1884 <            checkIncomplete(h);
1885 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1886 <        }
1879 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1880 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1881 >        final Callable<Boolean> complete1 = failFirst ?
1882 >            () -> fst.cancel(mayInterruptIfRunning) :
1883 >            () -> fst.complete(v1);
1884 >        final Callable<Boolean> complete2 = failFirst ?
1885 >            () -> snd.complete(v1) :
1886 >            () -> snd.cancel(mayInterruptIfRunning);
1887  
1888 <        checkCompletedWithWrappedCancellationException(h);
1889 <        checkCancelled(!fFirst ? f : g);
1890 <        r.assertNotInvoked();
1891 <        checkCompletedNormally(fFirst ? f : g, v1);
1888 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1889 >        assertTrue(complete1.call());
1890 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1891 >        checkIncomplete(h1);
1892 >        checkIncomplete(h2);
1893 >        assertTrue(complete2.call());
1894 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1895 >
1896 >        checkCompletedWithWrappedCancellationException(h1);
1897 >        checkCompletedWithWrappedCancellationException(h2);
1898 >        checkCompletedWithWrappedCancellationException(h3);
1899 >        r1.assertNotInvoked();
1900 >        r2.assertNotInvoked();
1901 >        r3.assertNotInvoked();
1902 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1903 >        checkCancelled(failFirst ? fst : snd);
1904      }}
1905  
1906      /**
# Line 1547 | Line 1914 | public class CompletableFutureTest exten
1914      {
1915          final CompletableFuture<Integer> f = new CompletableFuture<>();
1916          final CompletableFuture<Integer> g = new CompletableFuture<>();
1917 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1918 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1917 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1918 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1919 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1920 >
1921 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1922 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1923 >        final Integer w1 =  fFirst ? v1 : v2;
1924 >        final Integer w2 = !fFirst ? v1 : v2;
1925 >
1926 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1927 >        assertTrue(fst.complete(w1));
1928 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1929 >        assertTrue(snd.complete(w2));
1930 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1931  
1932 <        if (fFirst) {
1933 <            f.complete(v1);
1934 <            g.complete(v2);
1935 <        } else {
1936 <            g.complete(v2);
1937 <            f.complete(v1);
1559 <        }
1560 <
1561 <        checkCompletedWithWrappedCFException(h);
1932 >        checkCompletedWithWrappedCFException(h1);
1933 >        checkCompletedWithWrappedCFException(h2);
1934 >        checkCompletedWithWrappedCFException(h3);
1935 >        r1.assertInvoked();
1936 >        r2.assertInvoked();
1937 >        r3.assertInvoked();
1938          checkCompletedNormally(f, v1);
1939          checkCompletedNormally(g, v2);
1940      }}
# Line 1569 | Line 1945 | public class CompletableFutureTest exten
1945       */
1946      public void testRunAfterBoth_normalCompletion() {
1947          for (ExecutionMode m : ExecutionMode.values())
1572        for (boolean createIncomplete : new boolean[] { true, false })
1948          for (boolean fFirst : new boolean[] { true, false })
1949          for (Integer v1 : new Integer[] { 1, null })
1950          for (Integer v2 : new Integer[] { 2, null })
1951      {
1952          final CompletableFuture<Integer> f = new CompletableFuture<>();
1953          final CompletableFuture<Integer> g = new CompletableFuture<>();
1954 <        final Noop r = new Noop(m);
1955 <
1956 <        if (fFirst) f.complete(v1); else g.complete(v2);
1957 <        if (!createIncomplete)
1958 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1959 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1960 <        if (createIncomplete) {
1961 <            checkIncomplete(h);
1962 <            r.assertNotInvoked();
1963 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1964 <        }
1954 >        final Noop r1 = new Noop(m);
1955 >        final Noop r2 = new Noop(m);
1956 >        final Noop r3 = new Noop(m);
1957 >
1958 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1959 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1960 >        final Integer w1 =  fFirst ? v1 : v2;
1961 >        final Integer w2 = !fFirst ? v1 : v2;
1962 >
1963 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1964 >        assertTrue(fst.complete(w1));
1965 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1966 >        checkIncomplete(h1);
1967 >        checkIncomplete(h2);
1968 >        r1.assertNotInvoked();
1969 >        r2.assertNotInvoked();
1970 >        assertTrue(snd.complete(w2));
1971 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1972  
1973 <        checkCompletedNormally(h, null);
1974 <        r.assertInvoked();
1973 >        checkCompletedNormally(h1, null);
1974 >        checkCompletedNormally(h2, null);
1975 >        checkCompletedNormally(h3, null);
1976 >        r1.assertInvoked();
1977 >        r2.assertInvoked();
1978 >        r3.assertInvoked();
1979          checkCompletedNormally(f, v1);
1980          checkCompletedNormally(g, v2);
1981      }}
# Line 1598 | Line 1984 | public class CompletableFutureTest exten
1984       * runAfterBoth result completes exceptionally after exceptional
1985       * completion of either source
1986       */
1987 <    public void testRunAfterBoth_exceptionalCompletion() {
1987 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1988          for (ExecutionMode m : ExecutionMode.values())
1603        for (boolean createIncomplete : new boolean[] { true, false })
1989          for (boolean fFirst : new boolean[] { true, false })
1990 +        for (boolean failFirst : new boolean[] { true, false })
1991          for (Integer v1 : new Integer[] { 1, null })
1992      {
1993          final CompletableFuture<Integer> f = new CompletableFuture<>();
1994          final CompletableFuture<Integer> g = new CompletableFuture<>();
1995          final CFException ex = new CFException();
1996 <        final Noop r = new Noop(m);
1997 <
1998 <        (fFirst ? f : g).complete(v1);
1999 <        if (!createIncomplete)
2000 <            (!fFirst ? f : g).completeExceptionally(ex);
2001 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2002 <        if (createIncomplete) {
2003 <            checkIncomplete(h);
2004 <            (!fFirst ? f : g).completeExceptionally(ex);
2005 <        }
2006 <
2007 <        checkCompletedWithWrappedCFException(h, ex);
2008 <        r.assertNotInvoked();
2009 <        checkCompletedNormally(fFirst ? f : g, v1);
2010 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1996 >        final Noop r1 = new Noop(m);
1997 >        final Noop r2 = new Noop(m);
1998 >        final Noop r3 = new Noop(m);
1999 >
2000 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2001 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2002 >        final Callable<Boolean> complete1 = failFirst ?
2003 >            () -> fst.completeExceptionally(ex) :
2004 >            () -> fst.complete(v1);
2005 >        final Callable<Boolean> complete2 = failFirst ?
2006 >            () -> snd.complete(v1) :
2007 >            () -> snd.completeExceptionally(ex);
2008 >
2009 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2010 >        assertTrue(complete1.call());
2011 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2012 >        checkIncomplete(h1);
2013 >        checkIncomplete(h2);
2014 >        assertTrue(complete2.call());
2015 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2016 >
2017 >        checkCompletedWithWrappedException(h1, ex);
2018 >        checkCompletedWithWrappedException(h2, ex);
2019 >        checkCompletedWithWrappedException(h3, ex);
2020 >        r1.assertNotInvoked();
2021 >        r2.assertNotInvoked();
2022 >        r3.assertNotInvoked();
2023 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2024 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2025      }}
2026  
2027      /**
2028       * runAfterBoth result completes exceptionally if either source cancelled
2029       */
2030 <    public void testRunAfterBoth_sourceCancelled() {
2030 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2031          for (ExecutionMode m : ExecutionMode.values())
2032          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1633        for (boolean createIncomplete : new boolean[] { true, false })
2033          for (boolean fFirst : new boolean[] { true, false })
2034 +        for (boolean failFirst : new boolean[] { true, false })
2035          for (Integer v1 : new Integer[] { 1, null })
2036      {
2037          final CompletableFuture<Integer> f = new CompletableFuture<>();
2038          final CompletableFuture<Integer> g = new CompletableFuture<>();
2039 <        final Noop r = new Noop(m);
2039 >        final Noop r1 = new Noop(m);
2040 >        final Noop r2 = new Noop(m);
2041 >        final Noop r3 = new Noop(m);
2042  
2043 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2044 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2045 +        final Callable<Boolean> complete1 = failFirst ?
2046 +            () -> fst.cancel(mayInterruptIfRunning) :
2047 +            () -> fst.complete(v1);
2048 +        final Callable<Boolean> complete2 = failFirst ?
2049 +            () -> snd.complete(v1) :
2050 +            () -> snd.cancel(mayInterruptIfRunning);
2051  
2052 <        (fFirst ? f : g).complete(v1);
2053 <        if (!createIncomplete)
2054 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2055 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2056 <        if (createIncomplete) {
2057 <            checkIncomplete(h);
2058 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1649 <        }
2052 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2053 >        assertTrue(complete1.call());
2054 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2055 >        checkIncomplete(h1);
2056 >        checkIncomplete(h2);
2057 >        assertTrue(complete2.call());
2058 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2059  
2060 <        checkCompletedWithWrappedCancellationException(h);
2061 <        checkCancelled(!fFirst ? f : g);
2062 <        r.assertNotInvoked();
2063 <        checkCompletedNormally(fFirst ? f : g, v1);
2060 >        checkCompletedWithWrappedCancellationException(h1);
2061 >        checkCompletedWithWrappedCancellationException(h2);
2062 >        checkCompletedWithWrappedCancellationException(h3);
2063 >        r1.assertNotInvoked();
2064 >        r2.assertNotInvoked();
2065 >        r3.assertNotInvoked();
2066 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2067 >        checkCancelled(failFirst ? fst : snd);
2068      }}
2069  
2070      /**
# Line 1667 | Line 2080 | public class CompletableFutureTest exten
2080          final CompletableFuture<Integer> g = new CompletableFuture<>();
2081          final FailingRunnable r1 = new FailingRunnable(m);
2082          final FailingRunnable r2 = new FailingRunnable(m);
2083 +        final FailingRunnable r3 = new FailingRunnable(m);
2084  
2085 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2086 <        if (fFirst) {
2087 <            f.complete(v1);
2088 <            g.complete(v2);
2089 <        } else {
2090 <            g.complete(v2);
2091 <            f.complete(v1);
2092 <        }
2093 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2085 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2086 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2087 >        final Integer w1 =  fFirst ? v1 : v2;
2088 >        final Integer w2 = !fFirst ? v1 : v2;
2089 >
2090 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2091 >        assertTrue(fst.complete(w1));
2092 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2093 >        assertTrue(snd.complete(w2));
2094 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2095  
2096          checkCompletedWithWrappedCFException(h1);
2097          checkCompletedWithWrappedCFException(h2);
2098 +        checkCompletedWithWrappedCFException(h3);
2099 +        r1.assertInvoked();
2100 +        r2.assertInvoked();
2101 +        r3.assertInvoked();
2102          checkCompletedNormally(f, v1);
2103          checkCompletedNormally(g, v2);
2104      }}
# Line 1753 | Line 2172 | public class CompletableFutureTest exten
2172          rs[0].assertNotInvoked();
2173          rs[1].assertNotInvoked();
2174          f.completeExceptionally(ex);
2175 <        checkCompletedWithWrappedCFException(h0, ex);
2176 <        checkCompletedWithWrappedCFException(h1, ex);
2175 >        checkCompletedWithWrappedException(h0, ex);
2176 >        checkCompletedWithWrappedException(h1, ex);
2177          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2178          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2179 <        checkCompletedWithWrappedCFException(h2, ex);
2180 <        checkCompletedWithWrappedCFException(h3, ex);
2179 >        checkCompletedWithWrappedException(h2, ex);
2180 >        checkCompletedWithWrappedException(h3, ex);
2181          g.complete(v1);
2182  
2183          // unspecified behavior - both source completions available
# Line 1766 | Line 2185 | public class CompletableFutureTest exten
2185          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2186          try {
2187              assertEquals(inc(v1), h4.join());
2188 <            rs[4].assertInvoked();
2188 >            rs[4].assertValue(inc(v1));
2189          } catch (CompletionException ok) {
2190 <            checkCompletedWithWrappedCFException(h4, ex);
2190 >            checkCompletedWithWrappedException(h4, ex);
2191              rs[4].assertNotInvoked();
2192          }
2193          try {
2194              assertEquals(inc(v1), h5.join());
2195 <            rs[5].assertInvoked();
2195 >            rs[5].assertValue(inc(v1));
2196          } catch (CompletionException ok) {
2197 <            checkCompletedWithWrappedCFException(h5, ex);
2197 >            checkCompletedWithWrappedException(h5, ex);
2198              rs[5].assertNotInvoked();
2199          }
2200  
2201 <        checkCompletedWithWrappedCFException(f, ex);
2201 >        checkCompletedExceptionally(f, ex);
2202          checkCompletedNormally(g, v1);
2203 <        checkCompletedWithWrappedCFException(h0, ex);
2204 <        checkCompletedWithWrappedCFException(h1, ex);
2205 <        checkCompletedWithWrappedCFException(h2, ex);
2206 <        checkCompletedWithWrappedCFException(h3, ex);
2207 <        checkCompletedWithWrappedCFException(h4, ex);
2203 >        checkCompletedWithWrappedException(h0, ex);
2204 >        checkCompletedWithWrappedException(h1, ex);
2205 >        checkCompletedWithWrappedException(h2, ex);
2206 >        checkCompletedWithWrappedException(h3, ex);
2207 >        checkCompletedWithWrappedException(h4, ex);
2208          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2209      }}
2210  
2211 +    public void testApplyToEither_exceptionalCompletion2() {
2212 +        for (ExecutionMode m : ExecutionMode.values())
2213 +        for (boolean fFirst : new boolean[] { true, false })
2214 +        for (Integer v1 : new Integer[] { 1, null })
2215 +    {
2216 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2217 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2218 +        final CFException ex = new CFException();
2219 +        final IncFunction[] rs = new IncFunction[6];
2220 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2221 +
2222 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2223 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2224 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2225 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2226 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2227 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2228 +
2229 +        // unspecified behavior - both source completions available
2230 +        try {
2231 +            assertEquals(inc(v1), h0.join());
2232 +            rs[0].assertValue(inc(v1));
2233 +        } catch (CompletionException ok) {
2234 +            checkCompletedWithWrappedException(h0, ex);
2235 +            rs[0].assertNotInvoked();
2236 +        }
2237 +        try {
2238 +            assertEquals(inc(v1), h1.join());
2239 +            rs[1].assertValue(inc(v1));
2240 +        } catch (CompletionException ok) {
2241 +            checkCompletedWithWrappedException(h1, ex);
2242 +            rs[1].assertNotInvoked();
2243 +        }
2244 +        try {
2245 +            assertEquals(inc(v1), h2.join());
2246 +            rs[2].assertValue(inc(v1));
2247 +        } catch (CompletionException ok) {
2248 +            checkCompletedWithWrappedException(h2, ex);
2249 +            rs[2].assertNotInvoked();
2250 +        }
2251 +        try {
2252 +            assertEquals(inc(v1), h3.join());
2253 +            rs[3].assertValue(inc(v1));
2254 +        } catch (CompletionException ok) {
2255 +            checkCompletedWithWrappedException(h3, ex);
2256 +            rs[3].assertNotInvoked();
2257 +        }
2258 +
2259 +        checkCompletedNormally(f, v1);
2260 +        checkCompletedExceptionally(g, ex);
2261 +    }}
2262 +
2263      /**
2264       * applyToEither result completes exceptionally if either source cancelled
2265       */
# Line 1822 | Line 2293 | public class CompletableFutureTest exten
2293          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2294          try {
2295              assertEquals(inc(v1), h4.join());
2296 <            rs[4].assertInvoked();
2296 >            rs[4].assertValue(inc(v1));
2297          } catch (CompletionException ok) {
2298              checkCompletedWithWrappedCancellationException(h4);
2299              rs[4].assertNotInvoked();
2300          }
2301          try {
2302              assertEquals(inc(v1), h5.join());
2303 <            rs[5].assertInvoked();
2303 >            rs[5].assertValue(inc(v1));
2304          } catch (CompletionException ok) {
2305              checkCompletedWithWrappedCancellationException(h5);
2306              rs[5].assertNotInvoked();
# Line 1844 | Line 2315 | public class CompletableFutureTest exten
2315          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2316      }}
2317  
2318 +    public void testApplyToEither_sourceCancelled2() {
2319 +        for (ExecutionMode m : ExecutionMode.values())
2320 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2321 +        for (boolean fFirst : new boolean[] { true, false })
2322 +        for (Integer v1 : new Integer[] { 1, null })
2323 +    {
2324 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2325 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2326 +        final IncFunction[] rs = new IncFunction[6];
2327 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2328 +
2329 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2330 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2331 +        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2332 +        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2333 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2334 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2335 +
2336 +        // unspecified behavior - both source completions available
2337 +        try {
2338 +            assertEquals(inc(v1), h0.join());
2339 +            rs[0].assertValue(inc(v1));
2340 +        } catch (CompletionException ok) {
2341 +            checkCompletedWithWrappedCancellationException(h0);
2342 +            rs[0].assertNotInvoked();
2343 +        }
2344 +        try {
2345 +            assertEquals(inc(v1), h1.join());
2346 +            rs[1].assertValue(inc(v1));
2347 +        } catch (CompletionException ok) {
2348 +            checkCompletedWithWrappedCancellationException(h1);
2349 +            rs[1].assertNotInvoked();
2350 +        }
2351 +        try {
2352 +            assertEquals(inc(v1), h2.join());
2353 +            rs[2].assertValue(inc(v1));
2354 +        } catch (CompletionException ok) {
2355 +            checkCompletedWithWrappedCancellationException(h2);
2356 +            rs[2].assertNotInvoked();
2357 +        }
2358 +        try {
2359 +            assertEquals(inc(v1), h3.join());
2360 +            rs[3].assertValue(inc(v1));
2361 +        } catch (CompletionException ok) {
2362 +            checkCompletedWithWrappedCancellationException(h3);
2363 +            rs[3].assertNotInvoked();
2364 +        }
2365 +
2366 +        checkCompletedNormally(f, v1);
2367 +        checkCancelled(g);
2368 +    }}
2369 +
2370      /**
2371       * applyToEither result completes exceptionally if action does
2372       */
# Line 1896 | Line 2419 | public class CompletableFutureTest exten
2419      {
2420          final CompletableFuture<Integer> f = new CompletableFuture<>();
2421          final CompletableFuture<Integer> g = new CompletableFuture<>();
2422 <        final IncAction[] rs = new IncAction[6];
2423 <        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2422 >        final NoopConsumer[] rs = new NoopConsumer[6];
2423 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2424  
2425          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2426          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
# Line 1908 | Line 2431 | public class CompletableFutureTest exten
2431          f.complete(v1);
2432          checkCompletedNormally(h0, null);
2433          checkCompletedNormally(h1, null);
2434 <        rs[0].assertValue(inc(v1));
2435 <        rs[1].assertValue(inc(v1));
2434 >        rs[0].assertValue(v1);
2435 >        rs[1].assertValue(v1);
2436          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2437          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2438          checkCompletedNormally(h2, null);
2439          checkCompletedNormally(h3, null);
2440 <        rs[2].assertValue(inc(v1));
2441 <        rs[3].assertValue(inc(v1));
2440 >        rs[2].assertValue(v1);
2441 >        rs[3].assertValue(v1);
2442          g.complete(v2);
2443  
2444          // unspecified behavior - both source completions available
# Line 1923 | Line 2446 | public class CompletableFutureTest exten
2446          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2447          checkCompletedNormally(h4, null);
2448          checkCompletedNormally(h5, null);
2449 <        assertTrue(Objects.equals(inc(v1), rs[4].value) ||
2450 <                   Objects.equals(inc(v2), rs[4].value));
2451 <        assertTrue(Objects.equals(inc(v1), rs[5].value) ||
2452 <                   Objects.equals(inc(v2), rs[5].value));
2449 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2450 >                   Objects.equals(v2, rs[4].value));
2451 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2452 >                   Objects.equals(v2, rs[5].value));
2453  
2454          checkCompletedNormally(f, v1);
2455          checkCompletedNormally(g, v2);
# Line 1934 | Line 2457 | public class CompletableFutureTest exten
2457          checkCompletedNormally(h1, null);
2458          checkCompletedNormally(h2, null);
2459          checkCompletedNormally(h3, null);
2460 <        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2460 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2461      }}
2462  
2463      /**
# Line 1948 | Line 2471 | public class CompletableFutureTest exten
2471          final CompletableFuture<Integer> f = new CompletableFuture<>();
2472          final CompletableFuture<Integer> g = new CompletableFuture<>();
2473          final CFException ex = new CFException();
2474 <        final IncAction[] rs = new IncAction[6];
2475 <        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2474 >        final NoopConsumer[] rs = new NoopConsumer[6];
2475 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2476  
2477          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2478          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
# Line 1958 | Line 2481 | public class CompletableFutureTest exten
2481          rs[0].assertNotInvoked();
2482          rs[1].assertNotInvoked();
2483          f.completeExceptionally(ex);
2484 <        checkCompletedWithWrappedCFException(h0, ex);
2485 <        checkCompletedWithWrappedCFException(h1, ex);
2484 >        checkCompletedWithWrappedException(h0, ex);
2485 >        checkCompletedWithWrappedException(h1, ex);
2486          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2487          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2488 <        checkCompletedWithWrappedCFException(h2, ex);
2489 <        checkCompletedWithWrappedCFException(h3, ex);
2488 >        checkCompletedWithWrappedException(h2, ex);
2489 >        checkCompletedWithWrappedException(h3, ex);
2490  
2491          g.complete(v1);
2492  
# Line 1972 | Line 2495 | public class CompletableFutureTest exten
2495          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2496          try {
2497              assertNull(h4.join());
2498 <            rs[4].assertValue(inc(v1));
2498 >            rs[4].assertValue(v1);
2499          } catch (CompletionException ok) {
2500 <            checkCompletedWithWrappedCFException(h4, ex);
2500 >            checkCompletedWithWrappedException(h4, ex);
2501              rs[4].assertNotInvoked();
2502          }
2503          try {
2504              assertNull(h5.join());
2505 <            rs[5].assertValue(inc(v1));
2505 >            rs[5].assertValue(v1);
2506          } catch (CompletionException ok) {
2507 <            checkCompletedWithWrappedCFException(h5, ex);
2507 >            checkCompletedWithWrappedException(h5, ex);
2508              rs[5].assertNotInvoked();
2509          }
2510  
2511 <        checkCompletedWithWrappedCFException(f, ex);
2511 >        checkCompletedExceptionally(f, ex);
2512          checkCompletedNormally(g, v1);
2513 <        checkCompletedWithWrappedCFException(h0, ex);
2514 <        checkCompletedWithWrappedCFException(h1, ex);
2515 <        checkCompletedWithWrappedCFException(h2, ex);
2516 <        checkCompletedWithWrappedCFException(h3, ex);
2517 <        checkCompletedWithWrappedCFException(h4, ex);
2513 >        checkCompletedWithWrappedException(h0, ex);
2514 >        checkCompletedWithWrappedException(h1, ex);
2515 >        checkCompletedWithWrappedException(h2, ex);
2516 >        checkCompletedWithWrappedException(h3, ex);
2517 >        checkCompletedWithWrappedException(h4, ex);
2518          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2519      }}
2520  
2521 +    public void testAcceptEither_exceptionalCompletion2() {
2522 +        for (ExecutionMode m : ExecutionMode.values())
2523 +        for (boolean fFirst : new boolean[] { true, false })
2524 +        for (Integer v1 : new Integer[] { 1, null })
2525 +    {
2526 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2527 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2528 +        final CFException ex = new CFException();
2529 +        final NoopConsumer[] rs = new NoopConsumer[6];
2530 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2531 +
2532 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2533 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2534 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2535 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2536 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2537 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2538 +
2539 +        // unspecified behavior - both source completions available
2540 +        try {
2541 +            assertEquals(null, h0.join());
2542 +            rs[0].assertValue(v1);
2543 +        } catch (CompletionException ok) {
2544 +            checkCompletedWithWrappedException(h0, ex);
2545 +            rs[0].assertNotInvoked();
2546 +        }
2547 +        try {
2548 +            assertEquals(null, h1.join());
2549 +            rs[1].assertValue(v1);
2550 +        } catch (CompletionException ok) {
2551 +            checkCompletedWithWrappedException(h1, ex);
2552 +            rs[1].assertNotInvoked();
2553 +        }
2554 +        try {
2555 +            assertEquals(null, h2.join());
2556 +            rs[2].assertValue(v1);
2557 +        } catch (CompletionException ok) {
2558 +            checkCompletedWithWrappedException(h2, ex);
2559 +            rs[2].assertNotInvoked();
2560 +        }
2561 +        try {
2562 +            assertEquals(null, h3.join());
2563 +            rs[3].assertValue(v1);
2564 +        } catch (CompletionException ok) {
2565 +            checkCompletedWithWrappedException(h3, ex);
2566 +            rs[3].assertNotInvoked();
2567 +        }
2568 +
2569 +        checkCompletedNormally(f, v1);
2570 +        checkCompletedExceptionally(g, ex);
2571 +    }}
2572 +
2573      /**
2574       * acceptEither result completes exceptionally if either source cancelled
2575       */
# Line 2005 | Line 2580 | public class CompletableFutureTest exten
2580      {
2581          final CompletableFuture<Integer> f = new CompletableFuture<>();
2582          final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 <        final IncAction[] rs = new IncAction[6];
2584 <        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2583 >        final NoopConsumer[] rs = new NoopConsumer[6];
2584 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2585  
2586          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2587          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
# Line 2029 | Line 2604 | public class CompletableFutureTest exten
2604          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2605          try {
2606              assertNull(h4.join());
2607 <            rs[4].assertValue(inc(v1));
2607 >            rs[4].assertValue(v1);
2608          } catch (CompletionException ok) {
2609              checkCompletedWithWrappedCancellationException(h4);
2610              rs[4].assertNotInvoked();
2611          }
2612          try {
2613              assertNull(h5.join());
2614 <            rs[5].assertValue(inc(v1));
2614 >            rs[5].assertValue(v1);
2615          } catch (CompletionException ok) {
2616              checkCompletedWithWrappedCancellationException(h5);
2617              rs[5].assertNotInvoked();
# Line 2096 | Line 2671 | public class CompletableFutureTest exten
2671       * runAfterEither result completes normally after normal completion
2672       * of either source
2673       */
2674 <    public void testRunAfterEither_normalCompletion1() {
2674 >    public void testRunAfterEither_normalCompletion() {
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 Noop r = new Noop(m);
2682 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2681 >        final Noop[] rs = new Noop[6];
2682 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(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 +        checkIncomplete(h0);
2687 +        checkIncomplete(h1);
2688 +        rs[0].assertNotInvoked();
2689 +        rs[1].assertNotInvoked();
2690          f.complete(v1);
2691 <        checkCompletedNormally(h, null);
2692 <        r.assertInvoked();
2693 <        g.complete(v2);
2694 <
2695 <        checkCompletedNormally(f, v1);
2696 <        checkCompletedNormally(g, v2);
2697 <        checkCompletedNormally(h, null);
2698 <        r.assertInvoked();
2699 <    }}
2700 <
2120 <    public void testRunAfterEither_normalCompletion2() {
2121 <        for (ExecutionMode m : ExecutionMode.values())
2122 <        for (Integer v1 : new Integer[] { 1, null })
2123 <        for (Integer v2 : new Integer[] { 2, null })
2124 <    {
2125 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2126 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2127 <        final Noop r = new Noop(m);
2128 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2691 >        checkCompletedNormally(h0, null);
2692 >        checkCompletedNormally(h1, null);
2693 >        rs[0].assertInvoked();
2694 >        rs[1].assertInvoked();
2695 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2696 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2697 >        checkCompletedNormally(h2, null);
2698 >        checkCompletedNormally(h3, null);
2699 >        rs[2].assertInvoked();
2700 >        rs[3].assertInvoked();
2701  
2702          g.complete(v2);
2131        checkCompletedNormally(h, null);
2132        r.assertInvoked();
2133        f.complete(v1);
2134
2135        checkCompletedNormally(f, v1);
2136        checkCompletedNormally(g, v2);
2137        checkCompletedNormally(h, null);
2138        r.assertInvoked();
2139        }}
2703  
2704 <    public void testRunAfterEither_normalCompletion3() {
2705 <        for (ExecutionMode m : ExecutionMode.values())
2143 <        for (Integer v1 : new Integer[] { 1, null })
2144 <        for (Integer v2 : new Integer[] { 2, null })
2145 <    {
2146 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2147 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2148 <        final Noop r = new Noop(m);
2149 <
2150 <        f.complete(v1);
2151 <        g.complete(v2);
2152 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2704 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2705 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2706  
2154        checkCompletedNormally(h, null);
2707          checkCompletedNormally(f, v1);
2708          checkCompletedNormally(g, v2);
2709 <        r.assertInvoked();
2709 >        checkCompletedNormally(h0, null);
2710 >        checkCompletedNormally(h1, null);
2711 >        checkCompletedNormally(h2, null);
2712 >        checkCompletedNormally(h3, null);
2713 >        checkCompletedNormally(h4, null);
2714 >        checkCompletedNormally(h5, null);
2715 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2716      }}
2717  
2718      /**
2719       * runAfterEither result completes exceptionally after exceptional
2720       * completion of either source
2721       */
2722 <    public void testRunAfterEither_exceptionalCompletion1() {
2165 <        for (ExecutionMode m : ExecutionMode.values())
2166 <        for (Integer v1 : new Integer[] { 1, null })
2167 <    {
2168 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2169 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2170 <        final Noop r = new Noop(m);
2171 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2172 <        final CFException ex = new CFException();
2173 <
2174 <        f.completeExceptionally(ex);
2175 <        checkCompletedWithWrappedCFException(h, ex);
2176 <        g.complete(v1);
2177 <
2178 <        r.assertNotInvoked();
2179 <        checkCompletedNormally(g, v1);
2180 <        checkCompletedWithWrappedCFException(f, ex);
2181 <        checkCompletedWithWrappedCFException(h, ex);
2182 <    }}
2183 <
2184 <    public void testRunAfterEither_exceptionalCompletion2() {
2722 >    public void testRunAfterEither_exceptionalCompletion() {
2723          for (ExecutionMode m : ExecutionMode.values())
2724          for (Integer v1 : new Integer[] { 1, null })
2725      {
2726          final CompletableFuture<Integer> f = new CompletableFuture<>();
2727          final CompletableFuture<Integer> g = new CompletableFuture<>();
2190        final Noop r = new Noop(m);
2191        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2728          final CFException ex = new CFException();
2729 +        final Noop[] rs = new Noop[6];
2730 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2731  
2732 <        g.completeExceptionally(ex);
2733 <        checkCompletedWithWrappedCFException(h, ex);
2734 <        f.complete(v1);
2735 <
2736 <        r.assertNotInvoked();
2737 <        checkCompletedNormally(f, v1);
2738 <        checkCompletedWithWrappedCFException(g, ex);
2739 <        checkCompletedWithWrappedCFException(h, ex);
2740 <    }}
2741 <
2742 <    public void testRunAfterEither_exceptionalCompletion3() {
2743 <        for (ExecutionMode m : ExecutionMode.values())
2744 <        for (Integer v1 : new Integer[] { 1, null })
2207 <    {
2208 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2209 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 <        final Noop r = new Noop(m);
2211 <        final CFException ex = new CFException();
2732 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2733 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2734 >        checkIncomplete(h0);
2735 >        checkIncomplete(h1);
2736 >        rs[0].assertNotInvoked();
2737 >        rs[1].assertNotInvoked();
2738 >        assertTrue(f.completeExceptionally(ex));
2739 >        checkCompletedWithWrappedException(h0, ex);
2740 >        checkCompletedWithWrappedException(h1, ex);
2741 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2742 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2743 >        checkCompletedWithWrappedException(h2, ex);
2744 >        checkCompletedWithWrappedException(h3, ex);
2745  
2746 <        g.completeExceptionally(ex);
2214 <        f.complete(v1);
2215 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2746 >        assertTrue(g.complete(v1));
2747  
2748 <        // unspecified behavior
2749 <        Integer v;
2748 >        // unspecified behavior - both source completions available
2749 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2750 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2751          try {
2752 <            assertNull(h.join());
2753 <            r.assertInvoked();
2752 >            assertNull(h4.join());
2753 >            rs[4].assertInvoked();
2754          } catch (CompletionException ok) {
2755 <            checkCompletedWithWrappedCFException(h, ex);
2756 <            r.assertNotInvoked();
2755 >            checkCompletedWithWrappedException(h4, ex);
2756 >            rs[4].assertNotInvoked();
2757          }
2226
2227        checkCompletedWithWrappedCFException(g, ex);
2228        checkCompletedNormally(f, v1);
2229    }}
2230
2231    public void testRunAfterEither_exceptionalCompletion4() {
2232        for (ExecutionMode m : ExecutionMode.values())
2233        for (Integer v1 : new Integer[] { 1, null })
2234    {
2235        final CompletableFuture<Integer> f = new CompletableFuture<>();
2236        final CompletableFuture<Integer> g = new CompletableFuture<>();
2237        final Noop r = new Noop(m);
2238        final CFException ex = new CFException();
2239
2240        f.completeExceptionally(ex);
2241        g.complete(v1);
2242        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2243
2244        // unspecified behavior
2245        Integer v;
2758          try {
2759 <            assertNull(h.join());
2760 <            r.assertInvoked();
2759 >            assertNull(h5.join());
2760 >            rs[5].assertInvoked();
2761          } catch (CompletionException ok) {
2762 <            checkCompletedWithWrappedCFException(h, ex);
2763 <            r.assertNotInvoked();
2762 >            checkCompletedWithWrappedException(h5, ex);
2763 >            rs[5].assertNotInvoked();
2764          }
2765  
2766 <        checkCompletedWithWrappedCFException(f, ex);
2766 >        checkCompletedExceptionally(f, ex);
2767          checkCompletedNormally(g, v1);
2768 +        checkCompletedWithWrappedException(h0, ex);
2769 +        checkCompletedWithWrappedException(h1, ex);
2770 +        checkCompletedWithWrappedException(h2, ex);
2771 +        checkCompletedWithWrappedException(h3, ex);
2772 +        checkCompletedWithWrappedException(h4, ex);
2773 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2774      }}
2775  
2776 <    /**
2259 <     * runAfterEither result completes exceptionally if action does
2260 <     */
2261 <    public void testRunAfterEither_actionFailed1() {
2776 >    public void testRunAfterEither_exceptionalCompletion2() {
2777          for (ExecutionMode m : ExecutionMode.values())
2778 +        for (boolean fFirst : new boolean[] { true, false })
2779          for (Integer v1 : new Integer[] { 1, null })
2264        for (Integer v2 : new Integer[] { 2, null })
2780      {
2781          final CompletableFuture<Integer> f = new CompletableFuture<>();
2782          final CompletableFuture<Integer> g = new CompletableFuture<>();
2783 <        final FailingRunnable r = new FailingRunnable(m);
2784 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2783 >        final CFException ex = new CFException();
2784 >        final Noop[] rs = new Noop[6];
2785 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2786  
2787 <        f.complete(v1);
2788 <        checkCompletedWithWrappedCFException(h);
2789 <        g.complete(v2);
2790 <        checkCompletedNormally(f, v1);
2791 <        checkCompletedNormally(g, v2);
2792 <    }}
2787 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2788 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2789 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2790 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2791 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2792 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2793  
2794 <    public void testRunAfterEither_actionFailed2() {
2795 <        for (ExecutionMode m : ExecutionMode.values())
2796 <        for (Integer v1 : new Integer[] { 1, null })
2797 <        for (Integer v2 : new Integer[] { 2, null })
2798 <    {
2799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 <        final FailingRunnable r = new FailingRunnable(m);
2802 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2794 >        // unspecified behavior - both source completions available
2795 >        try {
2796 >            assertEquals(null, h0.join());
2797 >            rs[0].assertInvoked();
2798 >        } catch (CompletionException ok) {
2799 >            checkCompletedWithWrappedException(h0, ex);
2800 >            rs[0].assertNotInvoked();
2801 >        }
2802 >        try {
2803 >            assertEquals(null, h1.join());
2804 >            rs[1].assertInvoked();
2805 >        } catch (CompletionException ok) {
2806 >            checkCompletedWithWrappedException(h1, ex);
2807 >            rs[1].assertNotInvoked();
2808 >        }
2809 >        try {
2810 >            assertEquals(null, h2.join());
2811 >            rs[2].assertInvoked();
2812 >        } catch (CompletionException ok) {
2813 >            checkCompletedWithWrappedException(h2, ex);
2814 >            rs[2].assertNotInvoked();
2815 >        }
2816 >        try {
2817 >            assertEquals(null, h3.join());
2818 >            rs[3].assertInvoked();
2819 >        } catch (CompletionException ok) {
2820 >            checkCompletedWithWrappedException(h3, ex);
2821 >            rs[3].assertNotInvoked();
2822 >        }
2823  
2288        g.complete(v2);
2289        checkCompletedWithWrappedCFException(h);
2290        f.complete(v1);
2824          checkCompletedNormally(f, v1);
2825 <        checkCompletedNormally(g, v2);
2825 >        checkCompletedExceptionally(g, ex);
2826      }}
2827  
2828      /**
2829       * runAfterEither result completes exceptionally if either source cancelled
2830       */
2831 <    public void testRunAfterEither_sourceCancelled1() {
2299 <        for (ExecutionMode m : ExecutionMode.values())
2300 <        for (boolean mayInterruptIfRunning : 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<>();
2305 <        final Noop r = new Noop(m);
2306 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2307 <
2308 <        assertTrue(f.cancel(mayInterruptIfRunning));
2309 <        checkCompletedWithWrappedCancellationException(h);
2310 <        g.complete(v1);
2311 <
2312 <        checkCancelled(f);
2313 <        r.assertNotInvoked();
2314 <        checkCompletedNormally(g, v1);
2315 <        checkCompletedWithWrappedCancellationException(h);
2316 <    }}
2317 <
2318 <    public void testRunAfterEither_sourceCancelled2() {
2831 >    public void testRunAfterEither_sourceCancelled() {
2832          for (ExecutionMode m : ExecutionMode.values())
2833          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2834          for (Integer v1 : new Integer[] { 1, null })
2835      {
2836          final CompletableFuture<Integer> f = new CompletableFuture<>();
2837          final CompletableFuture<Integer> g = new CompletableFuture<>();
2838 <        final Noop r = new Noop(m);
2839 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2838 >        final Noop[] rs = new Noop[6];
2839 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2840  
2841 <        assertTrue(g.cancel(mayInterruptIfRunning));
2842 <        checkCompletedWithWrappedCancellationException(h);
2843 <        f.complete(v1);
2844 <
2845 <        checkCancelled(g);
2846 <        r.assertNotInvoked();
2847 <        checkCompletedNormally(f, v1);
2848 <        checkCompletedWithWrappedCancellationException(h);
2849 <    }}
2850 <
2851 <    public void testRunAfterEither_sourceCancelled3() {
2852 <        for (ExecutionMode m : ExecutionMode.values())
2853 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2341 <        for (Integer v1 : new Integer[] { 1, null })
2342 <    {
2343 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2344 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 <        final Noop r = new Noop(m);
2841 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2842 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2843 >        checkIncomplete(h0);
2844 >        checkIncomplete(h1);
2845 >        rs[0].assertNotInvoked();
2846 >        rs[1].assertNotInvoked();
2847 >        f.cancel(mayInterruptIfRunning);
2848 >        checkCompletedWithWrappedCancellationException(h0);
2849 >        checkCompletedWithWrappedCancellationException(h1);
2850 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2851 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2852 >        checkCompletedWithWrappedCancellationException(h2);
2853 >        checkCompletedWithWrappedCancellationException(h3);
2854  
2855 <        assertTrue(g.cancel(mayInterruptIfRunning));
2348 <        f.complete(v1);
2349 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2855 >        assertTrue(g.complete(v1));
2856  
2857 <        // unspecified behavior
2858 <        Integer v;
2857 >        // unspecified behavior - both source completions available
2858 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2859 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2860 >        try {
2861 >            assertNull(h4.join());
2862 >            rs[4].assertInvoked();
2863 >        } catch (CompletionException ok) {
2864 >            checkCompletedWithWrappedCancellationException(h4);
2865 >            rs[4].assertNotInvoked();
2866 >        }
2867          try {
2868 <            assertNull(h.join());
2869 <            r.assertInvoked();
2868 >            assertNull(h5.join());
2869 >            rs[5].assertInvoked();
2870          } catch (CompletionException ok) {
2871 <            checkCompletedWithWrappedCancellationException(h);
2872 <            r.assertNotInvoked();
2871 >            checkCompletedWithWrappedCancellationException(h5);
2872 >            rs[5].assertNotInvoked();
2873          }
2874  
2875 <        checkCancelled(g);
2876 <        checkCompletedNormally(f, v1);
2875 >        checkCancelled(f);
2876 >        checkCompletedNormally(g, v1);
2877 >        checkCompletedWithWrappedCancellationException(h0);
2878 >        checkCompletedWithWrappedCancellationException(h1);
2879 >        checkCompletedWithWrappedCancellationException(h2);
2880 >        checkCompletedWithWrappedCancellationException(h3);
2881 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2882      }}
2883  
2884 <    public void testRunAfterEither_sourceCancelled4() {
2884 >    /**
2885 >     * runAfterEither result completes exceptionally if action does
2886 >     */
2887 >    public void testRunAfterEither_actionFailed() {
2888          for (ExecutionMode m : ExecutionMode.values())
2367        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2889          for (Integer v1 : new Integer[] { 1, null })
2890 +        for (Integer v2 : new Integer[] { 2, null })
2891      {
2892          final CompletableFuture<Integer> f = new CompletableFuture<>();
2893          final CompletableFuture<Integer> g = new CompletableFuture<>();
2894 <        final Noop r = new Noop(m);
2894 >        final FailingRunnable[] rs = new FailingRunnable[6];
2895 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2896  
2897 <        assertTrue(f.cancel(mayInterruptIfRunning));
2898 <        g.complete(v1);
2899 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2900 <
2901 <        // unspecified behavior
2902 <        Integer v;
2903 <        try {
2904 <            assertNull(h.join());
2905 <            r.assertInvoked();
2906 <        } catch (CompletionException ok) {
2907 <            checkCompletedWithWrappedCancellationException(h);
2908 <            r.assertNotInvoked();
2909 <        }
2897 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2898 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2899 >        assertTrue(f.complete(v1));
2900 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2901 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2902 >        checkCompletedWithWrappedCFException(h0);
2903 >        checkCompletedWithWrappedCFException(h1);
2904 >        checkCompletedWithWrappedCFException(h2);
2905 >        checkCompletedWithWrappedCFException(h3);
2906 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2907 >        assertTrue(g.complete(v2));
2908 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2909 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2910 >        checkCompletedWithWrappedCFException(h4);
2911 >        checkCompletedWithWrappedCFException(h5);
2912  
2913 <        checkCancelled(f);
2914 <        checkCompletedNormally(g, v1);
2913 >        checkCompletedNormally(f, v1);
2914 >        checkCompletedNormally(g, v2);
2915 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2916      }}
2917  
2918      /**
# Line 2399 | Line 2925 | public class CompletableFutureTest exten
2925      {
2926          final CompletableFuture<Integer> f = new CompletableFuture<>();
2927          final CompletableFutureInc r = new CompletableFutureInc(m);
2928 <        if (!createIncomplete) f.complete(v1);
2928 >        if (!createIncomplete) assertTrue(f.complete(v1));
2929          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2930 <        if (createIncomplete) f.complete(v1);
2930 >        if (createIncomplete) assertTrue(f.complete(v1));
2931  
2932          checkCompletedNormally(g, inc(v1));
2933          checkCompletedNormally(f, v1);
2934 <        r.assertInvoked();
2934 >        r.assertValue(v1);
2935      }}
2936  
2937      /**
# Line 2423 | Line 2949 | public class CompletableFutureTest exten
2949          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2950          if (createIncomplete) f.completeExceptionally(ex);
2951  
2952 <        checkCompletedWithWrappedCFException(g, ex);
2953 <        checkCompletedWithWrappedCFException(f, ex);
2952 >        checkCompletedWithWrappedException(g, ex);
2953 >        checkCompletedExceptionally(f, ex);
2954          r.assertNotInvoked();
2955      }}
2956  
# Line 2439 | Line 2965 | public class CompletableFutureTest exten
2965          final CompletableFuture<Integer> f = new CompletableFuture<>();
2966          final FailingCompletableFutureFunction r
2967              = new FailingCompletableFutureFunction(m);
2968 <        if (!createIncomplete) f.complete(v1);
2968 >        if (!createIncomplete) assertTrue(f.complete(v1));
2969          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2970 <        if (createIncomplete) f.complete(v1);
2970 >        if (createIncomplete) assertTrue(f.complete(v1));
2971  
2972          checkCompletedWithWrappedCFException(g);
2973          checkCompletedNormally(f, v1);
# Line 2484 | Line 3010 | public class CompletableFutureTest exten
3010       * when all components complete normally
3011       */
3012      public void testAllOf_normal() throws Exception {
3013 <        for (int k = 1; k < 20; ++k) {
3013 >        for (int k = 1; k < 10; k++) {
3014              CompletableFuture<Integer>[] fs
3015                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3016 <            for (int i = 0; i < k; ++i)
3016 >            for (int i = 0; i < k; i++)
3017                  fs[i] = new CompletableFuture<>();
3018              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3019 <            for (int i = 0; i < k; ++i) {
3019 >            for (int i = 0; i < k; i++) {
3020                  checkIncomplete(f);
3021                  checkIncomplete(CompletableFuture.allOf(fs));
3022                  fs[i].complete(one);
# Line 2501 | Line 3027 | public class CompletableFutureTest exten
3027      }
3028  
3029      public void testAllOf_backwards() throws Exception {
3030 <        for (int k = 1; k < 20; ++k) {
3030 >        for (int k = 1; k < 10; k++) {
3031              CompletableFuture<Integer>[] fs
3032                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3033 <            for (int i = 0; i < k; ++i)
3033 >            for (int i = 0; i < k; i++)
3034                  fs[i] = new CompletableFuture<>();
3035              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3036              for (int i = k - 1; i >= 0; i--) {
# Line 2517 | Line 3043 | public class CompletableFutureTest exten
3043          }
3044      }
3045  
3046 +    public void testAllOf_exceptional() throws Exception {
3047 +        for (int k = 1; k < 10; k++) {
3048 +            CompletableFuture<Integer>[] fs
3049 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3050 +            CFException ex = new CFException();
3051 +            for (int i = 0; i < k; i++)
3052 +                fs[i] = new CompletableFuture<>();
3053 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3054 +            for (int i = 0; i < k; i++) {
3055 +                checkIncomplete(f);
3056 +                checkIncomplete(CompletableFuture.allOf(fs));
3057 +                if (i != k/2) {
3058 +                    fs[i].complete(i);
3059 +                    checkCompletedNormally(fs[i], i);
3060 +                } else {
3061 +                    fs[i].completeExceptionally(ex);
3062 +                    checkCompletedExceptionally(fs[i], ex);
3063 +                }
3064 +            }
3065 +            checkCompletedWithWrappedException(f, ex);
3066 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3067 +        }
3068 +    }
3069 +
3070      /**
3071       * anyOf(no component futures) returns an incomplete future
3072       */
3073      public void testAnyOf_empty() throws Exception {
3074 +        for (Integer v1 : new Integer[] { 1, null })
3075 +    {
3076          CompletableFuture<Object> f = CompletableFuture.anyOf();
3077          checkIncomplete(f);
3078 <    }
3078 >
3079 >        f.complete(v1);
3080 >        checkCompletedNormally(f, v1);
3081 >    }}
3082  
3083      /**
3084       * anyOf returns a future completed normally with a value when
3085       * a component future does
3086       */
3087      public void testAnyOf_normal() throws Exception {
3088 <        for (int k = 0; k < 10; ++k) {
3088 >        for (int k = 0; k < 10; k++) {
3089              CompletableFuture[] fs = new CompletableFuture[k];
3090 <            for (int i = 0; i < k; ++i)
3090 >            for (int i = 0; i < k; i++)
3091                  fs[i] = new CompletableFuture<>();
3092              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3093              checkIncomplete(f);
3094 <            for (int i = 0; i < k; ++i) {
3095 <                fs[i].complete(one);
3096 <                checkCompletedNormally(f, one);
3097 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3094 >            for (int i = 0; i < k; i++) {
3095 >                fs[i].complete(i);
3096 >                checkCompletedNormally(f, 0);
3097 >                int x = (int) CompletableFuture.anyOf(fs).join();
3098 >                assertTrue(0 <= x && x <= i);
3099 >            }
3100 >        }
3101 >    }
3102 >    public void testAnyOf_normal_backwards() throws Exception {
3103 >        for (int k = 0; k < 10; k++) {
3104 >            CompletableFuture[] fs = new CompletableFuture[k];
3105 >            for (int i = 0; i < k; i++)
3106 >                fs[i] = new CompletableFuture<>();
3107 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3108 >            checkIncomplete(f);
3109 >            for (int i = k - 1; i >= 0; i--) {
3110 >                fs[i].complete(i);
3111 >                checkCompletedNormally(f, k - 1);
3112 >                int x = (int) CompletableFuture.anyOf(fs).join();
3113 >                assertTrue(i <= x && x <= k - 1);
3114              }
3115          }
3116      }
# Line 2548 | Line 3119 | public class CompletableFutureTest exten
3119       * anyOf result completes exceptionally when any component does.
3120       */
3121      public void testAnyOf_exceptional() throws Exception {
3122 <        for (int k = 0; k < 10; ++k) {
3122 >        for (int k = 0; k < 10; k++) {
3123              CompletableFuture[] fs = new CompletableFuture[k];
3124 <            for (int i = 0; i < k; ++i)
3124 >            CFException[] exs = new CFException[k];
3125 >            for (int i = 0; i < k; i++) {
3126                  fs[i] = new CompletableFuture<>();
3127 +                exs[i] = new CFException();
3128 +            }
3129 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3130 +            checkIncomplete(f);
3131 +            for (int i = 0; i < k; i++) {
3132 +                fs[i].completeExceptionally(exs[i]);
3133 +                checkCompletedWithWrappedException(f, exs[0]);
3134 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3135 +            }
3136 +        }
3137 +    }
3138 +
3139 +    public void testAnyOf_exceptional_backwards() throws Exception {
3140 +        for (int k = 0; k < 10; k++) {
3141 +            CompletableFuture[] fs = new CompletableFuture[k];
3142 +            CFException[] exs = new CFException[k];
3143 +            for (int i = 0; i < k; i++) {
3144 +                fs[i] = new CompletableFuture<>();
3145 +                exs[i] = new CFException();
3146 +            }
3147              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3148              checkIncomplete(f);
3149 <            for (int i = 0; i < k; ++i) {
3150 <                fs[i].completeExceptionally(new CFException());
3151 <                checkCompletedWithWrappedCFException(f);
3149 >            for (int i = k - 1; i >= 0; i--) {
3150 >                fs[i].completeExceptionally(exs[i]);
3151 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3152                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3153              }
3154          }
# Line 2575 | Line 3167 | public class CompletableFutureTest exten
3167          Runnable[] throwingActions = {
3168              () -> CompletableFuture.supplyAsync(null),
3169              () -> CompletableFuture.supplyAsync(null, exec),
3170 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3170 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3171  
3172              () -> CompletableFuture.runAsync(null),
3173              () -> CompletableFuture.runAsync(null, exec),
# Line 2680 | Line 3272 | public class CompletableFutureTest exten
3272          assertSame(f, f.toCompletableFuture());
3273      }
3274  
3275 <    /**
2684 <     * whenComplete action executes on normal completion, propagating
2685 <     * source result.
2686 <     */
2687 <    public void testWhenComplete_normalCompletion1() {
2688 <        for (ExecutionMode m : ExecutionMode.values())
2689 <        for (boolean createIncomplete : new boolean[] { true, false })
2690 <        for (Integer v1 : new Integer[] { 1, null })
2691 <    {
2692 <        final AtomicInteger a = new AtomicInteger(0);
2693 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 <        if (!createIncomplete) f.complete(v1);
2695 <        final CompletableFuture<Integer> g = m.whenComplete
2696 <            (f,
2697 <             (Integer x, Throwable t) -> {
2698 <                threadAssertSame(x, v1);
2699 <                threadAssertNull(t);
2700 <                a.getAndIncrement();
2701 <            });
2702 <        if (createIncomplete) f.complete(v1);
3275 >    //--- tests of implementation details; not part of official tck ---
3276  
3277 <        checkCompletedNormally(g, v1);
3278 <        checkCompletedNormally(f, v1);
3279 <        assertEquals(1, a.get());
3280 <    }}
3277 >    Object resultOf(CompletableFuture<?> f) {
3278 >        try {
3279 >            java.lang.reflect.Field resultField
3280 >                = CompletableFuture.class.getDeclaredField("result");
3281 >            resultField.setAccessible(true);
3282 >            return resultField.get(f);
3283 >        } catch (Throwable t) { throw new AssertionError(t); }
3284 >    }
3285  
3286 <    /**
3287 <     * whenComplete action executes on exceptional completion, propagating
2711 <     * source result.
2712 <     */
2713 <    public void testWhenComplete_exceptionalCompletion() {
3286 >    public void testExceptionPropagationReusesResultObject() {
3287 >        if (!testImplementationDetails) return;
3288          for (ExecutionMode m : ExecutionMode.values())
2715        for (boolean createIncomplete : new boolean[] { true, false })
2716        for (Integer v1 : new Integer[] { 1, null })
3289      {
2718        final AtomicInteger a = new AtomicInteger(0);
3290          final CFException ex = new CFException();
3291 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3292 <        if (!createIncomplete) f.completeExceptionally(ex);
2722 <        final CompletableFuture<Integer> g = m.whenComplete
2723 <            (f,
2724 <             (Integer x, Throwable t) -> {
2725 <                threadAssertNull(x);
2726 <                threadAssertSame(t, ex);
2727 <                a.getAndIncrement();
2728 <            });
2729 <        if (createIncomplete) f.completeExceptionally(ex);
2730 <        checkCompletedWithWrappedCFException(f, ex);
2731 <        checkCompletedWithWrappedCFException(g, ex);
2732 <        assertEquals(1, a.get());
2733 <    }}
3291 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3292 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3293  
3294 <    /**
3295 <     * whenComplete action executes on cancelled source, propagating
2737 <     * CancellationException.
2738 <     */
2739 <    public void testWhenComplete_sourceCancelled() {
2740 <        for (ExecutionMode m : ExecutionMode.values())
2741 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2742 <        for (boolean createIncomplete : new boolean[] { true, false })
2743 <    {
2744 <        final AtomicInteger a = new AtomicInteger(0);
2745 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2746 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2747 <        final CompletableFuture<Integer> g = m.whenComplete
2748 <            (f,
2749 <             (Integer x, Throwable t) -> {
2750 <                threadAssertNull(x);
2751 <                threadAssertTrue(t instanceof CancellationException);
2752 <                a.getAndIncrement();
2753 <            });
2754 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3294 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3295 >            = new ArrayList<>();
3296  
3297 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3298 <        checkCompletedWithWrappedCancellationException(g);
3299 <        checkCancelled(f);
2759 <        assertEquals(1, a.get());
2760 <    }}
3297 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3298 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3299 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3300  
3301 <    /**
3302 <     * If a whenComplete action throws an exception when triggered by
3303 <     * a normal completion, it completes exceptionally
2765 <     */
2766 <    public void testWhenComplete_actionFailed() {
2767 <        for (boolean createIncomplete : new boolean[] { true, false })
2768 <        for (ExecutionMode m : ExecutionMode.values())
2769 <        for (Integer v1 : new Integer[] { 1, null })
2770 <    {
2771 <        final AtomicInteger a = new AtomicInteger(0);
2772 <        final CFException ex = new CFException();
2773 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2774 <        if (!createIncomplete) f.complete(v1);
2775 <        final CompletableFuture<Integer> g = m.whenComplete
2776 <            (f,
2777 <             (Integer x, Throwable t) -> {
2778 <                threadAssertSame(x, v1);
2779 <                threadAssertNull(t);
2780 <                a.getAndIncrement();
2781 <                throw ex;
2782 <            });
2783 <        if (createIncomplete) f.complete(v1);
2784 <        checkCompletedNormally(f, v1);
2785 <        checkCompletedWithWrappedCFException(g, ex);
2786 <        assertEquals(1, a.get());
2787 <    }}
3301 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3302 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3303 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3304  
3305 <    /**
3306 <     * If a whenComplete action throws an exception when triggered by
3307 <     * a source completion that also throws an exception, the source
2792 <     * exception takes precedence.
2793 <     */
2794 <    public void testWhenComplete_actionFailedSourceFailed() {
2795 <        for (boolean createIncomplete : new boolean[] { true, false })
2796 <        for (ExecutionMode m : ExecutionMode.values())
2797 <        for (Integer v1 : new Integer[] { 1, null })
2798 <    {
2799 <        final AtomicInteger a = new AtomicInteger(0);
2800 <        final CFException ex1 = new CFException();
2801 <        final CFException ex2 = new CFException();
2802 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3305 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3306 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3307 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3308  
3309 <        if (!createIncomplete) f.completeExceptionally(ex1);
2805 <        final CompletableFuture<Integer> g = m.whenComplete
2806 <            (f,
2807 <             (Integer x, Throwable t) -> {
2808 <                threadAssertSame(t, ex1);
2809 <                threadAssertNull(x);
2810 <                a.getAndIncrement();
2811 <                throw ex2;
2812 <            });
2813 <        if (createIncomplete) f.completeExceptionally(ex1);
3309 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3310  
3311 <        checkCompletedWithWrappedCFException(f, ex1);
3312 <        checkCompletedWithWrappedCFException(g, ex1);
3313 <        assertEquals(1, a.get());
3311 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3312 >
3313 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3314 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3315 >
3316 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3317 >                 fun : funs) {
3318 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3319 >            f.completeExceptionally(ex);
3320 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3321 >            checkCompletedWithWrappedException(src, ex);
3322 >            CompletableFuture<?> dep = fun.apply(src);
3323 >            checkCompletedWithWrappedException(dep, ex);
3324 >            assertSame(resultOf(src), resultOf(dep));
3325 >        }
3326 >
3327 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3328 >                 fun : funs) {
3329 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3330 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3331 >            CompletableFuture<?> dep = fun.apply(src);
3332 >            f.completeExceptionally(ex);
3333 >            checkCompletedWithWrappedException(src, ex);
3334 >            checkCompletedWithWrappedException(dep, ex);
3335 >            assertSame(resultOf(src), resultOf(dep));
3336 >        }
3337 >
3338 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3339 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3340 >                 fun : funs) {
3341 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3342 >            f.cancel(mayInterruptIfRunning);
3343 >            checkCancelled(f);
3344 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3345 >            checkCompletedWithWrappedCancellationException(src);
3346 >            CompletableFuture<?> dep = fun.apply(src);
3347 >            checkCompletedWithWrappedCancellationException(dep);
3348 >            assertSame(resultOf(src), resultOf(dep));
3349 >        }
3350 >
3351 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3352 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3353 >                 fun : funs) {
3354 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3355 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3356 >            CompletableFuture<?> dep = fun.apply(src);
3357 >            f.cancel(mayInterruptIfRunning);
3358 >            checkCancelled(f);
3359 >            checkCompletedWithWrappedCancellationException(src);
3360 >            checkCompletedWithWrappedCancellationException(dep);
3361 >            assertSame(resultOf(src), resultOf(dep));
3362 >        }
3363      }}
3364  
3365   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines