--- jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2009/11/21 02:07:26	1.29
+++ jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2010/08/25 00:07:02	1.34
@@ -10,12 +10,13 @@
 import junit.framework.*;
 import java.util.*;
 import java.util.concurrent.*;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import java.util.concurrent.locks.*;
 import java.io.*;
 
 public class AbstractQueuedSynchronizerTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
         return new TestSuite(AbstractQueuedSynchronizerTest.class);
@@ -326,10 +327,11 @@ public class AbstractQueuedSynchronizerT
         sync.acquire(1);
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
-                sync.tryAcquireNanos(1, MEDIUM_DELAY_MS * 1000 * 1000);
+                sync.tryAcquireNanos(1, MILLISECONDS.toNanos(MEDIUM_DELAY_MS));
             }});
 
         t.start();
+        Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         t.join();
     }
@@ -359,7 +361,8 @@ public class AbstractQueuedSynchronizerT
         sync.acquire(1);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(sync.tryAcquireNanos(1, 1000 * 1000));
+                long nanos = MILLISECONDS.toNanos(SHORT_DELAY_MS);
+                assertFalse(sync.tryAcquireNanos(1, nanos));
             }});
 
         t.start();
@@ -416,6 +419,7 @@ public class AbstractQueuedSynchronizerT
         sync.acquireInterruptibly(1);
         Thread t = new Thread(new InterruptedSyncRunnable(sync));
         t.start();
+        Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         assertTrue(sync.isHeldExclusively());
         t.join();
@@ -475,7 +479,7 @@ public class AbstractQueuedSynchronizerT
         final Mutex sync = new Mutex();
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
         sync.acquire(1);
-        assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
+        assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
         sync.release(1);
     }
 
@@ -785,7 +789,6 @@ public class AbstractQueuedSynchronizerT
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
                 c.await();
-                sync.release(1);
             }});
 
         t.start();
@@ -804,8 +807,7 @@ public class AbstractQueuedSynchronizerT
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
-                c.awaitNanos(1000 * 1000 * 1000); // 1 sec
-                sync.release(1);
+                c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
             }});
 
         t.start();
@@ -826,7 +828,6 @@ public class AbstractQueuedSynchronizerT
                 sync.acquire(1);
                 java.util.Date d = new java.util.Date();
                 c.awaitUntil(new java.util.Date(d.getTime() + 10000));
-                sync.release(1);
             }});
 
         t.start();
@@ -953,9 +954,10 @@ public class AbstractQueuedSynchronizerT
 
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(l.isSignalled());
-                threadAssertTrue(l.tryAcquireSharedNanos(0, MEDIUM_DELAY_MS* 1000 * 1000));
-                threadAssertTrue(l.isSignalled());
+                assertFalse(l.isSignalled());
+                long nanos = MILLISECONDS.toNanos(MEDIUM_DELAY_MS);
+                assertTrue(l.tryAcquireSharedNanos(0, nanos));
+                assertTrue(l.isSignalled());
             }});
 
         t.start();
@@ -990,8 +992,9 @@ public class AbstractQueuedSynchronizerT
         final BooleanLatch l = new BooleanLatch();
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(l.isSignalled());
-                l.tryAcquireSharedNanos(0, SMALL_DELAY_MS* 1000 * 1000);
+                assertFalse(l.isSignalled());
+                long nanos = MILLISECONDS.toNanos(SMALL_DELAY_MS);
+                l.tryAcquireSharedNanos(0, nanos);
             }});
 
         t.start();
@@ -1008,8 +1011,9 @@ public class AbstractQueuedSynchronizerT
         final BooleanLatch l = new BooleanLatch();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(l.isSignalled());
-                threadAssertFalse(l.tryAcquireSharedNanos(0, SMALL_DELAY_MS* 1000 * 1000));
+                assertFalse(l.isSignalled());
+                long nanos = MILLISECONDS.toNanos(SMALL_DELAY_MS);
+                assertFalse(l.tryAcquireSharedNanos(0, nanos));
             }});
 
         t.start();