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.54 by jsr166, Mon May 2 01:07:15 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines