--- jsr166/src/test/tck/ScheduledExecutorTest.java 2015/10/25 02:58:25 1.78 +++ jsr166/src/test/tck/ScheduledExecutorTest.java 2016/02/22 20:40:12 1.79 @@ -154,14 +154,14 @@ public class ScheduledExecutorTest exten final CountDownLatch done = new CountDownLatch(cycles); Runnable task = new CheckedRunnable() { public void realRun() { done.countDown(); }}; - ScheduledFuture h = + ScheduledFuture periodicTask = p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS); await(done); - h.cancel(true); - double normalizedTime = + periodicTask.cancel(true); + double elapsedDelays = (double) millisElapsedSince(startTime) / delay; - if (normalizedTime >= cycles - 1 && - normalizedTime <= cycles) + if (elapsedDelays >= cycles - 1 && + elapsedDelays <= cycles) return; } fail("unexpected execution rate"); @@ -180,14 +180,14 @@ public class ScheduledExecutorTest exten final CountDownLatch done = new CountDownLatch(cycles); Runnable task = new CheckedRunnable() { public void realRun() { done.countDown(); }}; - ScheduledFuture h = + ScheduledFuture periodicTask = p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS); await(done); - h.cancel(true); - double normalizedTime = + periodicTask.cancel(true); + double elapsedDelays = (double) millisElapsedSince(startTime) / delay; - if (normalizedTime >= cycles - 1 && - normalizedTime <= cycles) + if (elapsedDelays >= cycles - 1 && + elapsedDelays <= cycles) return; } fail("unexpected execution rate");