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.181 by jsr166, Sat Nov 26 20:32:24 2016 UTC vs.
Revision 1.218 by jsr166, Sat Nov 24 18:24:14 2018 UTC

# Line 41 | Line 41 | import java.util.function.Function;
41   import java.util.function.Predicate;
42   import java.util.function.Supplier;
43  
44 import junit.framework.AssertionFailedError;
44   import junit.framework.Test;
45   import junit.framework.TestSuite;
46  
# Line 59 | Line 58 | public class CompletableFutureTest exten
58      void checkIncomplete(CompletableFuture<?> f) {
59          assertFalse(f.isDone());
60          assertFalse(f.isCancelled());
61 <        assertTrue(f.toString().contains("Not completed"));
61 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
62 >
63 >        Object result = null;
64          try {
65 <            assertNull(f.getNow(null));
65 >            result = f.getNow(null);
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
67 +        assertNull(result);
68 +
69          try {
70 <            f.get(0L, SECONDS);
70 >            f.get(randomExpiredTimeout(), randomTimeUnit());
71              shouldThrow();
72          }
73          catch (TimeoutException success) {}
74          catch (Throwable fail) { threadUnexpectedException(fail); }
75      }
76  
77 <    <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
78 <        checkTimedGet(f, value);
77 >    <T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
78 >        checkTimedGet(f, expectedValue);
79  
80 +        assertEquals(expectedValue, f.join());
81 +        assertEquals(expectedValue, f.getNow(null));
82 +
83 +        T result = null;
84          try {
85 <            assertEquals(value, f.join());
79 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
80 <        try {
81 <            assertEquals(value, f.getNow(null));
82 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
83 <        try {
84 <            assertEquals(value, f.get());
85 >            result = f.get();
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertEquals(expectedValue, result);
88 +
89          assertTrue(f.isDone());
90          assertFalse(f.isCancelled());
91          assertFalse(f.isCompletedExceptionally());
92 <        assertTrue(f.toString().contains("[Completed normally]"));
92 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
93      }
94  
95      /**
96       * Returns the "raw" internal exceptional completion of f,
97       * without any additional wrapping with CompletionException.
98       */
99 <    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
100 <        // handle (and whenComplete) can distinguish between "direct"
101 <        // and "wrapped" exceptional completion
102 <        return f.handle((U u, Throwable t) -> t).join();
99 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
100 >        // handle (and whenComplete and exceptionally) can distinguish
101 >        // between "direct" and "wrapped" exceptional completion
102 >        return f.handle((u, t) -> t).join();
103      }
104  
105      void checkCompletedExceptionally(CompletableFuture<?> f,
# Line 142 | Line 145 | public class CompletableFutureTest exten
145          assertFalse(f.isCancelled());
146          assertTrue(f.isDone());
147          assertTrue(f.isCompletedExceptionally());
148 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
148 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
149      }
150  
151      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
# Line 197 | Line 200 | public class CompletableFutureTest exten
200          assertTrue(f.isDone());
201          assertTrue(f.isCompletedExceptionally());
202          assertTrue(f.isCancelled());
203 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
203 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
204      }
205  
206      /**
# Line 296 | Line 299 | public class CompletableFutureTest exten
299          }
300  
301          f = new CompletableFuture<>();
302 <        f.completeExceptionally(ex = new CFException());
302 >        f.completeExceptionally(new CFException());
303          f.obtrudeValue(v1);
304          checkCompletedNormally(f, v1);
305          f.obtrudeException(ex = new CFException());
# Line 333 | Line 336 | public class CompletableFutureTest exten
336      /**
337       * toString indicates current completion state
338       */
339 <    public void testToString() {
340 <        CompletableFuture<String> f;
341 <
342 <        f = new CompletableFuture<String>();
343 <        assertTrue(f.toString().contains("[Not completed]"));
339 >    public void testToString_incomplete() {
340 >        CompletableFuture<String> f = new CompletableFuture<>();
341 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
342 >        if (testImplementationDetails)
343 >            assertEquals(identityString(f) + "[Not completed]",
344 >                         f.toString());
345 >    }
346  
347 +    public void testToString_normal() {
348 +        CompletableFuture<String> f = new CompletableFuture<>();
349          assertTrue(f.complete("foo"));
350 <        assertTrue(f.toString().contains("[Completed normally]"));
350 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
351 >        if (testImplementationDetails)
352 >            assertEquals(identityString(f) + "[Completed normally]",
353 >                         f.toString());
354 >    }
355  
356 <        f = new CompletableFuture<String>();
356 >    public void testToString_exception() {
357 >        CompletableFuture<String> f = new CompletableFuture<>();
358          assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
359 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
360 >        if (testImplementationDetails)
361 >            assertTrue(f.toString().startsWith(
362 >                               identityString(f) + "[Completed exceptionally: "));
363 >    }
364  
365 +    public void testToString_cancelled() {
366          for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
367 <            f = new CompletableFuture<String>();
367 >            CompletableFuture<String> f = new CompletableFuture<>();
368              assertTrue(f.cancel(mayInterruptIfRunning));
369 <            assertTrue(f.toString().contains("[Completed exceptionally]"));
369 >            assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
370 >            if (testImplementationDetails)
371 >                assertTrue(f.toString().startsWith(
372 >                                   identityString(f) + "[Completed exceptionally: "));
373          }
374      }
375  
# Line 531 | Line 551 | public class CompletableFutureTest exten
551          public CompletableFuture<Integer> apply(Integer x) {
552              invoked();
553              value = x;
554 <            CompletableFuture<Integer> f = new CompletableFuture<>();
555 <            assertTrue(f.complete(inc(x)));
556 <            return f;
554 >            return CompletableFuture.completedFuture(inc(x));
555 >        }
556 >    }
557 >
558 >    static class FailingExceptionalCompletableFutureFunction extends CheckedAction
559 >        implements Function<Throwable, CompletableFuture<Integer>>
560 >    {
561 >        final CFException ex;
562 >        FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
563 >        public CompletableFuture<Integer> apply(Throwable x) {
564 >            invoked();
565 >            throw ex;
566 >        }
567 >    }
568 >
569 >    static class ExceptionalCompletableFutureFunction extends CheckedAction
570 >        implements Function<Throwable, CompletionStage<Integer>> {
571 >        final Integer value = 3;
572 >        ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
573 >        public CompletionStage<Integer> apply(Throwable x) {
574 >            invoked();
575 >            return CompletableFuture.completedFuture(value);
576          }
577      }
578  
# Line 652 | Line 691 | public class CompletableFutureTest exten
691                   Function<? super T,U> a) {
692                  return f.applyToEither(g, a);
693              }
694 +            public <T> CompletableFuture<T> exceptionally
695 +                (CompletableFuture<T> f,
696 +                 Function<Throwable, ? extends T> fn) {
697 +                return f.exceptionally(fn);
698 +            }
699 +            public <T> CompletableFuture<T> exceptionallyCompose
700 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
701 +                return f.exceptionallyCompose(fn);
702 +            }
703          },
656
704          ASYNC {
705              public void checkExecutionMode() {
706                  assertEquals(defaultExecutorIsCommonPool,
# Line 726 | Line 773 | public class CompletableFutureTest exten
773                   Function<? super T,U> a) {
774                  return f.applyToEitherAsync(g, a);
775              }
776 +            public <T> CompletableFuture<T> exceptionally
777 +                (CompletableFuture<T> f,
778 +                 Function<Throwable, ? extends T> fn) {
779 +                return f.exceptionallyAsync(fn);
780 +            }
781 +
782 +            public <T> CompletableFuture<T> exceptionallyCompose
783 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
784 +                return f.exceptionallyComposeAsync(fn);
785 +            }
786 +
787          },
788  
789          EXECUTOR {
# Line 799 | Line 857 | public class CompletableFutureTest exten
857                   Function<? super T,U> a) {
858                  return f.applyToEitherAsync(g, a, new ThreadExecutor());
859              }
860 +            public <T> CompletableFuture<T> exceptionally
861 +                (CompletableFuture<T> f,
862 +                 Function<Throwable, ? extends T> fn) {
863 +                return f.exceptionallyAsync(fn, new ThreadExecutor());
864 +            }
865 +            public <T> CompletableFuture<T> exceptionallyCompose
866 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
867 +                return f.exceptionallyComposeAsync(fn, new ThreadExecutor());
868 +            }
869 +
870          };
871  
872          public abstract void checkExecutionMode();
# Line 841 | Line 909 | public class CompletableFutureTest exten
909              (CompletableFuture<T> f,
910               CompletionStage<? extends T> g,
911               Function<? super T,U> a);
912 +        public abstract <T> CompletableFuture<T> exceptionally
913 +            (CompletableFuture<T> f,
914 +             Function<Throwable, ? extends T> fn);
915 +        public abstract <T> CompletableFuture<T> exceptionallyCompose
916 +            (CompletableFuture<T> f,
917 +             Function<Throwable, ? extends CompletionStage<T>> fn);
918      }
919  
920      /**
# Line 848 | Line 922 | public class CompletableFutureTest exten
922       * normally, and source result is propagated
923       */
924      public void testExceptionally_normalCompletion() {
925 +        for (ExecutionMode m : ExecutionMode.values())
926          for (boolean createIncomplete : new boolean[] { true, false })
927          for (Integer v1 : new Integer[] { 1, null })
928      {
854        final AtomicInteger a = new AtomicInteger(0);
929          final CompletableFuture<Integer> f = new CompletableFuture<>();
930          if (!createIncomplete) assertTrue(f.complete(v1));
931 <        final CompletableFuture<Integer> g = f.exceptionally
932 <            ((Throwable t) -> {
859 <                a.getAndIncrement();
931 >        final CompletableFuture<Integer> g = m.exceptionally
932 >            (f, (Throwable t) -> {
933                  threadFail("should not be called");
934                  return null;            // unreached
935              });
# Line 864 | Line 937 | public class CompletableFutureTest exten
937  
938          checkCompletedNormally(g, v1);
939          checkCompletedNormally(f, v1);
867        assertEquals(0, a.get());
940      }}
941  
942      /**
# Line 872 | Line 944 | public class CompletableFutureTest exten
944       * exception
945       */
946      public void testExceptionally_exceptionalCompletion() {
947 +        for (ExecutionMode m : ExecutionMode.values())
948          for (boolean createIncomplete : new boolean[] { true, false })
949          for (Integer v1 : new Integer[] { 1, null })
950      {
951 <        final AtomicInteger a = new AtomicInteger(0);
951 >        final AtomicInteger ran = new AtomicInteger(0);
952          final CFException ex = new CFException();
953          final CompletableFuture<Integer> f = new CompletableFuture<>();
954          if (!createIncomplete) f.completeExceptionally(ex);
955 <        final CompletableFuture<Integer> g = f.exceptionally
956 <            ((Throwable t) -> {
957 <                ExecutionMode.SYNC.checkExecutionMode();
958 <                threadAssertSame(t, ex);
959 <                a.getAndIncrement();
955 >        final CompletableFuture<Integer> g = m.exceptionally
956 >            (f, (Throwable t) -> {
957 >                m.checkExecutionMode();
958 >                assertSame(t, ex);
959 >                ran.getAndIncrement();
960                  return v1;
961              });
962          if (createIncomplete) f.completeExceptionally(ex);
963  
964          checkCompletedNormally(g, v1);
965 <        assertEquals(1, a.get());
965 >        assertEquals(1, ran.get());
966      }}
967  
968      /**
# Line 897 | Line 970 | public class CompletableFutureTest exten
970       * exceptionally with that exception
971       */
972      public void testExceptionally_exceptionalCompletionActionFailed() {
973 +        for (ExecutionMode m : ExecutionMode.values())
974          for (boolean createIncomplete : new boolean[] { true, false })
975      {
976 <        final AtomicInteger a = new AtomicInteger(0);
976 >        final AtomicInteger ran = new AtomicInteger(0);
977          final CFException ex1 = new CFException();
978          final CFException ex2 = new CFException();
979          final CompletableFuture<Integer> f = new CompletableFuture<>();
980          if (!createIncomplete) f.completeExceptionally(ex1);
981 <        final CompletableFuture<Integer> g = f.exceptionally
982 <            ((Throwable t) -> {
983 <                ExecutionMode.SYNC.checkExecutionMode();
984 <                threadAssertSame(t, ex1);
985 <                a.getAndIncrement();
981 >        final CompletableFuture<Integer> g = m.exceptionally
982 >            (f, (Throwable t) -> {
983 >                m.checkExecutionMode();
984 >                assertSame(t, ex1);
985 >                ran.getAndIncrement();
986                  throw ex2;
987              });
988          if (createIncomplete) f.completeExceptionally(ex1);
989  
990          checkCompletedWithWrappedException(g, ex2);
991          checkCompletedExceptionally(f, ex1);
992 <        assertEquals(1, a.get());
992 >        assertEquals(1, ran.get());
993      }}
994  
995      /**
# Line 927 | Line 1001 | public class CompletableFutureTest exten
1001          for (boolean createIncomplete : new boolean[] { true, false })
1002          for (Integer v1 : new Integer[] { 1, null })
1003      {
1004 <        final AtomicInteger a = new AtomicInteger(0);
1004 >        final AtomicInteger ran = new AtomicInteger(0);
1005          final CompletableFuture<Integer> f = new CompletableFuture<>();
1006          if (!createIncomplete) assertTrue(f.complete(v1));
1007          final CompletableFuture<Integer> g = m.whenComplete
1008              (f,
1009               (Integer result, Throwable t) -> {
1010                  m.checkExecutionMode();
1011 <                threadAssertSame(result, v1);
1012 <                threadAssertNull(t);
1013 <                a.getAndIncrement();
1011 >                assertSame(result, v1);
1012 >                assertNull(t);
1013 >                ran.getAndIncrement();
1014              });
1015          if (createIncomplete) assertTrue(f.complete(v1));
1016  
1017          checkCompletedNormally(g, v1);
1018          checkCompletedNormally(f, v1);
1019 <        assertEquals(1, a.get());
1019 >        assertEquals(1, ran.get());
1020      }}
1021  
1022      /**
# Line 953 | Line 1027 | public class CompletableFutureTest exten
1027          for (ExecutionMode m : ExecutionMode.values())
1028          for (boolean createIncomplete : new boolean[] { true, false })
1029      {
1030 <        final AtomicInteger a = new AtomicInteger(0);
1030 >        final AtomicInteger ran = new AtomicInteger(0);
1031          final CFException ex = new CFException();
1032          final CompletableFuture<Integer> f = new CompletableFuture<>();
1033          if (!createIncomplete) f.completeExceptionally(ex);
# Line 961 | Line 1035 | public class CompletableFutureTest exten
1035              (f,
1036               (Integer result, Throwable t) -> {
1037                  m.checkExecutionMode();
1038 <                threadAssertNull(result);
1039 <                threadAssertSame(t, ex);
1040 <                a.getAndIncrement();
1038 >                assertNull(result);
1039 >                assertSame(t, ex);
1040 >                ran.getAndIncrement();
1041              });
1042          if (createIncomplete) f.completeExceptionally(ex);
1043  
1044          checkCompletedWithWrappedException(g, ex);
1045          checkCompletedExceptionally(f, ex);
1046 <        assertEquals(1, a.get());
1046 >        assertEquals(1, ran.get());
1047      }}
1048  
1049      /**
# Line 981 | Line 1055 | public class CompletableFutureTest exten
1055          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1056          for (boolean createIncomplete : new boolean[] { true, false })
1057      {
1058 <        final AtomicInteger a = new AtomicInteger(0);
1058 >        final AtomicInteger ran = new AtomicInteger(0);
1059          final CompletableFuture<Integer> f = new CompletableFuture<>();
1060          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1061          final CompletableFuture<Integer> g = m.whenComplete
1062              (f,
1063               (Integer result, Throwable t) -> {
1064                  m.checkExecutionMode();
1065 <                threadAssertNull(result);
1066 <                threadAssertTrue(t instanceof CancellationException);
1067 <                a.getAndIncrement();
1065 >                assertNull(result);
1066 >                assertTrue(t instanceof CancellationException);
1067 >                ran.getAndIncrement();
1068              });
1069          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1070  
1071          checkCompletedWithWrappedCancellationException(g);
1072          checkCancelled(f);
1073 <        assertEquals(1, a.get());
1073 >        assertEquals(1, ran.get());
1074      }}
1075  
1076      /**
# Line 1008 | Line 1082 | public class CompletableFutureTest exten
1082          for (ExecutionMode m : ExecutionMode.values())
1083          for (Integer v1 : new Integer[] { 1, null })
1084      {
1085 <        final AtomicInteger a = new AtomicInteger(0);
1085 >        final AtomicInteger ran = new AtomicInteger(0);
1086          final CFException ex = new CFException();
1087          final CompletableFuture<Integer> f = new CompletableFuture<>();
1088          if (!createIncomplete) assertTrue(f.complete(v1));
# Line 1016 | Line 1090 | public class CompletableFutureTest exten
1090              (f,
1091               (Integer result, Throwable t) -> {
1092                  m.checkExecutionMode();
1093 <                threadAssertSame(result, v1);
1094 <                threadAssertNull(t);
1095 <                a.getAndIncrement();
1093 >                assertSame(result, v1);
1094 >                assertNull(t);
1095 >                ran.getAndIncrement();
1096                  throw ex;
1097              });
1098          if (createIncomplete) assertTrue(f.complete(v1));
1099  
1100          checkCompletedWithWrappedException(g, ex);
1101          checkCompletedNormally(f, v1);
1102 <        assertEquals(1, a.get());
1102 >        assertEquals(1, ran.get());
1103      }}
1104  
1105      /**
# Line 1037 | Line 1111 | public class CompletableFutureTest exten
1111          for (boolean createIncomplete : new boolean[] { true, false })
1112          for (ExecutionMode m : ExecutionMode.values())
1113      {
1114 <        final AtomicInteger a = new AtomicInteger(0);
1114 >        final AtomicInteger ran = new AtomicInteger(0);
1115          final CFException ex1 = new CFException();
1116          final CFException ex2 = new CFException();
1117          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 1047 | Line 1121 | public class CompletableFutureTest exten
1121              (f,
1122               (Integer result, Throwable t) -> {
1123                  m.checkExecutionMode();
1124 <                threadAssertSame(t, ex1);
1125 <                threadAssertNull(result);
1126 <                a.getAndIncrement();
1124 >                assertSame(t, ex1);
1125 >                assertNull(result);
1126 >                ran.getAndIncrement();
1127                  throw ex2;
1128              });
1129          if (createIncomplete) f.completeExceptionally(ex1);
# Line 1060 | Line 1134 | public class CompletableFutureTest exten
1134              assertEquals(1, ex1.getSuppressed().length);
1135              assertSame(ex2, ex1.getSuppressed()[0]);
1136          }
1137 <        assertEquals(1, a.get());
1137 >        assertEquals(1, ran.get());
1138      }}
1139  
1140      /**
# Line 1073 | Line 1147 | public class CompletableFutureTest exten
1147          for (Integer v1 : new Integer[] { 1, null })
1148      {
1149          final CompletableFuture<Integer> f = new CompletableFuture<>();
1150 <        final AtomicInteger a = new AtomicInteger(0);
1150 >        final AtomicInteger ran = new AtomicInteger(0);
1151          if (!createIncomplete) assertTrue(f.complete(v1));
1152          final CompletableFuture<Integer> g = m.handle
1153              (f,
1154               (Integer result, Throwable t) -> {
1155                  m.checkExecutionMode();
1156 <                threadAssertSame(result, v1);
1157 <                threadAssertNull(t);
1158 <                a.getAndIncrement();
1156 >                assertSame(result, v1);
1157 >                assertNull(t);
1158 >                ran.getAndIncrement();
1159                  return inc(v1);
1160              });
1161          if (createIncomplete) assertTrue(f.complete(v1));
1162  
1163          checkCompletedNormally(g, inc(v1));
1164          checkCompletedNormally(f, v1);
1165 <        assertEquals(1, a.get());
1165 >        assertEquals(1, ran.get());
1166      }}
1167  
1168      /**
# Line 1101 | Line 1175 | public class CompletableFutureTest exten
1175          for (Integer v1 : new Integer[] { 1, null })
1176      {
1177          final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 <        final AtomicInteger a = new AtomicInteger(0);
1178 >        final AtomicInteger ran = new AtomicInteger(0);
1179          final CFException ex = new CFException();
1180          if (!createIncomplete) f.completeExceptionally(ex);
1181          final CompletableFuture<Integer> g = m.handle
1182              (f,
1183               (Integer result, Throwable t) -> {
1184                  m.checkExecutionMode();
1185 <                threadAssertNull(result);
1186 <                threadAssertSame(t, ex);
1187 <                a.getAndIncrement();
1185 >                assertNull(result);
1186 >                assertSame(t, ex);
1187 >                ran.getAndIncrement();
1188                  return v1;
1189              });
1190          if (createIncomplete) f.completeExceptionally(ex);
1191  
1192          checkCompletedNormally(g, v1);
1193          checkCompletedExceptionally(f, ex);
1194 <        assertEquals(1, a.get());
1194 >        assertEquals(1, ran.get());
1195      }}
1196  
1197      /**
# Line 1131 | Line 1205 | public class CompletableFutureTest exten
1205          for (Integer v1 : new Integer[] { 1, null })
1206      {
1207          final CompletableFuture<Integer> f = new CompletableFuture<>();
1208 <        final AtomicInteger a = new AtomicInteger(0);
1208 >        final AtomicInteger ran = new AtomicInteger(0);
1209          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1210          final CompletableFuture<Integer> g = m.handle
1211              (f,
1212               (Integer result, Throwable t) -> {
1213                  m.checkExecutionMode();
1214 <                threadAssertNull(result);
1215 <                threadAssertTrue(t instanceof CancellationException);
1216 <                a.getAndIncrement();
1214 >                assertNull(result);
1215 >                assertTrue(t instanceof CancellationException);
1216 >                ran.getAndIncrement();
1217                  return v1;
1218              });
1219          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1220  
1221          checkCompletedNormally(g, v1);
1222          checkCancelled(f);
1223 <        assertEquals(1, a.get());
1223 >        assertEquals(1, ran.get());
1224      }}
1225  
1226      /**
# Line 1159 | Line 1233 | public class CompletableFutureTest exten
1233          for (Integer v1 : new Integer[] { 1, null })
1234      {
1235          final CompletableFuture<Integer> f = new CompletableFuture<>();
1236 <        final AtomicInteger a = new AtomicInteger(0);
1236 >        final AtomicInteger ran = new AtomicInteger(0);
1237          final CFException ex = new CFException();
1238          if (!createIncomplete) assertTrue(f.complete(v1));
1239          final CompletableFuture<Integer> g = m.handle
1240              (f,
1241               (Integer result, Throwable t) -> {
1242                  m.checkExecutionMode();
1243 <                threadAssertSame(result, v1);
1244 <                threadAssertNull(t);
1245 <                a.getAndIncrement();
1243 >                assertSame(result, v1);
1244 >                assertNull(t);
1245 >                ran.getAndIncrement();
1246                  throw ex;
1247              });
1248          if (createIncomplete) assertTrue(f.complete(v1));
1249  
1250          checkCompletedWithWrappedException(g, ex);
1251          checkCompletedNormally(f, v1);
1252 <        assertEquals(1, a.get());
1252 >        assertEquals(1, ran.get());
1253      }}
1254  
1255      /**
# Line 1187 | Line 1261 | public class CompletableFutureTest exten
1261          for (boolean createIncomplete : new boolean[] { true, false })
1262          for (ExecutionMode m : ExecutionMode.values())
1263      {
1264 <        final AtomicInteger a = new AtomicInteger(0);
1264 >        final AtomicInteger ran = new AtomicInteger(0);
1265          final CFException ex1 = new CFException();
1266          final CFException ex2 = new CFException();
1267          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 1197 | Line 1271 | public class CompletableFutureTest exten
1271              (f,
1272               (Integer result, Throwable t) -> {
1273                  m.checkExecutionMode();
1274 <                threadAssertNull(result);
1275 <                threadAssertSame(ex1, t);
1276 <                a.getAndIncrement();
1274 >                assertNull(result);
1275 >                assertSame(ex1, t);
1276 >                ran.getAndIncrement();
1277                  throw ex2;
1278              });
1279          if (createIncomplete) f.completeExceptionally(ex1);
1280  
1281          checkCompletedWithWrappedException(g, ex2);
1282          checkCompletedExceptionally(f, ex1);
1283 <        assertEquals(1, a.get());
1283 >        assertEquals(1, ran.get());
1284      }}
1285  
1286      /**
# Line 1242 | Line 1316 | public class CompletableFutureTest exten
1316          r.assertInvoked();
1317      }}
1318  
1319 +    @SuppressWarnings("FutureReturnValueIgnored")
1320      public void testRunAsync_rejectingExecutor() {
1321          CountingRejectingExecutor e = new CountingRejectingExecutor();
1322          try {
# Line 1288 | Line 1363 | public class CompletableFutureTest exten
1363          r.assertInvoked();
1364      }}
1365  
1366 +    @SuppressWarnings("FutureReturnValueIgnored")
1367      public void testSupplyAsync_rejectingExecutor() {
1368          CountingRejectingExecutor e = new CountingRejectingExecutor();
1369          try {
# Line 2562 | Line 2638 | public class CompletableFutureTest exten
2638  
2639          // unspecified behavior - both source completions available
2640          try {
2641 <            assertEquals(null, h0.join());
2641 >            assertNull(h0.join());
2642              rs[0].assertValue(v1);
2643          } catch (CompletionException ok) {
2644              checkCompletedWithWrappedException(h0, ex);
2645              rs[0].assertNotInvoked();
2646          }
2647          try {
2648 <            assertEquals(null, h1.join());
2648 >            assertNull(h1.join());
2649              rs[1].assertValue(v1);
2650          } catch (CompletionException ok) {
2651              checkCompletedWithWrappedException(h1, ex);
2652              rs[1].assertNotInvoked();
2653          }
2654          try {
2655 <            assertEquals(null, h2.join());
2655 >            assertNull(h2.join());
2656              rs[2].assertValue(v1);
2657          } catch (CompletionException ok) {
2658              checkCompletedWithWrappedException(h2, ex);
2659              rs[2].assertNotInvoked();
2660          }
2661          try {
2662 <            assertEquals(null, h3.join());
2662 >            assertNull(h3.join());
2663              rs[3].assertValue(v1);
2664          } catch (CompletionException ok) {
2665              checkCompletedWithWrappedException(h3, ex);
# Line 2822 | Line 2898 | public class CompletableFutureTest exten
2898  
2899          // unspecified behavior - both source completions available
2900          try {
2901 <            assertEquals(null, h0.join());
2901 >            assertNull(h0.join());
2902              rs[0].assertInvoked();
2903          } catch (CompletionException ok) {
2904              checkCompletedWithWrappedException(h0, ex);
2905              rs[0].assertNotInvoked();
2906          }
2907          try {
2908 <            assertEquals(null, h1.join());
2908 >            assertNull(h1.join());
2909              rs[1].assertInvoked();
2910          } catch (CompletionException ok) {
2911              checkCompletedWithWrappedException(h1, ex);
2912              rs[1].assertNotInvoked();
2913          }
2914          try {
2915 <            assertEquals(null, h2.join());
2915 >            assertNull(h2.join());
2916              rs[2].assertInvoked();
2917          } catch (CompletionException ok) {
2918              checkCompletedWithWrappedException(h2, ex);
2919              rs[2].assertNotInvoked();
2920          }
2921          try {
2922 <            assertEquals(null, h3.join());
2922 >            assertNull(h3.join());
2923              rs[3].assertInvoked();
2924          } catch (CompletionException ok) {
2925              checkCompletedWithWrappedException(h3, ex);
# Line 3040 | Line 3116 | public class CompletableFutureTest exten
3116          case 0:
3117              assertTrue(f.complete(v1));
3118              assertTrue(g.completeExceptionally(ex));
3119 <            h = m.thenCompose(f, (x -> g));
3119 >            h = m.thenCompose(f, x -> g);
3120              break;
3121          case 1:
3122              assertTrue(f.complete(v1));
3123 <            h = m.thenCompose(f, (x -> g));
3123 >            h = m.thenCompose(f, x -> g);
3124              assertTrue(g.completeExceptionally(ex));
3125              break;
3126          case 2:
3127              assertTrue(g.completeExceptionally(ex));
3128              assertTrue(f.complete(v1));
3129 <            h = m.thenCompose(f, (x -> g));
3129 >            h = m.thenCompose(f, x -> g);
3130              break;
3131          case 3:
3132              assertTrue(g.completeExceptionally(ex));
3133 <            h = m.thenCompose(f, (x -> g));
3133 >            h = m.thenCompose(f, x -> g);
3134              assertTrue(f.complete(v1));
3135              break;
3136          case 4:
3137 <            h = m.thenCompose(f, (x -> g));
3137 >            h = m.thenCompose(f, x -> g);
3138              assertTrue(f.complete(v1));
3139              assertTrue(g.completeExceptionally(ex));
3140              break;
3141          case 5:
3142 <            h = m.thenCompose(f, (x -> g));
3142 >            h = m.thenCompose(f, x -> g);
3143              assertTrue(f.complete(v1));
3144              assertTrue(g.completeExceptionally(ex));
3145              break;
# Line 3075 | Line 3151 | public class CompletableFutureTest exten
3151          checkCompletedNormally(f, v1);
3152      }}
3153  
3154 +    /**
3155 +     * exceptionallyCompose result completes normally after normal
3156 +     * completion of source
3157 +     */
3158 +    public void testExceptionallyCompose_normalCompletion() {
3159 +        for (ExecutionMode m : ExecutionMode.values())
3160 +        for (boolean createIncomplete : new boolean[] { true, false })
3161 +        for (Integer v1 : new Integer[] { 1, null })
3162 +    {
3163 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3164 +        final ExceptionalCompletableFutureFunction r =
3165 +            new ExceptionalCompletableFutureFunction(m);
3166 +        if (!createIncomplete) assertTrue(f.complete(v1));
3167 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3168 +        if (createIncomplete) assertTrue(f.complete(v1));
3169 +
3170 +        checkCompletedNormally(f, v1);
3171 +        checkCompletedNormally(g, v1);
3172 +        r.assertNotInvoked();
3173 +    }}
3174 +
3175 +    /**
3176 +     * exceptionallyCompose result completes normally after exceptional
3177 +     * completion of source
3178 +     */
3179 +    public void testExceptionallyCompose_exceptionalCompletion() {
3180 +        for (ExecutionMode m : ExecutionMode.values())
3181 +        for (boolean createIncomplete : new boolean[] { true, false })
3182 +    {
3183 +        final CFException ex = new CFException();
3184 +        final ExceptionalCompletableFutureFunction r =
3185 +            new ExceptionalCompletableFutureFunction(m);
3186 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3187 +        if (!createIncomplete) f.completeExceptionally(ex);
3188 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3189 +        if (createIncomplete) f.completeExceptionally(ex);
3190 +
3191 +        checkCompletedExceptionally(f, ex);
3192 +        checkCompletedNormally(g, r.value);
3193 +        r.assertInvoked();
3194 +    }}
3195 +
3196 +    /**
3197 +     * exceptionallyCompose completes exceptionally on exception if action does
3198 +     */
3199 +    public void testExceptionallyCompose_actionFailed() {
3200 +        for (ExecutionMode m : ExecutionMode.values())
3201 +        for (boolean createIncomplete : new boolean[] { true, false })
3202 +    {
3203 +        final CFException ex = new CFException();
3204 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3205 +        final FailingExceptionalCompletableFutureFunction r
3206 +            = new FailingExceptionalCompletableFutureFunction(m);
3207 +        if (!createIncomplete) f.completeExceptionally(ex);
3208 +        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3209 +        if (createIncomplete) f.completeExceptionally(ex);
3210 +
3211 +        checkCompletedExceptionally(f, ex);
3212 +        checkCompletedWithWrappedException(g, r.ex);
3213 +        r.assertInvoked();
3214 +    }}
3215 +
3216 +    /**
3217 +     * exceptionallyCompose result completes exceptionally if the
3218 +     * result of the action does
3219 +     */
3220 +    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3221 +        for (ExecutionMode m : ExecutionMode.values())
3222 +        for (int order = 0; order < 6; order++)
3223 +    {
3224 +        final CFException ex0 = new CFException();
3225 +        final CFException ex = new CFException();
3226 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3227 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3228 +        final CompletableFuture<Integer> h;
3229 +        // Test all permutations of orders
3230 +        switch (order) {
3231 +        case 0:
3232 +            assertTrue(f.completeExceptionally(ex0));
3233 +            assertTrue(g.completeExceptionally(ex));
3234 +            h = m.exceptionallyCompose(f, x -> g);
3235 +            break;
3236 +        case 1:
3237 +            assertTrue(f.completeExceptionally(ex0));
3238 +            h = m.exceptionallyCompose(f, x -> g);
3239 +            assertTrue(g.completeExceptionally(ex));
3240 +            break;
3241 +        case 2:
3242 +            assertTrue(g.completeExceptionally(ex));
3243 +            assertTrue(f.completeExceptionally(ex0));
3244 +            h = m.exceptionallyCompose(f, x -> g);
3245 +            break;
3246 +        case 3:
3247 +            assertTrue(g.completeExceptionally(ex));
3248 +            h = m.exceptionallyCompose(f, x -> g);
3249 +            assertTrue(f.completeExceptionally(ex0));
3250 +            break;
3251 +        case 4:
3252 +            h = m.exceptionallyCompose(f, x -> g);
3253 +            assertTrue(f.completeExceptionally(ex0));
3254 +            assertTrue(g.completeExceptionally(ex));
3255 +            break;
3256 +        case 5:
3257 +            h = m.exceptionallyCompose(f, x -> g);
3258 +            assertTrue(f.completeExceptionally(ex0));
3259 +            assertTrue(g.completeExceptionally(ex));
3260 +            break;
3261 +        default: throw new AssertionError();
3262 +        }
3263 +
3264 +        checkCompletedExceptionally(g, ex);
3265 +        checkCompletedWithWrappedException(h, ex);
3266 +        checkCompletedExceptionally(f, ex0);
3267 +    }}
3268 +
3269      // other static methods
3270  
3271      /**
# Line 3238 | Line 3429 | public class CompletableFutureTest exten
3429      /**
3430       * Completion methods throw NullPointerException with null arguments
3431       */
3432 +    @SuppressWarnings("FutureReturnValueIgnored")
3433      public void testNPE() {
3434          CompletableFuture<Integer> f = new CompletableFuture<>();
3435          CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 3453 | Line 3645 | public class CompletableFutureTest exten
3645          final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3646          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3647  
3456        List<CompletableFuture<?>> futures = new ArrayList<>();
3457
3458        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3459        srcs.add(complete);
3460        srcs.add(incomplete);
3461
3648          List<CompletableFuture<?>> fs = new ArrayList<>();
3649          fs.add(incomplete.thenRunAsync(() -> {}, e));
3650          fs.add(incomplete.thenAcceptAsync(z -> {}, e));
# Line 3532 | Line 3718 | public class CompletableFutureTest exten
3718       */
3719      public void testCompletedStage() {
3720          AtomicInteger x = new AtomicInteger(0);
3721 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3721 >        AtomicReference<Throwable> r = new AtomicReference<>();
3722          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3723          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3724          assertEquals(x.get(), 1);
# Line 3634 | Line 3820 | public class CompletableFutureTest exten
3820          CompletableFuture<Integer> f = new CompletableFuture<>();
3821          CompletionStage<Integer> g = f.minimalCompletionStage();
3822          AtomicInteger x = new AtomicInteger(0);
3823 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3823 >        AtomicReference<Throwable> r = new AtomicReference<>();
3824          checkIncomplete(f);
3825          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3826          f.complete(1);
# Line 3651 | Line 3837 | public class CompletableFutureTest exten
3837          CompletableFuture<Integer> f = new CompletableFuture<>();
3838          CompletionStage<Integer> g = f.minimalCompletionStage();
3839          AtomicInteger x = new AtomicInteger(0);
3840 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3840 >        AtomicReference<Throwable> r = new AtomicReference<>();
3841          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3842          checkIncomplete(f);
3843          CFException ex = new CFException();
# Line 3669 | Line 3855 | public class CompletableFutureTest exten
3855          CFException ex = new CFException();
3856          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3857          AtomicInteger x = new AtomicInteger(0);
3858 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3858 >        AtomicReference<Throwable> r = new AtomicReference<>();
3859          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3860          assertEquals(x.get(), 0);
3861          assertEquals(r.get(), ex);
# Line 4174 | Line 4360 | public class CompletableFutureTest exten
4360          static void assertZero(CompletableFuture<?> f) {
4361              try {
4362                  f.getNow(null);
4363 <                throw new AssertionFailedError("should throw");
4363 >                throw new AssertionError("should throw");
4364              } catch (CompletionException success) {
4365                  assertTrue(success.getCause() instanceof ZeroException);
4366              }
# Line 4299 | Line 4485 | public class CompletableFutureTest exten
4485      }
4486  
4487      /** Test long recursive chains of CompletableFutures with cascading completions */
4488 +    @SuppressWarnings("FutureReturnValueIgnored")
4489      public void testRecursiveChains() throws Throwable {
4490          for (ExecutionMode m : ExecutionMode.values())
4491          for (boolean addDeadEnds : new boolean[] { true, false })
# Line 4323 | Line 4510 | public class CompletableFutureTest exten
4510       * A single CompletableFuture with many dependents.
4511       * A demo of scalability - runtime is O(n).
4512       */
4513 +    @SuppressWarnings("FutureReturnValueIgnored")
4514      public void testManyDependents() throws Throwable {
4515          final int n = expensiveTests ? 1_000_000 : 10;
4516          final CompletableFuture<Void> head = new CompletableFuture<>();
# Line 4352 | Line 4540 | public class CompletableFutureTest exten
4540      }
4541  
4542      /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4543 +    @SuppressWarnings("FutureReturnValueIgnored")
4544      public void testCoCompletionGarbageRetention() throws Throwable {
4545          final int n = expensiveTests ? 1_000_000 : 10;
4546          final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
# Line 4370 | Line 4559 | public class CompletableFutureTest exten
4559              f.complete(null);
4560  
4561              f = new CompletableFuture<>();
4562 <            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4562 >            CompletableFuture.anyOf(f, incomplete);
4563              f.complete(null);
4564          }
4565  
# Line 4388 | Line 4577 | public class CompletableFutureTest exten
4577              f.complete(null);
4578  
4579              f = new CompletableFuture<>();
4580 <            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4580 >            CompletableFuture.anyOf(incomplete, f);
4581              f.complete(null);
4582          }
4583      }
# Line 4482 | Line 4671 | public class CompletableFutureTest exten
4671   //         return stage.toCompletableFuture().copy().isDone();
4672   //     }
4673  
4674 +    // For testing default implementations
4675 +    // Only non-default interface methods defined.
4676 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4677 +        final CompletableFuture<T> cf;
4678 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4679 +        public CompletableFuture<T> toCompletableFuture() {
4680 +            return cf; }
4681 +        public CompletionStage<Void> thenRun
4682 +            (Runnable action) {
4683 +            return cf.thenRun(action); }
4684 +        public CompletionStage<Void> thenRunAsync
4685 +            (Runnable action) {
4686 +            return cf.thenRunAsync(action); }
4687 +        public CompletionStage<Void> thenRunAsync
4688 +            (Runnable action,
4689 +             Executor executor) {
4690 +            return cf.thenRunAsync(action, executor); }
4691 +        public CompletionStage<Void> thenAccept
4692 +            (Consumer<? super T> action) {
4693 +            return cf.thenAccept(action); }
4694 +        public CompletionStage<Void> thenAcceptAsync
4695 +            (Consumer<? super T> action) {
4696 +            return cf.thenAcceptAsync(action); }
4697 +        public CompletionStage<Void> thenAcceptAsync
4698 +            (Consumer<? super T> action,
4699 +             Executor executor) {
4700 +            return cf.thenAcceptAsync(action, executor); }
4701 +        public <U> CompletionStage<U> thenApply
4702 +            (Function<? super T,? extends U> a) {
4703 +            return cf.thenApply(a); }
4704 +        public <U> CompletionStage<U> thenApplyAsync
4705 +            (Function<? super T,? extends U> fn) {
4706 +            return cf.thenApplyAsync(fn); }
4707 +        public <U> CompletionStage<U> thenApplyAsync
4708 +            (Function<? super T,? extends U> fn,
4709 +             Executor executor) {
4710 +            return cf.thenApplyAsync(fn, executor); }
4711 +        public <U,V> CompletionStage<V> thenCombine
4712 +            (CompletionStage<? extends U> other,
4713 +             BiFunction<? super T,? super U,? extends V> fn) {
4714 +            return cf.thenCombine(other, fn); }
4715 +        public <U,V> CompletionStage<V> thenCombineAsync
4716 +            (CompletionStage<? extends U> other,
4717 +             BiFunction<? super T,? super U,? extends V> fn) {
4718 +            return cf.thenCombineAsync(other, fn); }
4719 +        public <U,V> CompletionStage<V> thenCombineAsync
4720 +            (CompletionStage<? extends U> other,
4721 +             BiFunction<? super T,? super U,? extends V> fn,
4722 +             Executor executor) {
4723 +            return cf.thenCombineAsync(other, fn, executor); }
4724 +        public <U> CompletionStage<Void> thenAcceptBoth
4725 +            (CompletionStage<? extends U> other,
4726 +             BiConsumer<? super T, ? super U> action) {
4727 +            return cf.thenAcceptBoth(other, action); }
4728 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4729 +            (CompletionStage<? extends U> other,
4730 +             BiConsumer<? super T, ? super U> action) {
4731 +            return cf.thenAcceptBothAsync(other, action); }
4732 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4733 +            (CompletionStage<? extends U> other,
4734 +             BiConsumer<? super T, ? super U> action,
4735 +             Executor executor) {
4736 +            return cf.thenAcceptBothAsync(other, action, executor); }
4737 +        public CompletionStage<Void> runAfterBoth
4738 +            (CompletionStage<?> other,
4739 +             Runnable action) {
4740 +            return cf.runAfterBoth(other, action); }
4741 +        public CompletionStage<Void> runAfterBothAsync
4742 +            (CompletionStage<?> other,
4743 +             Runnable action) {
4744 +            return cf.runAfterBothAsync(other, action); }
4745 +        public CompletionStage<Void> runAfterBothAsync
4746 +            (CompletionStage<?> other,
4747 +             Runnable action,
4748 +             Executor executor) {
4749 +            return cf.runAfterBothAsync(other, action, executor); }
4750 +        public <U> CompletionStage<U> applyToEither
4751 +            (CompletionStage<? extends T> other,
4752 +             Function<? super T, U> fn) {
4753 +            return cf.applyToEither(other, fn); }
4754 +        public <U> CompletionStage<U> applyToEitherAsync
4755 +            (CompletionStage<? extends T> other,
4756 +             Function<? super T, U> fn) {
4757 +            return cf.applyToEitherAsync(other, fn); }
4758 +        public <U> CompletionStage<U> applyToEitherAsync
4759 +            (CompletionStage<? extends T> other,
4760 +             Function<? super T, U> fn,
4761 +             Executor executor) {
4762 +            return cf.applyToEitherAsync(other, fn, executor); }
4763 +        public CompletionStage<Void> acceptEither
4764 +            (CompletionStage<? extends T> other,
4765 +             Consumer<? super T> action) {
4766 +            return cf.acceptEither(other, action); }
4767 +        public CompletionStage<Void> acceptEitherAsync
4768 +            (CompletionStage<? extends T> other,
4769 +             Consumer<? super T> action) {
4770 +            return cf.acceptEitherAsync(other, action); }
4771 +        public CompletionStage<Void> acceptEitherAsync
4772 +            (CompletionStage<? extends T> other,
4773 +             Consumer<? super T> action,
4774 +             Executor executor) {
4775 +            return cf.acceptEitherAsync(other, action, executor); }
4776 +        public CompletionStage<Void> runAfterEither
4777 +            (CompletionStage<?> other,
4778 +             Runnable action) {
4779 +            return cf.runAfterEither(other, action); }
4780 +        public CompletionStage<Void> runAfterEitherAsync
4781 +            (CompletionStage<?> other,
4782 +             Runnable action) {
4783 +            return cf.runAfterEitherAsync(other, action); }
4784 +        public CompletionStage<Void> runAfterEitherAsync
4785 +            (CompletionStage<?> other,
4786 +             Runnable action,
4787 +             Executor executor) {
4788 +            return cf.runAfterEitherAsync(other, action, executor); }
4789 +        public <U> CompletionStage<U> thenCompose
4790 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4791 +            return cf.thenCompose(fn); }
4792 +        public <U> CompletionStage<U> thenComposeAsync
4793 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4794 +            return cf.thenComposeAsync(fn); }
4795 +        public <U> CompletionStage<U> thenComposeAsync
4796 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4797 +             Executor executor) {
4798 +            return cf.thenComposeAsync(fn, executor); }
4799 +        public <U> CompletionStage<U> handle
4800 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4801 +            return cf.handle(fn); }
4802 +        public <U> CompletionStage<U> handleAsync
4803 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4804 +            return cf.handleAsync(fn); }
4805 +        public <U> CompletionStage<U> handleAsync
4806 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4807 +             Executor executor) {
4808 +            return cf.handleAsync(fn, executor); }
4809 +        public CompletionStage<T> whenComplete
4810 +            (BiConsumer<? super T, ? super Throwable> action) {
4811 +            return cf.whenComplete(action); }
4812 +        public CompletionStage<T> whenCompleteAsync
4813 +            (BiConsumer<? super T, ? super Throwable> action) {
4814 +            return cf.whenCompleteAsync(action); }
4815 +        public CompletionStage<T> whenCompleteAsync
4816 +            (BiConsumer<? super T, ? super Throwable> action,
4817 +             Executor executor) {
4818 +            return cf.whenCompleteAsync(action, executor); }
4819 +        public CompletionStage<T> exceptionally
4820 +            (Function<Throwable, ? extends T> fn) {
4821 +            return cf.exceptionally(fn); }
4822 +    }
4823 +
4824 +    /**
4825 +     * default-implemented exceptionallyAsync action is not invoked when
4826 +     * source completes normally, and source result is propagated
4827 +     */
4828 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4829 +        for (boolean createIncomplete : new boolean[] { true, false })
4830 +        for (Integer v1 : new Integer[] { 1, null })
4831 +    {
4832 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4833 +        final DelegatedCompletionStage<Integer> d =
4834 +            new DelegatedCompletionStage<Integer>(f);
4835 +        if (!createIncomplete) assertTrue(f.complete(v1));
4836 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4837 +            ((Throwable t) -> {
4838 +                threadFail("should not be called");
4839 +                return null;            // unreached
4840 +            });
4841 +        if (createIncomplete) assertTrue(f.complete(v1));
4842 +
4843 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4844 +    }}
4845 +
4846 +    /**
4847 +     * default-implemented exceptionallyAsync action completes with
4848 +     * function value on source exception
4849 +     */
4850 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4851 +        for (boolean createIncomplete : new boolean[] { true, false })
4852 +        for (Integer v1 : new Integer[] { 1, null })
4853 +    {
4854 +        final AtomicInteger ran = new AtomicInteger(0);
4855 +        final CFException ex = new CFException();
4856 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4857 +        final DelegatedCompletionStage<Integer> d =
4858 +            new DelegatedCompletionStage<Integer>(f);
4859 +        if (!createIncomplete) f.completeExceptionally(ex);
4860 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4861 +            ((Throwable t) -> {
4862 +                assertSame(t, ex);
4863 +                ran.getAndIncrement();
4864 +                return v1;
4865 +            });
4866 +        if (createIncomplete) f.completeExceptionally(ex);
4867 +
4868 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4869 +        assertEquals(1, ran.get());
4870 +    }}
4871 +
4872 +    /**
4873 +     * Under default implementation, if an "exceptionally action"
4874 +     * throws an exception, it completes exceptionally with that
4875 +     * exception
4876 +     */
4877 +    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4878 +        for (boolean createIncomplete : new boolean[] { true, false })
4879 +    {
4880 +        final AtomicInteger ran = new AtomicInteger(0);
4881 +        final CFException ex1 = new CFException();
4882 +        final CFException ex2 = new CFException();
4883 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4884 +        final DelegatedCompletionStage<Integer> d =
4885 +            new DelegatedCompletionStage<Integer>(f);
4886 +        if (!createIncomplete) f.completeExceptionally(ex1);
4887 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4888 +            ((Throwable t) -> {
4889 +                assertSame(t, ex1);
4890 +                ran.getAndIncrement();
4891 +                throw ex2;
4892 +            });
4893 +        if (createIncomplete) f.completeExceptionally(ex1);
4894 +
4895 +        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4896 +        checkCompletedExceptionally(f, ex1);
4897 +        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4898 +        assertEquals(1, ran.get());
4899 +    }}
4900 +
4901 +    /**
4902 +     * default-implemented exceptionallyCompose result completes
4903 +     * normally after normal completion of source
4904 +     */
4905 +    public void testDefaultExceptionallyCompose_normalCompletion() {
4906 +        for (boolean createIncomplete : new boolean[] { true, false })
4907 +        for (Integer v1 : new Integer[] { 1, null })
4908 +    {
4909 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4910 +        final ExceptionalCompletableFutureFunction r =
4911 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4912 +        final DelegatedCompletionStage<Integer> d =
4913 +            new DelegatedCompletionStage<Integer>(f);
4914 +        if (!createIncomplete) assertTrue(f.complete(v1));
4915 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4916 +        if (createIncomplete) assertTrue(f.complete(v1));
4917 +
4918 +        checkCompletedNormally(f, v1);
4919 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4920 +        r.assertNotInvoked();
4921 +    }}
4922 +
4923 +    /**
4924 +     * default-implemented exceptionallyCompose result completes
4925 +     * normally after exceptional completion of source
4926 +     */
4927 +    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4928 +        for (boolean createIncomplete : new boolean[] { true, false })
4929 +    {
4930 +        final CFException ex = new CFException();
4931 +        final ExceptionalCompletableFutureFunction r =
4932 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4933 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4934 +        final DelegatedCompletionStage<Integer> d =
4935 +            new DelegatedCompletionStage<Integer>(f);
4936 +        if (!createIncomplete) f.completeExceptionally(ex);
4937 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4938 +        if (createIncomplete) f.completeExceptionally(ex);
4939 +
4940 +        checkCompletedExceptionally(f, ex);
4941 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
4942 +        r.assertInvoked();
4943 +    }}
4944 +
4945 +    /**
4946 +     * default-implemented exceptionallyCompose completes
4947 +     * exceptionally on exception if action does
4948 +     */
4949 +    public void testDefaultExceptionallyCompose_actionFailed() {
4950 +        for (boolean createIncomplete : new boolean[] { true, false })
4951 +    {
4952 +        final CFException ex = new CFException();
4953 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4954 +        final FailingExceptionalCompletableFutureFunction r
4955 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4956 +        final DelegatedCompletionStage<Integer> d =
4957 +            new DelegatedCompletionStage<Integer>(f);
4958 +        if (!createIncomplete) f.completeExceptionally(ex);
4959 +        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4960 +        if (createIncomplete) f.completeExceptionally(ex);
4961 +
4962 +        checkCompletedExceptionally(f, ex);
4963 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4964 +        r.assertInvoked();
4965 +    }}
4966 +
4967 +    /**
4968 +     * default-implemented exceptionallyComposeAsync result completes
4969 +     * normally after normal completion of source
4970 +     */
4971 +    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4972 +        for (boolean createIncomplete : new boolean[] { true, false })
4973 +        for (Integer v1 : new Integer[] { 1, null })
4974 +    {
4975 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4976 +        final ExceptionalCompletableFutureFunction r =
4977 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4978 +        final DelegatedCompletionStage<Integer> d =
4979 +            new DelegatedCompletionStage<Integer>(f);
4980 +        if (!createIncomplete) assertTrue(f.complete(v1));
4981 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4982 +        if (createIncomplete) assertTrue(f.complete(v1));
4983 +
4984 +        checkCompletedNormally(f, v1);
4985 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4986 +        r.assertNotInvoked();
4987 +    }}
4988 +
4989 +    /**
4990 +     * default-implemented exceptionallyComposeAsync result completes
4991 +     * normally after exceptional completion of source
4992 +     */
4993 +    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4994 +        for (boolean createIncomplete : new boolean[] { true, false })
4995 +    {
4996 +        final CFException ex = new CFException();
4997 +        final ExceptionalCompletableFutureFunction r =
4998 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4999 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5000 +        final DelegatedCompletionStage<Integer> d =
5001 +            new DelegatedCompletionStage<Integer>(f);
5002 +        if (!createIncomplete) f.completeExceptionally(ex);
5003 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5004 +        if (createIncomplete) f.completeExceptionally(ex);
5005 +
5006 +        checkCompletedExceptionally(f, ex);
5007 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5008 +        r.assertInvoked();
5009 +    }}
5010 +
5011 +    /**
5012 +     * default-implemented exceptionallyComposeAsync completes
5013 +     * exceptionally on exception if action does
5014 +     */
5015 +    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5016 +        for (boolean createIncomplete : new boolean[] { true, false })
5017 +    {
5018 +        final CFException ex = new CFException();
5019 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5020 +        final FailingExceptionalCompletableFutureFunction r
5021 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5022 +        final DelegatedCompletionStage<Integer> d =
5023 +            new DelegatedCompletionStage<Integer>(f);
5024 +        if (!createIncomplete) f.completeExceptionally(ex);
5025 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5026 +        if (createIncomplete) f.completeExceptionally(ex);
5027 +
5028 +        checkCompletedExceptionally(f, ex);
5029 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5030 +        r.assertInvoked();
5031 +    }}
5032 +
5033 +    /**
5034 +     * default-implemented exceptionallyComposeAsync result completes
5035 +     * normally after normal completion of source
5036 +     */
5037 +    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5038 +        for (boolean createIncomplete : new boolean[] { true, false })
5039 +        for (Integer v1 : new Integer[] { 1, null })
5040 +    {
5041 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5042 +        final ExceptionalCompletableFutureFunction r =
5043 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5044 +        final DelegatedCompletionStage<Integer> d =
5045 +            new DelegatedCompletionStage<Integer>(f);
5046 +        if (!createIncomplete) assertTrue(f.complete(v1));
5047 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5048 +        if (createIncomplete) assertTrue(f.complete(v1));
5049 +
5050 +        checkCompletedNormally(f, v1);
5051 +        checkCompletedNormally(g.toCompletableFuture(), v1);
5052 +        r.assertNotInvoked();
5053 +    }}
5054 +
5055 +    /**
5056 +     * default-implemented exceptionallyComposeAsync result completes
5057 +     * normally after exceptional completion of source
5058 +     */
5059 +    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5060 +        for (boolean createIncomplete : new boolean[] { true, false })
5061 +    {
5062 +        final CFException ex = new CFException();
5063 +        final ExceptionalCompletableFutureFunction r =
5064 +            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5065 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5066 +        final DelegatedCompletionStage<Integer> d =
5067 +            new DelegatedCompletionStage<Integer>(f);
5068 +        if (!createIncomplete) f.completeExceptionally(ex);
5069 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5070 +        if (createIncomplete) f.completeExceptionally(ex);
5071 +
5072 +        checkCompletedExceptionally(f, ex);
5073 +        checkCompletedNormally(g.toCompletableFuture(), r.value);
5074 +        r.assertInvoked();
5075 +    }}
5076 +
5077 +    /**
5078 +     * default-implemented exceptionallyComposeAsync completes
5079 +     * exceptionally on exception if action does
5080 +     */
5081 +    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5082 +        for (boolean createIncomplete : new boolean[] { true, false })
5083 +    {
5084 +        final CFException ex = new CFException();
5085 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
5086 +        final FailingExceptionalCompletableFutureFunction r
5087 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5088 +        final DelegatedCompletionStage<Integer> d =
5089 +            new DelegatedCompletionStage<Integer>(f);
5090 +        if (!createIncomplete) f.completeExceptionally(ex);
5091 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5092 +        if (createIncomplete) f.completeExceptionally(ex);
5093 +
5094 +        checkCompletedExceptionally(f, ex);
5095 +        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5096 +        r.assertInvoked();
5097 +    }}
5098 +
5099   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines