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.111 by jsr166, Fri Sep 4 13:43:25 2015 UTC vs.
Revision 1.120 by jsr166, Sun Sep 6 16:47:24 2015 UTC

# Line 3345 | Line 3345 | public class CompletableFutureTest exten
3345              () -> CompletableFuture.anyOf(null, f),
3346  
3347              () -> f.obtrudeException(null),
3348 +
3349 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3350 +            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3351 +            () -> CompletableFuture.delayedExecutor(1L, null),
3352 +
3353 +            () -> f.orTimeout(1L, null),
3354 +            () -> f.completeOnTimeout(42, 1L, null),
3355          };
3356  
3357          assertThrows(NullPointerException.class, throwingActions);
# Line 3365 | Line 3372 | public class CompletableFutureTest exten
3372       * newIncompleteFuture returns an incomplete CompletableFuture
3373       */
3374      public void testNewIncompleteFuture() {
3375 +        for (Integer v1 : new Integer[] { 1, null })
3376 +    {
3377          CompletableFuture<Integer> f = new CompletableFuture<>();
3378          CompletableFuture<Integer> g = f.newIncompleteFuture();
3379          checkIncomplete(f);
3380          checkIncomplete(g);
3381 <    }
3381 >        f.complete(v1);
3382 >        checkCompletedNormally(f, v1);
3383 >        checkIncomplete(g);
3384 >        g.complete(v1);
3385 >        checkCompletedNormally(g, v1);
3386 >        assertSame(g.getClass(), CompletableFuture.class);
3387 >    }}
3388  
3389      /**
3390       * completedStage returns a completed CompletionStage
3391       */
3392      public void testCompletedStage() {
3393 <        AtomicInteger x = new AtomicInteger();
3393 >        AtomicInteger x = new AtomicInteger(0);
3394          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3395          CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3396          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
# Line 3404 | Line 3419 | public class CompletableFutureTest exten
3419      public void testFailedFuture() {
3420          CFException ex = new CFException();
3421          CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3422 <        checkCompletedExceptionallyWithRootCause(f, ex);
3422 >        checkCompletedExceptionally(f, ex);
3423      }
3424  
3425      /**
3426       * failedFuture(null) throws NPE
3427       */
3428 <    public void testFailedFuture2() {
3428 >    public void testFailedFuture_null() {
3429          try {
3430              CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3431              shouldThrow();
# Line 3453 | Line 3468 | public class CompletableFutureTest exten
3468      public void testMinimalCompletionStage() {
3469          CompletableFuture<Integer> f = new CompletableFuture<>();
3470          CompletionStage<Integer> g = f.minimalCompletionStage();
3471 <        AtomicInteger x = new AtomicInteger();
3471 >        AtomicInteger x = new AtomicInteger(0);
3472          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3473          checkIncomplete(f);
3474          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
# Line 3470 | Line 3485 | public class CompletableFutureTest exten
3485      public void testMinimalCompletionStage2() {
3486          CompletableFuture<Integer> f = new CompletableFuture<>();
3487          CompletionStage<Integer> g = f.minimalCompletionStage();
3488 <        AtomicInteger x = new AtomicInteger();
3488 >        AtomicInteger x = new AtomicInteger(0);
3489          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3490          g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3491          checkIncomplete(f);
# Line 3488 | Line 3503 | public class CompletableFutureTest exten
3503      public void testFailedStage() {
3504          CFException ex = new CFException();
3505          CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3506 <        AtomicInteger x = new AtomicInteger();
3506 >        AtomicInteger x = new AtomicInteger(0);
3507          AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3508          f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3509          assertEquals(x.get(), 0);
3510 <        assertEquals(r.get().getCause(), ex);
3510 >        assertEquals(r.get(), ex);
3511      }
3512  
3513      /**
# Line 3549 | Line 3564 | public class CompletableFutureTest exten
3564       */
3565      public void testOrTimeout() {
3566          CompletableFuture<Integer> f = new CompletableFuture<>();
3567 <        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3567 >        f.orTimeout(SHORT_DELAY_MS, MILLISECONDS);
3568          checkCompletedExceptionallyWithTimeout(f);
3569      }
3570  
# Line 3559 | Line 3574 | public class CompletableFutureTest exten
3574      public void testOrTimeout2() {
3575          CompletableFuture<Integer> f = new CompletableFuture<>();
3576          f.complete(1);
3577 <        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3577 >        f.orTimeout(SHORT_DELAY_MS, MILLISECONDS);
3578          checkCompletedNormally(f, 1);
3579      }
3580  
# Line 3568 | Line 3583 | public class CompletableFutureTest exten
3583       */
3584      public void testCompleteOnTimeout() {
3585          CompletableFuture<Integer> f = new CompletableFuture<>();
3586 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3586 >        f.completeOnTimeout(-1, SHORT_DELAY_MS, MILLISECONDS);
3587          f.join();
3588          checkCompletedNormally(f, -1);
3589      }
# Line 3579 | Line 3594 | public class CompletableFutureTest exten
3594      public void testCompleteOnTimeout2() {
3595          CompletableFuture<Integer> f = new CompletableFuture<>();
3596          f.complete(1);
3597 <        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
3597 >        f.completeOnTimeout(-1, SHORT_DELAY_MS, MILLISECONDS);
3598          checkCompletedNormally(f, 1);
3599      }
3600  
3601      /**
3602       * delayedExecutor returns an executor that delays submission
3603       */
3604 <    public void testDelayedExecutor() {
3604 >    public void testDelayedExecutor() throws Exception {
3605          long timeoutMillis = SMALL_DELAY_MS;
3606          Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3607                                                         MILLISECONDS);
3608          long startTime = System.nanoTime();
3609          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3610          assertNull(f.getNow(null));
3611 <        try {
3597 <            f.get(LONG_DELAY_MS, MILLISECONDS);
3598 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
3611 >        assertEquals(1, (int) f.get(LONG_DELAY_MS, MILLISECONDS));
3612          assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3613          checkCompletedNormally(f, 1);
3614      }
# Line 3604 | Line 3617 | public class CompletableFutureTest exten
3617       * delayedExecutor for a given executor returns an executor that
3618       * delays submission
3619       */
3620 <    public void testDelayedExecutor2() {
3620 >    public void testDelayedExecutor2() throws Exception {
3621          long timeoutMillis = SMALL_DELAY_MS;
3622          Executor d = CompletableFuture.delayedExecutor(timeoutMillis,
3623                                                         MILLISECONDS,
# Line 3612 | Line 3625 | public class CompletableFutureTest exten
3625          long startTime = System.nanoTime();
3626          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
3627          assertNull(f.getNow(null));
3628 <        try {
3616 <            f.get(LONG_DELAY_MS, MILLISECONDS);
3617 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
3628 >        assertEquals(1, (int) f.get(LONG_DELAY_MS, MILLISECONDS));
3629          assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
3630          checkCompletedNormally(f, 1);
3631      }

Diff Legend

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