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.58 by jsr166, Sat May 7 14:43:13 2011 UTC vs.
Revision 1.74 by jsr166, Sun May 24 01:42:14 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.concurrent.atomic.AtomicBoolean;
11 import java.util.concurrent.locks.*;
12 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.io.*;
11 < import java.util.*;
10 >
11 > import java.util.Arrays;
12 > import java.util.Collection;
13 > import java.util.HashSet;
14 > import java.util.concurrent.CountDownLatch;
15 > import java.util.concurrent.atomic.AtomicBoolean;
16 > import java.util.concurrent.locks.Condition;
17 > import java.util.concurrent.locks.Lock;
18 > import java.util.concurrent.locks.ReentrantReadWriteLock;
19 >
20 > import junit.framework.AssertionFailedError;
21 > import junit.framework.Test;
22 > import junit.framework.TestSuite;
23  
24   public class ReentrantReadWriteLockTest extends JSR166TestCase {
25      public static void main(String[] args) {
26 <        junit.textui.TestRunner.run(suite());
26 >        main(suite(), args);
27      }
28      public static Test suite() {
29          return new TestSuite(ReentrantReadWriteLockTest.class);
# Line 67 | Line 74 | public class ReentrantReadWriteLockTest
74       */
75      void releaseWriteLock(PublicReentrantReadWriteLock lock) {
76          ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
77 <        assertWriteLockedBy(lock, Thread.currentThread());
77 >        assertWriteLockedByMoi(lock);
78          assertEquals(1, lock.getWriteHoldCount());
79          writeLock.unlock();
80          assertNotWriteLocked(lock);
# Line 80 | Line 87 | public class ReentrantReadWriteLockTest
87          long startTime = System.nanoTime();
88          while (!lock.hasQueuedThread(t)) {
89              if (millisElapsedSince(startTime) > LONG_DELAY_MS)
90 <                throw new AssertionError("timed out");
90 >                throw new AssertionFailedError("timed out");
91              Thread.yield();
92          }
93          assertTrue(t.isAlive());
94 <        assertTrue(lock.getOwner() != t);
94 >        assertNotSame(t, lock.getOwner());
95      }
96  
97      /**
# Line 94 | Line 101 | public class ReentrantReadWriteLockTest
101          assertFalse(lock.isWriteLocked());
102          assertFalse(lock.isWriteLockedByCurrentThread());
103          assertFalse(lock.writeLock().isHeldByCurrentThread());
97        assertNull(lock.getOwner());
104          assertEquals(0, lock.getWriteHoldCount());
105 +        assertEquals(0, lock.writeLock().getHoldCount());
106 +        assertNull(lock.getOwner());
107      }
108  
109      /**
# Line 110 | Line 118 | public class ReentrantReadWriteLockTest
118                       lock.writeLock().isHeldByCurrentThread());
119          assertEquals(t == Thread.currentThread(),
120                       lock.getWriteHoldCount() > 0);
121 +        assertEquals(t == Thread.currentThread(),
122 +                     lock.writeLock().getHoldCount() > 0);
123          assertEquals(0, lock.getReadLockCount());
124      }
125  
126      /**
127 +     * Checks that lock is write-locked by the current thread.
128 +     */
129 +    void assertWriteLockedByMoi(PublicReentrantReadWriteLock lock) {
130 +        assertWriteLockedBy(lock, Thread.currentThread());
131 +    }
132 +
133 +    /**
134       * Checks that condition c has no waiters.
135       */
136      void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
# Line 135 | Line 152 | public class ReentrantReadWriteLockTest
152          lock.writeLock().unlock();
153      }
154  
155 +    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
156 +
157 +    /**
158 +     * Awaits condition using the specified AwaitMethod.
159 +     */
160 +    void await(Condition c, AwaitMethod awaitMethod)
161 +            throws InterruptedException {
162 +        switch (awaitMethod) {
163 +        case await:
164 +            c.await();
165 +            break;
166 +        case awaitTimed:
167 +            assertTrue(c.await(2 * LONG_DELAY_MS, MILLISECONDS));
168 +            break;
169 +        case awaitNanos:
170 +            long nanosRemaining = c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
171 +            assertTrue(nanosRemaining > 0);
172 +            break;
173 +        case awaitUntil:
174 +            java.util.Date d = new java.util.Date();
175 +            assertTrue(c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS)));
176 +            break;
177 +        default:
178 +            throw new AssertionError();
179 +        }
180 +    }
181 +
182      /**
183       * Constructor sets given fairness, and is in unlocked state
184       */
# Line 160 | Line 204 | public class ReentrantReadWriteLockTest
204      /**
205       * write-locking and read-locking an unlocked lock succeed
206       */
207 <    public void testLock() {
208 <        PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
207 >    public void testLock()      { testLock(false); }
208 >    public void testLock_fair() { testLock(true); }
209 >    public void testLock(boolean fair) {
210 >        PublicReentrantReadWriteLock lock =
211 >            new PublicReentrantReadWriteLock(fair);
212          assertNotWriteLocked(lock);
213          lock.writeLock().lock();
214 <        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);
184 <        assertNotWriteLocked(lock);
185 <        lock.writeLock().lock();
186 <        assertWriteLockedBy(lock, Thread.currentThread());
214 >        assertWriteLockedByMoi(lock);
215          lock.writeLock().unlock();
216          assertNotWriteLocked(lock);
217          assertEquals(0, lock.getReadLockCount());
# Line 198 | Line 226 | public class ReentrantReadWriteLockTest
226      /**
227       * getWriteHoldCount returns number of recursive holds
228       */
229 <    public void testGetWriteHoldCount() {
230 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
229 >    public void testGetWriteHoldCount()      { testGetWriteHoldCount(false); }
230 >    public void testGetWriteHoldCount_fair() { testGetWriteHoldCount(true); }
231 >    public void testGetWriteHoldCount(boolean fair) {
232 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
233          for (int i = 1; i <= SIZE; i++) {
234              lock.writeLock().lock();
235              assertEquals(i,lock.getWriteHoldCount());
236          }
237          for (int i = SIZE; i > 0; i--) {
238              lock.writeLock().unlock();
239 <            assertEquals(i-1,lock.getWriteHoldCount());
239 >            assertEquals(i - 1,lock.getWriteHoldCount());
240          }
241      }
242  
243      /**
244 <     * WriteLock.getHoldCount returns number of recursive holds
244 >     * writelock.getHoldCount returns number of recursive holds
245       */
246 <    public void testGetHoldCount() {
247 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
246 >    public void testGetHoldCount()      { testGetHoldCount(false); }
247 >    public void testGetHoldCount_fair() { testGetHoldCount(true); }
248 >    public void testGetHoldCount(boolean fair) {
249 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
250          for (int i = 1; i <= SIZE; i++) {
251              lock.writeLock().lock();
252              assertEquals(i,lock.writeLock().getHoldCount());
253          }
254          for (int i = SIZE; i > 0; i--) {
255              lock.writeLock().unlock();
256 <            assertEquals(i-1,lock.writeLock().getHoldCount());
256 >            assertEquals(i - 1,lock.writeLock().getHoldCount());
257          }
258      }
259  
260      /**
261       * getReadHoldCount returns number of recursive holds
262       */
263 <    public void testGetReadHoldCount() {
264 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
263 >    public void testGetReadHoldCount()      { testGetReadHoldCount(false); }
264 >    public void testGetReadHoldCount_fair() { testGetReadHoldCount(true); }
265 >    public void testGetReadHoldCount(boolean fair) {
266 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
267          for (int i = 1; i <= SIZE; i++) {
268              lock.readLock().lock();
269              assertEquals(i,lock.getReadHoldCount());
270          }
271          for (int i = SIZE; i > 0; i--) {
272              lock.readLock().unlock();
273 <            assertEquals(i-1,lock.getReadHoldCount());
273 >            assertEquals(i - 1,lock.getReadHoldCount());
274          }
275      }
276  
277      /**
278       * write-unlocking an unlocked lock throws IllegalMonitorStateException
279       */
280 <    public void testWriteUnlock_IllegalMonitorStateException() {
281 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
280 >    public void testWriteUnlock_IMSE()      { testWriteUnlock_IMSE(false); }
281 >    public void testWriteUnlock_IMSE_fair() { testWriteUnlock_IMSE(true); }
282 >    public void testWriteUnlock_IMSE(boolean fair) {
283 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
284          try {
285              lock.writeLock().unlock();
286              shouldThrow();
# Line 254 | Line 290 | public class ReentrantReadWriteLockTest
290      /**
291       * read-unlocking an unlocked lock throws IllegalMonitorStateException
292       */
293 <    public void testReadUnlock_IllegalMonitorStateException() {
294 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
293 >    public void testReadUnlock_IMSE()      { testReadUnlock_IMSE(false); }
294 >    public void testReadUnlock_IMSE_fair() { testReadUnlock_IMSE(true); }
295 >    public void testReadUnlock_IMSE(boolean fair) {
296 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
297          try {
298              lock.readLock().unlock();
299              shouldThrow();
# Line 265 | Line 303 | public class ReentrantReadWriteLockTest
303      /**
304       * write-lockInterruptibly is interruptible
305       */
306 <    public void testWriteLockInterruptibly_Interrupted() throws Exception {
307 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
306 >    public void testWriteLockInterruptibly_Interruptible()      { testWriteLockInterruptibly_Interruptible(false); }
307 >    public void testWriteLockInterruptibly_Interruptible_fair() { testWriteLockInterruptibly_Interruptible(true); }
308 >    public void testWriteLockInterruptibly_Interruptible(boolean fair) {
309 >        final PublicReentrantReadWriteLock lock =
310 >            new PublicReentrantReadWriteLock(fair);
311          lock.writeLock().lock();
312          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
313              public void realRun() throws InterruptedException {
# Line 282 | Line 323 | public class ReentrantReadWriteLockTest
323      /**
324       * timed write-tryLock is interruptible
325       */
326 <    public void testWriteTryLock_Interrupted() throws InterruptedException {
327 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
326 >    public void testWriteTryLock_Interruptible()      { testWriteTryLock_Interruptible(false); }
327 >    public void testWriteTryLock_Interruptible_fair() { testWriteTryLock_Interruptible(true); }
328 >    public void testWriteTryLock_Interruptible(boolean fair) {
329 >        final PublicReentrantReadWriteLock lock =
330 >            new PublicReentrantReadWriteLock(fair);
331          lock.writeLock().lock();
332          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
333              public void realRun() throws InterruptedException {
334 <                lock.writeLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
334 >                lock.writeLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
335              }});
336  
337          waitForQueuedThread(lock, t);
# Line 299 | Line 343 | public class ReentrantReadWriteLockTest
343      /**
344       * read-lockInterruptibly is interruptible
345       */
346 <    public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
347 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
346 >    public void testReadLockInterruptibly_Interruptible()      { testReadLockInterruptibly_Interruptible(false); }
347 >    public void testReadLockInterruptibly_Interruptible_fair() { testReadLockInterruptibly_Interruptible(true); }
348 >    public void testReadLockInterruptibly_Interruptible(boolean fair) {
349 >        final PublicReentrantReadWriteLock lock =
350 >            new PublicReentrantReadWriteLock(fair);
351          lock.writeLock().lock();
352          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
353              public void realRun() throws InterruptedException {
# Line 316 | Line 363 | public class ReentrantReadWriteLockTest
363      /**
364       * timed read-tryLock is interruptible
365       */
366 <    public void testReadTryLock_Interrupted() throws InterruptedException {
367 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
366 >    public void testReadTryLock_Interruptible()      { testReadTryLock_Interruptible(false); }
367 >    public void testReadTryLock_Interruptible_fair() { testReadTryLock_Interruptible(true); }
368 >    public void testReadTryLock_Interruptible(boolean fair) {
369 >        final PublicReentrantReadWriteLock lock =
370 >            new PublicReentrantReadWriteLock(fair);
371          lock.writeLock().lock();
372          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
373              public void realRun() throws InterruptedException {
374 <                lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
374 >                lock.readLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
375              }});
376  
377          waitForQueuedThread(lock, t);
# Line 331 | Line 381 | public class ReentrantReadWriteLockTest
381      }
382  
383      /**
384 +     * write-tryLock on an unlocked lock succeeds
385 +     */
386 +    public void testWriteTryLock()      { testWriteTryLock(false); }
387 +    public void testWriteTryLock_fair() { testWriteTryLock(true); }
388 +    public void testWriteTryLock(boolean fair) {
389 +        final PublicReentrantReadWriteLock lock =
390 +            new PublicReentrantReadWriteLock(fair);
391 +        assertTrue(lock.writeLock().tryLock());
392 +        assertWriteLockedByMoi(lock);
393 +        assertTrue(lock.writeLock().tryLock());
394 +        assertWriteLockedByMoi(lock);
395 +        lock.writeLock().unlock();
396 +        releaseWriteLock(lock);
397 +    }
398 +
399 +    /**
400       * write-tryLock fails if locked
401       */
402 <    public void testWriteTryLockWhenLocked() throws InterruptedException {
403 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
402 >    public void testWriteTryLockWhenLocked()      { testWriteTryLockWhenLocked(false); }
403 >    public void testWriteTryLockWhenLocked_fair() { testWriteTryLockWhenLocked(true); }
404 >    public void testWriteTryLockWhenLocked(boolean fair) {
405 >        final PublicReentrantReadWriteLock lock =
406 >            new PublicReentrantReadWriteLock(fair);
407          lock.writeLock().lock();
408          Thread t = newStartedThread(new CheckedRunnable() {
409              public void realRun() {
# Line 348 | Line 417 | public class ReentrantReadWriteLockTest
417      /**
418       * read-tryLock fails if locked
419       */
420 <    public void testReadTryLockWhenLocked() throws InterruptedException {
421 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
420 >    public void testReadTryLockWhenLocked()      { testReadTryLockWhenLocked(false); }
421 >    public void testReadTryLockWhenLocked_fair() { testReadTryLockWhenLocked(true); }
422 >    public void testReadTryLockWhenLocked(boolean fair) {
423 >        final PublicReentrantReadWriteLock lock =
424 >            new PublicReentrantReadWriteLock(fair);
425          lock.writeLock().lock();
426          Thread t = newStartedThread(new CheckedRunnable() {
427              public void realRun() {
# Line 363 | Line 435 | public class ReentrantReadWriteLockTest
435      /**
436       * Multiple threads can hold a read lock when not write-locked
437       */
438 <    public void testMultipleReadLocks() throws InterruptedException {
439 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
438 >    public void testMultipleReadLocks()      { testMultipleReadLocks(false); }
439 >    public void testMultipleReadLocks_fair() { testMultipleReadLocks(true); }
440 >    public void testMultipleReadLocks(boolean fair) {
441 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
442          lock.readLock().lock();
443          Thread t = newStartedThread(new CheckedRunnable() {
444 <            public void realRun() {
444 >            public void realRun() throws InterruptedException {
445                  assertTrue(lock.readLock().tryLock());
446                  lock.readLock().unlock();
447 +                assertTrue(lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS));
448 +                lock.readLock().unlock();
449 +                lock.readLock().lock();
450 +                lock.readLock().unlock();
451              }});
452  
453          awaitTermination(t);
# Line 379 | Line 457 | public class ReentrantReadWriteLockTest
457      /**
458       * A writelock succeeds only after a reading thread unlocks
459       */
460 <    public void testWriteAfterReadLock() throws InterruptedException {
461 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
460 >    public void testWriteAfterReadLock()      { testWriteAfterReadLock(false); }
461 >    public void testWriteAfterReadLock_fair() { testWriteAfterReadLock(true); }
462 >    public void testWriteAfterReadLock(boolean fair) {
463 >        final PublicReentrantReadWriteLock lock =
464 >            new PublicReentrantReadWriteLock(fair);
465          lock.readLock().lock();
385
466          Thread t = newStartedThread(new CheckedRunnable() {
467              public void realRun() {
468                  assertEquals(1, lock.getReadLockCount());
# Line 402 | Line 482 | public class ReentrantReadWriteLockTest
482      /**
483       * A writelock succeeds only after reading threads unlock
484       */
485 <    public void testWriteAfterMultipleReadLocks() throws InterruptedException {
486 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
485 >    public void testWriteAfterMultipleReadLocks()      { testWriteAfterMultipleReadLocks(false); }
486 >    public void testWriteAfterMultipleReadLocks_fair() { testWriteAfterMultipleReadLocks(true); }
487 >    public void testWriteAfterMultipleReadLocks(boolean fair) {
488 >        final PublicReentrantReadWriteLock lock =
489 >            new PublicReentrantReadWriteLock(fair);
490          lock.readLock().lock();
491          lock.readLock().lock();
492          Thread t1 = newStartedThread(new CheckedRunnable() {
# Line 433 | Line 516 | public class ReentrantReadWriteLockTest
516  
517      /**
518       * A thread that tries to acquire a fair read lock (non-reentrantly)
519 <     * will block if there is a waiting writer thread.
519 >     * will block if there is a waiting writer thread
520       */
521 <    public void testReaderWriterReaderFairFifo() throws InterruptedException {
522 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
521 >    public void testReaderWriterReaderFairFifo() {
522 >        final PublicReentrantReadWriteLock lock =
523 >            new PublicReentrantReadWriteLock(true);
524          final AtomicBoolean t1GotLock = new AtomicBoolean(false);
525  
526          lock.readLock().lock();
# Line 471 | Line 555 | public class ReentrantReadWriteLockTest
555      /**
556       * Readlocks succeed only after a writing thread unlocks
557       */
558 <    public void testReadAfterWriteLock() throws InterruptedException {
559 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
558 >    public void testReadAfterWriteLock()      { testReadAfterWriteLock(false); }
559 >    public void testReadAfterWriteLock_fair() { testReadAfterWriteLock(true); }
560 >    public void testReadAfterWriteLock(boolean fair) {
561 >        final PublicReentrantReadWriteLock lock =
562 >            new PublicReentrantReadWriteLock(fair);
563          lock.writeLock().lock();
564          Thread t1 = newStartedThread(new CheckedRunnable() {
565              public void realRun() {
# Line 495 | Line 582 | public class ReentrantReadWriteLockTest
582      /**
583       * Read trylock succeeds if write locked by current thread
584       */
585 <    public void testReadHoldingWriteLock() {
586 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
585 >    public void testReadHoldingWriteLock()      { testReadHoldingWriteLock(false); }
586 >    public void testReadHoldingWriteLock_fair() { testReadHoldingWriteLock(true); }
587 >    public void testReadHoldingWriteLock(boolean fair) {
588 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
589          lock.writeLock().lock();
590          assertTrue(lock.readLock().tryLock());
591          lock.readLock().unlock();
# Line 504 | Line 593 | public class ReentrantReadWriteLockTest
593      }
594  
595      /**
596 <     * Read lock succeeds if write locked by current thread even if
597 <     * other threads are waiting for readlock
596 >     * Read trylock succeeds (barging) even in the presence of waiting
597 >     * readers and/or writers
598       */
599 <    public void testReadHoldingWriteLock2() throws InterruptedException {
600 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
601 <        lock.writeLock().lock();
599 >    public void testReadTryLockBarging()      { testReadTryLockBarging(false); }
600 >    public void testReadTryLockBarging_fair() { testReadTryLockBarging(true); }
601 >    public void testReadTryLockBarging(boolean fair) {
602 >        final PublicReentrantReadWriteLock lock =
603 >            new PublicReentrantReadWriteLock(fair);
604          lock.readLock().lock();
514        lock.readLock().unlock();
605  
606          Thread t1 = newStartedThread(new CheckedRunnable() {
607              public void realRun() {
608 <                lock.readLock().lock();
609 <                lock.readLock().unlock();
520 <            }});
521 <        Thread t2 = newStartedThread(new CheckedRunnable() {
522 <            public void realRun() {
523 <                lock.readLock().lock();
524 <                lock.readLock().unlock();
608 >                lock.writeLock().lock();
609 >                lock.writeLock().unlock();
610              }});
611  
612          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    }
613  
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            }});
614          Thread t2 = newStartedThread(new CheckedRunnable() {
615              public void realRun() {
616 <                lock.writeLock().lock();
617 <                lock.writeLock().unlock();
616 >                lock.readLock().lock();
617 >                lock.readLock().unlock();
618              }});
619  
620 <        waitForQueuedThread(lock, t1);
621 <        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();
620 >        if (fair)
621 >            waitForQueuedThread(lock, t2);
622  
623 <        Thread t1 = newStartedThread(new CheckedRunnable() {
623 >        Thread t3 = newStartedThread(new CheckedRunnable() {
624              public void realRun() {
625 <                lock.writeLock().lock();
626 <                lock.writeLock().unlock();
582 <            }});
583 <        Thread t2 = newStartedThread(new CheckedRunnable() {
584 <            public void realRun() {
585 <                lock.writeLock().lock();
586 <                lock.writeLock().unlock();
625 >                lock.readLock().tryLock();
626 >                lock.readLock().unlock();
627              }});
628  
629 <        waitForQueuedThread(lock, t1);
630 <        waitForQueuedThread(lock, t2);
631 <        assertWriteLockedBy(lock, Thread.currentThread());
632 <        assertEquals(1, lock.getWriteHoldCount());
633 <        lock.writeLock().lock();
594 <        assertWriteLockedBy(lock, Thread.currentThread());
595 <        assertEquals(2, lock.getWriteHoldCount());
596 <        lock.writeLock().unlock();
597 <        releaseWriteLock(lock);
629 >        assertTrue(lock.getReadLockCount() > 0);
630 >        awaitTermination(t3);
631 >        assertTrue(t1.isAlive());
632 >        if (fair) assertTrue(t2.isAlive());
633 >        lock.readLock().unlock();
634          awaitTermination(t1);
635          awaitTermination(t2);
636      }
637  
638      /**
639 <     * 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
639 >     * Read lock succeeds if write locked by current thread even if
640       * other threads are waiting for readlock
641       */
642 <    public void testReadHoldingWriteLockFair2() throws InterruptedException {
643 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
642 >    public void testReadHoldingWriteLock2()      { testReadHoldingWriteLock2(false); }
643 >    public void testReadHoldingWriteLock2_fair() { testReadHoldingWriteLock2(true); }
644 >    public void testReadHoldingWriteLock2(boolean fair) {
645 >        final PublicReentrantReadWriteLock lock =
646 >            new PublicReentrantReadWriteLock(fair);
647          lock.writeLock().lock();
648          lock.readLock().lock();
649          lock.readLock().unlock();
# Line 633 | Line 661 | public class ReentrantReadWriteLockTest
661  
662          waitForQueuedThread(lock, t1);
663          waitForQueuedThread(lock, t2);
664 <        assertWriteLockedBy(lock, Thread.currentThread());
664 >        assertWriteLockedByMoi(lock);
665          lock.readLock().lock();
666          lock.readLock().unlock();
667          releaseWriteLock(lock);
# Line 642 | Line 670 | public class ReentrantReadWriteLockTest
670      }
671  
672      /**
673 <     * Fair Read lock succeeds if write locked by current thread even if
673 >     * Read lock succeeds if write locked by current thread even if
674       * other threads are waiting for writelock
675       */
676 <    public void testReadHoldingWriteLockFair3() throws InterruptedException {
677 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
676 >    public void testReadHoldingWriteLock3()      { testReadHoldingWriteLock3(false); }
677 >    public void testReadHoldingWriteLock3_fair() { testReadHoldingWriteLock3(true); }
678 >    public void testReadHoldingWriteLock3(boolean fair) {
679 >        final PublicReentrantReadWriteLock lock =
680 >            new PublicReentrantReadWriteLock(fair);
681          lock.writeLock().lock();
682          lock.readLock().lock();
683          lock.readLock().unlock();
# Line 664 | Line 695 | public class ReentrantReadWriteLockTest
695  
696          waitForQueuedThread(lock, t1);
697          waitForQueuedThread(lock, t2);
698 <        assertWriteLockedBy(lock, Thread.currentThread());
698 >        assertWriteLockedByMoi(lock);
699          lock.readLock().lock();
700          lock.readLock().unlock();
701 <        releaseWriteLock(lock);
701 >        assertWriteLockedByMoi(lock);
702 >        lock.writeLock().unlock();
703          awaitTermination(t1);
704          awaitTermination(t2);
705      }
706  
707      /**
708 <     * Fair Write lock succeeds if write locked by current thread even if
708 >     * Write lock succeeds if write locked by current thread even if
709       * other threads are waiting for writelock
710       */
711 <    public void testWriteHoldingWriteLockFair4() throws InterruptedException {
712 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
711 >    public void testWriteHoldingWriteLock4()      { testWriteHoldingWriteLock4(false); }
712 >    public void testWriteHoldingWriteLock4_fair() { testWriteHoldingWriteLock4(true); }
713 >    public void testWriteHoldingWriteLock4(boolean fair) {
714 >        final PublicReentrantReadWriteLock lock =
715 >            new PublicReentrantReadWriteLock(fair);
716          lock.writeLock().lock();
717 +        lock.writeLock().lock();
718 +        lock.writeLock().unlock();
719 +
720          Thread t1 = newStartedThread(new CheckedRunnable() {
721              public void realRun() {
722                  lock.writeLock().lock();
# Line 692 | Line 730 | public class ReentrantReadWriteLockTest
730  
731          waitForQueuedThread(lock, t1);
732          waitForQueuedThread(lock, t2);
733 <        assertWriteLockedBy(lock, Thread.currentThread());
733 >        assertWriteLockedByMoi(lock);
734          assertEquals(1, lock.getWriteHoldCount());
735          lock.writeLock().lock();
736 +        assertWriteLockedByMoi(lock);
737          assertEquals(2, lock.getWriteHoldCount());
738          lock.writeLock().unlock();
739 <        lock.writeLock().lock();
739 >        assertWriteLockedByMoi(lock);
740 >        assertEquals(1, lock.getWriteHoldCount());
741          lock.writeLock().unlock();
702        releaseWriteLock(lock);
742          awaitTermination(t1);
743          awaitTermination(t2);
744      }
# Line 707 | Line 746 | public class ReentrantReadWriteLockTest
746      /**
747       * Read tryLock succeeds if readlocked but not writelocked
748       */
749 <    public void testTryLockWhenReadLocked() throws InterruptedException {
750 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
749 >    public void testTryLockWhenReadLocked()      { testTryLockWhenReadLocked(false); }
750 >    public void testTryLockWhenReadLocked_fair() { testTryLockWhenReadLocked(true); }
751 >    public void testTryLockWhenReadLocked(boolean fair) {
752 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
753          lock.readLock().lock();
754          Thread t = newStartedThread(new CheckedRunnable() {
755              public void realRun() {
# Line 723 | Line 764 | public class ReentrantReadWriteLockTest
764      /**
765       * write tryLock fails when readlocked
766       */
767 <    public void testWriteTryLockWhenReadLocked() throws InterruptedException {
768 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
769 <        lock.readLock().lock();
770 <        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);
767 >    public void testWriteTryLockWhenReadLocked()      { testWriteTryLockWhenReadLocked(false); }
768 >    public void testWriteTryLockWhenReadLocked_fair() { testWriteTryLockWhenReadLocked(true); }
769 >    public void testWriteTryLockWhenReadLocked(boolean fair) {
770 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
771          lock.readLock().lock();
772          Thread t = newStartedThread(new CheckedRunnable() {
773              public void realRun() {
# Line 769 | Line 781 | public class ReentrantReadWriteLockTest
781      /**
782       * write timed tryLock times out if locked
783       */
784 <    public void testWriteTryLock_Timeout() throws InterruptedException {
785 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
784 >    public void testWriteTryLock_Timeout()      { testWriteTryLock_Timeout(false); }
785 >    public void testWriteTryLock_Timeout_fair() { testWriteTryLock_Timeout(true); }
786 >    public void testWriteTryLock_Timeout(boolean fair) {
787 >        final PublicReentrantReadWriteLock lock =
788 >            new PublicReentrantReadWriteLock(fair);
789          lock.writeLock().lock();
790          Thread t = newStartedThread(new CheckedRunnable() {
791              public void realRun() throws InterruptedException {
792 <                assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
792 >                long startTime = System.nanoTime();
793 >                long timeoutMillis = 10;
794 >                assertFalse(lock.writeLock().tryLock(timeoutMillis, MILLISECONDS));
795 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
796              }});
797  
798          awaitTermination(t);
799 <        assertTrue(lock.writeLock().isHeldByCurrentThread());
782 <        lock.writeLock().unlock();
799 >        releaseWriteLock(lock);
800      }
801  
802      /**
803       * read timed tryLock times out if write-locked
804       */
805 <    public void testReadTryLock_Timeout() throws InterruptedException {
806 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
805 >    public void testReadTryLock_Timeout()      { testReadTryLock_Timeout(false); }
806 >    public void testReadTryLock_Timeout_fair() { testReadTryLock_Timeout(true); }
807 >    public void testReadTryLock_Timeout(boolean fair) {
808 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
809          lock.writeLock().lock();
810          Thread t = newStartedThread(new CheckedRunnable() {
811              public void realRun() throws InterruptedException {
812 <                assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
812 >                long startTime = System.nanoTime();
813 >                long timeoutMillis = 10;
814 >                assertFalse(lock.readLock().tryLock(timeoutMillis, MILLISECONDS));
815 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
816              }});
817  
818          awaitTermination(t);
# Line 799 | Line 821 | public class ReentrantReadWriteLockTest
821      }
822  
823      /**
824 <     * write lockInterruptibly succeeds if lock free else is interruptible
824 >     * write lockInterruptibly succeeds if unlocked, else is interruptible
825       */
826 <    public void testWriteLockInterruptibly() throws InterruptedException {
827 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
828 <        lock.writeLock().lockInterruptibly();
826 >    public void testWriteLockInterruptibly()      { testWriteLockInterruptibly(false); }
827 >    public void testWriteLockInterruptibly_fair() { testWriteLockInterruptibly(true); }
828 >    public void testWriteLockInterruptibly(boolean fair) {
829 >        final PublicReentrantReadWriteLock lock =
830 >            new PublicReentrantReadWriteLock(fair);
831 >        try {
832 >            lock.writeLock().lockInterruptibly();
833 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
834          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
835              public void realRun() throws InterruptedException {
836                  lock.writeLock().lockInterruptibly();
# Line 811 | Line 838 | public class ReentrantReadWriteLockTest
838  
839          waitForQueuedThread(lock, t);
840          t.interrupt();
841 +        assertTrue(lock.writeLock().isHeldByCurrentThread());
842          awaitTermination(t);
843          releaseWriteLock(lock);
844      }
# Line 818 | Line 846 | public class ReentrantReadWriteLockTest
846      /**
847       * read lockInterruptibly succeeds if lock free else is interruptible
848       */
849 <    public void testReadLockInterruptibly() throws InterruptedException {
850 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
851 <        lock.writeLock().lockInterruptibly();
849 >    public void testReadLockInterruptibly()      { testReadLockInterruptibly(false); }
850 >    public void testReadLockInterruptibly_fair() { testReadLockInterruptibly(true); }
851 >    public void testReadLockInterruptibly(boolean fair) {
852 >        final PublicReentrantReadWriteLock lock =
853 >            new PublicReentrantReadWriteLock(fair);
854 >        try {
855 >            lock.readLock().lockInterruptibly();
856 >            lock.readLock().unlock();
857 >            lock.writeLock().lockInterruptibly();
858 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
859          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
860              public void realRun() throws InterruptedException {
861                  lock.readLock().lockInterruptibly();
# Line 835 | Line 870 | public class ReentrantReadWriteLockTest
870      /**
871       * Calling await without holding lock throws IllegalMonitorStateException
872       */
873 <    public void testAwait_IllegalMonitor() throws InterruptedException {
874 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
875 <        final Condition c = lock.writeLock().newCondition();
876 <        try {
877 <            c.await();
878 <            shouldThrow();
879 <        } catch (IllegalMonitorStateException success) {}
880 <        try {
881 <            c.await(LONG_DELAY_MS, MILLISECONDS);
882 <            shouldThrow();
883 <        } catch (IllegalMonitorStateException success) {}
884 <        try {
885 <            c.awaitNanos(100);
886 <            shouldThrow();
887 <        } catch (IllegalMonitorStateException success) {}
888 <        try {
854 <            c.awaitUninterruptibly();
855 <            shouldThrow();
856 <        } catch (IllegalMonitorStateException success) {}
873 >    public void testAwait_IMSE()      { testAwait_IMSE(false); }
874 >    public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
875 >    public void testAwait_IMSE(boolean fair) {
876 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
877 >        final Condition c = lock.writeLock().newCondition();
878 >        for (AwaitMethod awaitMethod : AwaitMethod.values()) {
879 >            long startTime = System.nanoTime();
880 >            try {
881 >                await(c, awaitMethod);
882 >                shouldThrow();
883 >            } catch (IllegalMonitorStateException success) {
884 >            } catch (InterruptedException fail) {
885 >                threadUnexpectedException(fail);
886 >            }
887 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
888 >        }
889      }
890  
891      /**
892       * Calling signal without holding lock throws IllegalMonitorStateException
893       */
894 <    public void testSignal_IllegalMonitor() {
895 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
894 >    public void testSignal_IMSE()      { testSignal_IMSE(false); }
895 >    public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
896 >    public void testSignal_IMSE(boolean fair) {
897 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
898          final Condition c = lock.writeLock().newCondition();
899          try {
900              c.signal();
# Line 871 | Line 905 | public class ReentrantReadWriteLockTest
905      /**
906       * Calling signalAll without holding lock throws IllegalMonitorStateException
907       */
908 <    public void testSignalAll_IllegalMonitor() {
909 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
908 >    public void testSignalAll_IMSE()      { testSignalAll_IMSE(false); }
909 >    public void testSignalAll_IMSE_fair() { testSignalAll_IMSE(true); }
910 >    public void testSignalAll_IMSE(boolean fair) {
911 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
912          final Condition c = lock.writeLock().newCondition();
913          try {
914              c.signalAll();
# Line 883 | Line 919 | public class ReentrantReadWriteLockTest
919      /**
920       * awaitNanos without a signal times out
921       */
922 <    public void testAwaitNanos_Timeout() throws InterruptedException {
923 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
924 <        final Condition c = lock.writeLock().newCondition();
925 <        lock.writeLock().lock();
926 <        long startTime = System.nanoTime();
927 <        long timeoutMillis = 10;
928 <        long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
929 <        long nanosRemaining = c.awaitNanos(timeoutNanos);
930 <        assertTrue(nanosRemaining <= 0);
931 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
932 <        lock.writeLock().unlock();
922 >    public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
923 >    public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
924 >    public void testAwaitNanos_Timeout(boolean fair) {
925 >        try {
926 >            final ReentrantReadWriteLock lock =
927 >                new ReentrantReadWriteLock(fair);
928 >            final Condition c = lock.writeLock().newCondition();
929 >            lock.writeLock().lock();
930 >            long startTime = System.nanoTime();
931 >            long timeoutMillis = 10;
932 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
933 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
934 >            assertTrue(nanosRemaining <= 0);
935 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
936 >            lock.writeLock().unlock();
937 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
938      }
939  
940      /**
941       * timed await without a signal times out
942       */
943 <    public void testAwait_Timeout() throws InterruptedException {
944 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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();
943 >    public void testAwait_Timeout()      { testAwait_Timeout(false); }
944 >    public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
945 >    public void testAwait_Timeout(boolean fair) {
946 >        try {
947 >            final ReentrantReadWriteLock lock =
948 >                new ReentrantReadWriteLock(fair);
949 >            final Condition c = lock.writeLock().newCondition();
950 >            lock.writeLock().lock();
951 >            long startTime = System.nanoTime();
952 >            long timeoutMillis = 10;
953 >            assertFalse(c.await(timeoutMillis, MILLISECONDS));
954 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
955 >            lock.writeLock().unlock();
956 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
957      }
958  
959      /**
960       * awaitUntil without a signal times out
961       */
962 <    public void testAwaitUntil_Timeout() throws InterruptedException {
963 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
964 <        final Condition c = lock.writeLock().newCondition();
965 <        lock.writeLock().lock();
966 <        java.util.Date d = new java.util.Date();
967 <        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
968 <        lock.writeLock().unlock();
962 >    public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
963 >    public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
964 >    public void testAwaitUntil_Timeout(boolean fair) {
965 >        try {
966 >            final ReentrantReadWriteLock lock =
967 >                new ReentrantReadWriteLock(fair);
968 >            final Condition c = lock.writeLock().newCondition();
969 >            lock.writeLock().lock();
970 >            long startTime = System.nanoTime();
971 >            long timeoutMillis = 10;
972 >            java.util.Date d = new java.util.Date();
973 >            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
974 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
975 >            lock.writeLock().unlock();
976 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
977      }
978  
979      /**
980       * await returns when signalled
981       */
982 <    public void testAwait() throws InterruptedException {
983 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
982 >    public void testAwait()      { testAwait(false); }
983 >    public void testAwait_fair() { testAwait(true); }
984 >    public void testAwait(boolean fair) {
985 >        final PublicReentrantReadWriteLock lock =
986 >            new PublicReentrantReadWriteLock(fair);
987          final Condition c = lock.writeLock().newCondition();
988          final CountDownLatch locked = new CountDownLatch(1);
989          Thread t = newStartedThread(new CheckedRunnable() {
# Line 937 | Line 994 | public class ReentrantReadWriteLockTest
994                  lock.writeLock().unlock();
995              }});
996  
997 <        locked.await();
997 >        await(locked);
998          lock.writeLock().lock();
999 +        assertHasWaiters(lock, c, t);
1000          c.signal();
1001 +        assertHasNoWaiters(lock, c);
1002          assertTrue(t.isAlive());
1003          lock.writeLock().unlock();
1004          awaitTermination(t);
1005      }
1006  
1007      /**
1008 <     * awaitUninterruptibly doesn't abort on interrupt
1008 >     * awaitUninterruptibly is uninterruptible
1009       */
1010 <    public void testAwaitUninterruptibly() throws InterruptedException {
1011 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 <        final AtomicBoolean canAwake = new AtomicBoolean(false);
1017 <        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();
968 <        t.interrupt();
969 <        t.join(10);
970 <        assertTrue(t.isAlive());
971 <        lock.writeLock().lock();
972 <        c.signal();
973 <        lock.writeLock().unlock();
974 <        awaitTermination(t);
975 <    }
976 <
977 <    /**
978 <     * await is interruptible
979 <     */
980 <    public void testAwait_Interrupt() throws InterruptedException {
981 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
982 <        final Condition c = lock.writeLock().newCondition();
983 <        final CountDownLatch locked = new CountDownLatch(1);
984 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
985 <            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 {
991 <                    c.await();
992 <                } finally {
993 <                    assertWriteLockedBy(lock, Thread.currentThread());
994 <                    assertHasNoWaiters(lock, c);
995 <                    lock.writeLock().unlock();
996 <                    assertFalse(Thread.interrupted());
997 <                }
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);
1004 <        assertNotWriteLocked(lock);
1005 <    }
1038 >        await(pleaseInterrupt);
1039 >        lock.writeLock().lock();
1040 >        lock.writeLock().unlock();
1041 >        t2.interrupt();
1042  
1043 <    /**
1044 <     * awaitNanos is interruptible
1009 <     */
1010 <    public void testAwaitNanos_Interrupt() throws InterruptedException {
1011 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1012 <        final Condition c = lock.writeLock().newCondition();
1013 <        final CountDownLatch locked = new CountDownLatch(1);
1014 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1015 <            public void realRun() throws InterruptedException {
1016 <                lock.writeLock().lock();
1017 <                assertWriteLockedBy(lock, Thread.currentThread());
1018 <                assertHasNoWaiters(lock, c);
1019 <                locked.countDown();
1020 <                try {
1021 <                    c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
1022 <                } finally {
1023 <                    assertWriteLockedBy(lock, Thread.currentThread());
1024 <                    assertHasNoWaiters(lock, c);
1025 <                    lock.writeLock().unlock();
1026 <                    assertFalse(Thread.interrupted());
1027 <                }
1028 <            }});
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();
1050                java.util.Date d = new java.util.Date();
1076                  try {
1077 <                    c.awaitUntil(new java.util.Date(d.getTime() + 10000));
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 1068 | 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 {
1086 <                writeLock.lock();
1087 <                locked.countDown();
1088 <                c.await();
1089 <                writeLock.unlock();
1090 <            }});
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 1100 | 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 1116 | 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 1126 | 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 1145 | Line 1178 | public class ReentrantReadWriteLockTest
1178      }
1179  
1180      /**
1181 +     * await after multiple reentrant locking preserves lock count
1182 +     */
1183 +    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1184 +    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1185 +    public void testAwaitLockCount(boolean fair) {
1186 +        final PublicReentrantReadWriteLock lock =
1187 +            new PublicReentrantReadWriteLock(fair);
1188 +        final Condition c = lock.writeLock().newCondition();
1189 +        final CountDownLatch locked = new CountDownLatch(2);
1190 +        Thread t1 = newStartedThread(new CheckedRunnable() {
1191 +            public void realRun() throws InterruptedException {
1192 +                lock.writeLock().lock();
1193 +                assertWriteLockedByMoi(lock);
1194 +                assertEquals(1, lock.writeLock().getHoldCount());
1195 +                locked.countDown();
1196 +                c.await();
1197 +                assertWriteLockedByMoi(lock);
1198 +                assertEquals(1, lock.writeLock().getHoldCount());
1199 +                lock.writeLock().unlock();
1200 +            }});
1201 +
1202 +        Thread t2 = newStartedThread(new CheckedRunnable() {
1203 +            public void realRun() throws InterruptedException {
1204 +                lock.writeLock().lock();
1205 +                lock.writeLock().lock();
1206 +                assertWriteLockedByMoi(lock);
1207 +                assertEquals(2, lock.writeLock().getHoldCount());
1208 +                locked.countDown();
1209 +                c.await();
1210 +                assertWriteLockedByMoi(lock);
1211 +                assertEquals(2, lock.writeLock().getHoldCount());
1212 +                lock.writeLock().unlock();
1213 +                lock.writeLock().unlock();
1214 +            }});
1215 +
1216 +        await(locked);
1217 +        lock.writeLock().lock();
1218 +        assertHasWaiters(lock, c, t1, t2);
1219 +        c.signalAll();
1220 +        assertHasNoWaiters(lock, c);
1221 +        lock.writeLock().unlock();
1222 +        awaitTermination(t1);
1223 +        awaitTermination(t2);
1224 +    }
1225 +
1226 +    /**
1227       * A serialized lock deserializes as unlocked
1228       */
1229 <    public void testSerialization() 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());
1264          lock.writeLock().lock();
1265          assertFalse(lock.hasQueuedThreads());
1177        long startTime = System.nanoTime();
1266          t1.start();
1267          waitForQueuedThread(lock, t1);
1268 +        assertTrue(lock.hasQueuedThreads());
1269          t2.start();
1270          waitForQueuedThread(lock, t2);
1271          assertTrue(lock.hasQueuedThreads());
# Line 1191 | Line 1280 | public class ReentrantReadWriteLockTest
1280      /**
1281       * hasQueuedThread(null) throws NPE
1282       */
1283 <    public void testHasQueuedThreadNPE() {
1284 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1283 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
1284 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
1285 >    public void testHasQueuedThreadNPE(boolean fair) {
1286 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1287          try {
1288 <            sync.hasQueuedThread(null);
1288 >            lock.hasQueuedThread(null);
1289              shouldThrow();
1290          } catch (NullPointerException success) {}
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));
1304          assertFalse(lock.hasQueuedThread(t2));
1305          lock.writeLock().lock();
1212        long startTime = System.nanoTime();
1306          t1.start();
1307          waitForQueuedThread(lock, t1);
1308          assertTrue(lock.hasQueuedThread(t1));
# Line 1231 | 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());
1335          lock.writeLock().lock();
1240        long startTime = System.nanoTime();
1336          t1.start();
1337          waitForQueuedThread(lock, t1);
1338          assertEquals(1, lock.getQueueLength());
# Line 1255 | 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());
1361          lock.writeLock().lock();
1264        long startTime = System.nanoTime();
1362          assertTrue(lock.getQueuedThreads().isEmpty());
1363          t1.start();
1364          waitForQueuedThread(lock, t1);
# Line 1285 | 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 1296 | 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 1307 | 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 1316 | Line 1419 | public class ReentrantReadWriteLockTest
1419      }
1420  
1421      /**
1422 <     * hasWaiters throws IAE if not owned
1422 >     * hasWaiters throws IllegalArgumentException if not owned
1423       */
1424 <    public void testHasWaitersIAE() {
1425 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 1329 | Line 1434 | public class ReentrantReadWriteLockTest
1434      }
1435  
1436      /**
1437 <     * hasWaiters throws IMSE if not locked
1437 >     * hasWaiters throws IllegalMonitorStateException if not locked
1438       */
1439 <    public void testHasWaitersIMSE() {
1440 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 1341 | Line 1448 | public class ReentrantReadWriteLockTest
1448      }
1449  
1450      /**
1451 <     * getWaitQueueLength throws IAE if not owned
1451 >     * getWaitQueueLength throws IllegalArgumentException if not owned
1452       */
1453 <    public void testGetWaitQueueLengthIAE() {
1454 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 1354 | Line 1463 | public class ReentrantReadWriteLockTest
1463      }
1464  
1465      /**
1466 <     * getWaitQueueLength throws IMSE if not locked
1466 >     * getWaitQueueLength throws IllegalMonitorStateException if not locked
1467       */
1468 <    public void testGetWaitQueueLengthIMSE() {
1469 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 1366 | Line 1477 | public class ReentrantReadWriteLockTest
1477      }
1478  
1479      /**
1480 <     * getWaitingThreads throws IAE if not owned
1480 >     * getWaitingThreads throws IllegalArgumentException if not owned
1481       */
1482 <    public void testGetWaitingThreadsIAE() {
1483 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 1379 | Line 1494 | public class ReentrantReadWriteLockTest
1494      }
1495  
1496      /**
1497 <     * getWaitingThreads throws IMSE if not locked
1497 >     * getWaitingThreads throws IllegalMonitorStateException if not locked
1498       */
1499 <    public void testGetWaitingThreadsIMSE() {
1500 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
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 1393 | 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() {
1522              public void realRun() throws InterruptedException {
1523                  lock.writeLock().lock();
1524 +                assertHasNoWaiters(lock, c);
1525                  assertFalse(lock.hasWaiters(c));
1526                  locked.countDown();
1405                assertEquals(0, lock.getWaitQueueLength(c));
1527                  c.await();
1528 +                assertHasNoWaiters(lock, c);
1529 +                assertFalse(lock.hasWaiters(c));
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));
1413        assertEquals(1, lock.getWaitQueueLength(c));
1537          c.signal();
1538          assertHasNoWaiters(lock, c);
1539 +        assertFalse(lock.hasWaiters(c));
1540          lock.writeLock().unlock();
1541          awaitTermination(t);
1542          assertHasNoWaiters(lock, c);
# Line 1421 | 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 1434 | 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 1448 | 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 1476 | 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 1498 | 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);
1515 <        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();
1528 <        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