--- jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2009/11/21 02:07:26	1.29
+++ jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2009/11/30 08:31:09	1.32
@@ -10,6 +10,7 @@
 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.*;
 
@@ -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, MEDIUM_DELAY_MS * 1000L * 1000L);
             }});
 
         t.start();
+        Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         t.join();
     }
@@ -359,7 +361,7 @@ public class AbstractQueuedSynchronizerT
         sync.acquire(1);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(sync.tryAcquireNanos(1, 1000 * 1000));
+                threadAssertFalse(sync.tryAcquireNanos(1, SHORT_DELAY_MS * 1000L * 1000L));
             }});
 
         t.start();
@@ -416,6 +418,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 +478,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 +788,6 @@ public class AbstractQueuedSynchronizerT
             public void realRun() throws InterruptedException {
                 sync.acquire(1);
                 c.await();
-                sync.release(1);
             }});
 
         t.start();
@@ -804,8 +806,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(LONG_DELAY_MS * 1000L * 1000L);
             }});
 
         t.start();
@@ -826,7 +827,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();
@@ -954,7 +954,7 @@ 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.tryAcquireSharedNanos(0, MEDIUM_DELAY_MS * 1000L * 1000L));
                 threadAssertTrue(l.isSignalled());
             }});
 
@@ -991,7 +991,7 @@ public class AbstractQueuedSynchronizerT
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
                 threadAssertFalse(l.isSignalled());
-                l.tryAcquireSharedNanos(0, SMALL_DELAY_MS* 1000 * 1000);
+                l.tryAcquireSharedNanos(0, SMALL_DELAY_MS * 1000L * 1000L);
             }});
 
         t.start();
@@ -1009,7 +1009,7 @@ public class AbstractQueuedSynchronizerT
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 threadAssertFalse(l.isSignalled());
-                threadAssertFalse(l.tryAcquireSharedNanos(0, SMALL_DELAY_MS* 1000 * 1000));
+                threadAssertFalse(l.tryAcquireSharedNanos(0, SMALL_DELAY_MS * 1000L * 1000L));
             }});
 
         t.start();