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.164 by jsr166, Sun Jul 3 18:58:15 2016 UTC vs.
Revision 1.168 by jsr166, Mon Jul 18 17:19:01 2016 UTC

# Line 3935 | Line 3935 | public class CompletableFutureTest exten
3935      }}
3936  
3937      /**
3938 <     * Minimal completion stages throw UOE for all non-CompletionStage methods
3938 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
3939       */
3940      public void testMinimalCompletionStage_minimality() {
3941          if (!testImplementationDetails) return;
# Line 3964 | Line 3964 | public class CompletableFutureTest exten
3964              .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3965              .collect(Collectors.toList());
3966  
3967 <        CompletionStage<Integer> minimalStage =
3968 <            new CompletableFuture<Integer>().minimalCompletionStage();
3967 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
3968 >        stages.add(new CompletableFuture<Integer>().minimalCompletionStage());
3969 >        stages.add(CompletableFuture.completedStage(1));
3970 >        stages.add(CompletableFuture.failedStage(new CFException()));
3971  
3972          List<Method> bugs = new ArrayList<>();
3973          for (Method method : allMethods) {
# Line 3981 | Line 3983 | public class CompletableFutureTest exten
3983                  else if (parameterTypes[i] == long.class)
3984                      args[i] = 0L;
3985              }
3986 <            try {
3987 <                method.invoke(minimalStage, args);
3988 <                bugs.add(method);
3987 <            }
3988 <            catch (java.lang.reflect.InvocationTargetException expected) {
3989 <                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3986 >            for (CompletionStage<Integer> stage : stages) {
3987 >                try {
3988 >                    method.invoke(stage, args);
3989                      bugs.add(method);
3991 –                    // expected.getCause().printStackTrace();
3990                  }
3991 +                catch (java.lang.reflect.InvocationTargetException expected) {
3992 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3993 +                        bugs.add(method);
3994 +                        // expected.getCause().printStackTrace();
3995 +                    }
3996 +                }
3997 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
3998              }
3994 –            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3999          }
4000          if (!bugs.isEmpty())
4001 <            throw new Error("Methods did not throw UOE: " + bugs.toString());
4001 >            throw new Error("Methods did not throw UOE: " + bugs);
4002      }
4003  
4004      static class Monad {
# Line 4238 | Line 4242 | public class CompletableFutureTest exten
4242          }
4243      }
4244  
4245 <    /*
4246 <     * Tests below currently fail in stress mode due to memory retention.
4247 <     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck
4245 >    /**
4246 >     * Checks for garbage retention with anyOf.
4247 >     * Following used to fail with OOME:
4248 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testAnyOfGarbageRetention tck
4249       */
4245 –
4246 –    /** Checks for garbage retention with anyOf. */
4250      public void testAnyOfGarbageRetention() throws Throwable {
4251          for (Integer v : new Integer[] { 1, null })
4252      {
# Line 4257 | Line 4260 | public class CompletableFutureTest exten
4260              checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4261      }}
4262  
4263 <    /** Checks for garbage retention with allOf. */
4263 >    /**
4264 >     * Checks for garbage retention with allOf.
4265 >     *
4266 >     * As of 2016-07, fails with OOME:
4267 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4268 >     */
4269      public void testCancelledAllOfGarbageRetention() throws Throwable {
4270          final int n = expensiveTests ? 100_000 : 10;
4271          CompletableFuture<Integer>[] fs
# Line 4268 | Line 4276 | public class CompletableFutureTest exten
4276              assertTrue(CompletableFuture.allOf(fs).cancel(false));
4277      }
4278  
4279 +    /**
4280 +     * Checks for garbage retention when a dependent future is
4281 +     * cancelled and garbage-collected.
4282 +     *
4283 +     * As of 2016-07, fails with OOME:
4284 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4285 +     */
4286 +    public void testCancelledGarbageRetention() throws Throwable {
4287 +        final int n = expensiveTests ? 100_000 : 10;
4288 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4289 +        for (int i = 0; i < n; i++)
4290 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4291 +    }
4292 +
4293   //     static <U> U join(CompletionStage<U> stage) {
4294   //         CompletableFuture<U> f = new CompletableFuture<>();
4295   //         stage.whenComplete((v, ex) -> {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines