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.82 by jsr166, Tue Jan 23 20:44:11 2018 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;
14 import java.io.*;
15 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.Test;
21 + import junit.framework.TestSuite;
22 +
23 + @SuppressWarnings("WaitNotInLoop") // we implement spurious-wakeup freedom
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 84 | Line 91 | public class ReentrantReadWriteLockTest
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 "indefinitely" using the specified AwaitMethod.
159 +     */
160 +    void await(Condition c, AwaitMethod awaitMethod)
161 +            throws InterruptedException {
162 +        long timeoutMillis = 2 * LONG_DELAY_MS;
163 +        switch (awaitMethod) {
164 +        case await:
165 +            c.await();
166 +            break;
167 +        case awaitTimed:
168 +            assertTrue(c.await(timeoutMillis, MILLISECONDS));
169 +            break;
170 +        case awaitNanos:
171 +            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
172 +            long nanosRemaining = c.awaitNanos(timeoutNanos);
173 +            assertTrue(nanosRemaining > timeoutNanos / 2);
174 +            assertTrue(nanosRemaining <= timeoutNanos);
175 +            break;
176 +        case awaitUntil:
177 +            assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
178 +            break;
179 +        default:
180 +            throw new AssertionError();
181 +        }
182 +    }
183 +
184      /**
185       * Constructor sets given fairness, and is in unlocked state
186       */
# Line 160 | Line 206 | public class ReentrantReadWriteLockTest
206      /**
207       * write-locking and read-locking an unlocked lock succeed
208       */
209 <    public void testLock() {
210 <        PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
211 <        assertNotWriteLocked(lock);
212 <        lock.writeLock().lock();
213 <        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);
209 >    public void testLock()      { testLock(false); }
210 >    public void testLock_fair() { testLock(true); }
211 >    public void testLock(boolean fair) {
212 >        PublicReentrantReadWriteLock lock =
213 >            new PublicReentrantReadWriteLock(fair);
214          assertNotWriteLocked(lock);
215          lock.writeLock().lock();
216 <        assertWriteLockedBy(lock, Thread.currentThread());
216 >        assertWriteLockedByMoi(lock);
217          lock.writeLock().unlock();
218          assertNotWriteLocked(lock);
219          assertEquals(0, lock.getReadLockCount());
# Line 198 | Line 228 | public class ReentrantReadWriteLockTest
228      /**
229       * getWriteHoldCount returns number of recursive holds
230       */
231 <    public void testGetWriteHoldCount() {
232 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
231 >    public void testGetWriteHoldCount()      { testGetWriteHoldCount(false); }
232 >    public void testGetWriteHoldCount_fair() { testGetWriteHoldCount(true); }
233 >    public void testGetWriteHoldCount(boolean fair) {
234 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
235          for (int i = 1; i <= SIZE; i++) {
236              lock.writeLock().lock();
237              assertEquals(i,lock.getWriteHoldCount());
238          }
239          for (int i = SIZE; i > 0; i--) {
240              lock.writeLock().unlock();
241 <            assertEquals(i-1,lock.getWriteHoldCount());
241 >            assertEquals(i - 1,lock.getWriteHoldCount());
242          }
243      }
244  
245      /**
246 <     * WriteLock.getHoldCount returns number of recursive holds
246 >     * writelock.getHoldCount returns number of recursive holds
247       */
248 <    public void testGetHoldCount() {
249 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
248 >    public void testGetHoldCount()      { testGetHoldCount(false); }
249 >    public void testGetHoldCount_fair() { testGetHoldCount(true); }
250 >    public void testGetHoldCount(boolean fair) {
251 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
252          for (int i = 1; i <= SIZE; i++) {
253              lock.writeLock().lock();
254              assertEquals(i,lock.writeLock().getHoldCount());
255          }
256          for (int i = SIZE; i > 0; i--) {
257              lock.writeLock().unlock();
258 <            assertEquals(i-1,lock.writeLock().getHoldCount());
258 >            assertEquals(i - 1,lock.writeLock().getHoldCount());
259          }
260      }
261  
262      /**
263       * getReadHoldCount returns number of recursive holds
264       */
265 <    public void testGetReadHoldCount() {
266 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
265 >    public void testGetReadHoldCount()      { testGetReadHoldCount(false); }
266 >    public void testGetReadHoldCount_fair() { testGetReadHoldCount(true); }
267 >    public void testGetReadHoldCount(boolean fair) {
268 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
269          for (int i = 1; i <= SIZE; i++) {
270              lock.readLock().lock();
271              assertEquals(i,lock.getReadHoldCount());
272          }
273          for (int i = SIZE; i > 0; i--) {
274              lock.readLock().unlock();
275 <            assertEquals(i-1,lock.getReadHoldCount());
275 >            assertEquals(i - 1,lock.getReadHoldCount());
276          }
277      }
278  
279      /**
280       * write-unlocking an unlocked lock throws IllegalMonitorStateException
281       */
282 <    public void testWriteUnlock_IllegalMonitorStateException() {
283 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
282 >    public void testWriteUnlock_IMSE()      { testWriteUnlock_IMSE(false); }
283 >    public void testWriteUnlock_IMSE_fair() { testWriteUnlock_IMSE(true); }
284 >    public void testWriteUnlock_IMSE(boolean fair) {
285 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
286          try {
287              lock.writeLock().unlock();
288              shouldThrow();
# Line 254 | Line 292 | public class ReentrantReadWriteLockTest
292      /**
293       * read-unlocking an unlocked lock throws IllegalMonitorStateException
294       */
295 <    public void testReadUnlock_IllegalMonitorStateException() {
296 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
295 >    public void testReadUnlock_IMSE()      { testReadUnlock_IMSE(false); }
296 >    public void testReadUnlock_IMSE_fair() { testReadUnlock_IMSE(true); }
297 >    public void testReadUnlock_IMSE(boolean fair) {
298 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
299          try {
300              lock.readLock().unlock();
301              shouldThrow();
# Line 265 | Line 305 | public class ReentrantReadWriteLockTest
305      /**
306       * write-lockInterruptibly is interruptible
307       */
308 <    public void testWriteLockInterruptibly_Interrupted() throws Exception {
309 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
308 >    public void testWriteLockInterruptibly_Interruptible()      { testWriteLockInterruptibly_Interruptible(false); }
309 >    public void testWriteLockInterruptibly_Interruptible_fair() { testWriteLockInterruptibly_Interruptible(true); }
310 >    public void testWriteLockInterruptibly_Interruptible(boolean fair) {
311 >        final PublicReentrantReadWriteLock lock =
312 >            new PublicReentrantReadWriteLock(fair);
313          lock.writeLock().lock();
314          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
315              public void realRun() throws InterruptedException {
# Line 282 | Line 325 | public class ReentrantReadWriteLockTest
325      /**
326       * timed write-tryLock is interruptible
327       */
328 <    public void testWriteTryLock_Interrupted() throws InterruptedException {
329 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
328 >    public void testWriteTryLock_Interruptible()      { testWriteTryLock_Interruptible(false); }
329 >    public void testWriteTryLock_Interruptible_fair() { testWriteTryLock_Interruptible(true); }
330 >    public void testWriteTryLock_Interruptible(boolean fair) {
331 >        final PublicReentrantReadWriteLock lock =
332 >            new PublicReentrantReadWriteLock(fair);
333          lock.writeLock().lock();
334          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
335              public void realRun() throws InterruptedException {
# Line 299 | Line 345 | public class ReentrantReadWriteLockTest
345      /**
346       * read-lockInterruptibly is interruptible
347       */
348 <    public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
349 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
348 >    public void testReadLockInterruptibly_Interruptible()      { testReadLockInterruptibly_Interruptible(false); }
349 >    public void testReadLockInterruptibly_Interruptible_fair() { testReadLockInterruptibly_Interruptible(true); }
350 >    public void testReadLockInterruptibly_Interruptible(boolean fair) {
351 >        final PublicReentrantReadWriteLock lock =
352 >            new PublicReentrantReadWriteLock(fair);
353          lock.writeLock().lock();
354          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
355              public void realRun() throws InterruptedException {
# Line 316 | Line 365 | public class ReentrantReadWriteLockTest
365      /**
366       * timed read-tryLock is interruptible
367       */
368 <    public void testReadTryLock_Interrupted() throws InterruptedException {
369 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
368 >    public void testReadTryLock_Interruptible()      { testReadTryLock_Interruptible(false); }
369 >    public void testReadTryLock_Interruptible_fair() { testReadTryLock_Interruptible(true); }
370 >    public void testReadTryLock_Interruptible(boolean fair) {
371 >        final PublicReentrantReadWriteLock lock =
372 >            new PublicReentrantReadWriteLock(fair);
373          lock.writeLock().lock();
374          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
375              public void realRun() throws InterruptedException {
# Line 331 | Line 383 | public class ReentrantReadWriteLockTest
383      }
384  
385      /**
386 +     * write-tryLock on an unlocked lock succeeds
387 +     */
388 +    public void testWriteTryLock()      { testWriteTryLock(false); }
389 +    public void testWriteTryLock_fair() { testWriteTryLock(true); }
390 +    public void testWriteTryLock(boolean fair) {
391 +        final PublicReentrantReadWriteLock lock =
392 +            new PublicReentrantReadWriteLock(fair);
393 +        assertTrue(lock.writeLock().tryLock());
394 +        assertWriteLockedByMoi(lock);
395 +        assertTrue(lock.writeLock().tryLock());
396 +        assertWriteLockedByMoi(lock);
397 +        lock.writeLock().unlock();
398 +        releaseWriteLock(lock);
399 +    }
400 +
401 +    /**
402       * write-tryLock fails if locked
403       */
404 <    public void testWriteTryLockWhenLocked() throws InterruptedException {
405 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
404 >    public void testWriteTryLockWhenLocked()      { testWriteTryLockWhenLocked(false); }
405 >    public void testWriteTryLockWhenLocked_fair() { testWriteTryLockWhenLocked(true); }
406 >    public void testWriteTryLockWhenLocked(boolean fair) {
407 >        final PublicReentrantReadWriteLock lock =
408 >            new PublicReentrantReadWriteLock(fair);
409          lock.writeLock().lock();
410          Thread t = newStartedThread(new CheckedRunnable() {
411              public void realRun() {
# Line 348 | Line 419 | public class ReentrantReadWriteLockTest
419      /**
420       * read-tryLock fails if locked
421       */
422 <    public void testReadTryLockWhenLocked() throws InterruptedException {
423 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
422 >    public void testReadTryLockWhenLocked()      { testReadTryLockWhenLocked(false); }
423 >    public void testReadTryLockWhenLocked_fair() { testReadTryLockWhenLocked(true); }
424 >    public void testReadTryLockWhenLocked(boolean fair) {
425 >        final PublicReentrantReadWriteLock lock =
426 >            new PublicReentrantReadWriteLock(fair);
427          lock.writeLock().lock();
428          Thread t = newStartedThread(new CheckedRunnable() {
429              public void realRun() {
# Line 363 | Line 437 | public class ReentrantReadWriteLockTest
437      /**
438       * Multiple threads can hold a read lock when not write-locked
439       */
440 <    public void testMultipleReadLocks() throws InterruptedException {
441 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
440 >    public void testMultipleReadLocks()      { testMultipleReadLocks(false); }
441 >    public void testMultipleReadLocks_fair() { testMultipleReadLocks(true); }
442 >    public void testMultipleReadLocks(boolean fair) {
443 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
444          lock.readLock().lock();
445          Thread t = newStartedThread(new CheckedRunnable() {
446 <            public void realRun() {
446 >            public void realRun() throws InterruptedException {
447                  assertTrue(lock.readLock().tryLock());
448                  lock.readLock().unlock();
449 +                assertTrue(lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS));
450 +                lock.readLock().unlock();
451 +                lock.readLock().lock();
452 +                lock.readLock().unlock();
453              }});
454  
455          awaitTermination(t);
# Line 379 | Line 459 | public class ReentrantReadWriteLockTest
459      /**
460       * A writelock succeeds only after a reading thread unlocks
461       */
462 <    public void testWriteAfterReadLock() throws InterruptedException {
463 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
462 >    public void testWriteAfterReadLock()      { testWriteAfterReadLock(false); }
463 >    public void testWriteAfterReadLock_fair() { testWriteAfterReadLock(true); }
464 >    public void testWriteAfterReadLock(boolean fair) {
465 >        final PublicReentrantReadWriteLock lock =
466 >            new PublicReentrantReadWriteLock(fair);
467          lock.readLock().lock();
385
468          Thread t = newStartedThread(new CheckedRunnable() {
469              public void realRun() {
470                  assertEquals(1, lock.getReadLockCount());
# Line 402 | Line 484 | public class ReentrantReadWriteLockTest
484      /**
485       * A writelock succeeds only after reading threads unlock
486       */
487 <    public void testWriteAfterMultipleReadLocks() throws InterruptedException {
488 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
487 >    public void testWriteAfterMultipleReadLocks()      { testWriteAfterMultipleReadLocks(false); }
488 >    public void testWriteAfterMultipleReadLocks_fair() { testWriteAfterMultipleReadLocks(true); }
489 >    public void testWriteAfterMultipleReadLocks(boolean fair) {
490 >        final PublicReentrantReadWriteLock lock =
491 >            new PublicReentrantReadWriteLock(fair);
492          lock.readLock().lock();
493          lock.readLock().lock();
494          Thread t1 = newStartedThread(new CheckedRunnable() {
# Line 433 | Line 518 | public class ReentrantReadWriteLockTest
518  
519      /**
520       * A thread that tries to acquire a fair read lock (non-reentrantly)
521 <     * will block if there is a waiting writer thread.
521 >     * will block if there is a waiting writer thread
522       */
523 <    public void testReaderWriterReaderFairFifo() throws InterruptedException {
524 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
523 >    public void testReaderWriterReaderFairFifo() {
524 >        final PublicReentrantReadWriteLock lock =
525 >            new PublicReentrantReadWriteLock(true);
526          final AtomicBoolean t1GotLock = new AtomicBoolean(false);
527  
528          lock.readLock().lock();
# Line 471 | Line 557 | public class ReentrantReadWriteLockTest
557      /**
558       * Readlocks succeed only after a writing thread unlocks
559       */
560 <    public void testReadAfterWriteLock() throws InterruptedException {
561 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
560 >    public void testReadAfterWriteLock()      { testReadAfterWriteLock(false); }
561 >    public void testReadAfterWriteLock_fair() { testReadAfterWriteLock(true); }
562 >    public void testReadAfterWriteLock(boolean fair) {
563 >        final PublicReentrantReadWriteLock lock =
564 >            new PublicReentrantReadWriteLock(fair);
565          lock.writeLock().lock();
566          Thread t1 = newStartedThread(new CheckedRunnable() {
567              public void realRun() {
# Line 495 | Line 584 | public class ReentrantReadWriteLockTest
584      /**
585       * Read trylock succeeds if write locked by current thread
586       */
587 <    public void testReadHoldingWriteLock() {
588 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
587 >    public void testReadHoldingWriteLock()      { testReadHoldingWriteLock(false); }
588 >    public void testReadHoldingWriteLock_fair() { testReadHoldingWriteLock(true); }
589 >    public void testReadHoldingWriteLock(boolean fair) {
590 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
591          lock.writeLock().lock();
592          assertTrue(lock.readLock().tryLock());
593          lock.readLock().unlock();
# Line 504 | Line 595 | public class ReentrantReadWriteLockTest
595      }
596  
597      /**
598 <     * Read lock succeeds if write locked by current thread even if
599 <     * other threads are waiting for readlock
598 >     * Read trylock succeeds (barging) even in the presence of waiting
599 >     * readers and/or writers
600       */
601 <    public void testReadHoldingWriteLock2() throws InterruptedException {
602 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
603 <        lock.writeLock().lock();
601 >    public void testReadTryLockBarging()      { testReadTryLockBarging(false); }
602 >    public void testReadTryLockBarging_fair() { testReadTryLockBarging(true); }
603 >    public void testReadTryLockBarging(boolean fair) {
604 >        final PublicReentrantReadWriteLock lock =
605 >            new PublicReentrantReadWriteLock(fair);
606          lock.readLock().lock();
514        lock.readLock().unlock();
607  
608          Thread t1 = newStartedThread(new CheckedRunnable() {
609              public void realRun() {
610 <                lock.readLock().lock();
611 <                lock.readLock().unlock();
520 <            }});
521 <        Thread t2 = newStartedThread(new CheckedRunnable() {
522 <            public void realRun() {
523 <                lock.readLock().lock();
524 <                lock.readLock().unlock();
610 >                lock.writeLock().lock();
611 >                lock.writeLock().unlock();
612              }});
613  
614          waitForQueuedThread(lock, t1);
528        waitForQueuedThread(lock, t2);
529        assertWriteLockedBy(lock, Thread.currentThread());
530        lock.readLock().lock();
531        lock.readLock().unlock();
532        releaseWriteLock(lock);
533        awaitTermination(t1);
534        awaitTermination(t2);
535    }
536
537    /**
538     * Read lock succeeds if write locked by current thread even if
539     * other threads are waiting for writelock
540     */
541    public void testReadHoldingWriteLock3() throws InterruptedException {
542        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
543        lock.writeLock().lock();
544        lock.readLock().lock();
545        lock.readLock().unlock();
615  
547        Thread t1 = newStartedThread(new CheckedRunnable() {
548            public void realRun() {
549                lock.writeLock().lock();
550                lock.writeLock().unlock();
551            }});
616          Thread t2 = newStartedThread(new CheckedRunnable() {
617              public void realRun() {
618 <                lock.writeLock().lock();
619 <                lock.writeLock().unlock();
618 >                lock.readLock().lock();
619 >                lock.readLock().unlock();
620              }});
621  
622 <        waitForQueuedThread(lock, t1);
623 <        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();
622 >        if (fair)
623 >            waitForQueuedThread(lock, t2);
624  
625 <        Thread t1 = newStartedThread(new CheckedRunnable() {
579 <            public void realRun() {
580 <                lock.writeLock().lock();
581 <                lock.writeLock().unlock();
582 <            }});
583 <        Thread t2 = newStartedThread(new CheckedRunnable() {
625 >        Thread t3 = newStartedThread(new CheckedRunnable() {
626              public void realRun() {
627 <                lock.writeLock().lock();
628 <                lock.writeLock().unlock();
627 >                lock.readLock().tryLock();
628 >                lock.readLock().unlock();
629              }});
630  
631 <        waitForQueuedThread(lock, t1);
632 <        waitForQueuedThread(lock, t2);
633 <        assertWriteLockedBy(lock, Thread.currentThread());
634 <        assertEquals(1, lock.getWriteHoldCount());
635 <        lock.writeLock().lock();
594 <        assertWriteLockedBy(lock, Thread.currentThread());
595 <        assertEquals(2, lock.getWriteHoldCount());
596 <        lock.writeLock().unlock();
597 <        releaseWriteLock(lock);
631 >        assertTrue(lock.getReadLockCount() > 0);
632 >        awaitTermination(t3);
633 >        assertTrue(t1.isAlive());
634 >        if (fair) assertTrue(t2.isAlive());
635 >        lock.readLock().unlock();
636          awaitTermination(t1);
637          awaitTermination(t2);
638      }
639  
640      /**
641 <     * 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
641 >     * Read lock succeeds if write locked by current thread even if
642       * other threads are waiting for readlock
643       */
644 <    public void testReadHoldingWriteLockFair2() throws InterruptedException {
645 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
644 >    public void testReadHoldingWriteLock2()      { testReadHoldingWriteLock2(false); }
645 >    public void testReadHoldingWriteLock2_fair() { testReadHoldingWriteLock2(true); }
646 >    public void testReadHoldingWriteLock2(boolean fair) {
647 >        final PublicReentrantReadWriteLock lock =
648 >            new PublicReentrantReadWriteLock(fair);
649          lock.writeLock().lock();
650          lock.readLock().lock();
651          lock.readLock().unlock();
# Line 633 | Line 663 | public class ReentrantReadWriteLockTest
663  
664          waitForQueuedThread(lock, t1);
665          waitForQueuedThread(lock, t2);
666 <        assertWriteLockedBy(lock, Thread.currentThread());
666 >        assertWriteLockedByMoi(lock);
667          lock.readLock().lock();
668          lock.readLock().unlock();
669          releaseWriteLock(lock);
# Line 642 | Line 672 | public class ReentrantReadWriteLockTest
672      }
673  
674      /**
675 <     * Fair Read lock succeeds if write locked by current thread even if
675 >     * Read lock succeeds if write locked by current thread even if
676       * other threads are waiting for writelock
677       */
678 <    public void testReadHoldingWriteLockFair3() throws InterruptedException {
679 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
678 >    public void testReadHoldingWriteLock3()      { testReadHoldingWriteLock3(false); }
679 >    public void testReadHoldingWriteLock3_fair() { testReadHoldingWriteLock3(true); }
680 >    public void testReadHoldingWriteLock3(boolean fair) {
681 >        final PublicReentrantReadWriteLock lock =
682 >            new PublicReentrantReadWriteLock(fair);
683          lock.writeLock().lock();
684          lock.readLock().lock();
685          lock.readLock().unlock();
# Line 664 | Line 697 | public class ReentrantReadWriteLockTest
697  
698          waitForQueuedThread(lock, t1);
699          waitForQueuedThread(lock, t2);
700 <        assertWriteLockedBy(lock, Thread.currentThread());
700 >        assertWriteLockedByMoi(lock);
701          lock.readLock().lock();
702          lock.readLock().unlock();
703 <        releaseWriteLock(lock);
703 >        assertWriteLockedByMoi(lock);
704 >        lock.writeLock().unlock();
705          awaitTermination(t1);
706          awaitTermination(t2);
707      }
708  
709      /**
710 <     * Fair Write lock succeeds if write locked by current thread even if
710 >     * Write lock succeeds if write locked by current thread even if
711       * other threads are waiting for writelock
712       */
713 <    public void testWriteHoldingWriteLockFair4() throws InterruptedException {
714 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
713 >    public void testWriteHoldingWriteLock4()      { testWriteHoldingWriteLock4(false); }
714 >    public void testWriteHoldingWriteLock4_fair() { testWriteHoldingWriteLock4(true); }
715 >    public void testWriteHoldingWriteLock4(boolean fair) {
716 >        final PublicReentrantReadWriteLock lock =
717 >            new PublicReentrantReadWriteLock(fair);
718 >        lock.writeLock().lock();
719          lock.writeLock().lock();
720 +        lock.writeLock().unlock();
721 +
722          Thread t1 = newStartedThread(new CheckedRunnable() {
723              public void realRun() {
724                  lock.writeLock().lock();
# Line 692 | Line 732 | public class ReentrantReadWriteLockTest
732  
733          waitForQueuedThread(lock, t1);
734          waitForQueuedThread(lock, t2);
735 <        assertWriteLockedBy(lock, Thread.currentThread());
735 >        assertWriteLockedByMoi(lock);
736          assertEquals(1, lock.getWriteHoldCount());
737          lock.writeLock().lock();
738 +        assertWriteLockedByMoi(lock);
739          assertEquals(2, lock.getWriteHoldCount());
740          lock.writeLock().unlock();
741 <        lock.writeLock().lock();
741 >        assertWriteLockedByMoi(lock);
742 >        assertEquals(1, lock.getWriteHoldCount());
743          lock.writeLock().unlock();
702        releaseWriteLock(lock);
744          awaitTermination(t1);
745          awaitTermination(t2);
746      }
# Line 707 | Line 748 | public class ReentrantReadWriteLockTest
748      /**
749       * Read tryLock succeeds if readlocked but not writelocked
750       */
751 <    public void testTryLockWhenReadLocked() throws InterruptedException {
752 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
751 >    public void testTryLockWhenReadLocked()      { testTryLockWhenReadLocked(false); }
752 >    public void testTryLockWhenReadLocked_fair() { testTryLockWhenReadLocked(true); }
753 >    public void testTryLockWhenReadLocked(boolean fair) {
754 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
755          lock.readLock().lock();
756          Thread t = newStartedThread(new CheckedRunnable() {
757              public void realRun() {
# Line 723 | Line 766 | public class ReentrantReadWriteLockTest
766      /**
767       * write tryLock fails when readlocked
768       */
769 <    public void testWriteTryLockWhenReadLocked() throws InterruptedException {
770 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
771 <        lock.readLock().lock();
772 <        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);
769 >    public void testWriteTryLockWhenReadLocked()      { testWriteTryLockWhenReadLocked(false); }
770 >    public void testWriteTryLockWhenReadLocked_fair() { testWriteTryLockWhenReadLocked(true); }
771 >    public void testWriteTryLockWhenReadLocked(boolean fair) {
772 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
773          lock.readLock().lock();
774          Thread t = newStartedThread(new CheckedRunnable() {
775              public void realRun() {
# Line 769 | Line 783 | public class ReentrantReadWriteLockTest
783      /**
784       * write timed tryLock times out if locked
785       */
786 <    public void testWriteTryLock_Timeout() throws InterruptedException {
787 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
786 >    public void testWriteTryLock_Timeout()      { testWriteTryLock_Timeout(false); }
787 >    public void testWriteTryLock_Timeout_fair() { testWriteTryLock_Timeout(true); }
788 >    public void testWriteTryLock_Timeout(boolean fair) {
789 >        final PublicReentrantReadWriteLock lock =
790 >            new PublicReentrantReadWriteLock(fair);
791 >        final long timeoutMillis = timeoutMillis();
792          lock.writeLock().lock();
793          Thread t = newStartedThread(new CheckedRunnable() {
794              public void realRun() throws InterruptedException {
795                  long startTime = System.nanoTime();
778                long timeoutMillis = 10;
796                  assertFalse(lock.writeLock().tryLock(timeoutMillis, MILLISECONDS));
797                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
798              }});
799  
800          awaitTermination(t);
801 <        assertTrue(lock.writeLock().isHeldByCurrentThread());
785 <        lock.writeLock().unlock();
801 >        releaseWriteLock(lock);
802      }
803  
804      /**
805       * read timed tryLock times out if write-locked
806       */
807 <    public void testReadTryLock_Timeout() throws InterruptedException {
808 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
807 >    public void testReadTryLock_Timeout()      { testReadTryLock_Timeout(false); }
808 >    public void testReadTryLock_Timeout_fair() { testReadTryLock_Timeout(true); }
809 >    public void testReadTryLock_Timeout(boolean fair) {
810 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
811          lock.writeLock().lock();
812          Thread t = newStartedThread(new CheckedRunnable() {
813              public void realRun() throws InterruptedException {
814                  long startTime = System.nanoTime();
815 <                long timeoutMillis = 10;
815 >                long timeoutMillis = timeoutMillis();
816                  assertFalse(lock.readLock().tryLock(timeoutMillis, MILLISECONDS));
817                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
818              }});
# Line 805 | Line 823 | public class ReentrantReadWriteLockTest
823      }
824  
825      /**
826 <     * write lockInterruptibly succeeds if lock free else is interruptible
826 >     * write lockInterruptibly succeeds if unlocked, else is interruptible
827       */
828 <    public void testWriteLockInterruptibly() throws InterruptedException {
829 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
830 <        lock.writeLock().lockInterruptibly();
828 >    public void testWriteLockInterruptibly()      { testWriteLockInterruptibly(false); }
829 >    public void testWriteLockInterruptibly_fair() { testWriteLockInterruptibly(true); }
830 >    public void testWriteLockInterruptibly(boolean fair) {
831 >        final PublicReentrantReadWriteLock lock =
832 >            new PublicReentrantReadWriteLock(fair);
833 >        try {
834 >            lock.writeLock().lockInterruptibly();
835 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
836          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
837              public void realRun() throws InterruptedException {
838                  lock.writeLock().lockInterruptibly();
# Line 817 | Line 840 | public class ReentrantReadWriteLockTest
840  
841          waitForQueuedThread(lock, t);
842          t.interrupt();
843 +        assertTrue(lock.writeLock().isHeldByCurrentThread());
844          awaitTermination(t);
845          releaseWriteLock(lock);
846      }
# Line 824 | Line 848 | public class ReentrantReadWriteLockTest
848      /**
849       * read lockInterruptibly succeeds if lock free else is interruptible
850       */
851 <    public void testReadLockInterruptibly() throws InterruptedException {
852 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
853 <        lock.writeLock().lockInterruptibly();
851 >    public void testReadLockInterruptibly()      { testReadLockInterruptibly(false); }
852 >    public void testReadLockInterruptibly_fair() { testReadLockInterruptibly(true); }
853 >    public void testReadLockInterruptibly(boolean fair) {
854 >        final PublicReentrantReadWriteLock lock =
855 >            new PublicReentrantReadWriteLock(fair);
856 >        try {
857 >            lock.readLock().lockInterruptibly();
858 >            lock.readLock().unlock();
859 >            lock.writeLock().lockInterruptibly();
860 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
861          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
862              public void realRun() throws InterruptedException {
863                  lock.readLock().lockInterruptibly();
# Line 841 | Line 872 | public class ReentrantReadWriteLockTest
872      /**
873       * Calling await without holding lock throws IllegalMonitorStateException
874       */
875 <    public void testAwait_IllegalMonitor() throws InterruptedException {
876 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
877 <        final Condition c = lock.writeLock().newCondition();
878 <        try {
879 <            c.await();
880 <            shouldThrow();
881 <        } catch (IllegalMonitorStateException success) {}
882 <        try {
883 <            c.await(LONG_DELAY_MS, MILLISECONDS);
884 <            shouldThrow();
885 <        } catch (IllegalMonitorStateException success) {}
886 <        try {
887 <            c.awaitNanos(100);
888 <            shouldThrow();
889 <        } catch (IllegalMonitorStateException success) {}
890 <        try {
860 <            c.awaitUninterruptibly();
861 <            shouldThrow();
862 <        } catch (IllegalMonitorStateException success) {}
875 >    public void testAwait_IMSE()      { testAwait_IMSE(false); }
876 >    public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
877 >    public void testAwait_IMSE(boolean fair) {
878 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
879 >        final Condition c = lock.writeLock().newCondition();
880 >        for (AwaitMethod awaitMethod : AwaitMethod.values()) {
881 >            long startTime = System.nanoTime();
882 >            try {
883 >                await(c, awaitMethod);
884 >                shouldThrow();
885 >            } catch (IllegalMonitorStateException success) {
886 >            } catch (InterruptedException fail) {
887 >                threadUnexpectedException(fail);
888 >            }
889 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
890 >        }
891      }
892  
893      /**
894       * Calling signal without holding lock throws IllegalMonitorStateException
895       */
896 <    public void testSignal_IllegalMonitor() {
897 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
896 >    public void testSignal_IMSE()      { testSignal_IMSE(false); }
897 >    public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
898 >    public void testSignal_IMSE(boolean fair) {
899 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
900          final Condition c = lock.writeLock().newCondition();
901          try {
902              c.signal();
# Line 877 | Line 907 | public class ReentrantReadWriteLockTest
907      /**
908       * Calling signalAll without holding lock throws IllegalMonitorStateException
909       */
910 <    public void testSignalAll_IllegalMonitor() {
911 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
910 >    public void testSignalAll_IMSE()      { testSignalAll_IMSE(false); }
911 >    public void testSignalAll_IMSE_fair() { testSignalAll_IMSE(true); }
912 >    public void testSignalAll_IMSE(boolean fair) {
913 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
914          final Condition c = lock.writeLock().newCondition();
915          try {
916              c.signalAll();
# Line 889 | Line 921 | public class ReentrantReadWriteLockTest
921      /**
922       * awaitNanos without a signal times out
923       */
924 <    public void testAwaitNanos_Timeout() throws InterruptedException {
925 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
924 >    public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
925 >    public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
926 >    public void testAwaitNanos_Timeout(boolean fair) {
927 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
928          final Condition c = lock.writeLock().newCondition();
929 +        final long timeoutMillis = timeoutMillis();
930          lock.writeLock().lock();
931 <        long startTime = System.nanoTime();
932 <        long timeoutMillis = 10;
933 <        long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
934 <        long nanosRemaining = c.awaitNanos(timeoutNanos);
935 <        assertTrue(nanosRemaining <= 0);
931 >        final long startTime = System.nanoTime();
932 >        final long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
933 >        try {
934 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
935 >            assertTrue(nanosRemaining <= 0);
936 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
937          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
938          lock.writeLock().unlock();
939      }
# Line 905 | Line 941 | public class ReentrantReadWriteLockTest
941      /**
942       * timed await without a signal times out
943       */
944 <    public void testAwait_Timeout() throws InterruptedException {
945 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
944 >    public void testAwait_Timeout()      { testAwait_Timeout(false); }
945 >    public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
946 >    public void testAwait_Timeout(boolean fair) {
947 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
948          final Condition c = lock.writeLock().newCondition();
949 +        final long timeoutMillis = timeoutMillis();
950          lock.writeLock().lock();
951 <        long startTime = System.nanoTime();
952 <        long timeoutMillis = 10;
953 <        assertFalse(c.await(timeoutMillis, MILLISECONDS));
951 >        final long startTime = System.nanoTime();
952 >        try {
953 >            assertFalse(c.await(timeoutMillis, MILLISECONDS));
954 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
955          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
956          lock.writeLock().unlock();
957      }
# Line 919 | Line 959 | public class ReentrantReadWriteLockTest
959      /**
960       * awaitUntil without a signal times out
961       */
962 <    public void testAwaitUntil_Timeout() throws InterruptedException {
963 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
966          final Condition c = lock.writeLock().newCondition();
967          lock.writeLock().lock();
968 <        long startTime = System.nanoTime();
969 <        long timeoutMillis = 10;
970 <        java.util.Date d = new java.util.Date();
971 <        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
972 <        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
968 >        // We shouldn't assume that nanoTime and currentTimeMillis
969 >        // use the same time source, so don't use nanoTime here.
970 >        final java.util.Date delayedDate = delayedDate(timeoutMillis());
971 >        try {
972 >            assertFalse(c.awaitUntil(delayedDate));
973 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
974 >        assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
975          lock.writeLock().unlock();
976      }
977  
978      /**
979       * await returns when signalled
980       */
981 <    public void testAwait() throws InterruptedException {
982 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
981 >    public void testAwait()      { testAwait(false); }
982 >    public void testAwait_fair() { testAwait(true); }
983 >    public void testAwait(boolean fair) {
984 >        final PublicReentrantReadWriteLock lock =
985 >            new PublicReentrantReadWriteLock(fair);
986          final Condition c = lock.writeLock().newCondition();
987          final CountDownLatch locked = new CountDownLatch(1);
988          Thread t = newStartedThread(new CheckedRunnable() {
# Line 946 | Line 993 | public class ReentrantReadWriteLockTest
993                  lock.writeLock().unlock();
994              }});
995  
996 <        locked.await();
996 >        await(locked);
997          lock.writeLock().lock();
998          assertHasWaiters(lock, c, t);
999          c.signal();
# Line 957 | Line 1004 | public class ReentrantReadWriteLockTest
1004      }
1005  
1006      /**
1007 <     * awaitUninterruptibly doesn't abort on interrupt
1007 >     * awaitUninterruptibly is uninterruptible
1008       */
1009 <    public void testAwaitUninterruptibly() throws InterruptedException {
1010 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1011 <        final Condition c = lock.writeLock().newCondition();
1012 <        final CountDownLatch locked = new CountDownLatch(1);
1013 <        Thread t = newStartedThread(new CheckedRunnable() {
1009 >    public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
1010 >    public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
1011 >    public void testAwaitUninterruptibly(boolean fair) {
1012 >        final Lock lock = new ReentrantReadWriteLock(fair).writeLock();
1013 >        final Condition condition = lock.newCondition();
1014 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
1015 >
1016 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1017              public void realRun() {
1018 <                lock.writeLock().lock();
1019 <                locked.countDown();
1020 <                c.awaitUninterruptibly();
1018 >                // Interrupt before awaitUninterruptibly
1019 >                lock.lock();
1020 >                pleaseInterrupt.countDown();
1021 >                Thread.currentThread().interrupt();
1022 >                condition.awaitUninterruptibly();
1023                  assertTrue(Thread.interrupted());
1024 <                lock.writeLock().unlock();
1024 >                lock.unlock();
1025              }});
1026  
1027 <        locked.await();
1028 <        lock.writeLock().lock();
1029 <        lock.writeLock().unlock();
1030 <        t.interrupt();
1031 <        long timeoutMillis = 10;
1032 <        assertThreadJoinTimesOut(t, timeoutMillis);
1033 <        lock.writeLock().lock();
1034 <        c.signal();
983 <        lock.writeLock().unlock();
984 <        awaitTermination(t);
985 <    }
986 <
987 <    /**
988 <     * await is interruptible
989 <     */
990 <    public void testAwait_Interrupt() throws InterruptedException {
991 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
992 <        final Condition c = lock.writeLock().newCondition();
993 <        final CountDownLatch locked = new CountDownLatch(1);
994 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
995 <            public void realRun() throws InterruptedException {
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 <                }
1027 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1028 >            public void realRun() {
1029 >                // Interrupt during awaitUninterruptibly
1030 >                lock.lock();
1031 >                pleaseInterrupt.countDown();
1032 >                condition.awaitUninterruptibly();
1033 >                assertTrue(Thread.interrupted());
1034 >                lock.unlock();
1035              }});
1036  
1037 <        locked.await();
1038 <        assertHasWaiters(lock, c, t);
1039 <        t.interrupt();
1040 <        awaitTermination(t);
1041 <        assertNotWriteLocked(lock);
1042 <    }
1043 <
1044 <    /**
1045 <     * awaitNanos is interruptible
1046 <     */
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 <            }});
1037 >        await(pleaseInterrupt);
1038 >        t2.interrupt();
1039 >        lock.lock();
1040 >        lock.unlock();
1041 >        assertThreadBlocks(t1, Thread.State.WAITING);
1042 >        assertThreadBlocks(t2, Thread.State.WAITING);
1043 >
1044 >        lock.lock();
1045 >        condition.signalAll();
1046 >        lock.unlock();
1047  
1048 <        locked.await();
1049 <        assertHasWaiters(lock, c, t);
1042 <        t.interrupt();
1043 <        awaitTermination(t);
1044 <        assertNotWriteLocked(lock);
1048 >        awaitTermination(t1);
1049 >        awaitTermination(t2);
1050      }
1051  
1052      /**
1053 <     * awaitUntil is interruptible
1053 >     * await/awaitNanos/awaitUntil is interruptible
1054       */
1055 <    public void testAwaitUntil_Interrupt() throws InterruptedException {
1056 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1055 >    public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
1056 >    public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
1057 >    public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
1058 >    public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
1059 >    public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
1060 >    public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
1061 >    public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
1062 >    public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
1063 >    public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
1064 >        final PublicReentrantReadWriteLock lock =
1065 >            new PublicReentrantReadWriteLock(fair);
1066          final Condition c = lock.writeLock().newCondition();
1067          final CountDownLatch locked = new CountDownLatch(1);
1068          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1069              public void realRun() throws InterruptedException {
1070                  lock.writeLock().lock();
1071 <                assertWriteLockedBy(lock, Thread.currentThread());
1071 >                assertWriteLockedByMoi(lock);
1072                  assertHasNoWaiters(lock, c);
1073                  locked.countDown();
1060                java.util.Date d = new java.util.Date();
1074                  try {
1075 <                    c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS));
1075 >                    await(c, awaitMethod);
1076                  } finally {
1077 <                    assertWriteLockedBy(lock, Thread.currentThread());
1077 >                    assertWriteLockedByMoi(lock);
1078                      assertHasNoWaiters(lock, c);
1079                      lock.writeLock().unlock();
1080                      assertFalse(Thread.interrupted());
1081                  }
1082              }});
1083  
1084 <        locked.await();
1084 >        await(locked);
1085          assertHasWaiters(lock, c, t);
1086          t.interrupt();
1087          awaitTermination(t);
# Line 1078 | Line 1091 | public class ReentrantReadWriteLockTest
1091      /**
1092       * signalAll wakes up all threads
1093       */
1094 <    public void testSignalAll() throws InterruptedException {
1095 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1094 >    public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
1095 >    public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
1096 >    public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
1097 >    public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
1098 >    public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
1099 >    public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
1100 >    public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
1101 >    public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
1102 >    public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
1103 >        final PublicReentrantReadWriteLock lock =
1104 >            new PublicReentrantReadWriteLock(fair);
1105          final Condition c = lock.writeLock().newCondition();
1106          final CountDownLatch locked = new CountDownLatch(2);
1107          final Lock writeLock = lock.writeLock();
1108 <        Thread t1 = newStartedThread(new CheckedRunnable() {
1108 >        class Awaiter extends CheckedRunnable {
1109              public void realRun() throws InterruptedException {
1110                  writeLock.lock();
1111                  locked.countDown();
1112 <                c.await();
1112 >                await(c, awaitMethod);
1113                  writeLock.unlock();
1114 <            }});
1114 >            }
1115 >        }
1116  
1117 <        Thread t2 = newStartedThread(new CheckedRunnable() {
1118 <            public void realRun() throws InterruptedException {
1096 <                writeLock.lock();
1097 <                locked.countDown();
1098 <                c.await();
1099 <                writeLock.unlock();
1100 <            }});
1117 >        Thread t1 = newStartedThread(new Awaiter());
1118 >        Thread t2 = newStartedThread(new Awaiter());
1119  
1120 <        locked.await();
1120 >        await(locked);
1121          writeLock.lock();
1122          assertHasWaiters(lock, c, t1, t2);
1123          c.signalAll();
# Line 1110 | Line 1128 | public class ReentrantReadWriteLockTest
1128      }
1129  
1130      /**
1131 <     * signal wakes up waiting threads in FIFO order.
1131 >     * signal wakes up waiting threads in FIFO order
1132       */
1133 <    public void testSignalWakesFifo() throws InterruptedException {
1134 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1133 >    public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1134 >    public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1135 >    public void testSignalWakesFifo(boolean fair) {
1136 >        final PublicReentrantReadWriteLock lock =
1137 >            new PublicReentrantReadWriteLock(fair);
1138          final Condition c = lock.writeLock().newCondition();
1139          final CountDownLatch locked1 = new CountDownLatch(1);
1140          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1126 | Line 1147 | public class ReentrantReadWriteLockTest
1147                  writeLock.unlock();
1148              }});
1149  
1150 <        locked1.await();
1150 >        await(locked1);
1151  
1152          Thread t2 = newStartedThread(new CheckedRunnable() {
1153              public void realRun() throws InterruptedException {
# Line 1136 | Line 1157 | public class ReentrantReadWriteLockTest
1157                  writeLock.unlock();
1158              }});
1159  
1160 <        locked2.await();
1160 >        await(locked2);
1161  
1162          writeLock.lock();
1163          assertHasWaiters(lock, c, t1, t2);
# Line 1157 | Line 1178 | public class ReentrantReadWriteLockTest
1178      /**
1179       * await after multiple reentrant locking preserves lock count
1180       */
1181 <    public void testAwaitLockCount() throws InterruptedException {
1182 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1181 >    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1182 >    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1183 >    public void testAwaitLockCount(boolean fair) {
1184 >        final PublicReentrantReadWriteLock lock =
1185 >            new PublicReentrantReadWriteLock(fair);
1186          final Condition c = lock.writeLock().newCondition();
1187          final CountDownLatch locked = new CountDownLatch(2);
1188          Thread t1 = newStartedThread(new CheckedRunnable() {
1189              public void realRun() throws InterruptedException {
1190                  lock.writeLock().lock();
1191 <                assertWriteLockedBy(lock, Thread.currentThread());
1191 >                assertWriteLockedByMoi(lock);
1192                  assertEquals(1, lock.writeLock().getHoldCount());
1193                  locked.countDown();
1194                  c.await();
1195 <                assertWriteLockedBy(lock, Thread.currentThread());
1195 >                assertWriteLockedByMoi(lock);
1196                  assertEquals(1, lock.writeLock().getHoldCount());
1197                  lock.writeLock().unlock();
1198              }});
# Line 1177 | Line 1201 | public class ReentrantReadWriteLockTest
1201              public void realRun() throws InterruptedException {
1202                  lock.writeLock().lock();
1203                  lock.writeLock().lock();
1204 <                assertWriteLockedBy(lock, Thread.currentThread());
1204 >                assertWriteLockedByMoi(lock);
1205                  assertEquals(2, lock.writeLock().getHoldCount());
1206                  locked.countDown();
1207                  c.await();
1208 <                assertWriteLockedBy(lock, Thread.currentThread());
1208 >                assertWriteLockedByMoi(lock);
1209                  assertEquals(2, lock.writeLock().getHoldCount());
1210                  lock.writeLock().unlock();
1211                  lock.writeLock().unlock();
1212              }});
1213  
1214 <        locked.await();
1214 >        await(locked);
1215          lock.writeLock().lock();
1216          assertHasWaiters(lock, c, t1, t2);
1217          c.signalAll();
# Line 1200 | Line 1224 | public class ReentrantReadWriteLockTest
1224      /**
1225       * A serialized lock deserializes as unlocked
1226       */
1227 <    public void testSerialization() throws Exception {
1228 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1229 <        l.readLock().lock();
1230 <        l.readLock().unlock();
1231 <
1232 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1233 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1234 <        out.writeObject(l);
1235 <        out.close();
1236 <
1237 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1238 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1239 <        ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1240 <        r.readLock().lock();
1241 <        r.readLock().unlock();
1227 >    public void testSerialization()      { testSerialization(false); }
1228 >    public void testSerialization_fair() { testSerialization(true); }
1229 >    public void testSerialization(boolean fair) {
1230 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1231 >        lock.writeLock().lock();
1232 >        lock.readLock().lock();
1233 >
1234 >        ReentrantReadWriteLock clone = serialClone(lock);
1235 >        assertEquals(lock.isFair(), clone.isFair());
1236 >        assertTrue(lock.isWriteLocked());
1237 >        assertFalse(clone.isWriteLocked());
1238 >        assertEquals(1, lock.getReadLockCount());
1239 >        assertEquals(0, clone.getReadLockCount());
1240 >        clone.writeLock().lock();
1241 >        clone.readLock().lock();
1242 >        assertTrue(clone.isWriteLocked());
1243 >        assertEquals(1, clone.getReadLockCount());
1244 >        clone.readLock().unlock();
1245 >        clone.writeLock().unlock();
1246 >        assertFalse(clone.isWriteLocked());
1247 >        assertEquals(1, lock.getReadLockCount());
1248 >        assertEquals(0, clone.getReadLockCount());
1249      }
1250  
1251      /**
1252       * hasQueuedThreads reports whether there are waiting threads
1253       */
1254 <    public void testHasQueuedThreads() throws InterruptedException {
1255 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1254 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
1255 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
1256 >    public void testHasQueuedThreads(boolean fair) {
1257 >        final PublicReentrantReadWriteLock lock =
1258 >            new PublicReentrantReadWriteLock(fair);
1259          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1260          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1261          assertFalse(lock.hasQueuedThreads());
# Line 1244 | Line 1278 | public class ReentrantReadWriteLockTest
1278      /**
1279       * hasQueuedThread(null) throws NPE
1280       */
1281 <    public void testHasQueuedThreadNPE() {
1282 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1281 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
1282 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
1283 >    public void testHasQueuedThreadNPE(boolean fair) {
1284 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1285          try {
1286              lock.hasQueuedThread(null);
1287              shouldThrow();
# Line 1253 | Line 1289 | public class ReentrantReadWriteLockTest
1289      }
1290  
1291      /**
1292 <     * hasQueuedThread reports whether a thread is queued.
1292 >     * hasQueuedThread reports whether a thread is queued
1293       */
1294 <    public void testHasQueuedThread() throws InterruptedException {
1295 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1294 >    public void testHasQueuedThread()      { testHasQueuedThread(false); }
1295 >    public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
1296 >    public void testHasQueuedThread(boolean fair) {
1297 >        final PublicReentrantReadWriteLock lock =
1298 >            new PublicReentrantReadWriteLock(fair);
1299          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1300          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1301          assertFalse(lock.hasQueuedThread(t1));
# Line 1283 | Line 1322 | public class ReentrantReadWriteLockTest
1322      /**
1323       * getQueueLength reports number of waiting threads
1324       */
1325 <    public void testGetQueueLength() throws InterruptedException {
1326 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1325 >    public void testGetQueueLength()      { testGetQueueLength(false); }
1326 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
1327 >    public void testGetQueueLength(boolean fair) {
1328 >        final PublicReentrantReadWriteLock lock =
1329 >            new PublicReentrantReadWriteLock(fair);
1330          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1331          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1332          assertEquals(0, lock.getQueueLength());
# Line 1306 | Line 1348 | public class ReentrantReadWriteLockTest
1348      /**
1349       * getQueuedThreads includes waiting threads
1350       */
1351 <    public void testGetQueuedThreads() throws InterruptedException {
1352 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1351 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
1352 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
1353 >    public void testGetQueuedThreads(boolean fair) {
1354 >        final PublicReentrantReadWriteLock lock =
1355 >            new PublicReentrantReadWriteLock(fair);
1356          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1357          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1358          assertTrue(lock.getQueuedThreads().isEmpty());
# Line 1335 | Line 1380 | public class ReentrantReadWriteLockTest
1380      /**
1381       * hasWaiters throws NPE if null
1382       */
1383 <    public void testHasWaitersNPE() {
1384 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1383 >    public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
1384 >    public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
1385 >    public void testHasWaitersNPE(boolean fair) {
1386 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1387          try {
1388              lock.hasWaiters(null);
1389              shouldThrow();
# Line 1346 | Line 1393 | public class ReentrantReadWriteLockTest
1393      /**
1394       * getWaitQueueLength throws NPE if null
1395       */
1396 <    public void testGetWaitQueueLengthNPE() {
1397 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1396 >    public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
1397 >    public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
1398 >    public void testGetWaitQueueLengthNPE(boolean fair) {
1399 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1400          try {
1401              lock.getWaitQueueLength(null);
1402              shouldThrow();
# Line 1357 | Line 1406 | public class ReentrantReadWriteLockTest
1406      /**
1407       * getWaitingThreads throws NPE if null
1408       */
1409 <    public void testGetWaitingThreadsNPE() {
1410 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1409 >    public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
1410 >    public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
1411 >    public void testGetWaitingThreadsNPE(boolean fair) {
1412 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(fair);
1413          try {
1414              lock.getWaitingThreads(null);
1415              shouldThrow();
# Line 1368 | Line 1419 | public class ReentrantReadWriteLockTest
1419      /**
1420       * hasWaiters throws IllegalArgumentException if not owned
1421       */
1422 <    public void testHasWaitersIAE() {
1423 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1422 >    public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
1423 >    public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
1424 >    public void testHasWaitersIAE(boolean fair) {
1425 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1426          final Condition c = lock.writeLock().newCondition();
1427 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1427 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1428          try {
1429              lock2.hasWaiters(c);
1430              shouldThrow();
# Line 1381 | Line 1434 | public class ReentrantReadWriteLockTest
1434      /**
1435       * hasWaiters throws IllegalMonitorStateException if not locked
1436       */
1437 <    public void testHasWaitersIMSE() {
1438 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1437 >    public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
1438 >    public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
1439 >    public void testHasWaitersIMSE(boolean fair) {
1440 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1441          final Condition c = lock.writeLock().newCondition();
1442          try {
1443              lock.hasWaiters(c);
# Line 1393 | Line 1448 | public class ReentrantReadWriteLockTest
1448      /**
1449       * getWaitQueueLength throws IllegalArgumentException if not owned
1450       */
1451 <    public void testGetWaitQueueLengthIAE() {
1452 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1451 >    public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
1452 >    public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
1453 >    public void testGetWaitQueueLengthIAE(boolean fair) {
1454 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1455          final Condition c = lock.writeLock().newCondition();
1456 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1456 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1457          try {
1458              lock2.getWaitQueueLength(c);
1459              shouldThrow();
# Line 1406 | Line 1463 | public class ReentrantReadWriteLockTest
1463      /**
1464       * getWaitQueueLength throws IllegalMonitorStateException if not locked
1465       */
1466 <    public void testGetWaitQueueLengthIMSE() {
1467 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1466 >    public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
1467 >    public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
1468 >    public void testGetWaitQueueLengthIMSE(boolean fair) {
1469 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1470          final Condition c = lock.writeLock().newCondition();
1471          try {
1472              lock.getWaitQueueLength(c);
# Line 1418 | Line 1477 | public class ReentrantReadWriteLockTest
1477      /**
1478       * getWaitingThreads throws IllegalArgumentException if not owned
1479       */
1480 <    public void testGetWaitingThreadsIAE() {
1481 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1480 >    public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
1481 >    public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
1482 >    public void testGetWaitingThreadsIAE(boolean fair) {
1483 >        final PublicReentrantReadWriteLock lock =
1484 >            new PublicReentrantReadWriteLock(fair);
1485          final Condition c = lock.writeLock().newCondition();
1486 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1486 >        final PublicReentrantReadWriteLock lock2 =
1487 >            new PublicReentrantReadWriteLock(fair);
1488          try {
1489              lock2.getWaitingThreads(c);
1490              shouldThrow();
# Line 1431 | Line 1494 | public class ReentrantReadWriteLockTest
1494      /**
1495       * getWaitingThreads throws IllegalMonitorStateException if not locked
1496       */
1497 <    public void testGetWaitingThreadsIMSE() {
1498 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1497 >    public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
1498 >    public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
1499 >    public void testGetWaitingThreadsIMSE(boolean fair) {
1500 >        final PublicReentrantReadWriteLock lock =
1501 >            new PublicReentrantReadWriteLock(fair);
1502          final Condition c = lock.writeLock().newCondition();
1503          try {
1504              lock.getWaitingThreads(c);
# Line 1443 | Line 1509 | public class ReentrantReadWriteLockTest
1509      /**
1510       * hasWaiters returns true when a thread is waiting, else false
1511       */
1512 <    public void testHasWaiters() throws InterruptedException {
1513 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1512 >    public void testHasWaiters()      { testHasWaiters(false); }
1513 >    public void testHasWaiters_fair() { testHasWaiters(true); }
1514 >    public void testHasWaiters(boolean fair) {
1515 >        final PublicReentrantReadWriteLock lock =
1516 >            new PublicReentrantReadWriteLock(fair);
1517          final Condition c = lock.writeLock().newCondition();
1518          final CountDownLatch locked = new CountDownLatch(1);
1519          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1459 | Line 1528 | public class ReentrantReadWriteLockTest
1528                  lock.writeLock().unlock();
1529              }});
1530  
1531 <        locked.await();
1531 >        await(locked);
1532          lock.writeLock().lock();
1533          assertHasWaiters(lock, c, t);
1534          assertTrue(lock.hasWaiters(c));
# Line 1474 | Line 1543 | public class ReentrantReadWriteLockTest
1543      /**
1544       * getWaitQueueLength returns number of waiting threads
1545       */
1546 <    public void testGetWaitQueueLength() throws InterruptedException {
1547 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1546 >    public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
1547 >    public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
1548 >    public void testGetWaitQueueLength(boolean fair) {
1549 >        final PublicReentrantReadWriteLock lock =
1550 >            new PublicReentrantReadWriteLock(fair);
1551          final Condition c = lock.writeLock().newCondition();
1552          final CountDownLatch locked = new CountDownLatch(1);
1553          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1487 | Line 1559 | public class ReentrantReadWriteLockTest
1559                  lock.writeLock().unlock();
1560              }});
1561  
1562 <        locked.await();
1562 >        await(locked);
1563          lock.writeLock().lock();
1564          assertHasWaiters(lock, c, t);
1565          assertEquals(1, lock.getWaitQueueLength(c));
# Line 1501 | Line 1573 | public class ReentrantReadWriteLockTest
1573      /**
1574       * getWaitingThreads returns only and all waiting threads
1575       */
1576 <    public void testGetWaitingThreads() throws InterruptedException {
1577 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1576 >    public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
1577 >    public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
1578 >    public void testGetWaitingThreads(boolean fair) {
1579 >        final PublicReentrantReadWriteLock lock =
1580 >            new PublicReentrantReadWriteLock(fair);
1581          final Condition c = lock.writeLock().newCondition();
1582          final CountDownLatch locked1 = new CountDownLatch(1);
1583          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1529 | Line 1604 | public class ReentrantReadWriteLockTest
1604          lock.writeLock().unlock();
1605  
1606          t1.start();
1607 <        locked1.await();
1607 >        await(locked1);
1608          t2.start();
1609 <        locked2.await();
1609 >        await(locked2);
1610  
1611          lock.writeLock().lock();
1612          assertTrue(lock.hasWaiters(c));
# Line 1551 | Line 1626 | public class ReentrantReadWriteLockTest
1626      /**
1627       * toString indicates current lock state
1628       */
1629 <    public void testToString() {
1630 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1631 <        String us = lock.toString();
1632 <        assertTrue(us.indexOf("Write locks = 0") >= 0);
1633 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1634 <        lock.writeLock().lock();
1635 <        String ws = lock.toString();
1636 <        assertTrue(ws.indexOf("Write locks = 1") >= 0);
1637 <        assertTrue(ws.indexOf("Read locks = 0") >= 0);
1629 >    public void testToString()      { testToString(false); }
1630 >    public void testToString_fair() { testToString(true); }
1631 >    public void testToString(boolean fair) {
1632 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1633 >        assertTrue(lock.toString().contains("Write locks = 0"));
1634 >        assertTrue(lock.toString().contains("Read locks = 0"));
1635 >        lock.writeLock().lock();
1636 >        assertTrue(lock.toString().contains("Write locks = 1"));
1637 >        assertTrue(lock.toString().contains("Read locks = 0"));
1638 >        lock.writeLock().lock();
1639 >        assertTrue(lock.toString().contains("Write locks = 2"));
1640 >        assertTrue(lock.toString().contains("Read locks = 0"));
1641 >        lock.writeLock().unlock();
1642          lock.writeLock().unlock();
1643          lock.readLock().lock();
1644 +        assertTrue(lock.toString().contains("Write locks = 0"));
1645 +        assertTrue(lock.toString().contains("Read locks = 1"));
1646          lock.readLock().lock();
1647 <        String rs = lock.toString();
1648 <        assertTrue(rs.indexOf("Write locks = 0") >= 0);
1568 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1647 >        assertTrue(lock.toString().contains("Write locks = 0"));
1648 >        assertTrue(lock.toString().contains("Read locks = 2"));
1649      }
1650  
1651      /**
1652       * readLock.toString indicates current lock state
1653       */
1654 <    public void testReadLockToString() {
1655 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1656 <        String us = lock.readLock().toString();
1657 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1654 >    public void testReadLockToString()      { testReadLockToString(false); }
1655 >    public void testReadLockToString_fair() { testReadLockToString(true); }
1656 >    public void testReadLockToString(boolean fair) {
1657 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1658 >        assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1659          lock.readLock().lock();
1660 +        assertTrue(lock.readLock().toString().contains("Read locks = 1"));
1661          lock.readLock().lock();
1662 <        String rs = lock.readLock().toString();
1663 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1662 >        assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1663 >        lock.readLock().unlock();
1664 >        assertTrue(lock.readLock().toString().contains("Read locks = 1"));
1665 >        lock.readLock().unlock();
1666 >        assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1667      }
1668  
1669      /**
1670       * writeLock.toString indicates current lock state
1671       */
1672 <    public void testWriteLockToString() {
1673 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1674 <        String us = lock.writeLock().toString();
1675 <        assertTrue(us.indexOf("Unlocked") >= 0);
1672 >    public void testWriteLockToString()      { testWriteLockToString(false); }
1673 >    public void testWriteLockToString_fair() { testWriteLockToString(true); }
1674 >    public void testWriteLockToString(boolean fair) {
1675 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1676 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1677          lock.writeLock().lock();
1678 <        String ls = lock.writeLock().toString();
1679 <        assertTrue(ls.indexOf("Locked") >= 0);
1678 >        assertTrue(lock.writeLock().toString().contains("Locked by"));
1679 >        lock.writeLock().unlock();
1680 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1681      }
1682  
1683   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines