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.37 by jsr166, Sat Nov 21 10:25:05 2009 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/licenses/publicdomain
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 static java.util.concurrent.TimeUnit.MILLISECONDS;
13   import java.io.*;
14 + import java.util.*;
15  
16   public class ReentrantReadWriteLockTest extends JSR166TestCase {
17      public static void main(String[] args) {
18 <        junit.textui.TestRunner.run (suite());  
18 >        junit.textui.TestRunner.run (suite());
19      }
20      public static Test suite() {
21 <        return new TestSuite(ReentrantReadWriteLockTest.class);
21 >        return new TestSuite(ReentrantReadWriteLockTest.class);
22      }
23  
24 +    /**
25 +     * A runnable calling lockInterruptibly
26 +     */
27 +    class InterruptibleLockRunnable extends CheckedRunnable {
28 +        final ReentrantReadWriteLock lock;
29 +        InterruptibleLockRunnable(ReentrantReadWriteLock l) { lock = l; }
30 +        public void realRun() throws InterruptedException {
31 +            lock.writeLock().lockInterruptibly();
32 +        }
33 +    }
34 +
35 +
36 +    /**
37 +     * A runnable calling lockInterruptibly that expects to be
38 +     * interrupted
39 +     */
40 +    class InterruptedLockRunnable extends CheckedInterruptedRunnable {
41 +        final ReentrantReadWriteLock lock;
42 +        InterruptedLockRunnable(ReentrantReadWriteLock l) { lock = l; }
43 +        public void realRun() throws InterruptedException {
44 +            lock.writeLock().lockInterruptibly();
45 +        }
46 +    }
47 +
48 +    /**
49 +     * Subclass to expose protected methods
50 +     */
51 +    static class PublicReentrantReadWriteLock extends ReentrantReadWriteLock {
52 +        PublicReentrantReadWriteLock() { super(); }
53 +        public Collection<Thread> getQueuedThreads() {
54 +            return super.getQueuedThreads();
55 +        }
56 +        public Collection<Thread> getWaitingThreads(Condition c) {
57 +            return super.getWaitingThreads(c);
58 +        }
59 +    }
60 +
61 +    /**
62 +     * Constructor sets given fairness, and is in unlocked state
63 +     */
64 +    public void testConstructor() {
65 +        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
66 +        assertFalse(rl.isFair());
67 +        assertFalse(rl.isWriteLocked());
68 +        assertEquals(0, rl.getReadLockCount());
69 +        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
70 +        assertTrue(r2.isFair());
71 +        assertFalse(r2.isWriteLocked());
72 +        assertEquals(0, r2.getReadLockCount());
73 +        ReentrantReadWriteLock r3 = new ReentrantReadWriteLock(false);
74 +        assertFalse(r3.isFair());
75 +        assertFalse(r3.isWriteLocked());
76 +        assertEquals(0, r3.getReadLockCount());
77 +    }
78  
79 <    /*
79 >    /**
80       * write-locking and read-locking an unlocked lock succeed
81       */
82 <    public void testLock() {
83 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
82 >    public void testLock() {
83 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
84          rl.writeLock().lock();
85 +        assertTrue(rl.isWriteLocked());
86 +        assertTrue(rl.isWriteLockedByCurrentThread());
87 +        assertTrue(rl.writeLock().isHeldByCurrentThread());
88 +        assertEquals(0, rl.getReadLockCount());
89          rl.writeLock().unlock();
90 +        assertFalse(rl.isWriteLocked());
91 +        assertFalse(rl.isWriteLockedByCurrentThread());
92 +        assertFalse(rl.writeLock().isHeldByCurrentThread());
93 +        assertEquals(0, rl.getReadLockCount());
94          rl.readLock().lock();
95 +        assertFalse(rl.isWriteLocked());
96 +        assertFalse(rl.isWriteLockedByCurrentThread());
97 +        assertEquals(1, rl.getReadLockCount());
98          rl.readLock().unlock();
99 +        assertFalse(rl.isWriteLocked());
100 +        assertFalse(rl.isWriteLockedByCurrentThread());
101 +        assertEquals(0, rl.getReadLockCount());
102      }
103  
104  
105 <    /*
105 >    /**
106       * locking an unlocked fair lock succeeds
107       */
108 <    public void testFairLock() {
109 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
108 >    public void testFairLock() {
109 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
110          rl.writeLock().lock();
111 +        assertTrue(rl.isWriteLocked());
112 +        assertTrue(rl.isWriteLockedByCurrentThread());
113 +        assertTrue(rl.writeLock().isHeldByCurrentThread());
114 +        assertEquals(0, rl.getReadLockCount());
115          rl.writeLock().unlock();
116 +        assertFalse(rl.isWriteLocked());
117 +        assertFalse(rl.isWriteLockedByCurrentThread());
118 +        assertFalse(rl.writeLock().isHeldByCurrentThread());
119 +        assertEquals(0, rl.getReadLockCount());
120          rl.readLock().lock();
121 +        assertFalse(rl.isWriteLocked());
122 +        assertFalse(rl.isWriteLockedByCurrentThread());
123 +        assertEquals(1, rl.getReadLockCount());
124          rl.readLock().unlock();
125 +        assertFalse(rl.isWriteLocked());
126 +        assertFalse(rl.isWriteLockedByCurrentThread());
127 +        assertEquals(0, rl.getReadLockCount());
128      }
129  
130      /**
131 <     * write-unlocking an unlocked lock throws IllegalMonitorStateException
131 >     * getWriteHoldCount returns number of recursive holds
132       */
133 <    public void testUnlock_IllegalMonitorStateException() {
134 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
135 <        try {
136 <            rl.writeLock().unlock();
137 <            shouldThrow();
138 <        } catch(IllegalMonitorStateException success){}
133 >    public void testGetWriteHoldCount() {
134 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
135 >        for (int i = 1; i <= SIZE; i++) {
136 >            lock.writeLock().lock();
137 >            assertEquals(i,lock.getWriteHoldCount());
138 >        }
139 >        for (int i = SIZE; i > 0; i--) {
140 >            lock.writeLock().unlock();
141 >            assertEquals(i-1,lock.getWriteHoldCount());
142 >        }
143      }
144  
56
145      /**
146 <     * write-lockInterruptibly is interruptible
146 >     * WriteLock.getHoldCount returns number of recursive holds
147       */
148 <    public void testWriteLockInterruptibly_Interrupted() {
149 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
150 <        lock.writeLock().lock();
151 <        Thread t = new Thread(new Runnable() {
152 <                public void run() {
153 <                    try {
154 <                        lock.writeLock().lockInterruptibly();
67 <                        threadShouldThrow();
68 <                    } catch(InterruptedException success){}
69 <                }
70 <            });
71 <        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();
148 >    public void testGetHoldCount() {
149 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
150 >        for (int i = 1; i <= SIZE; i++) {
151 >            lock.writeLock().lock();
152 >            assertEquals(i,lock.writeLock().getHoldCount());
153 >        }
154 >        for (int i = SIZE; i > 0; i--) {
155              lock.writeLock().unlock();
156 <            t.join();
100 <        } catch(Exception e){
101 <            unexpectedException();
156 >            assertEquals(i-1,lock.writeLock().getHoldCount());
157          }
158      }
159  
160      /**
161 <     * read-lockInterruptibly is interruptible
161 >     * getReadHoldCount returns number of recursive holds
162       */
163 <    public void testReadLockInterruptibly_Interrupted() {
164 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
165 <        lock.writeLock().lock();
166 <        Thread t = new Thread(new Runnable() {
167 <                public void run() {
168 <                    try {
169 <                        lock.readLock().lockInterruptibly();
170 <                        threadShouldThrow();
171 <                    } catch(InterruptedException success){}
117 <                }
118 <            });
119 <        try {
120 <            t.start();
121 <            t.interrupt();
122 <            lock.writeLock().unlock();
123 <            t.join();
124 <        } catch(Exception e){
125 <            unexpectedException();
126 <        }
127 <    }
128 <
129 <    /**
130 <     * timed read-trylock is interruptible
131 <     */
132 <    public void testReadTryLock_Interrupted() {
133 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
134 <        lock.writeLock().lock();
135 <        Thread t = new Thread(new Runnable() {
136 <                public void run() {
137 <                    try {
138 <                        lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
139 <                        threadShouldThrow();
140 <                    } catch(InterruptedException success){}
141 <                }
142 <            });
143 <        try {
144 <            t.start();
145 <            t.interrupt();
146 <            t.join();
147 <        } catch(Exception e){
148 <            unexpectedException();
163 >    public void testGetReadHoldCount() {
164 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
165 >        for (int i = 1; i <= SIZE; i++) {
166 >            lock.readLock().lock();
167 >            assertEquals(i,lock.getReadHoldCount());
168 >        }
169 >        for (int i = SIZE; i > 0; i--) {
170 >            lock.readLock().unlock();
171 >            assertEquals(i-1,lock.getReadHoldCount());
172          }
173      }
174  
152    
153    /**
154     * write-trylock fails if locked
155     */
156    public void testWriteTryLockWhenLocked() {
157        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
158        lock.writeLock().lock();
159        Thread t = new Thread(new Runnable() {
160                public void run() {
161                    threadAssertFalse(lock.writeLock().tryLock());
162                }
163            });
164        try {
165            t.start();
166            t.join();
167            lock.writeLock().unlock();
168        } catch(Exception e){
169            unexpectedException();
170        }
171    }
175  
176      /**
177 <     * read-trylock fails if locked
177 >     * write-unlocking an unlocked lock throws IllegalMonitorStateException
178       */
179 <    public void testReadTryLockWhenLocked() {
180 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
178 <        lock.writeLock().lock();
179 <        Thread t = new Thread(new Runnable() {
180 <                public void run() {
181 <                    threadAssertFalse(lock.readLock().tryLock());
182 <                }
183 <            });
179 >    public void testUnlock_IllegalMonitorStateException() {
180 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
181          try {
182 <            t.start();
183 <            t.join();
184 <            lock.writeLock().unlock();
185 <        } catch(Exception e){
186 <            unexpectedException();
190 <        }
191 <    }
182 >            rl.writeLock().unlock();
183 >            shouldThrow();
184 >        } catch (IllegalMonitorStateException success) {}
185 >    }
186 >
187  
188      /**
189 <     * Multiple threads can hold a read lock when not write-locked
189 >     * write-lockInterruptibly is interruptible
190       */
191 <    public void testMultipleReadLocks() {
192 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
193 <        lock.readLock().lock();
194 <        Thread t = new Thread(new Runnable() {
195 <                public void run() {
196 <                    threadAssertTrue(lock.readLock().tryLock());
197 <                    lock.readLock().unlock();
198 <                }
199 <            });
200 <        try {
201 <            t.start();
202 <            t.join();
203 <            lock.readLock().unlock();
204 <        } catch(Exception e){
205 <            unexpectedException();
206 <        }
207 <    }
191 >    public void testWriteLockInterruptibly_Interrupted() throws Exception {
192 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
193 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
194 >            public void realRun() throws InterruptedException {
195 >                lock.writeLock().lockInterruptibly();
196 >                lock.writeLock().unlock();
197 >                lock.writeLock().lockInterruptibly();
198 >                lock.writeLock().unlock();
199 >            }});
200 >
201 >        lock.writeLock().lock();
202 >        t.start();
203 >        Thread.sleep(SHORT_DELAY_MS);
204 >        t.interrupt();
205 >        Thread.sleep(SHORT_DELAY_MS);
206 >        lock.writeLock().unlock();
207 >        t.join();
208 >    }
209  
210      /**
211 <     * A writelock succeeds after reading threads unlock
211 >     * timed write-tryLock is interruptible
212 >     */
213 >    public void testWriteTryLock_Interrupted() throws InterruptedException {
214 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
215 >        lock.writeLock().lock();
216 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
217 >            public void realRun() throws InterruptedException {
218 >                lock.writeLock().tryLock(1000,MILLISECONDS);
219 >            }});
220 >
221 >        t.start();
222 >        t.interrupt();
223 >        lock.writeLock().unlock();
224 >        t.join();
225 >    }
226 >
227 >    /**
228 >     * read-lockInterruptibly is interruptible
229       */
230 <    public void testWriteAfterMultipleReadLocks() {
231 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
232 <        lock.readLock().lock();
233 <        Thread t1 = new Thread(new Runnable() {
234 <                public void run() {
235 <                    lock.readLock().lock();
236 <                    lock.readLock().unlock();
237 <                }
238 <            });
239 <        Thread t2 = new Thread(new Runnable() {
240 <                public void run() {
241 <                    lock.writeLock().lock();
242 <                    lock.writeLock().unlock();
243 <                }
244 <            });
232 <
233 <        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 <    }
230 >    public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
231 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
232 >        lock.writeLock().lock();
233 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
234 >            public void realRun() throws InterruptedException {
235 >                lock.readLock().lockInterruptibly();
236 >            }});
237 >
238 >        t.start();
239 >        Thread.sleep(SHORT_DELAY_MS);
240 >        t.interrupt();
241 >        Thread.sleep(SHORT_DELAY_MS);
242 >        lock.writeLock().unlock();
243 >        t.join();
244 >    }
245  
246      /**
247 <     * Readlocks succeed after a writing thread unlocks
247 >     * timed read-tryLock is interruptible
248       */
249 <    public void testReadAfterWriteLock() {
250 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
251 <        lock.writeLock().lock();
252 <        Thread t1 = new Thread(new Runnable() {
253 <                public void run() {
254 <                    lock.readLock().lock();
255 <                    lock.readLock().unlock();
256 <                }
257 <            });
258 <        Thread t2 = new Thread(new Runnable() {
259 <                public void run() {
260 <                    lock.readLock().lock();
263 <                    lock.readLock().unlock();
264 <                }
265 <            });
266 <
267 <        try {
268 <            t1.start();
269 <            t2.start();
270 <            Thread.sleep(SHORT_DELAY_MS);
271 <            lock.writeLock().unlock();
272 <            t1.join(MEDIUM_DELAY_MS);
273 <            t2.join(MEDIUM_DELAY_MS);
274 <            assertTrue(!t1.isAlive());
275 <            assertTrue(!t2.isAlive());
276 <          
277 <        } catch(Exception e){
278 <            unexpectedException();
279 <        }
280 <    }
249 >    public void testReadTryLock_Interrupted() throws InterruptedException {
250 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
251 >        lock.writeLock().lock();
252 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
253 >            public void realRun() throws InterruptedException {
254 >                lock.readLock().tryLock(1000,MILLISECONDS);
255 >            }});
256 >
257 >        t.start();
258 >        t.interrupt();
259 >        t.join();
260 >    }
261  
262  
263      /**
264 <     * Read trylock succeeds if readlocked but not writelocked
265 <     */
266 <    public void testTryLockWhenReadLocked() {
267 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
268 <        lock.readLock().lock();
269 <        Thread t = new Thread(new Runnable() {
270 <                public void run() {
271 <                    threadAssertTrue(lock.readLock().tryLock());
272 <                    lock.readLock().unlock();
293 <                }
294 <            });
295 <        try {
296 <            t.start();
297 <            t.join();
298 <            lock.readLock().unlock();
299 <        } catch(Exception e){
300 <            unexpectedException();
301 <        }
302 <    }
264 >     * write-tryLock fails if locked
265 >     */
266 >    public void testWriteTryLockWhenLocked() throws InterruptedException {
267 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
268 >        lock.writeLock().lock();
269 >        Thread t = new Thread(new CheckedRunnable() {
270 >            public void realRun() {
271 >                threadAssertFalse(lock.writeLock().tryLock());
272 >            }});
273  
274 <    
274 >        t.start();
275 >        t.join();
276 >        lock.writeLock().unlock();
277 >    }
278  
279      /**
280 <     * write trylock fails when readlocked
280 >     * read-tryLock fails if locked
281       */
282 <    public void testWriteTryLockWhenReadLocked() {
283 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
284 <        lock.readLock().lock();
285 <        Thread t = new Thread(new Runnable() {
286 <                public void run() {
287 <                    threadAssertFalse(lock.writeLock().tryLock());
288 <                }
316 <            });
317 <        try {
318 <            t.start();
319 <            t.join();
320 <            lock.readLock().unlock();
321 <        } catch(Exception e){
322 <            unexpectedException();
323 <        }
324 <    }
282 >    public void testReadTryLockWhenLocked() throws InterruptedException {
283 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
284 >        lock.writeLock().lock();
285 >        Thread t = new Thread(new CheckedRunnable() {
286 >            public void realRun() {
287 >                threadAssertFalse(lock.readLock().tryLock());
288 >            }});
289  
290 <    
290 >        t.start();
291 >        t.join();
292 >        lock.writeLock().unlock();
293 >    }
294  
295      /**
296 <     * write timed trylock times out if locked
297 <     */
298 <    public void testWriteTryLock_Timeout() {
299 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
300 <        lock.writeLock().lock();
301 <        Thread t = new Thread(new Runnable() {
302 <                public void run() {
303 <                    try {
304 <                        threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
305 <                    } catch (Exception ex) {
306 <                        threadUnexpectedException();
307 <                    }
308 <                }
309 <            });
310 <        try {
344 <            t.start();
345 <            t.join();
346 <            lock.writeLock().unlock();
347 <        } catch(Exception e){
348 <            unexpectedException();
349 <        }
350 <    }
296 >     * Multiple threads can hold a read lock when not write-locked
297 >     */
298 >    public void testMultipleReadLocks() throws InterruptedException {
299 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
300 >        lock.readLock().lock();
301 >        Thread t = new Thread(new CheckedRunnable() {
302 >            public void realRun() {
303 >                threadAssertTrue(lock.readLock().tryLock());
304 >                lock.readLock().unlock();
305 >            }});
306 >
307 >        t.start();
308 >        t.join();
309 >        lock.readLock().unlock();
310 >    }
311  
312      /**
313 <     * read timed trylock times out if write-locked
313 >     * A writelock succeeds after reading threads unlock
314       */
315 <    public void testReadTryLock_Timeout() {
316 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
317 <        lock.writeLock().lock();
318 <        Thread t = new Thread(new Runnable() {
319 <                public void run() {
320 <                    try {
321 <                        threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
322 <                    } catch (Exception ex) {
323 <                        threadUnexpectedException();
324 <                    }
325 <                }
326 <            });
327 <        try {
328 <            t.start();
329 <            t.join();
330 <            lock.writeLock().unlock();
331 <        } catch(Exception e){
332 <            unexpectedException();
333 <        }
334 <    }
315 >    public void testWriteAfterMultipleReadLocks() throws InterruptedException {
316 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
317 >        lock.readLock().lock();
318 >        Thread t1 = new Thread(new CheckedRunnable() {
319 >            public void realRun() {
320 >                lock.readLock().lock();
321 >                lock.readLock().unlock();
322 >            }});
323 >        Thread t2 = new Thread(new CheckedRunnable() {
324 >            public void realRun() {
325 >                lock.writeLock().lock();
326 >                lock.writeLock().unlock();
327 >            }});
328 >
329 >        t1.start();
330 >        t2.start();
331 >        Thread.sleep(SHORT_DELAY_MS);
332 >        lock.readLock().unlock();
333 >        t1.join(MEDIUM_DELAY_MS);
334 >        t2.join(MEDIUM_DELAY_MS);
335 >        assertTrue(!t1.isAlive());
336 >        assertTrue(!t2.isAlive());
337 >    }
338 >
339 >    /**
340 >     * Readlocks succeed after a writing thread unlocks
341 >     */
342 >    public void testReadAfterWriteLock() throws InterruptedException {
343 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
344 >        lock.writeLock().lock();
345 >        Thread t1 = new Thread(new CheckedRunnable() {
346 >            public void realRun() {
347 >                lock.readLock().lock();
348 >                lock.readLock().unlock();
349 >            }});
350 >        Thread t2 = new Thread(new CheckedRunnable() {
351 >            public void realRun() {
352 >                lock.readLock().lock();
353 >                lock.readLock().unlock();
354 >            }});
355 >
356 >        t1.start();
357 >        t2.start();
358 >        Thread.sleep(SHORT_DELAY_MS);
359 >        lock.writeLock().unlock();
360 >        t1.join(MEDIUM_DELAY_MS);
361 >        t2.join(MEDIUM_DELAY_MS);
362 >        assertTrue(!t1.isAlive());
363 >        assertTrue(!t2.isAlive());
364 >    }
365 >
366 >    /**
367 >     * Read trylock succeeds if write locked by current thread
368 >     */
369 >    public void testReadHoldingWriteLock() {
370 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
371 >        lock.writeLock().lock();
372 >        assertTrue(lock.readLock().tryLock());
373 >        lock.readLock().unlock();
374 >        lock.writeLock().unlock();
375 >    }
376 >
377 >    /**
378 >     * Read lock succeeds if write locked by current thread even if
379 >     * other threads are waiting for readlock
380 >     */
381 >    public void testReadHoldingWriteLock2() throws InterruptedException {
382 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
383 >        lock.writeLock().lock();
384 >        Thread t1 = new Thread(new CheckedRunnable() {
385 >            public void realRun() {
386 >                lock.readLock().lock();
387 >                lock.readLock().unlock();
388 >            }});
389 >        Thread t2 = new Thread(new CheckedRunnable() {
390 >            public void realRun() {
391 >                lock.readLock().lock();
392 >                lock.readLock().unlock();
393 >            }});
394 >
395 >        t1.start();
396 >        t2.start();
397 >        lock.readLock().lock();
398 >        lock.readLock().unlock();
399 >        Thread.sleep(SHORT_DELAY_MS);
400 >        lock.readLock().lock();
401 >        lock.readLock().unlock();
402 >        lock.writeLock().unlock();
403 >        t1.join(MEDIUM_DELAY_MS);
404 >        t2.join(MEDIUM_DELAY_MS);
405 >        assertTrue(!t1.isAlive());
406 >        assertTrue(!t2.isAlive());
407 >    }
408 >
409 >    /**
410 >     *  Read lock succeeds if write locked by current thread even if
411 >     * other threads are waiting for writelock
412 >     */
413 >    public void testReadHoldingWriteLock3() throws InterruptedException {
414 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
415 >        lock.writeLock().lock();
416 >        Thread t1 = new Thread(new CheckedRunnable() {
417 >            public void realRun() {
418 >                lock.writeLock().lock();
419 >                lock.writeLock().unlock();
420 >            }});
421 >        Thread t2 = new Thread(new CheckedRunnable() {
422 >            public void realRun() {
423 >                lock.writeLock().lock();
424 >                lock.writeLock().unlock();
425 >            }});
426 >
427 >        t1.start();
428 >        t2.start();
429 >        lock.readLock().lock();
430 >        lock.readLock().unlock();
431 >        Thread.sleep(SHORT_DELAY_MS);
432 >        lock.readLock().lock();
433 >        lock.readLock().unlock();
434 >        lock.writeLock().unlock();
435 >        t1.join(MEDIUM_DELAY_MS);
436 >        t2.join(MEDIUM_DELAY_MS);
437 >        assertTrue(!t1.isAlive());
438 >        assertTrue(!t2.isAlive());
439 >    }
440 >
441 >
442 >    /**
443 >     *  Write lock succeeds if write locked by current thread even if
444 >     * other threads are waiting for writelock
445 >     */
446 >    public void testWriteHoldingWriteLock4() throws InterruptedException {
447 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
448 >        lock.writeLock().lock();
449 >        Thread t1 = new Thread(new CheckedRunnable() {
450 >            public void realRun() {
451 >                lock.writeLock().lock();
452 >                lock.writeLock().unlock();
453 >            }});
454 >        Thread t2 = new Thread(new CheckedRunnable() {
455 >            public void realRun() {
456 >                lock.writeLock().lock();
457 >                lock.writeLock().unlock();
458 >            }});
459 >
460 >        t1.start();
461 >        t2.start();
462 >        lock.writeLock().lock();
463 >        lock.writeLock().unlock();
464 >        Thread.sleep(SHORT_DELAY_MS);
465 >        lock.writeLock().lock();
466 >        lock.writeLock().unlock();
467 >        lock.writeLock().unlock();
468 >        t1.join(MEDIUM_DELAY_MS);
469 >        t2.join(MEDIUM_DELAY_MS);
470 >        assertTrue(!t1.isAlive());
471 >        assertTrue(!t2.isAlive());
472 >    }
473 >
474 >
475 >    /**
476 >     * Fair Read trylock succeeds if write locked by current thread
477 >     */
478 >    public void testReadHoldingWriteLockFair() {
479 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
480 >        lock.writeLock().lock();
481 >        assertTrue(lock.readLock().tryLock());
482 >        lock.readLock().unlock();
483 >        lock.writeLock().unlock();
484 >    }
485 >
486 >    /**
487 >     * Fair Read lock succeeds if write locked by current thread even if
488 >     * other threads are waiting for readlock
489 >     */
490 >    public void testReadHoldingWriteLockFair2() throws InterruptedException {
491 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
492 >        lock.writeLock().lock();
493 >        Thread t1 = new Thread(new CheckedRunnable() {
494 >            public void realRun() {
495 >                lock.readLock().lock();
496 >                lock.readLock().unlock();
497 >            }});
498 >        Thread t2 = new Thread(new CheckedRunnable() {
499 >            public void realRun() {
500 >                lock.readLock().lock();
501 >                lock.readLock().unlock();
502 >            }});
503 >
504 >        t1.start();
505 >        t2.start();
506 >        lock.readLock().lock();
507 >        lock.readLock().unlock();
508 >        Thread.sleep(SHORT_DELAY_MS);
509 >        lock.readLock().lock();
510 >        lock.readLock().unlock();
511 >        lock.writeLock().unlock();
512 >        t1.join(MEDIUM_DELAY_MS);
513 >        t2.join(MEDIUM_DELAY_MS);
514 >        assertTrue(!t1.isAlive());
515 >        assertTrue(!t2.isAlive());
516 >    }
517 >
518 >
519 >    /**
520 >     * Fair Read lock succeeds if write locked by current thread even if
521 >     * other threads are waiting for writelock
522 >     */
523 >    public void testReadHoldingWriteLockFair3() throws InterruptedException {
524 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
525 >        lock.writeLock().lock();
526 >        Thread t1 = new Thread(new CheckedRunnable() {
527 >            public void realRun() {
528 >                lock.writeLock().lock();
529 >                lock.writeLock().unlock();
530 >            }});
531 >        Thread t2 = new Thread(new CheckedRunnable() {
532 >            public void realRun() {
533 >                lock.writeLock().lock();
534 >                lock.writeLock().unlock();
535 >            }});
536 >
537 >        t1.start();
538 >        t2.start();
539 >        lock.readLock().lock();
540 >        lock.readLock().unlock();
541 >        Thread.sleep(SHORT_DELAY_MS);
542 >        lock.readLock().lock();
543 >        lock.readLock().unlock();
544 >        lock.writeLock().unlock();
545 >        t1.join(MEDIUM_DELAY_MS);
546 >        t2.join(MEDIUM_DELAY_MS);
547 >        assertTrue(!t1.isAlive());
548 >        assertTrue(!t2.isAlive());
549 >    }
550 >
551 >
552 >    /**
553 >     * Fair Write lock succeeds if write locked by current thread even if
554 >     * other threads are waiting for writelock
555 >     */
556 >    public void testWriteHoldingWriteLockFair4() throws InterruptedException {
557 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
558 >        lock.writeLock().lock();
559 >        Thread t1 = new Thread(new CheckedRunnable() {
560 >            public void realRun() {
561 >                lock.writeLock().lock();
562 >                lock.writeLock().unlock();
563 >            }});
564 >        Thread t2 = new Thread(new CheckedRunnable() {
565 >            public void realRun() {
566 >                lock.writeLock().lock();
567 >                lock.writeLock().unlock();
568 >            }});
569 >
570 >        t1.start();
571 >        t2.start();
572 >        Thread.sleep(SHORT_DELAY_MS);
573 >        assertTrue(lock.isWriteLockedByCurrentThread());
574 >        assertTrue(lock.getWriteHoldCount() == 1);
575 >        lock.writeLock().lock();
576 >        assertTrue(lock.getWriteHoldCount() == 2);
577 >        lock.writeLock().unlock();
578 >        lock.writeLock().lock();
579 >        lock.writeLock().unlock();
580 >        lock.writeLock().unlock();
581 >        t1.join(MEDIUM_DELAY_MS);
582 >        t2.join(MEDIUM_DELAY_MS);
583 >        assertTrue(!t1.isAlive());
584 >        assertTrue(!t2.isAlive());
585 >    }
586 >
587 >
588 >    /**
589 >     * Read tryLock succeeds if readlocked but not writelocked
590 >     */
591 >    public void testTryLockWhenReadLocked() throws InterruptedException {
592 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
593 >        lock.readLock().lock();
594 >        Thread t = new Thread(new CheckedRunnable() {
595 >            public void realRun() {
596 >                threadAssertTrue(lock.readLock().tryLock());
597 >                lock.readLock().unlock();
598 >            }});
599 >
600 >        t.start();
601 >        t.join();
602 >        lock.readLock().unlock();
603 >    }
604 >
605 >
606 >
607 >    /**
608 >     * write tryLock fails when readlocked
609 >     */
610 >    public void testWriteTryLockWhenReadLocked() throws InterruptedException {
611 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
612 >        lock.readLock().lock();
613 >        Thread t = new Thread(new CheckedRunnable() {
614 >            public void realRun() {
615 >                threadAssertFalse(lock.writeLock().tryLock());
616 >            }});
617 >
618 >        t.start();
619 >        t.join();
620 >        lock.readLock().unlock();
621 >    }
622 >
623 >
624 >    /**
625 >     * Fair Read tryLock succeeds if readlocked but not writelocked
626 >     */
627 >    public void testTryLockWhenReadLockedFair() throws InterruptedException {
628 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
629 >        lock.readLock().lock();
630 >        Thread t = new Thread(new CheckedRunnable() {
631 >            public void realRun() {
632 >                threadAssertTrue(lock.readLock().tryLock());
633 >                lock.readLock().unlock();
634 >            }});
635 >
636 >        t.start();
637 >        t.join();
638 >        lock.readLock().unlock();
639 >    }
640 >
641 >
642 >
643 >    /**
644 >     * Fair write tryLock fails when readlocked
645 >     */
646 >    public void testWriteTryLockWhenReadLockedFair() throws InterruptedException {
647 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
648 >        lock.readLock().lock();
649 >        Thread t = new Thread(new CheckedRunnable() {
650 >            public void realRun() {
651 >                threadAssertFalse(lock.writeLock().tryLock());
652 >            }});
653 >
654 >        t.start();
655 >        t.join();
656 >        lock.readLock().unlock();
657 >    }
658 >
659 >
660 >
661 >    /**
662 >     * write timed tryLock times out if locked
663 >     */
664 >    public void testWriteTryLock_Timeout() throws InterruptedException {
665 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
666 >        lock.writeLock().lock();
667 >        Thread t = new Thread(new CheckedRunnable() {
668 >            public void realRun() throws InterruptedException {
669 >                threadAssertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
670 >            }});
671 >
672 >        t.start();
673 >        t.join();
674 >        assertTrue(lock.writeLock().isHeldByCurrentThread());
675 >        lock.writeLock().unlock();
676 >    }
677 >
678 >    /**
679 >     * read timed tryLock times out if write-locked
680 >     */
681 >    public void testReadTryLock_Timeout() throws InterruptedException {
682 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
683 >        lock.writeLock().lock();
684 >        Thread t = new Thread(new CheckedRunnable() {
685 >            public void realRun() throws InterruptedException {
686 >                threadAssertFalse(lock.readLock().tryLock(1, MILLISECONDS));
687 >            }});
688 >
689 >        t.start();
690 >        t.join();
691 >        assertTrue(lock.writeLock().isHeldByCurrentThread());
692 >        lock.writeLock().unlock();
693 >    }
694  
695  
696      /**
697       * write lockInterruptibly succeeds if lock free else is interruptible
698       */
699 <    public void testWriteLockInterruptibly() {
700 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
701 <        try {
702 <            lock.writeLock().lockInterruptibly();
703 <        } catch(Exception e) {
704 <            unexpectedException();
705 <        }
706 <        Thread t = new Thread(new Runnable() {
707 <                public void run() {
708 <                    try {
709 <                        lock.writeLock().lockInterruptibly();
710 <                        threadShouldThrow();
711 <                    }
712 <                    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();
404 <        }
699 >    public void testWriteLockInterruptibly() throws InterruptedException {
700 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
701 >        lock.writeLock().lockInterruptibly();
702 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
703 >            public void realRun() throws InterruptedException {
704 >                lock.writeLock().lockInterruptibly();
705 >            }});
706 >
707 >        t.start();
708 >        Thread.sleep(SHORT_DELAY_MS);
709 >        t.interrupt();
710 >        Thread.sleep(SHORT_DELAY_MS);
711 >        t.join();
712 >        lock.writeLock().unlock();
713      }
714  
715      /**
716       *  read lockInterruptibly succeeds if lock free else is interruptible
717       */
718 <    public void testReadLockInterruptibly() {
719 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
720 <        try {
721 <            lock.writeLock().lockInterruptibly();
722 <        } catch(Exception e) {
723 <            unexpectedException();
724 <        }
725 <        Thread t = new Thread(new Runnable() {
726 <                public void run() {
727 <                    try {
728 <                        lock.readLock().lockInterruptibly();
729 <                        threadShouldThrow();
730 <                    }
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();
434 <        }
718 >    public void testReadLockInterruptibly() throws InterruptedException {
719 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
720 >        lock.writeLock().lockInterruptibly();
721 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
722 >            public void realRun() throws InterruptedException {
723 >                lock.readLock().lockInterruptibly();
724 >            }});
725 >
726 >        t.start();
727 >        Thread.sleep(SHORT_DELAY_MS);
728 >        t.interrupt();
729 >        t.join();
730 >        lock.writeLock().unlock();
731      }
732  
733      /**
734       * Calling await without holding lock throws IllegalMonitorStateException
735       */
736 <    public void testAwait_IllegalMonitor() {
737 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
736 >    public void testAwait_IllegalMonitor() throws InterruptedException {
737 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
738          final Condition c = lock.writeLock().newCondition();
739          try {
740              c.await();
741              shouldThrow();
742 <        }
447 <        catch (IllegalMonitorStateException success) {
448 <        }
449 <        catch (Exception ex) {
450 <            shouldThrow();
451 <        }
742 >        } catch (IllegalMonitorStateException success) {}
743      }
744  
745      /**
746       * Calling signal without holding lock throws IllegalMonitorStateException
747       */
748      public void testSignal_IllegalMonitor() {
749 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
749 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
750          final Condition c = lock.writeLock().newCondition();
751          try {
752              c.signal();
753              shouldThrow();
754 <        }
464 <        catch (IllegalMonitorStateException success) {
465 <        }
466 <        catch (Exception ex) {
467 <            unexpectedException();
468 <        }
754 >        } catch (IllegalMonitorStateException success) {}
755      }
756  
757      /**
758       * awaitNanos without a signal times out
759       */
760 <    public void testAwaitNanos_Timeout() {
761 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
760 >    public void testAwaitNanos_Timeout() throws InterruptedException {
761 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
762          final Condition c = lock.writeLock().newCondition();
763 <        try {
764 <            lock.writeLock().lock();
765 <            long t = c.awaitNanos(100);
766 <            assertTrue(t <= 0);
767 <            lock.writeLock().unlock();
482 <        }
483 <        catch (Exception ex) {
484 <            unexpectedException();
485 <        }
763 >
764 >        lock.writeLock().lock();
765 >        long t = c.awaitNanos(100);
766 >        assertTrue(t <= 0);
767 >        lock.writeLock().unlock();
768      }
769  
770  
771      /**
772       *  timed await without a signal times out
773       */
774 <    public void testAwait_Timeout() {
775 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
774 >    public void testAwait_Timeout() throws InterruptedException {
775 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
776          final Condition c = lock.writeLock().newCondition();
777 <        try {
778 <            lock.writeLock().lock();
779 <            assertFalse(c.await(10, TimeUnit.MILLISECONDS));
498 <            lock.writeLock().unlock();
499 <        }
500 <        catch (Exception ex) {
501 <            unexpectedException();
502 <        }
777 >        lock.writeLock().lock();
778 >        assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
779 >        lock.writeLock().unlock();
780      }
781  
782      /**
783       * awaitUntil without a signal times out
784       */
785 <    public void testAwaitUntil_Timeout() {
786 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
785 >    public void testAwaitUntil_Timeout() throws InterruptedException {
786 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
787          final Condition c = lock.writeLock().newCondition();
788 <        try {
789 <            lock.writeLock().lock();
790 <            java.util.Date d = new java.util.Date();
791 <            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
515 <            lock.writeLock().unlock();
516 <        }
517 <        catch (Exception ex) {
518 <            unexpectedException();
519 <        }
788 >        lock.writeLock().lock();
789 >        java.util.Date d = new java.util.Date();
790 >        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
791 >        lock.writeLock().unlock();
792      }
793  
794      /**
795       * await returns when signalled
796       */
797 <    public void testAwait() {
798 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
797 >    public void testAwait() throws InterruptedException {
798 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
799          final Condition c = lock.writeLock().newCondition();
800 <        Thread t = new Thread(new Runnable() {
801 <                public void run() {
802 <                    try {
803 <                        lock.writeLock().lock();
804 <                        c.await();
805 <                        lock.writeLock().unlock();
806 <                    }
807 <                    catch(InterruptedException e) {
808 <                        threadUnexpectedException();
809 <                    }
810 <                }
811 <            });
800 >        Thread t = new Thread(new CheckedRunnable() {
801 >            public void realRun() throws InterruptedException {
802 >                lock.writeLock().lock();
803 >                c.await();
804 >                lock.writeLock().unlock();
805 >            }});
806 >
807 >        t.start();
808 >        Thread.sleep(SHORT_DELAY_MS);
809 >        lock.writeLock().lock();
810 >        c.signal();
811 >        lock.writeLock().unlock();
812 >        t.join(SHORT_DELAY_MS);
813 >        assertFalse(t.isAlive());
814 >    }
815 >
816 >    /** A helper class for uninterruptible wait tests */
817 >    class UninterruptableThread extends Thread {
818 >        private Lock lock;
819 >        private Condition c;
820 >
821 >        public volatile boolean canAwake = false;
822 >        public volatile boolean interrupted = false;
823 >        public volatile boolean lockStarted = false;
824 >
825 >        public UninterruptableThread(Lock lock, Condition c) {
826 >            this.lock = lock;
827 >            this.c = c;
828 >        }
829 >
830 >        public synchronized void run() {
831 >            lock.lock();
832 >            lockStarted = true;
833 >
834 >            while (!canAwake) {
835 >                c.awaitUninterruptibly();
836 >            }
837  
838 <        try {
839 <            t.start();
543 <            Thread.sleep(SHORT_DELAY_MS);
544 <            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();
838 >            interrupted = isInterrupted();
839 >            lock.unlock();
840          }
841      }
842  
843      /**
844       * awaitUninterruptibly doesn't abort on interrupt
845       */
846 <    public void testAwaitUninterruptibly() {
847 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
846 >    public void testAwaitUninterruptibly() throws InterruptedException {
847 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
848          final Condition c = lock.writeLock().newCondition();
849 <        Thread t = new Thread(new Runnable() {
562 <                public void run() {
563 <                    lock.writeLock().lock();
564 <                    c.awaitUninterruptibly();
565 <                    lock.writeLock().unlock();
566 <                }
567 <            });
849 >        UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
850  
851 +        thread.start();
852 +
853 +        while (!thread.lockStarted) {
854 +            Thread.sleep(100);
855 +        }
856 +
857 +        lock.writeLock().lock();
858          try {
859 <            t.start();
860 <            Thread.sleep(SHORT_DELAY_MS);
572 <            t.interrupt();
573 <            lock.writeLock().lock();
859 >            thread.interrupt();
860 >            thread.canAwake = true;
861              c.signal();
862 +        } finally {
863              lock.writeLock().unlock();
576            assert(t.isInterrupted());
577            t.join(SHORT_DELAY_MS);
578            assertFalse(t.isAlive());
579        }
580        catch (Exception ex) {
581            unexpectedException();
864          }
865 +
866 +        thread.join();
867 +        assertTrue(thread.interrupted);
868 +        assertFalse(thread.isAlive());
869      }
870  
871      /**
872       * await is interruptible
873       */
874 <    public void testAwait_Interrupt() {
875 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
874 >    public void testAwait_Interrupt() throws InterruptedException {
875 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
876          final Condition c = lock.writeLock().newCondition();
877 <        Thread t = new Thread(new Runnable() {
878 <                public void run() {
879 <                    try {
880 <                        lock.writeLock().lock();
881 <                        c.await();
882 <                        lock.writeLock().unlock();
883 <                        threadShouldThrow();
884 <                    }
885 <                    catch(InterruptedException success) {
886 <                    }
887 <                }
888 <            });
603 <
604 <        try {
605 <            t.start();
606 <            Thread.sleep(SHORT_DELAY_MS);
607 <            t.interrupt();
608 <            t.join(SHORT_DELAY_MS);
609 <            assertFalse(t.isAlive());
610 <        }
611 <        catch (Exception ex) {
612 <            unexpectedException();
613 <        }
877 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
878 >            public void realRun() throws InterruptedException {
879 >                lock.writeLock().lock();
880 >                c.await();
881 >                lock.writeLock().unlock();
882 >            }});
883 >
884 >        t.start();
885 >        Thread.sleep(SHORT_DELAY_MS);
886 >        t.interrupt();
887 >        t.join(SHORT_DELAY_MS);
888 >        assertFalse(t.isAlive());
889      }
890  
891      /**
892       * awaitNanos is interruptible
893       */
894 <    public void testAwaitNanos_Interrupt() {
895 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
894 >    public void testAwaitNanos_Interrupt() throws InterruptedException {
895 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
896          final Condition c = lock.writeLock().newCondition();
897 <        Thread t = new Thread(new Runnable() {
898 <                public void run() {
899 <                    try {
900 <                        lock.writeLock().lock();
901 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
902 <                        lock.writeLock().unlock();
903 <                        threadShouldThrow();
904 <                    }
905 <                    catch(InterruptedException success) {
906 <                    }
907 <                }
908 <            });
634 <
635 <        try {
636 <            t.start();
637 <            Thread.sleep(SHORT_DELAY_MS);
638 <            t.interrupt();
639 <            t.join(SHORT_DELAY_MS);
640 <            assertFalse(t.isAlive());
641 <        }
642 <        catch (Exception ex) {
643 <            unexpectedException();
644 <        }
897 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
898 >            public void realRun() throws InterruptedException {
899 >                lock.writeLock().lock();
900 >                c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
901 >                lock.writeLock().unlock();
902 >            }});
903 >
904 >        t.start();
905 >        Thread.sleep(SHORT_DELAY_MS);
906 >        t.interrupt();
907 >        t.join(SHORT_DELAY_MS);
908 >        assertFalse(t.isAlive());
909      }
910  
911      /**
912       * awaitUntil is interruptible
913       */
914 <    public void testAwaitUntil_Interrupt() {
915 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
914 >    public void testAwaitUntil_Interrupt() throws InterruptedException {
915 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
916          final Condition c = lock.writeLock().newCondition();
917 <        Thread t = new Thread(new Runnable() {
918 <                public void run() {
919 <                    try {
920 <                        lock.writeLock().lock();
921 <                        java.util.Date d = new java.util.Date();
922 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
923 <                        lock.writeLock().unlock();
924 <                        threadShouldThrow();
925 <                    }
926 <                    catch(InterruptedException success) {
927 <                    }
928 <                }
929 <            });
666 <
667 <        try {
668 <            t.start();
669 <            Thread.sleep(SHORT_DELAY_MS);
670 <            t.interrupt();
671 <            t.join(SHORT_DELAY_MS);
672 <            assertFalse(t.isAlive());
673 <        }
674 <        catch (Exception ex) {
675 <            unexpectedException();
676 <        }
917 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
918 >            public void realRun() throws InterruptedException {
919 >                lock.writeLock().lock();
920 >                java.util.Date d = new java.util.Date();
921 >                c.awaitUntil(new java.util.Date(d.getTime() + 10000));
922 >                lock.writeLock().unlock();
923 >            }});
924 >
925 >        t.start();
926 >        Thread.sleep(SHORT_DELAY_MS);
927 >        t.interrupt();
928 >        t.join(SHORT_DELAY_MS);
929 >        assertFalse(t.isAlive());
930      }
931  
932      /**
933       * signalAll wakes up all threads
934       */
935 <    public void testSignalAll() {
936 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
935 >    public void testSignalAll() throws InterruptedException {
936 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
937          final Condition c = lock.writeLock().newCondition();
938 <        Thread t1 = new Thread(new Runnable() {
939 <                public void run() {
940 <                    try {
941 <                        lock.writeLock().lock();
942 <                        c.await();
943 <                        lock.writeLock().unlock();
944 <                    }
945 <                    catch(InterruptedException e) {
946 <                        threadUnexpectedException();
947 <                    }
948 <                }
949 <            });
950 <
951 <        Thread t2 = new Thread(new Runnable() {
952 <                public void run() {
953 <                    try {
954 <                        lock.writeLock().lock();
955 <                        c.await();
956 <                        lock.writeLock().unlock();
957 <                    }
958 <                    catch(InterruptedException e) {
959 <                        threadUnexpectedException();
960 <                    }
961 <                }
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 <        }
938 >        Thread t1 = new Thread(new CheckedRunnable() {
939 >            public void realRun() throws InterruptedException {
940 >                lock.writeLock().lock();
941 >                c.await();
942 >                lock.writeLock().unlock();
943 >            }});
944 >
945 >        Thread t2 = new Thread(new CheckedRunnable() {
946 >            public void realRun() throws InterruptedException {
947 >                lock.writeLock().lock();
948 >                c.await();
949 >                lock.writeLock().unlock();
950 >            }});
951 >
952 >        t1.start();
953 >        t2.start();
954 >        Thread.sleep(SHORT_DELAY_MS);
955 >        lock.writeLock().lock();
956 >        c.signalAll();
957 >        lock.writeLock().unlock();
958 >        t1.join(SHORT_DELAY_MS);
959 >        t2.join(SHORT_DELAY_MS);
960 >        assertFalse(t1.isAlive());
961 >        assertFalse(t2.isAlive());
962      }
963  
964      /**
965       * A serialized lock deserializes as unlocked
966       */
967 <    public void testSerialization() {
967 >    public void testSerialization() throws Exception {
968          ReentrantReadWriteLock l = new ReentrantReadWriteLock();
969          l.readLock().lock();
970          l.readLock().unlock();
971  
972 +        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
973 +        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
974 +        out.writeObject(l);
975 +        out.close();
976 +
977 +        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
978 +        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
979 +        ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
980 +        r.readLock().lock();
981 +        r.readLock().unlock();
982 +    }
983 +
984 +    /**
985 +     * hasQueuedThreads reports whether there are waiting threads
986 +     */
987 +    public void testhasQueuedThreads() throws InterruptedException {
988 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
989 +        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
990 +        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
991 +        assertFalse(lock.hasQueuedThreads());
992 +        lock.writeLock().lock();
993 +        t1.start();
994 +        Thread.sleep(SHORT_DELAY_MS);
995 +        assertTrue(lock.hasQueuedThreads());
996 +        t2.start();
997 +        Thread.sleep(SHORT_DELAY_MS);
998 +        assertTrue(lock.hasQueuedThreads());
999 +        t1.interrupt();
1000 +        Thread.sleep(SHORT_DELAY_MS);
1001 +        assertTrue(lock.hasQueuedThreads());
1002 +        lock.writeLock().unlock();
1003 +        Thread.sleep(SHORT_DELAY_MS);
1004 +        assertFalse(lock.hasQueuedThreads());
1005 +        t1.join();
1006 +        t2.join();
1007 +    }
1008 +
1009 +    /**
1010 +     * hasQueuedThread(null) throws NPE
1011 +     */
1012 +    public void testHasQueuedThreadNPE() {
1013 +        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1014          try {
1015 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1016 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1017 <            out.writeObject(l);
1018 <            out.close();
1019 <
1020 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1021 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1022 <            ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1023 <            r.readLock().lock();
1024 <            r.readLock().unlock();
1025 <        } catch(Exception e){
1026 <            e.printStackTrace();
1027 <            unexpectedException();
1028 <        }
1015 >            sync.hasQueuedThread(null);
1016 >            shouldThrow();
1017 >        } catch (NullPointerException success) {}
1018 >    }
1019 >
1020 >    /**
1021 >     * hasQueuedThread reports whether a thread is queued.
1022 >     */
1023 >    public void testHasQueuedThread() throws InterruptedException {
1024 >        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1025 >        Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1026 >        Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1027 >        assertFalse(sync.hasQueuedThread(t1));
1028 >        assertFalse(sync.hasQueuedThread(t2));
1029 >        sync.writeLock().lock();
1030 >        t1.start();
1031 >        Thread.sleep(SHORT_DELAY_MS);
1032 >        assertTrue(sync.hasQueuedThread(t1));
1033 >        t2.start();
1034 >        Thread.sleep(SHORT_DELAY_MS);
1035 >        assertTrue(sync.hasQueuedThread(t1));
1036 >        assertTrue(sync.hasQueuedThread(t2));
1037 >        t1.interrupt();
1038 >        Thread.sleep(SHORT_DELAY_MS);
1039 >        assertFalse(sync.hasQueuedThread(t1));
1040 >        assertTrue(sync.hasQueuedThread(t2));
1041 >        sync.writeLock().unlock();
1042 >        Thread.sleep(SHORT_DELAY_MS);
1043 >        assertFalse(sync.hasQueuedThread(t1));
1044 >        Thread.sleep(SHORT_DELAY_MS);
1045 >        assertFalse(sync.hasQueuedThread(t2));
1046 >        t1.join();
1047 >        t2.join();
1048 >    }
1049 >
1050 >
1051 >    /**
1052 >     * getQueueLength reports number of waiting threads
1053 >     */
1054 >    public void testGetQueueLength() throws InterruptedException {
1055 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1056 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1057 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1058 >        assertEquals(0, lock.getQueueLength());
1059 >        lock.writeLock().lock();
1060 >        t1.start();
1061 >        Thread.sleep(SHORT_DELAY_MS);
1062 >        assertEquals(1, lock.getQueueLength());
1063 >        t2.start();
1064 >        Thread.sleep(SHORT_DELAY_MS);
1065 >        assertEquals(2, lock.getQueueLength());
1066 >        t1.interrupt();
1067 >        Thread.sleep(SHORT_DELAY_MS);
1068 >        assertEquals(1, lock.getQueueLength());
1069 >        lock.writeLock().unlock();
1070 >        Thread.sleep(SHORT_DELAY_MS);
1071 >        assertEquals(0, lock.getQueueLength());
1072 >        t1.join();
1073 >        t2.join();
1074 >    }
1075 >
1076 >    /**
1077 >     * getQueuedThreads includes waiting threads
1078 >     */
1079 >    public void testGetQueuedThreads() throws InterruptedException {
1080 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1081 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1082 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1083 >        assertTrue(lock.getQueuedThreads().isEmpty());
1084 >        lock.writeLock().lock();
1085 >        assertTrue(lock.getQueuedThreads().isEmpty());
1086 >        t1.start();
1087 >        Thread.sleep(SHORT_DELAY_MS);
1088 >        assertTrue(lock.getQueuedThreads().contains(t1));
1089 >        t2.start();
1090 >        Thread.sleep(SHORT_DELAY_MS);
1091 >        assertTrue(lock.getQueuedThreads().contains(t1));
1092 >        assertTrue(lock.getQueuedThreads().contains(t2));
1093 >        t1.interrupt();
1094 >        Thread.sleep(SHORT_DELAY_MS);
1095 >        assertFalse(lock.getQueuedThreads().contains(t1));
1096 >        assertTrue(lock.getQueuedThreads().contains(t2));
1097 >        lock.writeLock().unlock();
1098 >        Thread.sleep(SHORT_DELAY_MS);
1099 >        assertTrue(lock.getQueuedThreads().isEmpty());
1100 >        t1.join();
1101 >        t2.join();
1102 >    }
1103 >
1104 >    /**
1105 >     * hasWaiters throws NPE if null
1106 >     */
1107 >    public void testHasWaitersNPE() {
1108 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1109 >        try {
1110 >            lock.hasWaiters(null);
1111 >            shouldThrow();
1112 >        } catch (NullPointerException success) {}
1113 >    }
1114 >
1115 >    /**
1116 >     * getWaitQueueLength throws NPE if null
1117 >     */
1118 >    public void testGetWaitQueueLengthNPE() {
1119 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1120 >        try {
1121 >            lock.getWaitQueueLength(null);
1122 >            shouldThrow();
1123 >        } catch (NullPointerException success) {}
1124 >    }
1125 >
1126 >
1127 >    /**
1128 >     * getWaitingThreads throws NPE if null
1129 >     */
1130 >    public void testGetWaitingThreadsNPE() {
1131 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1132 >        try {
1133 >            lock.getWaitingThreads(null);
1134 >            shouldThrow();
1135 >        } catch (NullPointerException success) {}
1136 >    }
1137 >
1138 >    /**
1139 >     * hasWaiters throws IAE if not owned
1140 >     */
1141 >    public void testHasWaitersIAE() {
1142 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1143 >        final Condition c = lock.writeLock().newCondition();
1144 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1145 >        try {
1146 >            lock2.hasWaiters(c);
1147 >            shouldThrow();
1148 >        } catch (IllegalArgumentException success) {}
1149 >    }
1150 >
1151 >    /**
1152 >     * hasWaiters throws IMSE if not locked
1153 >     */
1154 >    public void testHasWaitersIMSE() {
1155 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1156 >        final Condition c = lock.writeLock().newCondition();
1157 >        try {
1158 >            lock.hasWaiters(c);
1159 >            shouldThrow();
1160 >        } catch (IllegalMonitorStateException success) {}
1161 >    }
1162 >
1163 >
1164 >    /**
1165 >     * getWaitQueueLength throws IAE if not owned
1166 >     */
1167 >    public void testGetWaitQueueLengthIAE() {
1168 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1169 >        final Condition c = lock.writeLock().newCondition();
1170 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1171 >        try {
1172 >            lock2.getWaitQueueLength(c);
1173 >            shouldThrow();
1174 >        } catch (IllegalArgumentException success) {}
1175      }
1176  
1177 +    /**
1178 +     * getWaitQueueLength throws IMSE if not locked
1179 +     */
1180 +    public void testGetWaitQueueLengthIMSE() {
1181 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1182 +        final Condition c = lock.writeLock().newCondition();
1183 +        try {
1184 +            lock.getWaitQueueLength(c);
1185 +            shouldThrow();
1186 +        } catch (IllegalMonitorStateException success) {}
1187 +    }
1188 +
1189 +
1190 +    /**
1191 +     * getWaitingThreads throws IAE if not owned
1192 +     */
1193 +    public void testGetWaitingThreadsIAE() {
1194 +        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1195 +        final Condition c = lock.writeLock().newCondition();
1196 +        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1197 +        try {
1198 +            lock2.getWaitingThreads(c);
1199 +            shouldThrow();
1200 +        } catch (IllegalArgumentException success) {}
1201 +    }
1202 +
1203 +    /**
1204 +     * getWaitingThreads throws IMSE if not locked
1205 +     */
1206 +    public void testGetWaitingThreadsIMSE() {
1207 +        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1208 +        final Condition c = lock.writeLock().newCondition();
1209 +        try {
1210 +            lock.getWaitingThreads(c);
1211 +            shouldThrow();
1212 +        } catch (IllegalMonitorStateException success) {}
1213 +    }
1214 +
1215 +
1216 +    /**
1217 +     * hasWaiters returns true when a thread is waiting, else false
1218 +     */
1219 +    public void testHasWaiters() throws InterruptedException {
1220 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1221 +        final Condition c = lock.writeLock().newCondition();
1222 +        Thread t = new Thread(new CheckedRunnable() {
1223 +            public void realRun() throws InterruptedException {
1224 +                lock.writeLock().lock();
1225 +                threadAssertFalse(lock.hasWaiters(c));
1226 +                threadAssertEquals(0, lock.getWaitQueueLength(c));
1227 +                c.await();
1228 +                lock.writeLock().unlock();
1229 +            }});
1230 +
1231 +        t.start();
1232 +        Thread.sleep(SHORT_DELAY_MS);
1233 +        lock.writeLock().lock();
1234 +        assertTrue(lock.hasWaiters(c));
1235 +        assertEquals(1, lock.getWaitQueueLength(c));
1236 +        c.signal();
1237 +        lock.writeLock().unlock();
1238 +        Thread.sleep(SHORT_DELAY_MS);
1239 +        lock.writeLock().lock();
1240 +        assertFalse(lock.hasWaiters(c));
1241 +        assertEquals(0, lock.getWaitQueueLength(c));
1242 +        lock.writeLock().unlock();
1243 +        t.join(SHORT_DELAY_MS);
1244 +        assertFalse(t.isAlive());
1245 +    }
1246 +
1247 +    /**
1248 +     * getWaitQueueLength returns number of waiting threads
1249 +     */
1250 +    public void testGetWaitQueueLength() throws InterruptedException {
1251 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1252 +        final Condition c = lock.writeLock().newCondition();
1253 +        Thread t = new Thread(new CheckedRunnable() {
1254 +            public void realRun() throws InterruptedException {
1255 +                lock.writeLock().lock();
1256 +                threadAssertFalse(lock.hasWaiters(c));
1257 +                threadAssertEquals(0, lock.getWaitQueueLength(c));
1258 +                c.await();
1259 +                lock.writeLock().unlock();
1260 +            }});
1261 +
1262 +        t.start();
1263 +        Thread.sleep(SHORT_DELAY_MS);
1264 +        lock.writeLock().lock();
1265 +        assertTrue(lock.hasWaiters(c));
1266 +        assertEquals(1, lock.getWaitQueueLength(c));
1267 +        c.signal();
1268 +        lock.writeLock().unlock();
1269 +        Thread.sleep(SHORT_DELAY_MS);
1270 +        lock.writeLock().lock();
1271 +        assertFalse(lock.hasWaiters(c));
1272 +        assertEquals(0, lock.getWaitQueueLength(c));
1273 +        lock.writeLock().unlock();
1274 +        t.join(SHORT_DELAY_MS);
1275 +        assertFalse(t.isAlive());
1276 +    }
1277 +
1278 +
1279 +    /**
1280 +     * getWaitingThreads returns only and all waiting threads
1281 +     */
1282 +    public void testGetWaitingThreads() throws InterruptedException {
1283 +        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1284 +        final Condition c = lock.writeLock().newCondition();
1285 +        Thread t1 = new Thread(new CheckedRunnable() {
1286 +            public void realRun() throws InterruptedException {
1287 +                lock.writeLock().lock();
1288 +                threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1289 +                c.await();
1290 +                lock.writeLock().unlock();
1291 +            }});
1292 +
1293 +        Thread t2 = new Thread(new CheckedRunnable() {
1294 +            public void realRun() throws InterruptedException {
1295 +                lock.writeLock().lock();
1296 +                threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1297 +                c.await();
1298 +                lock.writeLock().unlock();
1299 +            }});
1300 +
1301 +        lock.writeLock().lock();
1302 +        assertTrue(lock.getWaitingThreads(c).isEmpty());
1303 +        lock.writeLock().unlock();
1304 +        t1.start();
1305 +        Thread.sleep(SHORT_DELAY_MS);
1306 +        t2.start();
1307 +        Thread.sleep(SHORT_DELAY_MS);
1308 +        lock.writeLock().lock();
1309 +        assertTrue(lock.hasWaiters(c));
1310 +        assertTrue(lock.getWaitingThreads(c).contains(t1));
1311 +        assertTrue(lock.getWaitingThreads(c).contains(t2));
1312 +        c.signalAll();
1313 +        lock.writeLock().unlock();
1314 +        Thread.sleep(SHORT_DELAY_MS);
1315 +        lock.writeLock().lock();
1316 +        assertFalse(lock.hasWaiters(c));
1317 +        assertTrue(lock.getWaitingThreads(c).isEmpty());
1318 +        lock.writeLock().unlock();
1319 +        t1.join(SHORT_DELAY_MS);
1320 +        t2.join(SHORT_DELAY_MS);
1321 +        assertFalse(t1.isAlive());
1322 +        assertFalse(t2.isAlive());
1323 +    }
1324 +
1325 +    /**
1326 +     * toString indicates current lock state
1327 +     */
1328 +    public void testToString() {
1329 +        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1330 +        String us = lock.toString();
1331 +        assertTrue(us.indexOf("Write locks = 0") >= 0);
1332 +        assertTrue(us.indexOf("Read locks = 0") >= 0);
1333 +        lock.writeLock().lock();
1334 +        String ws = lock.toString();
1335 +        assertTrue(ws.indexOf("Write locks = 1") >= 0);
1336 +        assertTrue(ws.indexOf("Read locks = 0") >= 0);
1337 +        lock.writeLock().unlock();
1338 +        lock.readLock().lock();
1339 +        lock.readLock().lock();
1340 +        String rs = lock.toString();
1341 +        assertTrue(rs.indexOf("Write locks = 0") >= 0);
1342 +        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1343 +    }
1344 +
1345 +    /**
1346 +     * readLock.toString indicates current lock state
1347 +     */
1348 +    public void testReadLockToString() {
1349 +        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1350 +        String us = lock.readLock().toString();
1351 +        assertTrue(us.indexOf("Read locks = 0") >= 0);
1352 +        lock.readLock().lock();
1353 +        lock.readLock().lock();
1354 +        String rs = lock.readLock().toString();
1355 +        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1356 +    }
1357 +
1358 +    /**
1359 +     * writeLock.toString indicates current lock state
1360 +     */
1361 +    public void testWriteLockToString() {
1362 +        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1363 +        String us = lock.writeLock().toString();
1364 +        assertTrue(us.indexOf("Unlocked") >= 0);
1365 +        lock.writeLock().lock();
1366 +        String ls = lock.writeLock().toString();
1367 +        assertTrue(ls.indexOf("Locked") >= 0);
1368 +    }
1369  
1370   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines