--- jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2009/11/21 21:59:50	1.38
+++ jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2011/03/15 19:47:07	1.44
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  * Other contributors include Andrew Wright, Jeffrey Hayes,
  * Pat Fisher, Mike Judd.
  */
@@ -15,7 +15,7 @@ import java.util.*;
 
 public class ReentrantReadWriteLockTest 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(ReentrantReadWriteLockTest.class);
@@ -252,10 +252,11 @@ public class ReentrantReadWriteLockTest
         lock.writeLock().lock();
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
-                lock.readLock().tryLock(1000,MILLISECONDS);
+                lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
             }});
 
         t.start();
+        Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         t.join();
     }
@@ -269,7 +270,7 @@ public class ReentrantReadWriteLockTest
         lock.writeLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertFalse(lock.writeLock().tryLock());
+                assertFalse(lock.writeLock().tryLock());
             }});
 
         t.start();
@@ -285,7 +286,7 @@ public class ReentrantReadWriteLockTest
         lock.writeLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertFalse(lock.readLock().tryLock());
+                assertFalse(lock.readLock().tryLock());
             }});
 
         t.start();
@@ -301,7 +302,7 @@ public class ReentrantReadWriteLockTest
         lock.readLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertTrue(lock.readLock().tryLock());
+                assertTrue(lock.readLock().tryLock());
                 lock.readLock().unlock();
             }});
 
@@ -408,7 +409,7 @@ public class ReentrantReadWriteLockTest
     }
 
     /**
-     *  Read lock succeeds if write locked by current thread even if
+     * Read lock succeeds if write locked by current thread even if
      * other threads are waiting for writelock
      */
     public void testReadHoldingWriteLock3() throws InterruptedException {
@@ -441,7 +442,7 @@ public class ReentrantReadWriteLockTest
 
 
     /**
-     *  Write lock succeeds if write locked by current thread even if
+     * Write lock succeeds if write locked by current thread even if
      * other threads are waiting for writelock
      */
     public void testWriteHoldingWriteLock4() throws InterruptedException {
@@ -572,9 +573,9 @@ public class ReentrantReadWriteLockTest
         t2.start();
         Thread.sleep(SHORT_DELAY_MS);
         assertTrue(lock.isWriteLockedByCurrentThread());
-        assertTrue(lock.getWriteHoldCount() == 1);
+        assertEquals(1, lock.getWriteHoldCount());
         lock.writeLock().lock();
-        assertTrue(lock.getWriteHoldCount() == 2);
+        assertEquals(2, lock.getWriteHoldCount());
         lock.writeLock().unlock();
         lock.writeLock().lock();
         lock.writeLock().unlock();
@@ -594,7 +595,7 @@ public class ReentrantReadWriteLockTest
         lock.readLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertTrue(lock.readLock().tryLock());
+                assertTrue(lock.readLock().tryLock());
                 lock.readLock().unlock();
             }});
 
@@ -613,7 +614,7 @@ public class ReentrantReadWriteLockTest
         lock.readLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertFalse(lock.writeLock().tryLock());
+                assertFalse(lock.writeLock().tryLock());
             }});
 
         t.start();
@@ -630,7 +631,7 @@ public class ReentrantReadWriteLockTest
         lock.readLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertTrue(lock.readLock().tryLock());
+                assertTrue(lock.readLock().tryLock());
                 lock.readLock().unlock();
             }});
 
@@ -649,7 +650,7 @@ public class ReentrantReadWriteLockTest
         lock.readLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
-                threadAssertFalse(lock.writeLock().tryLock());
+                assertFalse(lock.writeLock().tryLock());
             }});
 
         t.start();
@@ -667,7 +668,7 @@ public class ReentrantReadWriteLockTest
         lock.writeLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
+                assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
             }});
 
         t.start();
@@ -684,7 +685,7 @@ public class ReentrantReadWriteLockTest
         lock.writeLock().lock();
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(lock.readLock().tryLock(1, MILLISECONDS));
+                assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
             }});
 
         t.start();
@@ -714,7 +715,7 @@ public class ReentrantReadWriteLockTest
     }
 
     /**
-     *  read lockInterruptibly succeeds if lock free else is interruptible
+     * read lockInterruptibly succeeds if lock free else is interruptible
      */
     public void testReadLockInterruptibly() throws InterruptedException {
         final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -770,7 +771,7 @@ public class ReentrantReadWriteLockTest
 
 
     /**
-     *  timed await without a signal times out
+     * timed await without a signal times out
      */
     public void testAwait_Timeout() throws InterruptedException {
         final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -898,7 +899,7 @@ public class ReentrantReadWriteLockTest
         Thread t = new Thread(new CheckedInterruptedRunnable() {
             public void realRun() throws InterruptedException {
                 lock.writeLock().lock();
-                c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
+                c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
                 lock.writeLock().unlock();
             }});
 
@@ -1223,8 +1224,8 @@ public class ReentrantReadWriteLockTest
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 lock.writeLock().lock();
-                threadAssertFalse(lock.hasWaiters(c));
-                threadAssertEquals(0, lock.getWaitQueueLength(c));
+                assertFalse(lock.hasWaiters(c));
+                assertEquals(0, lock.getWaitQueueLength(c));
                 c.await();
                 lock.writeLock().unlock();
             }});
@@ -1254,8 +1255,8 @@ public class ReentrantReadWriteLockTest
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 lock.writeLock().lock();
-                threadAssertFalse(lock.hasWaiters(c));
-                threadAssertEquals(0, lock.getWaitQueueLength(c));
+                assertFalse(lock.hasWaiters(c));
+                assertEquals(0, lock.getWaitQueueLength(c));
                 c.await();
                 lock.writeLock().unlock();
             }});
@@ -1286,7 +1287,7 @@ public class ReentrantReadWriteLockTest
         Thread t1 = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 lock.writeLock().lock();
-                threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
+                assertTrue(lock.getWaitingThreads(c).isEmpty());
                 c.await();
                 lock.writeLock().unlock();
             }});
@@ -1294,7 +1295,7 @@ public class ReentrantReadWriteLockTest
         Thread t2 = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 lock.writeLock().lock();
-                threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
+                assertFalse(lock.getWaitingThreads(c).isEmpty());
                 c.await();
                 lock.writeLock().unlock();
             }});