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.64 by jsr166, Tue May 24 23:40:14 2011 UTC

# Line 67 | Line 67 | public class ReentrantReadWriteLockTest
67       */
68      void releaseWriteLock(PublicReentrantReadWriteLock lock) {
69          ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
70 <        assertWriteLockedBy(lock, Thread.currentThread());
70 >        assertWriteLockedByMoi(lock);
71          assertEquals(1, lock.getWriteHoldCount());
72          writeLock.unlock();
73          assertNotWriteLocked(lock);
# Line 80 | Line 80 | public class ReentrantReadWriteLockTest
80          long startTime = System.nanoTime();
81          while (!lock.hasQueuedThread(t)) {
82              if (millisElapsedSince(startTime) > LONG_DELAY_MS)
83 <                throw new AssertionError("timed out");
83 >                throw new AssertionFailedError("timed out");
84              Thread.yield();
85          }
86          assertTrue(t.isAlive());
# Line 94 | Line 94 | public class ReentrantReadWriteLockTest
94          assertFalse(lock.isWriteLocked());
95          assertFalse(lock.isWriteLockedByCurrentThread());
96          assertFalse(lock.writeLock().isHeldByCurrentThread());
97        assertNull(lock.getOwner());
97          assertEquals(0, lock.getWriteHoldCount());
98 +        assertEquals(0, lock.writeLock().getHoldCount());
99 +        assertNull(lock.getOwner());
100      }
101  
102      /**
# Line 110 | Line 111 | public class ReentrantReadWriteLockTest
111                       lock.writeLock().isHeldByCurrentThread());
112          assertEquals(t == Thread.currentThread(),
113                       lock.getWriteHoldCount() > 0);
114 +        assertEquals(t == Thread.currentThread(),
115 +                     lock.writeLock().getHoldCount() > 0);
116          assertEquals(0, lock.getReadLockCount());
117      }
118  
119      /**
120 +     * Checks that lock is write-locked by the current thread.
121 +     */
122 +    void assertWriteLockedByMoi(PublicReentrantReadWriteLock lock) {
123 +        assertWriteLockedBy(lock, Thread.currentThread());
124 +    }
125 +
126 +    /**
127       * Checks that condition c has no waiters.
128       */
129      void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
# Line 135 | Line 145 | public class ReentrantReadWriteLockTest
145          lock.writeLock().unlock();
146      }
147  
148 +    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
149 +
150 +    /**
151 +     * Awaits condition using the specified AwaitMethod.
152 +     */
153 +    void await(Condition c, AwaitMethod awaitMethod)
154 +            throws InterruptedException {
155 +        switch (awaitMethod) {
156 +        case await:
157 +            c.await();
158 +            break;
159 +        case awaitTimed:
160 +            assertTrue(c.await(2 * LONG_DELAY_MS, MILLISECONDS));
161 +            break;
162 +        case awaitNanos:
163 +            long nanosRemaining = c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
164 +            assertTrue(nanosRemaining > 0);
165 +            break;
166 +        case awaitUntil:
167 +            java.util.Date d = new java.util.Date();
168 +            assertTrue(c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS)));
169 +            break;
170 +        }
171 +    }
172 +
173      /**
174       * Constructor sets given fairness, and is in unlocked state
175       */
# Line 160 | Line 195 | public class ReentrantReadWriteLockTest
195      /**
196       * write-locking and read-locking an unlocked lock succeed
197       */
198 <    public void testLock() {
199 <        PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
200 <        assertNotWriteLocked(lock);
201 <        lock.writeLock().lock();
202 <        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);
198 >    public void testLock()      { testLock(false); }
199 >    public void testLock_fair() { testLock(true); }
200 >    public void testLock(boolean fair) {
201 >        PublicReentrantReadWriteLock lock =
202 >            new PublicReentrantReadWriteLock(fair);
203          assertNotWriteLocked(lock);
204          lock.writeLock().lock();
205 <        assertWriteLockedBy(lock, Thread.currentThread());
205 >        assertWriteLockedByMoi(lock);
206          lock.writeLock().unlock();
207          assertNotWriteLocked(lock);
208          assertEquals(0, lock.getReadLockCount());
# Line 198 | Line 217 | public class ReentrantReadWriteLockTest
217      /**
218       * getWriteHoldCount returns number of recursive holds
219       */
220 <    public void testGetWriteHoldCount() {
221 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
220 >    public void testGetWriteHoldCount()      { testGetWriteHoldCount(false); }
221 >    public void testGetWriteHoldCount_fair() { testGetWriteHoldCount(true); }
222 >    public void testGetWriteHoldCount(boolean fair) {
223 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
224          for (int i = 1; i <= SIZE; i++) {
225              lock.writeLock().lock();
226              assertEquals(i,lock.getWriteHoldCount());
# Line 211 | Line 232 | public class ReentrantReadWriteLockTest
232      }
233  
234      /**
235 <     * WriteLock.getHoldCount returns number of recursive holds
235 >     * writelock.getHoldCount returns number of recursive holds
236       */
237 <    public void testGetHoldCount() {
238 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
237 >    public void testGetHoldCount()      { testGetHoldCount(false); }
238 >    public void testGetHoldCount_fair() { testGetHoldCount(true); }
239 >    public void testGetHoldCount(boolean fair) {
240 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
241          for (int i = 1; i <= SIZE; i++) {
242              lock.writeLock().lock();
243              assertEquals(i,lock.writeLock().getHoldCount());
# Line 228 | Line 251 | public class ReentrantReadWriteLockTest
251      /**
252       * getReadHoldCount returns number of recursive holds
253       */
254 <    public void testGetReadHoldCount() {
255 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
254 >    public void testGetReadHoldCount()      { testGetReadHoldCount(false); }
255 >    public void testGetReadHoldCount_fair() { testGetReadHoldCount(true); }
256 >    public void testGetReadHoldCount(boolean fair) {
257 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
258          for (int i = 1; i <= SIZE; i++) {
259              lock.readLock().lock();
260              assertEquals(i,lock.getReadHoldCount());
# Line 243 | Line 268 | public class ReentrantReadWriteLockTest
268      /**
269       * write-unlocking an unlocked lock throws IllegalMonitorStateException
270       */
271 <    public void testWriteUnlock_IllegalMonitorStateException() {
272 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
271 >    public void testWriteUnlock_IMSE()      { testWriteUnlock_IMSE(false); }
272 >    public void testWriteUnlock_IMSE_fair() { testWriteUnlock_IMSE(true); }
273 >    public void testWriteUnlock_IMSE(boolean fair) {
274 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
275          try {
276              lock.writeLock().unlock();
277              shouldThrow();
# Line 254 | Line 281 | public class ReentrantReadWriteLockTest
281      /**
282       * read-unlocking an unlocked lock throws IllegalMonitorStateException
283       */
284 <    public void testReadUnlock_IllegalMonitorStateException() {
285 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
284 >    public void testReadUnlock_IMSE()      { testReadUnlock_IMSE(false); }
285 >    public void testReadUnlock_IMSE_fair() { testReadUnlock_IMSE(true); }
286 >    public void testReadUnlock_IMSE(boolean fair) {
287 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
288          try {
289              lock.readLock().unlock();
290              shouldThrow();
# Line 265 | Line 294 | public class ReentrantReadWriteLockTest
294      /**
295       * write-lockInterruptibly is interruptible
296       */
297 <    public void testWriteLockInterruptibly_Interrupted() throws Exception {
298 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
297 >    public void testWriteLockInterruptibly_Interruptible()      { testWriteLockInterruptibly_Interruptible(false); }
298 >    public void testWriteLockInterruptibly_Interruptible_fair() { testWriteLockInterruptibly_Interruptible(true); }
299 >    public void testWriteLockInterruptibly_Interruptible(boolean fair) {
300 >        final PublicReentrantReadWriteLock lock =
301 >            new PublicReentrantReadWriteLock(fair);
302          lock.writeLock().lock();
303          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
304              public void realRun() throws InterruptedException {
# Line 282 | Line 314 | public class ReentrantReadWriteLockTest
314      /**
315       * timed write-tryLock is interruptible
316       */
317 <    public void testWriteTryLock_Interrupted() throws InterruptedException {
318 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
317 >    public void testWriteTryLock_Interruptible()      { testWriteTryLock_Interruptible(false); }
318 >    public void testWriteTryLock_Interruptible_fair() { testWriteTryLock_Interruptible(true); }
319 >    public void testWriteTryLock_Interruptible(boolean fair) {
320 >        final PublicReentrantReadWriteLock lock =
321 >            new PublicReentrantReadWriteLock(fair);
322          lock.writeLock().lock();
323          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
324              public void realRun() throws InterruptedException {
# Line 299 | Line 334 | public class ReentrantReadWriteLockTest
334      /**
335       * read-lockInterruptibly is interruptible
336       */
337 <    public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
338 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
337 >    public void testReadLockInterruptibly_Interruptible()      { testReadLockInterruptibly_Interruptible(false); }
338 >    public void testReadLockInterruptibly_Interruptible_fair() { testReadLockInterruptibly_Interruptible(true); }
339 >    public void testReadLockInterruptibly_Interruptible(boolean fair) {
340 >        final PublicReentrantReadWriteLock lock =
341 >            new PublicReentrantReadWriteLock(fair);
342          lock.writeLock().lock();
343          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
344              public void realRun() throws InterruptedException {
# Line 316 | Line 354 | public class ReentrantReadWriteLockTest
354      /**
355       * timed read-tryLock is interruptible
356       */
357 <    public void testReadTryLock_Interrupted() throws InterruptedException {
358 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
357 >    public void testReadTryLock_Interruptible()      { testReadTryLock_Interruptible(false); }
358 >    public void testReadTryLock_Interruptible_fair() { testReadTryLock_Interruptible(true); }
359 >    public void testReadTryLock_Interruptible(boolean fair) {
360 >        final PublicReentrantReadWriteLock lock =
361 >            new PublicReentrantReadWriteLock(fair);
362          lock.writeLock().lock();
363          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
364              public void realRun() throws InterruptedException {
# Line 331 | Line 372 | public class ReentrantReadWriteLockTest
372      }
373  
374      /**
375 +     * write-tryLock on an unlocked lock succeeds
376 +     */
377 +    public void testWriteTryLock()      { testWriteTryLock(false); }
378 +    public void testWriteTryLock_fair() { testWriteTryLock(true); }
379 +    public void testWriteTryLock(boolean fair) {
380 +        final PublicReentrantReadWriteLock lock =
381 +            new PublicReentrantReadWriteLock(fair);
382 +        assertTrue(lock.writeLock().tryLock());
383 +        assertWriteLockedByMoi(lock);
384 +        assertTrue(lock.writeLock().tryLock());
385 +        assertWriteLockedByMoi(lock);
386 +        lock.writeLock().unlock();
387 +        releaseWriteLock(lock);
388 +    }
389 +
390 +    /**
391       * write-tryLock fails if locked
392       */
393 <    public void testWriteTryLockWhenLocked() throws InterruptedException {
394 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
393 >    public void testWriteTryLockWhenLocked()      { testWriteTryLockWhenLocked(false); }
394 >    public void testWriteTryLockWhenLocked_fair() { testWriteTryLockWhenLocked(true); }
395 >    public void testWriteTryLockWhenLocked(boolean fair) {
396 >        final PublicReentrantReadWriteLock lock =
397 >            new PublicReentrantReadWriteLock(fair);
398          lock.writeLock().lock();
399          Thread t = newStartedThread(new CheckedRunnable() {
400              public void realRun() {
# Line 348 | Line 408 | public class ReentrantReadWriteLockTest
408      /**
409       * read-tryLock fails if locked
410       */
411 <    public void testReadTryLockWhenLocked() throws InterruptedException {
412 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
411 >    public void testReadTryLockWhenLocked()      { testReadTryLockWhenLocked(false); }
412 >    public void testReadTryLockWhenLocked_fair() { testReadTryLockWhenLocked(true); }
413 >    public void testReadTryLockWhenLocked(boolean fair) {
414 >        final PublicReentrantReadWriteLock lock =
415 >            new PublicReentrantReadWriteLock(fair);
416          lock.writeLock().lock();
417          Thread t = newStartedThread(new CheckedRunnable() {
418              public void realRun() {
# Line 363 | Line 426 | public class ReentrantReadWriteLockTest
426      /**
427       * Multiple threads can hold a read lock when not write-locked
428       */
429 <    public void testMultipleReadLocks() throws InterruptedException {
430 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
429 >    public void testMultipleReadLocks()      { testMultipleReadLocks(false); }
430 >    public void testMultipleReadLocks_fair() { testMultipleReadLocks(true); }
431 >    public void testMultipleReadLocks(boolean fair) {
432 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
433          lock.readLock().lock();
434          Thread t = newStartedThread(new CheckedRunnable() {
435 <            public void realRun() {
435 >            public void realRun() throws InterruptedException {
436                  assertTrue(lock.readLock().tryLock());
437                  lock.readLock().unlock();
438 +                assertTrue(lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS));
439 +                lock.readLock().unlock();
440 +                lock.readLock().lock();
441 +                lock.readLock().unlock();
442              }});
443  
444          awaitTermination(t);
# Line 379 | Line 448 | public class ReentrantReadWriteLockTest
448      /**
449       * A writelock succeeds only after a reading thread unlocks
450       */
451 <    public void testWriteAfterReadLock() throws InterruptedException {
452 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
451 >    public void testWriteAfterReadLock()      { testWriteAfterReadLock(false); }
452 >    public void testWriteAfterReadLock_fair() { testWriteAfterReadLock(true); }
453 >    public void testWriteAfterReadLock(boolean fair) {
454 >        final PublicReentrantReadWriteLock lock =
455 >            new PublicReentrantReadWriteLock(fair);
456          lock.readLock().lock();
385
457          Thread t = newStartedThread(new CheckedRunnable() {
458              public void realRun() {
459                  assertEquals(1, lock.getReadLockCount());
# Line 402 | Line 473 | public class ReentrantReadWriteLockTest
473      /**
474       * A writelock succeeds only after reading threads unlock
475       */
476 <    public void testWriteAfterMultipleReadLocks() throws InterruptedException {
477 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
476 >    public void testWriteAfterMultipleReadLocks()      { testWriteAfterMultipleReadLocks(false); }
477 >    public void testWriteAfterMultipleReadLocks_fair() { testWriteAfterMultipleReadLocks(true); }
478 >    public void testWriteAfterMultipleReadLocks(boolean fair) {
479 >        final PublicReentrantReadWriteLock lock =
480 >            new PublicReentrantReadWriteLock(fair);
481          lock.readLock().lock();
482          lock.readLock().lock();
483          Thread t1 = newStartedThread(new CheckedRunnable() {
# Line 433 | Line 507 | public class ReentrantReadWriteLockTest
507  
508      /**
509       * A thread that tries to acquire a fair read lock (non-reentrantly)
510 <     * will block if there is a waiting writer thread.
510 >     * will block if there is a waiting writer thread
511       */
512 <    public void testReaderWriterReaderFairFifo() throws InterruptedException {
513 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
512 >    public void testReaderWriterReaderFairFifo() {
513 >        final PublicReentrantReadWriteLock lock =
514 >            new PublicReentrantReadWriteLock(true);
515          final AtomicBoolean t1GotLock = new AtomicBoolean(false);
516  
517          lock.readLock().lock();
# Line 471 | Line 546 | public class ReentrantReadWriteLockTest
546      /**
547       * Readlocks succeed only after a writing thread unlocks
548       */
549 <    public void testReadAfterWriteLock() throws InterruptedException {
550 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
549 >    public void testReadAfterWriteLock()      { testReadAfterWriteLock(false); }
550 >    public void testReadAfterWriteLock_fair() { testReadAfterWriteLock(true); }
551 >    public void testReadAfterWriteLock(boolean fair) {
552 >        final PublicReentrantReadWriteLock lock =
553 >            new PublicReentrantReadWriteLock(fair);
554          lock.writeLock().lock();
555          Thread t1 = newStartedThread(new CheckedRunnable() {
556              public void realRun() {
# Line 495 | Line 573 | public class ReentrantReadWriteLockTest
573      /**
574       * Read trylock succeeds if write locked by current thread
575       */
576 <    public void testReadHoldingWriteLock() {
577 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
576 >    public void testReadHoldingWriteLock()      { testReadHoldingWriteLock(false); }
577 >    public void testReadHoldingWriteLock_fair() { testReadHoldingWriteLock(true); }
578 >    public void testReadHoldingWriteLock(boolean fair) {
579 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
580          lock.writeLock().lock();
581          assertTrue(lock.readLock().tryLock());
582          lock.readLock().unlock();
# Line 504 | Line 584 | public class ReentrantReadWriteLockTest
584      }
585  
586      /**
587 <     * Read lock succeeds if write locked by current thread even if
588 <     * other threads are waiting for readlock
587 >     * Read trylock succeeds (barging) even in the presence of waiting
588 >     * readers and/or writers
589       */
590 <    public void testReadHoldingWriteLock2() throws InterruptedException {
591 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
592 <        lock.writeLock().lock();
590 >    public void testReadTryLockBarging()      { testReadTryLockBarging(false); }
591 >    public void testReadTryLockBarging_fair() { testReadTryLockBarging(true); }
592 >    public void testReadTryLockBarging(boolean fair) {
593 >        final PublicReentrantReadWriteLock lock =
594 >            new PublicReentrantReadWriteLock(fair);
595          lock.readLock().lock();
514        lock.readLock().unlock();
596  
597          Thread t1 = newStartedThread(new CheckedRunnable() {
598              public void realRun() {
599 <                lock.readLock().lock();
600 <                lock.readLock().unlock();
520 <            }});
521 <        Thread t2 = newStartedThread(new CheckedRunnable() {
522 <            public void realRun() {
523 <                lock.readLock().lock();
524 <                lock.readLock().unlock();
599 >                lock.writeLock().lock();
600 >                lock.writeLock().unlock();
601              }});
602  
603          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    }
536
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();
604  
547        Thread t1 = newStartedThread(new CheckedRunnable() {
548            public void realRun() {
549                lock.writeLock().lock();
550                lock.writeLock().unlock();
551            }});
605          Thread t2 = newStartedThread(new CheckedRunnable() {
606              public void realRun() {
607 <                lock.writeLock().lock();
608 <                lock.writeLock().unlock();
607 >                lock.readLock().lock();
608 >                lock.readLock().unlock();
609              }});
610  
611 <        waitForQueuedThread(lock, t1);
612 <        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();
611 >        if (fair)
612 >            waitForQueuedThread(lock, t2);
613  
614 <        Thread t1 = newStartedThread(new CheckedRunnable() {
614 >        Thread t3 = newStartedThread(new CheckedRunnable() {
615              public void realRun() {
616 <                lock.writeLock().lock();
617 <                lock.writeLock().unlock();
582 <            }});
583 <        Thread t2 = newStartedThread(new CheckedRunnable() {
584 <            public void realRun() {
585 <                lock.writeLock().lock();
586 <                lock.writeLock().unlock();
616 >                lock.readLock().tryLock();
617 >                lock.readLock().unlock();
618              }});
619  
620 <        waitForQueuedThread(lock, t1);
621 <        waitForQueuedThread(lock, t2);
622 <        assertWriteLockedBy(lock, Thread.currentThread());
623 <        assertEquals(1, lock.getWriteHoldCount());
624 <        lock.writeLock().lock();
594 <        assertWriteLockedBy(lock, Thread.currentThread());
595 <        assertEquals(2, lock.getWriteHoldCount());
596 <        lock.writeLock().unlock();
597 <        releaseWriteLock(lock);
620 >        assertTrue(lock.getReadLockCount() > 0);
621 >        awaitTermination(t3);
622 >        assertTrue(t1.isAlive());
623 >        if (fair) assertTrue(t2.isAlive());
624 >        lock.readLock().unlock();
625          awaitTermination(t1);
626          awaitTermination(t2);
627      }
628  
629      /**
630 <     * 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
630 >     * Read lock succeeds if write locked by current thread even if
631       * other threads are waiting for readlock
632       */
633 <    public void testReadHoldingWriteLockFair2() throws InterruptedException {
634 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
633 >    public void testReadHoldingWriteLock2()      { testReadHoldingWriteLock2(false); }
634 >    public void testReadHoldingWriteLock2_fair() { testReadHoldingWriteLock2(true); }
635 >    public void testReadHoldingWriteLock2(boolean fair) {
636 >        final PublicReentrantReadWriteLock lock =
637 >            new PublicReentrantReadWriteLock(fair);
638          lock.writeLock().lock();
639          lock.readLock().lock();
640          lock.readLock().unlock();
# Line 633 | Line 652 | public class ReentrantReadWriteLockTest
652  
653          waitForQueuedThread(lock, t1);
654          waitForQueuedThread(lock, t2);
655 <        assertWriteLockedBy(lock, Thread.currentThread());
655 >        assertWriteLockedByMoi(lock);
656          lock.readLock().lock();
657          lock.readLock().unlock();
658          releaseWriteLock(lock);
# Line 642 | Line 661 | public class ReentrantReadWriteLockTest
661      }
662  
663      /**
664 <     * Fair Read lock succeeds if write locked by current thread even if
664 >     * Read lock succeeds if write locked by current thread even if
665       * other threads are waiting for writelock
666       */
667 <    public void testReadHoldingWriteLockFair3() throws InterruptedException {
668 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
667 >    public void testReadHoldingWriteLock3()      { testReadHoldingWriteLock3(false); }
668 >    public void testReadHoldingWriteLock3_fair() { testReadHoldingWriteLock3(true); }
669 >    public void testReadHoldingWriteLock3(boolean fair) {
670 >        final PublicReentrantReadWriteLock lock =
671 >            new PublicReentrantReadWriteLock(fair);
672          lock.writeLock().lock();
673          lock.readLock().lock();
674          lock.readLock().unlock();
# Line 664 | Line 686 | public class ReentrantReadWriteLockTest
686  
687          waitForQueuedThread(lock, t1);
688          waitForQueuedThread(lock, t2);
689 <        assertWriteLockedBy(lock, Thread.currentThread());
689 >        assertWriteLockedByMoi(lock);
690          lock.readLock().lock();
691          lock.readLock().unlock();
692 <        releaseWriteLock(lock);
692 >        assertWriteLockedByMoi(lock);
693 >        lock.writeLock().unlock();
694          awaitTermination(t1);
695          awaitTermination(t2);
696      }
697  
698      /**
699 <     * Fair Write lock succeeds if write locked by current thread even if
699 >     * Write lock succeeds if write locked by current thread even if
700       * other threads are waiting for writelock
701       */
702 <    public void testWriteHoldingWriteLockFair4() throws InterruptedException {
703 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
702 >    public void testWriteHoldingWriteLock4()      { testWriteHoldingWriteLock4(false); }
703 >    public void testWriteHoldingWriteLock4_fair() { testWriteHoldingWriteLock4(true); }
704 >    public void testWriteHoldingWriteLock4(boolean fair) {
705 >        final PublicReentrantReadWriteLock lock =
706 >            new PublicReentrantReadWriteLock(fair);
707 >        lock.writeLock().lock();
708          lock.writeLock().lock();
709 +        lock.writeLock().unlock();
710 +
711          Thread t1 = newStartedThread(new CheckedRunnable() {
712              public void realRun() {
713                  lock.writeLock().lock();
# Line 692 | Line 721 | public class ReentrantReadWriteLockTest
721  
722          waitForQueuedThread(lock, t1);
723          waitForQueuedThread(lock, t2);
724 <        assertWriteLockedBy(lock, Thread.currentThread());
724 >        assertWriteLockedByMoi(lock);
725          assertEquals(1, lock.getWriteHoldCount());
726          lock.writeLock().lock();
727 +        assertWriteLockedByMoi(lock);
728          assertEquals(2, lock.getWriteHoldCount());
729          lock.writeLock().unlock();
730 <        lock.writeLock().lock();
730 >        assertWriteLockedByMoi(lock);
731 >        assertEquals(1, lock.getWriteHoldCount());
732          lock.writeLock().unlock();
702        releaseWriteLock(lock);
733          awaitTermination(t1);
734          awaitTermination(t2);
735      }
# Line 707 | Line 737 | public class ReentrantReadWriteLockTest
737      /**
738       * Read tryLock succeeds if readlocked but not writelocked
739       */
740 <    public void testTryLockWhenReadLocked() throws InterruptedException {
741 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
740 >    public void testTryLockWhenReadLocked()      { testTryLockWhenReadLocked(false); }
741 >    public void testTryLockWhenReadLocked_fair() { testTryLockWhenReadLocked(true); }
742 >    public void testTryLockWhenReadLocked(boolean fair) {
743 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
744          lock.readLock().lock();
745          Thread t = newStartedThread(new CheckedRunnable() {
746              public void realRun() {
# Line 723 | Line 755 | public class ReentrantReadWriteLockTest
755      /**
756       * write tryLock fails when readlocked
757       */
758 <    public void testWriteTryLockWhenReadLocked() throws InterruptedException {
759 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
760 <        lock.readLock().lock();
761 <        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);
758 >    public void testWriteTryLockWhenReadLocked()      { testWriteTryLockWhenReadLocked(false); }
759 >    public void testWriteTryLockWhenReadLocked_fair() { testWriteTryLockWhenReadLocked(true); }
760 >    public void testWriteTryLockWhenReadLocked(boolean fair) {
761 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
762          lock.readLock().lock();
763          Thread t = newStartedThread(new CheckedRunnable() {
764              public void realRun() {
# Line 769 | Line 772 | public class ReentrantReadWriteLockTest
772      /**
773       * write timed tryLock times out if locked
774       */
775 <    public void testWriteTryLock_Timeout() throws InterruptedException {
776 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
775 >    public void testWriteTryLock_Timeout()      { testWriteTryLock_Timeout(false); }
776 >    public void testWriteTryLock_Timeout_fair() { testWriteTryLock_Timeout(true); }
777 >    public void testWriteTryLock_Timeout(boolean fair) {
778 >        final PublicReentrantReadWriteLock lock =
779 >            new PublicReentrantReadWriteLock(fair);
780          lock.writeLock().lock();
781          Thread t = newStartedThread(new CheckedRunnable() {
782              public void realRun() throws InterruptedException {
# Line 781 | Line 787 | public class ReentrantReadWriteLockTest
787              }});
788  
789          awaitTermination(t);
790 <        assertTrue(lock.writeLock().isHeldByCurrentThread());
785 <        lock.writeLock().unlock();
790 >        releaseWriteLock(lock);
791      }
792  
793      /**
794       * read timed tryLock times out if write-locked
795       */
796 <    public void testReadTryLock_Timeout() throws InterruptedException {
797 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
796 >    public void testReadTryLock_Timeout()      { testReadTryLock_Timeout(false); }
797 >    public void testReadTryLock_Timeout_fair() { testReadTryLock_Timeout(true); }
798 >    public void testReadTryLock_Timeout(boolean fair) {
799 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
800          lock.writeLock().lock();
801          Thread t = newStartedThread(new CheckedRunnable() {
802              public void realRun() throws InterruptedException {
# Line 805 | Line 812 | public class ReentrantReadWriteLockTest
812      }
813  
814      /**
815 <     * write lockInterruptibly succeeds if lock free else is interruptible
815 >     * write lockInterruptibly succeeds if unlocked, else is interruptible
816       */
817 <    public void testWriteLockInterruptibly() throws InterruptedException {
818 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
819 <        lock.writeLock().lockInterruptibly();
817 >    public void testWriteLockInterruptibly()      { testWriteLockInterruptibly(false); }
818 >    public void testWriteLockInterruptibly_fair() { testWriteLockInterruptibly(true); }
819 >    public void testWriteLockInterruptibly(boolean fair) {
820 >        final PublicReentrantReadWriteLock lock =
821 >            new PublicReentrantReadWriteLock(fair);
822 >        try {
823 >            lock.writeLock().lockInterruptibly();
824 >        } catch (InterruptedException ie) {
825 >            threadUnexpectedException(ie);
826 >        }
827          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
828              public void realRun() throws InterruptedException {
829                  lock.writeLock().lockInterruptibly();
# Line 817 | Line 831 | public class ReentrantReadWriteLockTest
831  
832          waitForQueuedThread(lock, t);
833          t.interrupt();
834 +        assertTrue(lock.writeLock().isHeldByCurrentThread());
835          awaitTermination(t);
836          releaseWriteLock(lock);
837      }
# Line 824 | Line 839 | public class ReentrantReadWriteLockTest
839      /**
840       * read lockInterruptibly succeeds if lock free else is interruptible
841       */
842 <    public void testReadLockInterruptibly() throws InterruptedException {
843 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
844 <        lock.writeLock().lockInterruptibly();
842 >    public void testReadLockInterruptibly()      { testReadLockInterruptibly(false); }
843 >    public void testReadLockInterruptibly_fair() { testReadLockInterruptibly(true); }
844 >    public void testReadLockInterruptibly(boolean fair) {
845 >        final PublicReentrantReadWriteLock lock =
846 >            new PublicReentrantReadWriteLock(fair);
847 >        try {
848 >            lock.readLock().lockInterruptibly();
849 >            lock.readLock().unlock();
850 >            lock.writeLock().lockInterruptibly();
851 >        } catch (InterruptedException ie) {
852 >            threadUnexpectedException(ie);
853 >        }
854          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
855              public void realRun() throws InterruptedException {
856                  lock.readLock().lockInterruptibly();
# Line 841 | Line 865 | public class ReentrantReadWriteLockTest
865      /**
866       * Calling await without holding lock throws IllegalMonitorStateException
867       */
868 <    public void testAwait_IllegalMonitor() throws InterruptedException {
869 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
870 <        final Condition c = lock.writeLock().newCondition();
871 <        try {
872 <            c.await();
873 <            shouldThrow();
874 <        } catch (IllegalMonitorStateException success) {}
875 <        try {
876 <            c.await(LONG_DELAY_MS, MILLISECONDS);
877 <            shouldThrow();
878 <        } catch (IllegalMonitorStateException success) {}
879 <        try {
880 <            c.awaitNanos(100);
881 <            shouldThrow();
858 <        } catch (IllegalMonitorStateException success) {}
859 <        try {
860 <            c.awaitUninterruptibly();
861 <            shouldThrow();
862 <        } catch (IllegalMonitorStateException success) {}
868 >    public void testAwait_IMSE()      { testAwait_IMSE(false); }
869 >    public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
870 >    public void testAwait_IMSE(boolean fair) {
871 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
872 >        final Condition c = lock.writeLock().newCondition();
873 >        for (AwaitMethod awaitMethod : AwaitMethod.values()) {
874 >            long startTime = System.nanoTime();
875 >            try {
876 >                await(c, awaitMethod);
877 >                shouldThrow();
878 >            } catch (IllegalMonitorStateException success) {
879 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
880 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
881 >        }
882      }
883  
884      /**
885       * Calling signal without holding lock throws IllegalMonitorStateException
886       */
887 <    public void testSignal_IllegalMonitor() {
888 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
887 >    public void testSignal_IMSE()      { testSignal_IMSE(false); }
888 >    public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
889 >    public void testSignal_IMSE(boolean fair) {
890 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
891          final Condition c = lock.writeLock().newCondition();
892          try {
893              c.signal();
# Line 877 | Line 898 | public class ReentrantReadWriteLockTest
898      /**
899       * Calling signalAll without holding lock throws IllegalMonitorStateException
900       */
901 <    public void testSignalAll_IllegalMonitor() {
902 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
901 >    public void testSignalAll_IMSE()      { testSignalAll_IMSE(false); }
902 >    public void testSignalAll_IMSE_fair() { testSignalAll_IMSE(true); }
903 >    public void testSignalAll_IMSE(boolean fair) {
904 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
905          final Condition c = lock.writeLock().newCondition();
906          try {
907              c.signalAll();
# Line 889 | Line 912 | public class ReentrantReadWriteLockTest
912      /**
913       * awaitNanos without a signal times out
914       */
915 <    public void testAwaitNanos_Timeout() throws InterruptedException {
916 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
917 <        final Condition c = lock.writeLock().newCondition();
918 <        lock.writeLock().lock();
919 <        long startTime = System.nanoTime();
920 <        long timeoutMillis = 10;
921 <        long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
922 <        long nanosRemaining = c.awaitNanos(timeoutNanos);
923 <        assertTrue(nanosRemaining <= 0);
924 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
925 <        lock.writeLock().unlock();
915 >    public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
916 >    public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
917 >    public void testAwaitNanos_Timeout(boolean fair) {
918 >        try {
919 >            final ReentrantReadWriteLock lock =
920 >                new ReentrantReadWriteLock(fair);
921 >            final Condition c = lock.writeLock().newCondition();
922 >            lock.writeLock().lock();
923 >            long startTime = System.nanoTime();
924 >            long timeoutMillis = 10;
925 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
926 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
927 >            assertTrue(nanosRemaining <= 0);
928 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
929 >            lock.writeLock().unlock();
930 >        } catch (InterruptedException e) {
931 >            threadUnexpectedException(e);
932 >        }
933      }
934  
935      /**
936       * timed await without a signal times out
937       */
938 <    public void testAwait_Timeout() throws InterruptedException {
939 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
940 <        final Condition c = lock.writeLock().newCondition();
941 <        lock.writeLock().lock();
942 <        long startTime = System.nanoTime();
943 <        long timeoutMillis = 10;
944 <        assertFalse(c.await(timeoutMillis, MILLISECONDS));
945 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
946 <        lock.writeLock().unlock();
938 >    public void testAwait_Timeout()      { testAwait_Timeout(false); }
939 >    public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
940 >    public void testAwait_Timeout(boolean fair) {
941 >        try {
942 >            final ReentrantReadWriteLock lock =
943 >                new ReentrantReadWriteLock(fair);
944 >            final Condition c = lock.writeLock().newCondition();
945 >            lock.writeLock().lock();
946 >            long startTime = System.nanoTime();
947 >            long timeoutMillis = 10;
948 >            assertFalse(c.await(timeoutMillis, MILLISECONDS));
949 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
950 >            lock.writeLock().unlock();
951 >        } catch (InterruptedException e) {
952 >            threadUnexpectedException(e);
953 >        }
954      }
955  
956      /**
957       * awaitUntil without a signal times out
958       */
959 <    public void testAwaitUntil_Timeout() throws InterruptedException {
960 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
961 <        final Condition c = lock.writeLock().newCondition();
962 <        lock.writeLock().lock();
963 <        long startTime = System.nanoTime();
964 <        long timeoutMillis = 10;
965 <        java.util.Date d = new java.util.Date();
966 <        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
967 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
968 <        lock.writeLock().unlock();
959 >    public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
960 >    public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
961 >    public void testAwaitUntil_Timeout(boolean fair) {
962 >        try {
963 >            final ReentrantReadWriteLock lock =
964 >                new ReentrantReadWriteLock(fair);
965 >            final Condition c = lock.writeLock().newCondition();
966 >            lock.writeLock().lock();
967 >            long startTime = System.nanoTime();
968 >            long timeoutMillis = 10;
969 >            java.util.Date d = new java.util.Date();
970 >            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
971 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
972 >            lock.writeLock().unlock();
973 >        } catch (InterruptedException e) {
974 >            threadUnexpectedException(e);
975 >        }
976      }
977  
978      /**
979       * await returns when signalled
980       */
981 <    public void testAwait() throws InterruptedException {
982 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
981 >    public void testAwait()      { testAwait(false); }
982 >    public void testAwait_fair() { testAwait(true); }
983 >    public void testAwait(boolean fair) {
984 >        final PublicReentrantReadWriteLock lock =
985 >            new PublicReentrantReadWriteLock(fair);
986          final Condition c = lock.writeLock().newCondition();
987          final CountDownLatch locked = new CountDownLatch(1);
988          Thread t = newStartedThread(new CheckedRunnable() {
# Line 946 | Line 993 | public class ReentrantReadWriteLockTest
993                  lock.writeLock().unlock();
994              }});
995  
996 <        locked.await();
996 >        await(locked);
997          lock.writeLock().lock();
998          assertHasWaiters(lock, c, t);
999          c.signal();
# Line 959 | Line 1006 | public class ReentrantReadWriteLockTest
1006      /**
1007       * awaitUninterruptibly doesn't abort on interrupt
1008       */
1009 <    public void testAwaitUninterruptibly() throws InterruptedException {
1010 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1009 >    public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
1010 >    public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
1011 >    public void testAwaitUninterruptibly(boolean fair) {
1012 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1013          final Condition c = lock.writeLock().newCondition();
1014          final CountDownLatch locked = new CountDownLatch(1);
1015          Thread t = newStartedThread(new CheckedRunnable() {
# Line 972 | Line 1021 | public class ReentrantReadWriteLockTest
1021                  lock.writeLock().unlock();
1022              }});
1023  
1024 <        locked.await();
1024 >        await(locked);
1025          lock.writeLock().lock();
1026          lock.writeLock().unlock();
1027          t.interrupt();
1028          long timeoutMillis = 10;
1029 <        assertThreadJoinTimesOut(t, timeoutMillis);
1029 >        assertThreadStaysAlive(t, timeoutMillis);
1030          lock.writeLock().lock();
1031          c.signal();
1032          lock.writeLock().unlock();
# Line 985 | Line 1034 | public class ReentrantReadWriteLockTest
1034      }
1035  
1036      /**
1037 <     * 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 {
996 <                lock.writeLock().lock();
997 <                assertWriteLockedBy(lock, Thread.currentThread());
998 <                assertHasNoWaiters(lock, c);
999 <                locked.countDown();
1000 <                try {
1001 <                    c.await();
1002 <                } finally {
1003 <                    assertWriteLockedBy(lock, Thread.currentThread());
1004 <                    assertHasNoWaiters(lock, c);
1005 <                    lock.writeLock().unlock();
1006 <                    assertFalse(Thread.interrupted());
1007 <                }
1008 <            }});
1009 <
1010 <        locked.await();
1011 <        assertHasWaiters(lock, c, t);
1012 <        t.interrupt();
1013 <        awaitTermination(t);
1014 <        assertNotWriteLocked(lock);
1015 <    }
1016 <
1017 <    /**
1018 <     * 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 <            }});
1039 <
1040 <        locked.await();
1041 <        assertHasWaiters(lock, c, t);
1042 <        t.interrupt();
1043 <        awaitTermination(t);
1044 <        assertNotWriteLocked(lock);
1045 <    }
1046 <
1047 <    /**
1048 <     * awaitUntil is interruptible
1037 >     * await/awaitNanos/awaitUntil is interruptible
1038       */
1039 <    public void testAwaitUntil_Interrupt() throws InterruptedException {
1040 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1039 >    public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
1040 >    public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
1041 >    public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
1042 >    public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
1043 >    public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
1044 >    public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
1045 >    public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
1046 >    public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
1047 >    public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
1048 >        final PublicReentrantReadWriteLock lock =
1049 >            new PublicReentrantReadWriteLock(fair);
1050          final Condition c = lock.writeLock().newCondition();
1051          final CountDownLatch locked = new CountDownLatch(1);
1052          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1053              public void realRun() throws InterruptedException {
1054                  lock.writeLock().lock();
1055 <                assertWriteLockedBy(lock, Thread.currentThread());
1055 >                assertWriteLockedByMoi(lock);
1056                  assertHasNoWaiters(lock, c);
1057                  locked.countDown();
1060                java.util.Date d = new java.util.Date();
1058                  try {
1059 <                    c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS));
1059 >                    await(c, awaitMethod);
1060                  } finally {
1061 <                    assertWriteLockedBy(lock, Thread.currentThread());
1061 >                    assertWriteLockedByMoi(lock);
1062                      assertHasNoWaiters(lock, c);
1063                      lock.writeLock().unlock();
1064                      assertFalse(Thread.interrupted());
1065                  }
1066              }});
1067  
1068 <        locked.await();
1068 >        await(locked);
1069          assertHasWaiters(lock, c, t);
1070          t.interrupt();
1071          awaitTermination(t);
# Line 1078 | Line 1075 | public class ReentrantReadWriteLockTest
1075      /**
1076       * signalAll wakes up all threads
1077       */
1078 <    public void testSignalAll() throws InterruptedException {
1079 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1078 >    public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
1079 >    public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
1080 >    public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
1081 >    public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
1082 >    public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
1083 >    public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
1084 >    public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
1085 >    public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
1086 >    public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
1087 >        final PublicReentrantReadWriteLock lock =
1088 >            new PublicReentrantReadWriteLock(fair);
1089          final Condition c = lock.writeLock().newCondition();
1090          final CountDownLatch locked = new CountDownLatch(2);
1091          final Lock writeLock = lock.writeLock();
1092 <        Thread t1 = newStartedThread(new CheckedRunnable() {
1092 >        class Awaiter extends CheckedRunnable {
1093              public void realRun() throws InterruptedException {
1094                  writeLock.lock();
1095                  locked.countDown();
1096 <                c.await();
1096 >                await(c, awaitMethod);
1097                  writeLock.unlock();
1098 <            }});
1098 >            }
1099 >        }
1100  
1101 <        Thread t2 = newStartedThread(new CheckedRunnable() {
1102 <            public void realRun() throws InterruptedException {
1096 <                writeLock.lock();
1097 <                locked.countDown();
1098 <                c.await();
1099 <                writeLock.unlock();
1100 <            }});
1101 >        Thread t1 = newStartedThread(new Awaiter());
1102 >        Thread t2 = newStartedThread(new Awaiter());
1103  
1104 <        locked.await();
1104 >        await(locked);
1105          writeLock.lock();
1106          assertHasWaiters(lock, c, t1, t2);
1107          c.signalAll();
# Line 1110 | Line 1112 | public class ReentrantReadWriteLockTest
1112      }
1113  
1114      /**
1115 <     * signal wakes up waiting threads in FIFO order.
1115 >     * signal wakes up waiting threads in FIFO order
1116       */
1117 <    public void testSignalWakesFifo() throws InterruptedException {
1118 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1117 >    public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1118 >    public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1119 >    public void testSignalWakesFifo(boolean fair) {
1120 >        final PublicReentrantReadWriteLock lock =
1121 >            new PublicReentrantReadWriteLock(fair);
1122          final Condition c = lock.writeLock().newCondition();
1123          final CountDownLatch locked1 = new CountDownLatch(1);
1124          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1126 | Line 1131 | public class ReentrantReadWriteLockTest
1131                  writeLock.unlock();
1132              }});
1133  
1134 <        locked1.await();
1134 >        await(locked1);
1135  
1136          Thread t2 = newStartedThread(new CheckedRunnable() {
1137              public void realRun() throws InterruptedException {
# Line 1136 | Line 1141 | public class ReentrantReadWriteLockTest
1141                  writeLock.unlock();
1142              }});
1143  
1144 <        locked2.await();
1144 >        await(locked2);
1145  
1146          writeLock.lock();
1147          assertHasWaiters(lock, c, t1, t2);
# Line 1157 | Line 1162 | public class ReentrantReadWriteLockTest
1162      /**
1163       * await after multiple reentrant locking preserves lock count
1164       */
1165 <    public void testAwaitLockCount() throws InterruptedException {
1166 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1165 >    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1166 >    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1167 >    public void testAwaitLockCount(boolean fair) {
1168 >        final PublicReentrantReadWriteLock lock =
1169 >            new PublicReentrantReadWriteLock(fair);
1170          final Condition c = lock.writeLock().newCondition();
1171          final CountDownLatch locked = new CountDownLatch(2);
1172          Thread t1 = newStartedThread(new CheckedRunnable() {
1173              public void realRun() throws InterruptedException {
1174                  lock.writeLock().lock();
1175 <                assertWriteLockedBy(lock, Thread.currentThread());
1175 >                assertWriteLockedByMoi(lock);
1176                  assertEquals(1, lock.writeLock().getHoldCount());
1177                  locked.countDown();
1178                  c.await();
1179 <                assertWriteLockedBy(lock, Thread.currentThread());
1179 >                assertWriteLockedByMoi(lock);
1180                  assertEquals(1, lock.writeLock().getHoldCount());
1181                  lock.writeLock().unlock();
1182              }});
# Line 1177 | Line 1185 | public class ReentrantReadWriteLockTest
1185              public void realRun() throws InterruptedException {
1186                  lock.writeLock().lock();
1187                  lock.writeLock().lock();
1188 <                assertWriteLockedBy(lock, Thread.currentThread());
1188 >                assertWriteLockedByMoi(lock);
1189                  assertEquals(2, lock.writeLock().getHoldCount());
1190                  locked.countDown();
1191                  c.await();
1192 <                assertWriteLockedBy(lock, Thread.currentThread());
1192 >                assertWriteLockedByMoi(lock);
1193                  assertEquals(2, lock.writeLock().getHoldCount());
1194                  lock.writeLock().unlock();
1195                  lock.writeLock().unlock();
1196              }});
1197  
1198 <        locked.await();
1198 >        await(locked);
1199          lock.writeLock().lock();
1200          assertHasWaiters(lock, c, t1, t2);
1201          c.signalAll();
# Line 1200 | Line 1208 | public class ReentrantReadWriteLockTest
1208      /**
1209       * A serialized lock deserializes as unlocked
1210       */
1211 <    public void testSerialization() throws Exception {
1212 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1213 <        l.readLock().lock();
1214 <        l.readLock().unlock();
1215 <
1216 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1217 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1218 <        out.writeObject(l);
1219 <        out.close();
1220 <
1221 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1222 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1223 <        ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1224 <        r.readLock().lock();
1225 <        r.readLock().unlock();
1211 >    public void testSerialization()      { testSerialization(false); }
1212 >    public void testSerialization_fair() { testSerialization(true); }
1213 >    public void testSerialization(boolean fair) {
1214 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1215 >        lock.writeLock().lock();
1216 >        lock.readLock().lock();
1217 >
1218 >        ReentrantReadWriteLock clone = serialClone(lock);
1219 >        assertEquals(lock.isFair(), clone.isFair());
1220 >        assertTrue(lock.isWriteLocked());
1221 >        assertFalse(clone.isWriteLocked());
1222 >        assertEquals(1, lock.getReadLockCount());
1223 >        assertEquals(0, clone.getReadLockCount());
1224 >        clone.writeLock().lock();
1225 >        clone.readLock().lock();
1226 >        assertTrue(clone.isWriteLocked());
1227 >        assertEquals(1, clone.getReadLockCount());
1228 >        clone.readLock().unlock();
1229 >        clone.writeLock().unlock();
1230 >        assertFalse(clone.isWriteLocked());
1231 >        assertEquals(1, lock.getReadLockCount());
1232 >        assertEquals(0, clone.getReadLockCount());
1233      }
1234  
1235      /**
1236       * hasQueuedThreads reports whether there are waiting threads
1237       */
1238 <    public void testHasQueuedThreads() throws InterruptedException {
1239 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1238 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
1239 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
1240 >    public void testHasQueuedThreads(boolean fair) {
1241 >        final PublicReentrantReadWriteLock lock =
1242 >            new PublicReentrantReadWriteLock(fair);
1243          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1244          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1245          assertFalse(lock.hasQueuedThreads());
# Line 1244 | Line 1262 | public class ReentrantReadWriteLockTest
1262      /**
1263       * hasQueuedThread(null) throws NPE
1264       */
1265 <    public void testHasQueuedThreadNPE() {
1266 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1265 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
1266 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
1267 >    public void testHasQueuedThreadNPE(boolean fair) {
1268 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1269          try {
1270              lock.hasQueuedThread(null);
1271              shouldThrow();
# Line 1253 | Line 1273 | public class ReentrantReadWriteLockTest
1273      }
1274  
1275      /**
1276 <     * hasQueuedThread reports whether a thread is queued.
1276 >     * hasQueuedThread reports whether a thread is queued
1277       */
1278 <    public void testHasQueuedThread() throws InterruptedException {
1279 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1278 >    public void testHasQueuedThread()      { testHasQueuedThread(false); }
1279 >    public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
1280 >    public void testHasQueuedThread(boolean fair) {
1281 >        final PublicReentrantReadWriteLock lock =
1282 >            new PublicReentrantReadWriteLock(fair);
1283          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1284          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1285          assertFalse(lock.hasQueuedThread(t1));
# Line 1283 | Line 1306 | public class ReentrantReadWriteLockTest
1306      /**
1307       * getQueueLength reports number of waiting threads
1308       */
1309 <    public void testGetQueueLength() throws InterruptedException {
1310 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1309 >    public void testGetQueueLength()      { testGetQueueLength(false); }
1310 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
1311 >    public void testGetQueueLength(boolean fair) {
1312 >        final PublicReentrantReadWriteLock lock =
1313 >            new PublicReentrantReadWriteLock(fair);
1314          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1315          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1316          assertEquals(0, lock.getQueueLength());
# Line 1306 | Line 1332 | public class ReentrantReadWriteLockTest
1332      /**
1333       * getQueuedThreads includes waiting threads
1334       */
1335 <    public void testGetQueuedThreads() throws InterruptedException {
1336 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1335 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
1336 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
1337 >    public void testGetQueuedThreads(boolean fair) {
1338 >        final PublicReentrantReadWriteLock lock =
1339 >            new PublicReentrantReadWriteLock(fair);
1340          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1341          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1342          assertTrue(lock.getQueuedThreads().isEmpty());
# Line 1335 | Line 1364 | public class ReentrantReadWriteLockTest
1364      /**
1365       * hasWaiters throws NPE if null
1366       */
1367 <    public void testHasWaitersNPE() {
1368 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1367 >    public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
1368 >    public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
1369 >    public void testHasWaitersNPE(boolean fair) {
1370 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1371          try {
1372              lock.hasWaiters(null);
1373              shouldThrow();
# Line 1346 | Line 1377 | public class ReentrantReadWriteLockTest
1377      /**
1378       * getWaitQueueLength throws NPE if null
1379       */
1380 <    public void testGetWaitQueueLengthNPE() {
1381 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1380 >    public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
1381 >    public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
1382 >    public void testGetWaitQueueLengthNPE(boolean fair) {
1383 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1384          try {
1385              lock.getWaitQueueLength(null);
1386              shouldThrow();
# Line 1357 | Line 1390 | public class ReentrantReadWriteLockTest
1390      /**
1391       * getWaitingThreads throws NPE if null
1392       */
1393 <    public void testGetWaitingThreadsNPE() {
1394 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1393 >    public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
1394 >    public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
1395 >    public void testGetWaitingThreadsNPE(boolean fair) {
1396 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(fair);
1397          try {
1398              lock.getWaitingThreads(null);
1399              shouldThrow();
# Line 1368 | Line 1403 | public class ReentrantReadWriteLockTest
1403      /**
1404       * hasWaiters throws IllegalArgumentException if not owned
1405       */
1406 <    public void testHasWaitersIAE() {
1407 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1406 >    public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
1407 >    public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
1408 >    public void testHasWaitersIAE(boolean fair) {
1409 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1410          final Condition c = lock.writeLock().newCondition();
1411 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1411 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1412          try {
1413              lock2.hasWaiters(c);
1414              shouldThrow();
# Line 1381 | Line 1418 | public class ReentrantReadWriteLockTest
1418      /**
1419       * hasWaiters throws IllegalMonitorStateException if not locked
1420       */
1421 <    public void testHasWaitersIMSE() {
1422 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1421 >    public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
1422 >    public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
1423 >    public void testHasWaitersIMSE(boolean fair) {
1424 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1425          final Condition c = lock.writeLock().newCondition();
1426          try {
1427              lock.hasWaiters(c);
# Line 1393 | Line 1432 | public class ReentrantReadWriteLockTest
1432      /**
1433       * getWaitQueueLength throws IllegalArgumentException if not owned
1434       */
1435 <    public void testGetWaitQueueLengthIAE() {
1436 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1435 >    public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
1436 >    public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
1437 >    public void testGetWaitQueueLengthIAE(boolean fair) {
1438 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1439          final Condition c = lock.writeLock().newCondition();
1440 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1440 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1441          try {
1442              lock2.getWaitQueueLength(c);
1443              shouldThrow();
# Line 1406 | Line 1447 | public class ReentrantReadWriteLockTest
1447      /**
1448       * getWaitQueueLength throws IllegalMonitorStateException if not locked
1449       */
1450 <    public void testGetWaitQueueLengthIMSE() {
1451 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1450 >    public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
1451 >    public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
1452 >    public void testGetWaitQueueLengthIMSE(boolean fair) {
1453 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1454          final Condition c = lock.writeLock().newCondition();
1455          try {
1456              lock.getWaitQueueLength(c);
# Line 1418 | Line 1461 | public class ReentrantReadWriteLockTest
1461      /**
1462       * getWaitingThreads throws IllegalArgumentException if not owned
1463       */
1464 <    public void testGetWaitingThreadsIAE() {
1465 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1464 >    public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
1465 >    public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
1466 >    public void testGetWaitingThreadsIAE(boolean fair) {
1467 >        final PublicReentrantReadWriteLock lock =
1468 >            new PublicReentrantReadWriteLock(fair);
1469          final Condition c = lock.writeLock().newCondition();
1470 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1470 >        final PublicReentrantReadWriteLock lock2 =
1471 >            new PublicReentrantReadWriteLock(fair);
1472          try {
1473              lock2.getWaitingThreads(c);
1474              shouldThrow();
# Line 1431 | Line 1478 | public class ReentrantReadWriteLockTest
1478      /**
1479       * getWaitingThreads throws IllegalMonitorStateException if not locked
1480       */
1481 <    public void testGetWaitingThreadsIMSE() {
1482 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1481 >    public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
1482 >    public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
1483 >    public void testGetWaitingThreadsIMSE(boolean fair) {
1484 >        final PublicReentrantReadWriteLock lock =
1485 >            new PublicReentrantReadWriteLock(fair);
1486          final Condition c = lock.writeLock().newCondition();
1487          try {
1488              lock.getWaitingThreads(c);
# Line 1443 | Line 1493 | public class ReentrantReadWriteLockTest
1493      /**
1494       * hasWaiters returns true when a thread is waiting, else false
1495       */
1496 <    public void testHasWaiters() throws InterruptedException {
1497 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1496 >    public void testHasWaiters()      { testHasWaiters(false); }
1497 >    public void testHasWaiters_fair() { testHasWaiters(true); }
1498 >    public void testHasWaiters(boolean fair) {
1499 >        final PublicReentrantReadWriteLock lock =
1500 >            new PublicReentrantReadWriteLock(fair);
1501          final Condition c = lock.writeLock().newCondition();
1502          final CountDownLatch locked = new CountDownLatch(1);
1503          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1459 | Line 1512 | public class ReentrantReadWriteLockTest
1512                  lock.writeLock().unlock();
1513              }});
1514  
1515 <        locked.await();
1515 >        await(locked);
1516          lock.writeLock().lock();
1517          assertHasWaiters(lock, c, t);
1518          assertTrue(lock.hasWaiters(c));
# Line 1474 | Line 1527 | public class ReentrantReadWriteLockTest
1527      /**
1528       * getWaitQueueLength returns number of waiting threads
1529       */
1530 <    public void testGetWaitQueueLength() throws InterruptedException {
1531 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1530 >    public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
1531 >    public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
1532 >    public void testGetWaitQueueLength(boolean fair) {
1533 >        final PublicReentrantReadWriteLock lock =
1534 >            new PublicReentrantReadWriteLock(fair);
1535          final Condition c = lock.writeLock().newCondition();
1536          final CountDownLatch locked = new CountDownLatch(1);
1537          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1487 | Line 1543 | public class ReentrantReadWriteLockTest
1543                  lock.writeLock().unlock();
1544              }});
1545  
1546 <        locked.await();
1546 >        await(locked);
1547          lock.writeLock().lock();
1548          assertHasWaiters(lock, c, t);
1549          assertEquals(1, lock.getWaitQueueLength(c));
# Line 1501 | Line 1557 | public class ReentrantReadWriteLockTest
1557      /**
1558       * getWaitingThreads returns only and all waiting threads
1559       */
1560 <    public void testGetWaitingThreads() throws InterruptedException {
1561 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1560 >    public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
1561 >    public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
1562 >    public void testGetWaitingThreads(boolean fair) {
1563 >        final PublicReentrantReadWriteLock lock =
1564 >            new PublicReentrantReadWriteLock(fair);
1565          final Condition c = lock.writeLock().newCondition();
1566          final CountDownLatch locked1 = new CountDownLatch(1);
1567          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1529 | Line 1588 | public class ReentrantReadWriteLockTest
1588          lock.writeLock().unlock();
1589  
1590          t1.start();
1591 <        locked1.await();
1591 >        await(locked1);
1592          t2.start();
1593 <        locked2.await();
1593 >        await(locked2);
1594  
1595          lock.writeLock().lock();
1596          assertTrue(lock.hasWaiters(c));
# Line 1551 | Line 1610 | public class ReentrantReadWriteLockTest
1610      /**
1611       * toString indicates current lock state
1612       */
1613 <    public void testToString() {
1614 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1615 <        String us = lock.toString();
1616 <        assertTrue(us.indexOf("Write locks = 0") >= 0);
1617 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1618 <        lock.writeLock().lock();
1619 <        String ws = lock.toString();
1620 <        assertTrue(ws.indexOf("Write locks = 1") >= 0);
1621 <        assertTrue(ws.indexOf("Read locks = 0") >= 0);
1613 >    public void testToString()      { testToString(false); }
1614 >    public void testToString_fair() { testToString(true); }
1615 >    public void testToString(boolean fair) {
1616 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1617 >        assertTrue(lock.toString().contains("Write locks = 0"));
1618 >        assertTrue(lock.toString().contains("Read locks = 0"));
1619 >        lock.writeLock().lock();
1620 >        assertTrue(lock.toString().contains("Write locks = 1"));
1621 >        assertTrue(lock.toString().contains("Read locks = 0"));
1622          lock.writeLock().unlock();
1623          lock.readLock().lock();
1624          lock.readLock().lock();
1625 <        String rs = lock.toString();
1626 <        assertTrue(rs.indexOf("Write locks = 0") >= 0);
1568 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1625 >        assertTrue(lock.toString().contains("Write locks = 0"));
1626 >        assertTrue(lock.toString().contains("Read locks = 2"));
1627      }
1628  
1629      /**
1630       * readLock.toString indicates current lock state
1631       */
1632 <    public void testReadLockToString() {
1633 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1634 <        String us = lock.readLock().toString();
1635 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1632 >    public void testReadLockToString()      { testReadLockToString(false); }
1633 >    public void testReadLockToString_fair() { testReadLockToString(true); }
1634 >    public void testReadLockToString(boolean fair) {
1635 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1636 >        assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1637          lock.readLock().lock();
1638          lock.readLock().lock();
1639 <        String rs = lock.readLock().toString();
1581 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1639 >        assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1640      }
1641  
1642      /**
1643       * writeLock.toString indicates current lock state
1644       */
1645 <    public void testWriteLockToString() {
1646 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1647 <        String us = lock.writeLock().toString();
1648 <        assertTrue(us.indexOf("Unlocked") >= 0);
1645 >    public void testWriteLockToString()      { testWriteLockToString(false); }
1646 >    public void testWriteLockToString_fair() { testWriteLockToString(true); }
1647 >    public void testWriteLockToString(boolean fair) {
1648 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1649 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1650          lock.writeLock().lock();
1651 <        String ls = lock.writeLock().toString();
1652 <        assertTrue(ls.indexOf("Locked") >= 0);
1651 >        assertTrue(lock.writeLock().toString().contains("Locked"));
1652 >        lock.writeLock().unlock();
1653 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1654      }
1655  
1656   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines