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.57 by dl, Sat May 7 11:15:04 2011 UTC vs.
Revision 1.81 by jsr166, Mon Jul 17 21:01:30 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines