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.178 by jsr166, Wed Sep 21 19:02:50 2016 UTC vs.
Revision 1.186 by jsr166, Mon Jul 3 20:55:45 2017 UTC

# Line 64 | Line 64 | public class CompletableFutureTest exten
64              assertNull(f.getNow(null));
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
66          try {
67 <            f.get(0L, SECONDS);
67 >            f.get(randomExpiredTimeout(), randomTimeUnit());
68              shouldThrow();
69          }
70          catch (TimeoutException success) {}
# Line 76 | Line 76 | public class CompletableFutureTest exten
76  
77          try {
78              assertEquals(value, f.join());
79        } catch (Throwable fail) { threadUnexpectedException(fail); }
80        try {
79              assertEquals(value, f.getNow(null));
82        } catch (Throwable fail) { threadUnexpectedException(fail); }
83        try {
80              assertEquals(value, f.get());
81          } catch (Throwable fail) { threadUnexpectedException(fail); }
82          assertTrue(f.isDone());
# Line 93 | Line 89 | public class CompletableFutureTest exten
89       * Returns the "raw" internal exceptional completion of f,
90       * without any additional wrapping with CompletionException.
91       */
92 <    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
93 <        // handle (and whenComplete) can distinguish between "direct"
94 <        // and "wrapped" exceptional completion
95 <        return f.handle((U u, Throwable t) -> t).join();
92 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
93 >        // handle (and whenComplete and exceptionally) can distinguish
94 >        // between "direct" and "wrapped" exceptional completion
95 >        return f.handle((u, t) -> t).join();
96      }
97  
98      void checkCompletedExceptionally(CompletableFuture<?> f,
# Line 147 | Line 143 | public class CompletableFutureTest exten
143  
144      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
145          checkCompletedExceptionally(f, true,
146 <            (t) -> assertTrue(t instanceof CFException));
146 >            t -> assertTrue(t instanceof CFException));
147      }
148  
149      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
150          checkCompletedExceptionally(f, true,
151 <            (t) -> assertTrue(t instanceof CancellationException));
151 >            t -> assertTrue(t instanceof CancellationException));
152      }
153  
154      void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
155          checkCompletedExceptionally(f, false,
156 <            (t) -> assertTrue(t instanceof TimeoutException));
156 >            t -> assertTrue(t instanceof TimeoutException));
157      }
158  
159      void checkCompletedWithWrappedException(CompletableFuture<?> f,
160                                              Throwable ex) {
161 <        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
161 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
162      }
163  
164      void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
165 <        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
165 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
166      }
167  
168      void checkCancelled(CompletableFuture<?> f) {
# Line 2562 | Line 2558 | public class CompletableFutureTest exten
2558  
2559          // unspecified behavior - both source completions available
2560          try {
2561 <            assertEquals(null, h0.join());
2561 >            assertNull(h0.join());
2562              rs[0].assertValue(v1);
2563          } catch (CompletionException ok) {
2564              checkCompletedWithWrappedException(h0, ex);
2565              rs[0].assertNotInvoked();
2566          }
2567          try {
2568 <            assertEquals(null, h1.join());
2568 >            assertNull(h1.join());
2569              rs[1].assertValue(v1);
2570          } catch (CompletionException ok) {
2571              checkCompletedWithWrappedException(h1, ex);
2572              rs[1].assertNotInvoked();
2573          }
2574          try {
2575 <            assertEquals(null, h2.join());
2575 >            assertNull(h2.join());
2576              rs[2].assertValue(v1);
2577          } catch (CompletionException ok) {
2578              checkCompletedWithWrappedException(h2, ex);
2579              rs[2].assertNotInvoked();
2580          }
2581          try {
2582 <            assertEquals(null, h3.join());
2582 >            assertNull(h3.join());
2583              rs[3].assertValue(v1);
2584          } catch (CompletionException ok) {
2585              checkCompletedWithWrappedException(h3, ex);
# Line 2822 | Line 2818 | public class CompletableFutureTest exten
2818  
2819          // unspecified behavior - both source completions available
2820          try {
2821 <            assertEquals(null, h0.join());
2821 >            assertNull(h0.join());
2822              rs[0].assertInvoked();
2823          } catch (CompletionException ok) {
2824              checkCompletedWithWrappedException(h0, ex);
2825              rs[0].assertNotInvoked();
2826          }
2827          try {
2828 <            assertEquals(null, h1.join());
2828 >            assertNull(h1.join());
2829              rs[1].assertInvoked();
2830          } catch (CompletionException ok) {
2831              checkCompletedWithWrappedException(h1, ex);
2832              rs[1].assertNotInvoked();
2833          }
2834          try {
2835 <            assertEquals(null, h2.join());
2835 >            assertNull(h2.join());
2836              rs[2].assertInvoked();
2837          } catch (CompletionException ok) {
2838              checkCompletedWithWrappedException(h2, ex);
2839              rs[2].assertNotInvoked();
2840          }
2841          try {
2842 <            assertEquals(null, h3.join());
2842 >            assertNull(h3.join());
2843              rs[3].assertInvoked();
2844          } catch (CompletionException ok) {
2845              checkCompletedWithWrappedException(h3, ex);
# Line 3238 | Line 3234 | public class CompletableFutureTest exten
3234      /**
3235       * Completion methods throw NullPointerException with null arguments
3236       */
3237 +    @SuppressWarnings("FutureReturnValueIgnored")
3238      public void testNPE() {
3239          CompletableFuture<Integer> f = new CompletableFuture<>();
3240          CompletableFuture<Integer> g = new CompletableFuture<>();
# Line 3257 | Line 3254 | public class CompletableFutureTest exten
3254  
3255              () -> f.thenApply(null),
3256              () -> f.thenApplyAsync(null),
3257 <            () -> f.thenApplyAsync((x) -> x, null),
3257 >            () -> f.thenApplyAsync(x -> x, null),
3258              () -> f.thenApplyAsync(null, exec),
3259  
3260              () -> f.thenAccept(null),
3261              () -> f.thenAcceptAsync(null),
3262 <            () -> f.thenAcceptAsync((x) -> {} , null),
3262 >            () -> f.thenAcceptAsync(x -> {} , null),
3263              () -> f.thenAcceptAsync(null, exec),
3264  
3265              () -> f.thenRun(null),
# Line 3297 | Line 3294 | public class CompletableFutureTest exten
3294              () -> f.applyToEither(g, null),
3295              () -> f.applyToEitherAsync(g, null),
3296              () -> f.applyToEitherAsync(g, null, exec),
3297 <            () -> f.applyToEither(nullFuture, (x) -> x),
3298 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3299 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3300 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3297 >            () -> f.applyToEither(nullFuture, x -> x),
3298 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3299 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3300 >            () -> f.applyToEitherAsync(g, x -> x, null),
3301  
3302              () -> f.acceptEither(g, null),
3303              () -> f.acceptEitherAsync(g, null),
3304              () -> f.acceptEitherAsync(g, null, exec),
3305 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3306 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3307 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3308 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3305 >            () -> f.acceptEither(nullFuture, x -> {}),
3306 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3307 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3308 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3309  
3310              () -> f.runAfterEither(g, null),
3311              () -> f.runAfterEitherAsync(g, null),
# Line 3374 | Line 3371 | public class CompletableFutureTest exten
3371          for (CompletableFuture<Integer> src : srcs) {
3372              List<CompletableFuture<?>> fs = new ArrayList<>();
3373              fs.add(src.thenRunAsync(() -> {}, e));
3374 <            fs.add(src.thenAcceptAsync((z) -> {}, e));
3375 <            fs.add(src.thenApplyAsync((z) -> z, e));
3374 >            fs.add(src.thenAcceptAsync(z -> {}, e));
3375 >            fs.add(src.thenApplyAsync(z -> z, e));
3376  
3377              fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3378              fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3379              fs.add(src.runAfterBothAsync(src, () -> {}, e));
3380  
3381 <            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3382 <            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3381 >            fs.add(src.applyToEitherAsync(src, z -> z, e));
3382 >            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3383              fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3384  
3385 <            fs.add(src.thenComposeAsync((z) -> null, e));
3385 >            fs.add(src.thenComposeAsync(z -> null, e));
3386              fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3387              fs.add(src.handleAsync((z, t) -> null, e));
3388  
# Line 3418 | Line 3415 | public class CompletableFutureTest exten
3415          {
3416              List<CompletableFuture<?>> fs = new ArrayList<>();
3417  
3418 <            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3419 <            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3418 >            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3419 >            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3420  
3421 <            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3422 <            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3421 >            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3422 >            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3423  
3424              fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3425              fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
# Line 3461 | Line 3458 | public class CompletableFutureTest exten
3458  
3459          List<CompletableFuture<?>> fs = new ArrayList<>();
3460          fs.add(incomplete.thenRunAsync(() -> {}, e));
3461 <        fs.add(incomplete.thenAcceptAsync((z) -> {}, e));
3462 <        fs.add(incomplete.thenApplyAsync((z) -> z, e));
3461 >        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3462 >        fs.add(incomplete.thenApplyAsync(z -> z, e));
3463  
3464          fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3465          fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3466          fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3467  
3468 <        fs.add(incomplete.applyToEitherAsync(incomplete, (z) -> z, e));
3469 <        fs.add(incomplete.acceptEitherAsync(incomplete, (z) -> {}, e));
3468 >        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3469 >        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3470          fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3471  
3472 <        fs.add(incomplete.thenComposeAsync((z) -> null, e));
3472 >        fs.add(incomplete.thenComposeAsync(z -> null, e));
3473          fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3474          fs.add(incomplete.handleAsync((z, t) -> null, e));
3475  
# Line 3532 | Line 3529 | public class CompletableFutureTest exten
3529       */
3530      public void testCompletedStage() {
3531          AtomicInteger x = new AtomicInteger(0);
3532 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3532 >        AtomicReference<Throwable> r = new AtomicReference<>();
3533          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3534          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3535          assertEquals(x.get(), 1);
# Line 3634 | Line 3631 | public class CompletableFutureTest exten
3631          CompletableFuture<Integer> f = new CompletableFuture<>();
3632          CompletionStage<Integer> g = f.minimalCompletionStage();
3633          AtomicInteger x = new AtomicInteger(0);
3634 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3634 >        AtomicReference<Throwable> r = new AtomicReference<>();
3635          checkIncomplete(f);
3636          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3637          f.complete(1);
# Line 3651 | Line 3648 | public class CompletableFutureTest exten
3648          CompletableFuture<Integer> f = new CompletableFuture<>();
3649          CompletionStage<Integer> g = f.minimalCompletionStage();
3650          AtomicInteger x = new AtomicInteger(0);
3651 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3651 >        AtomicReference<Throwable> r = new AtomicReference<>();
3652          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3653          checkIncomplete(f);
3654          CFException ex = new CFException();
# Line 3669 | Line 3666 | public class CompletableFutureTest exten
3666          CFException ex = new CFException();
3667          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3668          AtomicInteger x = new AtomicInteger(0);
3669 <        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3669 >        AtomicReference<Throwable> r = new AtomicReference<>();
3670          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3671          assertEquals(x.get(), 0);
3672          assertEquals(r.get(), ex);
# Line 3693 | Line 3690 | public class CompletableFutureTest exten
3690      public void testCompleteAsync2() {
3691          CompletableFuture<Integer> f = new CompletableFuture<>();
3692          CFException ex = new CFException();
3693 <        f.completeAsync(() -> {if (true) throw ex; return 1;});
3693 >        f.completeAsync(() -> { throw ex; });
3694          try {
3695              f.join();
3696              shouldThrow();
# Line 3723 | Line 3720 | public class CompletableFutureTest exten
3720          CompletableFuture<Integer> f = new CompletableFuture<>();
3721          CFException ex = new CFException();
3722          ThreadExecutor executor = new ThreadExecutor();
3723 <        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3723 >        f.completeAsync(() -> { throw ex; }, executor);
3724          try {
3725              f.join();
3726              shouldThrow();
# Line 3882 | Line 3879 | public class CompletableFutureTest exten
3879          List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3880              = new ArrayList<>();
3881  
3882 <        funs.add((y) -> m.thenRun(y, noopRunnable));
3883 <        funs.add((y) -> m.thenAccept(y, noopConsumer));
3884 <        funs.add((y) -> m.thenApply(y, incFunction));
3885 <
3886 <        funs.add((y) -> m.runAfterEither(y, incomplete, noopRunnable));
3887 <        funs.add((y) -> m.acceptEither(y, incomplete, noopConsumer));
3888 <        funs.add((y) -> m.applyToEither(y, incomplete, incFunction));
3889 <
3890 <        funs.add((y) -> m.runAfterBoth(y, v42, noopRunnable));
3891 <        funs.add((y) -> m.runAfterBoth(v42, y, noopRunnable));
3892 <        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3893 <        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3894 <        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3895 <        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3896 <
3897 <        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3898 <
3899 <        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3900 <
3901 <        funs.add((y) -> CompletableFuture.allOf(y));
3902 <        funs.add((y) -> CompletableFuture.allOf(y, v42));
3903 <        funs.add((y) -> CompletableFuture.allOf(v42, y));
3904 <        funs.add((y) -> CompletableFuture.anyOf(y));
3905 <        funs.add((y) -> CompletableFuture.anyOf(y, incomplete));
3906 <        funs.add((y) -> CompletableFuture.anyOf(incomplete, y));
3882 >        funs.add(y -> m.thenRun(y, noopRunnable));
3883 >        funs.add(y -> m.thenAccept(y, noopConsumer));
3884 >        funs.add(y -> m.thenApply(y, incFunction));
3885 >
3886 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
3887 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
3888 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
3889 >
3890 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
3891 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
3892 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3893 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3894 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
3895 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
3896 >
3897 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3898 >
3899 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
3900 >
3901 >        funs.add(y -> CompletableFuture.allOf(y));
3902 >        funs.add(y -> CompletableFuture.allOf(y, v42));
3903 >        funs.add(y -> CompletableFuture.allOf(v42, y));
3904 >        funs.add(y -> CompletableFuture.anyOf(y));
3905 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
3906 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
3907  
3908          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3909                   fun : funs) {
# Line 3963 | Line 3960 | public class CompletableFutureTest exten
3960      public void testMinimalCompletionStage_minimality() {
3961          if (!testImplementationDetails) return;
3962          Function<Method, String> toSignature =
3963 <            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3963 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
3964          Predicate<Method> isNotStatic =
3965 <            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3965 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
3966          List<Method> minimalMethods =
3967              Stream.of(Object.class, CompletionStage.class)
3968 <            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3968 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
3969              .filter(isNotStatic)
3970              .collect(Collectors.toList());
3971          // Methods from CompletableFuture permitted NOT to throw UOE
# Line 3984 | Line 3981 | public class CompletableFutureTest exten
3981              .collect(Collectors.toSet());
3982          List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3983              .filter(isNotStatic)
3984 <            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3984 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3985              .collect(Collectors.toList());
3986  
3987          List<CompletionStage<Integer>> stages = new ArrayList<>();
# Line 4144 | Line 4141 | public class CompletableFutureTest exten
4141          CompletionStage<Integer> minimal = f.minimalCompletionStage();
4142          CompletableFuture<Integer> g = new CompletableFuture<>();
4143          if (!createIncomplete) assertTrue(f.complete(v1));
4144 <        minimal.thenAccept((x) -> g.complete(x));
4144 >        minimal.thenAccept(x -> g.complete(x));
4145          if (createIncomplete) assertTrue(f.complete(v1));
4146          g.join();
4147          checkCompletedNormally(g, v1);
# Line 4168 | Line 4165 | public class CompletableFutureTest exten
4165          static <T,U,V> Function<T, CompletableFuture<V>> compose
4166              (Function<T, CompletableFuture<U>> f,
4167               Function<U, CompletableFuture<V>> g) {
4168 <            return (x) -> f.apply(x).thenCompose(g);
4168 >            return x -> f.apply(x).thenCompose(g);
4169          }
4170  
4171          static void assertZero(CompletableFuture<?> f) {
# Line 4248 | Line 4245 | public class CompletableFutureTest exten
4245  
4246          // Some mutually non-commutative functions
4247          Function<Long, CompletableFuture<Long>> triple
4248 <            = (x) -> Monad.unit(3 * x);
4248 >            = x -> Monad.unit(3 * x);
4249          Function<Long, CompletableFuture<Long>> inc
4250 <            = (x) -> Monad.unit(x + 1);
4250 >            = x -> Monad.unit(x + 1);
4251  
4252          // unit is a right identity: m >>= unit === m
4253          Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
# Line 4262 | Line 4259 | public class CompletableFutureTest exten
4259          // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4260          Monad.assertFutureEquals(
4261              unit.apply(5L).thenCompose(inc).thenCompose(triple),
4262 <            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4262 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4263  
4264          // The case for CompletableFuture as an additive monad is weaker...
4265  
# Line 4272 | Line 4269 | public class CompletableFutureTest exten
4269          // left zero: zero >>= f === zero
4270          Monad.assertZero(zero.thenCompose(inc));
4271          // right zero: f >>= (\x -> zero) === zero
4272 <        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4272 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4273  
4274          // f plus zero === f
4275          Monad.assertFutureEquals(Monad.unit(5L),
# Line 4330 | Line 4327 | public class CompletableFutureTest exten
4327          final AtomicInteger count = new AtomicInteger(0);
4328          for (int i = 0; i < n; i++) {
4329              head.thenRun(() -> count.getAndIncrement());
4330 <            head.thenAccept((x) -> count.getAndIncrement());
4331 <            head.thenApply((x) -> count.getAndIncrement());
4330 >            head.thenAccept(x -> count.getAndIncrement());
4331 >            head.thenApply(x -> count.getAndIncrement());
4332  
4333              head.runAfterBoth(complete, () -> count.getAndIncrement());
4334              head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
# Line 4341 | Line 4338 | public class CompletableFutureTest exten
4338              complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4339  
4340              head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4341 <            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4342 <            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4341 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4342 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4343              new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4344 <            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4345 <            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4344 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4345 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4346          }
4347          head.complete(null);
4348          assertEquals(5 * 3 * n, count.get());
# Line 4362 | Line 4359 | public class CompletableFutureTest exten
4359              f.complete(null);
4360  
4361              f = new CompletableFuture<>();
4362 <            f.acceptEither(incomplete, (x) -> {});
4362 >            f.acceptEither(incomplete, x -> {});
4363              f.complete(null);
4364  
4365              f = new CompletableFuture<>();
4366 <            f.applyToEither(incomplete, (x) -> x);
4366 >            f.applyToEither(incomplete, x -> x);
4367              f.complete(null);
4368  
4369              f = new CompletableFuture<>();
# Line 4380 | Line 4377 | public class CompletableFutureTest exten
4377              f.complete(null);
4378  
4379              f = new CompletableFuture<>();
4380 <            incomplete.acceptEither(f, (x) -> {});
4380 >            incomplete.acceptEither(f, x -> {});
4381              f.complete(null);
4382  
4383              f = new CompletableFuture<>();
4384 <            incomplete.applyToEither(f, (x) -> x);
4384 >            incomplete.applyToEither(f, x -> x);
4385              f.complete(null);
4386  
4387              f = new CompletableFuture<>();
# Line 4442 | Line 4439 | public class CompletableFutureTest exten
4439              assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4440      }
4441  
4442 +    /**
4443 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4444 +     * is invoked many times.
4445 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4446 +     *
4447 +     * As of 2016-07, fails with OOME:
4448 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4449 +     */
4450 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4451 +        final int n = expensiveTests ? 900_000 : 10;
4452 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4453 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4454 +        for (int i = 0; i < n; i++)
4455 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4456 +    }
4457 +
4458   //     static <U> U join(CompletionStage<U> stage) {
4459   //         CompletableFuture<U> f = new CompletableFuture<>();
4460   //         stage.whenComplete((v, ex) -> {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines