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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines