ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ReentrantReadWriteLockTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ReentrantReadWriteLockTest.java (file contents):
Revision 1.27 by dl, Thu May 18 10:29:23 2006 UTC vs.
Revision 1.65 by jsr166, Tue May 31 16:16:24 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
10 < import java.util.concurrent.locks.*;
11 < import java.util.concurrent.*;
12 < import java.io.*;
10 > import java.util.concurrent.atomic.AtomicBoolean;
11 > import java.util.concurrent.locks.Condition;
12 > import java.util.concurrent.locks.Lock;
13 > import java.util.concurrent.locks.ReentrantReadWriteLock;
14 > import java.util.concurrent.CountDownLatch;
15 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
16   import java.util.*;
17  
18   public class ReentrantReadWriteLockTest extends JSR166TestCase {
19      public static void main(String[] args) {
20 <        junit.textui.TestRunner.run (suite());  
20 >        junit.textui.TestRunner.run(suite());
21      }
22      public static Test suite() {
23 <        return new TestSuite(ReentrantReadWriteLockTest.class);
23 >        return new TestSuite(ReentrantReadWriteLockTest.class);
24      }
25  
26      /**
27       * A runnable calling lockInterruptibly
28       */
29 <    class InterruptibleLockRunnable implements Runnable {
29 >    class InterruptibleLockRunnable extends CheckedRunnable {
30          final ReentrantReadWriteLock lock;
31          InterruptibleLockRunnable(ReentrantReadWriteLock l) { lock = l; }
32 <        public void run() {
33 <            try {
31 <                lock.writeLock().lockInterruptibly();
32 <            } catch(InterruptedException success){}
32 >        public void realRun() throws InterruptedException {
33 >            lock.writeLock().lockInterruptibly();
34          }
35      }
36  
36
37      /**
38       * A runnable calling lockInterruptibly that expects to be
39       * interrupted
40       */
41 <    class InterruptedLockRunnable implements Runnable {
41 >    class InterruptedLockRunnable extends CheckedInterruptedRunnable {
42          final ReentrantReadWriteLock lock;
43          InterruptedLockRunnable(ReentrantReadWriteLock l) { lock = l; }
44 <        public void run() {
45 <            try {
46 <                lock.writeLock().lockInterruptibly();
47 <                threadShouldThrow();
48 <            } catch(InterruptedException success){}
44 >        public void realRun() throws InterruptedException {
45 >            lock.writeLock().lockInterruptibly();
46          }
47      }
48  
# Line 54 | Line 51 | public class ReentrantReadWriteLockTest
51       */
52      static class PublicReentrantReadWriteLock extends ReentrantReadWriteLock {
53          PublicReentrantReadWriteLock() { super(); }
54 <        public Collection<Thread> getQueuedThreads() {
55 <            return super.getQueuedThreads();
54 >        PublicReentrantReadWriteLock(boolean fair) { super(fair); }
55 >        public Thread getOwner() {
56 >            return super.getOwner();
57 >        }
58 >        public Collection<Thread> getQueuedThreads() {
59 >            return super.getQueuedThreads();
60          }
61 <        public Collection<Thread> getWaitingThreads(Condition c) {
62 <            return super.getWaitingThreads(c);
61 >        public Collection<Thread> getWaitingThreads(Condition c) {
62 >            return super.getWaitingThreads(c);
63          }
64      }
65  
66      /**
67 <     * Constructor sets given fairness, and is in unlocked state
67 >     * Releases write lock, checking that it had a hold count of 1.
68       */
69 <    public void testConstructor() {
70 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
71 <        assertFalse(rl.isFair());
72 <        assertFalse(rl.isWriteLocked());
73 <        assertEquals(0, rl.getReadLockCount());
74 <        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
74 <        assertTrue(r2.isFair());
75 <        assertFalse(r2.isWriteLocked());
76 <        assertEquals(0, r2.getReadLockCount());
69 >    void releaseWriteLock(PublicReentrantReadWriteLock lock) {
70 >        ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
71 >        assertWriteLockedByMoi(lock);
72 >        assertEquals(1, lock.getWriteHoldCount());
73 >        writeLock.unlock();
74 >        assertNotWriteLocked(lock);
75      }
76  
77      /**
78 <     * write-locking and read-locking an unlocked lock succeed
78 >     * Spin-waits until lock.hasQueuedThread(t) becomes true.
79       */
80 <    public void testLock() {
81 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
82 <        rl.writeLock().lock();
83 <        assertTrue(rl.isWriteLocked());
84 <        assertTrue(rl.isWriteLockedByCurrentThread());
85 <        assertTrue(rl.writeLock().isHeldByCurrentThread());
86 <        assertEquals(0, rl.getReadLockCount());
87 <        rl.writeLock().unlock();
88 <        assertFalse(rl.isWriteLocked());
91 <        assertFalse(rl.isWriteLockedByCurrentThread());
92 <        assertFalse(rl.writeLock().isHeldByCurrentThread());
93 <        assertEquals(0, rl.getReadLockCount());
94 <        rl.readLock().lock();
95 <        assertFalse(rl.isWriteLocked());
96 <        assertFalse(rl.isWriteLockedByCurrentThread());
97 <        assertEquals(1, rl.getReadLockCount());
98 <        rl.readLock().unlock();
99 <        assertFalse(rl.isWriteLocked());
100 <        assertFalse(rl.isWriteLockedByCurrentThread());
101 <        assertEquals(0, rl.getReadLockCount());
80 >    void waitForQueuedThread(PublicReentrantReadWriteLock lock, Thread t) {
81 >        long startTime = System.nanoTime();
82 >        while (!lock.hasQueuedThread(t)) {
83 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
84 >                throw new AssertionFailedError("timed out");
85 >            Thread.yield();
86 >        }
87 >        assertTrue(t.isAlive());
88 >        assertTrue(lock.getOwner() != t);
89      }
90  
104
91      /**
92 <     * locking an unlocked fair lock succeeds
93 <     */
94 <    public void testFairLock() {
95 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
96 <        rl.writeLock().lock();
97 <        assertTrue(rl.isWriteLocked());
98 <        assertTrue(rl.isWriteLockedByCurrentThread());
99 <        assertTrue(rl.writeLock().isHeldByCurrentThread());
100 <        assertEquals(0, rl.getReadLockCount());
115 <        rl.writeLock().unlock();
116 <        assertFalse(rl.isWriteLocked());
117 <        assertFalse(rl.isWriteLockedByCurrentThread());
118 <        assertFalse(rl.writeLock().isHeldByCurrentThread());
119 <        assertEquals(0, rl.getReadLockCount());
120 <        rl.readLock().lock();
121 <        assertFalse(rl.isWriteLocked());
122 <        assertFalse(rl.isWriteLockedByCurrentThread());
123 <        assertEquals(1, rl.getReadLockCount());
124 <        rl.readLock().unlock();
125 <        assertFalse(rl.isWriteLocked());
126 <        assertFalse(rl.isWriteLockedByCurrentThread());
127 <        assertEquals(0, rl.getReadLockCount());
92 >     * Checks that lock is not write-locked.
93 >     */
94 >    void assertNotWriteLocked(PublicReentrantReadWriteLock lock) {
95 >        assertFalse(lock.isWriteLocked());
96 >        assertFalse(lock.isWriteLockedByCurrentThread());
97 >        assertFalse(lock.writeLock().isHeldByCurrentThread());
98 >        assertEquals(0, lock.getWriteHoldCount());
99 >        assertEquals(0, lock.writeLock().getHoldCount());
100 >        assertNull(lock.getOwner());
101      }
102  
103      /**
104 <     * getWriteHoldCount returns number of recursive holds
104 >     * Checks that lock is write-locked by the given thread.
105       */
106 <    public void testGetWriteHoldCount() {
107 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
108 <        for(int i = 1; i <= SIZE; i++) {
109 <            lock.writeLock().lock();
110 <            assertEquals(i,lock.getWriteHoldCount());
111 <        }
112 <        for(int i = SIZE; i > 0; i--) {
113 <            lock.writeLock().unlock();
114 <            assertEquals(i-1,lock.getWriteHoldCount());
115 <        }
106 >    void assertWriteLockedBy(PublicReentrantReadWriteLock lock, Thread t) {
107 >        assertTrue(lock.isWriteLocked());
108 >        assertSame(t, lock.getOwner());
109 >        assertEquals(t == Thread.currentThread(),
110 >                     lock.isWriteLockedByCurrentThread());
111 >        assertEquals(t == Thread.currentThread(),
112 >                     lock.writeLock().isHeldByCurrentThread());
113 >        assertEquals(t == Thread.currentThread(),
114 >                     lock.getWriteHoldCount() > 0);
115 >        assertEquals(t == Thread.currentThread(),
116 >                     lock.writeLock().getHoldCount() > 0);
117 >        assertEquals(0, lock.getReadLockCount());
118      }
119  
120      /**
121 <     * WriteLock.getHoldCount returns number of recursive holds
122 <     */
123 <    public void testGetHoldCount() {
124 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
150 <        for(int i = 1; i <= SIZE; i++) {
151 <            lock.writeLock().lock();
152 <            assertEquals(i,lock.writeLock().getHoldCount());
153 <        }
154 <        for(int i = SIZE; i > 0; i--) {
155 <            lock.writeLock().unlock();
156 <            assertEquals(i-1,lock.writeLock().getHoldCount());
157 <        }
121 >     * Checks that lock is write-locked by the current thread.
122 >     */
123 >    void assertWriteLockedByMoi(PublicReentrantReadWriteLock lock) {
124 >        assertWriteLockedBy(lock, Thread.currentThread());
125      }
126  
127      /**
128 <     * getReadHoldCount returns number of recursive holds
128 >     * Checks that condition c has no waiters.
129       */
130 <    public void testGetReadHoldCount() {
131 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
165 <        for(int i = 1; i <= SIZE; i++) {
166 <            lock.readLock().lock();
167 <            assertEquals(i,lock.getReadHoldCount());
168 <        }
169 <        for(int i = SIZE; i > 0; i--) {
170 <            lock.readLock().unlock();
171 <            assertEquals(i-1,lock.getReadHoldCount());
172 <        }
130 >    void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
131 >        assertHasWaiters(lock, c, new Thread[] {});
132      }
174    
133  
134      /**
135 <     * write-unlocking an unlocked lock throws IllegalMonitorStateException
135 >     * Checks that condition c has exactly the given waiter threads.
136       */
137 <    public void testUnlock_IllegalMonitorStateException() {
138 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
139 <        try {
140 <            rl.writeLock().unlock();
141 <            shouldThrow();
142 <        } catch(IllegalMonitorStateException success){}
137 >    void assertHasWaiters(PublicReentrantReadWriteLock lock, Condition c,
138 >                          Thread... threads) {
139 >        lock.writeLock().lock();
140 >        assertEquals(threads.length > 0, lock.hasWaiters(c));
141 >        assertEquals(threads.length, lock.getWaitQueueLength(c));
142 >        assertEquals(threads.length == 0, lock.getWaitingThreads(c).isEmpty());
143 >        assertEquals(threads.length, lock.getWaitingThreads(c).size());
144 >        assertEquals(new HashSet<Thread>(lock.getWaitingThreads(c)),
145 >                     new HashSet<Thread>(Arrays.asList(threads)));
146 >        lock.writeLock().unlock();
147      }
148  
149 +    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
150  
151      /**
152 <     * write-lockInterruptibly is interruptible
152 >     * Awaits condition using the specified AwaitMethod.
153       */
154 <    public void testWriteLockInterruptibly_Interrupted() {
155 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
156 <        Thread t = new Thread(new Runnable() {
157 <                public void run() {
158 <                    try {
159 <                        lock.writeLock().lockInterruptibly();
160 <                        lock.writeLock().unlock();
161 <                        lock.writeLock().lockInterruptibly();
162 <                        lock.writeLock().unlock();
163 <                    } catch(InterruptedException success){}
164 <                }
165 <            });
166 <        try {
167 <            lock.writeLock().lock();
168 <            t.start();
169 <            Thread.sleep(SHORT_DELAY_MS);
170 <            t.interrupt();
208 <            Thread.sleep(SHORT_DELAY_MS);
209 <            lock.writeLock().unlock();
210 <            t.join();
211 <        } catch(Exception e){
212 <            unexpectedException();
154 >    void await(Condition c, AwaitMethod awaitMethod)
155 >            throws InterruptedException {
156 >        switch (awaitMethod) {
157 >        case await:
158 >            c.await();
159 >            break;
160 >        case awaitTimed:
161 >            assertTrue(c.await(2 * LONG_DELAY_MS, MILLISECONDS));
162 >            break;
163 >        case awaitNanos:
164 >            long nanosRemaining = c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
165 >            assertTrue(nanosRemaining > 0);
166 >            break;
167 >        case awaitUntil:
168 >            java.util.Date d = new java.util.Date();
169 >            assertTrue(c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS)));
170 >            break;
171          }
172 <    }
172 >    }
173  
174      /**
175 <     * timed write-tryLock is interruptible
175 >     * Constructor sets given fairness, and is in unlocked state
176       */
177 <    public void testWriteTryLock_Interrupted() {
178 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
179 <        lock.writeLock().lock();
180 <        Thread t = new Thread(new Runnable() {
181 <                public void run() {
182 <                    try {
183 <                        lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
184 <                    } catch(InterruptedException success){}
185 <                }
186 <            });
187 <        try {
188 <            t.start();
189 <            t.interrupt();
190 <            lock.writeLock().unlock();
191 <            t.join();
192 <        } catch(Exception e){
193 <            unexpectedException();
236 <        }
177 >    public void testConstructor() {
178 >        PublicReentrantReadWriteLock lock;
179 >
180 >        lock = new PublicReentrantReadWriteLock();
181 >        assertFalse(lock.isFair());
182 >        assertNotWriteLocked(lock);
183 >        assertEquals(0, lock.getReadLockCount());
184 >
185 >        lock = new PublicReentrantReadWriteLock(true);
186 >        assertTrue(lock.isFair());
187 >        assertNotWriteLocked(lock);
188 >        assertEquals(0, lock.getReadLockCount());
189 >
190 >        lock = new PublicReentrantReadWriteLock(false);
191 >        assertFalse(lock.isFair());
192 >        assertNotWriteLocked(lock);
193 >        assertEquals(0, lock.getReadLockCount());
194      }
195  
196      /**
197 <     * read-lockInterruptibly is interruptible
197 >     * write-locking and read-locking an unlocked lock succeed
198       */
199 <    public void testReadLockInterruptibly_Interrupted() {
200 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
201 <        lock.writeLock().lock();
202 <        Thread t = new Thread(new Runnable() {
203 <                public void run() {
204 <                    try {
205 <                        lock.readLock().lockInterruptibly();
206 <                    } catch(InterruptedException success){}
207 <                }
208 <            });
209 <        try {
210 <            t.start();
211 <            Thread.sleep(SHORT_DELAY_MS);
212 <            t.interrupt();
213 <            Thread.sleep(SHORT_DELAY_MS);
199 >    public void testLock()      { testLock(false); }
200 >    public void testLock_fair() { testLock(true); }
201 >    public void testLock(boolean fair) {
202 >        PublicReentrantReadWriteLock lock =
203 >            new PublicReentrantReadWriteLock(fair);
204 >        assertNotWriteLocked(lock);
205 >        lock.writeLock().lock();
206 >        assertWriteLockedByMoi(lock);
207 >        lock.writeLock().unlock();
208 >        assertNotWriteLocked(lock);
209 >        assertEquals(0, lock.getReadLockCount());
210 >        lock.readLock().lock();
211 >        assertNotWriteLocked(lock);
212 >        assertEquals(1, lock.getReadLockCount());
213 >        lock.readLock().unlock();
214 >        assertNotWriteLocked(lock);
215 >        assertEquals(0, lock.getReadLockCount());
216 >    }
217 >
218 >    /**
219 >     * getWriteHoldCount returns number of recursive holds
220 >     */
221 >    public void testGetWriteHoldCount()      { testGetWriteHoldCount(false); }
222 >    public void testGetWriteHoldCount_fair() { testGetWriteHoldCount(true); }
223 >    public void testGetWriteHoldCount(boolean fair) {
224 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
225 >        for (int i = 1; i <= SIZE; i++) {
226 >            lock.writeLock().lock();
227 >            assertEquals(i,lock.getWriteHoldCount());
228 >        }
229 >        for (int i = SIZE; i > 0; i--) {
230              lock.writeLock().unlock();
231 <            t.join();
259 <        } catch(Exception e){
260 <            unexpectedException();
231 >            assertEquals(i-1,lock.getWriteHoldCount());
232          }
233 <    }
233 >    }
234  
235      /**
236 <     * timed read-tryLock is interruptible
236 >     * writelock.getHoldCount returns number of recursive holds
237       */
238 <    public void testReadTryLock_Interrupted() {
239 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
240 <        lock.writeLock().lock();
241 <        Thread t = new Thread(new Runnable() {
242 <                public void run() {
243 <                    try {
244 <                        lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
245 <                        threadShouldThrow();
246 <                    } catch(InterruptedException success){}
247 <                }
248 <            });
278 <        try {
279 <            t.start();
280 <            t.interrupt();
281 <            t.join();
282 <        } catch(Exception e){
283 <            unexpectedException();
238 >    public void testGetHoldCount()      { testGetHoldCount(false); }
239 >    public void testGetHoldCount_fair() { testGetHoldCount(true); }
240 >    public void testGetHoldCount(boolean fair) {
241 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
242 >        for (int i = 1; i <= SIZE; i++) {
243 >            lock.writeLock().lock();
244 >            assertEquals(i,lock.writeLock().getHoldCount());
245 >        }
246 >        for (int i = SIZE; i > 0; i--) {
247 >            lock.writeLock().unlock();
248 >            assertEquals(i-1,lock.writeLock().getHoldCount());
249          }
250      }
251  
287    
252      /**
253 <     * write-tryLock fails if locked
253 >     * getReadHoldCount returns number of recursive holds
254       */
255 <    public void testWriteTryLockWhenLocked() {
256 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
257 <        lock.writeLock().lock();
258 <        Thread t = new Thread(new Runnable() {
259 <                public void run() {
260 <                    threadAssertFalse(lock.writeLock().tryLock());
261 <                }
262 <            });
263 <        try {
264 <            t.start();
265 <            t.join();
302 <            lock.writeLock().unlock();
303 <        } catch(Exception e){
304 <            unexpectedException();
255 >    public void testGetReadHoldCount()      { testGetReadHoldCount(false); }
256 >    public void testGetReadHoldCount_fair() { testGetReadHoldCount(true); }
257 >    public void testGetReadHoldCount(boolean fair) {
258 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
259 >        for (int i = 1; i <= SIZE; i++) {
260 >            lock.readLock().lock();
261 >            assertEquals(i,lock.getReadHoldCount());
262 >        }
263 >        for (int i = SIZE; i > 0; i--) {
264 >            lock.readLock().unlock();
265 >            assertEquals(i-1,lock.getReadHoldCount());
266          }
267 <    }
267 >    }
268  
269      /**
270 <     * read-tryLock fails if locked
270 >     * write-unlocking an unlocked lock throws IllegalMonitorStateException
271       */
272 <    public void testReadTryLockWhenLocked() {
273 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
274 <        lock.writeLock().lock();
275 <        Thread t = new Thread(new Runnable() {
315 <                public void run() {
316 <                    threadAssertFalse(lock.readLock().tryLock());
317 <                }
318 <            });
272 >    public void testWriteUnlock_IMSE()      { testWriteUnlock_IMSE(false); }
273 >    public void testWriteUnlock_IMSE_fair() { testWriteUnlock_IMSE(true); }
274 >    public void testWriteUnlock_IMSE(boolean fair) {
275 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
276          try {
320            t.start();
321            t.join();
277              lock.writeLock().unlock();
278 <        } catch(Exception e){
279 <            unexpectedException();
280 <        }
326 <    }
278 >            shouldThrow();
279 >        } catch (IllegalMonitorStateException success) {}
280 >    }
281  
282      /**
283 <     * Multiple threads can hold a read lock when not write-locked
283 >     * read-unlocking an unlocked lock throws IllegalMonitorStateException
284       */
285 <    public void testMultipleReadLocks() {
286 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
287 <        lock.readLock().lock();
288 <        Thread t = new Thread(new Runnable() {
335 <                public void run() {
336 <                    threadAssertTrue(lock.readLock().tryLock());
337 <                    lock.readLock().unlock();
338 <                }
339 <            });
285 >    public void testReadUnlock_IMSE()      { testReadUnlock_IMSE(false); }
286 >    public void testReadUnlock_IMSE_fair() { testReadUnlock_IMSE(true); }
287 >    public void testReadUnlock_IMSE(boolean fair) {
288 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
289          try {
341            t.start();
342            t.join();
290              lock.readLock().unlock();
291 <        } catch(Exception e){
292 <            unexpectedException();
293 <        }
347 <    }
291 >            shouldThrow();
292 >        } catch (IllegalMonitorStateException success) {}
293 >    }
294  
295      /**
296 <     * A writelock succeeds after reading threads unlock
296 >     * write-lockInterruptibly is interruptible
297       */
298 <    public void testWriteAfterMultipleReadLocks() {
299 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
300 <        lock.readLock().lock();
301 <        Thread t1 = new Thread(new Runnable() {
302 <                public void run() {
303 <                    lock.readLock().lock();
304 <                    lock.readLock().unlock();
305 <                }
306 <            });
307 <        Thread t2 = new Thread(new Runnable() {
362 <                public void run() {
363 <                    lock.writeLock().lock();
364 <                    lock.writeLock().unlock();
365 <                }
366 <            });
298 >    public void testWriteLockInterruptibly_Interruptible()      { testWriteLockInterruptibly_Interruptible(false); }
299 >    public void testWriteLockInterruptibly_Interruptible_fair() { testWriteLockInterruptibly_Interruptible(true); }
300 >    public void testWriteLockInterruptibly_Interruptible(boolean fair) {
301 >        final PublicReentrantReadWriteLock lock =
302 >            new PublicReentrantReadWriteLock(fair);
303 >        lock.writeLock().lock();
304 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
305 >            public void realRun() throws InterruptedException {
306 >                lock.writeLock().lockInterruptibly();
307 >            }});
308  
309 <        try {
310 <            t1.start();
311 <            t2.start();
312 <            Thread.sleep(SHORT_DELAY_MS);
313 <            lock.readLock().unlock();
373 <            t1.join(MEDIUM_DELAY_MS);
374 <            t2.join(MEDIUM_DELAY_MS);
375 <            assertTrue(!t1.isAlive());
376 <            assertTrue(!t2.isAlive());
377 <          
378 <        } catch(Exception e){
379 <            unexpectedException();
380 <        }
381 <    }
309 >        waitForQueuedThread(lock, t);
310 >        t.interrupt();
311 >        awaitTermination(t);
312 >        releaseWriteLock(lock);
313 >    }
314  
315      /**
316 <     * Readlocks succeed after a writing thread unlocks
316 >     * timed write-tryLock is interruptible
317       */
318 <    public void testReadAfterWriteLock() {
319 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
320 <        lock.writeLock().lock();
321 <        Thread t1 = new Thread(new Runnable() {
322 <                public void run() {
323 <                    lock.readLock().lock();
324 <                    lock.readLock().unlock();
325 <                }
326 <            });
327 <        Thread t2 = new Thread(new Runnable() {
328 <                public void run() {
329 <                    lock.readLock().lock();
330 <                    lock.readLock().unlock();
331 <                }
332 <            });
318 >    public void testWriteTryLock_Interruptible()      { testWriteTryLock_Interruptible(false); }
319 >    public void testWriteTryLock_Interruptible_fair() { testWriteTryLock_Interruptible(true); }
320 >    public void testWriteTryLock_Interruptible(boolean fair) {
321 >        final PublicReentrantReadWriteLock lock =
322 >            new PublicReentrantReadWriteLock(fair);
323 >        lock.writeLock().lock();
324 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
325 >            public void realRun() throws InterruptedException {
326 >                lock.writeLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
327 >            }});
328 >
329 >        waitForQueuedThread(lock, t);
330 >        t.interrupt();
331 >        awaitTermination(t);
332 >        releaseWriteLock(lock);
333 >    }
334  
335 <        try {
336 <            t1.start();
337 <            t2.start();
338 <            Thread.sleep(SHORT_DELAY_MS);
339 <            lock.writeLock().unlock();
340 <            t1.join(MEDIUM_DELAY_MS);
341 <            t2.join(MEDIUM_DELAY_MS);
342 <            assertTrue(!t1.isAlive());
343 <            assertTrue(!t2.isAlive());
344 <          
345 <        } catch(Exception e){
346 <            unexpectedException();
347 <        }
348 <    }
335 >    /**
336 >     * read-lockInterruptibly is interruptible
337 >     */
338 >    public void testReadLockInterruptibly_Interruptible()      { testReadLockInterruptibly_Interruptible(false); }
339 >    public void testReadLockInterruptibly_Interruptible_fair() { testReadLockInterruptibly_Interruptible(true); }
340 >    public void testReadLockInterruptibly_Interruptible(boolean fair) {
341 >        final PublicReentrantReadWriteLock lock =
342 >            new PublicReentrantReadWriteLock(fair);
343 >        lock.writeLock().lock();
344 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
345 >            public void realRun() throws InterruptedException {
346 >                lock.readLock().lockInterruptibly();
347 >            }});
348 >
349 >        waitForQueuedThread(lock, t);
350 >        t.interrupt();
351 >        awaitTermination(t);
352 >        releaseWriteLock(lock);
353 >    }
354  
355      /**
356 <     * Read trylock succeeds if write locked by current thread
356 >     * timed read-tryLock is interruptible
357       */
358 <    public void testReadHoldingWriteLock() {
359 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
360 <        lock.writeLock().lock();
361 <        assertTrue(lock.readLock().tryLock());
362 <        lock.readLock().unlock();
358 >    public void testReadTryLock_Interruptible()      { testReadTryLock_Interruptible(false); }
359 >    public void testReadTryLock_Interruptible_fair() { testReadTryLock_Interruptible(true); }
360 >    public void testReadTryLock_Interruptible(boolean fair) {
361 >        final PublicReentrantReadWriteLock lock =
362 >            new PublicReentrantReadWriteLock(fair);
363 >        lock.writeLock().lock();
364 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
365 >            public void realRun() throws InterruptedException {
366 >                lock.readLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
367 >            }});
368 >
369 >        waitForQueuedThread(lock, t);
370 >        t.interrupt();
371 >        awaitTermination(t);
372 >        releaseWriteLock(lock);
373 >    }
374 >
375 >    /**
376 >     * write-tryLock on an unlocked lock succeeds
377 >     */
378 >    public void testWriteTryLock()      { testWriteTryLock(false); }
379 >    public void testWriteTryLock_fair() { testWriteTryLock(true); }
380 >    public void testWriteTryLock(boolean fair) {
381 >        final PublicReentrantReadWriteLock lock =
382 >            new PublicReentrantReadWriteLock(fair);
383 >        assertTrue(lock.writeLock().tryLock());
384 >        assertWriteLockedByMoi(lock);
385 >        assertTrue(lock.writeLock().tryLock());
386 >        assertWriteLockedByMoi(lock);
387          lock.writeLock().unlock();
388 <    }
388 >        releaseWriteLock(lock);
389 >    }
390  
391      /**
392 <     * Read lock succeeds if write locked by current thread even if
430 <     * other threads are waiting for readlock
392 >     * write-tryLock fails if locked
393       */
394 <    public void testReadHoldingWriteLock2() {
395 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
396 <        lock.writeLock().lock();
397 <        Thread t1 = new Thread(new Runnable() {
398 <                public void run() {
399 <                    lock.readLock().lock();
400 <                    lock.readLock().unlock();
401 <                }
402 <            });
403 <        Thread t2 = new Thread(new Runnable() {
442 <                public void run() {
443 <                    lock.readLock().lock();
444 <                    lock.readLock().unlock();
445 <                }
446 <            });
394 >    public void testWriteTryLockWhenLocked()      { testWriteTryLockWhenLocked(false); }
395 >    public void testWriteTryLockWhenLocked_fair() { testWriteTryLockWhenLocked(true); }
396 >    public void testWriteTryLockWhenLocked(boolean fair) {
397 >        final PublicReentrantReadWriteLock lock =
398 >            new PublicReentrantReadWriteLock(fair);
399 >        lock.writeLock().lock();
400 >        Thread t = newStartedThread(new CheckedRunnable() {
401 >            public void realRun() {
402 >                assertFalse(lock.writeLock().tryLock());
403 >            }});
404  
405 <        try {
406 <            t1.start();
407 <            t2.start();
451 <            lock.readLock().lock();
452 <            lock.readLock().unlock();
453 <            Thread.sleep(SHORT_DELAY_MS);
454 <            lock.readLock().lock();
455 <            lock.readLock().unlock();
456 <            lock.writeLock().unlock();
457 <            t1.join(MEDIUM_DELAY_MS);
458 <            t2.join(MEDIUM_DELAY_MS);
459 <            assertTrue(!t1.isAlive());
460 <            assertTrue(!t2.isAlive());
461 <          
462 <        } catch(Exception e){
463 <            unexpectedException();
464 <        }
465 <    }
405 >        awaitTermination(t);
406 >        releaseWriteLock(lock);
407 >    }
408  
409      /**
410 <     *  Read lock succeeds if write locked by current thread even if
469 <     * other threads are waiting for writelock
410 >     * read-tryLock fails if locked
411       */
412 <    public void testReadHoldingWriteLock3() {
413 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
414 <        lock.writeLock().lock();
415 <        Thread t1 = new Thread(new Runnable() {
416 <                public void run() {
417 <                    lock.writeLock().lock();
418 <                    lock.writeLock().unlock();
419 <                }
420 <            });
421 <        Thread t2 = new Thread(new Runnable() {
481 <                public void run() {
482 <                    lock.writeLock().lock();
483 <                    lock.writeLock().unlock();
484 <                }
485 <            });
412 >    public void testReadTryLockWhenLocked()      { testReadTryLockWhenLocked(false); }
413 >    public void testReadTryLockWhenLocked_fair() { testReadTryLockWhenLocked(true); }
414 >    public void testReadTryLockWhenLocked(boolean fair) {
415 >        final PublicReentrantReadWriteLock lock =
416 >            new PublicReentrantReadWriteLock(fair);
417 >        lock.writeLock().lock();
418 >        Thread t = newStartedThread(new CheckedRunnable() {
419 >            public void realRun() {
420 >                assertFalse(lock.readLock().tryLock());
421 >            }});
422  
423 <        try {
424 <            t1.start();
425 <            t2.start();
490 <            lock.readLock().lock();
491 <            lock.readLock().unlock();
492 <            Thread.sleep(SHORT_DELAY_MS);
493 <            lock.readLock().lock();
494 <            lock.readLock().unlock();
495 <            lock.writeLock().unlock();
496 <            t1.join(MEDIUM_DELAY_MS);
497 <            t2.join(MEDIUM_DELAY_MS);
498 <            assertTrue(!t1.isAlive());
499 <            assertTrue(!t2.isAlive());
500 <          
501 <        } catch(Exception e){
502 <            unexpectedException();
503 <        }
504 <    }
423 >        awaitTermination(t);
424 >        releaseWriteLock(lock);
425 >    }
426  
427 +    /**
428 +     * Multiple threads can hold a read lock when not write-locked
429 +     */
430 +    public void testMultipleReadLocks()      { testMultipleReadLocks(false); }
431 +    public void testMultipleReadLocks_fair() { testMultipleReadLocks(true); }
432 +    public void testMultipleReadLocks(boolean fair) {
433 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
434 +        lock.readLock().lock();
435 +        Thread t = newStartedThread(new CheckedRunnable() {
436 +            public void realRun() throws InterruptedException {
437 +                assertTrue(lock.readLock().tryLock());
438 +                lock.readLock().unlock();
439 +                assertTrue(lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS));
440 +                lock.readLock().unlock();
441 +                lock.readLock().lock();
442 +                lock.readLock().unlock();
443 +            }});
444 +
445 +        awaitTermination(t);
446 +        lock.readLock().unlock();
447 +    }
448  
449      /**
450 <     *  Write lock succeeds if write locked by current thread even if
509 <     * other threads are waiting for writelock
450 >     * A writelock succeeds only after a reading thread unlocks
451       */
452 <    public void testWriteHoldingWriteLock4() {
453 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
454 <        lock.writeLock().lock();
455 <        Thread t1 = new Thread(new Runnable() {
456 <                public void run() {
457 <                    lock.writeLock().lock();
458 <                    lock.writeLock().unlock();
459 <                }
460 <            });
461 <        Thread t2 = new Thread(new Runnable() {
462 <                public void run() {
463 <                    lock.writeLock().lock();
464 <                    lock.writeLock().unlock();
465 <                }
466 <            });
452 >    public void testWriteAfterReadLock()      { testWriteAfterReadLock(false); }
453 >    public void testWriteAfterReadLock_fair() { testWriteAfterReadLock(true); }
454 >    public void testWriteAfterReadLock(boolean fair) {
455 >        final PublicReentrantReadWriteLock lock =
456 >            new PublicReentrantReadWriteLock(fair);
457 >        lock.readLock().lock();
458 >        Thread t = newStartedThread(new CheckedRunnable() {
459 >            public void realRun() {
460 >                assertEquals(1, lock.getReadLockCount());
461 >                lock.writeLock().lock();
462 >                assertEquals(0, lock.getReadLockCount());
463 >                lock.writeLock().unlock();
464 >            }});
465 >        waitForQueuedThread(lock, t);
466 >        assertNotWriteLocked(lock);
467 >        assertEquals(1, lock.getReadLockCount());
468 >        lock.readLock().unlock();
469 >        assertEquals(0, lock.getReadLockCount());
470 >        awaitTermination(t);
471 >        assertNotWriteLocked(lock);
472 >    }
473  
474 <        try {
475 <            t1.start();
476 <            t2.start();
477 <            lock.writeLock().lock();
478 <            lock.writeLock().unlock();
479 <            Thread.sleep(SHORT_DELAY_MS);
480 <            lock.writeLock().lock();
481 <            lock.writeLock().unlock();
482 <            lock.writeLock().unlock();
483 <            t1.join(MEDIUM_DELAY_MS);
484 <            t2.join(MEDIUM_DELAY_MS);
485 <            assertTrue(!t1.isAlive());
486 <            assertTrue(!t2.isAlive());
487 <          
488 <        } catch(Exception e){
489 <            unexpectedException();
490 <        }
491 <    }
474 >    /**
475 >     * A writelock succeeds only after reading threads unlock
476 >     */
477 >    public void testWriteAfterMultipleReadLocks()      { testWriteAfterMultipleReadLocks(false); }
478 >    public void testWriteAfterMultipleReadLocks_fair() { testWriteAfterMultipleReadLocks(true); }
479 >    public void testWriteAfterMultipleReadLocks(boolean fair) {
480 >        final PublicReentrantReadWriteLock lock =
481 >            new PublicReentrantReadWriteLock(fair);
482 >        lock.readLock().lock();
483 >        lock.readLock().lock();
484 >        Thread t1 = newStartedThread(new CheckedRunnable() {
485 >            public void realRun() {
486 >                lock.readLock().lock();
487 >                assertEquals(3, lock.getReadLockCount());
488 >                lock.readLock().unlock();
489 >            }});
490 >        awaitTermination(t1);
491 >
492 >        Thread t2 = newStartedThread(new CheckedRunnable() {
493 >            public void realRun() {
494 >                assertEquals(2, lock.getReadLockCount());
495 >                lock.writeLock().lock();
496 >                assertEquals(0, lock.getReadLockCount());
497 >                lock.writeLock().unlock();
498 >            }});
499 >        waitForQueuedThread(lock, t2);
500 >        assertNotWriteLocked(lock);
501 >        assertEquals(2, lock.getReadLockCount());
502 >        lock.readLock().unlock();
503 >        lock.readLock().unlock();
504 >        assertEquals(0, lock.getReadLockCount());
505 >        awaitTermination(t2);
506 >        assertNotWriteLocked(lock);
507 >    }
508  
509 +    /**
510 +     * A thread that tries to acquire a fair read lock (non-reentrantly)
511 +     * will block if there is a waiting writer thread
512 +     */
513 +    public void testReaderWriterReaderFairFifo() {
514 +        final PublicReentrantReadWriteLock lock =
515 +            new PublicReentrantReadWriteLock(true);
516 +        final AtomicBoolean t1GotLock = new AtomicBoolean(false);
517 +
518 +        lock.readLock().lock();
519 +        Thread t1 = newStartedThread(new CheckedRunnable() {
520 +            public void realRun() {
521 +                assertEquals(1, lock.getReadLockCount());
522 +                lock.writeLock().lock();
523 +                assertEquals(0, lock.getReadLockCount());
524 +                t1GotLock.set(true);
525 +                lock.writeLock().unlock();
526 +            }});
527 +        waitForQueuedThread(lock, t1);
528 +
529 +        Thread t2 = newStartedThread(new CheckedRunnable() {
530 +            public void realRun() {
531 +                assertEquals(1, lock.getReadLockCount());
532 +                lock.readLock().lock();
533 +                assertEquals(1, lock.getReadLockCount());
534 +                assertTrue(t1GotLock.get());
535 +                lock.readLock().unlock();
536 +            }});
537 +        waitForQueuedThread(lock, t2);
538 +        assertTrue(t1.isAlive());
539 +        assertNotWriteLocked(lock);
540 +        assertEquals(1, lock.getReadLockCount());
541 +        lock.readLock().unlock();
542 +        awaitTermination(t1);
543 +        awaitTermination(t2);
544 +        assertNotWriteLocked(lock);
545 +    }
546  
547      /**
548 <     * Fair Read trylock succeeds if write locked by current thread
548 >     * Readlocks succeed only after a writing thread unlocks
549       */
550 <    public void testReadHoldingWriteLockFair() {
551 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
552 <        lock.writeLock().lock();
550 >    public void testReadAfterWriteLock()      { testReadAfterWriteLock(false); }
551 >    public void testReadAfterWriteLock_fair() { testReadAfterWriteLock(true); }
552 >    public void testReadAfterWriteLock(boolean fair) {
553 >        final PublicReentrantReadWriteLock lock =
554 >            new PublicReentrantReadWriteLock(fair);
555 >        lock.writeLock().lock();
556 >        Thread t1 = newStartedThread(new CheckedRunnable() {
557 >            public void realRun() {
558 >                lock.readLock().lock();
559 >                lock.readLock().unlock();
560 >            }});
561 >        Thread t2 = newStartedThread(new CheckedRunnable() {
562 >            public void realRun() {
563 >                lock.readLock().lock();
564 >                lock.readLock().unlock();
565 >            }});
566 >
567 >        waitForQueuedThread(lock, t1);
568 >        waitForQueuedThread(lock, t2);
569 >        releaseWriteLock(lock);
570 >        awaitTermination(t1);
571 >        awaitTermination(t2);
572 >    }
573 >
574 >    /**
575 >     * Read trylock succeeds if write locked by current thread
576 >     */
577 >    public void testReadHoldingWriteLock()      { testReadHoldingWriteLock(false); }
578 >    public void testReadHoldingWriteLock_fair() { testReadHoldingWriteLock(true); }
579 >    public void testReadHoldingWriteLock(boolean fair) {
580 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
581 >        lock.writeLock().lock();
582          assertTrue(lock.readLock().tryLock());
583          lock.readLock().unlock();
584          lock.writeLock().unlock();
585 <    }
585 >    }
586  
587      /**
588 <     * Fair Read lock succeeds if write locked by current thread even if
589 <     * other threads are waiting for readlock
588 >     * Read trylock succeeds (barging) even in the presence of waiting
589 >     * readers and/or writers
590       */
591 <    public void testReadHoldingWriteLockFair2() {
592 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
593 <        lock.writeLock().lock();
594 <        Thread t1 = new Thread(new Runnable() {
595 <                public void run() {
596 <                    lock.readLock().lock();
568 <                    lock.readLock().unlock();
569 <                }
570 <            });
571 <        Thread t2 = new Thread(new Runnable() {
572 <                public void run() {
573 <                    lock.readLock().lock();
574 <                    lock.readLock().unlock();
575 <                }
576 <            });
591 >    public void testReadTryLockBarging()      { testReadTryLockBarging(false); }
592 >    public void testReadTryLockBarging_fair() { testReadTryLockBarging(true); }
593 >    public void testReadTryLockBarging(boolean fair) {
594 >        final PublicReentrantReadWriteLock lock =
595 >            new PublicReentrantReadWriteLock(fair);
596 >        lock.readLock().lock();
597  
598 <        try {
599 <            t1.start();
600 <            t2.start();
601 <            lock.readLock().lock();
602 <            lock.readLock().unlock();
603 <            Thread.sleep(SHORT_DELAY_MS);
604 <            lock.readLock().lock();
585 <            lock.readLock().unlock();
586 <            lock.writeLock().unlock();
587 <            t1.join(MEDIUM_DELAY_MS);
588 <            t2.join(MEDIUM_DELAY_MS);
589 <            assertTrue(!t1.isAlive());
590 <            assertTrue(!t2.isAlive());
591 <          
592 <        } catch(Exception e){
593 <            unexpectedException();
594 <        }
595 <    }
598 >        Thread t1 = newStartedThread(new CheckedRunnable() {
599 >            public void realRun() {
600 >                lock.writeLock().lock();
601 >                lock.writeLock().unlock();
602 >            }});
603 >
604 >        waitForQueuedThread(lock, t1);
605  
606 +        Thread t2 = newStartedThread(new CheckedRunnable() {
607 +            public void realRun() {
608 +                lock.readLock().lock();
609 +                lock.readLock().unlock();
610 +            }});
611 +
612 +        if (fair)
613 +            waitForQueuedThread(lock, t2);
614 +
615 +        Thread t3 = newStartedThread(new CheckedRunnable() {
616 +            public void realRun() {
617 +                lock.readLock().tryLock();
618 +                lock.readLock().unlock();
619 +            }});
620 +
621 +        assertTrue(lock.getReadLockCount() > 0);
622 +        awaitTermination(t3);
623 +        assertTrue(t1.isAlive());
624 +        if (fair) assertTrue(t2.isAlive());
625 +        lock.readLock().unlock();
626 +        awaitTermination(t1);
627 +        awaitTermination(t2);
628 +    }
629  
630      /**
631 <     * Fair Read lock succeeds if write locked by current thread even if
631 >     * Read lock succeeds if write locked by current thread even if
632 >     * other threads are waiting for readlock
633 >     */
634 >    public void testReadHoldingWriteLock2()      { testReadHoldingWriteLock2(false); }
635 >    public void testReadHoldingWriteLock2_fair() { testReadHoldingWriteLock2(true); }
636 >    public void testReadHoldingWriteLock2(boolean fair) {
637 >        final PublicReentrantReadWriteLock lock =
638 >            new PublicReentrantReadWriteLock(fair);
639 >        lock.writeLock().lock();
640 >        lock.readLock().lock();
641 >        lock.readLock().unlock();
642 >
643 >        Thread t1 = newStartedThread(new CheckedRunnable() {
644 >            public void realRun() {
645 >                lock.readLock().lock();
646 >                lock.readLock().unlock();
647 >            }});
648 >        Thread t2 = newStartedThread(new CheckedRunnable() {
649 >            public void realRun() {
650 >                lock.readLock().lock();
651 >                lock.readLock().unlock();
652 >            }});
653 >
654 >        waitForQueuedThread(lock, t1);
655 >        waitForQueuedThread(lock, t2);
656 >        assertWriteLockedByMoi(lock);
657 >        lock.readLock().lock();
658 >        lock.readLock().unlock();
659 >        releaseWriteLock(lock);
660 >        awaitTermination(t1);
661 >        awaitTermination(t2);
662 >    }
663 >
664 >    /**
665 >     * Read lock succeeds if write locked by current thread even if
666       * other threads are waiting for writelock
667       */
668 <    public void testReadHoldingWriteLockFair3() {
669 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
670 <        lock.writeLock().lock();
671 <        Thread t1 = new Thread(new Runnable() {
672 <                public void run() {
673 <                    lock.writeLock().lock();
674 <                    lock.writeLock().unlock();
675 <                }
610 <            });
611 <        Thread t2 = new Thread(new Runnable() {
612 <                public void run() {
613 <                    lock.writeLock().lock();
614 <                    lock.writeLock().unlock();
615 <                }
616 <            });
668 >    public void testReadHoldingWriteLock3()      { testReadHoldingWriteLock3(false); }
669 >    public void testReadHoldingWriteLock3_fair() { testReadHoldingWriteLock3(true); }
670 >    public void testReadHoldingWriteLock3(boolean fair) {
671 >        final PublicReentrantReadWriteLock lock =
672 >            new PublicReentrantReadWriteLock(fair);
673 >        lock.writeLock().lock();
674 >        lock.readLock().lock();
675 >        lock.readLock().unlock();
676  
677 <        try {
678 <            t1.start();
679 <            t2.start();
680 <            lock.readLock().lock();
681 <            lock.readLock().unlock();
682 <            Thread.sleep(SHORT_DELAY_MS);
683 <            lock.readLock().lock();
684 <            lock.readLock().unlock();
685 <            lock.writeLock().unlock();
686 <            t1.join(MEDIUM_DELAY_MS);
628 <            t2.join(MEDIUM_DELAY_MS);
629 <            assertTrue(!t1.isAlive());
630 <            assertTrue(!t2.isAlive());
631 <          
632 <        } catch(Exception e){
633 <            unexpectedException();
634 <        }
635 <    }
677 >        Thread t1 = newStartedThread(new CheckedRunnable() {
678 >            public void realRun() {
679 >                lock.writeLock().lock();
680 >                lock.writeLock().unlock();
681 >            }});
682 >        Thread t2 = newStartedThread(new CheckedRunnable() {
683 >            public void realRun() {
684 >                lock.writeLock().lock();
685 >                lock.writeLock().unlock();
686 >            }});
687  
688 +        waitForQueuedThread(lock, t1);
689 +        waitForQueuedThread(lock, t2);
690 +        assertWriteLockedByMoi(lock);
691 +        lock.readLock().lock();
692 +        lock.readLock().unlock();
693 +        assertWriteLockedByMoi(lock);
694 +        lock.writeLock().unlock();
695 +        awaitTermination(t1);
696 +        awaitTermination(t2);
697 +    }
698  
699      /**
700 <     * Fair Write lock succeeds if write locked by current thread even if
700 >     * Write lock succeeds if write locked by current thread even if
701       * other threads are waiting for writelock
702       */
703 <    public void testWriteHoldingWriteLockFair4() {
704 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
705 <        lock.writeLock().lock();
706 <        Thread t1 = new Thread(new Runnable() {
707 <                public void run() {
708 <                    lock.writeLock().lock();
709 <                    lock.writeLock().unlock();
710 <                }
650 <            });
651 <        Thread t2 = new Thread(new Runnable() {
652 <                public void run() {
653 <                    lock.writeLock().lock();
654 <                    lock.writeLock().unlock();
655 <                }
656 <            });
703 >    public void testWriteHoldingWriteLock4()      { testWriteHoldingWriteLock4(false); }
704 >    public void testWriteHoldingWriteLock4_fair() { testWriteHoldingWriteLock4(true); }
705 >    public void testWriteHoldingWriteLock4(boolean fair) {
706 >        final PublicReentrantReadWriteLock lock =
707 >            new PublicReentrantReadWriteLock(fair);
708 >        lock.writeLock().lock();
709 >        lock.writeLock().lock();
710 >        lock.writeLock().unlock();
711  
712 <        try {
713 <            t1.start();
714 <            t2.start();
715 <            Thread.sleep(SHORT_DELAY_MS);
716 <            assertTrue(lock.isWriteLockedByCurrentThread());
717 <            assertTrue(lock.getWriteHoldCount() == 1);
718 <            lock.writeLock().lock();
719 <            assertTrue(lock.getWriteHoldCount() == 2);
720 <            lock.writeLock().unlock();
721 <            lock.writeLock().lock();
668 <            lock.writeLock().unlock();
669 <            lock.writeLock().unlock();
670 <            t1.join(MEDIUM_DELAY_MS);
671 <            t2.join(MEDIUM_DELAY_MS);
672 <            assertTrue(!t1.isAlive());
673 <            assertTrue(!t2.isAlive());
674 <          
675 <        } catch(Exception e){
676 <            unexpectedException();
677 <        }
678 <    }
712 >        Thread t1 = newStartedThread(new CheckedRunnable() {
713 >            public void realRun() {
714 >                lock.writeLock().lock();
715 >                lock.writeLock().unlock();
716 >            }});
717 >        Thread t2 = newStartedThread(new CheckedRunnable() {
718 >            public void realRun() {
719 >                lock.writeLock().lock();
720 >                lock.writeLock().unlock();
721 >            }});
722  
723 +        waitForQueuedThread(lock, t1);
724 +        waitForQueuedThread(lock, t2);
725 +        assertWriteLockedByMoi(lock);
726 +        assertEquals(1, lock.getWriteHoldCount());
727 +        lock.writeLock().lock();
728 +        assertWriteLockedByMoi(lock);
729 +        assertEquals(2, lock.getWriteHoldCount());
730 +        lock.writeLock().unlock();
731 +        assertWriteLockedByMoi(lock);
732 +        assertEquals(1, lock.getWriteHoldCount());
733 +        lock.writeLock().unlock();
734 +        awaitTermination(t1);
735 +        awaitTermination(t2);
736 +    }
737  
738      /**
739       * Read tryLock succeeds if readlocked but not writelocked
740       */
741 <    public void testTryLockWhenReadLocked() {
742 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
743 <        lock.readLock().lock();
744 <        Thread t = new Thread(new Runnable() {
745 <                public void run() {
746 <                    threadAssertTrue(lock.readLock().tryLock());
747 <                    lock.readLock().unlock();
748 <                }
749 <            });
750 <        try {
694 <            t.start();
695 <            t.join();
696 <            lock.readLock().unlock();
697 <        } catch(Exception e){
698 <            unexpectedException();
699 <        }
700 <    }
741 >    public void testTryLockWhenReadLocked()      { testTryLockWhenReadLocked(false); }
742 >    public void testTryLockWhenReadLocked_fair() { testTryLockWhenReadLocked(true); }
743 >    public void testTryLockWhenReadLocked(boolean fair) {
744 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
745 >        lock.readLock().lock();
746 >        Thread t = newStartedThread(new CheckedRunnable() {
747 >            public void realRun() {
748 >                assertTrue(lock.readLock().tryLock());
749 >                lock.readLock().unlock();
750 >            }});
751  
752 <    
752 >        awaitTermination(t);
753 >        lock.readLock().unlock();
754 >    }
755  
756      /**
757       * write tryLock fails when readlocked
758       */
759 <    public void testWriteTryLockWhenReadLocked() {
760 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
761 <        lock.readLock().lock();
762 <        Thread t = new Thread(new Runnable() {
763 <                public void run() {
764 <                    threadAssertFalse(lock.writeLock().tryLock());
765 <                }
766 <            });
767 <        try {
716 <            t.start();
717 <            t.join();
718 <            lock.readLock().unlock();
719 <        } catch(Exception e){
720 <            unexpectedException();
721 <        }
722 <    }
759 >    public void testWriteTryLockWhenReadLocked()      { testWriteTryLockWhenReadLocked(false); }
760 >    public void testWriteTryLockWhenReadLocked_fair() { testWriteTryLockWhenReadLocked(true); }
761 >    public void testWriteTryLockWhenReadLocked(boolean fair) {
762 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
763 >        lock.readLock().lock();
764 >        Thread t = newStartedThread(new CheckedRunnable() {
765 >            public void realRun() {
766 >                assertFalse(lock.writeLock().tryLock());
767 >            }});
768  
769 +        awaitTermination(t);
770 +        lock.readLock().unlock();
771 +    }
772  
773      /**
774 <     * Fair Read tryLock succeeds if readlocked but not writelocked
774 >     * write timed tryLock times out if locked
775       */
776 <    public void testTryLockWhenReadLockedFair() {
777 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
778 <        lock.readLock().lock();
779 <        Thread t = new Thread(new Runnable() {
780 <                public void run() {
781 <                    threadAssertTrue(lock.readLock().tryLock());
782 <                    lock.readLock().unlock();
783 <                }
784 <            });
785 <        try {
786 <            t.start();
787 <            t.join();
788 <            lock.readLock().unlock();
741 <        } catch(Exception e){
742 <            unexpectedException();
743 <        }
744 <    }
776 >    public void testWriteTryLock_Timeout()      { testWriteTryLock_Timeout(false); }
777 >    public void testWriteTryLock_Timeout_fair() { testWriteTryLock_Timeout(true); }
778 >    public void testWriteTryLock_Timeout(boolean fair) {
779 >        final PublicReentrantReadWriteLock lock =
780 >            new PublicReentrantReadWriteLock(fair);
781 >        lock.writeLock().lock();
782 >        Thread t = newStartedThread(new CheckedRunnable() {
783 >            public void realRun() throws InterruptedException {
784 >                long startTime = System.nanoTime();
785 >                long timeoutMillis = 10;
786 >                assertFalse(lock.writeLock().tryLock(timeoutMillis, MILLISECONDS));
787 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
788 >            }});
789  
790 <    
790 >        awaitTermination(t);
791 >        releaseWriteLock(lock);
792 >    }
793  
794      /**
795 <     * Fair write tryLock fails when readlocked
795 >     * read timed tryLock times out if write-locked
796       */
797 <    public void testWriteTryLockWhenReadLockedFair() {
798 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
799 <        lock.readLock().lock();
800 <        Thread t = new Thread(new Runnable() {
801 <                public void run() {
802 <                    threadAssertFalse(lock.writeLock().tryLock());
803 <                }
804 <            });
805 <        try {
806 <            t.start();
807 <            t.join();
808 <            lock.readLock().unlock();
763 <        } catch(Exception e){
764 <            unexpectedException();
765 <        }
766 <    }
767 <
768 <    
797 >    public void testReadTryLock_Timeout()      { testReadTryLock_Timeout(false); }
798 >    public void testReadTryLock_Timeout_fair() { testReadTryLock_Timeout(true); }
799 >    public void testReadTryLock_Timeout(boolean fair) {
800 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
801 >        lock.writeLock().lock();
802 >        Thread t = newStartedThread(new CheckedRunnable() {
803 >            public void realRun() throws InterruptedException {
804 >                long startTime = System.nanoTime();
805 >                long timeoutMillis = 10;
806 >                assertFalse(lock.readLock().tryLock(timeoutMillis, MILLISECONDS));
807 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
808 >            }});
809  
810 <    /**
811 <     * write timed tryLock times out if locked
812 <     */
813 <    public void testWriteTryLock_Timeout() {
774 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
775 <        lock.writeLock().lock();
776 <        Thread t = new Thread(new Runnable() {
777 <                public void run() {
778 <                    try {
779 <                        threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
780 <                    } catch (Exception ex) {
781 <                        threadUnexpectedException();
782 <                    }
783 <                }
784 <            });
785 <        try {
786 <            t.start();
787 <            t.join();
788 <            lock.writeLock().unlock();
789 <        } catch(Exception e){
790 <            unexpectedException();
791 <        }
792 <    }
810 >        awaitTermination(t);
811 >        assertTrue(lock.writeLock().isHeldByCurrentThread());
812 >        lock.writeLock().unlock();
813 >    }
814  
815      /**
816 <     * read timed tryLock times out if write-locked
816 >     * write lockInterruptibly succeeds if unlocked, else is interruptible
817       */
818 <    public void testReadTryLock_Timeout() {
819 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
820 <        lock.writeLock().lock();
821 <        Thread t = new Thread(new Runnable() {
822 <                public void run() {
802 <                    try {
803 <                        threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
804 <                    } catch (Exception ex) {
805 <                        threadUnexpectedException();
806 <                    }
807 <                }
808 <            });
818 >    public void testWriteLockInterruptibly()      { testWriteLockInterruptibly(false); }
819 >    public void testWriteLockInterruptibly_fair() { testWriteLockInterruptibly(true); }
820 >    public void testWriteLockInterruptibly(boolean fair) {
821 >        final PublicReentrantReadWriteLock lock =
822 >            new PublicReentrantReadWriteLock(fair);
823          try {
824 <            t.start();
825 <            t.join();
826 <            lock.writeLock().unlock();
813 <        } catch(Exception e){
814 <            unexpectedException();
824 >            lock.writeLock().lockInterruptibly();
825 >        } catch (InterruptedException ie) {
826 >            threadUnexpectedException(ie);
827          }
828 <    }
828 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
829 >            public void realRun() throws InterruptedException {
830 >                lock.writeLock().lockInterruptibly();
831 >            }});
832  
833 +        waitForQueuedThread(lock, t);
834 +        t.interrupt();
835 +        assertTrue(lock.writeLock().isHeldByCurrentThread());
836 +        awaitTermination(t);
837 +        releaseWriteLock(lock);
838 +    }
839  
840      /**
841 <     * write lockInterruptibly succeeds if lock free else is interruptible
841 >     * read lockInterruptibly succeeds if lock free else is interruptible
842       */
843 <    public void testWriteLockInterruptibly() {
844 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
845 <        try {
846 <            lock.writeLock().lockInterruptibly();
847 <        } catch(Exception e) {
827 <            unexpectedException();
828 <        }
829 <        Thread t = new Thread(new Runnable() {
830 <                public void run() {
831 <                    try {
832 <                        lock.writeLock().lockInterruptibly();
833 <                        threadShouldThrow();
834 <                    }
835 <                    catch(InterruptedException success) {
836 <                    }
837 <                }
838 <            });
843 >    public void testReadLockInterruptibly()      { testReadLockInterruptibly(false); }
844 >    public void testReadLockInterruptibly_fair() { testReadLockInterruptibly(true); }
845 >    public void testReadLockInterruptibly(boolean fair) {
846 >        final PublicReentrantReadWriteLock lock =
847 >            new PublicReentrantReadWriteLock(fair);
848          try {
849 <            t.start();
850 <            Thread.sleep(SHORT_DELAY_MS);
851 <            t.interrupt();
852 <            Thread.sleep(SHORT_DELAY_MS);
853 <            t.join();
845 <            lock.writeLock().unlock();
846 <        } catch(Exception e){
847 <            unexpectedException();
849 >            lock.readLock().lockInterruptibly();
850 >            lock.readLock().unlock();
851 >            lock.writeLock().lockInterruptibly();
852 >        } catch (InterruptedException ie) {
853 >            threadUnexpectedException(ie);
854          }
855 +        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
856 +            public void realRun() throws InterruptedException {
857 +                lock.readLock().lockInterruptibly();
858 +            }});
859 +
860 +        waitForQueuedThread(lock, t);
861 +        t.interrupt();
862 +        awaitTermination(t);
863 +        releaseWriteLock(lock);
864      }
865  
866      /**
867 <     *  read lockInterruptibly succeeds if lock free else is interruptible
867 >     * Calling await without holding lock throws IllegalMonitorStateException
868       */
869 <    public void testReadLockInterruptibly() {
870 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
871 <        try {
872 <            lock.writeLock().lockInterruptibly();
873 <        } catch(Exception e) {
874 <            unexpectedException();
875 <        }
876 <        Thread t = new Thread(new Runnable() {
877 <                public void run() {
878 <                    try {
879 <                        lock.readLock().lockInterruptibly();
880 <                        threadShouldThrow();
881 <                    }
867 <                    catch(InterruptedException success) {
868 <                    }
869 <                }
870 <            });
871 <        try {
872 <            t.start();
873 <            Thread.sleep(SHORT_DELAY_MS);
874 <            t.interrupt();
875 <            t.join();
876 <            lock.writeLock().unlock();
877 <        } catch(Exception e){
878 <            unexpectedException();
869 >    public void testAwait_IMSE()      { testAwait_IMSE(false); }
870 >    public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
871 >    public void testAwait_IMSE(boolean fair) {
872 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
873 >        final Condition c = lock.writeLock().newCondition();
874 >        for (AwaitMethod awaitMethod : AwaitMethod.values()) {
875 >            long startTime = System.nanoTime();
876 >            try {
877 >                await(c, awaitMethod);
878 >                shouldThrow();
879 >            } catch (IllegalMonitorStateException success) {
880 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
881 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
882          }
883      }
884  
885      /**
886 <     * Calling await without holding lock throws IllegalMonitorStateException
886 >     * Calling signal without holding lock throws IllegalMonitorStateException
887       */
888 <    public void testAwait_IllegalMonitor() {
889 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
888 >    public void testSignal_IMSE()      { testSignal_IMSE(false); }
889 >    public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
890 >    public void testSignal_IMSE(boolean fair) {
891 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
892          final Condition c = lock.writeLock().newCondition();
893          try {
894 <            c.await();
890 <            shouldThrow();
891 <        }
892 <        catch (IllegalMonitorStateException success) {
893 <        }
894 <        catch (Exception ex) {
894 >            c.signal();
895              shouldThrow();
896 <        }
896 >        } catch (IllegalMonitorStateException success) {}
897      }
898  
899      /**
900 <     * Calling signal without holding lock throws IllegalMonitorStateException
900 >     * Calling signalAll without holding lock throws IllegalMonitorStateException
901       */
902 <    public void testSignal_IllegalMonitor() {
903 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
902 >    public void testSignalAll_IMSE()      { testSignalAll_IMSE(false); }
903 >    public void testSignalAll_IMSE_fair() { testSignalAll_IMSE(true); }
904 >    public void testSignalAll_IMSE(boolean fair) {
905 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
906          final Condition c = lock.writeLock().newCondition();
907          try {
908 <            c.signal();
908 >            c.signalAll();
909              shouldThrow();
910 <        }
909 <        catch (IllegalMonitorStateException success) {
910 <        }
911 <        catch (Exception ex) {
912 <            unexpectedException();
913 <        }
910 >        } catch (IllegalMonitorStateException success) {}
911      }
912  
913      /**
914       * awaitNanos without a signal times out
915       */
916 <    public void testAwaitNanos_Timeout() {
917 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
918 <        final Condition c = lock.writeLock().newCondition();
916 >    public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
917 >    public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
918 >    public void testAwaitNanos_Timeout(boolean fair) {
919          try {
920 +            final ReentrantReadWriteLock lock =
921 +                new ReentrantReadWriteLock(fair);
922 +            final Condition c = lock.writeLock().newCondition();
923              lock.writeLock().lock();
924 <            long t = c.awaitNanos(100);
925 <            assertTrue(t <= 0);
924 >            long startTime = System.nanoTime();
925 >            long timeoutMillis = 10;
926 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
927 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
928 >            assertTrue(nanosRemaining <= 0);
929 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
930              lock.writeLock().unlock();
931 <        }
932 <        catch (Exception ex) {
929 <            unexpectedException();
931 >        } catch (InterruptedException e) {
932 >            threadUnexpectedException(e);
933          }
934      }
935  
933
936      /**
937 <     *  timed await without a signal times out
937 >     * timed await without a signal times out
938       */
939 <    public void testAwait_Timeout() {
940 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
941 <        final Condition c = lock.writeLock().newCondition();
939 >    public void testAwait_Timeout()      { testAwait_Timeout(false); }
940 >    public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
941 >    public void testAwait_Timeout(boolean fair) {
942          try {
943 +            final ReentrantReadWriteLock lock =
944 +                new ReentrantReadWriteLock(fair);
945 +            final Condition c = lock.writeLock().newCondition();
946              lock.writeLock().lock();
947 +            long startTime = System.nanoTime();
948 +            long timeoutMillis = 10;
949 +            assertFalse(c.await(timeoutMillis, MILLISECONDS));
950 +            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
951              lock.writeLock().unlock();
952 <        }
953 <        catch (Exception ex) {
945 <            unexpectedException();
952 >        } catch (InterruptedException e) {
953 >            threadUnexpectedException(e);
954          }
955      }
956  
957      /**
958       * awaitUntil without a signal times out
959       */
960 <    public void testAwaitUntil_Timeout() {
961 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
962 <        final Condition c = lock.writeLock().newCondition();
963 <        try {
960 >    public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
961 >    public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
962 >    public void testAwaitUntil_Timeout(boolean fair) {
963 >        try {
964 >            final ReentrantReadWriteLock lock =
965 >                new ReentrantReadWriteLock(fair);
966 >            final Condition c = lock.writeLock().newCondition();
967              lock.writeLock().lock();
968 +            long startTime = System.nanoTime();
969 +            long timeoutMillis = 10;
970              java.util.Date d = new java.util.Date();
971 +            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
972 +            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
973              lock.writeLock().unlock();
974 <        }
975 <        catch (Exception ex) {
961 <            unexpectedException();
974 >        } catch (InterruptedException e) {
975 >            threadUnexpectedException(e);
976          }
977      }
978  
979      /**
980       * await returns when signalled
981       */
982 <    public void testAwait() {
983 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
982 >    public void testAwait()      { testAwait(false); }
983 >    public void testAwait_fair() { testAwait(true); }
984 >    public void testAwait(boolean fair) {
985 >        final PublicReentrantReadWriteLock lock =
986 >            new PublicReentrantReadWriteLock(fair);
987          final Condition c = lock.writeLock().newCondition();
988 <        Thread t = new Thread(new Runnable() {
989 <                public void run() {
990 <                    try {
991 <                        lock.writeLock().lock();
992 <                        c.await();
993 <                        lock.writeLock().unlock();
994 <                    }
995 <                    catch(InterruptedException e) {
979 <                        threadUnexpectedException();
980 <                    }
981 <                }
982 <            });
983 <
984 <        try {
985 <            t.start();
986 <            Thread.sleep(SHORT_DELAY_MS);
987 <            lock.writeLock().lock();
988 <            c.signal();
989 <            lock.writeLock().unlock();
990 <            t.join(SHORT_DELAY_MS);
991 <            assertFalse(t.isAlive());
992 <        }
993 <        catch (Exception ex) {
994 <            unexpectedException();
995 <        }
996 <    }
988 >        final CountDownLatch locked = new CountDownLatch(1);
989 >        Thread t = newStartedThread(new CheckedRunnable() {
990 >            public void realRun() throws InterruptedException {
991 >                lock.writeLock().lock();
992 >                locked.countDown();
993 >                c.await();
994 >                lock.writeLock().unlock();
995 >            }});
996  
997 <    /** A helper class for uninterruptible wait tests */
998 <    class UninterruptableThread extends Thread {
999 <        private Lock lock;
1000 <        private Condition c;
1001 <        
1002 <        public volatile boolean canAwake = false;
1003 <        public volatile boolean interrupted = false;
1004 <        public volatile boolean lockStarted = false;
1006 <        
1007 <        public UninterruptableThread(Lock lock, Condition c) {
1008 <            this.lock = lock;
1009 <            this.c = c;
1010 <        }
1011 <        
1012 <        public synchronized void run() {
1013 <            lock.lock();
1014 <            lockStarted = true;
1015 <            
1016 <            while (!canAwake) {
1017 <                c.awaitUninterruptibly();
1018 <            }
1019 <            
1020 <            interrupted = isInterrupted();
1021 <            lock.unlock();
1022 <        }
997 >        await(locked);
998 >        lock.writeLock().lock();
999 >        assertHasWaiters(lock, c, t);
1000 >        c.signal();
1001 >        assertHasNoWaiters(lock, c);
1002 >        assertTrue(t.isAlive());
1003 >        lock.writeLock().unlock();
1004 >        awaitTermination(t);
1005      }
1006  
1007      /**
1008       * awaitUninterruptibly doesn't abort on interrupt
1009       */
1010 <    public void testAwaitUninterruptibly() {
1011 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1010 >    public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
1011 >    public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
1012 >    public void testAwaitUninterruptibly(boolean fair) {
1013 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1014          final Condition c = lock.writeLock().newCondition();
1015 <        UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
1016 <
1017 <        try {
1018 <            thread.start();
1019 <
1020 <            while (!thread.lockStarted) {
1021 <                Thread.sleep(100);
1038 <            }
1039 <
1040 <            lock.writeLock().lock();
1041 <            try {
1042 <                thread.interrupt();
1043 <                thread.canAwake = true;
1044 <                c.signal();
1045 <            } finally {
1015 >        final CountDownLatch locked = new CountDownLatch(1);
1016 >        Thread t = newStartedThread(new CheckedRunnable() {
1017 >            public void realRun() {
1018 >                lock.writeLock().lock();
1019 >                locked.countDown();
1020 >                c.awaitUninterruptibly();
1021 >                assertTrue(Thread.interrupted());
1022                  lock.writeLock().unlock();
1023 <            }
1023 >            }});
1024  
1025 <            thread.join();
1026 <            assertTrue(thread.interrupted);
1027 <            assertFalse(thread.isAlive());
1028 <        } catch (Exception ex) {
1029 <            unexpectedException();
1030 <        }
1025 >        await(locked);
1026 >        lock.writeLock().lock();
1027 >        lock.writeLock().unlock();
1028 >        t.interrupt();
1029 >        long timeoutMillis = 10;
1030 >        assertThreadStaysAlive(t, timeoutMillis);
1031 >        lock.writeLock().lock();
1032 >        c.signal();
1033 >        lock.writeLock().unlock();
1034 >        awaitTermination(t);
1035      }
1036  
1037      /**
1038 <     * await is interruptible
1038 >     * await/awaitNanos/awaitUntil is interruptible
1039       */
1040 <    public void testAwait_Interrupt() {
1041 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
1040 >    public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
1041 >    public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
1042 >    public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
1043 >    public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
1044 >    public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
1045 >    public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
1046 >    public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
1047 >    public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
1048 >    public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
1049 >        final PublicReentrantReadWriteLock lock =
1050 >            new PublicReentrantReadWriteLock(fair);
1051          final Condition c = lock.writeLock().newCondition();
1052 <        Thread t = new Thread(new Runnable() {
1053 <                public void run() {
1054 <                    try {
1055 <                        lock.writeLock().lock();
1056 <                        c.await();
1057 <                        lock.writeLock().unlock();
1058 <                        threadShouldThrow();
1059 <                    }
1060 <                    catch(InterruptedException success) {
1061 <                    }
1062 <                }
1063 <            });
1064 <
1065 <        try {
1066 <            t.start();
1067 <            Thread.sleep(SHORT_DELAY_MS);
1068 <            t.interrupt();
1069 <            t.join(SHORT_DELAY_MS);
1070 <            assertFalse(t.isAlive());
1071 <        }
1072 <        catch (Exception ex) {
1073 <            unexpectedException();
1085 <        }
1052 >        final CountDownLatch locked = new CountDownLatch(1);
1053 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1054 >            public void realRun() throws InterruptedException {
1055 >                lock.writeLock().lock();
1056 >                assertWriteLockedByMoi(lock);
1057 >                assertHasNoWaiters(lock, c);
1058 >                locked.countDown();
1059 >                try {
1060 >                    await(c, awaitMethod);
1061 >                } finally {
1062 >                    assertWriteLockedByMoi(lock);
1063 >                    assertHasNoWaiters(lock, c);
1064 >                    lock.writeLock().unlock();
1065 >                    assertFalse(Thread.interrupted());
1066 >                }
1067 >            }});
1068 >
1069 >        await(locked);
1070 >        assertHasWaiters(lock, c, t);
1071 >        t.interrupt();
1072 >        awaitTermination(t);
1073 >        assertNotWriteLocked(lock);
1074      }
1075  
1076      /**
1077 <     * awaitNanos is interruptible
1077 >     * signalAll wakes up all threads
1078       */
1079 <    public void testAwaitNanos_Interrupt() {
1080 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
1079 >    public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
1080 >    public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
1081 >    public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
1082 >    public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
1083 >    public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
1084 >    public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
1085 >    public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
1086 >    public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
1087 >    public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
1088 >        final PublicReentrantReadWriteLock lock =
1089 >            new PublicReentrantReadWriteLock(fair);
1090          final Condition c = lock.writeLock().newCondition();
1091 <        Thread t = new Thread(new Runnable() {
1092 <                public void run() {
1093 <                    try {
1094 <                        lock.writeLock().lock();
1095 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
1096 <                        lock.writeLock().unlock();
1097 <                        threadShouldThrow();
1098 <                    }
1099 <                    catch(InterruptedException success) {
1103 <                    }
1104 <                }
1105 <            });
1106 <
1107 <        try {
1108 <            t.start();
1109 <            Thread.sleep(SHORT_DELAY_MS);
1110 <            t.interrupt();
1111 <            t.join(SHORT_DELAY_MS);
1112 <            assertFalse(t.isAlive());
1113 <        }
1114 <        catch (Exception ex) {
1115 <            unexpectedException();
1091 >        final CountDownLatch locked = new CountDownLatch(2);
1092 >        final Lock writeLock = lock.writeLock();
1093 >        class Awaiter extends CheckedRunnable {
1094 >            public void realRun() throws InterruptedException {
1095 >                writeLock.lock();
1096 >                locked.countDown();
1097 >                await(c, awaitMethod);
1098 >                writeLock.unlock();
1099 >            }
1100          }
1101 +
1102 +        Thread t1 = newStartedThread(new Awaiter());
1103 +        Thread t2 = newStartedThread(new Awaiter());
1104 +
1105 +        await(locked);
1106 +        writeLock.lock();
1107 +        assertHasWaiters(lock, c, t1, t2);
1108 +        c.signalAll();
1109 +        assertHasNoWaiters(lock, c);
1110 +        writeLock.unlock();
1111 +        awaitTermination(t1);
1112 +        awaitTermination(t2);
1113      }
1114  
1115      /**
1116 <     * awaitUntil is interruptible
1117 <     */
1118 <    public void testAwaitUntil_Interrupt() {
1119 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
1116 >     * signal wakes up waiting threads in FIFO order
1117 >     */
1118 >    public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1119 >    public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1120 >    public void testSignalWakesFifo(boolean fair) {
1121 >        final PublicReentrantReadWriteLock lock =
1122 >            new PublicReentrantReadWriteLock(fair);
1123          final Condition c = lock.writeLock().newCondition();
1124 <        Thread t = new Thread(new Runnable() {
1125 <                public void run() {
1126 <                    try {
1127 <                        lock.writeLock().lock();
1128 <                        java.util.Date d = new java.util.Date();
1129 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
1130 <                        lock.writeLock().unlock();
1131 <                        threadShouldThrow();
1132 <                    }
1133 <                    catch(InterruptedException success) {
1134 <                    }
1135 <                }
1136 <            });
1137 <
1138 <        try {
1139 <            t.start();
1140 <            Thread.sleep(SHORT_DELAY_MS);
1141 <            t.interrupt();
1142 <            t.join(SHORT_DELAY_MS);
1143 <            assertFalse(t.isAlive());
1144 <        }
1145 <        catch (Exception ex) {
1146 <            unexpectedException();
1147 <        }
1124 >        final CountDownLatch locked1 = new CountDownLatch(1);
1125 >        final CountDownLatch locked2 = new CountDownLatch(1);
1126 >        final Lock writeLock = lock.writeLock();
1127 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1128 >            public void realRun() throws InterruptedException {
1129 >                writeLock.lock();
1130 >                locked1.countDown();
1131 >                c.await();
1132 >                writeLock.unlock();
1133 >            }});
1134 >
1135 >        await(locked1);
1136 >
1137 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1138 >            public void realRun() throws InterruptedException {
1139 >                writeLock.lock();
1140 >                locked2.countDown();
1141 >                c.await();
1142 >                writeLock.unlock();
1143 >            }});
1144 >
1145 >        await(locked2);
1146 >
1147 >        writeLock.lock();
1148 >        assertHasWaiters(lock, c, t1, t2);
1149 >        assertFalse(lock.hasQueuedThreads());
1150 >        c.signal();
1151 >        assertHasWaiters(lock, c, t2);
1152 >        assertTrue(lock.hasQueuedThread(t1));
1153 >        assertFalse(lock.hasQueuedThread(t2));
1154 >        c.signal();
1155 >        assertHasNoWaiters(lock, c);
1156 >        assertTrue(lock.hasQueuedThread(t1));
1157 >        assertTrue(lock.hasQueuedThread(t2));
1158 >        writeLock.unlock();
1159 >        awaitTermination(t1);
1160 >        awaitTermination(t2);
1161      }
1162  
1163      /**
1164 <     * signalAll wakes up all threads
1165 <     */
1166 <    public void testSignalAll() {
1167 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
1164 >     * await after multiple reentrant locking preserves lock count
1165 >     */
1166 >    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1167 >    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1168 >    public void testAwaitLockCount(boolean fair) {
1169 >        final PublicReentrantReadWriteLock lock =
1170 >            new PublicReentrantReadWriteLock(fair);
1171          final Condition c = lock.writeLock().newCondition();
1172 <        Thread t1 = new Thread(new Runnable() {
1173 <                public void run() {
1174 <                    try {
1175 <                        lock.writeLock().lock();
1176 <                        c.await();
1177 <                        lock.writeLock().unlock();
1178 <                    }
1179 <                    catch(InterruptedException e) {
1180 <                        threadUnexpectedException();
1181 <                    }
1182 <                }
1183 <            });
1169 <
1170 <        Thread t2 = new Thread(new Runnable() {
1171 <                public void run() {
1172 <                    try {
1173 <                        lock.writeLock().lock();
1174 <                        c.await();
1175 <                        lock.writeLock().unlock();
1176 <                    }
1177 <                    catch(InterruptedException e) {
1178 <                        threadUnexpectedException();
1179 <                    }
1180 <                }
1181 <            });
1172 >        final CountDownLatch locked = new CountDownLatch(2);
1173 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1174 >            public void realRun() throws InterruptedException {
1175 >                lock.writeLock().lock();
1176 >                assertWriteLockedByMoi(lock);
1177 >                assertEquals(1, lock.writeLock().getHoldCount());
1178 >                locked.countDown();
1179 >                c.await();
1180 >                assertWriteLockedByMoi(lock);
1181 >                assertEquals(1, lock.writeLock().getHoldCount());
1182 >                lock.writeLock().unlock();
1183 >            }});
1184  
1185 <        try {
1186 <            t1.start();
1187 <            t2.start();
1188 <            Thread.sleep(SHORT_DELAY_MS);
1189 <            lock.writeLock().lock();
1190 <            c.signalAll();
1191 <            lock.writeLock().unlock();
1192 <            t1.join(SHORT_DELAY_MS);
1193 <            t2.join(SHORT_DELAY_MS);
1194 <            assertFalse(t1.isAlive());
1195 <            assertFalse(t2.isAlive());
1196 <        }
1197 <        catch (Exception ex) {
1198 <            unexpectedException();
1199 <        }
1185 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1186 >            public void realRun() throws InterruptedException {
1187 >                lock.writeLock().lock();
1188 >                lock.writeLock().lock();
1189 >                assertWriteLockedByMoi(lock);
1190 >                assertEquals(2, lock.writeLock().getHoldCount());
1191 >                locked.countDown();
1192 >                c.await();
1193 >                assertWriteLockedByMoi(lock);
1194 >                assertEquals(2, lock.writeLock().getHoldCount());
1195 >                lock.writeLock().unlock();
1196 >                lock.writeLock().unlock();
1197 >            }});
1198 >
1199 >        await(locked);
1200 >        lock.writeLock().lock();
1201 >        assertHasWaiters(lock, c, t1, t2);
1202 >        c.signalAll();
1203 >        assertHasNoWaiters(lock, c);
1204 >        lock.writeLock().unlock();
1205 >        awaitTermination(t1);
1206 >        awaitTermination(t2);
1207      }
1208  
1209      /**
1210       * A serialized lock deserializes as unlocked
1211       */
1212 <    public void testSerialization() {
1213 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1214 <        l.readLock().lock();
1215 <        l.readLock().unlock();
1212 >    public void testSerialization()      { testSerialization(false); }
1213 >    public void testSerialization_fair() { testSerialization(true); }
1214 >    public void testSerialization(boolean fair) {
1215 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1216 >        lock.writeLock().lock();
1217 >        lock.readLock().lock();
1218  
1219 <        try {
1220 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1221 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1222 <            out.writeObject(l);
1223 <            out.close();
1224 <
1225 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1226 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1227 <            ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1228 <            r.readLock().lock();
1229 <            r.readLock().unlock();
1230 <        } catch(Exception e){
1231 <            e.printStackTrace();
1232 <            unexpectedException();
1233 <        }
1219 >        ReentrantReadWriteLock clone = serialClone(lock);
1220 >        assertEquals(lock.isFair(), clone.isFair());
1221 >        assertTrue(lock.isWriteLocked());
1222 >        assertFalse(clone.isWriteLocked());
1223 >        assertEquals(1, lock.getReadLockCount());
1224 >        assertEquals(0, clone.getReadLockCount());
1225 >        clone.writeLock().lock();
1226 >        clone.readLock().lock();
1227 >        assertTrue(clone.isWriteLocked());
1228 >        assertEquals(1, clone.getReadLockCount());
1229 >        clone.readLock().unlock();
1230 >        clone.writeLock().unlock();
1231 >        assertFalse(clone.isWriteLocked());
1232 >        assertEquals(1, lock.getReadLockCount());
1233 >        assertEquals(0, clone.getReadLockCount());
1234      }
1235  
1236      /**
1237       * hasQueuedThreads reports whether there are waiting threads
1238       */
1239 <    public void testhasQueuedThreads() {
1240 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1239 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
1240 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
1241 >    public void testHasQueuedThreads(boolean fair) {
1242 >        final PublicReentrantReadWriteLock lock =
1243 >            new PublicReentrantReadWriteLock(fair);
1244          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1245          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1246 <        try {
1247 <            assertFalse(lock.hasQueuedThreads());
1248 <            lock.writeLock().lock();
1249 <            t1.start();
1250 <            Thread.sleep(SHORT_DELAY_MS);
1251 <            assertTrue(lock.hasQueuedThreads());
1252 <            t2.start();
1253 <            Thread.sleep(SHORT_DELAY_MS);
1254 <            assertTrue(lock.hasQueuedThreads());
1255 <            t1.interrupt();
1256 <            Thread.sleep(SHORT_DELAY_MS);
1257 <            assertTrue(lock.hasQueuedThreads());
1258 <            lock.writeLock().unlock();
1259 <            Thread.sleep(SHORT_DELAY_MS);
1260 <            assertFalse(lock.hasQueuedThreads());
1261 <            t1.join();
1248 <            t2.join();
1249 <        } catch(Exception e){
1250 <            unexpectedException();
1251 <        }
1252 <    }
1246 >        assertFalse(lock.hasQueuedThreads());
1247 >        lock.writeLock().lock();
1248 >        assertFalse(lock.hasQueuedThreads());
1249 >        t1.start();
1250 >        waitForQueuedThread(lock, t1);
1251 >        assertTrue(lock.hasQueuedThreads());
1252 >        t2.start();
1253 >        waitForQueuedThread(lock, t2);
1254 >        assertTrue(lock.hasQueuedThreads());
1255 >        t1.interrupt();
1256 >        awaitTermination(t1);
1257 >        assertTrue(lock.hasQueuedThreads());
1258 >        lock.writeLock().unlock();
1259 >        awaitTermination(t2);
1260 >        assertFalse(lock.hasQueuedThreads());
1261 >    }
1262  
1263      /**
1264       * hasQueuedThread(null) throws NPE
1265       */
1266 <    public void testHasQueuedThreadNPE() {
1267 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1266 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
1267 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
1268 >    public void testHasQueuedThreadNPE(boolean fair) {
1269 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1270          try {
1271 <            sync.hasQueuedThread(null);
1271 >            lock.hasQueuedThread(null);
1272              shouldThrow();
1273 <        } catch (NullPointerException success) {
1263 <        }
1273 >        } catch (NullPointerException success) {}
1274      }
1275  
1276      /**
1277 <     * hasQueuedThread reports whether a thread is queued.
1277 >     * hasQueuedThread reports whether a thread is queued
1278       */
1279 <    public void testHasQueuedThread() {
1280 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1281 <        Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1282 <        Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1283 <        try {
1284 <            assertFalse(sync.hasQueuedThread(t1));
1285 <            assertFalse(sync.hasQueuedThread(t2));
1286 <            sync.writeLock().lock();
1287 <            t1.start();
1288 <            Thread.sleep(SHORT_DELAY_MS);
1289 <            assertTrue(sync.hasQueuedThread(t1));
1290 <            t2.start();
1291 <            Thread.sleep(SHORT_DELAY_MS);
1292 <            assertTrue(sync.hasQueuedThread(t1));
1293 <            assertTrue(sync.hasQueuedThread(t2));
1294 <            t1.interrupt();
1295 <            Thread.sleep(SHORT_DELAY_MS);
1296 <            assertFalse(sync.hasQueuedThread(t1));
1297 <            assertTrue(sync.hasQueuedThread(t2));
1298 <            sync.writeLock().unlock();
1299 <            Thread.sleep(SHORT_DELAY_MS);
1300 <            assertFalse(sync.hasQueuedThread(t1));
1301 <            Thread.sleep(SHORT_DELAY_MS);
1302 <            assertFalse(sync.hasQueuedThread(t2));
1303 <            t1.join();
1304 <            t2.join();
1305 <        } catch(Exception e){
1296 <            unexpectedException();
1297 <        }
1298 <    }
1299 <
1279 >    public void testHasQueuedThread()      { testHasQueuedThread(false); }
1280 >    public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
1281 >    public void testHasQueuedThread(boolean fair) {
1282 >        final PublicReentrantReadWriteLock lock =
1283 >            new PublicReentrantReadWriteLock(fair);
1284 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1285 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1286 >        assertFalse(lock.hasQueuedThread(t1));
1287 >        assertFalse(lock.hasQueuedThread(t2));
1288 >        lock.writeLock().lock();
1289 >        t1.start();
1290 >        waitForQueuedThread(lock, t1);
1291 >        assertTrue(lock.hasQueuedThread(t1));
1292 >        assertFalse(lock.hasQueuedThread(t2));
1293 >        t2.start();
1294 >        waitForQueuedThread(lock, t2);
1295 >        assertTrue(lock.hasQueuedThread(t1));
1296 >        assertTrue(lock.hasQueuedThread(t2));
1297 >        t1.interrupt();
1298 >        awaitTermination(t1);
1299 >        assertFalse(lock.hasQueuedThread(t1));
1300 >        assertTrue(lock.hasQueuedThread(t2));
1301 >        lock.writeLock().unlock();
1302 >        awaitTermination(t2);
1303 >        assertFalse(lock.hasQueuedThread(t1));
1304 >        assertFalse(lock.hasQueuedThread(t2));
1305 >    }
1306  
1307      /**
1308       * getQueueLength reports number of waiting threads
1309       */
1310 <    public void testGetQueueLength() {
1311 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1310 >    public void testGetQueueLength()      { testGetQueueLength(false); }
1311 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
1312 >    public void testGetQueueLength(boolean fair) {
1313 >        final PublicReentrantReadWriteLock lock =
1314 >            new PublicReentrantReadWriteLock(fair);
1315          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1316          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1317 <        try {
1318 <            assertEquals(0, lock.getQueueLength());
1319 <            lock.writeLock().lock();
1320 <            t1.start();
1321 <            Thread.sleep(SHORT_DELAY_MS);
1322 <            assertEquals(1, lock.getQueueLength());
1323 <            t2.start();
1324 <            Thread.sleep(SHORT_DELAY_MS);
1325 <            assertEquals(2, lock.getQueueLength());
1326 <            t1.interrupt();
1327 <            Thread.sleep(SHORT_DELAY_MS);
1328 <            assertEquals(1, lock.getQueueLength());
1329 <            lock.writeLock().unlock();
1330 <            Thread.sleep(SHORT_DELAY_MS);
1331 <            assertEquals(0, lock.getQueueLength());
1323 <            t1.join();
1324 <            t2.join();
1325 <        } catch(Exception e){
1326 <            unexpectedException();
1327 <        }
1328 <    }
1317 >        assertEquals(0, lock.getQueueLength());
1318 >        lock.writeLock().lock();
1319 >        t1.start();
1320 >        waitForQueuedThread(lock, t1);
1321 >        assertEquals(1, lock.getQueueLength());
1322 >        t2.start();
1323 >        waitForQueuedThread(lock, t2);
1324 >        assertEquals(2, lock.getQueueLength());
1325 >        t1.interrupt();
1326 >        awaitTermination(t1);
1327 >        assertEquals(1, lock.getQueueLength());
1328 >        lock.writeLock().unlock();
1329 >        awaitTermination(t2);
1330 >        assertEquals(0, lock.getQueueLength());
1331 >    }
1332  
1333      /**
1334       * getQueuedThreads includes waiting threads
1335       */
1336 <    public void testGetQueuedThreads() {
1337 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1336 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
1337 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
1338 >    public void testGetQueuedThreads(boolean fair) {
1339 >        final PublicReentrantReadWriteLock lock =
1340 >            new PublicReentrantReadWriteLock(fair);
1341          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1342          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1343 <        try {
1344 <            assertTrue(lock.getQueuedThreads().isEmpty());
1345 <            lock.writeLock().lock();
1346 <            assertTrue(lock.getQueuedThreads().isEmpty());
1347 <            t1.start();
1348 <            Thread.sleep(SHORT_DELAY_MS);
1349 <            assertTrue(lock.getQueuedThreads().contains(t1));
1350 <            t2.start();
1351 <            Thread.sleep(SHORT_DELAY_MS);
1352 <            assertTrue(lock.getQueuedThreads().contains(t1));
1353 <            assertTrue(lock.getQueuedThreads().contains(t2));
1354 <            t1.interrupt();
1355 <            Thread.sleep(SHORT_DELAY_MS);
1356 <            assertFalse(lock.getQueuedThreads().contains(t1));
1357 <            assertTrue(lock.getQueuedThreads().contains(t2));
1358 <            lock.writeLock().unlock();
1359 <            Thread.sleep(SHORT_DELAY_MS);
1360 <            assertTrue(lock.getQueuedThreads().isEmpty());
1361 <            t1.join();
1362 <            t2.join();
1363 <        } catch(Exception e){
1358 <            unexpectedException();
1359 <        }
1360 <    }
1343 >        assertTrue(lock.getQueuedThreads().isEmpty());
1344 >        lock.writeLock().lock();
1345 >        assertTrue(lock.getQueuedThreads().isEmpty());
1346 >        t1.start();
1347 >        waitForQueuedThread(lock, t1);
1348 >        assertEquals(1, lock.getQueuedThreads().size());
1349 >        assertTrue(lock.getQueuedThreads().contains(t1));
1350 >        t2.start();
1351 >        waitForQueuedThread(lock, t2);
1352 >        assertEquals(2, lock.getQueuedThreads().size());
1353 >        assertTrue(lock.getQueuedThreads().contains(t1));
1354 >        assertTrue(lock.getQueuedThreads().contains(t2));
1355 >        t1.interrupt();
1356 >        awaitTermination(t1);
1357 >        assertFalse(lock.getQueuedThreads().contains(t1));
1358 >        assertTrue(lock.getQueuedThreads().contains(t2));
1359 >        assertEquals(1, lock.getQueuedThreads().size());
1360 >        lock.writeLock().unlock();
1361 >        awaitTermination(t2);
1362 >        assertTrue(lock.getQueuedThreads().isEmpty());
1363 >    }
1364  
1365      /**
1366       * hasWaiters throws NPE if null
1367       */
1368 <    public void testHasWaitersNPE() {
1369 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1368 >    public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
1369 >    public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
1370 >    public void testHasWaitersNPE(boolean fair) {
1371 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1372          try {
1373              lock.hasWaiters(null);
1374              shouldThrow();
1375 <        } catch (NullPointerException success) {
1371 <        } catch (Exception ex) {
1372 <            unexpectedException();
1373 <        }
1375 >        } catch (NullPointerException success) {}
1376      }
1377  
1378      /**
1379       * getWaitQueueLength throws NPE if null
1380       */
1381 <    public void testGetWaitQueueLengthNPE() {
1382 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1381 >    public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
1382 >    public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
1383 >    public void testGetWaitQueueLengthNPE(boolean fair) {
1384 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1385          try {
1386              lock.getWaitQueueLength(null);
1387              shouldThrow();
1388 <        } catch (NullPointerException success) {
1385 <        } catch (Exception ex) {
1386 <            unexpectedException();
1387 <        }
1388 >        } catch (NullPointerException success) {}
1389      }
1390  
1390
1391      /**
1392       * getWaitingThreads throws NPE if null
1393       */
1394 <    public void testGetWaitingThreadsNPE() {
1395 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1394 >    public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
1395 >    public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
1396 >    public void testGetWaitingThreadsNPE(boolean fair) {
1397 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(fair);
1398          try {
1399              lock.getWaitingThreads(null);
1400              shouldThrow();
1401 <        } catch (NullPointerException success) {
1400 <        } catch (Exception ex) {
1401 <            unexpectedException();
1402 <        }
1401 >        } catch (NullPointerException success) {}
1402      }
1403  
1404      /**
1405 <     * hasWaiters throws IAE if not owned
1405 >     * hasWaiters throws IllegalArgumentException if not owned
1406       */
1407 <    public void testHasWaitersIAE() {
1408 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1409 <        final Condition c = (lock.writeLock().newCondition());
1410 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1407 >    public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
1408 >    public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
1409 >    public void testHasWaitersIAE(boolean fair) {
1410 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1411 >        final Condition c = lock.writeLock().newCondition();
1412 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1413          try {
1414              lock2.hasWaiters(c);
1415              shouldThrow();
1416 <        } catch (IllegalArgumentException success) {
1416 <        } catch (Exception ex) {
1417 <            unexpectedException();
1418 <        }
1416 >        } catch (IllegalArgumentException success) {}
1417      }
1418  
1419      /**
1420 <     * hasWaiters throws IMSE if not locked
1420 >     * hasWaiters throws IllegalMonitorStateException if not locked
1421       */
1422 <    public void testHasWaitersIMSE() {
1423 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1424 <        final Condition c = (lock.writeLock().newCondition());
1422 >    public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
1423 >    public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
1424 >    public void testHasWaitersIMSE(boolean fair) {
1425 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1426 >        final Condition c = lock.writeLock().newCondition();
1427          try {
1428              lock.hasWaiters(c);
1429              shouldThrow();
1430 <        } catch (IllegalMonitorStateException success) {
1431 <        } catch (Exception ex) {
1432 <            unexpectedException();
1433 <        }
1430 >        } catch (IllegalMonitorStateException success) {}
1431      }
1432  
1436
1433      /**
1434 <     * getWaitQueueLength throws IAE if not owned
1434 >     * getWaitQueueLength throws IllegalArgumentException if not owned
1435       */
1436 <    public void testGetWaitQueueLengthIAE() {
1437 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1438 <        final Condition c = (lock.writeLock().newCondition());
1439 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1436 >    public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
1437 >    public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
1438 >    public void testGetWaitQueueLengthIAE(boolean fair) {
1439 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1440 >        final Condition c = lock.writeLock().newCondition();
1441 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1442          try {
1443              lock2.getWaitQueueLength(c);
1444              shouldThrow();
1445 <        } catch (IllegalArgumentException success) {
1448 <        } catch (Exception ex) {
1449 <            unexpectedException();
1450 <        }
1445 >        } catch (IllegalArgumentException success) {}
1446      }
1447  
1448      /**
1449 <     * getWaitQueueLength throws IMSE if not locked
1449 >     * getWaitQueueLength throws IllegalMonitorStateException if not locked
1450       */
1451 <    public void testGetWaitQueueLengthIMSE() {
1452 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1453 <        final Condition c = (lock.writeLock().newCondition());
1451 >    public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
1452 >    public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
1453 >    public void testGetWaitQueueLengthIMSE(boolean fair) {
1454 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1455 >        final Condition c = lock.writeLock().newCondition();
1456          try {
1457              lock.getWaitQueueLength(c);
1458              shouldThrow();
1459 <        } catch (IllegalMonitorStateException success) {
1463 <        } catch (Exception ex) {
1464 <            unexpectedException();
1465 <        }
1459 >        } catch (IllegalMonitorStateException success) {}
1460      }
1461  
1468
1462      /**
1463 <     * getWaitingThreads throws IAE if not owned
1463 >     * getWaitingThreads throws IllegalArgumentException if not owned
1464       */
1465 <    public void testGetWaitingThreadsIAE() {
1466 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();  
1467 <        final Condition c = (lock.writeLock().newCondition());
1468 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();  
1465 >    public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
1466 >    public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
1467 >    public void testGetWaitingThreadsIAE(boolean fair) {
1468 >        final PublicReentrantReadWriteLock lock =
1469 >            new PublicReentrantReadWriteLock(fair);
1470 >        final Condition c = lock.writeLock().newCondition();
1471 >        final PublicReentrantReadWriteLock lock2 =
1472 >            new PublicReentrantReadWriteLock(fair);
1473          try {
1474              lock2.getWaitingThreads(c);
1475              shouldThrow();
1476 <        } catch (IllegalArgumentException success) {
1480 <        } catch (Exception ex) {
1481 <            unexpectedException();
1482 <        }
1476 >        } catch (IllegalArgumentException success) {}
1477      }
1478  
1479      /**
1480 <     * getWaitingThreads throws IMSE if not locked
1480 >     * getWaitingThreads throws IllegalMonitorStateException if not locked
1481       */
1482 <    public void testGetWaitingThreadsIMSE() {
1483 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();  
1484 <        final Condition c = (lock.writeLock().newCondition());
1482 >    public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
1483 >    public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
1484 >    public void testGetWaitingThreadsIMSE(boolean fair) {
1485 >        final PublicReentrantReadWriteLock lock =
1486 >            new PublicReentrantReadWriteLock(fair);
1487 >        final Condition c = lock.writeLock().newCondition();
1488          try {
1489              lock.getWaitingThreads(c);
1490              shouldThrow();
1491 <        } catch (IllegalMonitorStateException success) {
1495 <        } catch (Exception ex) {
1496 <            unexpectedException();
1497 <        }
1491 >        } catch (IllegalMonitorStateException success) {}
1492      }
1493  
1500
1494      /**
1495       * hasWaiters returns true when a thread is waiting, else false
1496       */
1497 <    public void testHasWaiters() {
1498 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1499 <        final Condition c = (lock.writeLock().newCondition());
1500 <        Thread t = new Thread(new Runnable() {
1501 <                public void run() {
1502 <                    try {
1503 <                        lock.writeLock().lock();
1504 <                        threadAssertFalse(lock.hasWaiters(c));
1505 <                        threadAssertEquals(0, lock.getWaitQueueLength(c));
1506 <                        c.await();
1507 <                        lock.writeLock().unlock();
1508 <                    }
1509 <                    catch(InterruptedException e) {
1510 <                        threadUnexpectedException();
1511 <                    }
1512 <                }
1513 <            });
1497 >    public void testHasWaiters()      { testHasWaiters(false); }
1498 >    public void testHasWaiters_fair() { testHasWaiters(true); }
1499 >    public void testHasWaiters(boolean fair) {
1500 >        final PublicReentrantReadWriteLock lock =
1501 >            new PublicReentrantReadWriteLock(fair);
1502 >        final Condition c = lock.writeLock().newCondition();
1503 >        final CountDownLatch locked = new CountDownLatch(1);
1504 >        Thread t = newStartedThread(new CheckedRunnable() {
1505 >            public void realRun() throws InterruptedException {
1506 >                lock.writeLock().lock();
1507 >                assertHasNoWaiters(lock, c);
1508 >                assertFalse(lock.hasWaiters(c));
1509 >                locked.countDown();
1510 >                c.await();
1511 >                assertHasNoWaiters(lock, c);
1512 >                assertFalse(lock.hasWaiters(c));
1513 >                lock.writeLock().unlock();
1514 >            }});
1515  
1516 <        try {
1517 <            t.start();
1518 <            Thread.sleep(SHORT_DELAY_MS);
1519 <            lock.writeLock().lock();
1520 <            assertTrue(lock.hasWaiters(c));
1521 <            assertEquals(1, lock.getWaitQueueLength(c));
1522 <            c.signal();
1523 <            lock.writeLock().unlock();
1524 <            Thread.sleep(SHORT_DELAY_MS);
1525 <            lock.writeLock().lock();
1532 <            assertFalse(lock.hasWaiters(c));
1533 <            assertEquals(0, lock.getWaitQueueLength(c));
1534 <            lock.writeLock().unlock();
1535 <            t.join(SHORT_DELAY_MS);
1536 <            assertFalse(t.isAlive());
1537 <        }
1538 <        catch (Exception ex) {
1539 <            unexpectedException();
1540 <        }
1516 >        await(locked);
1517 >        lock.writeLock().lock();
1518 >        assertHasWaiters(lock, c, t);
1519 >        assertTrue(lock.hasWaiters(c));
1520 >        c.signal();
1521 >        assertHasNoWaiters(lock, c);
1522 >        assertFalse(lock.hasWaiters(c));
1523 >        lock.writeLock().unlock();
1524 >        awaitTermination(t);
1525 >        assertHasNoWaiters(lock, c);
1526      }
1527  
1528      /**
1529       * getWaitQueueLength returns number of waiting threads
1530       */
1531 <    public void testGetWaitQueueLength() {
1532 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1533 <        final Condition c = (lock.writeLock().newCondition());
1534 <        Thread t = new Thread(new Runnable() {
1535 <                public void run() {
1536 <                    try {
1537 <                        lock.writeLock().lock();
1538 <                        threadAssertFalse(lock.hasWaiters(c));
1539 <                        threadAssertEquals(0, lock.getWaitQueueLength(c));
1540 <                        c.await();
1541 <                        lock.writeLock().unlock();
1542 <                    }
1543 <                    catch(InterruptedException e) {
1544 <                        threadUnexpectedException();
1545 <                    }
1561 <                }
1562 <            });
1531 >    public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
1532 >    public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
1533 >    public void testGetWaitQueueLength(boolean fair) {
1534 >        final PublicReentrantReadWriteLock lock =
1535 >            new PublicReentrantReadWriteLock(fair);
1536 >        final Condition c = lock.writeLock().newCondition();
1537 >        final CountDownLatch locked = new CountDownLatch(1);
1538 >        Thread t = newStartedThread(new CheckedRunnable() {
1539 >            public void realRun() throws InterruptedException {
1540 >                lock.writeLock().lock();
1541 >                assertEquals(0, lock.getWaitQueueLength(c));
1542 >                locked.countDown();
1543 >                c.await();
1544 >                lock.writeLock().unlock();
1545 >            }});
1546  
1547 <        try {
1548 <            t.start();
1549 <            Thread.sleep(SHORT_DELAY_MS);
1550 <            lock.writeLock().lock();
1551 <            assertTrue(lock.hasWaiters(c));
1552 <            assertEquals(1, lock.getWaitQueueLength(c));
1553 <            c.signal();
1554 <            lock.writeLock().unlock();
1555 <            Thread.sleep(SHORT_DELAY_MS);
1573 <            lock.writeLock().lock();
1574 <            assertFalse(lock.hasWaiters(c));
1575 <            assertEquals(0, lock.getWaitQueueLength(c));
1576 <            lock.writeLock().unlock();
1577 <            t.join(SHORT_DELAY_MS);
1578 <            assertFalse(t.isAlive());
1579 <        }
1580 <        catch (Exception ex) {
1581 <            unexpectedException();
1582 <        }
1547 >        await(locked);
1548 >        lock.writeLock().lock();
1549 >        assertHasWaiters(lock, c, t);
1550 >        assertEquals(1, lock.getWaitQueueLength(c));
1551 >        c.signal();
1552 >        assertHasNoWaiters(lock, c);
1553 >        assertEquals(0, lock.getWaitQueueLength(c));
1554 >        lock.writeLock().unlock();
1555 >        awaitTermination(t);
1556      }
1557  
1585
1558      /**
1559       * getWaitingThreads returns only and all waiting threads
1560       */
1561 <    public void testGetWaitingThreads() {
1562 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();  
1561 >    public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
1562 >    public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
1563 >    public void testGetWaitingThreads(boolean fair) {
1564 >        final PublicReentrantReadWriteLock lock =
1565 >            new PublicReentrantReadWriteLock(fair);
1566          final Condition c = lock.writeLock().newCondition();
1567 <        Thread t1 = new Thread(new Runnable() {
1568 <                public void run() {
1569 <                    try {
1570 <                        lock.writeLock().lock();
1571 <                        threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1572 <                        c.await();
1573 <                        lock.writeLock().unlock();
1574 <                    }
1575 <                    catch(InterruptedException e) {
1576 <                        threadUnexpectedException();
1602 <                    }
1603 <                }
1604 <            });
1605 <
1606 <        Thread t2 = new Thread(new Runnable() {
1607 <                public void run() {
1608 <                    try {
1609 <                        lock.writeLock().lock();
1610 <                        threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1611 <                        c.await();
1612 <                        lock.writeLock().unlock();
1613 <                    }
1614 <                    catch(InterruptedException e) {
1615 <                        threadUnexpectedException();
1616 <                    }
1617 <                }
1618 <            });
1567 >        final CountDownLatch locked1 = new CountDownLatch(1);
1568 >        final CountDownLatch locked2 = new CountDownLatch(1);
1569 >        Thread t1 = new Thread(new CheckedRunnable() {
1570 >            public void realRun() throws InterruptedException {
1571 >                lock.writeLock().lock();
1572 >                assertTrue(lock.getWaitingThreads(c).isEmpty());
1573 >                locked1.countDown();
1574 >                c.await();
1575 >                lock.writeLock().unlock();
1576 >            }});
1577  
1578 <        try {
1579 <            lock.writeLock().lock();
1580 <            assertTrue(lock.getWaitingThreads(c).isEmpty());
1581 <            lock.writeLock().unlock();
1582 <            t1.start();
1583 <            Thread.sleep(SHORT_DELAY_MS);
1584 <            t2.start();
1585 <            Thread.sleep(SHORT_DELAY_MS);
1586 <            lock.writeLock().lock();
1587 <            assertTrue(lock.hasWaiters(c));
1588 <            assertTrue(lock.getWaitingThreads(c).contains(t1));
1589 <            assertTrue(lock.getWaitingThreads(c).contains(t2));
1590 <            c.signalAll();
1591 <            lock.writeLock().unlock();
1592 <            Thread.sleep(SHORT_DELAY_MS);
1593 <            lock.writeLock().lock();
1594 <            assertFalse(lock.hasWaiters(c));
1595 <            assertTrue(lock.getWaitingThreads(c).isEmpty());
1596 <            lock.writeLock().unlock();
1597 <            t1.join(SHORT_DELAY_MS);
1598 <            t2.join(SHORT_DELAY_MS);
1599 <            assertFalse(t1.isAlive());
1600 <            assertFalse(t2.isAlive());
1601 <        }
1602 <        catch (Exception ex) {
1603 <            unexpectedException();
1604 <        }
1578 >        Thread t2 = new Thread(new CheckedRunnable() {
1579 >            public void realRun() throws InterruptedException {
1580 >                lock.writeLock().lock();
1581 >                assertFalse(lock.getWaitingThreads(c).isEmpty());
1582 >                locked2.countDown();
1583 >                c.await();
1584 >                lock.writeLock().unlock();
1585 >            }});
1586 >
1587 >        lock.writeLock().lock();
1588 >        assertTrue(lock.getWaitingThreads(c).isEmpty());
1589 >        lock.writeLock().unlock();
1590 >
1591 >        t1.start();
1592 >        await(locked1);
1593 >        t2.start();
1594 >        await(locked2);
1595 >
1596 >        lock.writeLock().lock();
1597 >        assertTrue(lock.hasWaiters(c));
1598 >        assertTrue(lock.getWaitingThreads(c).contains(t1));
1599 >        assertTrue(lock.getWaitingThreads(c).contains(t2));
1600 >        assertEquals(2, lock.getWaitingThreads(c).size());
1601 >        c.signalAll();
1602 >        assertHasNoWaiters(lock, c);
1603 >        lock.writeLock().unlock();
1604 >
1605 >        awaitTermination(t1);
1606 >        awaitTermination(t2);
1607 >
1608 >        assertHasNoWaiters(lock, c);
1609      }
1610  
1611      /**
1612       * toString indicates current lock state
1613       */
1614 <    public void testToString() {
1615 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1616 <        String us = lock.toString();
1617 <        assertTrue(us.indexOf("Write locks = 0") >= 0);
1618 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1619 <        lock.writeLock().lock();
1620 <        String ws = lock.toString();
1621 <        assertTrue(ws.indexOf("Write locks = 1") >= 0);
1622 <        assertTrue(ws.indexOf("Read locks = 0") >= 0);
1614 >    public void testToString()      { testToString(false); }
1615 >    public void testToString_fair() { testToString(true); }
1616 >    public void testToString(boolean fair) {
1617 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1618 >        assertTrue(lock.toString().contains("Write locks = 0"));
1619 >        assertTrue(lock.toString().contains("Read locks = 0"));
1620 >        lock.writeLock().lock();
1621 >        assertTrue(lock.toString().contains("Write locks = 1"));
1622 >        assertTrue(lock.toString().contains("Read locks = 0"));
1623          lock.writeLock().unlock();
1624          lock.readLock().lock();
1625          lock.readLock().lock();
1626 <        String rs = lock.toString();
1627 <        assertTrue(rs.indexOf("Write locks = 0") >= 0);
1666 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1626 >        assertTrue(lock.toString().contains("Write locks = 0"));
1627 >        assertTrue(lock.toString().contains("Read locks = 2"));
1628      }
1629  
1630      /**
1631       * readLock.toString indicates current lock state
1632       */
1633 <    public void testReadLockToString() {
1634 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1635 <        String us = lock.readLock().toString();
1636 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1633 >    public void testReadLockToString()      { testReadLockToString(false); }
1634 >    public void testReadLockToString_fair() { testReadLockToString(true); }
1635 >    public void testReadLockToString(boolean fair) {
1636 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1637 >        assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1638          lock.readLock().lock();
1639          lock.readLock().lock();
1640 <        String rs = lock.readLock().toString();
1679 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1640 >        assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1641      }
1642  
1643      /**
1644       * writeLock.toString indicates current lock state
1645       */
1646 <    public void testWriteLockToString() {
1647 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1648 <        String us = lock.writeLock().toString();
1649 <        assertTrue(us.indexOf("Unlocked") >= 0);
1646 >    public void testWriteLockToString()      { testWriteLockToString(false); }
1647 >    public void testWriteLockToString_fair() { testWriteLockToString(true); }
1648 >    public void testWriteLockToString(boolean fair) {
1649 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1650 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1651          lock.writeLock().lock();
1652 <        String ls = lock.writeLock().toString();
1653 <        assertTrue(ls.indexOf("Locked") >= 0);
1652 >        assertTrue(lock.writeLock().toString().contains("Locked"));
1653 >        lock.writeLock().unlock();
1654 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1655      }
1656  
1657   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines