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.140 by jsr166, Mon Mar 28 19:18:16 2016 UTC vs.
Revision 1.149 by jsr166, Sun Jun 26 16:01:17 2016 UTC

# Line 3295 | Line 3295 | public class CompletableFutureTest exten
3295              () -> f.obtrudeException(null),
3296  
3297              () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3298 <            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3298 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3299              () -> CompletableFuture.delayedExecutor(1L, null),
3300  
3301              () -> f.orTimeout(1L, null),
# Line 3525 | Line 3525 | public class CompletableFutureTest exten
3525          long timeoutMillis = timeoutMillis();
3526          CompletableFuture<Integer> f = new CompletableFuture<>();
3527          long startTime = System.nanoTime();
3528 <        f.orTimeout(timeoutMillis, MILLISECONDS);
3528 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3529          checkCompletedWithTimeoutException(f);
3530          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3531      }
# Line 3540 | Line 3540 | public class CompletableFutureTest exten
3540          CompletableFuture<Integer> g = new CompletableFuture<>();
3541          long startTime = System.nanoTime();
3542          f.complete(v1);
3543 <        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3544 <        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3543 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3544 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3545          g.complete(v1);
3546          checkCompletedNormally(f, v1);
3547          checkCompletedNormally(g, v1);
# Line 3556 | Line 3556 | public class CompletableFutureTest exten
3556                         () -> testCompleteOnTimeout_timesOut(null));
3557      }
3558  
3559 +    /**
3560 +     * completeOnTimeout completes with given value if not complete
3561 +     */
3562      public void testCompleteOnTimeout_timesOut(Integer v) {
3563          long timeoutMillis = timeoutMillis();
3564          CompletableFuture<Integer> f = new CompletableFuture<>();
3565          long startTime = System.nanoTime();
3566 <        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3566 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3567          assertSame(v, f.join());
3568          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3569          f.complete(99);         // should have no effect
# Line 3577 | Line 3580 | public class CompletableFutureTest exten
3580          CompletableFuture<Integer> g = new CompletableFuture<>();
3581          long startTime = System.nanoTime();
3582          f.complete(v1);
3583 <        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3584 <        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3583 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3584 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3585          g.complete(v1);
3586          checkCompletedNormally(f, v1);
3587          checkCompletedNormally(g, v1);
# Line 3629 | Line 3632 | public class CompletableFutureTest exten
3632      //--- tests of implementation details; not part of official tck ---
3633  
3634      Object resultOf(CompletableFuture<?> f) {
3635 +        SecurityManager sm = System.getSecurityManager();
3636 +        if (sm != null) {
3637 +            try {
3638 +                System.setSecurityManager(null);
3639 +            } catch (SecurityException giveUp) {
3640 +                return "Reflection not available";
3641 +            }
3642 +        }
3643 +
3644          try {
3645              java.lang.reflect.Field resultField
3646                  = CompletableFuture.class.getDeclaredField("result");
3647              resultField.setAccessible(true);
3648              return resultField.get(f);
3649 <        } catch (Throwable t) { throw new AssertionError(t); }
3649 >        } catch (Throwable t) {
3650 >            throw new AssertionError(t);
3651 >        } finally {
3652 >            if (sm != null) System.setSecurityManager(sm);
3653 >        }
3654      }
3655  
3656      public void testExceptionPropagationReusesResultObject() {
# Line 3657 | Line 3673 | public class CompletableFutureTest exten
3673          funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3674  
3675          funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3676 +        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3677          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3678 +        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3679          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3680 +        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3681  
3682          funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3683  
3684          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3685  
3686 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3687          funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3688 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3689 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3690          funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3691 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3692  
3693          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3694                   fun : funs) {
# Line 3927 | Line 3950 | public class CompletableFutureTest exten
3950  
3951      /**
3952       * A single CompletableFuture with many dependents.
3953 +     * A demo of scalability - runtime is O(n).
3954       */
3955      public void testManyDependents() throws Throwable {
3956 <        final int n = 10_000;
3956 >        final int n = 1_000;
3957          final CompletableFuture<Void> head = new CompletableFuture<>();
3934        final CompletableFuture<Void> incomplete = new CompletableFuture<>();
3958          final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
3959          final AtomicInteger count = new AtomicInteger(0);
3960          for (int i = 0; i < n; i++) {
3961              head.thenRun(() -> count.getAndIncrement());
3962              head.thenAccept((x) -> count.getAndIncrement());
3963              head.thenApply((x) -> count.getAndIncrement());
3964 +
3965              head.runAfterBoth(complete, () -> count.getAndIncrement());
3966              head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
3967              head.thenCombine(complete, (x, y) -> count.getAndIncrement());
3968 <            head.runAfterEither(incomplete, () -> count.getAndIncrement());
3969 <            head.acceptEither(incomplete, (x) -> count.getAndIncrement());
3970 <            head.applyToEither(incomplete, (x) -> count.getAndIncrement());
3968 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
3969 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
3970 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
3971 >
3972 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
3973 >            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
3974 >            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
3975 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
3976 >            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
3977 >            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
3978          }
3979          head.complete(null);
3980 <        assertEquals(9 * n, count.get());
3980 >        assertEquals(5 * 3 * n, count.get());
3981      }
3982  
3983   //     static <U> U join(CompletionStage<U> stage) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines