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.56 by jsr166, Tue May 3 06:08:49 2011 UTC vs.
Revision 1.65 by jsr166, Tue May 31 16:16:24 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines