--- jsr166/src/test/tck/ScheduledExecutorTest.java	2011/05/27 19:48:58	1.43
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2011/05/28 15:33:20	1.44
@@ -43,19 +43,18 @@ public class ScheduledExecutorTest exten
      */
     public void testSchedule1() throws Exception {
         ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
-        final long t0 = System.nanoTime();
-        final long timeoutNanos = SHORT_DELAY_MS * 1000L * 1000L;
+        final long startTime = System.nanoTime();
         final CountDownLatch done = new CountDownLatch(1);
         try {
             Callable task = new CheckedCallable<Boolean>() {
                 public Boolean realCall() {
                     done.countDown();
-                    assertTrue(System.nanoTime() - t0 >= timeoutNanos);
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
                     return Boolean.TRUE;
                 }};
-            Future f = p.schedule(task, SHORT_DELAY_MS, MILLISECONDS);
-            assertEquals(Boolean.TRUE, f.get());
-            assertTrue(System.nanoTime() - t0 >= timeoutNanos);
+            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            assertSame(Boolean.TRUE, f.get());
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
             assertTrue(done.await(0L, MILLISECONDS));
         } finally {
             joinPool(p);
@@ -67,19 +66,18 @@ public class ScheduledExecutorTest exten
      */
     public void testSchedule3() throws Exception {
         ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
-        final long t0 = System.nanoTime();
-        final long timeoutNanos = SHORT_DELAY_MS * 1000L * 1000L;
+        final long startTime = System.nanoTime();
         final CountDownLatch done = new CountDownLatch(1);
         try {
             Runnable task = new CheckedRunnable() {
                 public void realRun() {
                     done.countDown();
-                    assertTrue(System.nanoTime() - t0 >= timeoutNanos);
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
                 }};
-            Future f = p.schedule(task, SHORT_DELAY_MS, MILLISECONDS);
-            assertNull(f.get());
-            assertTrue(System.nanoTime() - t0 >= timeoutNanos);
-            assertTrue(done.await(0L, MILLISECONDS));
+            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            await(done);
+            assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
         } finally {
             joinPool(p);
         }
@@ -90,20 +88,19 @@ public class ScheduledExecutorTest exten
      */
     public void testSchedule4() throws Exception {
         ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
-        final long t0 = System.nanoTime();
-        final long timeoutNanos = SHORT_DELAY_MS * 1000L * 1000L;
+        final long startTime = System.nanoTime();
         final CountDownLatch done = new CountDownLatch(1);
         try {
             Runnable task = new CheckedRunnable() {
                 public void realRun() {
                     done.countDown();
-                    assertTrue(System.nanoTime() - t0 >= timeoutNanos);
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
                 }};
             ScheduledFuture f =
-                p.scheduleAtFixedRate(task, SHORT_DELAY_MS,
-                                      SHORT_DELAY_MS, MILLISECONDS);
-            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
-            assertTrue(System.nanoTime() - t0 >= timeoutNanos);
+                p.scheduleAtFixedRate(task, timeoutMillis(),
+                                      LONG_DELAY_MS, MILLISECONDS);
+            await(done);
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
             f.cancel(true);
         } finally {
             joinPool(p);
@@ -113,22 +110,21 @@ public class ScheduledExecutorTest exten
     /**
      * scheduleWithFixedDelay executes runnable after given initial delay
      */
-    public void testSchedule5() throws InterruptedException {
+    public void testSchedule5() throws Exception {
         ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
-        final long t0 = System.nanoTime();
-        final long timeoutNanos = SHORT_DELAY_MS * 1000L * 1000L;
+        final long startTime = System.nanoTime();
         final CountDownLatch done = new CountDownLatch(1);
         try {
             Runnable task = new CheckedRunnable() {
                 public void realRun() {
                     done.countDown();
-                    assertTrue(System.nanoTime() - t0 >= timeoutNanos);
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
                 }};
             ScheduledFuture f =
-                p.scheduleWithFixedDelay(task, SHORT_DELAY_MS,
-                                         SHORT_DELAY_MS, MILLISECONDS);
-            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
-            assertTrue(System.nanoTime() - t0 >= timeoutNanos);
+                p.scheduleWithFixedDelay(task, timeoutMillis(),
+                                         LONG_DELAY_MS, MILLISECONDS);
+            await(done);
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
             f.cancel(true);
         } finally {
             joinPool(p);
@@ -328,8 +324,12 @@ public class ScheduledExecutorTest exten
             assertEquals(0, p.getCompletedTaskCount());
             threadProceed.countDown();
             threadDone.await();
-            delay(SHORT_DELAY_MS);
-            assertEquals(1, p.getCompletedTaskCount());
+            long startTime = System.nanoTime();
+            while (p.getCompletedTaskCount() != 1) {
+                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
+                    fail("timed out");
+                Thread.yield();
+            }
         } finally {
             joinPool(p);
         }