--- jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2009/11/30 08:31:09	1.32
+++ jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2010/10/19 00:43:49	1.38
@@ -16,7 +16,7 @@ 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);
@@ -34,7 +34,7 @@ public class AbstractQueuedSynchronizerT
         public boolean isHeldExclusively() { return getState() == 1; }
 
         public boolean tryAcquire(int acquires) {
-            assertTrue(acquires == 1);
+            assertEquals(1, acquires);
             return compareAndSetState(0, 1);
         }
 
@@ -44,7 +44,9 @@ public class AbstractQueuedSynchronizerT
             return true;
         }
 
-        public AbstractQueuedSynchronizer.ConditionObject newCondition() { return new AbstractQueuedSynchronizer.ConditionObject(); }
+        public AbstractQueuedSynchronizer.ConditionObject newCondition() {
+            return new AbstractQueuedSynchronizer.ConditionObject();
+        }
 
     }
 
@@ -56,7 +58,7 @@ public class AbstractQueuedSynchronizerT
         public boolean isSignalled() { return getState() != 0; }
 
         public int tryAcquireShared(int ignore) {
-            return isSignalled()? 1 : -1;
+            return isSignalled() ? 1 : -1;
         }
 
         public boolean tryReleaseShared(int ignore) {
@@ -327,7 +329,7 @@ public class AbstractQueuedSynchronizerT
         sync.acquire(1);
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
-                sync.tryAcquireNanos(1, MEDIUM_DELAY_MS * 1000L * 1000L);
+                sync.tryAcquireNanos(1, MILLISECONDS.toNanos(MEDIUM_DELAY_MS));
             }});
 
         t.start();
@@ -345,7 +347,7 @@ public class AbstractQueuedSynchronizerT
         sync.acquire(1);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertFalse(sync.tryAcquire(1));
+                assertFalse(sync.tryAcquire(1));
             }});
 
         t.start();
@@ -361,7 +363,8 @@ public class AbstractQueuedSynchronizerT
         sync.acquire(1);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(sync.tryAcquireNanos(1, SHORT_DELAY_MS * 1000L * 1000L));
+                long nanos = MILLISECONDS.toNanos(SHORT_DELAY_MS);
+                assertFalse(sync.tryAcquireNanos(1, nanos));
             }});
 
         t.start();
@@ -472,7 +475,7 @@ public class AbstractQueuedSynchronizerT
     }
 
     /**
-     *  Timed await without a signal times out
+     * Timed await without a signal times out
      */
     public void testAwait_Timeout() throws InterruptedException {
         final Mutex sync = new Mutex();
@@ -641,8 +644,8 @@ public class AbstractQueuedSynchronizerT
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
-                threadAssertFalse(sync.hasWaiters(c));
-                threadAssertEquals(0, sync.getWaitQueueLength(c));
+                assertFalse(sync.hasWaiters(c));
+                assertEquals(0, sync.getWaitQueueLength(c));
                 c.await();
                 sync.release(1);
             }});
@@ -672,8 +675,8 @@ public class AbstractQueuedSynchronizerT
         Thread t1 = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
-                threadAssertFalse(sync.hasWaiters(c));
-                threadAssertEquals(0, sync.getWaitQueueLength(c));
+                assertFalse(sync.hasWaiters(c));
+                assertEquals(0, sync.getWaitQueueLength(c));
                 c.await();
                 sync.release(1);
             }});
@@ -681,8 +684,8 @@ public class AbstractQueuedSynchronizerT
         Thread t2 = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
-                threadAssertTrue(sync.hasWaiters(c));
-                threadAssertEquals(1, sync.getWaitQueueLength(c));
+                assertTrue(sync.hasWaiters(c));
+                assertEquals(1, sync.getWaitQueueLength(c));
                 c.await();
                 sync.release(1);
             }});
@@ -716,7 +719,7 @@ public class AbstractQueuedSynchronizerT
         Thread t1 = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
-                threadAssertTrue(sync.getWaitingThreads(c).isEmpty());
+                assertTrue(sync.getWaitingThreads(c).isEmpty());
                 c.await();
                 sync.release(1);
             }});
@@ -724,7 +727,7 @@ public class AbstractQueuedSynchronizerT
         Thread t2 = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
-                threadAssertFalse(sync.getWaitingThreads(c).isEmpty());
+                assertFalse(sync.getWaitingThreads(c).isEmpty());
                 c.await();
                 sync.release(1);
             }});
@@ -806,7 +809,7 @@ public class AbstractQueuedSynchronizerT
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
-                c.awaitNanos(LONG_DELAY_MS * 1000L * 1000L);
+                c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
             }});
 
         t.start();
@@ -931,9 +934,9 @@ public class AbstractQueuedSynchronizerT
 
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(l.isSignalled());
+                assertFalse(l.isSignalled());
                 l.acquireSharedInterruptibly(0);
-                threadAssertTrue(l.isSignalled());
+                assertTrue(l.isSignalled());
             }});
 
         t.start();
@@ -948,14 +951,15 @@ public class AbstractQueuedSynchronizerT
     /**
      * acquireSharedTimed returns after release
      */
-    public void testAsquireSharedTimed() throws InterruptedException {
+    public void testAcquireSharedTimed() throws InterruptedException {
         final BooleanLatch l = new BooleanLatch();
 
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(l.isSignalled());
-                threadAssertTrue(l.tryAcquireSharedNanos(0, MEDIUM_DELAY_MS * 1000L * 1000L));
-                threadAssertTrue(l.isSignalled());
+                assertFalse(l.isSignalled());
+                long nanos = MILLISECONDS.toNanos(MEDIUM_DELAY_MS);
+                assertTrue(l.tryAcquireSharedNanos(0, nanos));
+                assertTrue(l.isSignalled());
             }});
 
         t.start();
@@ -973,7 +977,7 @@ public class AbstractQueuedSynchronizerT
         final BooleanLatch l = new BooleanLatch();
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(l.isSignalled());
+                assertFalse(l.isSignalled());
                 l.acquireSharedInterruptibly(0);
             }});
 
@@ -990,8 +994,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 * 1000L * 1000L);
+                assertFalse(l.isSignalled());
+                long nanos = MILLISECONDS.toNanos(SMALL_DELAY_MS);
+                l.tryAcquireSharedNanos(0, nanos);
             }});
 
         t.start();
@@ -1008,8 +1013,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 * 1000L * 1000L));
+                assertFalse(l.isSignalled());
+                long nanos = MILLISECONDS.toNanos(SMALL_DELAY_MS);
+                assertFalse(l.tryAcquireSharedNanos(0, nanos));
             }});
 
         t.start();