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.4 by dl, Sat Sep 20 18:20:08 2003 UTC vs.
Revision 1.65 by jsr166, Tue May 31 16:16:24 2011 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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/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 extends CheckedRunnable {
30 +        final ReentrantReadWriteLock lock;
31 +        InterruptibleLockRunnable(ReentrantReadWriteLock l) { lock = l; }
32 +        public void realRun() throws InterruptedException {
33 +            lock.writeLock().lockInterruptibly();
34 +        }
35 +    }
36  
37 <    /*
38 <     * write-locking and read-locking an unlocked lock succeed
37 >    /**
38 >     * A runnable calling lockInterruptibly that expects to be
39 >     * interrupted
40       */
41 <    public void testLock() {
42 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
43 <        rl.writeLock().lock();
44 <        rl.writeLock().unlock();
45 <        rl.readLock().lock();
46 <        rl.readLock().unlock();
41 >    class InterruptedLockRunnable extends CheckedInterruptedRunnable {
42 >        final ReentrantReadWriteLock lock;
43 >        InterruptedLockRunnable(ReentrantReadWriteLock l) { lock = l; }
44 >        public void realRun() throws InterruptedException {
45 >            lock.writeLock().lockInterruptibly();
46 >        }
47      }
48  
49 +    /**
50 +     * Subclass to expose protected methods
51 +     */
52 +    static class PublicReentrantReadWriteLock extends ReentrantReadWriteLock {
53 +        PublicReentrantReadWriteLock() { super(); }
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);
63 +        }
64 +    }
65  
66 <    /*
67 <     * locking an unlocked fair lock succeeds
68 <     */
69 <    public void testFairLock() {
70 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
71 <        rl.writeLock().lock();
72 <        rl.writeLock().unlock();
73 <        rl.readLock().lock();
74 <        rl.readLock().unlock();
66 >    /**
67 >     * Releases write lock, checking that it had a hold count of 1.
68 >     */
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-unlocking an unlocked lock throws IllegalMonitorStateException
78 >     * Spin-waits until lock.hasQueuedThread(t) becomes true.
79       */
80 <    public void testUnlock_IllegalMonitorStateException() {
81 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
82 <        try {
83 <            rl.writeLock().unlock();
84 <            shouldThrow();
85 <        } catch(IllegalMonitorStateException success){}
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  
91 +    /**
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 <     * write-lockInterruptibly is interruptible
104 >     * Checks that lock is write-locked by the given thread.
105       */
106 <    public void testWriteLockInterruptibly_Interrupted() {
107 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
108 <        lock.writeLock().lock();
109 <        Thread t = new Thread(new Runnable() {
110 <                public void run() {
111 <                    try {
112 <                        lock.writeLock().lockInterruptibly();
113 <                        threadShouldThrow();
114 <                    } catch(InterruptedException success){}
115 <                }
116 <            });
117 <        try {
72 <            t.start();
73 <            t.interrupt();
74 <            lock.writeLock().unlock();
75 <            t.join();
76 <        } catch(Exception e){
77 <            unexpectedException();
78 <        }
79 <    }
80 <
81 <    /**
82 <     * timed write-trylock is interruptible
83 <     */
84 <    public void testWriteTryLock_Interrupted() {
85 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
86 <        lock.writeLock().lock();
87 <        Thread t = new Thread(new Runnable() {
88 <                public void run() {
89 <                    try {
90 <                        lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
91 <                        threadShouldThrow();
92 <                    } catch(InterruptedException success){}
93 <                }
94 <            });
95 <        try {
96 <            t.start();
97 <            t.interrupt();
98 <            lock.writeLock().unlock();
99 <            t.join();
100 <        } catch(Exception e){
101 <            unexpectedException();
102 <        }
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 <     * read-lockInterruptibly is interruptible
121 >     * Checks that lock is write-locked by the current thread.
122       */
123 <    public void testReadLockInterruptibly_Interrupted() {
124 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
125 <        lock.writeLock().lock();
126 <        Thread t = new Thread(new Runnable() {
127 <                public void run() {
128 <                    try {
129 <                        lock.readLock().lockInterruptibly();
130 <                        threadShouldThrow();
131 <                    } catch(InterruptedException success){}
132 <                }
133 <            });
134 <        try {
135 <            t.start();
136 <            t.interrupt();
137 <            lock.writeLock().unlock();
138 <            t.join();
139 <        } catch(Exception e){
140 <            unexpectedException();
141 <        }
142 <    }
143 <
144 <    /**
145 <     * timed read-trylock is interruptible
146 <     */
147 <    public void testReadTryLock_Interrupted() {
148 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
149 <        lock.writeLock().lock();
150 <        Thread t = new Thread(new Runnable() {
151 <                public void run() {
152 <                    try {
153 <                        lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
154 <                        threadShouldThrow();
155 <                    } catch(InterruptedException success){}
156 <                }
157 <            });
158 <        try {
159 <            t.start();
160 <            t.interrupt();
161 <            t.join();
162 <        } catch(Exception e){
163 <            unexpectedException();
123 >    void assertWriteLockedByMoi(PublicReentrantReadWriteLock lock) {
124 >        assertWriteLockedBy(lock, Thread.currentThread());
125 >    }
126 >
127 >    /**
128 >     * Checks that condition c has no waiters.
129 >     */
130 >    void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
131 >        assertHasWaiters(lock, c, new Thread[] {});
132 >    }
133 >
134 >    /**
135 >     * Checks that condition c has exactly the given waiter threads.
136 >     */
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 >     * Awaits condition using the specified AwaitMethod.
153 >     */
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      }
173  
174 <    
175 <    /**
176 <     * write-trylock fails if locked
177 <     */
178 <    public void testWriteTryLockWhenLocked() {
179 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
180 <        lock.writeLock().lock();
181 <        Thread t = new Thread(new Runnable() {
182 <                public void run() {
183 <                    threadAssertFalse(lock.writeLock().tryLock());
184 <                }
185 <            });
186 <        try {
187 <            t.start();
188 <            t.join();
174 >    /**
175 >     * Constructor sets given fairness, and is in unlocked state
176 >     */
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 >     * write-locking and read-locking an unlocked lock succeed
198 >     */
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 <        } catch(Exception e){
169 <            unexpectedException();
231 >            assertEquals(i-1,lock.getWriteHoldCount());
232          }
233 <    }
233 >    }
234  
235      /**
236 <     * read-trylock fails if locked
236 >     * writelock.getHoldCount returns number of recursive holds
237       */
238 <    public void testReadTryLockWhenLocked() {
239 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
240 <        lock.writeLock().lock();
241 <        Thread t = new Thread(new Runnable() {
242 <                public void run() {
243 <                    threadAssertFalse(lock.readLock().tryLock());
244 <                }
245 <            });
246 <        try {
185 <            t.start();
186 <            t.join();
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 <        } catch(Exception e){
189 <            unexpectedException();
248 >            assertEquals(i-1,lock.writeLock().getHoldCount());
249          }
250 <    }
250 >    }
251  
252      /**
253 <     * Multiple threads can hold a read lock when not write-locked
253 >     * getReadHoldCount returns number of recursive holds
254       */
255 <    public void testMultipleReadLocks() {
256 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
257 <        lock.readLock().lock();
258 <        Thread t = new Thread(new Runnable() {
259 <                public void run() {
260 <                    threadAssertTrue(lock.readLock().tryLock());
261 <                    lock.readLock().unlock();
262 <                }
263 <            });
205 <        try {
206 <            t.start();
207 <            t.join();
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 <        } catch(Exception e){
210 <            unexpectedException();
265 >            assertEquals(i-1,lock.getReadHoldCount());
266          }
267 <    }
267 >    }
268  
269      /**
270 <     * A writelock succeeds after reading threads unlock
270 >     * write-unlocking an unlocked lock throws IllegalMonitorStateException
271       */
272 <    public void testWriteAfterMultipleReadLocks() {
273 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
274 <        lock.readLock().lock();
275 <        Thread t1 = new Thread(new Runnable() {
221 <                public void run() {
222 <                    lock.readLock().lock();
223 <                    lock.readLock().unlock();
224 <                }
225 <            });
226 <        Thread t2 = new Thread(new Runnable() {
227 <                public void run() {
228 <                    lock.writeLock().lock();
229 <                    lock.writeLock().unlock();
230 <                }
231 <            });
232 <
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 {
234            t1.start();
235            t2.start();
236            Thread.sleep(SHORT_DELAY_MS);
237            lock.readLock().unlock();
238            t1.join(MEDIUM_DELAY_MS);
239            t2.join(MEDIUM_DELAY_MS);
240            assertTrue(!t1.isAlive());
241            assertTrue(!t2.isAlive());
242          
243        } catch(Exception e){
244            unexpectedException();
245        }
246    }
247
248    /**
249     * Readlocks succeed after a writing thread unlocks
250     */
251    public void testReadAfterWriteLock() {
252        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
253        lock.writeLock().lock();
254        Thread t1 = new Thread(new Runnable() {
255                public void run() {
256                    lock.readLock().lock();
257                    lock.readLock().unlock();
258                }
259            });
260        Thread t2 = new Thread(new Runnable() {
261                public void run() {
262                    lock.readLock().lock();
263                    lock.readLock().unlock();
264                }
265            });
266
267        try {
268            t1.start();
269            t2.start();
270            Thread.sleep(SHORT_DELAY_MS);
277              lock.writeLock().unlock();
278 <            t1.join(MEDIUM_DELAY_MS);
279 <            t2.join(MEDIUM_DELAY_MS);
280 <            assertTrue(!t1.isAlive());
275 <            assertTrue(!t2.isAlive());
276 <          
277 <        } catch(Exception e){
278 <            unexpectedException();
279 <        }
280 <    }
281 <
278 >            shouldThrow();
279 >        } catch (IllegalMonitorStateException success) {}
280 >    }
281  
282      /**
283 <     * Read trylock succeeds if readlocked but not writelocked
284 <     */
285 <    public void testTryLockWhenReadLocked() {
286 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
287 <        lock.readLock().lock();
288 <        Thread t = new Thread(new Runnable() {
290 <                public void run() {
291 <                    threadAssertTrue(lock.readLock().tryLock());
292 <                    lock.readLock().unlock();
293 <                }
294 <            });
283 >     * read-unlocking an unlocked lock throws IllegalMonitorStateException
284 >     */
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 {
296            t.start();
297            t.join();
290              lock.readLock().unlock();
291 <        } catch(Exception e){
292 <            unexpectedException();
293 <        }
302 <    }
303 <
304 <    
291 >            shouldThrow();
292 >        } catch (IllegalMonitorStateException success) {}
293 >    }
294  
295      /**
296 <     * write trylock fails when readlocked
296 >     * write-lockInterruptibly is interruptible
297       */
298 <    public void testWriteTryLockWhenReadLocked() {
299 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
300 <        lock.readLock().lock();
301 <        Thread t = new Thread(new Runnable() {
302 <                public void run() {
303 <                    threadAssertFalse(lock.writeLock().tryLock());
304 <                }
305 <            });
306 <        try {
307 <            t.start();
308 <            t.join();
309 <            lock.readLock().unlock();
310 <        } catch(Exception e){
311 <            unexpectedException();
312 <        }
313 <    }
325 <
326 <    
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 >        waitForQueuedThread(lock, t);
310 >        t.interrupt();
311 >        awaitTermination(t);
312 >        releaseWriteLock(lock);
313 >    }
314  
315      /**
316 <     * write timed trylock times out if locked
317 <     */
318 <    public void testWriteTryLock_Timeout() {
319 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
320 <        lock.writeLock().lock();
321 <        Thread t = new Thread(new Runnable() {
322 <                public void run() {
323 <                    try {
324 <                        threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
325 <                    } catch (Exception ex) {
326 <                        threadUnexpectedException();
327 <                    }
328 <                }
329 <            });
330 <        try {
331 <            t.start();
332 <            t.join();
333 <            lock.writeLock().unlock();
347 <        } catch(Exception e){
348 <            unexpectedException();
349 <        }
350 <    }
316 >     * timed write-tryLock is interruptible
317 >     */
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      /**
336 <     * read timed trylock times out if write-locked
336 >     * read-lockInterruptibly is interruptible
337       */
338 <    public void testReadTryLock_Timeout() {
339 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
340 <        lock.writeLock().lock();
341 <        Thread t = new Thread(new Runnable() {
342 <                public void run() {
343 <                    try {
344 <                        threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
345 <                    } catch (Exception ex) {
346 <                        threadUnexpectedException();
347 <                    }
348 <                }
349 <            });
350 <        try {
351 <            t.start();
352 <            t.join();
353 <            lock.writeLock().unlock();
354 <        } catch(Exception e){
355 <            unexpectedException();
356 <        }
357 <    }
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 >     * timed read-tryLock is interruptible
357 >     */
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 >        releaseWriteLock(lock);
389 >    }
390 >
391 >    /**
392 >     * write-tryLock fails if locked
393 >     */
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 >        awaitTermination(t);
406 >        releaseWriteLock(lock);
407 >    }
408 >
409 >    /**
410 >     * read-tryLock fails if locked
411 >     */
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 +        awaitTermination(t);
424 +        releaseWriteLock(lock);
425 +    }
426  
427      /**
428 <     * write lockInterruptibly succeeds if lock free else is interruptible
428 >     * Multiple threads can hold a read lock when not write-locked
429       */
430 <    public void testWriteLockInterruptibly() {
431 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
432 <        try {
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 >     * A writelock succeeds only after a reading thread unlocks
451 >     */
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 >    /**
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 >     * Readlocks succeed only after a writing thread unlocks
549 >     */
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 >    }
586 >
587 >    /**
588 >     * Read trylock succeeds (barging) even in the presence of waiting
589 >     * readers and/or writers
590 >     */
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 >        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 >     * 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 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 >        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 >     * Write lock succeeds if write locked by current thread even if
701 >     * other threads are waiting for writelock
702 >     */
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 >        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()      { 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 >        awaitTermination(t);
753 >        lock.readLock().unlock();
754 >    }
755 >
756 >    /**
757 >     * write tryLock fails when readlocked
758 >     */
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 >     * write timed tryLock times out if locked
775 >     */
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 >        awaitTermination(t);
791 >        releaseWriteLock(lock);
792 >    }
793 >
794 >    /**
795 >     * read timed tryLock times out if write-locked
796 >     */
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 >        awaitTermination(t);
811 >        assertTrue(lock.writeLock().isHeldByCurrentThread());
812 >        lock.writeLock().unlock();
813 >    }
814 >
815 >    /**
816 >     * write lockInterruptibly succeeds if unlocked, else is interruptible
817 >     */
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              lock.writeLock().lockInterruptibly();
825 <        } catch(Exception e) {
826 <            unexpectedException();
386 <        }
387 <        Thread t = new Thread(new Runnable() {
388 <                public void run() {
389 <                    try {
390 <                        lock.writeLock().lockInterruptibly();
391 <                        threadShouldThrow();
392 <                    }
393 <                    catch(InterruptedException success) {
394 <                    }
395 <                }
396 <            });
397 <        try {
398 <            t.start();
399 <            t.interrupt();
400 <            t.join();
401 <            lock.writeLock().unlock();
402 <        } catch(Exception e){
403 <            unexpectedException();
825 >        } catch (InterruptedException ie) {
826 >            threadUnexpectedException(ie);
827          }
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 <     *  read lockInterruptibly succeeds if lock free else is interruptible
841 >     * read lockInterruptibly succeeds if lock free else is interruptible
842       */
843 <    public void testReadLockInterruptibly() {
844 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
845 <        try {
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 >            lock.readLock().lockInterruptibly();
850 >            lock.readLock().unlock();
851              lock.writeLock().lockInterruptibly();
852 <        } catch(Exception e) {
853 <            unexpectedException();
416 <        }
417 <        Thread t = new Thread(new Runnable() {
418 <                public void run() {
419 <                    try {
420 <                        lock.readLock().lockInterruptibly();
421 <                        threadShouldThrow();
422 <                    }
423 <                    catch(InterruptedException success) {
424 <                    }
425 <                }
426 <            });
427 <        try {
428 <            t.start();
429 <            t.interrupt();
430 <            t.join();
431 <            lock.writeLock().unlock();
432 <        } catch(Exception e){
433 <            unexpectedException();
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       * Calling await without holding lock throws IllegalMonitorStateException
868       */
869 <    public void testAwait_IllegalMonitor() {
870 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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 <        try {
875 <            c.await();
876 <            shouldThrow();
877 <        }
878 <        catch (IllegalMonitorStateException success) {
879 <        }
880 <        catch (Exception ex) {
881 <            shouldThrow();
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 signal without holding lock throws IllegalMonitorStateException
887       */
888 <    public void testSignal_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.signal();
895              shouldThrow();
896 <        }
464 <        catch (IllegalMonitorStateException success) {
465 <        }
466 <        catch (Exception ex) {
467 <            unexpectedException();
468 <        }
896 >        } catch (IllegalMonitorStateException success) {}
897      }
898  
899      /**
900 <     * awaitNanos without a signal times out
900 >     * Calling signalAll without holding lock throws IllegalMonitorStateException
901       */
902 <    public void testAwaitNanos_Timeout() {
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.signalAll();
909 +            shouldThrow();
910 +        } catch (IllegalMonitorStateException success) {}
911 +    }
912 +
913 +    /**
914 +     * awaitNanos without a signal times out
915 +     */
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) {
484 <            unexpectedException();
931 >        } catch (InterruptedException e) {
932 >            threadUnexpectedException(e);
933          }
934      }
935  
488
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 <            assertFalse(c.await(10, TimeUnit.MILLISECONDS));
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) {
501 <            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() + 10)));
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) {
518 <            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) {
996 <                        threadUnexpectedException();
997 <                    }
998 <                }
999 <            });
1000 <
1001 <        try {
1002 <            t.start();
1003 <            Thread.sleep(SHORT_DELAY_MS);
1004 <            lock.writeLock().lock();
545 <            c.signal();
546 <            lock.writeLock().unlock();
547 <            t.join(SHORT_DELAY_MS);
548 <            assertFalse(t.isAlive());
549 <        }
550 <        catch (Exception ex) {
551 <            unexpectedException();
552 <        }
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 >        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 <        Thread t = new Thread(new Runnable() {
1016 <                public void run() {
1017 <                    lock.writeLock().lock();
1018 <                    c.awaitUninterruptibly();
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 >            }});
1024 >
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/awaitNanos/awaitUntil is interruptible
1039 >     */
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 >        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 <                }
1066 <            });
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 >     * signalAll wakes up all threads
1078 >     */
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 >        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 +     * 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 +        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 +     * 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 +        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 +        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()      { 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 +        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()      { 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 +        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()      { 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 <            t.start();
1272 <            Thread.sleep(SHORT_DELAY_MS);
1273 <            t.interrupt();
573 <            lock.writeLock().lock();
574 <            c.signal();
575 <            lock.writeLock().unlock();
576 <            assert(t.isInterrupted());
577 <            t.join(SHORT_DELAY_MS);
578 <            assertFalse(t.isAlive());
579 <        }
580 <        catch (Exception ex) {
581 <            unexpectedException();
582 <        }
1271 >            lock.hasQueuedThread(null);
1272 >            shouldThrow();
1273 >        } catch (NullPointerException success) {}
1274      }
1275  
1276      /**
1277 <     * await is interruptible
1277 >     * hasQueuedThread reports whether a thread is queued
1278       */
1279 <    public void testAwait_Interrupt() {
1280 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
1281 <        final Condition c = lock.writeLock().newCondition();
1282 <        Thread t = new Thread(new Runnable() {
1283 <                public void run() {
1284 <                    try {
1285 <                        lock.writeLock().lock();
1286 <                        c.await();
1287 <                        lock.writeLock().unlock();
1288 <                        threadShouldThrow();
1289 <                    }
1290 <                    catch(InterruptedException success) {
1291 <                    }
1292 <                }
1293 <            });
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()      { 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 >        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()      { 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 >        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()      { 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) {}
1376 >    }
1377  
1378 +    /**
1379 +     * getWaitQueueLength throws NPE if null
1380 +     */
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 <            t.start();
1387 <            Thread.sleep(SHORT_DELAY_MS);
1388 <            t.interrupt();
608 <            t.join(SHORT_DELAY_MS);
609 <            assertFalse(t.isAlive());
610 <        }
611 <        catch (Exception ex) {
612 <            unexpectedException();
613 <        }
1386 >            lock.getWaitQueueLength(null);
1387 >            shouldThrow();
1388 >        } catch (NullPointerException success) {}
1389      }
1390  
1391      /**
1392 <     * awaitNanos is interruptible
1392 >     * getWaitingThreads throws NPE if null
1393       */
1394 <    public void testAwaitNanos_Interrupt() {
1395 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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) {}
1402 >    }
1403 >
1404 >    /**
1405 >     * hasWaiters throws IllegalArgumentException if not owned
1406 >     */
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 <        Thread t = new Thread(new Runnable() {
1413 <                public void run() {
1414 <                    try {
1415 <                        lock.writeLock().lock();
1416 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
1417 <                        lock.writeLock().unlock();
628 <                        threadShouldThrow();
629 <                    }
630 <                    catch(InterruptedException success) {
631 <                    }
632 <                }
633 <            });
1412 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1413 >        try {
1414 >            lock2.hasWaiters(c);
1415 >            shouldThrow();
1416 >        } catch (IllegalArgumentException success) {}
1417 >    }
1418  
1419 +    /**
1420 +     * hasWaiters throws IllegalMonitorStateException if not locked
1421 +     */
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 <            t.start();
1429 <            Thread.sleep(SHORT_DELAY_MS);
1430 <            t.interrupt();
639 <            t.join(SHORT_DELAY_MS);
640 <            assertFalse(t.isAlive());
641 <        }
642 <        catch (Exception ex) {
643 <            unexpectedException();
644 <        }
1428 >            lock.hasWaiters(c);
1429 >            shouldThrow();
1430 >        } catch (IllegalMonitorStateException success) {}
1431      }
1432  
1433      /**
1434 <     * awaitUntil is interruptible
1434 >     * getWaitQueueLength throws IllegalArgumentException if not owned
1435       */
1436 <    public void testAwaitUntil_Interrupt() {
1437 <        final ReentrantReadWriteLock lock = 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 <        Thread t = new Thread(new Runnable() {
1442 <                public void run() {
1443 <                    try {
1444 <                        lock.writeLock().lock();
1445 <                        java.util.Date d = new java.util.Date();
1446 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
659 <                        lock.writeLock().unlock();
660 <                        threadShouldThrow();
661 <                    }
662 <                    catch(InterruptedException success) {
663 <                    }
664 <                }
665 <            });
1441 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1442 >        try {
1443 >            lock2.getWaitQueueLength(c);
1444 >            shouldThrow();
1445 >        } catch (IllegalArgumentException success) {}
1446 >    }
1447  
1448 +    /**
1449 +     * getWaitQueueLength throws IllegalMonitorStateException if not locked
1450 +     */
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 <            t.start();
1458 <            Thread.sleep(SHORT_DELAY_MS);
1459 <            t.interrupt();
671 <            t.join(SHORT_DELAY_MS);
672 <            assertFalse(t.isAlive());
673 <        }
674 <        catch (Exception ex) {
675 <            unexpectedException();
676 <        }
1457 >            lock.getWaitQueueLength(c);
1458 >            shouldThrow();
1459 >        } catch (IllegalMonitorStateException success) {}
1460      }
1461  
1462      /**
1463 <     * signalAll wakes up all threads
1463 >     * getWaitingThreads throws IllegalArgumentException if not owned
1464       */
1465 <    public void testSignalAll() {
1466 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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 <        Thread t1 = new Thread(new Runnable() {
1472 <                public void run() {
1473 <                    try {
1474 <                        lock.writeLock().lock();
1475 <                        c.await();
1476 <                        lock.writeLock().unlock();
691 <                    }
692 <                    catch(InterruptedException e) {
693 <                        threadUnexpectedException();
694 <                    }
695 <                }
696 <            });
697 <
698 <        Thread t2 = new Thread(new Runnable() {
699 <                public void run() {
700 <                    try {
701 <                        lock.writeLock().lock();
702 <                        c.await();
703 <                        lock.writeLock().unlock();
704 <                    }
705 <                    catch(InterruptedException e) {
706 <                        threadUnexpectedException();
707 <                    }
708 <                }
709 <            });
710 <
711 <        try {
712 <            t1.start();
713 <            t2.start();
714 <            Thread.sleep(SHORT_DELAY_MS);
715 <            lock.writeLock().lock();
716 <            c.signalAll();
717 <            lock.writeLock().unlock();
718 <            t1.join(SHORT_DELAY_MS);
719 <            t2.join(SHORT_DELAY_MS);
720 <            assertFalse(t1.isAlive());
721 <            assertFalse(t2.isAlive());
722 <        }
723 <        catch (Exception ex) {
724 <            unexpectedException();
725 <        }
1471 >        final PublicReentrantReadWriteLock lock2 =
1472 >            new PublicReentrantReadWriteLock(fair);
1473 >        try {
1474 >            lock2.getWaitingThreads(c);
1475 >            shouldThrow();
1476 >        } catch (IllegalArgumentException success) {}
1477      }
1478  
1479      /**
1480 <     * A serialized lock deserializes as unlocked
1480 >     * getWaitingThreads throws IllegalMonitorStateException if not locked
1481       */
1482 <    public void testSerialization() {
1483 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1484 <        l.readLock().lock();
1485 <        l.readLock().unlock();
1486 <
1487 <        try {
1488 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1489 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1490 <            out.writeObject(l);
1491 <            out.close();
1492 <
1493 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1494 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1495 <            ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1496 <            r.readLock().lock();
1497 <            r.readLock().unlock();
1498 <        } catch(Exception e){
1499 <            e.printStackTrace();
1500 <            unexpectedException();
1501 <        }
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) {}
1492 >    }
1493 >
1494 >    /**
1495 >     * hasWaiters returns true when a thread is waiting, else false
1496 >     */
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 >        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()      { 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 +        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 +
1558 +    /**
1559 +     * getWaitingThreads returns only and all waiting threads
1560 +     */
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 +        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 +        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()      { 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 +        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()      { 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 +        assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1641 +    }
1642 +
1643 +    /**
1644 +     * writeLock.toString indicates current lock state
1645 +     */
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 +        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