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.59 by jsr166, Sat May 7 19:03:26 2011 UTC vs.
Revision 1.66 by jsr166, Fri Jun 3 05:07:14 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 67 | Line 68 | public class ReentrantReadWriteLockTest
68       */
69      void releaseWriteLock(PublicReentrantReadWriteLock lock) {
70          ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
71 <        assertWriteLockedBy(lock, Thread.currentThread());
71 >        assertWriteLockedByMoi(lock);
72          assertEquals(1, lock.getWriteHoldCount());
73          writeLock.unlock();
74          assertNotWriteLocked(lock);
# Line 80 | Line 81 | public class ReentrantReadWriteLockTest
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());
# Line 94 | Line 95 | public class ReentrantReadWriteLockTest
95          assertFalse(lock.isWriteLocked());
96          assertFalse(lock.isWriteLockedByCurrentThread());
97          assertFalse(lock.writeLock().isHeldByCurrentThread());
97        assertNull(lock.getOwner());
98          assertEquals(0, lock.getWriteHoldCount());
99 +        assertEquals(0, lock.writeLock().getHoldCount());
100 +        assertNull(lock.getOwner());
101      }
102  
103      /**
# Line 110 | Line 112 | public class ReentrantReadWriteLockTest
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 +    /**
128       * Checks that condition c has no waiters.
129       */
130      void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
# Line 135 | Line 146 | public class ReentrantReadWriteLockTest
146          lock.writeLock().unlock();
147      }
148  
149 +    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
150 +
151 +    /**
152 +     * Awaits condition using the specified AwaitMethod.
153 +     */
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       * Constructor sets given fairness, and is in unlocked state
176       */
# Line 160 | Line 196 | public class ReentrantReadWriteLockTest
196      /**
197       * write-locking and read-locking an unlocked lock succeed
198       */
199 <    public void testLock() {
200 <        PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
201 <        assertNotWriteLocked(lock);
202 <        lock.writeLock().lock();
203 <        assertWriteLockedBy(lock, Thread.currentThread());
168 <        lock.writeLock().unlock();
169 <        assertNotWriteLocked(lock);
170 <        assertEquals(0, lock.getReadLockCount());
171 <        lock.readLock().lock();
172 <        assertNotWriteLocked(lock);
173 <        assertEquals(1, lock.getReadLockCount());
174 <        lock.readLock().unlock();
175 <        assertNotWriteLocked(lock);
176 <        assertEquals(0, lock.getReadLockCount());
177 <    }
178 <
179 <    /**
180 <     * locking an unlocked fair lock succeeds
181 <     */
182 <    public void testFairLock() {
183 <        PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
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 <        assertWriteLockedBy(lock, Thread.currentThread());
206 >        assertWriteLockedByMoi(lock);
207          lock.writeLock().unlock();
208          assertNotWriteLocked(lock);
209          assertEquals(0, lock.getReadLockCount());
# Line 198 | Line 218 | public class ReentrantReadWriteLockTest
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 211 | 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 228 | 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 243 | Line 269 | public class ReentrantReadWriteLockTest
269      /**
270       * write-unlocking an unlocked lock throws IllegalMonitorStateException
271       */
272 <    public void testWriteUnlock_IllegalMonitorStateException() {
273 <        ReentrantReadWriteLock lock = 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              lock.writeLock().unlock();
278              shouldThrow();
# Line 254 | Line 282 | public class ReentrantReadWriteLockTest
282      /**
283       * read-unlocking an unlocked lock throws IllegalMonitorStateException
284       */
285 <    public void testReadUnlock_IllegalMonitorStateException() {
286 <        ReentrantReadWriteLock lock = 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              lock.readLock().unlock();
291              shouldThrow();
# Line 265 | Line 295 | public class ReentrantReadWriteLockTest
295      /**
296       * write-lockInterruptibly is interruptible
297       */
298 <    public void testWriteLockInterruptibly_Interrupted() throws Exception {
299 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 282 | Line 315 | public class ReentrantReadWriteLockTest
315      /**
316       * timed write-tryLock is interruptible
317       */
318 <    public void testWriteTryLock_Interrupted() throws InterruptedException {
319 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 {
# Line 299 | Line 335 | public class ReentrantReadWriteLockTest
335      /**
336       * read-lockInterruptibly is interruptible
337       */
338 <    public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
339 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 316 | Line 355 | public class ReentrantReadWriteLockTest
355      /**
356       * timed read-tryLock is interruptible
357       */
358 <    public void testReadTryLock_Interrupted() throws InterruptedException {
359 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 {
# Line 331 | 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 PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 348 | Line 409 | public class ReentrantReadWriteLockTest
409      /**
410       * read-tryLock fails if locked
411       */
412 <    public void testReadTryLockWhenLocked() throws InterruptedException {
413 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 363 | 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 379 | Line 449 | public class ReentrantReadWriteLockTest
449      /**
450       * A writelock succeeds only after a reading thread unlocks
451       */
452 <    public void testWriteAfterReadLock() throws InterruptedException {
453 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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();
385
458          Thread t = newStartedThread(new CheckedRunnable() {
459              public void realRun() {
460                  assertEquals(1, lock.getReadLockCount());
# Line 402 | Line 474 | public class ReentrantReadWriteLockTest
474      /**
475       * A writelock succeeds only after reading threads unlock
476       */
477 <    public void testWriteAfterMultipleReadLocks() throws InterruptedException {
478 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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() {
# Line 433 | Line 508 | public class ReentrantReadWriteLockTest
508  
509      /**
510       * A thread that tries to acquire a fair read lock (non-reentrantly)
511 <     * will block if there is a waiting writer thread.
511 >     * will block if there is a waiting writer thread
512       */
513 <    public void testReaderWriterReaderFairFifo() throws InterruptedException {
514 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
513 >    public void testReaderWriterReaderFairFifo() {
514 >        final PublicReentrantReadWriteLock lock =
515 >            new PublicReentrantReadWriteLock(true);
516          final AtomicBoolean t1GotLock = new AtomicBoolean(false);
517  
518          lock.readLock().lock();
# Line 471 | Line 547 | public class ReentrantReadWriteLockTest
547      /**
548       * Readlocks succeed only after a writing thread unlocks
549       */
550 <    public void testReadAfterWriteLock() throws InterruptedException {
551 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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();
556          Thread t1 = newStartedThread(new CheckedRunnable() {
557              public void realRun() {
# Line 495 | Line 574 | public class ReentrantReadWriteLockTest
574      /**
575       * Read trylock succeeds if write locked by current thread
576       */
577 <    public void testReadHoldingWriteLock() {
578 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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();
# Line 504 | Line 585 | public class ReentrantReadWriteLockTest
585      }
586  
587      /**
588 <     * Read lock succeeds if write locked by current thread even if
589 <     * other threads are waiting for readlock
588 >     * Read trylock succeeds (barging) even in the presence of waiting
589 >     * readers and/or writers
590       */
591 <    public void testReadHoldingWriteLock2() throws InterruptedException {
592 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
593 <        lock.writeLock().lock();
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();
514        lock.readLock().unlock();
597  
598          Thread t1 = newStartedThread(new CheckedRunnable() {
599              public void realRun() {
600 <                lock.readLock().lock();
601 <                lock.readLock().unlock();
520 <            }});
521 <        Thread t2 = newStartedThread(new CheckedRunnable() {
522 <            public void realRun() {
523 <                lock.readLock().lock();
524 <                lock.readLock().unlock();
600 >                lock.writeLock().lock();
601 >                lock.writeLock().unlock();
602              }});
603  
604          waitForQueuedThread(lock, t1);
528        waitForQueuedThread(lock, t2);
529        assertWriteLockedBy(lock, Thread.currentThread());
530        lock.readLock().lock();
531        lock.readLock().unlock();
532        releaseWriteLock(lock);
533        awaitTermination(t1);
534        awaitTermination(t2);
535    }
605  
537    /**
538     * Read lock succeeds if write locked by current thread even if
539     * other threads are waiting for writelock
540     */
541    public void testReadHoldingWriteLock3() throws InterruptedException {
542        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
543        lock.writeLock().lock();
544        lock.readLock().lock();
545        lock.readLock().unlock();
546
547        Thread t1 = newStartedThread(new CheckedRunnable() {
548            public void realRun() {
549                lock.writeLock().lock();
550                lock.writeLock().unlock();
551            }});
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);
560 <        assertWriteLockedBy(lock, Thread.currentThread());
561 <        lock.readLock().lock();
562 <        lock.readLock().unlock();
563 <        releaseWriteLock(lock);
564 <        awaitTermination(t1);
565 <        awaitTermination(t2);
566 <    }
567 <
568 <    /**
569 <     * Write lock succeeds if write locked by current thread even if
570 <     * other threads are waiting for writelock
571 <     */
572 <    public void testWriteHoldingWriteLock4() throws InterruptedException {
573 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
574 <        lock.writeLock().lock();
575 <        lock.writeLock().lock();
576 <        lock.writeLock().unlock();
612 >        if (fair)
613 >            waitForQueuedThread(lock, t2);
614  
615 <        Thread t1 = newStartedThread(new CheckedRunnable() {
615 >        Thread t3 = newStartedThread(new CheckedRunnable() {
616              public void realRun() {
617 <                lock.writeLock().lock();
618 <                lock.writeLock().unlock();
582 <            }});
583 <        Thread t2 = newStartedThread(new CheckedRunnable() {
584 <            public void realRun() {
585 <                lock.writeLock().lock();
586 <                lock.writeLock().unlock();
617 >                lock.readLock().tryLock();
618 >                lock.readLock().unlock();
619              }});
620  
621 <        waitForQueuedThread(lock, t1);
622 <        waitForQueuedThread(lock, t2);
623 <        assertWriteLockedBy(lock, Thread.currentThread());
624 <        assertEquals(1, lock.getWriteHoldCount());
625 <        lock.writeLock().lock();
594 <        assertWriteLockedBy(lock, Thread.currentThread());
595 <        assertEquals(2, lock.getWriteHoldCount());
596 <        lock.writeLock().unlock();
597 <        releaseWriteLock(lock);
621 >        assertTrue(lock.getReadLockCount() > 0);
622 >        awaitTermination(t3);
623 >        assertTrue(t1.isAlive());
624 >        if (fair) assertTrue(t2.isAlive());
625 >        lock.readLock().unlock();
626          awaitTermination(t1);
627          awaitTermination(t2);
628      }
629  
630      /**
631 <     * Fair Read trylock succeeds if write locked by current thread
604 <     */
605 <    public void testReadHoldingWriteLockFair() {
606 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
607 <        lock.writeLock().lock();
608 <        assertTrue(lock.readLock().tryLock());
609 <        lock.readLock().unlock();
610 <        lock.writeLock().unlock();
611 <    }
612 <
613 <    /**
614 <     * 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 PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(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 633 | Line 653 | public class ReentrantReadWriteLockTest
653  
654          waitForQueuedThread(lock, t1);
655          waitForQueuedThread(lock, t2);
656 <        assertWriteLockedBy(lock, Thread.currentThread());
656 >        assertWriteLockedByMoi(lock);
657          lock.readLock().lock();
658          lock.readLock().unlock();
659          releaseWriteLock(lock);
# Line 642 | 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 PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(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 664 | Line 687 | public class ReentrantReadWriteLockTest
687  
688          waitForQueuedThread(lock, t1);
689          waitForQueuedThread(lock, t2);
690 <        assertWriteLockedBy(lock, Thread.currentThread());
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 PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(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 692 | Line 722 | public class ReentrantReadWriteLockTest
722  
723          waitForQueuedThread(lock, t1);
724          waitForQueuedThread(lock, t2);
725 <        assertWriteLockedBy(lock, Thread.currentThread());
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();
702        releaseWriteLock(lock);
734          awaitTermination(t1);
735          awaitTermination(t2);
736      }
# Line 707 | 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 723 | 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() {
730 <            public void realRun() {
731 <                assertFalse(lock.writeLock().tryLock());
732 <            }});
733 <
734 <        awaitTermination(t);
735 <        lock.readLock().unlock();
736 <    }
737 <
738 <    /**
739 <     * Fair Read tryLock succeeds if readlocked but not writelocked
740 <     */
741 <    public void testTryLockWhenReadLockedFair() throws InterruptedException {
742 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
743 <        lock.readLock().lock();
744 <        Thread t = newStartedThread(new CheckedRunnable() {
745 <            public void realRun() {
746 <                assertTrue(lock.readLock().tryLock());
747 <                lock.readLock().unlock();
748 <            }});
749 <
750 <        awaitTermination(t);
751 <        lock.readLock().unlock();
752 <    }
753 <
754 <    /**
755 <     * Fair write tryLock fails when readlocked
756 <     */
757 <    public void testWriteTryLockWhenReadLockedFair() throws InterruptedException {
758 <        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 769 | 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 {
# Line 781 | Line 788 | public class ReentrantReadWriteLockTest
788              }});
789  
790          awaitTermination(t);
791 <        assertTrue(lock.writeLock().isHeldByCurrentThread());
785 <        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 {
# Line 805 | 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 PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 817 | 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 824 | 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 PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 841 | 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();
858 <        } catch (IllegalMonitorStateException success) {}
859 <        try {
860 <            c.awaitUninterruptibly();
861 <            shouldThrow();
862 <        } 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 877 | 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 889 | 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 <        long startTime = System.nanoTime();
965 <        long timeoutMillis = 10;
966 <        java.util.Date d = new java.util.Date();
967 <        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
968 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
969 <        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 PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 946 | 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();
# Line 957 | Line 1005 | public class ReentrantReadWriteLockTest
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();
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);
1016 <        Thread t = newStartedThread(new CheckedRunnable() {
1015 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
1016 >
1017 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1018              public void realRun() {
1019 +                // Interrupt before awaitUninterruptibly
1020                  lock.writeLock().lock();
1021 <                locked.countDown();
1021 >                pleaseInterrupt.countDown();
1022 >                Thread.currentThread().interrupt();
1023                  c.awaitUninterruptibly();
1024                  assertTrue(Thread.interrupted());
1025                  lock.writeLock().unlock();
1026              }});
1027  
1028 <        locked.await();
1029 <        lock.writeLock().lock();
1030 <        lock.writeLock().unlock();
978 <        t.interrupt();
979 <        long timeoutMillis = 10;
980 <        assertThreadJoinTimesOut(t, timeoutMillis);
981 <        lock.writeLock().lock();
982 <        c.signal();
983 <        lock.writeLock().unlock();
984 <        awaitTermination(t);
985 <    }
986 <
987 <    /**
988 <     * await is interruptible
989 <     */
990 <    public void testAwait_Interrupt() throws InterruptedException {
991 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
992 <        final Condition c = lock.writeLock().newCondition();
993 <        final CountDownLatch locked = new CountDownLatch(1);
994 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
995 <            public void realRun() throws InterruptedException {
1028 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1029 >            public void realRun() {
1030 >                // Interrupt during awaitUninterruptibly
1031                  lock.writeLock().lock();
1032 <                assertWriteLockedBy(lock, Thread.currentThread());
1033 <                assertHasNoWaiters(lock, c);
1034 <                locked.countDown();
1035 <                try {
1001 <                    c.await();
1002 <                } finally {
1003 <                    assertWriteLockedBy(lock, Thread.currentThread());
1004 <                    assertHasNoWaiters(lock, c);
1005 <                    lock.writeLock().unlock();
1006 <                    assertFalse(Thread.interrupted());
1007 <                }
1032 >                pleaseInterrupt.countDown();
1033 >                c.awaitUninterruptibly();
1034 >                assertTrue(Thread.interrupted());
1035 >                lock.writeLock().unlock();
1036              }});
1037  
1038 <        locked.await();
1039 <        assertHasWaiters(lock, c, t);
1040 <        t.interrupt();
1041 <        awaitTermination(t);
1014 <        assertNotWriteLocked(lock);
1015 <    }
1038 >        await(pleaseInterrupt);
1039 >        lock.writeLock().lock();
1040 >        lock.writeLock().unlock();
1041 >        t2.interrupt();
1042  
1043 <    /**
1044 <     * awaitNanos is interruptible
1019 <     */
1020 <    public void testAwaitNanos_Interrupt() throws InterruptedException {
1021 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1022 <        final Condition c = lock.writeLock().newCondition();
1023 <        final CountDownLatch locked = new CountDownLatch(1);
1024 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1025 <            public void realRun() throws InterruptedException {
1026 <                lock.writeLock().lock();
1027 <                assertWriteLockedBy(lock, Thread.currentThread());
1028 <                assertHasNoWaiters(lock, c);
1029 <                locked.countDown();
1030 <                try {
1031 <                    c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
1032 <                } finally {
1033 <                    assertWriteLockedBy(lock, Thread.currentThread());
1034 <                    assertHasNoWaiters(lock, c);
1035 <                    lock.writeLock().unlock();
1036 <                    assertFalse(Thread.interrupted());
1037 <                }
1038 <            }});
1043 >        assertThreadStaysAlive(t1);
1044 >        assertTrue(t2.isAlive());
1045  
1046 <        locked.await();
1047 <        assertHasWaiters(lock, c, t);
1048 <        t.interrupt();
1049 <        awaitTermination(t);
1050 <        assertNotWriteLocked(lock);
1046 >        lock.writeLock().lock();
1047 >        c.signalAll();
1048 >        lock.writeLock().unlock();
1049 >
1050 >        awaitTermination(t1);
1051 >        awaitTermination(t2);
1052      }
1053  
1054      /**
1055 <     * awaitUntil is interruptible
1055 >     * await/awaitNanos/awaitUntil is interruptible
1056       */
1057 <    public void testAwaitUntil_Interrupt() throws InterruptedException {
1058 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1057 >    public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
1058 >    public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
1059 >    public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
1060 >    public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
1061 >    public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
1062 >    public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
1063 >    public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
1064 >    public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
1065 >    public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
1066 >        final PublicReentrantReadWriteLock lock =
1067 >            new PublicReentrantReadWriteLock(fair);
1068          final Condition c = lock.writeLock().newCondition();
1069          final CountDownLatch locked = new CountDownLatch(1);
1070          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1071              public void realRun() throws InterruptedException {
1072                  lock.writeLock().lock();
1073 <                assertWriteLockedBy(lock, Thread.currentThread());
1073 >                assertWriteLockedByMoi(lock);
1074                  assertHasNoWaiters(lock, c);
1075                  locked.countDown();
1060                java.util.Date d = new java.util.Date();
1076                  try {
1077 <                    c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS));
1077 >                    await(c, awaitMethod);
1078                  } finally {
1079 <                    assertWriteLockedBy(lock, Thread.currentThread());
1079 >                    assertWriteLockedByMoi(lock);
1080                      assertHasNoWaiters(lock, c);
1081                      lock.writeLock().unlock();
1082                      assertFalse(Thread.interrupted());
1083                  }
1084              }});
1085  
1086 <        locked.await();
1086 >        await(locked);
1087          assertHasWaiters(lock, c, t);
1088          t.interrupt();
1089          awaitTermination(t);
# Line 1078 | Line 1093 | public class ReentrantReadWriteLockTest
1093      /**
1094       * signalAll wakes up all threads
1095       */
1096 <    public void testSignalAll() throws InterruptedException {
1097 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1096 >    public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
1097 >    public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
1098 >    public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
1099 >    public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
1100 >    public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
1101 >    public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
1102 >    public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
1103 >    public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
1104 >    public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
1105 >        final PublicReentrantReadWriteLock lock =
1106 >            new PublicReentrantReadWriteLock(fair);
1107          final Condition c = lock.writeLock().newCondition();
1108          final CountDownLatch locked = new CountDownLatch(2);
1109          final Lock writeLock = lock.writeLock();
1110 <        Thread t1 = newStartedThread(new CheckedRunnable() {
1110 >        class Awaiter extends CheckedRunnable {
1111              public void realRun() throws InterruptedException {
1112                  writeLock.lock();
1113                  locked.countDown();
1114 <                c.await();
1114 >                await(c, awaitMethod);
1115                  writeLock.unlock();
1116 <            }});
1116 >            }
1117 >        }
1118  
1119 <        Thread t2 = newStartedThread(new CheckedRunnable() {
1120 <            public void realRun() throws InterruptedException {
1096 <                writeLock.lock();
1097 <                locked.countDown();
1098 <                c.await();
1099 <                writeLock.unlock();
1100 <            }});
1119 >        Thread t1 = newStartedThread(new Awaiter());
1120 >        Thread t2 = newStartedThread(new Awaiter());
1121  
1122 <        locked.await();
1122 >        await(locked);
1123          writeLock.lock();
1124          assertHasWaiters(lock, c, t1, t2);
1125          c.signalAll();
# Line 1110 | Line 1130 | public class ReentrantReadWriteLockTest
1130      }
1131  
1132      /**
1133 <     * signal wakes up waiting threads in FIFO order.
1133 >     * signal wakes up waiting threads in FIFO order
1134       */
1135 <    public void testSignalWakesFifo() throws InterruptedException {
1136 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1135 >    public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1136 >    public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1137 >    public void testSignalWakesFifo(boolean fair) {
1138 >        final PublicReentrantReadWriteLock lock =
1139 >            new PublicReentrantReadWriteLock(fair);
1140          final Condition c = lock.writeLock().newCondition();
1141          final CountDownLatch locked1 = new CountDownLatch(1);
1142          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1126 | Line 1149 | public class ReentrantReadWriteLockTest
1149                  writeLock.unlock();
1150              }});
1151  
1152 <        locked1.await();
1152 >        await(locked1);
1153  
1154          Thread t2 = newStartedThread(new CheckedRunnable() {
1155              public void realRun() throws InterruptedException {
# Line 1136 | Line 1159 | public class ReentrantReadWriteLockTest
1159                  writeLock.unlock();
1160              }});
1161  
1162 <        locked2.await();
1162 >        await(locked2);
1163  
1164          writeLock.lock();
1165          assertHasWaiters(lock, c, t1, t2);
# Line 1157 | Line 1180 | public class ReentrantReadWriteLockTest
1180      /**
1181       * await after multiple reentrant locking preserves lock count
1182       */
1183 <    public void testAwaitLockCount() throws InterruptedException {
1184 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1183 >    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1184 >    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1185 >    public void testAwaitLockCount(boolean fair) {
1186 >        final PublicReentrantReadWriteLock lock =
1187 >            new PublicReentrantReadWriteLock(fair);
1188          final Condition c = lock.writeLock().newCondition();
1189          final CountDownLatch locked = new CountDownLatch(2);
1190          Thread t1 = newStartedThread(new CheckedRunnable() {
1191              public void realRun() throws InterruptedException {
1192                  lock.writeLock().lock();
1193 <                assertWriteLockedBy(lock, Thread.currentThread());
1193 >                assertWriteLockedByMoi(lock);
1194                  assertEquals(1, lock.writeLock().getHoldCount());
1195                  locked.countDown();
1196                  c.await();
1197 <                assertWriteLockedBy(lock, Thread.currentThread());
1197 >                assertWriteLockedByMoi(lock);
1198                  assertEquals(1, lock.writeLock().getHoldCount());
1199                  lock.writeLock().unlock();
1200              }});
# Line 1177 | Line 1203 | public class ReentrantReadWriteLockTest
1203              public void realRun() throws InterruptedException {
1204                  lock.writeLock().lock();
1205                  lock.writeLock().lock();
1206 <                assertWriteLockedBy(lock, Thread.currentThread());
1206 >                assertWriteLockedByMoi(lock);
1207                  assertEquals(2, lock.writeLock().getHoldCount());
1208                  locked.countDown();
1209                  c.await();
1210 <                assertWriteLockedBy(lock, Thread.currentThread());
1210 >                assertWriteLockedByMoi(lock);
1211                  assertEquals(2, lock.writeLock().getHoldCount());
1212                  lock.writeLock().unlock();
1213                  lock.writeLock().unlock();
1214              }});
1215  
1216 <        locked.await();
1216 >        await(locked);
1217          lock.writeLock().lock();
1218          assertHasWaiters(lock, c, t1, t2);
1219          c.signalAll();
# Line 1200 | Line 1226 | public class ReentrantReadWriteLockTest
1226      /**
1227       * A serialized lock deserializes as unlocked
1228       */
1229 <    public void testSerialization() throws Exception {
1230 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1231 <        l.readLock().lock();
1232 <        l.readLock().unlock();
1233 <
1234 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1235 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1236 <        out.writeObject(l);
1237 <        out.close();
1238 <
1239 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1240 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1241 <        ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1242 <        r.readLock().lock();
1243 <        r.readLock().unlock();
1229 >    public void testSerialization()      { testSerialization(false); }
1230 >    public void testSerialization_fair() { testSerialization(true); }
1231 >    public void testSerialization(boolean fair) {
1232 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1233 >        lock.writeLock().lock();
1234 >        lock.readLock().lock();
1235 >
1236 >        ReentrantReadWriteLock clone = serialClone(lock);
1237 >        assertEquals(lock.isFair(), clone.isFair());
1238 >        assertTrue(lock.isWriteLocked());
1239 >        assertFalse(clone.isWriteLocked());
1240 >        assertEquals(1, lock.getReadLockCount());
1241 >        assertEquals(0, clone.getReadLockCount());
1242 >        clone.writeLock().lock();
1243 >        clone.readLock().lock();
1244 >        assertTrue(clone.isWriteLocked());
1245 >        assertEquals(1, clone.getReadLockCount());
1246 >        clone.readLock().unlock();
1247 >        clone.writeLock().unlock();
1248 >        assertFalse(clone.isWriteLocked());
1249 >        assertEquals(1, lock.getReadLockCount());
1250 >        assertEquals(0, clone.getReadLockCount());
1251      }
1252  
1253      /**
1254       * hasQueuedThreads reports whether there are waiting threads
1255       */
1256 <    public void testHasQueuedThreads() throws InterruptedException {
1257 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1256 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
1257 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
1258 >    public void testHasQueuedThreads(boolean fair) {
1259 >        final PublicReentrantReadWriteLock lock =
1260 >            new PublicReentrantReadWriteLock(fair);
1261          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1262          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1263          assertFalse(lock.hasQueuedThreads());
# Line 1244 | Line 1280 | public class ReentrantReadWriteLockTest
1280      /**
1281       * hasQueuedThread(null) throws NPE
1282       */
1283 <    public void testHasQueuedThreadNPE() {
1284 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1283 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
1284 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
1285 >    public void testHasQueuedThreadNPE(boolean fair) {
1286 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1287          try {
1288              lock.hasQueuedThread(null);
1289              shouldThrow();
# Line 1253 | Line 1291 | public class ReentrantReadWriteLockTest
1291      }
1292  
1293      /**
1294 <     * hasQueuedThread reports whether a thread is queued.
1294 >     * hasQueuedThread reports whether a thread is queued
1295       */
1296 <    public void testHasQueuedThread() throws InterruptedException {
1297 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1296 >    public void testHasQueuedThread()      { testHasQueuedThread(false); }
1297 >    public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
1298 >    public void testHasQueuedThread(boolean fair) {
1299 >        final PublicReentrantReadWriteLock lock =
1300 >            new PublicReentrantReadWriteLock(fair);
1301          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1302          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1303          assertFalse(lock.hasQueuedThread(t1));
# Line 1283 | Line 1324 | public class ReentrantReadWriteLockTest
1324      /**
1325       * getQueueLength reports number of waiting threads
1326       */
1327 <    public void testGetQueueLength() throws InterruptedException {
1328 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1327 >    public void testGetQueueLength()      { testGetQueueLength(false); }
1328 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
1329 >    public void testGetQueueLength(boolean fair) {
1330 >        final PublicReentrantReadWriteLock lock =
1331 >            new PublicReentrantReadWriteLock(fair);
1332          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1333          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1334          assertEquals(0, lock.getQueueLength());
# Line 1306 | Line 1350 | public class ReentrantReadWriteLockTest
1350      /**
1351       * getQueuedThreads includes waiting threads
1352       */
1353 <    public void testGetQueuedThreads() throws InterruptedException {
1354 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1353 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
1354 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
1355 >    public void testGetQueuedThreads(boolean fair) {
1356 >        final PublicReentrantReadWriteLock lock =
1357 >            new PublicReentrantReadWriteLock(fair);
1358          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1359          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1360          assertTrue(lock.getQueuedThreads().isEmpty());
# Line 1335 | Line 1382 | public class ReentrantReadWriteLockTest
1382      /**
1383       * hasWaiters throws NPE if null
1384       */
1385 <    public void testHasWaitersNPE() {
1386 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1385 >    public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
1386 >    public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
1387 >    public void testHasWaitersNPE(boolean fair) {
1388 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1389          try {
1390              lock.hasWaiters(null);
1391              shouldThrow();
# Line 1346 | Line 1395 | public class ReentrantReadWriteLockTest
1395      /**
1396       * getWaitQueueLength throws NPE if null
1397       */
1398 <    public void testGetWaitQueueLengthNPE() {
1399 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1398 >    public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
1399 >    public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
1400 >    public void testGetWaitQueueLengthNPE(boolean fair) {
1401 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1402          try {
1403              lock.getWaitQueueLength(null);
1404              shouldThrow();
# Line 1357 | Line 1408 | public class ReentrantReadWriteLockTest
1408      /**
1409       * getWaitingThreads throws NPE if null
1410       */
1411 <    public void testGetWaitingThreadsNPE() {
1412 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1411 >    public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
1412 >    public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
1413 >    public void testGetWaitingThreadsNPE(boolean fair) {
1414 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(fair);
1415          try {
1416              lock.getWaitingThreads(null);
1417              shouldThrow();
# Line 1368 | Line 1421 | public class ReentrantReadWriteLockTest
1421      /**
1422       * hasWaiters throws IllegalArgumentException if not owned
1423       */
1424 <    public void testHasWaitersIAE() {
1425 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1424 >    public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
1425 >    public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
1426 >    public void testHasWaitersIAE(boolean fair) {
1427 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1428          final Condition c = lock.writeLock().newCondition();
1429 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1429 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1430          try {
1431              lock2.hasWaiters(c);
1432              shouldThrow();
# Line 1381 | Line 1436 | public class ReentrantReadWriteLockTest
1436      /**
1437       * hasWaiters throws IllegalMonitorStateException if not locked
1438       */
1439 <    public void testHasWaitersIMSE() {
1440 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1439 >    public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
1440 >    public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
1441 >    public void testHasWaitersIMSE(boolean fair) {
1442 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1443          final Condition c = lock.writeLock().newCondition();
1444          try {
1445              lock.hasWaiters(c);
# Line 1393 | Line 1450 | public class ReentrantReadWriteLockTest
1450      /**
1451       * getWaitQueueLength throws IllegalArgumentException if not owned
1452       */
1453 <    public void testGetWaitQueueLengthIAE() {
1454 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1453 >    public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
1454 >    public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
1455 >    public void testGetWaitQueueLengthIAE(boolean fair) {
1456 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1457          final Condition c = lock.writeLock().newCondition();
1458 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1458 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1459          try {
1460              lock2.getWaitQueueLength(c);
1461              shouldThrow();
# Line 1406 | Line 1465 | public class ReentrantReadWriteLockTest
1465      /**
1466       * getWaitQueueLength throws IllegalMonitorStateException if not locked
1467       */
1468 <    public void testGetWaitQueueLengthIMSE() {
1469 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1468 >    public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
1469 >    public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
1470 >    public void testGetWaitQueueLengthIMSE(boolean fair) {
1471 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1472          final Condition c = lock.writeLock().newCondition();
1473          try {
1474              lock.getWaitQueueLength(c);
# Line 1418 | Line 1479 | public class ReentrantReadWriteLockTest
1479      /**
1480       * getWaitingThreads throws IllegalArgumentException if not owned
1481       */
1482 <    public void testGetWaitingThreadsIAE() {
1483 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1482 >    public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
1483 >    public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
1484 >    public void testGetWaitingThreadsIAE(boolean fair) {
1485 >        final PublicReentrantReadWriteLock lock =
1486 >            new PublicReentrantReadWriteLock(fair);
1487          final Condition c = lock.writeLock().newCondition();
1488 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1488 >        final PublicReentrantReadWriteLock lock2 =
1489 >            new PublicReentrantReadWriteLock(fair);
1490          try {
1491              lock2.getWaitingThreads(c);
1492              shouldThrow();
# Line 1431 | Line 1496 | public class ReentrantReadWriteLockTest
1496      /**
1497       * getWaitingThreads throws IllegalMonitorStateException if not locked
1498       */
1499 <    public void testGetWaitingThreadsIMSE() {
1500 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1499 >    public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
1500 >    public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
1501 >    public void testGetWaitingThreadsIMSE(boolean fair) {
1502 >        final PublicReentrantReadWriteLock lock =
1503 >            new PublicReentrantReadWriteLock(fair);
1504          final Condition c = lock.writeLock().newCondition();
1505          try {
1506              lock.getWaitingThreads(c);
# Line 1443 | Line 1511 | public class ReentrantReadWriteLockTest
1511      /**
1512       * hasWaiters returns true when a thread is waiting, else false
1513       */
1514 <    public void testHasWaiters() throws InterruptedException {
1515 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1514 >    public void testHasWaiters()      { testHasWaiters(false); }
1515 >    public void testHasWaiters_fair() { testHasWaiters(true); }
1516 >    public void testHasWaiters(boolean fair) {
1517 >        final PublicReentrantReadWriteLock lock =
1518 >            new PublicReentrantReadWriteLock(fair);
1519          final Condition c = lock.writeLock().newCondition();
1520          final CountDownLatch locked = new CountDownLatch(1);
1521          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1459 | Line 1530 | public class ReentrantReadWriteLockTest
1530                  lock.writeLock().unlock();
1531              }});
1532  
1533 <        locked.await();
1533 >        await(locked);
1534          lock.writeLock().lock();
1535          assertHasWaiters(lock, c, t);
1536          assertTrue(lock.hasWaiters(c));
# Line 1474 | Line 1545 | public class ReentrantReadWriteLockTest
1545      /**
1546       * getWaitQueueLength returns number of waiting threads
1547       */
1548 <    public void testGetWaitQueueLength() throws InterruptedException {
1549 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1548 >    public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
1549 >    public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
1550 >    public void testGetWaitQueueLength(boolean fair) {
1551 >        final PublicReentrantReadWriteLock lock =
1552 >            new PublicReentrantReadWriteLock(fair);
1553          final Condition c = lock.writeLock().newCondition();
1554          final CountDownLatch locked = new CountDownLatch(1);
1555          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1487 | Line 1561 | public class ReentrantReadWriteLockTest
1561                  lock.writeLock().unlock();
1562              }});
1563  
1564 <        locked.await();
1564 >        await(locked);
1565          lock.writeLock().lock();
1566          assertHasWaiters(lock, c, t);
1567          assertEquals(1, lock.getWaitQueueLength(c));
# Line 1501 | Line 1575 | public class ReentrantReadWriteLockTest
1575      /**
1576       * getWaitingThreads returns only and all waiting threads
1577       */
1578 <    public void testGetWaitingThreads() throws InterruptedException {
1579 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1578 >    public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
1579 >    public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
1580 >    public void testGetWaitingThreads(boolean fair) {
1581 >        final PublicReentrantReadWriteLock lock =
1582 >            new PublicReentrantReadWriteLock(fair);
1583          final Condition c = lock.writeLock().newCondition();
1584          final CountDownLatch locked1 = new CountDownLatch(1);
1585          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1529 | Line 1606 | public class ReentrantReadWriteLockTest
1606          lock.writeLock().unlock();
1607  
1608          t1.start();
1609 <        locked1.await();
1609 >        await(locked1);
1610          t2.start();
1611 <        locked2.await();
1611 >        await(locked2);
1612  
1613          lock.writeLock().lock();
1614          assertTrue(lock.hasWaiters(c));
# Line 1551 | Line 1628 | public class ReentrantReadWriteLockTest
1628      /**
1629       * toString indicates current lock state
1630       */
1631 <    public void testToString() {
1632 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1633 <        String us = lock.toString();
1634 <        assertTrue(us.indexOf("Write locks = 0") >= 0);
1635 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1636 <        lock.writeLock().lock();
1637 <        String ws = lock.toString();
1638 <        assertTrue(ws.indexOf("Write locks = 1") >= 0);
1639 <        assertTrue(ws.indexOf("Read locks = 0") >= 0);
1631 >    public void testToString()      { testToString(false); }
1632 >    public void testToString_fair() { testToString(true); }
1633 >    public void testToString(boolean fair) {
1634 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1635 >        assertTrue(lock.toString().contains("Write locks = 0"));
1636 >        assertTrue(lock.toString().contains("Read locks = 0"));
1637 >        lock.writeLock().lock();
1638 >        assertTrue(lock.toString().contains("Write locks = 1"));
1639 >        assertTrue(lock.toString().contains("Read locks = 0"));
1640          lock.writeLock().unlock();
1641          lock.readLock().lock();
1642          lock.readLock().lock();
1643 <        String rs = lock.toString();
1644 <        assertTrue(rs.indexOf("Write locks = 0") >= 0);
1568 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1643 >        assertTrue(lock.toString().contains("Write locks = 0"));
1644 >        assertTrue(lock.toString().contains("Read locks = 2"));
1645      }
1646  
1647      /**
1648       * readLock.toString indicates current lock state
1649       */
1650 <    public void testReadLockToString() {
1651 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1652 <        String us = lock.readLock().toString();
1653 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1650 >    public void testReadLockToString()      { testReadLockToString(false); }
1651 >    public void testReadLockToString_fair() { testReadLockToString(true); }
1652 >    public void testReadLockToString(boolean fair) {
1653 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1654 >        assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1655          lock.readLock().lock();
1656          lock.readLock().lock();
1657 <        String rs = lock.readLock().toString();
1581 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1657 >        assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1658      }
1659  
1660      /**
1661       * writeLock.toString indicates current lock state
1662       */
1663 <    public void testWriteLockToString() {
1664 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1665 <        String us = lock.writeLock().toString();
1666 <        assertTrue(us.indexOf("Unlocked") >= 0);
1663 >    public void testWriteLockToString()      { testWriteLockToString(false); }
1664 >    public void testWriteLockToString_fair() { testWriteLockToString(true); }
1665 >    public void testWriteLockToString(boolean fair) {
1666 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1667 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1668          lock.writeLock().lock();
1669 <        String ls = lock.writeLock().toString();
1670 <        assertTrue(ls.indexOf("Locked") >= 0);
1669 >        assertTrue(lock.writeLock().toString().contains("Locked"));
1670 >        lock.writeLock().unlock();
1671 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1672      }
1673  
1674   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines