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.66 by jsr166, Fri Jun 6 19:19:04 2014 UTC vs.
Revision 1.96 by jsr166, Sat Nov 1 14:50:26 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines