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.3 by dl, Sun Sep 14 20:42:40 2003 UTC vs.
Revision 1.64 by jsr166, Tue May 24 23:40:14 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.atomic.AtomicBoolean;
11   import java.util.concurrent.locks.*;
12   import java.util.concurrent.*;
13 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
14   import java.io.*;
15 + import java.util.*;
16  
17   public class ReentrantReadWriteLockTest extends JSR166TestCase {
18      public static void main(String[] args) {
19 <        junit.textui.TestRunner.run (suite());  
19 >        junit.textui.TestRunner.run(suite());
20      }
21      public static Test suite() {
22 <        return new TestSuite(ReentrantReadWriteLockTest.class);
22 >        return new TestSuite(ReentrantReadWriteLockTest.class);
23      }
24  
25 <    static int HOLD_COUNT_TEST_LIMIT = 20;
26 <
23 <    /*
24 <     * Unlocks an unlocked lock, throws Illegal Monitor State
25 <     *
25 >    /**
26 >     * A runnable calling lockInterruptibly
27       */
28 <    public void testIllegalMonitorStateException(){
29 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
30 <        try{
31 <            rl.writeLock().unlock();
32 <            fail("Should of thown Illegal Monitor State Exception");
28 >    class InterruptibleLockRunnable extends CheckedRunnable {
29 >        final ReentrantReadWriteLock lock;
30 >        InterruptibleLockRunnable(ReentrantReadWriteLock l) { lock = l; }
31 >        public void realRun() throws InterruptedException {
32 >            lock.writeLock().lockInterruptibly();
33 >        }
34 >    }
35  
36 <        }catch(IllegalMonitorStateException success){}
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 +        PublicReentrantReadWriteLock(boolean fair) { super(fair); }
54 +        public Thread getOwner() {
55 +            return super.getOwner();
56 +        }
57 +        public Collection<Thread> getQueuedThreads() {
58 +            return super.getQueuedThreads();
59 +        }
60 +        public Collection<Thread> getWaitingThreads(Condition c) {
61 +            return super.getWaitingThreads(c);
62 +        }
63 +    }
64  
65 +    /**
66 +     * Releases write lock, checking that it had a hold count of 1.
67 +     */
68 +    void releaseWriteLock(PublicReentrantReadWriteLock lock) {
69 +        ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
70 +        assertWriteLockedByMoi(lock);
71 +        assertEquals(1, lock.getWriteHoldCount());
72 +        writeLock.unlock();
73 +        assertNotWriteLocked(lock);
74 +    }
75  
76 <    public void testInterruptedException(){
77 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
78 <        lock.writeLock().lock();
79 <        Thread t = new Thread(new Runnable() {
80 <                public void run(){
81 <                    try{
82 <                        lock.writeLock().lockInterruptibly();
83 <                        threadFail("should throw");
84 <                    }catch(InterruptedException success){}
47 <                }
48 <            });
49 <        try {
50 <            t.start();
51 <            t.interrupt();
52 <            lock.writeLock().unlock();
53 <            t.join();
54 <        } catch(Exception e){
55 <            fail("unexpected exception");
56 <        }
57 <    }
58 <
59 <    public void testInterruptedException2(){
60 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
61 <        lock.writeLock().lock();
62 <        Thread t = new Thread(new Runnable() {
63 <                public void run(){
64 <                    try{
65 <                        lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
66 <                        threadFail("should throw");
67 <                    }catch(InterruptedException success){}
68 <                }
69 <            });
70 <        try {
71 <            t.start();
72 <            t.interrupt();
73 <            lock.writeLock().unlock();
74 <            t.join();
75 <        } catch(Exception e){
76 <            fail("unexpected exception");
76 >    /**
77 >     * Spin-waits until lock.hasQueuedThread(t) becomes true.
78 >     */
79 >    void waitForQueuedThread(PublicReentrantReadWriteLock lock, Thread t) {
80 >        long startTime = System.nanoTime();
81 >        while (!lock.hasQueuedThread(t)) {
82 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
83 >                throw new AssertionFailedError("timed out");
84 >            Thread.yield();
85          }
86 +        assertTrue(t.isAlive());
87 +        assertTrue(lock.getOwner() != t);
88      }
89  
90 <    public void testInterruptedException3(){
91 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
92 <        lock.writeLock().lock();
93 <        Thread t = new Thread(new Runnable() {
94 <                public void run(){
95 <                    try{
96 <                        lock.readLock().lockInterruptibly();
97 <                        threadFail("should throw");
98 <                    }catch(InterruptedException success){}
99 <                }
100 <            });
101 <        try {
102 <            t.start();
103 <            t.interrupt();
104 <            lock.writeLock().unlock();
105 <            t.join();
106 <        } catch(Exception e){
107 <            fail("unexpected exception");
108 <        }
109 <    }
110 <
111 <    public void testInterruptedException4(){
112 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
113 <        lock.writeLock().lock();
114 <        Thread t = new Thread(new Runnable() {
115 <                public void run(){
116 <                    try{
117 <                        lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
118 <                        threadFail("should throw");
119 <                    }catch(InterruptedException success){}
120 <                }
121 <            });
122 <        try {
123 <            t.start();
124 <            t.interrupt();
125 <            t.join();
126 <        } catch(Exception e){
127 <            fail("unexpected exception");
90 >    /**
91 >     * Checks that lock is not write-locked.
92 >     */
93 >    void assertNotWriteLocked(PublicReentrantReadWriteLock lock) {
94 >        assertFalse(lock.isWriteLocked());
95 >        assertFalse(lock.isWriteLockedByCurrentThread());
96 >        assertFalse(lock.writeLock().isHeldByCurrentThread());
97 >        assertEquals(0, lock.getWriteHoldCount());
98 >        assertEquals(0, lock.writeLock().getHoldCount());
99 >        assertNull(lock.getOwner());
100 >    }
101 >
102 >    /**
103 >     * Checks that lock is write-locked by the given thread.
104 >     */
105 >    void assertWriteLockedBy(PublicReentrantReadWriteLock lock, Thread t) {
106 >        assertTrue(lock.isWriteLocked());
107 >        assertSame(t, lock.getOwner());
108 >        assertEquals(t == Thread.currentThread(),
109 >                     lock.isWriteLockedByCurrentThread());
110 >        assertEquals(t == Thread.currentThread(),
111 >                     lock.writeLock().isHeldByCurrentThread());
112 >        assertEquals(t == Thread.currentThread(),
113 >                     lock.getWriteHoldCount() > 0);
114 >        assertEquals(t == Thread.currentThread(),
115 >                     lock.writeLock().getHoldCount() > 0);
116 >        assertEquals(0, lock.getReadLockCount());
117 >    }
118 >
119 >    /**
120 >     * Checks that lock is write-locked by the current thread.
121 >     */
122 >    void assertWriteLockedByMoi(PublicReentrantReadWriteLock lock) {
123 >        assertWriteLockedBy(lock, Thread.currentThread());
124 >    }
125 >
126 >    /**
127 >     * Checks that condition c has no waiters.
128 >     */
129 >    void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
130 >        assertHasWaiters(lock, c, new Thread[] {});
131 >    }
132 >
133 >    /**
134 >     * Checks that condition c has exactly the given waiter threads.
135 >     */
136 >    void assertHasWaiters(PublicReentrantReadWriteLock lock, Condition c,
137 >                          Thread... threads) {
138 >        lock.writeLock().lock();
139 >        assertEquals(threads.length > 0, lock.hasWaiters(c));
140 >        assertEquals(threads.length, lock.getWaitQueueLength(c));
141 >        assertEquals(threads.length == 0, lock.getWaitingThreads(c).isEmpty());
142 >        assertEquals(threads.length, lock.getWaitingThreads(c).size());
143 >        assertEquals(new HashSet<Thread>(lock.getWaitingThreads(c)),
144 >                     new HashSet<Thread>(Arrays.asList(threads)));
145 >        lock.writeLock().unlock();
146 >    }
147 >
148 >    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
149 >
150 >    /**
151 >     * Awaits condition using the specified AwaitMethod.
152 >     */
153 >    void await(Condition c, AwaitMethod awaitMethod)
154 >            throws InterruptedException {
155 >        switch (awaitMethod) {
156 >        case await:
157 >            c.await();
158 >            break;
159 >        case awaitTimed:
160 >            assertTrue(c.await(2 * LONG_DELAY_MS, MILLISECONDS));
161 >            break;
162 >        case awaitNanos:
163 >            long nanosRemaining = c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
164 >            assertTrue(nanosRemaining > 0);
165 >            break;
166 >        case awaitUntil:
167 >            java.util.Date d = new java.util.Date();
168 >            assertTrue(c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS)));
169 >            break;
170          }
171      }
172  
173 <    
174 <    public void testTryLockWhenLocked() {
175 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
176 <        lock.writeLock().lock();
177 <        Thread t = new Thread(new Runnable() {
178 <                public void run(){
179 <                    threadAssertFalse(lock.writeLock().tryLock());
180 <                }
181 <            });
182 <        try {
183 <            t.start();
184 <            t.join();
173 >    /**
174 >     * Constructor sets given fairness, and is in unlocked state
175 >     */
176 >    public void testConstructor() {
177 >        PublicReentrantReadWriteLock lock;
178 >
179 >        lock = new PublicReentrantReadWriteLock();
180 >        assertFalse(lock.isFair());
181 >        assertNotWriteLocked(lock);
182 >        assertEquals(0, lock.getReadLockCount());
183 >
184 >        lock = new PublicReentrantReadWriteLock(true);
185 >        assertTrue(lock.isFair());
186 >        assertNotWriteLocked(lock);
187 >        assertEquals(0, lock.getReadLockCount());
188 >
189 >        lock = new PublicReentrantReadWriteLock(false);
190 >        assertFalse(lock.isFair());
191 >        assertNotWriteLocked(lock);
192 >        assertEquals(0, lock.getReadLockCount());
193 >    }
194 >
195 >    /**
196 >     * write-locking and read-locking an unlocked lock succeed
197 >     */
198 >    public void testLock()      { testLock(false); }
199 >    public void testLock_fair() { testLock(true); }
200 >    public void testLock(boolean fair) {
201 >        PublicReentrantReadWriteLock lock =
202 >            new PublicReentrantReadWriteLock(fair);
203 >        assertNotWriteLocked(lock);
204 >        lock.writeLock().lock();
205 >        assertWriteLockedByMoi(lock);
206 >        lock.writeLock().unlock();
207 >        assertNotWriteLocked(lock);
208 >        assertEquals(0, lock.getReadLockCount());
209 >        lock.readLock().lock();
210 >        assertNotWriteLocked(lock);
211 >        assertEquals(1, lock.getReadLockCount());
212 >        lock.readLock().unlock();
213 >        assertNotWriteLocked(lock);
214 >        assertEquals(0, lock.getReadLockCount());
215 >    }
216 >
217 >    /**
218 >     * getWriteHoldCount returns number of recursive holds
219 >     */
220 >    public void testGetWriteHoldCount()      { testGetWriteHoldCount(false); }
221 >    public void testGetWriteHoldCount_fair() { testGetWriteHoldCount(true); }
222 >    public void testGetWriteHoldCount(boolean fair) {
223 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
224 >        for (int i = 1; i <= SIZE; i++) {
225 >            lock.writeLock().lock();
226 >            assertEquals(i,lock.getWriteHoldCount());
227 >        }
228 >        for (int i = SIZE; i > 0; i--) {
229              lock.writeLock().unlock();
230 <        } catch(Exception e){
135 <            fail("unexpected exception");
230 >            assertEquals(i-1,lock.getWriteHoldCount());
231          }
232 <    }
232 >    }
233  
234 <    public void testTryLockWhenLocked2() {
235 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
236 <        lock.writeLock().lock();
237 <        Thread t = new Thread(new Runnable() {
238 <                public void run(){
239 <                    threadAssertFalse(lock.readLock().tryLock());
240 <                }
241 <            });
242 <        try {
243 <            t.start();
244 <            t.join();
234 >    /**
235 >     * writelock.getHoldCount returns number of recursive holds
236 >     */
237 >    public void testGetHoldCount()      { testGetHoldCount(false); }
238 >    public void testGetHoldCount_fair() { testGetHoldCount(true); }
239 >    public void testGetHoldCount(boolean fair) {
240 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
241 >        for (int i = 1; i <= SIZE; i++) {
242 >            lock.writeLock().lock();
243 >            assertEquals(i,lock.writeLock().getHoldCount());
244 >        }
245 >        for (int i = SIZE; i > 0; i--) {
246              lock.writeLock().unlock();
247 <        } catch(Exception e){
152 <            fail("unexpected exception");
247 >            assertEquals(i-1,lock.writeLock().getHoldCount());
248          }
249 <    }
249 >    }
250  
251 <    public void testMultipleReadLocks() {
252 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
253 <        lock.readLock().lock();
254 <        Thread t = new Thread(new Runnable() {
255 <                public void run(){
256 <                    threadAssertTrue(lock.readLock().tryLock());
257 <                    lock.readLock().unlock();
258 <                }
259 <            });
260 <        try {
261 <            t.start();
262 <            t.join();
251 >    /**
252 >     * getReadHoldCount returns number of recursive holds
253 >     */
254 >    public void testGetReadHoldCount()      { testGetReadHoldCount(false); }
255 >    public void testGetReadHoldCount_fair() { testGetReadHoldCount(true); }
256 >    public void testGetReadHoldCount(boolean fair) {
257 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
258 >        for (int i = 1; i <= SIZE; i++) {
259 >            lock.readLock().lock();
260 >            assertEquals(i,lock.getReadHoldCount());
261 >        }
262 >        for (int i = SIZE; i > 0; i--) {
263              lock.readLock().unlock();
264 <        } catch(Exception e){
170 <            fail("unexpected exception");
264 >            assertEquals(i-1,lock.getReadHoldCount());
265          }
266 <    }
173 <
174 <    public void testWriteAfterMultipleReadLocks() {
175 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
176 <        lock.readLock().lock();
177 <        Thread t1 = new Thread(new Runnable() {
178 <                public void run(){
179 <                    lock.readLock().lock();
180 <                    lock.readLock().unlock();
181 <                }
182 <            });
183 <        Thread t2 = new Thread(new Runnable() {
184 <                public void run(){
185 <                    lock.writeLock().lock();
186 <                    lock.writeLock().unlock();
187 <                }
188 <            });
266 >    }
267  
268 +    /**
269 +     * write-unlocking an unlocked lock throws IllegalMonitorStateException
270 +     */
271 +    public void testWriteUnlock_IMSE()      { testWriteUnlock_IMSE(false); }
272 +    public void testWriteUnlock_IMSE_fair() { testWriteUnlock_IMSE(true); }
273 +    public void testWriteUnlock_IMSE(boolean fair) {
274 +        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
275          try {
191            t1.start();
192            t2.start();
193            Thread.sleep(SHORT_DELAY_MS);
194            lock.readLock().unlock();
195            t1.join(MEDIUM_DELAY_MS);
196            t2.join(MEDIUM_DELAY_MS);
197            assertTrue(!t1.isAlive());
198            assertTrue(!t2.isAlive());
199          
200        } catch(Exception e){
201            fail("unexpected exception");
202        }
203    }
204
205    public void testReadAfterWriteLock() {
206        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
207        lock.writeLock().lock();
208        Thread t1 = new Thread(new Runnable() {
209                public void run(){
210                    lock.readLock().lock();
211                    lock.readLock().unlock();
212                }
213            });
214        Thread t2 = new Thread(new Runnable() {
215                public void run(){
216                    lock.readLock().lock();
217                    lock.readLock().unlock();
218                }
219            });
220
221        try {
222            t1.start();
223            t2.start();
224            Thread.sleep(SHORT_DELAY_MS);
276              lock.writeLock().unlock();
277 <            t1.join(MEDIUM_DELAY_MS);
278 <            t2.join(MEDIUM_DELAY_MS);
279 <            assertTrue(!t1.isAlive());
280 <            assertTrue(!t2.isAlive());
281 <          
282 <        } catch(Exception e){
283 <            fail("unexpected exception");
284 <        }
285 <    }
286 <
287 <
237 <    public void testTryLockWhenReadLocked() {
238 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
239 <        lock.readLock().lock();
240 <        Thread t = new Thread(new Runnable() {
241 <                public void run(){
242 <                    threadAssertTrue(lock.readLock().tryLock());
243 <                    lock.readLock().unlock();
244 <                }
245 <            });
277 >            shouldThrow();
278 >        } catch (IllegalMonitorStateException success) {}
279 >    }
280 >
281 >    /**
282 >     * read-unlocking an unlocked lock throws IllegalMonitorStateException
283 >     */
284 >    public void testReadUnlock_IMSE()      { testReadUnlock_IMSE(false); }
285 >    public void testReadUnlock_IMSE_fair() { testReadUnlock_IMSE(true); }
286 >    public void testReadUnlock_IMSE(boolean fair) {
287 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
288          try {
247            t.start();
248            t.join();
289              lock.readLock().unlock();
290 <        } catch(Exception e){
291 <            fail("unexpected exception");
292 <        }
253 <    }
290 >            shouldThrow();
291 >        } catch (IllegalMonitorStateException success) {}
292 >    }
293  
294 <    
294 >    /**
295 >     * write-lockInterruptibly is interruptible
296 >     */
297 >    public void testWriteLockInterruptibly_Interruptible()      { testWriteLockInterruptibly_Interruptible(false); }
298 >    public void testWriteLockInterruptibly_Interruptible_fair() { testWriteLockInterruptibly_Interruptible(true); }
299 >    public void testWriteLockInterruptibly_Interruptible(boolean fair) {
300 >        final PublicReentrantReadWriteLock lock =
301 >            new PublicReentrantReadWriteLock(fair);
302 >        lock.writeLock().lock();
303 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
304 >            public void realRun() throws InterruptedException {
305 >                lock.writeLock().lockInterruptibly();
306 >            }});
307 >
308 >        waitForQueuedThread(lock, t);
309 >        t.interrupt();
310 >        awaitTermination(t);
311 >        releaseWriteLock(lock);
312 >    }
313  
314 <    public void testWriteTryLockWhenReadLocked() {
315 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
316 <        lock.readLock().lock();
317 <        Thread t = new Thread(new Runnable() {
318 <                public void run(){
319 <                    threadAssertFalse(lock.writeLock().tryLock());
320 <                }
321 <            });
322 <        try {
323 <            t.start();
324 <            t.join();
325 <            lock.readLock().unlock();
326 <        } catch(Exception e){
327 <            fail("unexpected exception");
328 <        }
329 <    }
314 >    /**
315 >     * timed write-tryLock is interruptible
316 >     */
317 >    public void testWriteTryLock_Interruptible()      { testWriteTryLock_Interruptible(false); }
318 >    public void testWriteTryLock_Interruptible_fair() { testWriteTryLock_Interruptible(true); }
319 >    public void testWriteTryLock_Interruptible(boolean fair) {
320 >        final PublicReentrantReadWriteLock lock =
321 >            new PublicReentrantReadWriteLock(fair);
322 >        lock.writeLock().lock();
323 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
324 >            public void realRun() throws InterruptedException {
325 >                lock.writeLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
326 >            }});
327 >
328 >        waitForQueuedThread(lock, t);
329 >        t.interrupt();
330 >        awaitTermination(t);
331 >        releaseWriteLock(lock);
332 >    }
333  
334 <    
334 >    /**
335 >     * read-lockInterruptibly is interruptible
336 >     */
337 >    public void testReadLockInterruptibly_Interruptible()      { testReadLockInterruptibly_Interruptible(false); }
338 >    public void testReadLockInterruptibly_Interruptible_fair() { testReadLockInterruptibly_Interruptible(true); }
339 >    public void testReadLockInterruptibly_Interruptible(boolean fair) {
340 >        final PublicReentrantReadWriteLock lock =
341 >            new PublicReentrantReadWriteLock(fair);
342 >        lock.writeLock().lock();
343 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
344 >            public void realRun() throws InterruptedException {
345 >                lock.readLock().lockInterruptibly();
346 >            }});
347 >
348 >        waitForQueuedThread(lock, t);
349 >        t.interrupt();
350 >        awaitTermination(t);
351 >        releaseWriteLock(lock);
352 >    }
353  
354 <    public void testTryLock_Timeout(){
355 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
356 <        lock.writeLock().lock();
357 <        Thread t = new Thread(new Runnable() {
358 <                public void run(){
359 <                    try {
360 <                        threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
361 <                    } catch (Exception ex) {
362 <                        threadFail("unexpected exception");
363 <                    }
364 <                }
365 <            });
366 <        try {
367 <            t.start();
368 <            t.join();
369 <            lock.writeLock().unlock();
370 <        } catch(Exception e){
371 <            fail("unexpected exception");
372 <        }
295 <    }
354 >    /**
355 >     * timed read-tryLock is interruptible
356 >     */
357 >    public void testReadTryLock_Interruptible()      { testReadTryLock_Interruptible(false); }
358 >    public void testReadTryLock_Interruptible_fair() { testReadTryLock_Interruptible(true); }
359 >    public void testReadTryLock_Interruptible(boolean fair) {
360 >        final PublicReentrantReadWriteLock lock =
361 >            new PublicReentrantReadWriteLock(fair);
362 >        lock.writeLock().lock();
363 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
364 >            public void realRun() throws InterruptedException {
365 >                lock.readLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
366 >            }});
367 >
368 >        waitForQueuedThread(lock, t);
369 >        t.interrupt();
370 >        awaitTermination(t);
371 >        releaseWriteLock(lock);
372 >    }
373  
374 <    public void testTryLock_Timeout2(){
375 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
376 <        lock.writeLock().lock();
377 <        Thread t = new Thread(new Runnable() {
378 <                public void run(){
379 <                    try {
380 <                        threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
381 <                    } catch (Exception ex) {
382 <                        threadFail("unexpected exception");
383 <                    }
384 <                }
385 <            });
386 <        try {
387 <            t.start();
388 <            t.join();
389 <            lock.writeLock().unlock();
390 <        } catch(Exception e){
391 <            fail("unexpected exception");
392 <        }
393 <    }
374 >    /**
375 >     * write-tryLock on an unlocked lock succeeds
376 >     */
377 >    public void testWriteTryLock()      { testWriteTryLock(false); }
378 >    public void testWriteTryLock_fair() { testWriteTryLock(true); }
379 >    public void testWriteTryLock(boolean fair) {
380 >        final PublicReentrantReadWriteLock lock =
381 >            new PublicReentrantReadWriteLock(fair);
382 >        assertTrue(lock.writeLock().tryLock());
383 >        assertWriteLockedByMoi(lock);
384 >        assertTrue(lock.writeLock().tryLock());
385 >        assertWriteLockedByMoi(lock);
386 >        lock.writeLock().unlock();
387 >        releaseWriteLock(lock);
388 >    }
389 >
390 >    /**
391 >     * write-tryLock fails if locked
392 >     */
393 >    public void testWriteTryLockWhenLocked()      { testWriteTryLockWhenLocked(false); }
394 >    public void testWriteTryLockWhenLocked_fair() { testWriteTryLockWhenLocked(true); }
395 >    public void testWriteTryLockWhenLocked(boolean fair) {
396 >        final PublicReentrantReadWriteLock lock =
397 >            new PublicReentrantReadWriteLock(fair);
398 >        lock.writeLock().lock();
399 >        Thread t = newStartedThread(new CheckedRunnable() {
400 >            public void realRun() {
401 >                assertFalse(lock.writeLock().tryLock());
402 >            }});
403 >
404 >        awaitTermination(t);
405 >        releaseWriteLock(lock);
406 >    }
407 >
408 >    /**
409 >     * read-tryLock fails if locked
410 >     */
411 >    public void testReadTryLockWhenLocked()      { testReadTryLockWhenLocked(false); }
412 >    public void testReadTryLockWhenLocked_fair() { testReadTryLockWhenLocked(true); }
413 >    public void testReadTryLockWhenLocked(boolean fair) {
414 >        final PublicReentrantReadWriteLock lock =
415 >            new PublicReentrantReadWriteLock(fair);
416 >        lock.writeLock().lock();
417 >        Thread t = newStartedThread(new CheckedRunnable() {
418 >            public void realRun() {
419 >                assertFalse(lock.readLock().tryLock());
420 >            }});
421 >
422 >        awaitTermination(t);
423 >        releaseWriteLock(lock);
424 >    }
425 >
426 >    /**
427 >     * Multiple threads can hold a read lock when not write-locked
428 >     */
429 >    public void testMultipleReadLocks()      { testMultipleReadLocks(false); }
430 >    public void testMultipleReadLocks_fair() { testMultipleReadLocks(true); }
431 >    public void testMultipleReadLocks(boolean fair) {
432 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
433 >        lock.readLock().lock();
434 >        Thread t = newStartedThread(new CheckedRunnable() {
435 >            public void realRun() throws InterruptedException {
436 >                assertTrue(lock.readLock().tryLock());
437 >                lock.readLock().unlock();
438 >                assertTrue(lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS));
439 >                lock.readLock().unlock();
440 >                lock.readLock().lock();
441 >                lock.readLock().unlock();
442 >            }});
443 >
444 >        awaitTermination(t);
445 >        lock.readLock().unlock();
446 >    }
447 >
448 >    /**
449 >     * A writelock succeeds only after a reading thread unlocks
450 >     */
451 >    public void testWriteAfterReadLock()      { testWriteAfterReadLock(false); }
452 >    public void testWriteAfterReadLock_fair() { testWriteAfterReadLock(true); }
453 >    public void testWriteAfterReadLock(boolean fair) {
454 >        final PublicReentrantReadWriteLock lock =
455 >            new PublicReentrantReadWriteLock(fair);
456 >        lock.readLock().lock();
457 >        Thread t = newStartedThread(new CheckedRunnable() {
458 >            public void realRun() {
459 >                assertEquals(1, lock.getReadLockCount());
460 >                lock.writeLock().lock();
461 >                assertEquals(0, lock.getReadLockCount());
462 >                lock.writeLock().unlock();
463 >            }});
464 >        waitForQueuedThread(lock, t);
465 >        assertNotWriteLocked(lock);
466 >        assertEquals(1, lock.getReadLockCount());
467 >        lock.readLock().unlock();
468 >        assertEquals(0, lock.getReadLockCount());
469 >        awaitTermination(t);
470 >        assertNotWriteLocked(lock);
471 >    }
472 >
473 >    /**
474 >     * A writelock succeeds only after reading threads unlock
475 >     */
476 >    public void testWriteAfterMultipleReadLocks()      { testWriteAfterMultipleReadLocks(false); }
477 >    public void testWriteAfterMultipleReadLocks_fair() { testWriteAfterMultipleReadLocks(true); }
478 >    public void testWriteAfterMultipleReadLocks(boolean fair) {
479 >        final PublicReentrantReadWriteLock lock =
480 >            new PublicReentrantReadWriteLock(fair);
481 >        lock.readLock().lock();
482 >        lock.readLock().lock();
483 >        Thread t1 = newStartedThread(new CheckedRunnable() {
484 >            public void realRun() {
485 >                lock.readLock().lock();
486 >                assertEquals(3, lock.getReadLockCount());
487 >                lock.readLock().unlock();
488 >            }});
489 >        awaitTermination(t1);
490 >
491 >        Thread t2 = newStartedThread(new CheckedRunnable() {
492 >            public void realRun() {
493 >                assertEquals(2, lock.getReadLockCount());
494 >                lock.writeLock().lock();
495 >                assertEquals(0, lock.getReadLockCount());
496 >                lock.writeLock().unlock();
497 >            }});
498 >        waitForQueuedThread(lock, t2);
499 >        assertNotWriteLocked(lock);
500 >        assertEquals(2, lock.getReadLockCount());
501 >        lock.readLock().unlock();
502 >        lock.readLock().unlock();
503 >        assertEquals(0, lock.getReadLockCount());
504 >        awaitTermination(t2);
505 >        assertNotWriteLocked(lock);
506 >    }
507 >
508 >    /**
509 >     * A thread that tries to acquire a fair read lock (non-reentrantly)
510 >     * will block if there is a waiting writer thread
511 >     */
512 >    public void testReaderWriterReaderFairFifo() {
513 >        final PublicReentrantReadWriteLock lock =
514 >            new PublicReentrantReadWriteLock(true);
515 >        final AtomicBoolean t1GotLock = new AtomicBoolean(false);
516 >
517 >        lock.readLock().lock();
518 >        Thread t1 = newStartedThread(new CheckedRunnable() {
519 >            public void realRun() {
520 >                assertEquals(1, lock.getReadLockCount());
521 >                lock.writeLock().lock();
522 >                assertEquals(0, lock.getReadLockCount());
523 >                t1GotLock.set(true);
524 >                lock.writeLock().unlock();
525 >            }});
526 >        waitForQueuedThread(lock, t1);
527 >
528 >        Thread t2 = newStartedThread(new CheckedRunnable() {
529 >            public void realRun() {
530 >                assertEquals(1, lock.getReadLockCount());
531 >                lock.readLock().lock();
532 >                assertEquals(1, lock.getReadLockCount());
533 >                assertTrue(t1GotLock.get());
534 >                lock.readLock().unlock();
535 >            }});
536 >        waitForQueuedThread(lock, t2);
537 >        assertTrue(t1.isAlive());
538 >        assertNotWriteLocked(lock);
539 >        assertEquals(1, lock.getReadLockCount());
540 >        lock.readLock().unlock();
541 >        awaitTermination(t1);
542 >        awaitTermination(t2);
543 >        assertNotWriteLocked(lock);
544 >    }
545 >
546 >    /**
547 >     * Readlocks succeed only after a writing thread unlocks
548 >     */
549 >    public void testReadAfterWriteLock()      { testReadAfterWriteLock(false); }
550 >    public void testReadAfterWriteLock_fair() { testReadAfterWriteLock(true); }
551 >    public void testReadAfterWriteLock(boolean fair) {
552 >        final PublicReentrantReadWriteLock lock =
553 >            new PublicReentrantReadWriteLock(fair);
554 >        lock.writeLock().lock();
555 >        Thread t1 = newStartedThread(new CheckedRunnable() {
556 >            public void realRun() {
557 >                lock.readLock().lock();
558 >                lock.readLock().unlock();
559 >            }});
560 >        Thread t2 = newStartedThread(new CheckedRunnable() {
561 >            public void realRun() {
562 >                lock.readLock().lock();
563 >                lock.readLock().unlock();
564 >            }});
565 >
566 >        waitForQueuedThread(lock, t1);
567 >        waitForQueuedThread(lock, t2);
568 >        releaseWriteLock(lock);
569 >        awaitTermination(t1);
570 >        awaitTermination(t2);
571 >    }
572 >
573 >    /**
574 >     * Read trylock succeeds if write locked by current thread
575 >     */
576 >    public void testReadHoldingWriteLock()      { testReadHoldingWriteLock(false); }
577 >    public void testReadHoldingWriteLock_fair() { testReadHoldingWriteLock(true); }
578 >    public void testReadHoldingWriteLock(boolean fair) {
579 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
580 >        lock.writeLock().lock();
581 >        assertTrue(lock.readLock().tryLock());
582 >        lock.readLock().unlock();
583 >        lock.writeLock().unlock();
584 >    }
585 >
586 >    /**
587 >     * Read trylock succeeds (barging) even in the presence of waiting
588 >     * readers and/or writers
589 >     */
590 >    public void testReadTryLockBarging()      { testReadTryLockBarging(false); }
591 >    public void testReadTryLockBarging_fair() { testReadTryLockBarging(true); }
592 >    public void testReadTryLockBarging(boolean fair) {
593 >        final PublicReentrantReadWriteLock lock =
594 >            new PublicReentrantReadWriteLock(fair);
595 >        lock.readLock().lock();
596 >
597 >        Thread t1 = newStartedThread(new CheckedRunnable() {
598 >            public void realRun() {
599 >                lock.writeLock().lock();
600 >                lock.writeLock().unlock();
601 >            }});
602 >
603 >        waitForQueuedThread(lock, t1);
604 >
605 >        Thread t2 = newStartedThread(new CheckedRunnable() {
606 >            public void realRun() {
607 >                lock.readLock().lock();
608 >                lock.readLock().unlock();
609 >            }});
610 >
611 >        if (fair)
612 >            waitForQueuedThread(lock, t2);
613 >
614 >        Thread t3 = newStartedThread(new CheckedRunnable() {
615 >            public void realRun() {
616 >                lock.readLock().tryLock();
617 >                lock.readLock().unlock();
618 >            }});
619 >
620 >        assertTrue(lock.getReadLockCount() > 0);
621 >        awaitTermination(t3);
622 >        assertTrue(t1.isAlive());
623 >        if (fair) assertTrue(t2.isAlive());
624 >        lock.readLock().unlock();
625 >        awaitTermination(t1);
626 >        awaitTermination(t2);
627 >    }
628 >
629 >    /**
630 >     * Read lock succeeds if write locked by current thread even if
631 >     * other threads are waiting for readlock
632 >     */
633 >    public void testReadHoldingWriteLock2()      { testReadHoldingWriteLock2(false); }
634 >    public void testReadHoldingWriteLock2_fair() { testReadHoldingWriteLock2(true); }
635 >    public void testReadHoldingWriteLock2(boolean fair) {
636 >        final PublicReentrantReadWriteLock lock =
637 >            new PublicReentrantReadWriteLock(fair);
638 >        lock.writeLock().lock();
639 >        lock.readLock().lock();
640 >        lock.readLock().unlock();
641 >
642 >        Thread t1 = newStartedThread(new CheckedRunnable() {
643 >            public void realRun() {
644 >                lock.readLock().lock();
645 >                lock.readLock().unlock();
646 >            }});
647 >        Thread t2 = newStartedThread(new CheckedRunnable() {
648 >            public void realRun() {
649 >                lock.readLock().lock();
650 >                lock.readLock().unlock();
651 >            }});
652 >
653 >        waitForQueuedThread(lock, t1);
654 >        waitForQueuedThread(lock, t2);
655 >        assertWriteLockedByMoi(lock);
656 >        lock.readLock().lock();
657 >        lock.readLock().unlock();
658 >        releaseWriteLock(lock);
659 >        awaitTermination(t1);
660 >        awaitTermination(t2);
661 >    }
662 >
663 >    /**
664 >     * Read lock succeeds if write locked by current thread even if
665 >     * other threads are waiting for writelock
666 >     */
667 >    public void testReadHoldingWriteLock3()      { testReadHoldingWriteLock3(false); }
668 >    public void testReadHoldingWriteLock3_fair() { testReadHoldingWriteLock3(true); }
669 >    public void testReadHoldingWriteLock3(boolean fair) {
670 >        final PublicReentrantReadWriteLock lock =
671 >            new PublicReentrantReadWriteLock(fair);
672 >        lock.writeLock().lock();
673 >        lock.readLock().lock();
674 >        lock.readLock().unlock();
675 >
676 >        Thread t1 = newStartedThread(new CheckedRunnable() {
677 >            public void realRun() {
678 >                lock.writeLock().lock();
679 >                lock.writeLock().unlock();
680 >            }});
681 >        Thread t2 = newStartedThread(new CheckedRunnable() {
682 >            public void realRun() {
683 >                lock.writeLock().lock();
684 >                lock.writeLock().unlock();
685 >            }});
686 >
687 >        waitForQueuedThread(lock, t1);
688 >        waitForQueuedThread(lock, t2);
689 >        assertWriteLockedByMoi(lock);
690 >        lock.readLock().lock();
691 >        lock.readLock().unlock();
692 >        assertWriteLockedByMoi(lock);
693 >        lock.writeLock().unlock();
694 >        awaitTermination(t1);
695 >        awaitTermination(t2);
696 >    }
697 >
698 >    /**
699 >     * Write lock succeeds if write locked by current thread even if
700 >     * other threads are waiting for writelock
701 >     */
702 >    public void testWriteHoldingWriteLock4()      { testWriteHoldingWriteLock4(false); }
703 >    public void testWriteHoldingWriteLock4_fair() { testWriteHoldingWriteLock4(true); }
704 >    public void testWriteHoldingWriteLock4(boolean fair) {
705 >        final PublicReentrantReadWriteLock lock =
706 >            new PublicReentrantReadWriteLock(fair);
707 >        lock.writeLock().lock();
708 >        lock.writeLock().lock();
709 >        lock.writeLock().unlock();
710 >
711 >        Thread t1 = newStartedThread(new CheckedRunnable() {
712 >            public void realRun() {
713 >                lock.writeLock().lock();
714 >                lock.writeLock().unlock();
715 >            }});
716 >        Thread t2 = newStartedThread(new CheckedRunnable() {
717 >            public void realRun() {
718 >                lock.writeLock().lock();
719 >                lock.writeLock().unlock();
720 >            }});
721 >
722 >        waitForQueuedThread(lock, t1);
723 >        waitForQueuedThread(lock, t2);
724 >        assertWriteLockedByMoi(lock);
725 >        assertEquals(1, lock.getWriteHoldCount());
726 >        lock.writeLock().lock();
727 >        assertWriteLockedByMoi(lock);
728 >        assertEquals(2, lock.getWriteHoldCount());
729 >        lock.writeLock().unlock();
730 >        assertWriteLockedByMoi(lock);
731 >        assertEquals(1, lock.getWriteHoldCount());
732 >        lock.writeLock().unlock();
733 >        awaitTermination(t1);
734 >        awaitTermination(t2);
735 >    }
736 >
737 >    /**
738 >     * Read tryLock succeeds if readlocked but not writelocked
739 >     */
740 >    public void testTryLockWhenReadLocked()      { testTryLockWhenReadLocked(false); }
741 >    public void testTryLockWhenReadLocked_fair() { testTryLockWhenReadLocked(true); }
742 >    public void testTryLockWhenReadLocked(boolean fair) {
743 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
744 >        lock.readLock().lock();
745 >        Thread t = newStartedThread(new CheckedRunnable() {
746 >            public void realRun() {
747 >                assertTrue(lock.readLock().tryLock());
748 >                lock.readLock().unlock();
749 >            }});
750 >
751 >        awaitTermination(t);
752 >        lock.readLock().unlock();
753 >    }
754 >
755 >    /**
756 >     * write tryLock fails when readlocked
757 >     */
758 >    public void testWriteTryLockWhenReadLocked()      { testWriteTryLockWhenReadLocked(false); }
759 >    public void testWriteTryLockWhenReadLocked_fair() { testWriteTryLockWhenReadLocked(true); }
760 >    public void testWriteTryLockWhenReadLocked(boolean fair) {
761 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
762 >        lock.readLock().lock();
763 >        Thread t = newStartedThread(new CheckedRunnable() {
764 >            public void realRun() {
765 >                assertFalse(lock.writeLock().tryLock());
766 >            }});
767 >
768 >        awaitTermination(t);
769 >        lock.readLock().unlock();
770 >    }
771 >
772 >    /**
773 >     * write timed tryLock times out if locked
774 >     */
775 >    public void testWriteTryLock_Timeout()      { testWriteTryLock_Timeout(false); }
776 >    public void testWriteTryLock_Timeout_fair() { testWriteTryLock_Timeout(true); }
777 >    public void testWriteTryLock_Timeout(boolean fair) {
778 >        final PublicReentrantReadWriteLock lock =
779 >            new PublicReentrantReadWriteLock(fair);
780 >        lock.writeLock().lock();
781 >        Thread t = newStartedThread(new CheckedRunnable() {
782 >            public void realRun() throws InterruptedException {
783 >                long startTime = System.nanoTime();
784 >                long timeoutMillis = 10;
785 >                assertFalse(lock.writeLock().tryLock(timeoutMillis, MILLISECONDS));
786 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
787 >            }});
788 >
789 >        awaitTermination(t);
790 >        releaseWriteLock(lock);
791 >    }
792  
793 +    /**
794 +     * read timed tryLock times out if write-locked
795 +     */
796 +    public void testReadTryLock_Timeout()      { testReadTryLock_Timeout(false); }
797 +    public void testReadTryLock_Timeout_fair() { testReadTryLock_Timeout(true); }
798 +    public void testReadTryLock_Timeout(boolean fair) {
799 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
800 +        lock.writeLock().lock();
801 +        Thread t = newStartedThread(new CheckedRunnable() {
802 +            public void realRun() throws InterruptedException {
803 +                long startTime = System.nanoTime();
804 +                long timeoutMillis = 10;
805 +                assertFalse(lock.readLock().tryLock(timeoutMillis, MILLISECONDS));
806 +                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
807 +            }});
808 +
809 +        awaitTermination(t);
810 +        assertTrue(lock.writeLock().isHeldByCurrentThread());
811 +        lock.writeLock().unlock();
812 +    }
813  
814 <    public void testLockInterruptibly() {
815 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
816 <        try {
814 >    /**
815 >     * write lockInterruptibly succeeds if unlocked, else is interruptible
816 >     */
817 >    public void testWriteLockInterruptibly()      { testWriteLockInterruptibly(false); }
818 >    public void testWriteLockInterruptibly_fair() { testWriteLockInterruptibly(true); }
819 >    public void testWriteLockInterruptibly(boolean fair) {
820 >        final PublicReentrantReadWriteLock lock =
821 >            new PublicReentrantReadWriteLock(fair);
822 >        try {
823              lock.writeLock().lockInterruptibly();
824 <        } catch(Exception e) {
825 <            fail("unexpected exception");
325 <        }
326 <        Thread t = new Thread(new Runnable() {
327 <                public void run() {
328 <                    try {
329 <                        lock.writeLock().lockInterruptibly();
330 <                        threadFail("should throw");
331 <                    }
332 <                    catch(InterruptedException success) {
333 <                    }
334 <                }
335 <            });
336 <        try {
337 <            t.start();
338 <            t.interrupt();
339 <            t.join();
340 <            lock.writeLock().unlock();
341 <        } catch(Exception e){
342 <            fail("unexpected exception");
824 >        } catch (InterruptedException ie) {
825 >            threadUnexpectedException(ie);
826          }
827 +        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
828 +            public void realRun() throws InterruptedException {
829 +                lock.writeLock().lockInterruptibly();
830 +            }});
831 +
832 +        waitForQueuedThread(lock, t);
833 +        t.interrupt();
834 +        assertTrue(lock.writeLock().isHeldByCurrentThread());
835 +        awaitTermination(t);
836 +        releaseWriteLock(lock);
837      }
838  
839 <    public void testLockInterruptibly2() {
840 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
841 <        try {
839 >    /**
840 >     * read lockInterruptibly succeeds if lock free else is interruptible
841 >     */
842 >    public void testReadLockInterruptibly()      { testReadLockInterruptibly(false); }
843 >    public void testReadLockInterruptibly_fair() { testReadLockInterruptibly(true); }
844 >    public void testReadLockInterruptibly(boolean fair) {
845 >        final PublicReentrantReadWriteLock lock =
846 >            new PublicReentrantReadWriteLock(fair);
847 >        try {
848 >            lock.readLock().lockInterruptibly();
849 >            lock.readLock().unlock();
850              lock.writeLock().lockInterruptibly();
851 <        } catch(Exception e) {
852 <            fail("unexpected exception");
352 <        }
353 <        Thread t = new Thread(new Runnable() {
354 <                public void run() {
355 <                    try {
356 <                        lock.readLock().lockInterruptibly();
357 <                        threadFail("should throw");
358 <                    }
359 <                    catch(InterruptedException success) {
360 <                    }
361 <                }
362 <            });
363 <        try {
364 <            t.start();
365 <            t.interrupt();
366 <            t.join();
367 <            lock.writeLock().unlock();
368 <        } catch(Exception e){
369 <            fail("unexpected exception");
851 >        } catch (InterruptedException ie) {
852 >            threadUnexpectedException(ie);
853          }
854 +        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
855 +            public void realRun() throws InterruptedException {
856 +                lock.readLock().lockInterruptibly();
857 +            }});
858 +
859 +        waitForQueuedThread(lock, t);
860 +        t.interrupt();
861 +        awaitTermination(t);
862 +        releaseWriteLock(lock);
863      }
864  
865 <    public void testAwait_IllegalMonitor() {
866 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
865 >    /**
866 >     * Calling await without holding lock throws IllegalMonitorStateException
867 >     */
868 >    public void testAwait_IMSE()      { testAwait_IMSE(false); }
869 >    public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
870 >    public void testAwait_IMSE(boolean fair) {
871 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
872          final Condition c = lock.writeLock().newCondition();
873 <        try {
874 <            c.await();
875 <            fail("should throw");
876 <        }
877 <        catch (IllegalMonitorStateException success) {
878 <        }
879 <        catch (Exception ex) {
880 <            fail("should throw IMSE");
873 >        for (AwaitMethod awaitMethod : AwaitMethod.values()) {
874 >            long startTime = System.nanoTime();
875 >            try {
876 >                await(c, awaitMethod);
877 >                shouldThrow();
878 >            } catch (IllegalMonitorStateException success) {
879 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
880 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
881          }
882      }
883  
884 <    public void testSignal_IllegalMonitor() {
885 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
884 >    /**
885 >     * Calling signal without holding lock throws IllegalMonitorStateException
886 >     */
887 >    public void testSignal_IMSE()      { testSignal_IMSE(false); }
888 >    public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
889 >    public void testSignal_IMSE(boolean fair) {
890 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
891          final Condition c = lock.writeLock().newCondition();
892          try {
893              c.signal();
894 <            fail("should throw");
895 <        }
394 <        catch (IllegalMonitorStateException success) {
395 <        }
396 <        catch (Exception ex) {
397 <            fail("should throw IMSE");
398 <        }
894 >            shouldThrow();
895 >        } catch (IllegalMonitorStateException success) {}
896      }
897  
898 <    public void testAwaitNanos_Timeout() {
899 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
898 >    /**
899 >     * Calling signalAll without holding lock throws IllegalMonitorStateException
900 >     */
901 >    public void testSignalAll_IMSE()      { testSignalAll_IMSE(false); }
902 >    public void testSignalAll_IMSE_fair() { testSignalAll_IMSE(true); }
903 >    public void testSignalAll_IMSE(boolean fair) {
904 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
905          final Condition c = lock.writeLock().newCondition();
906          try {
907 +            c.signalAll();
908 +            shouldThrow();
909 +        } catch (IllegalMonitorStateException success) {}
910 +    }
911 +
912 +    /**
913 +     * awaitNanos without a signal times out
914 +     */
915 +    public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
916 +    public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
917 +    public void testAwaitNanos_Timeout(boolean fair) {
918 +        try {
919 +            final ReentrantReadWriteLock lock =
920 +                new ReentrantReadWriteLock(fair);
921 +            final Condition c = lock.writeLock().newCondition();
922              lock.writeLock().lock();
923 <            long t = c.awaitNanos(100);
924 <            assertTrue(t <= 0);
923 >            long startTime = System.nanoTime();
924 >            long timeoutMillis = 10;
925 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
926 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
927 >            assertTrue(nanosRemaining <= 0);
928 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
929              lock.writeLock().unlock();
930 <        }
931 <        catch (Exception ex) {
411 <            fail("unexpected exception");
930 >        } catch (InterruptedException e) {
931 >            threadUnexpectedException(e);
932          }
933      }
934  
935 <    public void testAwait_Timeout() {
936 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
937 <        final Condition c = lock.writeLock().newCondition();
938 <        try {
935 >    /**
936 >     * timed await without a signal times out
937 >     */
938 >    public void testAwait_Timeout()      { testAwait_Timeout(false); }
939 >    public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
940 >    public void testAwait_Timeout(boolean fair) {
941 >        try {
942 >            final ReentrantReadWriteLock lock =
943 >                new ReentrantReadWriteLock(fair);
944 >            final Condition c = lock.writeLock().newCondition();
945              lock.writeLock().lock();
946 <            assertFalse(c.await(10, TimeUnit.MILLISECONDS));
946 >            long startTime = System.nanoTime();
947 >            long timeoutMillis = 10;
948 >            assertFalse(c.await(timeoutMillis, MILLISECONDS));
949 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
950              lock.writeLock().unlock();
951 <        }
952 <        catch (Exception ex) {
424 <            fail("unexpected exception");
951 >        } catch (InterruptedException e) {
952 >            threadUnexpectedException(e);
953          }
954      }
955  
956 <    public void testAwaitUntil_Timeout() {
957 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
958 <        final Condition c = lock.writeLock().newCondition();
959 <        try {
956 >    /**
957 >     * awaitUntil without a signal times out
958 >     */
959 >    public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
960 >    public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
961 >    public void testAwaitUntil_Timeout(boolean fair) {
962 >        try {
963 >            final ReentrantReadWriteLock lock =
964 >                new ReentrantReadWriteLock(fair);
965 >            final Condition c = lock.writeLock().newCondition();
966              lock.writeLock().lock();
967 +            long startTime = System.nanoTime();
968 +            long timeoutMillis = 10;
969              java.util.Date d = new java.util.Date();
970 <            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
970 >            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
971 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
972              lock.writeLock().unlock();
973 <        }
974 <        catch (Exception ex) {
438 <            fail("unexpected exception");
973 >        } catch (InterruptedException e) {
974 >            threadUnexpectedException(e);
975          }
976      }
977  
978 <    public void testAwait() {
979 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
978 >    /**
979 >     * await returns when signalled
980 >     */
981 >    public void testAwait()      { testAwait(false); }
982 >    public void testAwait_fair() { testAwait(true); }
983 >    public void testAwait(boolean fair) {
984 >        final PublicReentrantReadWriteLock lock =
985 >            new PublicReentrantReadWriteLock(fair);
986          final Condition c = lock.writeLock().newCondition();
987 <        Thread t = new Thread(new Runnable() {
988 <                public void run() {
989 <                    try {
990 <                        lock.writeLock().lock();
991 <                        c.await();
992 <                        lock.writeLock().unlock();
993 <                    }
994 <                    catch(InterruptedException e) {
995 <                        threadFail("unexpected exception");
996 <                    }
997 <                }
998 <            });
987 >        final CountDownLatch locked = new CountDownLatch(1);
988 >        Thread t = newStartedThread(new CheckedRunnable() {
989 >            public void realRun() throws InterruptedException {
990 >                lock.writeLock().lock();
991 >                locked.countDown();
992 >                c.await();
993 >                lock.writeLock().unlock();
994 >            }});
995 >
996 >        await(locked);
997 >        lock.writeLock().lock();
998 >        assertHasWaiters(lock, c, t);
999 >        c.signal();
1000 >        assertHasNoWaiters(lock, c);
1001 >        assertTrue(t.isAlive());
1002 >        lock.writeLock().unlock();
1003 >        awaitTermination(t);
1004 >    }
1005  
1006 <        try {
1007 <            t.start();
1008 <            Thread.sleep(SHORT_DELAY_MS);
1009 <            lock.writeLock().lock();
1010 <            c.signal();
1011 <            lock.writeLock().unlock();
1012 <            t.join(SHORT_DELAY_MS);
1013 <            assertFalse(t.isAlive());
1014 <        }
1015 <        catch (Exception ex) {
1016 <            fail("unexpected exception");
1017 <        }
1006 >    /**
1007 >     * awaitUninterruptibly doesn't abort on interrupt
1008 >     */
1009 >    public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
1010 >    public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
1011 >    public void testAwaitUninterruptibly(boolean fair) {
1012 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1013 >        final Condition c = lock.writeLock().newCondition();
1014 >        final CountDownLatch locked = new CountDownLatch(1);
1015 >        Thread t = newStartedThread(new CheckedRunnable() {
1016 >            public void realRun() {
1017 >                lock.writeLock().lock();
1018 >                locked.countDown();
1019 >                c.awaitUninterruptibly();
1020 >                assertTrue(Thread.interrupted());
1021 >                lock.writeLock().unlock();
1022 >            }});
1023 >
1024 >        await(locked);
1025 >        lock.writeLock().lock();
1026 >        lock.writeLock().unlock();
1027 >        t.interrupt();
1028 >        long timeoutMillis = 10;
1029 >        assertThreadStaysAlive(t, timeoutMillis);
1030 >        lock.writeLock().lock();
1031 >        c.signal();
1032 >        lock.writeLock().unlock();
1033 >        awaitTermination(t);
1034      }
1035  
1036 <    public void testAwaitUninterruptibly() {
1037 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
1036 >    /**
1037 >     * await/awaitNanos/awaitUntil is interruptible
1038 >     */
1039 >    public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
1040 >    public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
1041 >    public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
1042 >    public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
1043 >    public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
1044 >    public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
1045 >    public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
1046 >    public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
1047 >    public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
1048 >        final PublicReentrantReadWriteLock lock =
1049 >            new PublicReentrantReadWriteLock(fair);
1050          final Condition c = lock.writeLock().newCondition();
1051 <        Thread t = new Thread(new Runnable() {
1052 <                public void run() {
1053 <                    lock.writeLock().lock();
1054 <                    c.awaitUninterruptibly();
1051 >        final CountDownLatch locked = new CountDownLatch(1);
1052 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1053 >            public void realRun() throws InterruptedException {
1054 >                lock.writeLock().lock();
1055 >                assertWriteLockedByMoi(lock);
1056 >                assertHasNoWaiters(lock, c);
1057 >                locked.countDown();
1058 >                try {
1059 >                    await(c, awaitMethod);
1060 >                } finally {
1061 >                    assertWriteLockedByMoi(lock);
1062 >                    assertHasNoWaiters(lock, c);
1063                      lock.writeLock().unlock();
1064 <                }
1065 <            });
1064 >                    assertFalse(Thread.interrupted());
1065 >                }
1066 >            }});
1067 >
1068 >        await(locked);
1069 >        assertHasWaiters(lock, c, t);
1070 >        t.interrupt();
1071 >        awaitTermination(t);
1072 >        assertNotWriteLocked(lock);
1073 >    }
1074 >
1075 >    /**
1076 >     * signalAll wakes up all threads
1077 >     */
1078 >    public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
1079 >    public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
1080 >    public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
1081 >    public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
1082 >    public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
1083 >    public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
1084 >    public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
1085 >    public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
1086 >    public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
1087 >        final PublicReentrantReadWriteLock lock =
1088 >            new PublicReentrantReadWriteLock(fair);
1089 >        final Condition c = lock.writeLock().newCondition();
1090 >        final CountDownLatch locked = new CountDownLatch(2);
1091 >        final Lock writeLock = lock.writeLock();
1092 >        class Awaiter extends CheckedRunnable {
1093 >            public void realRun() throws InterruptedException {
1094 >                writeLock.lock();
1095 >                locked.countDown();
1096 >                await(c, awaitMethod);
1097 >                writeLock.unlock();
1098 >            }
1099 >        }
1100 >
1101 >        Thread t1 = newStartedThread(new Awaiter());
1102 >        Thread t2 = newStartedThread(new Awaiter());
1103 >
1104 >        await(locked);
1105 >        writeLock.lock();
1106 >        assertHasWaiters(lock, c, t1, t2);
1107 >        c.signalAll();
1108 >        assertHasNoWaiters(lock, c);
1109 >        writeLock.unlock();
1110 >        awaitTermination(t1);
1111 >        awaitTermination(t2);
1112 >    }
1113 >
1114 >    /**
1115 >     * signal wakes up waiting threads in FIFO order
1116 >     */
1117 >    public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1118 >    public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1119 >    public void testSignalWakesFifo(boolean fair) {
1120 >        final PublicReentrantReadWriteLock lock =
1121 >            new PublicReentrantReadWriteLock(fair);
1122 >        final Condition c = lock.writeLock().newCondition();
1123 >        final CountDownLatch locked1 = new CountDownLatch(1);
1124 >        final CountDownLatch locked2 = new CountDownLatch(1);
1125 >        final Lock writeLock = lock.writeLock();
1126 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1127 >            public void realRun() throws InterruptedException {
1128 >                writeLock.lock();
1129 >                locked1.countDown();
1130 >                c.await();
1131 >                writeLock.unlock();
1132 >            }});
1133 >
1134 >        await(locked1);
1135 >
1136 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1137 >            public void realRun() throws InterruptedException {
1138 >                writeLock.lock();
1139 >                locked2.countDown();
1140 >                c.await();
1141 >                writeLock.unlock();
1142 >            }});
1143 >
1144 >        await(locked2);
1145 >
1146 >        writeLock.lock();
1147 >        assertHasWaiters(lock, c, t1, t2);
1148 >        assertFalse(lock.hasQueuedThreads());
1149 >        c.signal();
1150 >        assertHasWaiters(lock, c, t2);
1151 >        assertTrue(lock.hasQueuedThread(t1));
1152 >        assertFalse(lock.hasQueuedThread(t2));
1153 >        c.signal();
1154 >        assertHasNoWaiters(lock, c);
1155 >        assertTrue(lock.hasQueuedThread(t1));
1156 >        assertTrue(lock.hasQueuedThread(t2));
1157 >        writeLock.unlock();
1158 >        awaitTermination(t1);
1159 >        awaitTermination(t2);
1160 >    }
1161 >
1162 >    /**
1163 >     * await after multiple reentrant locking preserves lock count
1164 >     */
1165 >    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1166 >    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1167 >    public void testAwaitLockCount(boolean fair) {
1168 >        final PublicReentrantReadWriteLock lock =
1169 >            new PublicReentrantReadWriteLock(fair);
1170 >        final Condition c = lock.writeLock().newCondition();
1171 >        final CountDownLatch locked = new CountDownLatch(2);
1172 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1173 >            public void realRun() throws InterruptedException {
1174 >                lock.writeLock().lock();
1175 >                assertWriteLockedByMoi(lock);
1176 >                assertEquals(1, lock.writeLock().getHoldCount());
1177 >                locked.countDown();
1178 >                c.await();
1179 >                assertWriteLockedByMoi(lock);
1180 >                assertEquals(1, lock.writeLock().getHoldCount());
1181 >                lock.writeLock().unlock();
1182 >            }});
1183 >
1184 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1185 >            public void realRun() throws InterruptedException {
1186 >                lock.writeLock().lock();
1187 >                lock.writeLock().lock();
1188 >                assertWriteLockedByMoi(lock);
1189 >                assertEquals(2, lock.writeLock().getHoldCount());
1190 >                locked.countDown();
1191 >                c.await();
1192 >                assertWriteLockedByMoi(lock);
1193 >                assertEquals(2, lock.writeLock().getHoldCount());
1194 >                lock.writeLock().unlock();
1195 >                lock.writeLock().unlock();
1196 >            }});
1197 >
1198 >        await(locked);
1199 >        lock.writeLock().lock();
1200 >        assertHasWaiters(lock, c, t1, t2);
1201 >        c.signalAll();
1202 >        assertHasNoWaiters(lock, c);
1203 >        lock.writeLock().unlock();
1204 >        awaitTermination(t1);
1205 >        awaitTermination(t2);
1206 >    }
1207 >
1208 >    /**
1209 >     * A serialized lock deserializes as unlocked
1210 >     */
1211 >    public void testSerialization()      { testSerialization(false); }
1212 >    public void testSerialization_fair() { testSerialization(true); }
1213 >    public void testSerialization(boolean fair) {
1214 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1215 >        lock.writeLock().lock();
1216 >        lock.readLock().lock();
1217 >
1218 >        ReentrantReadWriteLock clone = serialClone(lock);
1219 >        assertEquals(lock.isFair(), clone.isFair());
1220 >        assertTrue(lock.isWriteLocked());
1221 >        assertFalse(clone.isWriteLocked());
1222 >        assertEquals(1, lock.getReadLockCount());
1223 >        assertEquals(0, clone.getReadLockCount());
1224 >        clone.writeLock().lock();
1225 >        clone.readLock().lock();
1226 >        assertTrue(clone.isWriteLocked());
1227 >        assertEquals(1, clone.getReadLockCount());
1228 >        clone.readLock().unlock();
1229 >        clone.writeLock().unlock();
1230 >        assertFalse(clone.isWriteLocked());
1231 >        assertEquals(1, lock.getReadLockCount());
1232 >        assertEquals(0, clone.getReadLockCount());
1233 >    }
1234 >
1235 >    /**
1236 >     * hasQueuedThreads reports whether there are waiting threads
1237 >     */
1238 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
1239 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
1240 >    public void testHasQueuedThreads(boolean fair) {
1241 >        final PublicReentrantReadWriteLock lock =
1242 >            new PublicReentrantReadWriteLock(fair);
1243 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1244 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1245 >        assertFalse(lock.hasQueuedThreads());
1246 >        lock.writeLock().lock();
1247 >        assertFalse(lock.hasQueuedThreads());
1248 >        t1.start();
1249 >        waitForQueuedThread(lock, t1);
1250 >        assertTrue(lock.hasQueuedThreads());
1251 >        t2.start();
1252 >        waitForQueuedThread(lock, t2);
1253 >        assertTrue(lock.hasQueuedThreads());
1254 >        t1.interrupt();
1255 >        awaitTermination(t1);
1256 >        assertTrue(lock.hasQueuedThreads());
1257 >        lock.writeLock().unlock();
1258 >        awaitTermination(t2);
1259 >        assertFalse(lock.hasQueuedThreads());
1260 >    }
1261 >
1262 >    /**
1263 >     * hasQueuedThread(null) throws NPE
1264 >     */
1265 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
1266 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
1267 >    public void testHasQueuedThreadNPE(boolean fair) {
1268 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1269 >        try {
1270 >            lock.hasQueuedThread(null);
1271 >            shouldThrow();
1272 >        } catch (NullPointerException success) {}
1273 >    }
1274 >
1275 >    /**
1276 >     * hasQueuedThread reports whether a thread is queued
1277 >     */
1278 >    public void testHasQueuedThread()      { testHasQueuedThread(false); }
1279 >    public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
1280 >    public void testHasQueuedThread(boolean fair) {
1281 >        final PublicReentrantReadWriteLock lock =
1282 >            new PublicReentrantReadWriteLock(fair);
1283 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1284 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1285 >        assertFalse(lock.hasQueuedThread(t1));
1286 >        assertFalse(lock.hasQueuedThread(t2));
1287 >        lock.writeLock().lock();
1288 >        t1.start();
1289 >        waitForQueuedThread(lock, t1);
1290 >        assertTrue(lock.hasQueuedThread(t1));
1291 >        assertFalse(lock.hasQueuedThread(t2));
1292 >        t2.start();
1293 >        waitForQueuedThread(lock, t2);
1294 >        assertTrue(lock.hasQueuedThread(t1));
1295 >        assertTrue(lock.hasQueuedThread(t2));
1296 >        t1.interrupt();
1297 >        awaitTermination(t1);
1298 >        assertFalse(lock.hasQueuedThread(t1));
1299 >        assertTrue(lock.hasQueuedThread(t2));
1300 >        lock.writeLock().unlock();
1301 >        awaitTermination(t2);
1302 >        assertFalse(lock.hasQueuedThread(t1));
1303 >        assertFalse(lock.hasQueuedThread(t2));
1304 >    }
1305  
1306 +    /**
1307 +     * getQueueLength reports number of waiting threads
1308 +     */
1309 +    public void testGetQueueLength()      { testGetQueueLength(false); }
1310 +    public void testGetQueueLength_fair() { testGetQueueLength(true); }
1311 +    public void testGetQueueLength(boolean fair) {
1312 +        final PublicReentrantReadWriteLock lock =
1313 +            new PublicReentrantReadWriteLock(fair);
1314 +        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1315 +        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1316 +        assertEquals(0, lock.getQueueLength());
1317 +        lock.writeLock().lock();
1318 +        t1.start();
1319 +        waitForQueuedThread(lock, t1);
1320 +        assertEquals(1, lock.getQueueLength());
1321 +        t2.start();
1322 +        waitForQueuedThread(lock, t2);
1323 +        assertEquals(2, lock.getQueueLength());
1324 +        t1.interrupt();
1325 +        awaitTermination(t1);
1326 +        assertEquals(1, lock.getQueueLength());
1327 +        lock.writeLock().unlock();
1328 +        awaitTermination(t2);
1329 +        assertEquals(0, lock.getQueueLength());
1330 +    }
1331 +
1332 +    /**
1333 +     * getQueuedThreads includes waiting threads
1334 +     */
1335 +    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
1336 +    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
1337 +    public void testGetQueuedThreads(boolean fair) {
1338 +        final PublicReentrantReadWriteLock lock =
1339 +            new PublicReentrantReadWriteLock(fair);
1340 +        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1341 +        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1342 +        assertTrue(lock.getQueuedThreads().isEmpty());
1343 +        lock.writeLock().lock();
1344 +        assertTrue(lock.getQueuedThreads().isEmpty());
1345 +        t1.start();
1346 +        waitForQueuedThread(lock, t1);
1347 +        assertEquals(1, lock.getQueuedThreads().size());
1348 +        assertTrue(lock.getQueuedThreads().contains(t1));
1349 +        t2.start();
1350 +        waitForQueuedThread(lock, t2);
1351 +        assertEquals(2, lock.getQueuedThreads().size());
1352 +        assertTrue(lock.getQueuedThreads().contains(t1));
1353 +        assertTrue(lock.getQueuedThreads().contains(t2));
1354 +        t1.interrupt();
1355 +        awaitTermination(t1);
1356 +        assertFalse(lock.getQueuedThreads().contains(t1));
1357 +        assertTrue(lock.getQueuedThreads().contains(t2));
1358 +        assertEquals(1, lock.getQueuedThreads().size());
1359 +        lock.writeLock().unlock();
1360 +        awaitTermination(t2);
1361 +        assertTrue(lock.getQueuedThreads().isEmpty());
1362 +    }
1363 +
1364 +    /**
1365 +     * hasWaiters throws NPE if null
1366 +     */
1367 +    public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
1368 +    public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
1369 +    public void testHasWaitersNPE(boolean fair) {
1370 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1371 +        try {
1372 +            lock.hasWaiters(null);
1373 +            shouldThrow();
1374 +        } catch (NullPointerException success) {}
1375 +    }
1376 +
1377 +    /**
1378 +     * getWaitQueueLength throws NPE if null
1379 +     */
1380 +    public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
1381 +    public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
1382 +    public void testGetWaitQueueLengthNPE(boolean fair) {
1383 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1384 +        try {
1385 +            lock.getWaitQueueLength(null);
1386 +            shouldThrow();
1387 +        } catch (NullPointerException success) {}
1388 +    }
1389 +
1390 +    /**
1391 +     * getWaitingThreads throws NPE if null
1392 +     */
1393 +    public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
1394 +    public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
1395 +    public void testGetWaitingThreadsNPE(boolean fair) {
1396 +        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(fair);
1397 +        try {
1398 +            lock.getWaitingThreads(null);
1399 +            shouldThrow();
1400 +        } catch (NullPointerException success) {}
1401 +    }
1402 +
1403 +    /**
1404 +     * hasWaiters throws IllegalArgumentException if not owned
1405 +     */
1406 +    public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
1407 +    public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
1408 +    public void testHasWaitersIAE(boolean fair) {
1409 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1410 +        final Condition c = lock.writeLock().newCondition();
1411 +        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1412          try {
1413 <            t.start();
1414 <            Thread.sleep(SHORT_DELAY_MS);
1415 <            t.interrupt();
487 <            lock.writeLock().lock();
488 <            c.signal();
489 <            lock.writeLock().unlock();
490 <            t.join(SHORT_DELAY_MS);
491 <            assertFalse(t.isAlive());
492 <        }
493 <        catch (Exception ex) {
494 <            fail("unexpected exception");
495 <        }
1413 >            lock2.hasWaiters(c);
1414 >            shouldThrow();
1415 >        } catch (IllegalArgumentException success) {}
1416      }
1417  
1418 <    public void testAwait_Interrupt() {
1419 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
1420 <        final Condition c = lock.writeLock().newCondition();
1421 <        Thread t = new Thread(new Runnable() {
1422 <                public void run() {
1423 <                    try {
1424 <                        lock.writeLock().lock();
1425 <                        c.await();
1426 <                        lock.writeLock().unlock();
1427 <                        threadFail("should throw");
1428 <                    }
1429 <                    catch(InterruptedException success) {
510 <                    }
511 <                }
512 <            });
513 <
514 <        try {
515 <            t.start();
516 <            Thread.sleep(SHORT_DELAY_MS);
517 <            t.interrupt();
518 <            t.join(SHORT_DELAY_MS);
519 <            assertFalse(t.isAlive());
520 <        }
521 <        catch (Exception ex) {
522 <            fail("unexpected exception");
523 <        }
524 <    }
525 <
526 <    public void testAwaitNanos_Interrupt() {
527 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
528 <        final Condition c = lock.writeLock().newCondition();
529 <        Thread t = new Thread(new Runnable() {
530 <                public void run() {
531 <                    try {
532 <                        lock.writeLock().lock();
533 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
534 <                        lock.writeLock().unlock();
535 <                        threadFail("should throw");
536 <                    }
537 <                    catch(InterruptedException success) {
538 <                    }
539 <                }
540 <            });
541 <
542 <        try {
543 <            t.start();
544 <            Thread.sleep(SHORT_DELAY_MS);
545 <            t.interrupt();
546 <            t.join(SHORT_DELAY_MS);
547 <            assertFalse(t.isAlive());
548 <        }
549 <        catch (Exception ex) {
550 <            fail("unexpected exception");
551 <        }
552 <    }
553 <
554 <    public void testAwaitUntil_Interrupt() {
555 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
556 <        final Condition c = lock.writeLock().newCondition();
557 <        Thread t = new Thread(new Runnable() {
558 <                public void run() {
559 <                    try {
560 <                        lock.writeLock().lock();
561 <                        java.util.Date d = new java.util.Date();
562 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
563 <                        lock.writeLock().unlock();
564 <                        threadFail("should throw");
565 <                    }
566 <                    catch(InterruptedException success) {
567 <                    }
568 <                }
569 <            });
570 <
571 <        try {
572 <            t.start();
573 <            Thread.sleep(SHORT_DELAY_MS);
574 <            t.interrupt();
575 <            t.join(SHORT_DELAY_MS);
576 <            assertFalse(t.isAlive());
577 <        }
578 <        catch (Exception ex) {
579 <            fail("unexpected exception");
580 <        }
581 <    }
582 <
583 <    public void testSignalAll() {
584 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
585 <        final Condition c = lock.writeLock().newCondition();
586 <        Thread t1 = new Thread(new Runnable() {
587 <                public void run() {
588 <                    try {
589 <                        lock.writeLock().lock();
590 <                        c.await();
591 <                        lock.writeLock().unlock();
592 <                    }
593 <                    catch(InterruptedException e) {
594 <                        threadFail("unexpected exception");
595 <                    }
596 <                }
597 <            });
598 <
599 <        Thread t2 = new Thread(new Runnable() {
600 <                public void run() {
601 <                    try {
602 <                        lock.writeLock().lock();
603 <                        c.await();
604 <                        lock.writeLock().unlock();
605 <                    }
606 <                    catch(InterruptedException e) {
607 <                        threadFail("unexpected exception");
608 <                    }
609 <                }
610 <            });
611 <
612 <        try {
613 <            t1.start();
614 <            t2.start();
615 <            Thread.sleep(SHORT_DELAY_MS);
616 <            lock.writeLock().lock();
617 <            c.signalAll();
618 <            lock.writeLock().unlock();
619 <            t1.join(SHORT_DELAY_MS);
620 <            t2.join(SHORT_DELAY_MS);
621 <            assertFalse(t1.isAlive());
622 <            assertFalse(t2.isAlive());
623 <        }
624 <        catch (Exception ex) {
625 <            fail("unexpected exception");
626 <        }
1418 >    /**
1419 >     * hasWaiters throws IllegalMonitorStateException if not locked
1420 >     */
1421 >    public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
1422 >    public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
1423 >    public void testHasWaitersIMSE(boolean fair) {
1424 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1425 >        final Condition c = lock.writeLock().newCondition();
1426 >        try {
1427 >            lock.hasWaiters(c);
1428 >            shouldThrow();
1429 >        } catch (IllegalMonitorStateException success) {}
1430      }
1431  
1432 <    public void testSerialization() {
1433 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1434 <        l.readLock().lock();
1435 <        l.readLock().unlock();
1436 <
1437 <        try {
1438 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1439 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1440 <            out.writeObject(l);
1441 <            out.close();
1442 <
1443 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1444 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1445 <            ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1446 <            r.readLock().lock();
1447 <            r.readLock().unlock();
1448 <        } catch(Exception e){
1449 <            e.printStackTrace();
1450 <            fail("unexpected exception");
1451 <        }
1432 >    /**
1433 >     * getWaitQueueLength throws IllegalArgumentException if not owned
1434 >     */
1435 >    public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
1436 >    public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
1437 >    public void testGetWaitQueueLengthIAE(boolean fair) {
1438 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1439 >        final Condition c = lock.writeLock().newCondition();
1440 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1441 >        try {
1442 >            lock2.getWaitQueueLength(c);
1443 >            shouldThrow();
1444 >        } catch (IllegalArgumentException success) {}
1445 >    }
1446 >
1447 >    /**
1448 >     * getWaitQueueLength throws IllegalMonitorStateException if not locked
1449 >     */
1450 >    public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
1451 >    public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
1452 >    public void testGetWaitQueueLengthIMSE(boolean fair) {
1453 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1454 >        final Condition c = lock.writeLock().newCondition();
1455 >        try {
1456 >            lock.getWaitQueueLength(c);
1457 >            shouldThrow();
1458 >        } catch (IllegalMonitorStateException success) {}
1459 >    }
1460 >
1461 >    /**
1462 >     * getWaitingThreads throws IllegalArgumentException if not owned
1463 >     */
1464 >    public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
1465 >    public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
1466 >    public void testGetWaitingThreadsIAE(boolean fair) {
1467 >        final PublicReentrantReadWriteLock lock =
1468 >            new PublicReentrantReadWriteLock(fair);
1469 >        final Condition c = lock.writeLock().newCondition();
1470 >        final PublicReentrantReadWriteLock lock2 =
1471 >            new PublicReentrantReadWriteLock(fair);
1472 >        try {
1473 >            lock2.getWaitingThreads(c);
1474 >            shouldThrow();
1475 >        } catch (IllegalArgumentException success) {}
1476 >    }
1477 >
1478 >    /**
1479 >     * getWaitingThreads throws IllegalMonitorStateException if not locked
1480 >     */
1481 >    public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
1482 >    public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
1483 >    public void testGetWaitingThreadsIMSE(boolean fair) {
1484 >        final PublicReentrantReadWriteLock lock =
1485 >            new PublicReentrantReadWriteLock(fair);
1486 >        final Condition c = lock.writeLock().newCondition();
1487 >        try {
1488 >            lock.getWaitingThreads(c);
1489 >            shouldThrow();
1490 >        } catch (IllegalMonitorStateException success) {}
1491      }
1492  
1493 +    /**
1494 +     * hasWaiters returns true when a thread is waiting, else false
1495 +     */
1496 +    public void testHasWaiters()      { testHasWaiters(false); }
1497 +    public void testHasWaiters_fair() { testHasWaiters(true); }
1498 +    public void testHasWaiters(boolean fair) {
1499 +        final PublicReentrantReadWriteLock lock =
1500 +            new PublicReentrantReadWriteLock(fair);
1501 +        final Condition c = lock.writeLock().newCondition();
1502 +        final CountDownLatch locked = new CountDownLatch(1);
1503 +        Thread t = newStartedThread(new CheckedRunnable() {
1504 +            public void realRun() throws InterruptedException {
1505 +                lock.writeLock().lock();
1506 +                assertHasNoWaiters(lock, c);
1507 +                assertFalse(lock.hasWaiters(c));
1508 +                locked.countDown();
1509 +                c.await();
1510 +                assertHasNoWaiters(lock, c);
1511 +                assertFalse(lock.hasWaiters(c));
1512 +                lock.writeLock().unlock();
1513 +            }});
1514 +
1515 +        await(locked);
1516 +        lock.writeLock().lock();
1517 +        assertHasWaiters(lock, c, t);
1518 +        assertTrue(lock.hasWaiters(c));
1519 +        c.signal();
1520 +        assertHasNoWaiters(lock, c);
1521 +        assertFalse(lock.hasWaiters(c));
1522 +        lock.writeLock().unlock();
1523 +        awaitTermination(t);
1524 +        assertHasNoWaiters(lock, c);
1525 +    }
1526 +
1527 +    /**
1528 +     * getWaitQueueLength returns number of waiting threads
1529 +     */
1530 +    public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
1531 +    public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
1532 +    public void testGetWaitQueueLength(boolean fair) {
1533 +        final PublicReentrantReadWriteLock lock =
1534 +            new PublicReentrantReadWriteLock(fair);
1535 +        final Condition c = lock.writeLock().newCondition();
1536 +        final CountDownLatch locked = new CountDownLatch(1);
1537 +        Thread t = newStartedThread(new CheckedRunnable() {
1538 +            public void realRun() throws InterruptedException {
1539 +                lock.writeLock().lock();
1540 +                assertEquals(0, lock.getWaitQueueLength(c));
1541 +                locked.countDown();
1542 +                c.await();
1543 +                lock.writeLock().unlock();
1544 +            }});
1545 +
1546 +        await(locked);
1547 +        lock.writeLock().lock();
1548 +        assertHasWaiters(lock, c, t);
1549 +        assertEquals(1, lock.getWaitQueueLength(c));
1550 +        c.signal();
1551 +        assertHasNoWaiters(lock, c);
1552 +        assertEquals(0, lock.getWaitQueueLength(c));
1553 +        lock.writeLock().unlock();
1554 +        awaitTermination(t);
1555 +    }
1556 +
1557 +    /**
1558 +     * getWaitingThreads returns only and all waiting threads
1559 +     */
1560 +    public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
1561 +    public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
1562 +    public void testGetWaitingThreads(boolean fair) {
1563 +        final PublicReentrantReadWriteLock lock =
1564 +            new PublicReentrantReadWriteLock(fair);
1565 +        final Condition c = lock.writeLock().newCondition();
1566 +        final CountDownLatch locked1 = new CountDownLatch(1);
1567 +        final CountDownLatch locked2 = new CountDownLatch(1);
1568 +        Thread t1 = new Thread(new CheckedRunnable() {
1569 +            public void realRun() throws InterruptedException {
1570 +                lock.writeLock().lock();
1571 +                assertTrue(lock.getWaitingThreads(c).isEmpty());
1572 +                locked1.countDown();
1573 +                c.await();
1574 +                lock.writeLock().unlock();
1575 +            }});
1576 +
1577 +        Thread t2 = new Thread(new CheckedRunnable() {
1578 +            public void realRun() throws InterruptedException {
1579 +                lock.writeLock().lock();
1580 +                assertFalse(lock.getWaitingThreads(c).isEmpty());
1581 +                locked2.countDown();
1582 +                c.await();
1583 +                lock.writeLock().unlock();
1584 +            }});
1585 +
1586 +        lock.writeLock().lock();
1587 +        assertTrue(lock.getWaitingThreads(c).isEmpty());
1588 +        lock.writeLock().unlock();
1589 +
1590 +        t1.start();
1591 +        await(locked1);
1592 +        t2.start();
1593 +        await(locked2);
1594 +
1595 +        lock.writeLock().lock();
1596 +        assertTrue(lock.hasWaiters(c));
1597 +        assertTrue(lock.getWaitingThreads(c).contains(t1));
1598 +        assertTrue(lock.getWaitingThreads(c).contains(t2));
1599 +        assertEquals(2, lock.getWaitingThreads(c).size());
1600 +        c.signalAll();
1601 +        assertHasNoWaiters(lock, c);
1602 +        lock.writeLock().unlock();
1603 +
1604 +        awaitTermination(t1);
1605 +        awaitTermination(t2);
1606 +
1607 +        assertHasNoWaiters(lock, c);
1608 +    }
1609 +
1610 +    /**
1611 +     * toString indicates current lock state
1612 +     */
1613 +    public void testToString()      { testToString(false); }
1614 +    public void testToString_fair() { testToString(true); }
1615 +    public void testToString(boolean fair) {
1616 +        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1617 +        assertTrue(lock.toString().contains("Write locks = 0"));
1618 +        assertTrue(lock.toString().contains("Read locks = 0"));
1619 +        lock.writeLock().lock();
1620 +        assertTrue(lock.toString().contains("Write locks = 1"));
1621 +        assertTrue(lock.toString().contains("Read locks = 0"));
1622 +        lock.writeLock().unlock();
1623 +        lock.readLock().lock();
1624 +        lock.readLock().lock();
1625 +        assertTrue(lock.toString().contains("Write locks = 0"));
1626 +        assertTrue(lock.toString().contains("Read locks = 2"));
1627 +    }
1628 +
1629 +    /**
1630 +     * readLock.toString indicates current lock state
1631 +     */
1632 +    public void testReadLockToString()      { testReadLockToString(false); }
1633 +    public void testReadLockToString_fair() { testReadLockToString(true); }
1634 +    public void testReadLockToString(boolean fair) {
1635 +        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1636 +        assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1637 +        lock.readLock().lock();
1638 +        lock.readLock().lock();
1639 +        assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1640 +    }
1641 +
1642 +    /**
1643 +     * writeLock.toString indicates current lock state
1644 +     */
1645 +    public void testWriteLockToString()      { testWriteLockToString(false); }
1646 +    public void testWriteLockToString_fair() { testWriteLockToString(true); }
1647 +    public void testWriteLockToString(boolean fair) {
1648 +        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1649 +        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1650 +        lock.writeLock().lock();
1651 +        assertTrue(lock.writeLock().toString().contains("Locked"));
1652 +        lock.writeLock().unlock();
1653 +        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1654 +    }
1655  
1656   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines