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.25 by dl, Sun Jan 29 21:17:38 2006 UTC vs.
Revision 1.77 by jsr166, Fri Jul 3 01:25:15 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
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 < import java.util.*;
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      }
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 implements Runnable {
35 >    class InterruptibleLockRunnable extends CheckedRunnable {
36          final ReentrantReadWriteLock lock;
37          InterruptibleLockRunnable(ReentrantReadWriteLock l) { lock = l; }
38 <        public void run() {
39 <            try {
31 <                lock.writeLock().lockInterruptibly();
32 <            } catch(InterruptedException success){}
38 >        public void realRun() throws InterruptedException {
39 >            lock.writeLock().lockInterruptibly();
40          }
41      }
42  
36
43      /**
44       * A runnable calling lockInterruptibly that expects to be
45       * interrupted
46       */
47 <    class InterruptedLockRunnable implements Runnable {
47 >    class InterruptedLockRunnable extends CheckedInterruptedRunnable {
48          final ReentrantReadWriteLock lock;
49          InterruptedLockRunnable(ReentrantReadWriteLock l) { lock = l; }
50 <        public void run() {
51 <            try {
46 <                lock.writeLock().lockInterruptibly();
47 <                threadShouldThrow();
48 <            } catch(InterruptedException success){}
50 >        public void realRun() throws InterruptedException {
51 >            lock.writeLock().lockInterruptibly();
52          }
53      }
54  
# Line 54 | Line 57 | public class ReentrantReadWriteLockTest
57       */
58      static class PublicReentrantReadWriteLock extends ReentrantReadWriteLock {
59          PublicReentrantReadWriteLock() { super(); }
60 <        public Collection<Thread> getQueuedThreads() {
61 <            return super.getQueuedThreads();
60 >        PublicReentrantReadWriteLock(boolean fair) { super(fair); }
61 >        public Thread getOwner() {
62 >            return super.getOwner();
63          }
64 <        public Collection<Thread> getWaitingThreads(Condition c) {
65 <            return super.getWaitingThreads(c);
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      /**
73 <     * Constructor sets given fairness, and is in unlocked state
73 >     * Releases write lock, checking that it had a hold count of 1.
74       */
75 <    public void testConstructor() {
76 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
77 <        assertFalse(rl.isFair());
78 <        assertFalse(rl.isWriteLocked());
79 <        assertEquals(0, rl.getReadLockCount());
80 <        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
74 <        assertTrue(r2.isFair());
75 <        assertFalse(r2.isWriteLocked());
76 <        assertEquals(0, r2.getReadLockCount());
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 <     * write-locking and read-locking an unlocked lock succeed
84 >     * Spin-waits until lock.hasQueuedThread(t) becomes true.
85       */
86 <    public void testLock() {
87 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
88 <        rl.writeLock().lock();
89 <        assertTrue(rl.isWriteLocked());
90 <        assertTrue(rl.isWriteLockedByCurrentThread());
91 <        assertTrue(rl.writeLock().isHeldByCurrentThread());
92 <        assertEquals(0, rl.getReadLockCount());
93 <        rl.writeLock().unlock();
94 <        assertFalse(rl.isWriteLocked());
91 <        assertFalse(rl.isWriteLockedByCurrentThread());
92 <        assertFalse(rl.writeLock().isHeldByCurrentThread());
93 <        assertEquals(0, rl.getReadLockCount());
94 <        rl.readLock().lock();
95 <        assertFalse(rl.isWriteLocked());
96 <        assertFalse(rl.isWriteLockedByCurrentThread());
97 <        assertEquals(1, rl.getReadLockCount());
98 <        rl.readLock().unlock();
99 <        assertFalse(rl.isWriteLocked());
100 <        assertFalse(rl.isWriteLockedByCurrentThread());
101 <        assertEquals(0, rl.getReadLockCount());
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  
104
97      /**
98 <     * locking an unlocked fair lock succeeds
99 <     */
100 <    public void testFairLock() {
101 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
102 <        rl.writeLock().lock();
103 <        assertTrue(rl.isWriteLocked());
104 <        assertTrue(rl.isWriteLockedByCurrentThread());
105 <        assertTrue(rl.writeLock().isHeldByCurrentThread());
106 <        assertEquals(0, rl.getReadLockCount());
115 <        rl.writeLock().unlock();
116 <        assertFalse(rl.isWriteLocked());
117 <        assertFalse(rl.isWriteLockedByCurrentThread());
118 <        assertFalse(rl.writeLock().isHeldByCurrentThread());
119 <        assertEquals(0, rl.getReadLockCount());
120 <        rl.readLock().lock();
121 <        assertFalse(rl.isWriteLocked());
122 <        assertFalse(rl.isWriteLockedByCurrentThread());
123 <        assertEquals(1, rl.getReadLockCount());
124 <        rl.readLock().unlock();
125 <        assertFalse(rl.isWriteLocked());
126 <        assertFalse(rl.isWriteLockedByCurrentThread());
127 <        assertEquals(0, rl.getReadLockCount());
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 <     * getWriteHoldCount returns number of recursive holds
110 >     * Checks that lock is write-locked by the given thread.
111       */
112 <    public void testGetWriteHoldCount() {
113 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
114 <        for(int i = 1; i <= SIZE; i++) {
115 <            lock.writeLock().lock();
116 <            assertEquals(i,lock.getWriteHoldCount());
117 <        }
118 <        for(int i = SIZE; i > 0; i--) {
119 <            lock.writeLock().unlock();
120 <            assertEquals(i-1,lock.getWriteHoldCount());
121 <        }
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 <     * WriteLock.getHoldCount returns number of recursive holds
128 <     */
129 <    public void testGetHoldCount() {
130 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
150 <        for(int i = 1; i <= SIZE; i++) {
151 <            lock.writeLock().lock();
152 <            assertEquals(i,lock.writeLock().getHoldCount());
153 <        }
154 <        for(int i = SIZE; i > 0; i--) {
155 <            lock.writeLock().unlock();
156 <            assertEquals(i-1,lock.writeLock().getHoldCount());
157 <        }
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      /**
134 <     * getReadHoldCount returns number of recursive holds
134 >     * Checks that condition c has no waiters.
135       */
136 <    public void testGetReadHoldCount() {
137 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
165 <        for(int i = 1; i <= SIZE; i++) {
166 <            lock.readLock().lock();
167 <            assertEquals(i,lock.getReadHoldCount());
168 <        }
169 <        for(int i = SIZE; i > 0; i--) {
170 <            lock.readLock().unlock();
171 <            assertEquals(i-1,lock.getReadHoldCount());
172 <        }
136 >    void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
137 >        assertHasWaiters(lock, c, new Thread[] {});
138      }
174    
139  
140      /**
141 <     * write-unlocking an unlocked lock throws IllegalMonitorStateException
141 >     * Checks that condition c has exactly the given waiter threads.
142       */
143 <    public void testUnlock_IllegalMonitorStateException() {
144 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
145 <        try {
146 <            rl.writeLock().unlock();
147 <            shouldThrow();
148 <        } catch(IllegalMonitorStateException success){}
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 <     * write-lockInterruptibly is interruptible
158 >     * Awaits condition "indefinitely" using the specified AwaitMethod.
159       */
160 <    public void testWriteLockInterruptibly_Interrupted() {
161 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
162 <        Thread t = new Thread(new Runnable() {
163 <                public void run() {
164 <                    try {
165 <                        lock.writeLock().lockInterruptibly();
166 <                        lock.writeLock().unlock();
167 <                        lock.writeLock().lockInterruptibly();
168 <                        lock.writeLock().unlock();
169 <                    } catch(InterruptedException success){}
170 <                }
171 <            });
172 <        try {
173 <            lock.writeLock().lock();
174 <            t.start();
175 <            t.interrupt();
176 <            lock.writeLock().unlock();
177 <            t.join();
178 <        } catch(Exception e){
179 <            unexpectedException();
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 <    }
182 >    }
183  
184      /**
185 <     * timed write-tryLock is interruptible
185 >     * Constructor sets given fairness, and is in unlocked state
186       */
187 <    public void testWriteTryLock_Interrupted() {
188 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
189 <        lock.writeLock().lock();
190 <        Thread t = new Thread(new Runnable() {
191 <                public void run() {
192 <                    try {
193 <                        lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
194 <                    } catch(InterruptedException success){}
195 <                }
196 <            });
197 <        try {
198 <            t.start();
199 <            t.interrupt();
200 <            lock.writeLock().unlock();
201 <            t.join();
202 <        } catch(Exception e){
203 <            unexpectedException();
234 <        }
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 <     * read-lockInterruptibly is interruptible
207 >     * write-locking and read-locking an unlocked lock succeed
208       */
209 <    public void testReadLockInterruptibly_Interrupted() {
210 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
211 <        lock.writeLock().lock();
212 <        Thread t = new Thread(new Runnable() {
213 <                public void run() {
214 <                    try {
215 <                        lock.readLock().lockInterruptibly();
216 <                    } catch(InterruptedException success){}
217 <                }
218 <            });
219 <        try {
220 <            t.start();
221 <            t.interrupt();
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 <            t.join();
255 <        } catch(Exception e){
256 <            unexpectedException();
241 >            assertEquals(i - 1,lock.getWriteHoldCount());
242          }
243 <    }
243 >    }
244  
245      /**
246 <     * timed read-tryLock is interruptible
246 >     * writelock.getHoldCount returns number of recursive holds
247       */
248 <    public void testReadTryLock_Interrupted() {
249 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
250 <        lock.writeLock().lock();
251 <        Thread t = new Thread(new Runnable() {
252 <                public void run() {
253 <                    try {
254 <                        lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
255 <                        threadShouldThrow();
256 <                    } catch(InterruptedException success){}
257 <                }
258 <            });
274 <        try {
275 <            t.start();
276 <            t.interrupt();
277 <            t.join();
278 <        } catch(Exception e){
279 <            unexpectedException();
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 >            assertEquals(i - 1,lock.writeLock().getHoldCount());
259          }
260      }
261  
283    
262      /**
263 <     * write-tryLock fails if locked
263 >     * getReadHoldCount returns number of recursive holds
264       */
265 <    public void testWriteTryLockWhenLocked() {
266 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
267 <        lock.writeLock().lock();
268 <        Thread t = new Thread(new Runnable() {
269 <                public void run() {
270 <                    threadAssertFalse(lock.writeLock().tryLock());
271 <                }
272 <            });
273 <        try {
274 <            t.start();
275 <            t.join();
298 <            lock.writeLock().unlock();
299 <        } catch(Exception e){
300 <            unexpectedException();
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 >            assertEquals(i - 1,lock.getReadHoldCount());
276          }
277 <    }
277 >    }
278  
279      /**
280 <     * read-tryLock fails if locked
280 >     * write-unlocking an unlocked lock throws IllegalMonitorStateException
281       */
282 <    public void testReadTryLockWhenLocked() {
283 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
284 <        lock.writeLock().lock();
285 <        Thread t = new Thread(new Runnable() {
311 <                public void run() {
312 <                    threadAssertFalse(lock.readLock().tryLock());
313 <                }
314 <            });
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 {
316            t.start();
317            t.join();
287              lock.writeLock().unlock();
288 <        } catch(Exception e){
289 <            unexpectedException();
290 <        }
322 <    }
288 >            shouldThrow();
289 >        } catch (IllegalMonitorStateException success) {}
290 >    }
291  
292      /**
293 <     * Multiple threads can hold a read lock when not write-locked
293 >     * read-unlocking an unlocked lock throws IllegalMonitorStateException
294       */
295 <    public void testMultipleReadLocks() {
296 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
297 <        lock.readLock().lock();
298 <        Thread t = new Thread(new Runnable() {
331 <                public void run() {
332 <                    threadAssertTrue(lock.readLock().tryLock());
333 <                    lock.readLock().unlock();
334 <                }
335 <            });
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 {
337            t.start();
338            t.join();
300              lock.readLock().unlock();
301 <        } catch(Exception e){
302 <            unexpectedException();
303 <        }
343 <    }
301 >            shouldThrow();
302 >        } catch (IllegalMonitorStateException success) {}
303 >    }
304  
305      /**
306 <     * A writelock succeeds after reading threads unlock
306 >     * write-lockInterruptibly is interruptible
307       */
308 <    public void testWriteAfterMultipleReadLocks() {
309 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
310 <        lock.readLock().lock();
311 <        Thread t1 = new Thread(new Runnable() {
312 <                public void run() {
313 <                    lock.readLock().lock();
314 <                    lock.readLock().unlock();
315 <                }
316 <            });
317 <        Thread t2 = new Thread(new Runnable() {
358 <                public void run() {
359 <                    lock.writeLock().lock();
360 <                    lock.writeLock().unlock();
361 <                }
362 <            });
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 <        try {
320 <            t1.start();
321 <            t2.start();
322 <            Thread.sleep(SHORT_DELAY_MS);
323 <            lock.readLock().unlock();
369 <            t1.join(MEDIUM_DELAY_MS);
370 <            t2.join(MEDIUM_DELAY_MS);
371 <            assertTrue(!t1.isAlive());
372 <            assertTrue(!t2.isAlive());
373 <          
374 <        } catch(Exception e){
375 <            unexpectedException();
376 <        }
377 <    }
319 >        waitForQueuedThread(lock, t);
320 >        t.interrupt();
321 >        awaitTermination(t);
322 >        releaseWriteLock(lock);
323 >    }
324  
325      /**
326 <     * Readlocks succeed after a writing thread unlocks
326 >     * timed write-tryLock is interruptible
327       */
328 <    public void testReadAfterWriteLock() {
329 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
330 <        lock.writeLock().lock();
331 <        Thread t1 = new Thread(new Runnable() {
332 <                public void run() {
333 <                    lock.readLock().lock();
334 <                    lock.readLock().unlock();
335 <                }
336 <            });
337 <        Thread t2 = new Thread(new Runnable() {
338 <                public void run() {
339 <                    lock.readLock().lock();
340 <                    lock.readLock().unlock();
341 <                }
342 <            });
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 <        try {
346 <            t1.start();
347 <            t2.start();
348 <            Thread.sleep(SHORT_DELAY_MS);
349 <            lock.writeLock().unlock();
350 <            t1.join(MEDIUM_DELAY_MS);
351 <            t2.join(MEDIUM_DELAY_MS);
352 <            assertTrue(!t1.isAlive());
353 <            assertTrue(!t2.isAlive());
354 <          
355 <        } catch(Exception e){
356 <            unexpectedException();
357 <        }
358 <    }
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      /**
366 <     * Read trylock succeeds if write locked by current thread
366 >     * timed read-tryLock is interruptible
367       */
368 <    public void testReadHoldingWriteLock() {
369 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
370 <        lock.writeLock().lock();
371 <        assertTrue(lock.readLock().tryLock());
372 <        lock.readLock().unlock();
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 >    /**
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 <    }
398 >        releaseWriteLock(lock);
399 >    }
400  
401      /**
402 <     * Read lock succeeds if write locked by current thread even if
426 <     * other threads are waiting for readlock
402 >     * write-tryLock fails if locked
403       */
404 <    public void testReadHoldingWriteLock2() {
405 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
406 <        lock.writeLock().lock();
407 <        Thread t1 = new Thread(new Runnable() {
408 <                public void run() {
409 <                    lock.readLock().lock();
410 <                    lock.readLock().unlock();
411 <                }
412 <            });
413 <        Thread t2 = new Thread(new Runnable() {
438 <                public void run() {
439 <                    lock.readLock().lock();
440 <                    lock.readLock().unlock();
441 <                }
442 <            });
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 <        try {
416 <            t1.start();
417 <            t2.start();
447 <            lock.readLock().lock();
448 <            lock.readLock().unlock();
449 <            Thread.sleep(SHORT_DELAY_MS);
450 <            lock.readLock().lock();
451 <            lock.readLock().unlock();
452 <            lock.writeLock().unlock();
453 <            t1.join(MEDIUM_DELAY_MS);
454 <            t2.join(MEDIUM_DELAY_MS);
455 <            assertTrue(!t1.isAlive());
456 <            assertTrue(!t2.isAlive());
457 <          
458 <        } catch(Exception e){
459 <            unexpectedException();
460 <        }
461 <    }
415 >        awaitTermination(t);
416 >        releaseWriteLock(lock);
417 >    }
418  
419      /**
420 <     *  Read lock succeeds if write locked by current thread even if
465 <     * other threads are waiting for writelock
420 >     * read-tryLock fails if locked
421       */
422 <    public void testReadHoldingWriteLock3() {
423 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
424 <        lock.writeLock().lock();
425 <        Thread t1 = new Thread(new Runnable() {
426 <                public void run() {
427 <                    lock.writeLock().lock();
428 <                    lock.writeLock().unlock();
429 <                }
430 <            });
431 <        Thread t2 = new Thread(new Runnable() {
477 <                public void run() {
478 <                    lock.writeLock().lock();
479 <                    lock.writeLock().unlock();
480 <                }
481 <            });
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 <        try {
434 <            t1.start();
435 <            t2.start();
486 <            lock.readLock().lock();
487 <            lock.readLock().unlock();
488 <            Thread.sleep(SHORT_DELAY_MS);
489 <            lock.readLock().lock();
490 <            lock.readLock().unlock();
491 <            lock.writeLock().unlock();
492 <            t1.join(MEDIUM_DELAY_MS);
493 <            t2.join(MEDIUM_DELAY_MS);
494 <            assertTrue(!t1.isAlive());
495 <            assertTrue(!t2.isAlive());
496 <          
497 <        } catch(Exception e){
498 <            unexpectedException();
499 <        }
500 <    }
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 <     *  Write lock succeeds if write locked by current thread even if
505 <     * other threads are waiting for writelock
460 >     * A writelock succeeds only after a reading thread unlocks
461       */
462 <    public void testWriteHoldingWriteLock4() {
463 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
464 <        lock.writeLock().lock();
465 <        Thread t1 = new Thread(new Runnable() {
466 <                public void run() {
467 <                    lock.writeLock().lock();
468 <                    lock.writeLock().unlock();
469 <                }
470 <            });
471 <        Thread t2 = new Thread(new Runnable() {
472 <                public void run() {
473 <                    lock.writeLock().lock();
474 <                    lock.writeLock().unlock();
475 <                }
476 <            });
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 <        try {
485 <            t1.start();
486 <            t2.start();
487 <            lock.writeLock().lock();
488 <            lock.writeLock().unlock();
489 <            Thread.sleep(SHORT_DELAY_MS);
490 <            lock.writeLock().lock();
491 <            lock.writeLock().unlock();
492 <            lock.writeLock().unlock();
493 <            t1.join(MEDIUM_DELAY_MS);
494 <            t2.join(MEDIUM_DELAY_MS);
495 <            assertTrue(!t1.isAlive());
496 <            assertTrue(!t2.isAlive());
497 <          
498 <        } catch(Exception e){
499 <            unexpectedException();
500 <        }
501 <    }
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 <     * Fair Read trylock succeeds if write locked by current thread
558 >     * Readlocks succeed only after a writing thread unlocks
559       */
560 <    public void testReadHoldingWriteLockFair() {
561 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
562 <        lock.writeLock().lock();
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 <    }
595 >    }
596  
597      /**
598 <     * Fair Read lock succeeds if write locked by current thread even if
599 <     * other threads are waiting for readlock
598 >     * Read trylock succeeds (barging) even in the presence of waiting
599 >     * readers and/or writers
600       */
601 <    public void testReadHoldingWriteLockFair2() {
602 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
603 <        lock.writeLock().lock();
604 <        Thread t1 = new Thread(new Runnable() {
605 <                public void run() {
606 <                    lock.readLock().lock();
564 <                    lock.readLock().unlock();
565 <                }
566 <            });
567 <        Thread t2 = new Thread(new Runnable() {
568 <                public void run() {
569 <                    lock.readLock().lock();
570 <                    lock.readLock().unlock();
571 <                }
572 <            });
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 <        try {
609 <            t1.start();
610 <            t2.start();
611 <            lock.readLock().lock();
612 <            lock.readLock().unlock();
579 <            Thread.sleep(SHORT_DELAY_MS);
580 <            lock.readLock().lock();
581 <            lock.readLock().unlock();
582 <            lock.writeLock().unlock();
583 <            t1.join(MEDIUM_DELAY_MS);
584 <            t2.join(MEDIUM_DELAY_MS);
585 <            assertTrue(!t1.isAlive());
586 <            assertTrue(!t2.isAlive());
587 <          
588 <        } catch(Exception e){
589 <            unexpectedException();
590 <        }
591 <    }
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 <     * Fair Read lock succeeds if write locked by current thread even if
675 >     * Read lock succeeds if write locked by current thread even if
676       * other threads are waiting for writelock
677       */
678 <    public void testReadHoldingWriteLockFair3() {
679 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
680 <        lock.writeLock().lock();
681 <        Thread t1 = new Thread(new Runnable() {
682 <                public void run() {
683 <                    lock.writeLock().lock();
684 <                    lock.writeLock().unlock();
685 <                }
606 <            });
607 <        Thread t2 = new Thread(new Runnable() {
608 <                public void run() {
609 <                    lock.writeLock().lock();
610 <                    lock.writeLock().unlock();
611 <                }
612 <            });
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 <        try {
688 <            t1.start();
689 <            t2.start();
690 <            lock.readLock().lock();
691 <            lock.readLock().unlock();
692 <            Thread.sleep(SHORT_DELAY_MS);
693 <            lock.readLock().lock();
694 <            lock.readLock().unlock();
695 <            lock.writeLock().unlock();
696 <            t1.join(MEDIUM_DELAY_MS);
624 <            t2.join(MEDIUM_DELAY_MS);
625 <            assertTrue(!t1.isAlive());
626 <            assertTrue(!t2.isAlive());
627 <          
628 <        } catch(Exception e){
629 <            unexpectedException();
630 <        }
631 <    }
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 <     * Fair Write lock succeeds if write locked by current thread even if
710 >     * Write lock succeeds if write locked by current thread even if
711       * other threads are waiting for writelock
712       */
713 <    public void testWriteHoldingWriteLockFair4() {
714 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
715 <        lock.writeLock().lock();
716 <        Thread t1 = new Thread(new Runnable() {
717 <                public void run() {
718 <                    lock.writeLock().lock();
719 <                    lock.writeLock().unlock();
720 <                }
646 <            });
647 <        Thread t2 = new Thread(new Runnable() {
648 <                public void run() {
649 <                    lock.writeLock().lock();
650 <                    lock.writeLock().unlock();
651 <                }
652 <            });
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 <        try {
723 <            t1.start();
724 <            t2.start();
725 <            Thread.sleep(SHORT_DELAY_MS);
726 <            assertTrue(lock.isWriteLockedByCurrentThread());
727 <            assertTrue(lock.getWriteHoldCount() == 1);
728 <            lock.writeLock().lock();
729 <            assertTrue(lock.getWriteHoldCount() == 2);
730 <            lock.writeLock().unlock();
731 <            lock.writeLock().lock();
664 <            lock.writeLock().unlock();
665 <            lock.writeLock().unlock();
666 <            t1.join(MEDIUM_DELAY_MS);
667 <            t2.join(MEDIUM_DELAY_MS);
668 <            assertTrue(!t1.isAlive());
669 <            assertTrue(!t2.isAlive());
670 <          
671 <        } catch(Exception e){
672 <            unexpectedException();
673 <        }
674 <    }
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() {
752 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
753 <        lock.readLock().lock();
754 <        Thread t = new Thread(new Runnable() {
755 <                public void run() {
756 <                    threadAssertTrue(lock.readLock().tryLock());
757 <                    lock.readLock().unlock();
758 <                }
759 <            });
760 <        try {
690 <            t.start();
691 <            t.join();
692 <            lock.readLock().unlock();
693 <        } catch(Exception e){
694 <            unexpectedException();
695 <        }
696 <    }
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 <    
762 >        awaitTermination(t);
763 >        lock.readLock().unlock();
764 >    }
765  
766      /**
767       * write tryLock fails when readlocked
768       */
769 <    public void testWriteTryLockWhenReadLocked() {
770 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
771 <        lock.readLock().lock();
772 <        Thread t = new Thread(new Runnable() {
773 <                public void run() {
774 <                    threadAssertFalse(lock.writeLock().tryLock());
775 <                }
776 <            });
777 <        try {
712 <            t.start();
713 <            t.join();
714 <            lock.readLock().unlock();
715 <        } catch(Exception e){
716 <            unexpectedException();
717 <        }
718 <    }
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 <     * Fair Read tryLock succeeds if readlocked but not writelocked
784 >     * write timed tryLock times out if locked
785       */
786 <    public void testTryLockWhenReadLockedFair() {
787 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
788 <        lock.readLock().lock();
789 <        Thread t = new Thread(new Runnable() {
790 <                public void run() {
791 <                    threadAssertTrue(lock.readLock().tryLock());
792 <                    lock.readLock().unlock();
793 <                }
794 <            });
795 <        try {
796 <            t.start();
797 <            t.join();
798 <            lock.readLock().unlock();
737 <        } catch(Exception e){
738 <            unexpectedException();
739 <        }
740 <    }
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 <    
800 >        awaitTermination(t);
801 >        releaseWriteLock(lock);
802 >    }
803  
804      /**
805 <     * Fair write tryLock fails when readlocked
805 >     * read timed tryLock times out if write-locked
806       */
807 <    public void testWriteTryLockWhenReadLockedFair() {
808 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
809 <        lock.readLock().lock();
810 <        Thread t = new Thread(new Runnable() {
811 <                public void run() {
812 <                    threadAssertFalse(lock.writeLock().tryLock());
813 <                }
814 <            });
815 <        try {
816 <            t.start();
817 <            t.join();
818 <            lock.readLock().unlock();
759 <        } catch(Exception e){
760 <            unexpectedException();
761 <        }
762 <    }
763 <
764 <    
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 <    /**
821 <     * write timed tryLock times out if locked
822 <     */
823 <    public void testWriteTryLock_Timeout() {
770 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
771 <        lock.writeLock().lock();
772 <        Thread t = new Thread(new Runnable() {
773 <                public void run() {
774 <                    try {
775 <                        threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
776 <                    } catch (Exception ex) {
777 <                        threadUnexpectedException();
778 <                    }
779 <                }
780 <            });
781 <        try {
782 <            t.start();
783 <            t.join();
784 <            lock.writeLock().unlock();
785 <        } catch(Exception e){
786 <            unexpectedException();
787 <        }
788 <    }
820 >        awaitTermination(t);
821 >        assertTrue(lock.writeLock().isHeldByCurrentThread());
822 >        lock.writeLock().unlock();
823 >    }
824  
825      /**
826 <     * read timed tryLock times out if write-locked
826 >     * write lockInterruptibly succeeds if unlocked, else is interruptible
827       */
828 <    public void testReadTryLock_Timeout() {
829 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
830 <        lock.writeLock().lock();
831 <        Thread t = new Thread(new Runnable() {
832 <                public void run() {
798 <                    try {
799 <                        threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
800 <                    } catch (Exception ex) {
801 <                        threadUnexpectedException();
802 <                    }
803 <                }
804 <            });
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 <            t.start();
835 <            t.join();
836 <            lock.writeLock().unlock();
837 <        } catch(Exception e){
838 <            unexpectedException();
839 <        }
812 <    }
834 >            lock.writeLock().lockInterruptibly();
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      /**
849 <     * write lockInterruptibly succeeds if lock free else is interruptible
849 >     * read lockInterruptibly succeeds if lock free else is interruptible
850       */
851 <    public void testWriteLockInterruptibly() {
852 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
853 <        try {
854 <            lock.writeLock().lockInterruptibly();
855 <        } catch(Exception e) {
823 <            unexpectedException();
824 <        }
825 <        Thread t = new Thread(new Runnable() {
826 <                public void run() {
827 <                    try {
828 <                        lock.writeLock().lockInterruptibly();
829 <                        threadShouldThrow();
830 <                    }
831 <                    catch(InterruptedException success) {
832 <                    }
833 <                }
834 <            });
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 <            t.start();
858 <            t.interrupt();
859 <            t.join();
860 <            lock.writeLock().unlock();
861 <        } catch(Exception e){
862 <            unexpectedException();
863 <        }
857 >            lock.readLock().lockInterruptibly();
858 >            lock.readLock().unlock();
859 >            lock.writeLock().lockInterruptibly();
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      /**
873 <     *  read lockInterruptibly succeeds if lock free else is interruptible
873 >     * Calling await without holding lock throws IllegalMonitorStateException
874       */
875 <    public void testReadLockInterruptibly() {
876 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
877 <        try {
878 <            lock.writeLock().lockInterruptibly();
879 <        } catch(Exception e) {
880 <            unexpectedException();
881 <        }
882 <        Thread t = new Thread(new Runnable() {
883 <                public void run() {
884 <                    try {
885 <                        lock.readLock().lockInterruptibly();
886 <                        threadShouldThrow();
887 <                    }
888 <                    catch(InterruptedException success) {
889 <                    }
863 <                }
864 <            });
865 <        try {
866 <            t.start();
867 <            t.interrupt();
868 <            t.join();
869 <            lock.writeLock().unlock();
870 <        } catch(Exception e){
871 <            unexpectedException();
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 >        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      /**
894 <     * Calling await without holding lock throws IllegalMonitorStateException
894 >     * Calling signal without holding lock throws IllegalMonitorStateException
895       */
896 <    public void testAwait_IllegalMonitor() {
897 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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.await();
883 <            shouldThrow();
884 <        }
885 <        catch (IllegalMonitorStateException success) {
886 <        }
887 <        catch (Exception ex) {
902 >            c.signal();
903              shouldThrow();
904 <        }
904 >        } catch (IllegalMonitorStateException success) {}
905      }
906  
907      /**
908 <     * Calling signal without holding lock throws IllegalMonitorStateException
908 >     * Calling signalAll without holding lock throws IllegalMonitorStateException
909       */
910 <    public void testSignal_IllegalMonitor() {
911 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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.signal();
916 >            c.signalAll();
917              shouldThrow();
918 <        }
902 <        catch (IllegalMonitorStateException success) {
903 <        }
904 <        catch (Exception ex) {
905 <            unexpectedException();
906 <        }
918 >        } catch (IllegalMonitorStateException success) {}
919      }
920  
921      /**
922       * awaitNanos without a signal times out
923       */
924 <    public void testAwaitNanos_Timeout() {
925 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
926 <        final Condition c = lock.writeLock().newCondition();
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 <        }
921 <        catch (Exception ex) {
922 <            unexpectedException();
923 <        }
939 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
940      }
941  
926
942      /**
943 <     *  timed await without a signal times out
943 >     * timed await without a signal times out
944       */
945 <    public void testAwait_Timeout() {
946 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
947 <        final Condition c = lock.writeLock().newCondition();
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 +            long startTime = System.nanoTime();
954 +            long timeoutMillis = 10;
955 +            assertFalse(c.await(timeoutMillis, MILLISECONDS));
956 +            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
957              lock.writeLock().unlock();
958 <        }
937 <        catch (Exception ex) {
938 <            unexpectedException();
939 <        }
958 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
959      }
960  
961      /**
962       * awaitUntil without a signal times out
963       */
964 <    public void testAwaitUntil_Timeout() {
965 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
966 <        final Condition c = lock.writeLock().newCondition();
967 <        try {
968 <            lock.writeLock().lock();
969 <            java.util.Date d = new java.util.Date();
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 >            long startTime = System.nanoTime();
973 >            assertFalse(c.awaitUntil(delayedDate(timeoutMillis())));
974 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
975              lock.writeLock().unlock();
976 <        }
953 <        catch (Exception ex) {
954 <            unexpectedException();
955 <        }
976 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
977      }
978  
979      /**
980       * await returns when signalled
981       */
982 <    public void testAwait() {
983 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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 <        Thread t = new Thread(new Runnable() {
989 <                public void run() {
990 <                    try {
991 <                        lock.writeLock().lock();
992 <                        c.await();
993 <                        lock.writeLock().unlock();
994 <                    }
995 <                    catch(InterruptedException e) {
972 <                        threadUnexpectedException();
973 <                    }
974 <                }
975 <            });
976 <
977 <        try {
978 <            t.start();
979 <            Thread.sleep(SHORT_DELAY_MS);
980 <            lock.writeLock().lock();
981 <            c.signal();
982 <            lock.writeLock().unlock();
983 <            t.join(SHORT_DELAY_MS);
984 <            assertFalse(t.isAlive());
985 <        }
986 <        catch (Exception ex) {
987 <            unexpectedException();
988 <        }
989 <    }
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 <    /** A helper class for uninterruptible wait tests */
998 <    class UninterruptableThread extends Thread {
999 <        private Lock lock;
1000 <        private Condition c;
1001 <        
1002 <        public volatile boolean canAwake = false;
1003 <        public volatile boolean interrupted = false;
1004 <        public volatile boolean lockStarted = false;
999 <        
1000 <        public UninterruptableThread(Lock lock, Condition c) {
1001 <            this.lock = lock;
1002 <            this.c = c;
1003 <        }
1004 <        
1005 <        public synchronized void run() {
1006 <            lock.lock();
1007 <            lockStarted = true;
1008 <            
1009 <            while (!canAwake) {
1010 <                c.awaitUninterruptibly();
1011 <            }
1012 <            
1013 <            interrupted = isInterrupted();
1014 <            lock.unlock();
1015 <        }
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      /**
1008 <     * awaitUninterruptibly doesn't abort on interrupt
1008 >     * awaitUninterruptibly is uninterruptible
1009       */
1010 <    public void testAwaitUninterruptibly() {
1011 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 <        UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
1015 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
1016  
1017 <        try {
1018 <            thread.start();
1019 <
1020 <            while (!thread.lockStarted) {
1021 <                Thread.sleep(100);
1022 <            }
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 <            lock.writeLock().lock();
1029 <            try {
1030 <                thread.interrupt();
1031 <                thread.canAwake = true;
1032 <                c.signal();
1033 <            } finally {
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 <            }
1036 >            }});
1037  
1038 <            thread.join();
1039 <            assertTrue(thread.interrupted);
1040 <            assertFalse(thread.isAlive());
1041 <        } catch (Exception ex) {
1042 <            unexpectedException();
1043 <        }
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      /**
1055 <     * await is interruptible
1055 >     * await/awaitNanos/awaitUntil is interruptible
1056       */
1057 <    public void testAwait_Interrupt() {
1058 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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 <                    try {
1072 <                        lock.writeLock().lock();
1073 <                        c.await();
1074 <                        lock.writeLock().unlock();
1075 <                        threadShouldThrow();
1076 <                    }
1077 <                    catch(InterruptedException success) {
1078 <                    }
1079 <                }
1080 <            });
1081 <
1082 <        try {
1083 <            t.start();
1084 <            Thread.sleep(SHORT_DELAY_MS);
1085 <            t.interrupt();
1086 <            t.join(SHORT_DELAY_MS);
1087 <            assertFalse(t.isAlive());
1088 <        }
1089 <        catch (Exception ex) {
1090 <            unexpectedException();
1078 <        }
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 >                    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 <     * awaitNanos is interruptible
1094 >     * signalAll wakes up all threads
1095       */
1096 <    public void testAwaitNanos_Interrupt() {
1097 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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 <        Thread t = new Thread(new Runnable() {
1109 <                public void run() {
1110 <                    try {
1111 <                        lock.writeLock().lock();
1112 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
1113 <                        lock.writeLock().unlock();
1114 <                        threadShouldThrow();
1115 <                    }
1116 <                    catch(InterruptedException success) {
1096 <                    }
1097 <                }
1098 <            });
1099 <
1100 <        try {
1101 <            t.start();
1102 <            Thread.sleep(SHORT_DELAY_MS);
1103 <            t.interrupt();
1104 <            t.join(SHORT_DELAY_MS);
1105 <            assertFalse(t.isAlive());
1106 <        }
1107 <        catch (Exception ex) {
1108 <            unexpectedException();
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 <     * awaitUntil is interruptible
1134 <     */
1135 <    public void testAwaitUntil_Interrupt() {
1136 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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 <        Thread t = new Thread(new Runnable() {
1142 <                public void run() {
1143 <                    try {
1144 <                        lock.writeLock().lock();
1145 <                        java.util.Date d = new java.util.Date();
1146 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
1147 <                        lock.writeLock().unlock();
1148 <                        threadShouldThrow();
1149 <                    }
1150 <                    catch(InterruptedException success) {
1151 <                    }
1152 <                }
1153 <            });
1154 <
1155 <        try {
1156 <            t.start();
1157 <            Thread.sleep(SHORT_DELAY_MS);
1158 <            t.interrupt();
1159 <            t.join(SHORT_DELAY_MS);
1160 <            assertFalse(t.isAlive());
1161 <        }
1162 <        catch (Exception ex) {
1163 <            unexpectedException();
1164 <        }
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 <     * signalAll wakes up all threads
1182 <     */
1183 <    public void testSignalAll() {
1184 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();      
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 <        Thread t1 = new Thread(new Runnable() {
1190 <                public void run() {
1191 <                    try {
1192 <                        lock.writeLock().lock();
1193 <                        c.await();
1194 <                        lock.writeLock().unlock();
1195 <                    }
1196 <                    catch(InterruptedException e) {
1197 <                        threadUnexpectedException();
1198 <                    }
1199 <                }
1200 <            });
1162 <
1163 <        Thread t2 = new Thread(new Runnable() {
1164 <                public void run() {
1165 <                    try {
1166 <                        lock.writeLock().lock();
1167 <                        c.await();
1168 <                        lock.writeLock().unlock();
1169 <                    }
1170 <                    catch(InterruptedException e) {
1171 <                        threadUnexpectedException();
1172 <                    }
1173 <                }
1174 <            });
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 <        try {
1203 <            t1.start();
1204 <            t2.start();
1205 <            Thread.sleep(SHORT_DELAY_MS);
1206 <            lock.writeLock().lock();
1207 <            c.signalAll();
1208 <            lock.writeLock().unlock();
1209 <            t1.join(SHORT_DELAY_MS);
1210 <            t2.join(SHORT_DELAY_MS);
1211 <            assertFalse(t1.isAlive());
1212 <            assertFalse(t2.isAlive());
1213 <        }
1214 <        catch (Exception ex) {
1215 <            unexpectedException();
1216 <        }
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() {
1230 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1231 <        l.readLock().lock();
1232 <        l.readLock().unlock();
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 <        try {
1237 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1238 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1239 <            out.writeObject(l);
1240 <            out.close();
1241 <
1242 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1243 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1244 <            ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1245 <            r.readLock().lock();
1246 <            r.readLock().unlock();
1247 <        } catch(Exception e){
1248 <            e.printStackTrace();
1249 <            unexpectedException();
1250 <        }
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() {
1257 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 <        try {
1264 <            assertFalse(lock.hasQueuedThreads());
1265 <            lock.writeLock().lock();
1266 <            t1.start();
1267 <            Thread.sleep(SHORT_DELAY_MS);
1268 <            assertTrue(lock.hasQueuedThreads());
1269 <            t2.start();
1270 <            Thread.sleep(SHORT_DELAY_MS);
1271 <            assertTrue(lock.hasQueuedThreads());
1272 <            t1.interrupt();
1273 <            Thread.sleep(SHORT_DELAY_MS);
1274 <            assertTrue(lock.hasQueuedThreads());
1275 <            lock.writeLock().unlock();
1276 <            Thread.sleep(SHORT_DELAY_MS);
1277 <            assertFalse(lock.hasQueuedThreads());
1278 <            t1.join();
1241 <            t2.join();
1242 <        } catch(Exception e){
1243 <            unexpectedException();
1244 <        }
1245 <    }
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() {
1284 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
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 <            sync.hasQueuedThread(null);
1288 >            lock.hasQueuedThread(null);
1289              shouldThrow();
1290 <        } catch (NullPointerException success) {
1256 <        }
1290 >        } catch (NullPointerException success) {}
1291      }
1292  
1293      /**
1294 <     * hasQueuedThread reports whether a thread is queued.
1294 >     * hasQueuedThread reports whether a thread is queued
1295       */
1296 <    public void testHasQueuedThread() {
1297 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1298 <        Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1299 <        Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1300 <        try {
1301 <            assertFalse(sync.hasQueuedThread(t1));
1302 <            assertFalse(sync.hasQueuedThread(t2));
1303 <            sync.writeLock().lock();
1304 <            t1.start();
1305 <            Thread.sleep(SHORT_DELAY_MS);
1306 <            assertTrue(sync.hasQueuedThread(t1));
1307 <            t2.start();
1308 <            Thread.sleep(SHORT_DELAY_MS);
1309 <            assertTrue(sync.hasQueuedThread(t1));
1310 <            assertTrue(sync.hasQueuedThread(t2));
1311 <            t1.interrupt();
1312 <            Thread.sleep(SHORT_DELAY_MS);
1313 <            assertFalse(sync.hasQueuedThread(t1));
1314 <            assertTrue(sync.hasQueuedThread(t2));
1315 <            sync.writeLock().unlock();
1316 <            Thread.sleep(SHORT_DELAY_MS);
1317 <            assertFalse(sync.hasQueuedThread(t1));
1318 <            Thread.sleep(SHORT_DELAY_MS);
1319 <            assertFalse(sync.hasQueuedThread(t2));
1320 <            t1.join();
1321 <            t2.join();
1322 <        } catch(Exception e){
1289 <            unexpectedException();
1290 <        }
1291 <    }
1292 <
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() {
1328 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 <        try {
1335 <            assertEquals(0, lock.getQueueLength());
1336 <            lock.writeLock().lock();
1337 <            t1.start();
1338 <            Thread.sleep(SHORT_DELAY_MS);
1339 <            assertEquals(1, lock.getQueueLength());
1340 <            t2.start();
1341 <            Thread.sleep(SHORT_DELAY_MS);
1342 <            assertEquals(2, lock.getQueueLength());
1343 <            t1.interrupt();
1344 <            Thread.sleep(SHORT_DELAY_MS);
1345 <            assertEquals(1, lock.getQueueLength());
1346 <            lock.writeLock().unlock();
1347 <            Thread.sleep(SHORT_DELAY_MS);
1348 <            assertEquals(0, lock.getQueueLength());
1316 <            t1.join();
1317 <            t2.join();
1318 <        } catch(Exception e){
1319 <            unexpectedException();
1320 <        }
1321 <    }
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() {
1354 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 <        try {
1361 <            assertTrue(lock.getQueuedThreads().isEmpty());
1362 <            lock.writeLock().lock();
1363 <            assertTrue(lock.getQueuedThreads().isEmpty());
1364 <            t1.start();
1365 <            Thread.sleep(SHORT_DELAY_MS);
1366 <            assertTrue(lock.getQueuedThreads().contains(t1));
1367 <            t2.start();
1368 <            Thread.sleep(SHORT_DELAY_MS);
1369 <            assertTrue(lock.getQueuedThreads().contains(t1));
1370 <            assertTrue(lock.getQueuedThreads().contains(t2));
1371 <            t1.interrupt();
1372 <            Thread.sleep(SHORT_DELAY_MS);
1373 <            assertFalse(lock.getQueuedThreads().contains(t1));
1374 <            assertTrue(lock.getQueuedThreads().contains(t2));
1375 <            lock.writeLock().unlock();
1376 <            Thread.sleep(SHORT_DELAY_MS);
1377 <            assertTrue(lock.getQueuedThreads().isEmpty());
1378 <            t1.join();
1379 <            t2.join();
1380 <        } catch(Exception e){
1351 <            unexpectedException();
1352 <        }
1353 <    }
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() {
1386 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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) {
1364 <        } catch (Exception ex) {
1365 <            unexpectedException();
1366 <        }
1392 >        } catch (NullPointerException success) {}
1393      }
1394  
1395      /**
1396       * getWaitQueueLength throws NPE if null
1397       */
1398 <    public void testGetWaitQueueLengthNPE() {
1399 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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) {
1378 <        } catch (Exception ex) {
1379 <            unexpectedException();
1380 <        }
1405 >        } catch (NullPointerException success) {}
1406      }
1407  
1383
1408      /**
1409       * getWaitingThreads throws NPE if null
1410       */
1411 <    public void testGetWaitingThreadsNPE() {
1412 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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) {
1393 <        } catch (Exception ex) {
1394 <            unexpectedException();
1395 <        }
1418 >        } catch (NullPointerException success) {}
1419      }
1420  
1421      /**
1422 <     * hasWaiters throws IAE if not owned
1422 >     * hasWaiters throws IllegalArgumentException if not owned
1423       */
1424 <    public void testHasWaitersIAE() {
1425 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1426 <        final Condition c = (lock.writeLock().newCondition());
1427 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
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              lock2.hasWaiters(c);
1432              shouldThrow();
1433 <        } catch (IllegalArgumentException success) {
1409 <        } catch (Exception ex) {
1410 <            unexpectedException();
1411 <        }
1433 >        } catch (IllegalArgumentException success) {}
1434      }
1435  
1436      /**
1437 <     * hasWaiters throws IMSE if not locked
1437 >     * hasWaiters throws IllegalMonitorStateException if not locked
1438       */
1439 <    public void testHasWaitersIMSE() {
1440 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1441 <        final Condition c = (lock.writeLock().newCondition());
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) {
1424 <        } catch (Exception ex) {
1425 <            unexpectedException();
1426 <        }
1447 >        } catch (IllegalMonitorStateException success) {}
1448      }
1449  
1429
1450      /**
1451 <     * getWaitQueueLength throws IAE if not owned
1451 >     * getWaitQueueLength throws IllegalArgumentException if not owned
1452       */
1453 <    public void testGetWaitQueueLengthIAE() {
1454 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1455 <        final Condition c = (lock.writeLock().newCondition());
1456 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
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) {
1441 <        } catch (Exception ex) {
1442 <            unexpectedException();
1443 <        }
1462 >        } catch (IllegalArgumentException success) {}
1463      }
1464  
1465      /**
1466 <     * getWaitQueueLength throws IMSE if not locked
1466 >     * getWaitQueueLength throws IllegalMonitorStateException if not locked
1467       */
1468 <    public void testGetWaitQueueLengthIMSE() {
1469 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1470 <        final Condition c = (lock.writeLock().newCondition());
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) {
1456 <        } catch (Exception ex) {
1457 <            unexpectedException();
1458 <        }
1476 >        } catch (IllegalMonitorStateException success) {}
1477      }
1478  
1461
1479      /**
1480 <     * getWaitingThreads throws IAE if not owned
1480 >     * getWaitingThreads throws IllegalArgumentException if not owned
1481       */
1482 <    public void testGetWaitingThreadsIAE() {
1483 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();  
1484 <        final Condition c = (lock.writeLock().newCondition());
1485 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();  
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) {
1473 <        } catch (Exception ex) {
1474 <            unexpectedException();
1475 <        }
1493 >        } catch (IllegalArgumentException success) {}
1494      }
1495  
1496      /**
1497 <     * getWaitingThreads throws IMSE if not locked
1497 >     * getWaitingThreads throws IllegalMonitorStateException if not locked
1498       */
1499 <    public void testGetWaitingThreadsIMSE() {
1500 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();  
1501 <        final Condition c = (lock.writeLock().newCondition());
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) {
1488 <        } catch (Exception ex) {
1489 <            unexpectedException();
1490 <        }
1508 >        } catch (IllegalMonitorStateException success) {}
1509      }
1510  
1493
1511      /**
1512       * hasWaiters returns true when a thread is waiting, else false
1513       */
1514 <    public void testHasWaiters() {
1515 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1516 <        final Condition c = (lock.writeLock().newCondition());
1517 <        Thread t = new Thread(new Runnable() {
1518 <                public void run() {
1519 <                    try {
1520 <                        lock.writeLock().lock();
1521 <                        threadAssertFalse(lock.hasWaiters(c));
1522 <                        threadAssertEquals(0, lock.getWaitQueueLength(c));
1523 <                        c.await();
1524 <                        lock.writeLock().unlock();
1525 <                    }
1526 <                    catch(InterruptedException e) {
1527 <                        threadUnexpectedException();
1528 <                    }
1529 <                }
1530 <            });
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 <        try {
1534 <            t.start();
1535 <            Thread.sleep(SHORT_DELAY_MS);
1536 <            lock.writeLock().lock();
1537 <            assertTrue(lock.hasWaiters(c));
1538 <            assertEquals(1, lock.getWaitQueueLength(c));
1539 <            c.signal();
1540 <            lock.writeLock().unlock();
1541 <            Thread.sleep(SHORT_DELAY_MS);
1542 <            lock.writeLock().lock();
1525 <            assertFalse(lock.hasWaiters(c));
1526 <            assertEquals(0, lock.getWaitQueueLength(c));
1527 <            lock.writeLock().unlock();
1528 <            t.join(SHORT_DELAY_MS);
1529 <            assertFalse(t.isAlive());
1530 <        }
1531 <        catch (Exception ex) {
1532 <            unexpectedException();
1533 <        }
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() {
1549 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1550 <        final Condition c = (lock.writeLock().newCondition());
1551 <        Thread t = new Thread(new Runnable() {
1552 <                public void run() {
1553 <                    try {
1554 <                        lock.writeLock().lock();
1555 <                        threadAssertFalse(lock.hasWaiters(c));
1556 <                        threadAssertEquals(0, lock.getWaitQueueLength(c));
1557 <                        c.await();
1558 <                        lock.writeLock().unlock();
1559 <                    }
1560 <                    catch(InterruptedException e) {
1561 <                        threadUnexpectedException();
1562 <                    }
1554 <                }
1555 <            });
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 <        try {
1565 <            t.start();
1566 <            Thread.sleep(SHORT_DELAY_MS);
1567 <            lock.writeLock().lock();
1568 <            assertTrue(lock.hasWaiters(c));
1569 <            assertEquals(1, lock.getWaitQueueLength(c));
1570 <            c.signal();
1571 <            lock.writeLock().unlock();
1572 <            Thread.sleep(SHORT_DELAY_MS);
1566 <            lock.writeLock().lock();
1567 <            assertFalse(lock.hasWaiters(c));
1568 <            assertEquals(0, lock.getWaitQueueLength(c));
1569 <            lock.writeLock().unlock();
1570 <            t.join(SHORT_DELAY_MS);
1571 <            assertFalse(t.isAlive());
1572 <        }
1573 <        catch (Exception ex) {
1574 <            unexpectedException();
1575 <        }
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  
1578
1575      /**
1576       * getWaitingThreads returns only and all waiting threads
1577       */
1578 <    public void testGetWaitingThreads() {
1579 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();  
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 <        Thread t1 = new Thread(new Runnable() {
1585 <                public void run() {
1586 <                    try {
1587 <                        lock.writeLock().lock();
1588 <                        threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1589 <                        c.await();
1590 <                        lock.writeLock().unlock();
1591 <                    }
1592 <                    catch(InterruptedException e) {
1593 <                        threadUnexpectedException();
1595 <                    }
1596 <                }
1597 <            });
1598 <
1599 <        Thread t2 = new Thread(new Runnable() {
1600 <                public void run() {
1601 <                    try {
1602 <                        lock.writeLock().lock();
1603 <                        threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1604 <                        c.await();
1605 <                        lock.writeLock().unlock();
1606 <                    }
1607 <                    catch(InterruptedException e) {
1608 <                        threadUnexpectedException();
1609 <                    }
1610 <                }
1611 <            });
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 <        try {
1596 <            lock.writeLock().lock();
1597 <            assertTrue(lock.getWaitingThreads(c).isEmpty());
1598 <            lock.writeLock().unlock();
1599 <            t1.start();
1600 <            Thread.sleep(SHORT_DELAY_MS);
1601 <            t2.start();
1602 <            Thread.sleep(SHORT_DELAY_MS);
1603 <            lock.writeLock().lock();
1604 <            assertTrue(lock.hasWaiters(c));
1605 <            assertTrue(lock.getWaitingThreads(c).contains(t1));
1606 <            assertTrue(lock.getWaitingThreads(c).contains(t2));
1607 <            c.signalAll();
1608 <            lock.writeLock().unlock();
1609 <            Thread.sleep(SHORT_DELAY_MS);
1610 <            lock.writeLock().lock();
1611 <            assertFalse(lock.hasWaiters(c));
1612 <            assertTrue(lock.getWaitingThreads(c).isEmpty());
1613 <            lock.writeLock().unlock();
1614 <            t1.join(SHORT_DELAY_MS);
1615 <            t2.join(SHORT_DELAY_MS);
1616 <            assertFalse(t1.isAlive());
1617 <            assertFalse(t2.isAlive());
1618 <        }
1619 <        catch (Exception ex) {
1620 <            unexpectedException();
1621 <        }
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() {
1632 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1633 <        String us = lock.toString();
1634 <        assertTrue(us.indexOf("Write locks = 0") >= 0);
1635 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1636 <        lock.writeLock().lock();
1637 <        String ws = lock.toString();
1638 <        assertTrue(ws.indexOf("Write locks = 1") >= 0);
1639 <        assertTrue(ws.indexOf("Read locks = 0") >= 0);
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 <        String rs = lock.toString();
1644 <        assertTrue(rs.indexOf("Write locks = 0") >= 0);
1659 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
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() {
1651 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1652 <        String us = lock.readLock().toString();
1653 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
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 <        String rs = lock.readLock().toString();
1672 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1657 >        assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1658      }
1659  
1660      /**
1661       * writeLock.toString indicates current lock state
1662       */
1663 <    public void testWriteLockToString() {
1664 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1665 <        String us = lock.writeLock().toString();
1666 <        assertTrue(us.indexOf("Unlocked") >= 0);
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 <        String ls = lock.writeLock().toString();
1670 <        assertTrue(ls.indexOf("Locked") >= 0);
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