ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ReentrantReadWriteLockTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ReentrantReadWriteLockTest.java (file contents):
Revision 1.2 by dl, Sun Sep 7 20:39:11 2003 UTC vs.
Revision 1.77 by jsr166, Fri Jul 3 01:25:15 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines