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.56 by jsr166, Tue May 3 06:08:49 2011 UTC vs.
Revision 1.79 by jsr166, Sun Jan 1 20:34:39 2017 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.concurrent.atomic.AtomicBoolean;
11 import java.util.concurrent.locks.*;
12 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.io.*;
11 < import java.util.*;
10 >
11 > import java.util.Arrays;
12 > import java.util.Collection;
13 > import java.util.HashSet;
14 > import java.util.concurrent.CountDownLatch;
15 > import java.util.concurrent.atomic.AtomicBoolean;
16 > import java.util.concurrent.locks.Condition;
17 > import java.util.concurrent.locks.Lock;
18 > import java.util.concurrent.locks.ReentrantReadWriteLock;
19 >
20 > import junit.framework.AssertionFailedError;
21 > import junit.framework.Test;
22 > import junit.framework.TestSuite;
23  
24   public class ReentrantReadWriteLockTest extends JSR166TestCase {
25      public static void main(String[] args) {
26 <        junit.textui.TestRunner.run(suite());
26 >        main(suite(), args);
27      }
28      public static Test suite() {
29          return new TestSuite(ReentrantReadWriteLockTest.class);
# Line 50 | Line 57 | public class ReentrantReadWriteLockTest
57       */
58      static class PublicReentrantReadWriteLock extends ReentrantReadWriteLock {
59          PublicReentrantReadWriteLock() { super(); }
60 +        PublicReentrantReadWriteLock(boolean fair) { super(fair); }
61 +        public Thread getOwner() {
62 +            return super.getOwner();
63 +        }
64          public Collection<Thread> getQueuedThreads() {
65              return super.getQueuedThreads();
66          }
# Line 61 | Line 72 | public class ReentrantReadWriteLockTest
72      /**
73       * Releases write lock, checking that it had a hold count of 1.
74       */
75 <    void releaseWriteLock(ReentrantReadWriteLock lock) {
75 >    void releaseWriteLock(PublicReentrantReadWriteLock lock) {
76          ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
77 <        assertTrue(writeLock.isHeldByCurrentThread());
77 >        assertWriteLockedByMoi(lock);
78 >        assertEquals(1, lock.getWriteHoldCount());
79          writeLock.unlock();
80 <        assertFalse(writeLock.isHeldByCurrentThread());
80 >        assertNotWriteLocked(lock);
81      }
82  
83      /**
84       * Spin-waits until lock.hasQueuedThread(t) becomes true.
85       */
86 <    void waitForQueuedThread(ReentrantReadWriteLock lock, Thread t) {
86 >    void waitForQueuedThread(PublicReentrantReadWriteLock lock, Thread t) {
87          long startTime = System.nanoTime();
88          while (!lock.hasQueuedThread(t)) {
89              if (millisElapsedSince(startTime) > LONG_DELAY_MS)
90 <                throw new AssertionError("timed out");
90 >                throw new AssertionFailedError("timed out");
91              Thread.yield();
92          }
93 +        assertTrue(t.isAlive());
94 +        assertNotSame(t, lock.getOwner());
95      }
96  
97      /**
98       * Checks that lock is not write-locked.
99       */
100 <    void assertNotWriteLocked(ReentrantReadWriteLock lock) {
100 >    void assertNotWriteLocked(PublicReentrantReadWriteLock lock) {
101          assertFalse(lock.isWriteLocked());
102          assertFalse(lock.isWriteLockedByCurrentThread());
103 +        assertFalse(lock.writeLock().isHeldByCurrentThread());
104          assertEquals(0, lock.getWriteHoldCount());
105 +        assertEquals(0, lock.writeLock().getHoldCount());
106 +        assertNull(lock.getOwner());
107 +    }
108 +
109 +    /**
110 +     * Checks that lock is write-locked by the given thread.
111 +     */
112 +    void assertWriteLockedBy(PublicReentrantReadWriteLock lock, Thread t) {
113 +        assertTrue(lock.isWriteLocked());
114 +        assertSame(t, lock.getOwner());
115 +        assertEquals(t == Thread.currentThread(),
116 +                     lock.isWriteLockedByCurrentThread());
117 +        assertEquals(t == Thread.currentThread(),
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      /**
# Line 111 | Line 152 | public class ReentrantReadWriteLockTest
152          lock.writeLock().unlock();
153      }
154  
155 +    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
156 +
157      /**
158 <     * Constructor sets given fairness, and is in unlocked state
158 >     * Awaits condition "indefinitely" using the specified AwaitMethod.
159       */
160 <    public void testConstructor() {
161 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
162 <        assertFalse(rl.isFair());
163 <        assertFalse(rl.isWriteLocked());
164 <        assertEquals(0, rl.getReadLockCount());
165 <        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
166 <        assertTrue(r2.isFair());
167 <        assertFalse(r2.isWriteLocked());
168 <        assertEquals(0, r2.getReadLockCount());
169 <        ReentrantReadWriteLock r3 = new ReentrantReadWriteLock(false);
170 <        assertFalse(r3.isFair());
171 <        assertFalse(r3.isWriteLocked());
172 <        assertEquals(0, r3.getReadLockCount());
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 <     * write-locking and read-locking an unlocked lock succeed
185 >     * Constructor sets given fairness, and is in unlocked state
186       */
187 <    public void testLock() {
188 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
189 <        rl.writeLock().lock();
190 <        assertTrue(rl.isWriteLocked());
191 <        assertTrue(rl.isWriteLockedByCurrentThread());
192 <        assertTrue(rl.writeLock().isHeldByCurrentThread());
193 <        assertEquals(0, rl.getReadLockCount());
194 <        rl.writeLock().unlock();
195 <        assertFalse(rl.isWriteLocked());
196 <        assertFalse(rl.isWriteLockedByCurrentThread());
197 <        assertFalse(rl.writeLock().isHeldByCurrentThread());
198 <        assertEquals(0, rl.getReadLockCount());
199 <        rl.readLock().lock();
200 <        assertFalse(rl.isWriteLocked());
201 <        assertFalse(rl.isWriteLockedByCurrentThread());
202 <        assertEquals(1, rl.getReadLockCount());
203 <        rl.readLock().unlock();
152 <        assertFalse(rl.isWriteLocked());
153 <        assertFalse(rl.isWriteLockedByCurrentThread());
154 <        assertEquals(0, rl.getReadLockCount());
187 >    public void testConstructor() {
188 >        PublicReentrantReadWriteLock lock;
189 >
190 >        lock = new PublicReentrantReadWriteLock();
191 >        assertFalse(lock.isFair());
192 >        assertNotWriteLocked(lock);
193 >        assertEquals(0, lock.getReadLockCount());
194 >
195 >        lock = new PublicReentrantReadWriteLock(true);
196 >        assertTrue(lock.isFair());
197 >        assertNotWriteLocked(lock);
198 >        assertEquals(0, lock.getReadLockCount());
199 >
200 >        lock = new PublicReentrantReadWriteLock(false);
201 >        assertFalse(lock.isFair());
202 >        assertNotWriteLocked(lock);
203 >        assertEquals(0, lock.getReadLockCount());
204      }
205  
206      /**
207 <     * locking an unlocked fair lock succeeds
208 <     */
209 <    public void testFairLock() {
210 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
211 <        rl.writeLock().lock();
212 <        assertTrue(rl.isWriteLocked());
213 <        assertTrue(rl.isWriteLockedByCurrentThread());
214 <        assertTrue(rl.writeLock().isHeldByCurrentThread());
215 <        assertEquals(0, rl.getReadLockCount());
216 <        rl.writeLock().unlock();
217 <        assertFalse(rl.isWriteLocked());
218 <        assertFalse(rl.isWriteLockedByCurrentThread());
219 <        assertFalse(rl.writeLock().isHeldByCurrentThread());
220 <        assertEquals(0, rl.getReadLockCount());
221 <        rl.readLock().lock();
222 <        assertFalse(rl.isWriteLocked());
223 <        assertFalse(rl.isWriteLockedByCurrentThread());
224 <        assertEquals(1, rl.getReadLockCount());
225 <        rl.readLock().unlock();
177 <        assertFalse(rl.isWriteLocked());
178 <        assertFalse(rl.isWriteLockedByCurrentThread());
179 <        assertEquals(0, rl.getReadLockCount());
207 >     * write-locking and read-locking an unlocked lock succeed
208 >     */
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 >        assertWriteLockedByMoi(lock);
217 >        lock.writeLock().unlock();
218 >        assertNotWriteLocked(lock);
219 >        assertEquals(0, lock.getReadLockCount());
220 >        lock.readLock().lock();
221 >        assertNotWriteLocked(lock);
222 >        assertEquals(1, lock.getReadLockCount());
223 >        lock.readLock().unlock();
224 >        assertNotWriteLocked(lock);
225 >        assertEquals(0, lock.getReadLockCount());
226      }
227  
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 rl = 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 <            rl.writeLock().unlock();
287 >            lock.writeLock().unlock();
288              shouldThrow();
289          } catch (IllegalMonitorStateException success) {}
290      }
# Line 238 | Line 292 | public class ReentrantReadWriteLockTest
292      /**
293       * read-unlocking an unlocked lock throws IllegalMonitorStateException
294       */
295 <    public void testReadUnlock_IllegalMonitorStateException() {
296 <        ReentrantReadWriteLock rl = 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 <            rl.readLock().unlock();
300 >            lock.readLock().unlock();
301              shouldThrow();
302          } catch (IllegalMonitorStateException success) {}
303      }
# Line 249 | Line 305 | public class ReentrantReadWriteLockTest
305      /**
306       * write-lockInterruptibly is interruptible
307       */
308 <    public void testWriteLockInterruptibly_Interrupted() throws Exception {
309 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 266 | Line 325 | public class ReentrantReadWriteLockTest
325      /**
326       * timed write-tryLock is interruptible
327       */
328 <    public void testWriteTryLock_Interrupted() throws InterruptedException {
329 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 {
336 <                lock.writeLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
336 >                lock.writeLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
337              }});
338  
339          waitForQueuedThread(lock, t);
# Line 283 | Line 345 | public class ReentrantReadWriteLockTest
345      /**
346       * read-lockInterruptibly is interruptible
347       */
348 <    public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
349 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 300 | Line 365 | public class ReentrantReadWriteLockTest
365      /**
366       * timed read-tryLock is interruptible
367       */
368 <    public void testReadTryLock_Interrupted() throws InterruptedException {
369 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 {
376 <                lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
376 >                lock.readLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
377              }});
378  
379          waitForQueuedThread(lock, t);
# Line 315 | 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 ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 332 | Line 419 | public class ReentrantReadWriteLockTest
419      /**
420       * read-tryLock fails if locked
421       */
422 <    public void testReadTryLockWhenLocked() throws InterruptedException {
423 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 347 | 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 361 | Line 457 | public class ReentrantReadWriteLockTest
457      }
458  
459      /**
460 <     * A writelock succeeds only after reading threads unlock
460 >     * A writelock succeeds only after a reading thread unlocks
461       */
462 <    public void testWriteAfterMultipleReadLocks() throws InterruptedException {
463 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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();
468 <        Thread t1 = newStartedThread(new CheckedRunnable() {
370 <            public void realRun() {
371 <                lock.readLock().lock();
372 <                lock.readLock().unlock();
373 <            }});
374 <        Thread t2 = newStartedThread(new CheckedRunnable() {
468 >        Thread t = newStartedThread(new CheckedRunnable() {
469              public void realRun() {
470 +                assertEquals(1, lock.getReadLockCount());
471                  lock.writeLock().lock();
472 +                assertEquals(0, lock.getReadLockCount());
473                  lock.writeLock().unlock();
474              }});
475 <
380 <        awaitTermination(t1);
381 <        waitForQueuedThread(lock, t2);
475 >        waitForQueuedThread(lock, t);
476          assertNotWriteLocked(lock);
477 +        assertEquals(1, lock.getReadLockCount());
478          lock.readLock().unlock();
479 <        awaitTermination(t2);
479 >        assertEquals(0, lock.getReadLockCount());
480 >        awaitTermination(t);
481 >        assertNotWriteLocked(lock);
482      }
483  
484      /**
485 <     * Readlocks succeed only after a writing thread unlocks
485 >     * A writelock succeeds only after reading threads unlock
486       */
487 <    public void testReadAfterWriteLock() throws InterruptedException {
488 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
489 <        lock.writeLock().lock();
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() {
495              public void realRun() {
496                  lock.readLock().lock();
497 +                assertEquals(3, lock.getReadLockCount());
498                  lock.readLock().unlock();
499              }});
500 +        awaitTermination(t1);
501 +
502          Thread t2 = newStartedThread(new CheckedRunnable() {
503              public void realRun() {
504 <                lock.readLock().lock();
505 <                lock.readLock().unlock();
504 >                assertEquals(2, lock.getReadLockCount());
505 >                lock.writeLock().lock();
506 >                assertEquals(0, lock.getReadLockCount());
507 >                lock.writeLock().unlock();
508              }});
403
404        waitForQueuedThread(lock, t1);
509          waitForQueuedThread(lock, t2);
510 <        releaseWriteLock(lock);
511 <        awaitTermination(t1);
510 >        assertNotWriteLocked(lock);
511 >        assertEquals(2, lock.getReadLockCount());
512 >        lock.readLock().unlock();
513 >        lock.readLock().unlock();
514 >        assertEquals(0, lock.getReadLockCount());
515          awaitTermination(t2);
516 +        assertNotWriteLocked(lock);
517      }
518  
519      /**
520 <     * Read trylock succeeds if write locked by current thread
520 >     * A thread that tries to acquire a fair read lock (non-reentrantly)
521 >     * will block if there is a waiting writer thread
522       */
523 <    public void testReadHoldingWriteLock() {
524 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
525 <        lock.writeLock().lock();
526 <        assertTrue(lock.readLock().tryLock());
418 <        lock.readLock().unlock();
419 <        lock.writeLock().unlock();
420 <    }
523 >    public void testReaderWriterReaderFairFifo() {
524 >        final PublicReentrantReadWriteLock lock =
525 >            new PublicReentrantReadWriteLock(true);
526 >        final AtomicBoolean t1GotLock = new AtomicBoolean(false);
527  
422    /**
423     * Read lock succeeds if write locked by current thread even if
424     * other threads are waiting for readlock
425     */
426    public void testReadHoldingWriteLock2() throws InterruptedException {
427        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
428        lock.writeLock().lock();
528          lock.readLock().lock();
430        lock.readLock().unlock();
431
529          Thread t1 = newStartedThread(new CheckedRunnable() {
530              public void realRun() {
531 <                lock.readLock().lock();
532 <                lock.readLock().unlock();
531 >                assertEquals(1, lock.getReadLockCount());
532 >                lock.writeLock().lock();
533 >                assertEquals(0, lock.getReadLockCount());
534 >                t1GotLock.set(true);
535 >                lock.writeLock().unlock();
536              }});
537 +        waitForQueuedThread(lock, t1);
538 +
539          Thread t2 = newStartedThread(new CheckedRunnable() {
540              public void realRun() {
541 +                assertEquals(1, lock.getReadLockCount());
542                  lock.readLock().lock();
543 +                assertEquals(1, lock.getReadLockCount());
544 +                assertTrue(t1GotLock.get());
545                  lock.readLock().unlock();
546              }});
442
443        waitForQueuedThread(lock, t1);
547          waitForQueuedThread(lock, t2);
548 <        assertTrue(lock.isWriteLockedByCurrentThread());
549 <        lock.readLock().lock();
548 >        assertTrue(t1.isAlive());
549 >        assertNotWriteLocked(lock);
550 >        assertEquals(1, lock.getReadLockCount());
551          lock.readLock().unlock();
448        releaseWriteLock(lock);
552          awaitTermination(t1);
553          awaitTermination(t2);
554 +        assertNotWriteLocked(lock);
555      }
556  
557      /**
558 <     * Read lock succeeds if write locked by current thread even if
455 <     * other threads are waiting for writelock
558 >     * Readlocks succeed only after a writing thread unlocks
559       */
560 <    public void testReadHoldingWriteLock3() throws InterruptedException {
561 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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();
460        lock.readLock().lock();
461        lock.readLock().unlock();
462
566          Thread t1 = newStartedThread(new CheckedRunnable() {
567              public void realRun() {
568 <                lock.writeLock().lock();
569 <                lock.writeLock().unlock();
568 >                lock.readLock().lock();
569 >                lock.readLock().unlock();
570              }});
571          Thread t2 = newStartedThread(new CheckedRunnable() {
572              public void realRun() {
573 <                lock.writeLock().lock();
574 <                lock.writeLock().unlock();
573 >                lock.readLock().lock();
574 >                lock.readLock().unlock();
575              }});
576  
577          waitForQueuedThread(lock, t1);
578          waitForQueuedThread(lock, t2);
476        assertTrue(lock.isWriteLockedByCurrentThread());
477        lock.readLock().lock();
478        lock.readLock().unlock();
579          releaseWriteLock(lock);
580          awaitTermination(t1);
581          awaitTermination(t2);
582      }
583  
584      /**
585 <     * Write lock succeeds if write locked by current thread even if
486 <     * other threads are waiting for writelock
585 >     * Read trylock succeeds if write locked by current thread
586       */
587 <    public void testWriteHoldingWriteLock4() throws InterruptedException {
588 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
589 <        lock.writeLock().lock();
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();
594          lock.writeLock().unlock();
595 +    }
596 +
597 +    /**
598 +     * Read trylock succeeds (barging) even in the presence of waiting
599 +     * readers and/or writers
600 +     */
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();
607  
608          Thread t1 = newStartedThread(new CheckedRunnable() {
609              public void realRun() {
610                  lock.writeLock().lock();
611                  lock.writeLock().unlock();
612              }});
613 +
614 +        waitForQueuedThread(lock, t1);
615 +
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);
507 <        assertTrue(lock.isWriteLockedByCurrentThread());
508 <        assertEquals(1, lock.getWriteHoldCount());
509 <        lock.writeLock().lock();
510 <        assertTrue(lock.isWriteLockedByCurrentThread());
511 <        assertEquals(2, lock.getWriteHoldCount());
512 <        lock.writeLock().unlock();
513 <        releaseWriteLock(lock);
514 <        awaitTermination(t1);
515 <        awaitTermination(t2);
516 <    }
622 >        if (fair)
623 >            waitForQueuedThread(lock, t2);
624  
625 <    /**
626 <     * Fair Read trylock succeeds if write locked by current thread
627 <     */
628 <    public void testReadHoldingWriteLockFair() {
629 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
630 <        lock.writeLock().lock();
631 <        assertTrue(lock.readLock().tryLock());
625 >        Thread t3 = newStartedThread(new CheckedRunnable() {
626 >            public void realRun() {
627 >                lock.readLock().tryLock();
628 >                lock.readLock().unlock();
629 >            }});
630 >
631 >        assertTrue(lock.getReadLockCount() > 0);
632 >        awaitTermination(t3);
633 >        assertTrue(t1.isAlive());
634 >        if (fair) assertTrue(t2.isAlive());
635          lock.readLock().unlock();
636 <        lock.writeLock().unlock();
636 >        awaitTermination(t1);
637 >        awaitTermination(t2);
638      }
639  
640      /**
641 <     * 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 ReentrantReadWriteLock lock = new ReentrantReadWriteLock(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 549 | Line 663 | public class ReentrantReadWriteLockTest
663  
664          waitForQueuedThread(lock, t1);
665          waitForQueuedThread(lock, t2);
666 <        assertTrue(lock.isWriteLockedByCurrentThread());
666 >        assertWriteLockedByMoi(lock);
667          lock.readLock().lock();
668          lock.readLock().unlock();
669          releaseWriteLock(lock);
# Line 558 | 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 ReentrantReadWriteLock lock = new ReentrantReadWriteLock(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 580 | Line 697 | public class ReentrantReadWriteLockTest
697  
698          waitForQueuedThread(lock, t1);
699          waitForQueuedThread(lock, t2);
700 <        assertTrue(lock.isWriteLockedByCurrentThread());
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 ReentrantReadWriteLock lock = new ReentrantReadWriteLock(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 608 | Line 732 | public class ReentrantReadWriteLockTest
732  
733          waitForQueuedThread(lock, t1);
734          waitForQueuedThread(lock, t2);
735 <        assertTrue(lock.isWriteLockedByCurrentThread());
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();
618        releaseWriteLock(lock);
744          awaitTermination(t1);
745          awaitTermination(t2);
746      }
# Line 623 | 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 639 | 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() {
646 <            public void realRun() {
647 <                assertFalse(lock.writeLock().tryLock());
648 <            }});
649 <
650 <        awaitTermination(t);
651 <        lock.readLock().unlock();
652 <    }
653 <
654 <    /**
655 <     * Fair Read tryLock succeeds if readlocked but not writelocked
656 <     */
657 <    public void testTryLockWhenReadLockedFair() throws InterruptedException {
658 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
659 <        lock.readLock().lock();
660 <        Thread t = newStartedThread(new CheckedRunnable() {
661 <            public void realRun() {
662 <                assertTrue(lock.readLock().tryLock());
663 <                lock.readLock().unlock();
664 <            }});
665 <
666 <        awaitTermination(t);
667 <        lock.readLock().unlock();
668 <    }
669 <
670 <    /**
671 <     * Fair write tryLock fails when readlocked
672 <     */
673 <    public void testWriteTryLockWhenReadLockedFair() throws InterruptedException {
674 <        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 685 | 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 <                assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
795 >                long startTime = System.nanoTime();
796 >                assertFalse(lock.writeLock().tryLock(timeoutMillis, MILLISECONDS));
797 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
798              }});
799  
800          awaitTermination(t);
801 <        assertTrue(lock.writeLock().isHeldByCurrentThread());
698 <        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 <                assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
814 >                long startTime = System.nanoTime();
815 >                long timeoutMillis = timeoutMillis();
816 >                assertFalse(lock.readLock().tryLock(timeoutMillis, MILLISECONDS));
817 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
818              }});
819  
820          awaitTermination(t);
# Line 715 | 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 ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 727 | 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 734 | 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 ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 751 | 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 {
770 <            c.awaitUninterruptibly();
771 <            shouldThrow();
772 <        } 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 787 | 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 799 | 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 815 | 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 829 | 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 <        java.util.Date d = new java.util.Date();
969 <        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
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 ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
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 853 | 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();
1000 +        assertHasNoWaiters(lock, c);
1001          assertTrue(t.isAlive());
1002          lock.writeLock().unlock();
1003          awaitTermination(t);
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();
1009 >    public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
1010 >    public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
1011 >    public void testAwaitUninterruptibly(boolean fair) {
1012 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1013          final Condition c = lock.writeLock().newCondition();
1014 <        final CountDownLatch locked = new CountDownLatch(1);
1015 <        final AtomicBoolean canAwake = new AtomicBoolean(false);
1016 <        Thread t = newStartedThread(new CheckedRunnable() {
1014 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
1015 >
1016 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1017              public void realRun() {
1018 +                // Interrupt before awaitUninterruptibly
1019                  lock.writeLock().lock();
1020 <                locked.countDown();
1020 >                pleaseInterrupt.countDown();
1021 >                Thread.currentThread().interrupt();
1022                  c.awaitUninterruptibly();
1023                  assertTrue(Thread.interrupted());
1024                  lock.writeLock().unlock();
1025              }});
1026  
1027 <        locked.await();
1028 <        lock.writeLock().lock();
1029 <        lock.writeLock().unlock();
884 <        t.interrupt();
885 <        t.join(10);
886 <        assertTrue(t.isAlive());
887 <        lock.writeLock().lock();
888 <        c.signal();
889 <        lock.writeLock().unlock();
890 <        awaitTermination(t);
891 <    }
892 <
893 <    /**
894 <     * await is interruptible
895 <     */
896 <    public void testAwait_Interrupt() throws InterruptedException {
897 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
898 <        final Condition c = lock.writeLock().newCondition();
899 <        final CountDownLatch locked = new CountDownLatch(1);
900 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
901 <            public void realRun() throws InterruptedException {
1027 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1028 >            public void realRun() {
1029 >                // Interrupt during awaitUninterruptibly
1030                  lock.writeLock().lock();
1031 <                assertTrue(lock.isWriteLocked());
1032 <                assertTrue(lock.isWriteLockedByCurrentThread());
1033 <                assertHasNoWaiters(lock, c);
1034 <                locked.countDown();
907 <                try {
908 <                    c.await();
909 <                } finally {
910 <                    assertTrue(lock.isWriteLocked());
911 <                    assertTrue(lock.isWriteLockedByCurrentThread());
912 <                    assertHasNoWaiters(lock, c);
913 <                    lock.writeLock().unlock();
914 <                    assertFalse(Thread.interrupted());
915 <                }
1031 >                pleaseInterrupt.countDown();
1032 >                c.awaitUninterruptibly();
1033 >                assertTrue(Thread.interrupted());
1034 >                lock.writeLock().unlock();
1035              }});
1036  
1037 <        locked.await();
1038 <        assertHasWaiters(lock, c, t);
1039 <        t.interrupt();
1040 <        awaitTermination(t);
922 <        assertFalse(lock.isWriteLocked());
923 <    }
1037 >        await(pleaseInterrupt);
1038 >        lock.writeLock().lock();
1039 >        lock.writeLock().unlock();
1040 >        t2.interrupt();
1041  
1042 <    /**
1043 <     * awaitNanos is interruptible
927 <     */
928 <    public void testAwaitNanos_Interrupt() throws InterruptedException {
929 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
930 <        final Condition c = lock.writeLock().newCondition();
931 <        final CountDownLatch locked = new CountDownLatch(1);
932 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
933 <            public void realRun() throws InterruptedException {
934 <                lock.writeLock().lock();
935 <                assertTrue(lock.isWriteLocked());
936 <                assertTrue(lock.isWriteLockedByCurrentThread());
937 <                assertHasNoWaiters(lock, c);
938 <                locked.countDown();
939 <                try {
940 <                    c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
941 <                } finally {
942 <                    assertTrue(lock.isWriteLocked());
943 <                    assertTrue(lock.isWriteLockedByCurrentThread());
944 <                    assertHasNoWaiters(lock, c);
945 <                    lock.writeLock().unlock();
946 <                    assertFalse(Thread.interrupted());
947 <                }
948 <            }});
1042 >        assertThreadStaysAlive(t1);
1043 >        assertTrue(t2.isAlive());
1044  
1045 <        locked.await();
1046 <        assertHasWaiters(lock, c, t);
1047 <        t.interrupt();
1048 <        awaitTermination(t);
1049 <        assertFalse(lock.isWriteLocked());
1045 >        lock.writeLock().lock();
1046 >        c.signalAll();
1047 >        lock.writeLock().unlock();
1048 >
1049 >        awaitTermination(t1);
1050 >        awaitTermination(t2);
1051      }
1052  
1053      /**
1054 <     * awaitUntil is interruptible
1054 >     * await/awaitNanos/awaitUntil is interruptible
1055       */
1056 <    public void testAwaitUntil_Interrupt() throws InterruptedException {
1057 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1056 >    public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
1057 >    public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
1058 >    public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
1059 >    public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
1060 >    public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
1061 >    public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
1062 >    public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
1063 >    public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
1064 >    public void testInterruptible(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(1);
1069          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1070              public void realRun() throws InterruptedException {
1071                  lock.writeLock().lock();
1072 <                assertTrue(lock.isWriteLocked());
968 <                assertTrue(lock.isWriteLockedByCurrentThread());
1072 >                assertWriteLockedByMoi(lock);
1073                  assertHasNoWaiters(lock, c);
1074                  locked.countDown();
971                java.util.Date d = new java.util.Date();
1075                  try {
1076 <                    c.awaitUntil(new java.util.Date(d.getTime() + 10000));
1076 >                    await(c, awaitMethod);
1077                  } finally {
1078 <                    assertTrue(lock.isWriteLocked());
976 <                    assertTrue(lock.isWriteLockedByCurrentThread());
1078 >                    assertWriteLockedByMoi(lock);
1079                      assertHasNoWaiters(lock, c);
1080                      lock.writeLock().unlock();
1081                      assertFalse(Thread.interrupted());
1082                  }
1083              }});
1084  
1085 <        locked.await();
1085 >        await(locked);
1086          assertHasWaiters(lock, c, t);
1087          t.interrupt();
1088          awaitTermination(t);
1089 <        assertFalse(lock.isWriteLocked());
1089 >        assertNotWriteLocked(lock);
1090      }
1091  
1092      /**
1093       * signalAll wakes up all threads
1094       */
1095 <    public void testSignalAll() throws InterruptedException {
1096 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1095 >    public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
1096 >    public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
1097 >    public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
1098 >    public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
1099 >    public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
1100 >    public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
1101 >    public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
1102 >    public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
1103 >    public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
1104 >        final PublicReentrantReadWriteLock lock =
1105 >            new PublicReentrantReadWriteLock(fair);
1106          final Condition c = lock.writeLock().newCondition();
1107          final CountDownLatch locked = new CountDownLatch(2);
1108          final Lock writeLock = lock.writeLock();
1109 <        Thread t1 = newStartedThread(new CheckedRunnable() {
1109 >        class Awaiter extends CheckedRunnable {
1110              public void realRun() throws InterruptedException {
1111                  writeLock.lock();
1112                  locked.countDown();
1113 <                c.await();
1113 >                await(c, awaitMethod);
1114                  writeLock.unlock();
1115 <            }});
1115 >            }
1116 >        }
1117  
1118 <        Thread t2 = newStartedThread(new CheckedRunnable() {
1119 <            public void realRun() throws InterruptedException {
1008 <                writeLock.lock();
1009 <                locked.countDown();
1010 <                c.await();
1011 <                writeLock.unlock();
1012 <            }});
1118 >        Thread t1 = newStartedThread(new Awaiter());
1119 >        Thread t2 = newStartedThread(new Awaiter());
1120  
1121 <        locked.await();
1121 >        await(locked);
1122          writeLock.lock();
1123          assertHasWaiters(lock, c, t1, t2);
1124          c.signalAll();
# Line 1022 | Line 1129 | public class ReentrantReadWriteLockTest
1129      }
1130  
1131      /**
1132 <     * signal wakes up waiting threads in FIFO order.
1132 >     * signal wakes up waiting threads in FIFO order
1133       */
1134 <    public void testSignalWakesFifo() throws InterruptedException {
1135 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1134 >    public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1135 >    public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1136 >    public void testSignalWakesFifo(boolean fair) {
1137 >        final PublicReentrantReadWriteLock lock =
1138 >            new PublicReentrantReadWriteLock(fair);
1139          final Condition c = lock.writeLock().newCondition();
1140          final CountDownLatch locked1 = new CountDownLatch(1);
1141          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1038 | Line 1148 | public class ReentrantReadWriteLockTest
1148                  writeLock.unlock();
1149              }});
1150  
1151 <        locked1.await();
1151 >        await(locked1);
1152  
1153          Thread t2 = newStartedThread(new CheckedRunnable() {
1154              public void realRun() throws InterruptedException {
# Line 1048 | Line 1158 | public class ReentrantReadWriteLockTest
1158                  writeLock.unlock();
1159              }});
1160  
1161 <        locked2.await();
1161 >        await(locked2);
1162  
1163          writeLock.lock();
1164          assertHasWaiters(lock, c, t1, t2);
# Line 1067 | Line 1177 | public class ReentrantReadWriteLockTest
1177      }
1178  
1179      /**
1180 +     * await after multiple reentrant locking preserves lock count
1181 +     */
1182 +    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1183 +    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1184 +    public void testAwaitLockCount(boolean fair) {
1185 +        final PublicReentrantReadWriteLock lock =
1186 +            new PublicReentrantReadWriteLock(fair);
1187 +        final Condition c = lock.writeLock().newCondition();
1188 +        final CountDownLatch locked = new CountDownLatch(2);
1189 +        Thread t1 = newStartedThread(new CheckedRunnable() {
1190 +            public void realRun() throws InterruptedException {
1191 +                lock.writeLock().lock();
1192 +                assertWriteLockedByMoi(lock);
1193 +                assertEquals(1, lock.writeLock().getHoldCount());
1194 +                locked.countDown();
1195 +                c.await();
1196 +                assertWriteLockedByMoi(lock);
1197 +                assertEquals(1, lock.writeLock().getHoldCount());
1198 +                lock.writeLock().unlock();
1199 +            }});
1200 +
1201 +        Thread t2 = newStartedThread(new CheckedRunnable() {
1202 +            public void realRun() throws InterruptedException {
1203 +                lock.writeLock().lock();
1204 +                lock.writeLock().lock();
1205 +                assertWriteLockedByMoi(lock);
1206 +                assertEquals(2, lock.writeLock().getHoldCount());
1207 +                locked.countDown();
1208 +                c.await();
1209 +                assertWriteLockedByMoi(lock);
1210 +                assertEquals(2, lock.writeLock().getHoldCount());
1211 +                lock.writeLock().unlock();
1212 +                lock.writeLock().unlock();
1213 +            }});
1214 +
1215 +        await(locked);
1216 +        lock.writeLock().lock();
1217 +        assertHasWaiters(lock, c, t1, t2);
1218 +        c.signalAll();
1219 +        assertHasNoWaiters(lock, c);
1220 +        lock.writeLock().unlock();
1221 +        awaitTermination(t1);
1222 +        awaitTermination(t2);
1223 +    }
1224 +
1225 +    /**
1226       * A serialized lock deserializes as unlocked
1227       */
1228 <    public void testSerialization() throws Exception {
1229 <        ReentrantReadWriteLock l = new ReentrantReadWriteLock();
1230 <        l.readLock().lock();
1231 <        l.readLock().unlock();
1232 <
1233 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1234 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1235 <        out.writeObject(l);
1236 <        out.close();
1237 <
1238 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1239 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1240 <        ReentrantReadWriteLock r = (ReentrantReadWriteLock) in.readObject();
1241 <        r.readLock().lock();
1242 <        r.readLock().unlock();
1228 >    public void testSerialization()      { testSerialization(false); }
1229 >    public void testSerialization_fair() { testSerialization(true); }
1230 >    public void testSerialization(boolean fair) {
1231 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1232 >        lock.writeLock().lock();
1233 >        lock.readLock().lock();
1234 >
1235 >        ReentrantReadWriteLock clone = serialClone(lock);
1236 >        assertEquals(lock.isFair(), clone.isFair());
1237 >        assertTrue(lock.isWriteLocked());
1238 >        assertFalse(clone.isWriteLocked());
1239 >        assertEquals(1, lock.getReadLockCount());
1240 >        assertEquals(0, clone.getReadLockCount());
1241 >        clone.writeLock().lock();
1242 >        clone.readLock().lock();
1243 >        assertTrue(clone.isWriteLocked());
1244 >        assertEquals(1, clone.getReadLockCount());
1245 >        clone.readLock().unlock();
1246 >        clone.writeLock().unlock();
1247 >        assertFalse(clone.isWriteLocked());
1248 >        assertEquals(1, lock.getReadLockCount());
1249 >        assertEquals(0, clone.getReadLockCount());
1250      }
1251  
1252      /**
1253       * hasQueuedThreads reports whether there are waiting threads
1254       */
1255 <    public void testhasQueuedThreads() throws InterruptedException {
1256 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1255 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
1256 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
1257 >    public void testHasQueuedThreads(boolean fair) {
1258 >        final PublicReentrantReadWriteLock lock =
1259 >            new PublicReentrantReadWriteLock(fair);
1260          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1261          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1262          assertFalse(lock.hasQueuedThreads());
1263          lock.writeLock().lock();
1264          assertFalse(lock.hasQueuedThreads());
1099        long startTime = System.nanoTime();
1265          t1.start();
1266          waitForQueuedThread(lock, t1);
1267 +        assertTrue(lock.hasQueuedThreads());
1268          t2.start();
1269          waitForQueuedThread(lock, t2);
1270          assertTrue(lock.hasQueuedThreads());
# Line 1113 | Line 1279 | public class ReentrantReadWriteLockTest
1279      /**
1280       * hasQueuedThread(null) throws NPE
1281       */
1282 <    public void testHasQueuedThreadNPE() {
1283 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1282 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
1283 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
1284 >    public void testHasQueuedThreadNPE(boolean fair) {
1285 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1286          try {
1287 <            sync.hasQueuedThread(null);
1287 >            lock.hasQueuedThread(null);
1288              shouldThrow();
1289          } catch (NullPointerException success) {}
1290      }
1291  
1292      /**
1293 <     * hasQueuedThread reports whether a thread is queued.
1293 >     * hasQueuedThread reports whether a thread is queued
1294       */
1295 <    public void testHasQueuedThread() throws InterruptedException {
1296 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1295 >    public void testHasQueuedThread()      { testHasQueuedThread(false); }
1296 >    public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
1297 >    public void testHasQueuedThread(boolean fair) {
1298 >        final PublicReentrantReadWriteLock lock =
1299 >            new PublicReentrantReadWriteLock(fair);
1300          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1301          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1302          assertFalse(lock.hasQueuedThread(t1));
1303          assertFalse(lock.hasQueuedThread(t2));
1304          lock.writeLock().lock();
1134        long startTime = System.nanoTime();
1305          t1.start();
1306          waitForQueuedThread(lock, t1);
1307          assertTrue(lock.hasQueuedThread(t1));
# Line 1153 | Line 1323 | public class ReentrantReadWriteLockTest
1323      /**
1324       * getQueueLength reports number of waiting threads
1325       */
1326 <    public void testGetQueueLength() throws InterruptedException {
1327 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1326 >    public void testGetQueueLength()      { testGetQueueLength(false); }
1327 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
1328 >    public void testGetQueueLength(boolean fair) {
1329 >        final PublicReentrantReadWriteLock lock =
1330 >            new PublicReentrantReadWriteLock(fair);
1331          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1332          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1333          assertEquals(0, lock.getQueueLength());
1334          lock.writeLock().lock();
1162        long startTime = System.nanoTime();
1335          t1.start();
1336          waitForQueuedThread(lock, t1);
1337          assertEquals(1, lock.getQueueLength());
# Line 1177 | Line 1349 | public class ReentrantReadWriteLockTest
1349      /**
1350       * getQueuedThreads includes waiting threads
1351       */
1352 <    public void testGetQueuedThreads() throws InterruptedException {
1353 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1352 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
1353 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
1354 >    public void testGetQueuedThreads(boolean fair) {
1355 >        final PublicReentrantReadWriteLock lock =
1356 >            new PublicReentrantReadWriteLock(fair);
1357          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1358          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1359          assertTrue(lock.getQueuedThreads().isEmpty());
1360          lock.writeLock().lock();
1186        long startTime = System.nanoTime();
1361          assertTrue(lock.getQueuedThreads().isEmpty());
1362          t1.start();
1363          waitForQueuedThread(lock, t1);
# Line 1207 | Line 1381 | public class ReentrantReadWriteLockTest
1381      /**
1382       * hasWaiters throws NPE if null
1383       */
1384 <    public void testHasWaitersNPE() {
1385 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1384 >    public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
1385 >    public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
1386 >    public void testHasWaitersNPE(boolean fair) {
1387 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1388          try {
1389              lock.hasWaiters(null);
1390              shouldThrow();
# Line 1218 | Line 1394 | public class ReentrantReadWriteLockTest
1394      /**
1395       * getWaitQueueLength throws NPE if null
1396       */
1397 <    public void testGetWaitQueueLengthNPE() {
1398 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1397 >    public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
1398 >    public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
1399 >    public void testGetWaitQueueLengthNPE(boolean fair) {
1400 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1401          try {
1402              lock.getWaitQueueLength(null);
1403              shouldThrow();
# Line 1229 | Line 1407 | public class ReentrantReadWriteLockTest
1407      /**
1408       * getWaitingThreads throws NPE if null
1409       */
1410 <    public void testGetWaitingThreadsNPE() {
1411 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1410 >    public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
1411 >    public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
1412 >    public void testGetWaitingThreadsNPE(boolean fair) {
1413 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(fair);
1414          try {
1415              lock.getWaitingThreads(null);
1416              shouldThrow();
# Line 1238 | Line 1418 | public class ReentrantReadWriteLockTest
1418      }
1419  
1420      /**
1421 <     * hasWaiters throws IAE if not owned
1421 >     * hasWaiters throws IllegalArgumentException if not owned
1422       */
1423 <    public void testHasWaitersIAE() {
1424 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1423 >    public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
1424 >    public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
1425 >    public void testHasWaitersIAE(boolean fair) {
1426 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1427          final Condition c = lock.writeLock().newCondition();
1428 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1428 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1429          try {
1430              lock2.hasWaiters(c);
1431              shouldThrow();
# Line 1251 | Line 1433 | public class ReentrantReadWriteLockTest
1433      }
1434  
1435      /**
1436 <     * hasWaiters throws IMSE if not locked
1436 >     * hasWaiters throws IllegalMonitorStateException if not locked
1437       */
1438 <    public void testHasWaitersIMSE() {
1439 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1438 >    public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
1439 >    public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
1440 >    public void testHasWaitersIMSE(boolean fair) {
1441 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1442          final Condition c = lock.writeLock().newCondition();
1443          try {
1444              lock.hasWaiters(c);
# Line 1263 | Line 1447 | public class ReentrantReadWriteLockTest
1447      }
1448  
1449      /**
1450 <     * getWaitQueueLength throws IAE if not owned
1450 >     * getWaitQueueLength throws IllegalArgumentException if not owned
1451       */
1452 <    public void testGetWaitQueueLengthIAE() {
1453 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1452 >    public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
1453 >    public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
1454 >    public void testGetWaitQueueLengthIAE(boolean fair) {
1455 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1456          final Condition c = lock.writeLock().newCondition();
1457 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1457 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock(fair);
1458          try {
1459              lock2.getWaitQueueLength(c);
1460              shouldThrow();
# Line 1276 | Line 1462 | public class ReentrantReadWriteLockTest
1462      }
1463  
1464      /**
1465 <     * getWaitQueueLength throws IMSE if not locked
1465 >     * getWaitQueueLength throws IllegalMonitorStateException if not locked
1466       */
1467 <    public void testGetWaitQueueLengthIMSE() {
1468 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1467 >    public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
1468 >    public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
1469 >    public void testGetWaitQueueLengthIMSE(boolean fair) {
1470 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1471          final Condition c = lock.writeLock().newCondition();
1472          try {
1473              lock.getWaitQueueLength(c);
# Line 1288 | Line 1476 | public class ReentrantReadWriteLockTest
1476      }
1477  
1478      /**
1479 <     * getWaitingThreads throws IAE if not owned
1479 >     * getWaitingThreads throws IllegalArgumentException if not owned
1480       */
1481 <    public void testGetWaitingThreadsIAE() {
1482 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1481 >    public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
1482 >    public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
1483 >    public void testGetWaitingThreadsIAE(boolean fair) {
1484 >        final PublicReentrantReadWriteLock lock =
1485 >            new PublicReentrantReadWriteLock(fair);
1486          final Condition c = lock.writeLock().newCondition();
1487 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1487 >        final PublicReentrantReadWriteLock lock2 =
1488 >            new PublicReentrantReadWriteLock(fair);
1489          try {
1490              lock2.getWaitingThreads(c);
1491              shouldThrow();
# Line 1301 | Line 1493 | public class ReentrantReadWriteLockTest
1493      }
1494  
1495      /**
1496 <     * getWaitingThreads throws IMSE if not locked
1496 >     * getWaitingThreads throws IllegalMonitorStateException if not locked
1497       */
1498 <    public void testGetWaitingThreadsIMSE() {
1499 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1498 >    public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
1499 >    public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
1500 >    public void testGetWaitingThreadsIMSE(boolean fair) {
1501 >        final PublicReentrantReadWriteLock lock =
1502 >            new PublicReentrantReadWriteLock(fair);
1503          final Condition c = lock.writeLock().newCondition();
1504          try {
1505              lock.getWaitingThreads(c);
# Line 1315 | Line 1510 | public class ReentrantReadWriteLockTest
1510      /**
1511       * hasWaiters returns true when a thread is waiting, else false
1512       */
1513 <    public void testHasWaiters() throws InterruptedException {
1514 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1513 >    public void testHasWaiters()      { testHasWaiters(false); }
1514 >    public void testHasWaiters_fair() { testHasWaiters(true); }
1515 >    public void testHasWaiters(boolean fair) {
1516 >        final PublicReentrantReadWriteLock lock =
1517 >            new PublicReentrantReadWriteLock(fair);
1518          final Condition c = lock.writeLock().newCondition();
1519          final CountDownLatch locked = new CountDownLatch(1);
1520          Thread t = newStartedThread(new CheckedRunnable() {
1521              public void realRun() throws InterruptedException {
1522                  lock.writeLock().lock();
1523 +                assertHasNoWaiters(lock, c);
1524                  assertFalse(lock.hasWaiters(c));
1525                  locked.countDown();
1327                assertEquals(0, lock.getWaitQueueLength(c));
1526                  c.await();
1527 +                assertHasNoWaiters(lock, c);
1528 +                assertFalse(lock.hasWaiters(c));
1529                  lock.writeLock().unlock();
1530              }});
1531  
1532 <        locked.await();
1532 >        await(locked);
1533          lock.writeLock().lock();
1534 +        assertHasWaiters(lock, c, t);
1535          assertTrue(lock.hasWaiters(c));
1335        assertEquals(1, lock.getWaitQueueLength(c));
1536          c.signal();
1537          assertHasNoWaiters(lock, c);
1538 +        assertFalse(lock.hasWaiters(c));
1539          lock.writeLock().unlock();
1540          awaitTermination(t);
1541          assertHasNoWaiters(lock, c);
# Line 1343 | Line 1544 | public class ReentrantReadWriteLockTest
1544      /**
1545       * getWaitQueueLength returns number of waiting threads
1546       */
1547 <    public void testGetWaitQueueLength() throws InterruptedException {
1548 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1547 >    public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
1548 >    public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
1549 >    public void testGetWaitQueueLength(boolean fair) {
1550 >        final PublicReentrantReadWriteLock lock =
1551 >            new PublicReentrantReadWriteLock(fair);
1552          final Condition c = lock.writeLock().newCondition();
1553          final CountDownLatch locked = new CountDownLatch(1);
1554          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1356 | Line 1560 | public class ReentrantReadWriteLockTest
1560                  lock.writeLock().unlock();
1561              }});
1562  
1563 <        locked.await();
1563 >        await(locked);
1564          lock.writeLock().lock();
1565          assertHasWaiters(lock, c, t);
1566          assertEquals(1, lock.getWaitQueueLength(c));
# Line 1370 | Line 1574 | public class ReentrantReadWriteLockTest
1574      /**
1575       * getWaitingThreads returns only and all waiting threads
1576       */
1577 <    public void testGetWaitingThreads() throws InterruptedException {
1578 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1577 >    public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
1578 >    public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
1579 >    public void testGetWaitingThreads(boolean fair) {
1580 >        final PublicReentrantReadWriteLock lock =
1581 >            new PublicReentrantReadWriteLock(fair);
1582          final Condition c = lock.writeLock().newCondition();
1583          final CountDownLatch locked1 = new CountDownLatch(1);
1584          final CountDownLatch locked2 = new CountDownLatch(1);
# Line 1398 | Line 1605 | public class ReentrantReadWriteLockTest
1605          lock.writeLock().unlock();
1606  
1607          t1.start();
1608 <        locked1.await();
1608 >        await(locked1);
1609          t2.start();
1610 <        locked2.await();
1610 >        await(locked2);
1611  
1612          lock.writeLock().lock();
1613          assertTrue(lock.hasWaiters(c));
# Line 1420 | Line 1627 | public class ReentrantReadWriteLockTest
1627      /**
1628       * toString indicates current lock state
1629       */
1630 <    public void testToString() {
1631 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1632 <        String us = lock.toString();
1633 <        assertTrue(us.indexOf("Write locks = 0") >= 0);
1634 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1635 <        lock.writeLock().lock();
1636 <        String ws = lock.toString();
1637 <        assertTrue(ws.indexOf("Write locks = 1") >= 0);
1638 <        assertTrue(ws.indexOf("Read locks = 0") >= 0);
1630 >    public void testToString()      { testToString(false); }
1631 >    public void testToString_fair() { testToString(true); }
1632 >    public void testToString(boolean fair) {
1633 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1634 >        assertTrue(lock.toString().contains("Write locks = 0"));
1635 >        assertTrue(lock.toString().contains("Read locks = 0"));
1636 >        lock.writeLock().lock();
1637 >        assertTrue(lock.toString().contains("Write locks = 1"));
1638 >        assertTrue(lock.toString().contains("Read locks = 0"));
1639 >        lock.writeLock().lock();
1640 >        assertTrue(lock.toString().contains("Write locks = 2"));
1641 >        assertTrue(lock.toString().contains("Read locks = 0"));
1642 >        lock.writeLock().unlock();
1643          lock.writeLock().unlock();
1644          lock.readLock().lock();
1645 +        assertTrue(lock.toString().contains("Write locks = 0"));
1646 +        assertTrue(lock.toString().contains("Read locks = 1"));
1647          lock.readLock().lock();
1648 <        String rs = lock.toString();
1649 <        assertTrue(rs.indexOf("Write locks = 0") >= 0);
1437 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1648 >        assertTrue(lock.toString().contains("Write locks = 0"));
1649 >        assertTrue(lock.toString().contains("Read locks = 2"));
1650      }
1651  
1652      /**
1653       * readLock.toString indicates current lock state
1654       */
1655 <    public void testReadLockToString() {
1656 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1657 <        String us = lock.readLock().toString();
1658 <        assertTrue(us.indexOf("Read locks = 0") >= 0);
1655 >    public void testReadLockToString()      { testReadLockToString(false); }
1656 >    public void testReadLockToString_fair() { testReadLockToString(true); }
1657 >    public void testReadLockToString(boolean fair) {
1658 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1659 >        assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1660          lock.readLock().lock();
1661 +        assertTrue(lock.readLock().toString().contains("Read locks = 1"));
1662          lock.readLock().lock();
1663 <        String rs = lock.readLock().toString();
1664 <        assertTrue(rs.indexOf("Read locks = 2") >= 0);
1663 >        assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1664 >        lock.readLock().unlock();
1665 >        assertTrue(lock.readLock().toString().contains("Read locks = 1"));
1666 >        lock.readLock().unlock();
1667 >        assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1668      }
1669  
1670      /**
1671       * writeLock.toString indicates current lock state
1672       */
1673 <    public void testWriteLockToString() {
1674 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1675 <        String us = lock.writeLock().toString();
1676 <        assertTrue(us.indexOf("Unlocked") >= 0);
1673 >    public void testWriteLockToString()      { testWriteLockToString(false); }
1674 >    public void testWriteLockToString_fair() { testWriteLockToString(true); }
1675 >    public void testWriteLockToString(boolean fair) {
1676 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1677 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1678          lock.writeLock().lock();
1679 <        String ls = lock.writeLock().toString();
1680 <        assertTrue(ls.indexOf("Locked") >= 0);
1679 >        assertTrue(lock.writeLock().toString().contains("Locked by"));
1680 >        lock.writeLock().unlock();
1681 >        assertTrue(lock.writeLock().toString().contains("Unlocked"));
1682      }
1683  
1684   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines