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.60 by jsr166, Mon May 9 20:00:19 2011 UTC

# Line 135 | Line 135 | public class ReentrantReadWriteLockTest
135          lock.writeLock().unlock();
136      }
137  
138 +    enum AwaitMethod { await, awaitNanos, awaitUntil };
139 +
140 +    /**
141 +     * Awaits condition using the specified AwaitMethod
142 +     */
143 +    void await(Condition c, AwaitMethod awaitMethod)
144 +            throws InterruptedException {
145 +        switch (awaitMethod) {
146 +        case await:
147 +            c.await();
148 +            break;
149 +        case awaitNanos:
150 +            long nanosRemaining = c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
151 +            assertTrue(nanosRemaining > 0);
152 +            break;
153 +        case awaitUntil:
154 +            java.util.Date d = new java.util.Date();
155 +            assertTrue(c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS)));
156 +            break;
157 +        }
158 +    }
159 +
160      /**
161       * Constructor sets given fairness, and is in unlocked state
162       */
# Line 160 | Line 182 | public class ReentrantReadWriteLockTest
182      /**
183       * write-locking and read-locking an unlocked lock succeed
184       */
185 <    public void testLock() {
186 <        PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
187 <        assertNotWriteLocked(lock);
188 <        lock.writeLock().lock();
189 <        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);
185 >    public void testLock()      { testLock(false); }
186 >    public void testLock_fair() { testLock(true); }
187 >    public void testLock(boolean fair) {
188 >        PublicReentrantReadWriteLock lock =
189 >            new PublicReentrantReadWriteLock(fair);
190          assertNotWriteLocked(lock);
191          lock.writeLock().lock();
192          assertWriteLockedBy(lock, Thread.currentThread());
# Line 198 | Line 204 | public class ReentrantReadWriteLockTest
204      /**
205       * getWriteHoldCount returns number of recursive holds
206       */
207 <    public void testGetWriteHoldCount() {
208 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
207 >    public void testGetWriteHoldCount()      { testGetWriteHoldCount(false); }
208 >    public void testGetWriteHoldCount_fair() { testGetWriteHoldCount(true); }
209 >    public void testGetWriteHoldCount(boolean fair) {
210 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
211          for (int i = 1; i <= SIZE; i++) {
212              lock.writeLock().lock();
213              assertEquals(i,lock.getWriteHoldCount());
# Line 211 | Line 219 | public class ReentrantReadWriteLockTest
219      }
220  
221      /**
222 <     * WriteLock.getHoldCount returns number of recursive holds
222 >     * writelock.getHoldCount returns number of recursive holds
223       */
224 <    public void testGetHoldCount() {
225 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
224 >    public void testGetHoldCount()      { testGetHoldCount(false); }
225 >    public void testGetHoldCount_fair() { testGetHoldCount(true); }
226 >    public void testGetHoldCount(boolean fair) {
227 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
228          for (int i = 1; i <= SIZE; i++) {
229              lock.writeLock().lock();
230              assertEquals(i,lock.writeLock().getHoldCount());
# Line 228 | Line 238 | public class ReentrantReadWriteLockTest
238      /**
239       * getReadHoldCount returns number of recursive holds
240       */
241 <    public void testGetReadHoldCount() {
242 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
241 >    public void testGetReadHoldCount()      { testGetReadHoldCount(false); }
242 >    public void testGetReadHoldCount_fair() { testGetReadHoldCount(true); }
243 >    public void testGetReadHoldCount(boolean fair) {
244 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
245          for (int i = 1; i <= SIZE; i++) {
246              lock.readLock().lock();
247              assertEquals(i,lock.getReadHoldCount());
# Line 243 | Line 255 | public class ReentrantReadWriteLockTest
255      /**
256       * write-unlocking an unlocked lock throws IllegalMonitorStateException
257       */
258 <    public void testWriteUnlock_IllegalMonitorStateException() {
259 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
258 >    public void testWriteUnlock_IMSE()      { testWriteUnlock_IMSE(false); }
259 >    public void testWriteUnlock_IMSE_fair() { testWriteUnlock_IMSE(true); }
260 >    public void testWriteUnlock_IMSE(boolean fair) {
261 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
262          try {
263              lock.writeLock().unlock();
264              shouldThrow();
# Line 254 | Line 268 | public class ReentrantReadWriteLockTest
268      /**
269       * read-unlocking an unlocked lock throws IllegalMonitorStateException
270       */
271 <    public void testReadUnlock_IllegalMonitorStateException() {
272 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
271 >    public void testReadUnlock_IMSE()      { testReadUnlock_IMSE(false); }
272 >    public void testReadUnlock_IMSE_fair() { testReadUnlock_IMSE(true); }
273 >    public void testReadUnlock_IMSE(boolean fair) {
274 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
275          try {
276              lock.readLock().unlock();
277              shouldThrow();
# Line 265 | Line 281 | public class ReentrantReadWriteLockTest
281      /**
282       * write-lockInterruptibly is interruptible
283       */
284 <    public void testWriteLockInterruptibly_Interrupted() throws Exception {
285 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
284 >    public void testWriteLockInterruptibly_Interruptible()      { testWriteLockInterruptibly_Interruptible(false); }
285 >    public void testWriteLockInterruptibly_Interruptible_fair() { testWriteLockInterruptibly_Interruptible(true); }
286 >    public void testWriteLockInterruptibly_Interruptible(boolean fair) {
287 >        final PublicReentrantReadWriteLock lock =
288 >            new PublicReentrantReadWriteLock(fair);
289          lock.writeLock().lock();
290          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
291              public void realRun() throws InterruptedException {
# Line 282 | Line 301 | public class ReentrantReadWriteLockTest
301      /**
302       * timed write-tryLock is interruptible
303       */
304 <    public void testWriteTryLock_Interrupted() throws InterruptedException {
305 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
304 >    public void testWriteTryLock_Interruptible()      { testWriteTryLock_Interruptible(false); }
305 >    public void testWriteTryLock_Interruptible_fair() { testWriteTryLock_Interruptible(true); }
306 >    public void testWriteTryLock_Interruptible(boolean fair) {
307 >        final PublicReentrantReadWriteLock lock =
308 >            new PublicReentrantReadWriteLock(fair);
309          lock.writeLock().lock();
310          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
311              public void realRun() throws InterruptedException {
# Line 299 | Line 321 | public class ReentrantReadWriteLockTest
321      /**
322       * read-lockInterruptibly is interruptible
323       */
324 <    public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
325 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
324 >    public void testReadLockInterruptibly_Interruptible()      { testReadLockInterruptibly_Interruptible(false); }
325 >    public void testReadLockInterruptibly_Interruptible_fair() { testReadLockInterruptibly_Interruptible(true); }
326 >    public void testReadLockInterruptibly_Interruptible(boolean fair) {
327 >        final PublicReentrantReadWriteLock lock =
328 >            new PublicReentrantReadWriteLock(fair);
329          lock.writeLock().lock();
330          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
331              public void realRun() throws InterruptedException {
# Line 316 | Line 341 | public class ReentrantReadWriteLockTest
341      /**
342       * timed read-tryLock is interruptible
343       */
344 <    public void testReadTryLock_Interrupted() throws InterruptedException {
345 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
344 >    public void testReadTryLock_Interruptible()      { testReadTryLock_Interruptible(false); }
345 >    public void testReadTryLock_Interruptible_fair() { testReadTryLock_Interruptible(true); }
346 >    public void testReadTryLock_Interruptible(boolean fair) {
347 >        final PublicReentrantReadWriteLock lock =
348 >            new PublicReentrantReadWriteLock(fair);
349          lock.writeLock().lock();
350          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
351              public void realRun() throws InterruptedException {
# Line 333 | Line 361 | public class ReentrantReadWriteLockTest
361      /**
362       * write-tryLock fails if locked
363       */
364 <    public void testWriteTryLockWhenLocked() throws InterruptedException {
365 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
364 >    public void testWriteTryLockWhenLocked()      { testWriteTryLockWhenLocked(false); }
365 >    public void testWriteTryLockWhenLocked_fair() { testWriteTryLockWhenLocked(true); }
366 >    public void testWriteTryLockWhenLocked(boolean fair) {
367 >        final PublicReentrantReadWriteLock lock =
368 >            new PublicReentrantReadWriteLock(fair);
369          lock.writeLock().lock();
370          Thread t = newStartedThread(new CheckedRunnable() {
371              public void realRun() {
# Line 348 | Line 379 | public class ReentrantReadWriteLockTest
379      /**
380       * read-tryLock fails if locked
381       */
382 <    public void testReadTryLockWhenLocked() throws InterruptedException {
383 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
382 >    public void testReadTryLockWhenLocked()      { testReadTryLockWhenLocked(false); }
383 >    public void testReadTryLockWhenLocked_fair() { testReadTryLockWhenLocked(true); }
384 >    public void testReadTryLockWhenLocked(boolean fair) {
385 >        final PublicReentrantReadWriteLock lock =
386 >            new PublicReentrantReadWriteLock(fair);
387          lock.writeLock().lock();
388          Thread t = newStartedThread(new CheckedRunnable() {
389              public void realRun() {
# Line 363 | Line 397 | public class ReentrantReadWriteLockTest
397      /**
398       * Multiple threads can hold a read lock when not write-locked
399       */
400 <    public void testMultipleReadLocks() throws InterruptedException {
401 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
400 >    public void testMultipleReadLocks()      { testMultipleReadLocks(false); }
401 >    public void testMultipleReadLocks_fair() { testMultipleReadLocks(true); }
402 >    public void testMultipleReadLocks(boolean fair) {
403 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
404          lock.readLock().lock();
405          Thread t = newStartedThread(new CheckedRunnable() {
406 <            public void realRun() {
406 >            public void realRun() throws InterruptedException {
407                  assertTrue(lock.readLock().tryLock());
408                  lock.readLock().unlock();
409 +                assertTrue(lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS));
410 +                lock.readLock().unlock();
411 +                lock.readLock().lock();
412 +                lock.readLock().unlock();
413              }});
414  
415          awaitTermination(t);
# Line 379 | Line 419 | public class ReentrantReadWriteLockTest
419      /**
420       * A writelock succeeds only after a reading thread unlocks
421       */
422 <    public void testWriteAfterReadLock() throws InterruptedException {
423 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
422 >    public void testWriteAfterReadLock()      { testWriteAfterReadLock(false); }
423 >    public void testWriteAfterReadLock_fair() { testWriteAfterReadLock(true); }
424 >    public void testWriteAfterReadLock(boolean fair) {
425 >        final PublicReentrantReadWriteLock lock =
426 >            new PublicReentrantReadWriteLock(fair);
427          lock.readLock().lock();
385
428          Thread t = newStartedThread(new CheckedRunnable() {
429              public void realRun() {
430                  assertEquals(1, lock.getReadLockCount());
# Line 402 | Line 444 | public class ReentrantReadWriteLockTest
444      /**
445       * A writelock succeeds only after reading threads unlock
446       */
447 <    public void testWriteAfterMultipleReadLocks() throws InterruptedException {
448 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
447 >    public void testWriteAfterMultipleReadLocks()      { testWriteAfterMultipleReadLocks(false); }
448 >    public void testWriteAfterMultipleReadLocks_fair() { testWriteAfterMultipleReadLocks(true); }
449 >    public void testWriteAfterMultipleReadLocks(boolean fair) {
450 >        final PublicReentrantReadWriteLock lock =
451 >            new PublicReentrantReadWriteLock(fair);
452          lock.readLock().lock();
453          lock.readLock().lock();
454          Thread t1 = newStartedThread(new CheckedRunnable() {
# Line 435 | Line 480 | public class ReentrantReadWriteLockTest
480       * A thread that tries to acquire a fair read lock (non-reentrantly)
481       * will block if there is a waiting writer thread.
482       */
483 <    public void testReaderWriterReaderFairFifo() throws InterruptedException {
484 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
483 >    public void testReaderWriterReaderFairFifo() {
484 >        final PublicReentrantReadWriteLock lock =
485 >            new PublicReentrantReadWriteLock(true);
486          final AtomicBoolean t1GotLock = new AtomicBoolean(false);
487  
488          lock.readLock().lock();
# Line 471 | Line 517 | public class ReentrantReadWriteLockTest
517      /**
518       * Readlocks succeed only after a writing thread unlocks
519       */
520 <    public void testReadAfterWriteLock() throws InterruptedException {
521 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
520 >    public void testReadAfterWriteLock()      { testReadAfterWriteLock(false); }
521 >    public void testReadAfterWriteLock_fair() { testReadAfterWriteLock(true); }
522 >    public void testReadAfterWriteLock(boolean fair) {
523 >        final PublicReentrantReadWriteLock lock =
524 >            new PublicReentrantReadWriteLock(fair);
525          lock.writeLock().lock();
526          Thread t1 = newStartedThread(new CheckedRunnable() {
527              public void realRun() {
# Line 495 | Line 544 | public class ReentrantReadWriteLockTest
544      /**
545       * Read trylock succeeds if write locked by current thread
546       */
547 <    public void testReadHoldingWriteLock() {
548 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
547 >    public void testReadHoldingWriteLock()      { testReadHoldingWriteLock(false); }
548 >    public void testReadHoldingWriteLock_fair() { testReadHoldingWriteLock(true); }
549 >    public void testReadHoldingWriteLock(boolean fair) {
550 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
551          lock.writeLock().lock();
552          assertTrue(lock.readLock().tryLock());
553          lock.readLock().unlock();
# Line 504 | Line 555 | public class ReentrantReadWriteLockTest
555      }
556  
557      /**
558 <     * Read lock succeeds if write locked by current thread even if
508 <     * other threads are waiting for readlock
558 >     * Read trylock succeeds (barging) even in the presence of waiting readers and/or writers.
559       */
560 <    public void testReadHoldingWriteLock2() throws InterruptedException {
561 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
562 <        lock.writeLock().lock();
560 >    public void testReadTryLockBarging()      { testReadTryLockBarging(false); }
561 >    public void testReadTryLockBarging_fair() { testReadTryLockBarging(true); }
562 >    public void testReadTryLockBarging(boolean fair) {
563 >        final PublicReentrantReadWriteLock lock =
564 >            new PublicReentrantReadWriteLock(fair);
565          lock.readLock().lock();
514        lock.readLock().unlock();
566  
567          Thread t1 = newStartedThread(new CheckedRunnable() {
568              public void realRun() {
569 <                lock.readLock().lock();
570 <                lock.readLock().unlock();
520 <            }});
521 <        Thread t2 = newStartedThread(new CheckedRunnable() {
522 <            public void realRun() {
523 <                lock.readLock().lock();
524 <                lock.readLock().unlock();
569 >                lock.writeLock().lock();
570 >                lock.writeLock().unlock();
571              }});
572  
573          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    }
574  
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            }});
575          Thread t2 = newStartedThread(new CheckedRunnable() {
576              public void realRun() {
577 <                lock.writeLock().lock();
578 <                lock.writeLock().unlock();
577 >                lock.readLock().lock();
578 >                lock.readLock().unlock();
579              }});
580  
581 <        waitForQueuedThread(lock, t1);
582 <        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 <    }
581 >        if (fair)
582 >            waitForQueuedThread(lock, t2);
583  
584 <    /**
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();
577 <
578 <        Thread t1 = newStartedThread(new CheckedRunnable() {
579 <            public void realRun() {
580 <                lock.writeLock().lock();
581 <                lock.writeLock().unlock();
582 <            }});
583 <        Thread t2 = newStartedThread(new CheckedRunnable() {
584 >        Thread t3 = newStartedThread(new CheckedRunnable() {
585              public void realRun() {
586 <                lock.writeLock().lock();
587 <                lock.writeLock().unlock();
586 >                lock.readLock().tryLock();
587 >                lock.readLock().unlock();
588              }});
589  
590 <        waitForQueuedThread(lock, t1);
591 <        waitForQueuedThread(lock, t2);
592 <        assertWriteLockedBy(lock, Thread.currentThread());
593 <        assertEquals(1, lock.getWriteHoldCount());
594 <        lock.writeLock().lock();
594 <        assertWriteLockedBy(lock, Thread.currentThread());
595 <        assertEquals(2, lock.getWriteHoldCount());
596 <        lock.writeLock().unlock();
597 <        releaseWriteLock(lock);
590 >        assertTrue(lock.getReadLockCount() > 0);
591 >        awaitTermination(t3);
592 >        assertTrue(t1.isAlive());
593 >        if (fair) assertTrue(t2.isAlive());
594 >        lock.readLock().unlock();
595          awaitTermination(t1);
596          awaitTermination(t2);
597      }
598  
599      /**
600 <     * 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
600 >     * Read lock succeeds if write locked by current thread even if
601       * other threads are waiting for readlock
602       */
603 <    public void testReadHoldingWriteLockFair2() throws InterruptedException {
604 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
603 >    public void testReadHoldingWriteLock2()      { testReadHoldingWriteLock2(false); }
604 >    public void testReadHoldingWriteLock2_fair() { testReadHoldingWriteLock2(true); }
605 >    public void testReadHoldingWriteLock2(boolean fair) {
606 >        final PublicReentrantReadWriteLock lock =
607 >            new PublicReentrantReadWriteLock(fair);
608          lock.writeLock().lock();
609          lock.readLock().lock();
610          lock.readLock().unlock();
# Line 642 | Line 631 | public class ReentrantReadWriteLockTest
631      }
632  
633      /**
634 <     * Fair Read lock succeeds if write locked by current thread even if
634 >     * Read lock succeeds if write locked by current thread even if
635       * other threads are waiting for writelock
636       */
637 <    public void testReadHoldingWriteLockFair3() throws InterruptedException {
638 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
637 >    public void testReadHoldingWriteLock3()      { testReadHoldingWriteLock3(false); }
638 >    public void testReadHoldingWriteLock3_fair() { testReadHoldingWriteLock3(true); }
639 >    public void testReadHoldingWriteLock3(boolean fair) {
640 >        final PublicReentrantReadWriteLock lock =
641 >            new PublicReentrantReadWriteLock(fair);
642          lock.writeLock().lock();
643          lock.readLock().lock();
644          lock.readLock().unlock();
# Line 667 | Line 659 | public class ReentrantReadWriteLockTest
659          assertWriteLockedBy(lock, Thread.currentThread());
660          lock.readLock().lock();
661          lock.readLock().unlock();
662 <        releaseWriteLock(lock);
662 >        assertWriteLockedBy(lock, Thread.currentThread());
663 >        lock.writeLock().unlock();
664          awaitTermination(t1);
665          awaitTermination(t2);
666      }
667  
668      /**
669 <     * Fair Write lock succeeds if write locked by current thread even if
669 >     * Write lock succeeds if write locked by current thread even if
670       * other threads are waiting for writelock
671       */
672 <    public void testWriteHoldingWriteLockFair4() throws InterruptedException {
673 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
672 >    public void testWriteHoldingWriteLock4()      { testWriteHoldingWriteLock4(false); }
673 >    public void testWriteHoldingWriteLock4_fair() { testWriteHoldingWriteLock4(true); }
674 >    public void testWriteHoldingWriteLock4(boolean fair) {
675 >        final PublicReentrantReadWriteLock lock =
676 >            new PublicReentrantReadWriteLock(fair);
677          lock.writeLock().lock();
678 +        lock.writeLock().lock();
679 +        lock.writeLock().unlock();
680 +
681          Thread t1 = newStartedThread(new CheckedRunnable() {
682              public void realRun() {
683                  lock.writeLock().lock();
# Line 695 | Line 694 | public class ReentrantReadWriteLockTest
694          assertWriteLockedBy(lock, Thread.currentThread());
695          assertEquals(1, lock.getWriteHoldCount());
696          lock.writeLock().lock();
697 +        assertWriteLockedBy(lock, Thread.currentThread());
698          assertEquals(2, lock.getWriteHoldCount());
699          lock.writeLock().unlock();
700 <        lock.writeLock().lock();
700 >        assertWriteLockedBy(lock, Thread.currentThread());
701 >        assertEquals(1, lock.getWriteHoldCount());
702          lock.writeLock().unlock();
702        releaseWriteLock(lock);
703          awaitTermination(t1);
704          awaitTermination(t2);
705      }
# Line 707 | Line 707 | public class ReentrantReadWriteLockTest
707      /**
708       * Read tryLock succeeds if readlocked but not writelocked
709       */
710 <    public void testTryLockWhenReadLocked() throws InterruptedException {
711 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
710 >    public void testTryLockWhenReadLocked()      { testTryLockWhenReadLocked(false); }
711 >    public void testTryLockWhenReadLocked_fair() { testTryLockWhenReadLocked(true); }
712 >    public void testTryLockWhenReadLocked(boolean fair) {
713 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
714          lock.readLock().lock();
715          Thread t = newStartedThread(new CheckedRunnable() {
716              public void realRun() {
# Line 723 | Line 725 | public class ReentrantReadWriteLockTest
725      /**
726       * write tryLock fails when readlocked
727       */
728 <    public void testWriteTryLockWhenReadLocked() throws InterruptedException {
729 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
730 <        lock.readLock().lock();
731 <        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);
728 >    public void testWriteTryLockWhenReadLocked()      { testWriteTryLockWhenReadLocked(false); }
729 >    public void testWriteTryLockWhenReadLocked_fair() { testWriteTryLockWhenReadLocked(true); }
730 >    public void testWriteTryLockWhenReadLocked(boolean fair) {
731 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
732          lock.readLock().lock();
733          Thread t = newStartedThread(new CheckedRunnable() {
734              public void realRun() {
# Line 769 | Line 742 | public class ReentrantReadWriteLockTest
742      /**
743       * write timed tryLock times out if locked
744       */
745 <    public void testWriteTryLock_Timeout() throws InterruptedException {
746 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
745 >    public void testWriteTryLock_Timeout()      { testWriteTryLock_Timeout(false); }
746 >    public void testWriteTryLock_Timeout_fair() { testWriteTryLock_Timeout(true); }
747 >    public void testWriteTryLock_Timeout(boolean fair) {
748 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
749          lock.writeLock().lock();
750          Thread t = newStartedThread(new CheckedRunnable() {
751              public void realRun() throws InterruptedException {
# Line 788 | Line 763 | public class ReentrantReadWriteLockTest
763      /**
764       * read timed tryLock times out if write-locked
765       */
766 <    public void testReadTryLock_Timeout() throws InterruptedException {
767 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
766 >    public void testReadTryLock_Timeout()      { testReadTryLock_Timeout(false); }
767 >    public void testReadTryLock_Timeout_fair() { testReadTryLock_Timeout(true); }
768 >    public void testReadTryLock_Timeout(boolean fair) {
769 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
770          lock.writeLock().lock();
771          Thread t = newStartedThread(new CheckedRunnable() {
772              public void realRun() throws InterruptedException {
# Line 807 | Line 784 | public class ReentrantReadWriteLockTest
784      /**
785       * write lockInterruptibly succeeds if lock free else is interruptible
786       */
787 <    public void testWriteLockInterruptibly() throws InterruptedException {
788 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
789 <        lock.writeLock().lockInterruptibly();
787 >    public void testWriteLockInterruptibly()      { testWriteLockInterruptibly(false); }
788 >    public void testWriteLockInterruptibly_fair() { testWriteLockInterruptibly(true); }
789 >    public void testWriteLockInterruptibly(boolean fair) {
790 >        final PublicReentrantReadWriteLock lock =
791 >            new PublicReentrantReadWriteLock(fair);
792 >        try {
793 >            lock.writeLock().lockInterruptibly();
794 >        } catch (Throwable t) {
795 >            threadUnexpectedException(t);
796 >        }
797          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
798              public void realRun() throws InterruptedException {
799                  lock.writeLock().lockInterruptibly();
# Line 824 | Line 808 | public class ReentrantReadWriteLockTest
808      /**
809       * read lockInterruptibly succeeds if lock free else is interruptible
810       */
811 <    public void testReadLockInterruptibly() throws InterruptedException {
812 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
813 <        lock.writeLock().lockInterruptibly();
811 >    public void testReadLockInterruptibly()      { testReadLockInterruptibly(false); }
812 >    public void testReadLockInterruptibly_fair() { testReadLockInterruptibly(true); }
813 >    public void testReadLockInterruptibly(boolean fair) {
814 >        final PublicReentrantReadWriteLock lock =
815 >            new PublicReentrantReadWriteLock(fair);
816 >        try {
817 >            lock.readLock().lockInterruptibly();
818 >            lock.readLock().unlock();
819 >            lock.writeLock().lockInterruptibly();
820 >        } catch (Throwable t) {
821 >            threadUnexpectedException(t);
822 >        }
823          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
824              public void realRun() throws InterruptedException {
825                  lock.readLock().lockInterruptibly();
# Line 841 | Line 834 | public class ReentrantReadWriteLockTest
834      /**
835       * Calling await without holding lock throws IllegalMonitorStateException
836       */
837 <    public void testAwait_IllegalMonitor() throws InterruptedException {
838 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
837 >    public void testAwait_IMSE()      { testAwait_IMSE(false); }
838 >    public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
839 >    public void testAwait_IMSE(boolean fair) {
840 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
841          final Condition c = lock.writeLock().newCondition();
842 +        long startTime = System.nanoTime();
843          try {
844 <            c.await();
845 <            shouldThrow();
846 <        } catch (IllegalMonitorStateException success) {}
847 <        try {
848 <            c.await(LONG_DELAY_MS, MILLISECONDS);
849 <            shouldThrow();
850 <        } catch (IllegalMonitorStateException success) {}
851 <        try {
852 <            c.awaitNanos(100);
853 <            shouldThrow();
854 <        } catch (IllegalMonitorStateException success) {}
855 <        try {
856 <            c.awaitUninterruptibly();
857 <            shouldThrow();
858 <        } catch (IllegalMonitorStateException success) {}
844 >            try {
845 >                c.await();
846 >                shouldThrow();
847 >            } catch (IllegalMonitorStateException success) {}
848 >            try {
849 >                c.await(LONG_DELAY_MS, MILLISECONDS);
850 >                shouldThrow();
851 >            } catch (IllegalMonitorStateException success) {}
852 >            try {
853 >                c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
854 >                shouldThrow();
855 >            } catch (IllegalMonitorStateException success) {}
856 >            try {
857 >                c.awaitUninterruptibly();
858 >                shouldThrow();
859 >            } catch (IllegalMonitorStateException success) {}
860 >        } catch (Throwable t) {
861 >            threadUnexpectedException(t);
862 >        }
863 >        assertTrue(millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
864      }
865  
866      /**
867       * Calling signal without holding lock throws IllegalMonitorStateException
868       */
869 <    public void testSignal_IllegalMonitor() {
870 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
869 >    public void testSignal_IMSE()      { testSignal_IMSE(false); }
870 >    public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
871 >    public void testSignal_IMSE(boolean fair) {
872 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
873          final Condition c = lock.writeLock().newCondition();
874          try {
875              c.signal();
# Line 877 | Line 880 | public class ReentrantReadWriteLockTest
880      /**
881       * Calling signalAll without holding lock throws IllegalMonitorStateException
882       */
883 <    public void testSignalAll_IllegalMonitor() {
884 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
883 >    public void testSignalAll_IMSE()      { testSignalAll_IMSE(false); }
884 >    public void testSignalAll_IMSE_fair() { testSignalAll_IMSE(true); }
885 >    public void testSignalAll_IMSE(boolean fair) {
886 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
887          final Condition c = lock.writeLock().newCondition();
888          try {
889              c.signalAll();
# Line 889 | Line 894 | public class ReentrantReadWriteLockTest
894      /**
895       * awaitNanos without a signal times out
896       */
897 <    public void testAwaitNanos_Timeout() throws InterruptedException {
898 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
899 <        final Condition c = lock.writeLock().newCondition();
900 <        lock.writeLock().lock();
901 <        long startTime = System.nanoTime();
902 <        long timeoutMillis = 10;
903 <        long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
904 <        long nanosRemaining = c.awaitNanos(timeoutNanos);
905 <        assertTrue(nanosRemaining <= 0);
906 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
907 <        lock.writeLock().unlock();
897 >    public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
898 >    public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
899 >    public void testAwaitNanos_Timeout(boolean fair) {
900 >        try {
901 >            final ReentrantReadWriteLock lock =
902 >                new ReentrantReadWriteLock(fair);
903 >            final Condition c = lock.writeLock().newCondition();
904 >            lock.writeLock().lock();
905 >            long startTime = System.nanoTime();
906 >            long timeoutMillis = 10;
907 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
908 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
909 >            assertTrue(nanosRemaining <= 0);
910 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
911 >            lock.writeLock().unlock();
912 >        } catch (InterruptedException e) {
913 >            threadUnexpectedException(e);
914 >        }
915      }
916  
917      /**
918       * timed await without a signal times out
919       */
920 <    public void testAwait_Timeout() throws InterruptedException {
921 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
922 <        final Condition c = lock.writeLock().newCondition();
923 <        lock.writeLock().lock();
924 <        long startTime = System.nanoTime();
925 <        long timeoutMillis = 10;
926 <        assertFalse(c.await(timeoutMillis, MILLISECONDS));
927 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
928 <        lock.writeLock().unlock();
920 >    public void testAwait_Timeout()      { testAwait_Timeout(false); }
921 >    public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
922 >    public void testAwait_Timeout(boolean fair) {
923 >        try {
924 >            final ReentrantReadWriteLock lock =
925 >                new ReentrantReadWriteLock(fair);
926 >            final Condition c = lock.writeLock().newCondition();
927 >            lock.writeLock().lock();
928 >            long startTime = System.nanoTime();
929 >            long timeoutMillis = 10;
930 >            assertFalse(c.await(timeoutMillis, MILLISECONDS));
931 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
932 >            lock.writeLock().unlock();
933 >        } catch (InterruptedException e) {
934 >            threadUnexpectedException(e);
935 >        }
936      }
937  
938      /**
939       * awaitUntil without a signal times out
940       */
941 <    public void testAwaitUntil_Timeout() throws InterruptedException {
942 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
943 <        final Condition c = lock.writeLock().newCondition();
944 <        lock.writeLock().lock();
945 <        long startTime = System.nanoTime();
946 <        long timeoutMillis = 10;
947 <        java.util.Date d = new java.util.Date();
948 <        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
949 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
950 <        lock.writeLock().unlock();
941 >    public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
942 >    public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
943 >    public void testAwaitUntil_Timeout(boolean fair) {
944 >        try {
945 >            final ReentrantReadWriteLock lock =
946 >                new ReentrantReadWriteLock(fair);
947 >            final Condition c = lock.writeLock().newCondition();
948 >            lock.writeLock().lock();
949 >            long startTime = System.nanoTime();
950 >            long timeoutMillis = 10;
951 >            java.util.Date d = new java.util.Date();
952 >            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
953 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
954 >            lock.writeLock().unlock();
955 >        } catch (InterruptedException e) {
956 >            threadUnexpectedException(e);
957 >        }
958      }
959  
960      /**
961       * await returns when signalled
962       */
963 <    public void testAwait() throws InterruptedException {
964 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
963 >    public void testAwait()      { testAwait(false); }
964 >    public void testAwait_fair() { testAwait(true); }
965 >    public void testAwait(boolean fair) {
966 >        final PublicReentrantReadWriteLock lock =
967 >            new PublicReentrantReadWriteLock(fair);
968          final Condition c = lock.writeLock().newCondition();
969          final CountDownLatch locked = new CountDownLatch(1);
970          Thread t = newStartedThread(new CheckedRunnable() {
# Line 946 | Line 975 | public class ReentrantReadWriteLockTest
975                  lock.writeLock().unlock();
976              }});
977  
978 <        locked.await();
978 >        await(locked);
979          lock.writeLock().lock();
980          assertHasWaiters(lock, c, t);
981          c.signal();
# Line 959 | Line 988 | public class ReentrantReadWriteLockTest
988      /**
989       * awaitUninterruptibly doesn't abort on interrupt
990       */
991 <    public void testAwaitUninterruptibly() throws InterruptedException {
992 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
991 >    public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
992 >    public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
993 >    public void testAwaitUninterruptibly(boolean fair) {
994 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
995          final Condition c = lock.writeLock().newCondition();
996          final CountDownLatch locked = new CountDownLatch(1);
997          Thread t = newStartedThread(new CheckedRunnable() {
# Line 972 | Line 1003 | public class ReentrantReadWriteLockTest
1003                  lock.writeLock().unlock();
1004              }});
1005  
1006 <        locked.await();
1006 >        await(locked);
1007          lock.writeLock().lock();
1008          lock.writeLock().unlock();
1009          t.interrupt();
# Line 985 | Line 1016 | public class ReentrantReadWriteLockTest
1016      }
1017  
1018      /**
1019 <     * 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
1019 >     * await/awaitNanos/awaitUntil is interruptible
1020       */
1021 <    public void testAwaitUntil_Interrupt() throws InterruptedException {
1022 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1021 >    public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
1022 >    public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
1023 >    public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
1024 >    public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
1025 >    public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
1026 >    public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
1027 >    public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
1028 >        final PublicReentrantReadWriteLock lock =
1029 >            new PublicReentrantReadWriteLock(fair);
1030          final Condition c = lock.writeLock().newCondition();
1031          final CountDownLatch locked = new CountDownLatch(1);
1032          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
# Line 1057 | Line 1035 | public class ReentrantReadWriteLockTest
1035                  assertWriteLockedBy(lock, Thread.currentThread());
1036                  assertHasNoWaiters(lock, c);
1037                  locked.countDown();
1060                java.util.Date d = new java.util.Date();
1038                  try {
1039 <                    c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS));
1039 >                    await(c, awaitMethod);
1040                  } finally {
1041                      assertWriteLockedBy(lock, Thread.currentThread());
1042                      assertHasNoWaiters(lock, c);
# Line 1068 | Line 1045 | public class ReentrantReadWriteLockTest
1045                  }
1046              }});
1047  
1048 <        locked.await();
1048 >        await(locked);
1049          assertHasWaiters(lock, c, t);
1050          t.interrupt();
1051          awaitTermination(t);
# Line 1078 | Line 1055 | public class ReentrantReadWriteLockTest
1055      /**
1056       * signalAll wakes up all threads
1057       */
1058 <    public void testSignalAll() throws InterruptedException {
1059 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1058 >    public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
1059 >    public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
1060 >    public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
1061 >    public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
1062 >    public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
1063 >    public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
1064 >    public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
1065 >        final PublicReentrantReadWriteLock lock =
1066 >            new PublicReentrantReadWriteLock(fair);
1067          final Condition c = lock.writeLock().newCondition();
1068          final CountDownLatch locked = new CountDownLatch(2);
1069          final Lock writeLock = lock.writeLock();
1070 <        Thread t1 = newStartedThread(new CheckedRunnable() {
1070 >        class Awaiter extends CheckedRunnable {
1071              public void realRun() throws InterruptedException {
1072                  writeLock.lock();
1073                  locked.countDown();
1074 <                c.await();
1074 >                await(c, awaitMethod);
1075                  writeLock.unlock();
1076 <            }});
1076 >            }
1077 >        }
1078  
1079 <        Thread t2 = newStartedThread(new CheckedRunnable() {
1080 <            public void realRun() throws InterruptedException {
1096 <                writeLock.lock();
1097 <                locked.countDown();
1098 <                c.await();
1099 <                writeLock.unlock();
1100 <            }});
1079 >        Thread t1 = newStartedThread(new Awaiter());
1080 >        Thread t2 = newStartedThread(new Awaiter());
1081  
1082 <        locked.await();
1082 >        await(locked);
1083          writeLock.lock();
1084          assertHasWaiters(lock, c, t1, t2);
1085          c.signalAll();
# Line 1112 | Line 1092 | public class ReentrantReadWriteLockTest
1092      /**
1093       * signal wakes up waiting threads in FIFO order.
1094       */
1095 <    public void testSignalWakesFifo() throws InterruptedException {
1096 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1095 >    public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1096 >    public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1097 >    public void testSignalWakesFifo(boolean fair) {
1098 >        final PublicReentrantReadWriteLock lock =
1099 >            new PublicReentrantReadWriteLock(fair);
1100          final Condition c = lock.writeLock().newCondition();
1101          final CountDownLatch locked1 = new CountDownLatch(1);
1102          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1126 | Line 1109 | public class ReentrantReadWriteLockTest
1109                  writeLock.unlock();
1110              }});
1111  
1112 <        locked1.await();
1112 >        await(locked1);
1113  
1114          Thread t2 = newStartedThread(new CheckedRunnable() {
1115              public void realRun() throws InterruptedException {
# Line 1136 | Line 1119 | public class ReentrantReadWriteLockTest
1119                  writeLock.unlock();
1120              }});
1121  
1122 <        locked2.await();
1122 >        await(locked2);
1123  
1124          writeLock.lock();
1125          assertHasWaiters(lock, c, t1, t2);
# Line 1157 | Line 1140 | public class ReentrantReadWriteLockTest
1140      /**
1141       * await after multiple reentrant locking preserves lock count
1142       */
1143 <    public void testAwaitLockCount() throws InterruptedException {
1144 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1143 >    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1144 >    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1145 >    public void testAwaitLockCount(boolean fair) {
1146 >        final PublicReentrantReadWriteLock lock =
1147 >            new PublicReentrantReadWriteLock(fair);
1148          final Condition c = lock.writeLock().newCondition();
1149          final CountDownLatch locked = new CountDownLatch(2);
1150          Thread t1 = newStartedThread(new CheckedRunnable() {
# Line 1187 | Line 1173 | public class ReentrantReadWriteLockTest
1173                  lock.writeLock().unlock();
1174              }});
1175  
1176 <        locked.await();
1176 >        await(locked);
1177          lock.writeLock().lock();
1178          assertHasWaiters(lock, c, t1, t2);
1179          c.signalAll();
# Line 1200 | Line 1186 | public class ReentrantReadWriteLockTest
1186      /**
1187       * A serialized lock deserializes as unlocked
1188       */
1189 <    public void testSerialization() throws Exception {
1190 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1191 <        l.readLock().lock();
1192 <        l.readLock().unlock();
1193 <
1194 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1195 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1196 <        out.writeObject(l);
1197 <        out.close();
1198 <
1199 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1200 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1201 <        ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1202 <        r.readLock().lock();
1203 <        r.readLock().unlock();
1189 >    public void testSerialization()      { testSerialization(false); }
1190 >    public void testSerialization_fair() { testSerialization(true); }
1191 >    public void testSerialization(boolean fair) {
1192 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1193 >        lock.writeLock().lock();
1194 >        lock.readLock().lock();
1195 >
1196 >        ReentrantReadWriteLock clone = serialClone(lock);
1197 >        assertEquals(lock.isFair(), clone.isFair());
1198 >        assertTrue(lock.isWriteLocked());
1199 >        assertFalse(clone.isWriteLocked());
1200 >        assertEquals(1, lock.getReadLockCount());
1201 >        assertEquals(0, clone.getReadLockCount());
1202 >        clone.writeLock().lock();
1203 >        clone.readLock().lock();
1204 >        assertTrue(clone.isWriteLocked());
1205 >        assertEquals(1, clone.getReadLockCount());
1206 >        clone.readLock().unlock();
1207 >        clone.writeLock().unlock();
1208      }
1209  
1210      /**
1211       * hasQueuedThreads reports whether there are waiting threads
1212       */
1213 <    public void testHasQueuedThreads() throws InterruptedException {
1214 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1213 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
1214 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
1215 >    public void testHasQueuedThreads(boolean fair) {
1216 >        final PublicReentrantReadWriteLock lock =
1217 >            new PublicReentrantReadWriteLock(fair);
1218          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1219          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1220          assertFalse(lock.hasQueuedThreads());
# Line 1244 | Line 1237 | public class ReentrantReadWriteLockTest
1237      /**
1238       * hasQueuedThread(null) throws NPE
1239       */
1240 <    public void testHasQueuedThreadNPE() {
1241 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1240 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
1241 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
1242 >    public void testHasQueuedThreadNPE(boolean fair) {
1243 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1244          try {
1245              lock.hasQueuedThread(null);
1246              shouldThrow();
# Line 1255 | Line 1250 | public class ReentrantReadWriteLockTest
1250      /**
1251       * hasQueuedThread reports whether a thread is queued.
1252       */
1253 <    public void testHasQueuedThread() throws InterruptedException {
1254 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1253 >    public void testHasQueuedThread()      { testHasQueuedThread(false); }
1254 >    public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
1255 >    public void testHasQueuedThread(boolean fair) {
1256 >        final PublicReentrantReadWriteLock lock =
1257 >            new PublicReentrantReadWriteLock(fair);
1258          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1259          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1260          assertFalse(lock.hasQueuedThread(t1));
# Line 1283 | Line 1281 | public class ReentrantReadWriteLockTest
1281      /**
1282       * getQueueLength reports number of waiting threads
1283       */
1284 <    public void testGetQueueLength() throws InterruptedException {
1285 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1284 >    public void testGetQueueLength()      { testGetQueueLength(false); }
1285 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
1286 >    public void testGetQueueLength(boolean fair) {
1287 >        final PublicReentrantReadWriteLock lock =
1288 >            new PublicReentrantReadWriteLock(fair);
1289          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1290          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1291          assertEquals(0, lock.getQueueLength());
# Line 1306 | Line 1307 | public class ReentrantReadWriteLockTest
1307      /**
1308       * getQueuedThreads includes waiting threads
1309       */
1310 <    public void testGetQueuedThreads() throws InterruptedException {
1311 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1310 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
1311 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
1312 >    public void testGetQueuedThreads(boolean fair) {
1313 >        final PublicReentrantReadWriteLock lock =
1314 >            new PublicReentrantReadWriteLock(fair);
1315          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1316          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1317          assertTrue(lock.getQueuedThreads().isEmpty());
# Line 1335 | Line 1339 | public class ReentrantReadWriteLockTest
1339      /**
1340       * hasWaiters throws NPE if null
1341       */
1342 <    public void testHasWaitersNPE() {
1343 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1342 >    public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
1343 >    public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
1344 >    public void testHasWaitersNPE(boolean fair) {
1345 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1346          try {
1347              lock.hasWaiters(null);
1348              shouldThrow();
# Line 1346 | Line 1352 | public class ReentrantReadWriteLockTest
1352      /**
1353       * getWaitQueueLength throws NPE if null
1354       */
1355 <    public void testGetWaitQueueLengthNPE() {
1356 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1355 >    public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
1356 >    public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
1357 >    public void testGetWaitQueueLengthNPE(boolean fair) {
1358 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1359          try {
1360              lock.getWaitQueueLength(null);
1361              shouldThrow();
# Line 1357 | Line 1365 | public class ReentrantReadWriteLockTest
1365      /**
1366       * getWaitingThreads throws NPE if null
1367       */
1368 <    public void testGetWaitingThreadsNPE() {
1369 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1368 >    public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
1369 >    public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
1370 >    public void testGetWaitingThreadsNPE(boolean fair) {
1371 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(fair);
1372          try {
1373              lock.getWaitingThreads(null);
1374              shouldThrow();
# Line 1368 | Line 1378 | public class ReentrantReadWriteLockTest
1378      /**
1379       * hasWaiters throws IllegalArgumentException if not owned
1380       */
1381 <    public void testHasWaitersIAE() {
1382 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1381 >    public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
1382 >    public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
1383 >    public void testHasWaitersIAE(boolean fair) {
1384 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1385          final Condition c = lock.writeLock().newCondition();
1386 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1386 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1387          try {
1388              lock2.hasWaiters(c);
1389              shouldThrow();
# Line 1381 | Line 1393 | public class ReentrantReadWriteLockTest
1393      /**
1394       * hasWaiters throws IllegalMonitorStateException if not locked
1395       */
1396 <    public void testHasWaitersIMSE() {
1397 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1396 >    public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
1397 >    public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
1398 >    public void testHasWaitersIMSE(boolean fair) {
1399 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1400          final Condition c = lock.writeLock().newCondition();
1401          try {
1402              lock.hasWaiters(c);
# Line 1393 | Line 1407 | public class ReentrantReadWriteLockTest
1407      /**
1408       * getWaitQueueLength throws IllegalArgumentException if not owned
1409       */
1410 <    public void testGetWaitQueueLengthIAE() {
1411 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1410 >    public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
1411 >    public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
1412 >    public void testGetWaitQueueLengthIAE(boolean fair) {
1413 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1414          final Condition c = lock.writeLock().newCondition();
1415 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1415 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1416          try {
1417              lock2.getWaitQueueLength(c);
1418              shouldThrow();
# Line 1406 | Line 1422 | public class ReentrantReadWriteLockTest
1422      /**
1423       * getWaitQueueLength throws IllegalMonitorStateException if not locked
1424       */
1425 <    public void testGetWaitQueueLengthIMSE() {
1426 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1425 >    public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
1426 >    public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
1427 >    public void testGetWaitQueueLengthIMSE(boolean fair) {
1428 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1429          final Condition c = lock.writeLock().newCondition();
1430          try {
1431              lock.getWaitQueueLength(c);
# Line 1418 | Line 1436 | public class ReentrantReadWriteLockTest
1436      /**
1437       * getWaitingThreads throws IllegalArgumentException if not owned
1438       */
1439 <    public void testGetWaitingThreadsIAE() {
1440 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1439 >    public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
1440 >    public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
1441 >    public void testGetWaitingThreadsIAE(boolean fair) {
1442 >        final PublicReentrantReadWriteLock lock =
1443 >            new PublicReentrantReadWriteLock(fair);
1444          final Condition c = lock.writeLock().newCondition();
1445 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1445 >        final PublicReentrantReadWriteLock lock2 =
1446 >            new PublicReentrantReadWriteLock(fair);
1447          try {
1448              lock2.getWaitingThreads(c);
1449              shouldThrow();
# Line 1431 | Line 1453 | public class ReentrantReadWriteLockTest
1453      /**
1454       * getWaitingThreads throws IllegalMonitorStateException if not locked
1455       */
1456 <    public void testGetWaitingThreadsIMSE() {
1457 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1456 >    public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
1457 >    public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
1458 >    public void testGetWaitingThreadsIMSE(boolean fair) {
1459 >        final PublicReentrantReadWriteLock lock =
1460 >            new PublicReentrantReadWriteLock(fair);
1461          final Condition c = lock.writeLock().newCondition();
1462          try {
1463              lock.getWaitingThreads(c);
# Line 1443 | Line 1468 | public class ReentrantReadWriteLockTest
1468      /**
1469       * hasWaiters returns true when a thread is waiting, else false
1470       */
1471 <    public void testHasWaiters() throws InterruptedException {
1472 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1471 >    public void testHasWaiters()      { testHasWaiters(false); }
1472 >    public void testHasWaiters_fair() { testHasWaiters(true); }
1473 >    public void testHasWaiters(boolean fair) {
1474 >        final PublicReentrantReadWriteLock lock =
1475 >            new PublicReentrantReadWriteLock(fair);
1476          final Condition c = lock.writeLock().newCondition();
1477          final CountDownLatch locked = new CountDownLatch(1);
1478          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1459 | Line 1487 | public class ReentrantReadWriteLockTest
1487                  lock.writeLock().unlock();
1488              }});
1489  
1490 <        locked.await();
1490 >        await(locked);
1491          lock.writeLock().lock();
1492          assertHasWaiters(lock, c, t);
1493          assertTrue(lock.hasWaiters(c));
# Line 1474 | Line 1502 | public class ReentrantReadWriteLockTest
1502      /**
1503       * getWaitQueueLength returns number of waiting threads
1504       */
1505 <    public void testGetWaitQueueLength() throws InterruptedException {
1506 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1505 >    public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
1506 >    public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
1507 >    public void testGetWaitQueueLength(boolean fair) {
1508 >        final PublicReentrantReadWriteLock lock =
1509 >            new PublicReentrantReadWriteLock(fair);
1510          final Condition c = lock.writeLock().newCondition();
1511          final CountDownLatch locked = new CountDownLatch(1);
1512          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1487 | Line 1518 | public class ReentrantReadWriteLockTest
1518                  lock.writeLock().unlock();
1519              }});
1520  
1521 <        locked.await();
1521 >        await(locked);
1522          lock.writeLock().lock();
1523          assertHasWaiters(lock, c, t);
1524          assertEquals(1, lock.getWaitQueueLength(c));
# Line 1501 | Line 1532 | public class ReentrantReadWriteLockTest
1532      /**
1533       * getWaitingThreads returns only and all waiting threads
1534       */
1535 <    public void testGetWaitingThreads() throws InterruptedException {
1536 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1535 >    public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
1536 >    public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
1537 >    public void testGetWaitingThreads(boolean fair) {
1538 >        final PublicReentrantReadWriteLock lock =
1539 >            new PublicReentrantReadWriteLock(fair);
1540          final Condition c = lock.writeLock().newCondition();
1541          final CountDownLatch locked1 = new CountDownLatch(1);
1542          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1529 | Line 1563 | public class ReentrantReadWriteLockTest
1563          lock.writeLock().unlock();
1564  
1565          t1.start();
1566 <        locked1.await();
1566 >        await(locked1);
1567          t2.start();
1568 <        locked2.await();
1568 >        await(locked2);
1569  
1570          lock.writeLock().lock();
1571          assertTrue(lock.hasWaiters(c));
# Line 1551 | Line 1585 | public class ReentrantReadWriteLockTest
1585      /**
1586       * toString indicates current lock state
1587       */
1588 <    public void testToString() {
1589 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1588 >    public void testToString()      { testToString(false); }
1589 >    public void testToString_fair() { testToString(true); }
1590 >    public void testToString(boolean fair) {
1591 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1592          String us = lock.toString();
1593          assertTrue(us.indexOf("Write locks = 0") >= 0);
1594          assertTrue(us.indexOf("Read locks = 0") >= 0);
# Line 1571 | Line 1607 | public class ReentrantReadWriteLockTest
1607      /**
1608       * readLock.toString indicates current lock state
1609       */
1610 <    public void testReadLockToString() {
1611 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1610 >    public void testReadLockToString()      { testReadLockToString(false); }
1611 >    public void testReadLockToString_fair() { testReadLockToString(true); }
1612 >    public void testReadLockToString(boolean fair) {
1613 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1614          String us = lock.readLock().toString();
1615          assertTrue(us.indexOf("Read locks = 0") >= 0);
1616          lock.readLock().lock();
# Line 1584 | Line 1622 | public class ReentrantReadWriteLockTest
1622      /**
1623       * writeLock.toString indicates current lock state
1624       */
1625 <    public void testWriteLockToString() {
1626 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1625 >    public void testWriteLockToString()      { testWriteLockToString(false); }
1626 >    public void testWriteLockToString_fair() { testWriteLockToString(true); }
1627 >    public void testWriteLockToString(boolean fair) {
1628 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1629          String us = lock.writeLock().toString();
1630          assertTrue(us.indexOf("Unlocked") >= 0);
1631          lock.writeLock().lock();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines