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.2 by dl, Sun Sep 7 20:39:11 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 TestCase {
14 <    static int HOLD_COUNT_TEST_LIMIT = 20;
15 <    
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    
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  
25    private static long SHORT_DELAY_MS = 100;
26    private static long MEDIUM_DELAY_MS = 1000;
27    private static long LONG_DELAY_MS = 10000;
34  
35 <    /*
36 <     * Unlocks an unlocked lock, throws Illegal Monitor State
37 <     *
35 >    /**
36 >     * A runnable calling lockInterruptibly that expects to be
37 >     * interrupted
38       */
39 <    
40 <    public void testIllegalMonitorStateException(){
41 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
42 <        try{
43 <            rl.writeLock().unlock();
44 <            fail("Should of thown Illegal Monitor State Exception");
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 <        }catch(IllegalMonitorStateException success){}
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();
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 <    public void testInterruptedException(){
104 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
105 <        lock.writeLock().lock();
106 <        Thread t = new Thread(new Runnable() {
107 <                public void run(){
108 <                    try{
109 <                        lock.writeLock().lockInterruptibly();
110 <                        fail("should throw");
111 <                    }catch(InterruptedException success){}
112 <                }
113 <            });
114 <        try {
115 <            t.start();
116 <            t.interrupt();
117 <            lock.writeLock().unlock();
118 <            t.join();
119 <        } catch(Exception e){
120 <            fail("unexpected exception");
121 <        }
122 <    }
123 <
124 <    public void testInterruptedException2(){
125 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
126 <        lock.writeLock().lock();
127 <        Thread t = new Thread(new Runnable() {
128 <                public void run(){
129 <                    try{
130 <                        lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
131 <                        fail("should throw");
132 <                    }catch(InterruptedException success){}
133 <                }
134 <            });
135 <        try {
136 <            t.start();
137 <            t.interrupt();
103 >
104 >    /**
105 >     * locking an unlocked fair lock succeeds
106 >     */
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 >     * getWriteHoldCount returns number of recursive holds
131 >     */
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 <            t.join();
82 <        } catch(Exception e){
83 <            fail("unexpected exception");
140 >            assertEquals(i-1,lock.getWriteHoldCount());
141          }
142      }
143  
144 <    public void testInterruptedException3(){
145 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
146 <        lock.writeLock().lock();
147 <        Thread t = new Thread(new Runnable() {
148 <                public void run(){
149 <                    try{
150 <                        lock.readLock().lockInterruptibly();
151 <                        fail("should throw");
152 <                    }catch(InterruptedException success){}
153 <                }
97 <            });
98 <        try {
99 <            t.start();
100 <            t.interrupt();
144 >    /**
145 >     * WriteLock.getHoldCount returns number of recursive holds
146 >     */
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();
103 <        } catch(Exception e){
104 <            fail("unexpected exception");
105 <        }
106 <    }
107 <
108 <    public void testInterruptedException4(){
109 <        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().tryLock(1000,TimeUnit.MILLISECONDS);
115 <                        fail("should throw");
116 <                    }catch(InterruptedException success){}
117 <                }
118 <            });
119 <        try {
120 <            t.start();
121 <            t.interrupt();
122 <            t.join();
123 <        } catch(Exception e){
124 <            fail("unexpected exception");
155 >            assertEquals(i-1,lock.writeLock().getHoldCount());
156          }
157      }
158  
159 <    
160 <    public void testTryLockWhenLocked() {
161 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
162 <        lock.writeLock().lock();
163 <        Thread t = new Thread(new Runnable() {
164 <                public void run(){
165 <                    assertFalse(lock.writeLock().tryLock());
166 <                }
136 <            });
137 <        try {
138 <            t.start();
139 <            t.join();
140 <            lock.writeLock().unlock();
141 <        } catch(Exception e){
142 <            fail("unexpected exception");
159 >    /**
160 >     * getReadHoldCount returns number of recursive holds
161 >     */
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 <    }
168 >        for (int i = SIZE; i > 0; i--) {
169 >            lock.readLock().unlock();
170 >            assertEquals(i-1,lock.getReadHoldCount());
171 >        }
172 >    }
173  
174 <    public void testTryLockWhenLocked2() {
175 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
176 <        lock.writeLock().lock();
177 <        Thread t = new Thread(new Runnable() {
178 <                public void run(){
179 <                    assertFalse(lock.readLock().tryLock());
152 <                }
153 <            });
174 >
175 >    /**
176 >     * write-unlocking an unlocked lock throws IllegalMonitorStateException
177 >     */
178 >    public void testUnlock_IllegalMonitorStateException() {
179 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
180          try {
181 <            t.start();
182 <            t.join();
183 <            lock.writeLock().unlock();
184 <        } catch(Exception e){
185 <            fail("unexpected exception");
186 <        }
187 <    }
181 >            rl.writeLock().unlock();
182 >            shouldThrow();
183 >        } catch (IllegalMonitorStateException success) {}
184 >    }
185 >
186 >
187 >    /**
188 >     * write-lockInterruptibly is interruptible
189 >     */
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 >
245 >    /**
246 >     * timed read-tryLock is interruptible
247 >     */
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 <    public void testMultipleReadLocks() {
262 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
263 <        lock.readLock().lock();
264 <        Thread t = new Thread(new Runnable() {
265 <                public void run(){
266 <                    assertTrue(lock.readLock().tryLock());
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 >
274 >        t.start();
275 >        t.join();
276 >        lock.writeLock().unlock();
277 >    }
278 >
279 >    /**
280 >     * read-tryLock fails if locked
281 >     */
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 >
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() 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){
177 <            fail("unexpected exception");
178 <        }
179 <    }
306 >                }
307 >            });
308 >
309 >        t.start();
310 >        t.join();
311 >        lock.readLock().unlock();
312 >    }
313  
314 <    public void testWriteAfterMultipleReadLocks() {
315 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
316 <        lock.readLock().lock();
317 <        Thread t1 = new Thread(new Runnable() {
318 <                public void run(){
314 >    /**
315 >     * A writelock succeeds after reading threads unlock
316 >     */
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() {
327 <                public void run(){
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());
342 <          
343 <        } catch(Exception e){
344 <            fail("unexpected exception");
345 <        }
346 <    }
347 <
348 <    public void testReadAfterWriteLock() {
349 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
350 <        lock.writeLock().lock();
215 <        Thread t1 = new Thread(new Runnable() {
216 <                public void run(){
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() 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() {
356 <                public void run(){
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());
371 <          
372 <        } catch(Exception e){
373 <            fail("unexpected exception");
374 <        }
375 <    }
376 <
377 <
378 <    public void testTryLockWhenReadLocked() {
379 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
380 <        lock.readLock().lock();
381 <        Thread t = new Thread(new Runnable() {
382 <                public void run(){
383 <                    assertTrue(lock.readLock().tryLock());
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 lock succeeds if write locked by current thread even if
385 >     * other threads are waiting for readlock
386 >     */
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 <        try {
397 <            t.start();
398 <            t.join();
399 <            lock.readLock().unlock();
400 <        } catch(Exception e){
401 <            fail("unexpected exception");
259 <        }
260 <    }
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 <    
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 <    public void testWriteTryLockWhenReadLocked() {
418 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
419 <        lock.readLock().lock();
420 <        Thread t = new Thread(new Runnable() {
421 <                public void run(){
422 <                    assertFalse(lock.writeLock().tryLock());
423 <                }
424 <            });
425 <        try {
426 <            t.start();
427 <            t.join();
428 <            lock.readLock().unlock();
429 <        } catch(Exception e){
430 <            fail("unexpected exception");
431 <        }
432 <    }
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 <    
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  
283    public void testTryLock_Timeout(){
284        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
285        lock.writeLock().lock();
286        Thread t = new Thread(new Runnable() {
287                public void run(){
288                    try {
289                        assertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
290                    } catch (Exception ex) {
291                        fail("unexpected exception");
292                    }
293                }
294            });
295        try {
296            t.start();
297            t.join();
298            lock.writeLock().unlock();
299        } catch(Exception e){
300            fail("unexpected exception");
301        }
302    }
451  
452 <    public void testTryLock_Timeout2(){
453 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
454 <        lock.writeLock().lock();
455 <        Thread t = new Thread(new Runnable() {
456 <                public void run(){
457 <                    try {
458 <                        assertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
459 <                    } catch (Exception ex) {
460 <                        fail("unexpected exception");
461 <                    }
462 <                }
463 <            });
464 <        try {
465 <            t.start();
466 <            t.join();
467 <            lock.writeLock().unlock();
468 <        } catch(Exception e){
469 <            fail("unexpected exception");
470 <        }
323 <    }
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 <    public void testLockInterruptibly() {
487 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
488 <        try {
489 <            lock.writeLock().lockInterruptibly();
490 <        } catch(Exception e) {
491 <            fail("unexpected exception");
492 <        }
493 <        Thread t = new Thread(new Runnable() {
494 <                public void run() {
495 <                    try {
336 <                        lock.writeLock().lockInterruptibly();
337 <                        fail("should throw");
338 <                    }
339 <                    catch(InterruptedException success) {
340 <                    }
341 <                }
342 <            });
343 <        try {
344 <            t.start();
345 <            t.interrupt();
346 <            t.join();
347 <            lock.writeLock().unlock();
348 <        } catch(Exception e){
349 <            fail("unexpected exception");
350 <        }
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 <    public void testLockInterruptibly2() {
499 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
500 <        try {
501 <            lock.writeLock().lockInterruptibly();
502 <        } catch(Exception e) {
503 <            fail("unexpected exception");
504 <        }
505 <        Thread t = new Thread(new Runnable() {
506 <                public void run() {
507 <                    try {
508 <                        lock.readLock().lockInterruptibly();
509 <                        fail("should throw");
510 <                    }
511 <                    catch(InterruptedException success) {
512 <                    }
513 <                }
514 <            });
515 <        try {
516 <            t.start();
517 <            t.interrupt();
518 <            t.join();
519 <            lock.writeLock().unlock();
520 <        } catch(Exception e){
521 <            fail("unexpected exception");
522 <        }
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 >
619 >        t.start();
620 >        t.join();
621 >        lock.readLock().unlock();
622 >    }
623 >
624 >
625 >
626 >    /**
627 >     * write tryLock fails when readlocked
628 >     */
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 >
638 >        t.start();
639 >        t.join();
640 >        lock.readLock().unlock();
641 >    }
642 >
643 >
644 >    /**
645 >     * Fair Read tryLock succeeds if readlocked but not writelocked
646 >     */
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 >                    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 >     * Fair write tryLock fails when readlocked
666 >     */
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 >                    threadAssertFalse(lock.writeLock().tryLock());
673 >                }
674 >            });
675 >
676 >        t.start();
677 >        t.join();
678 >        lock.readLock().unlock();
679      }
680  
681 <    public void testAwait_IllegalMonitor() {
682 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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() 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() 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() throws InterruptedException {
759 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
760          final Condition c = lock.writeLock().newCondition();
761          try {
762              c.await();
763 <            fail("should throw");
764 <        }
387 <        catch (IllegalMonitorStateException success) {
388 <        }
389 <        catch (Exception ex) {
390 <            fail("should throw IMSE");
391 <        }
763 >            shouldThrow();
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 <            fail("should throw");
776 <        }
401 <        catch (IllegalMonitorStateException success) {
402 <        }
403 <        catch (Exception ex) {
404 <            fail("should throw IMSE");
405 <        }
775 >            shouldThrow();
776 >        } catch (IllegalMonitorStateException success) {}
777      }
778  
779 <    public void testAwaitNanos_Timeout() {
780 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
779 >    /**
780 >     * awaitNanos without a signal times out
781 >     */
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();
416 <        }
417 <        catch (Exception ex) {
418 <            fail("unexpected exception");
419 <        }
785 >
786 >        lock.writeLock().lock();
787 >        long t = c.awaitNanos(100);
788 >        assertTrue(t <= 0);
789 >        lock.writeLock().unlock();
790      }
791  
792 <    public void testAwait_Timeout() {
793 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
792 >
793 >    /**
794 >     *  timed await without a signal times out
795 >     */
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));
428 <            lock.writeLock().unlock();
429 <        }
430 <        catch (Exception ex) {
431 <            fail("unexpected exception");
432 <        }
799 >        lock.writeLock().lock();
800 >        assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
801 >        lock.writeLock().unlock();
802      }
803  
804 <    public void testAwaitUntil_Timeout() {
805 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
804 >    /**
805 >     * awaitUntil without a signal times out
806 >     */
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)));
442 <            lock.writeLock().unlock();
443 <        }
444 <        catch (Exception ex) {
445 <            fail("unexpected exception");
446 <        }
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 <    public void testAwait() {
817 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
816 >    /**
817 >     * await returns when signalled
818 >     */
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 <                        fail("unexpected exception");
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 <        try {
839 <            t.start();
840 <            Thread.sleep(SHORT_DELAY_MS);
841 <            lock.writeLock().lock();
842 <            c.signal();
843 <            lock.writeLock().unlock();
844 <            t.join(SHORT_DELAY_MS);
845 <            assertFalse(t.isAlive());
846 <        }
847 <        catch (Exception ex) {
848 <            fail("unexpected exception");
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 >            interrupted = isInterrupted();
861 >            lock.unlock();
862          }
863      }
864  
865 <    public void testAwaitUninterruptibly() {
866 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
865 >    /**
866 >     * awaitUninterruptibly doesn't abort on interrupt
867 >     */
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() {
872 <                public void run() {
873 <                    lock.writeLock().lock();
874 <                    c.awaitUninterruptibly();
875 <                    lock.writeLock().unlock();
876 <                }
877 <            });
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);
493 <            t.interrupt();
494 <            lock.writeLock().lock();
881 >            thread.interrupt();
882 >            thread.canAwake = true;
883              c.signal();
884 +        } finally {
885              lock.writeLock().unlock();
497            t.join(SHORT_DELAY_MS);
498            assertFalse(t.isAlive());
499        }
500        catch (Exception ex) {
501            fail("unexpected exception");
886          }
887 +
888 +        thread.join();
889 +        assertTrue(thread.interrupted);
890 +        assertFalse(thread.isAlive());
891      }
892  
893 <    public void testAwait_Interrupt() {
894 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
895 <        final Condition c = lock.writeLock().newCondition();
896 <        Thread t = new Thread(new Runnable() {
897 <                public void run() {
898 <                    try {
899 <                        lock.writeLock().lock();
900 <                        c.await();
901 <                        lock.writeLock().unlock();
902 <                        fail("should throw");
903 <                    }
904 <                    catch(InterruptedException success) {
905 <                    }
906 <                }
907 <            });
908 <
909 <        try {
910 <            t.start();
911 <            Thread.sleep(SHORT_DELAY_MS);
912 <            t.interrupt();
913 <            t.join(SHORT_DELAY_MS);
914 <            assertFalse(t.isAlive());
915 <        }
916 <        catch (Exception ex) {
917 <            fail("unexpected exception");
918 <        }
919 <    }
920 <
921 <    public void testAwaitNanos_Interrupt() {
922 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
923 <        final Condition c = lock.writeLock().newCondition();
924 <        Thread t = new Thread(new Runnable() {
925 <                public void run() {
926 <                    try {
927 <                        lock.writeLock().lock();
928 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
929 <                        lock.writeLock().unlock();
930 <                        fail("should throw");
931 <                    }
932 <                    catch(InterruptedException success) {
933 <                    }
934 <                }
935 <            });
936 <
937 <        try {
938 <            t.start();
939 <            Thread.sleep(SHORT_DELAY_MS);
940 <            t.interrupt();
941 <            t.join(SHORT_DELAY_MS);
942 <            assertFalse(t.isAlive());
943 <        }
944 <        catch (Exception ex) {
945 <            fail("unexpected exception");
946 <        }
947 <    }
948 <
949 <    public void testAwaitUntil_Interrupt() {
950 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
951 <        final Condition c = lock.writeLock().newCondition();
952 <        Thread t = new Thread(new Runnable() {
953 <                public void run() {
954 <                    try {
955 <                        lock.writeLock().lock();
956 <                        java.util.Date d = new java.util.Date();
957 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
958 <                        lock.writeLock().unlock();
959 <                        fail("should throw");
960 <                    }
961 <                    catch(InterruptedException success) {
962 <                    }
963 <                }
964 <            });
965 <
966 <        try {
967 <            t.start();
968 <            Thread.sleep(SHORT_DELAY_MS);
969 <            t.interrupt();
970 <            t.join(SHORT_DELAY_MS);
971 <            assertFalse(t.isAlive());
972 <        }
973 <        catch (Exception ex) {
974 <            fail("unexpected exception");
975 <        }
976 <    }
977 <
978 <    public void testSignalAll() {
979 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
980 <        final Condition c = lock.writeLock().newCondition();
981 <        Thread t1 = new Thread(new Runnable() {
982 <                public void run() {
983 <                    try {
596 <                        lock.writeLock().lock();
597 <                        c.await();
598 <                        lock.writeLock().unlock();
599 <                    }
600 <                    catch(InterruptedException e) {
601 <                        fail("unexpected exception");
602 <                    }
603 <                }
604 <            });
605 <
606 <        Thread t2 = new Thread(new Runnable() {
607 <                public void run() {
608 <                    try {
609 <                        lock.writeLock().lock();
610 <                        c.await();
611 <                        lock.writeLock().unlock();
612 <                    }
613 <                    catch(InterruptedException e) {
614 <                        fail("unexpected exception");
615 <                    }
616 <                }
617 <            });
618 <
619 <        try {
620 <            t1.start();
621 <            t2.start();
622 <            Thread.sleep(SHORT_DELAY_MS);
623 <            lock.writeLock().lock();
624 <            c.signalAll();
625 <            lock.writeLock().unlock();
626 <            t1.join(SHORT_DELAY_MS);
627 <            t2.join(SHORT_DELAY_MS);
628 <            assertFalse(t1.isAlive());
629 <            assertFalse(t2.isAlive());
630 <        }
631 <        catch (Exception ex) {
632 <            fail("unexpected exception");
633 <        }
893 >    /**
894 >     * await is interruptible
895 >     */
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 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() throws InterruptedException {
917 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
918 >        final Condition c = lock.writeLock().newCondition();
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() throws InterruptedException {
937 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
938 >        final Condition c = lock.writeLock().newCondition();
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() throws InterruptedException {
958 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
959 >        final Condition c = lock.writeLock().newCondition();
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 <    public void testSerialization() {
986 >    /**
987 >     * A serialized lock deserializes as unlocked
988 >     */
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 <            fail("unexpected exception");
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