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.34 by jsr166, Tue Nov 17 14:45:32 2009 UTC vs.
Revision 1.54 by jsr166, Mon May 2 01:07:15 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
# Line 9 | Line 9
9   import junit.framework.*;
10   import java.util.concurrent.locks.*;
11   import java.util.concurrent.*;
12 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
13   import java.io.*;
14   import java.util.*;
15  
16   public class ReentrantReadWriteLockTest extends JSR166TestCase {
17      public static void main(String[] args) {
18 <        junit.textui.TestRunner.run (suite());
18 >        junit.textui.TestRunner.run(suite());
19      }
20      public static Test suite() {
21 <        return new TestSuite(ReentrantReadWriteLockTest.class);
21 >        return new TestSuite(ReentrantReadWriteLockTest.class);
22      }
23  
24      /**
# Line 58 | Line 59 | public class ReentrantReadWriteLockTest
59      }
60  
61      /**
62 +     * Releases write lock, checking that it had a hold count of 1.
63 +     */
64 +    void releaseWriteLock(ReentrantReadWriteLock lock) {
65 +        ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
66 +        assertTrue(writeLock.isHeldByCurrentThread());
67 +        writeLock.unlock();
68 +        assertFalse(writeLock.isHeldByCurrentThread());
69 +    }
70 +
71 +    /**
72       * Constructor sets given fairness, and is in unlocked state
73       */
74      public void testConstructor() {
75 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
75 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
76          assertFalse(rl.isFair());
77          assertFalse(rl.isWriteLocked());
78          assertEquals(0, rl.getReadLockCount());
79 <        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
79 >        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
80          assertTrue(r2.isFair());
81          assertFalse(r2.isWriteLocked());
82          assertEquals(0, r2.getReadLockCount());
83 <        ReentrantReadWriteLock r3 = new ReentrantReadWriteLock(false);
83 >        ReentrantReadWriteLock r3 = new ReentrantReadWriteLock(false);
84          assertFalse(r3.isFair());
85          assertFalse(r3.isWriteLocked());
86          assertEquals(0, r3.getReadLockCount());
# Line 79 | Line 90 | public class ReentrantReadWriteLockTest
90       * write-locking and read-locking an unlocked lock succeed
91       */
92      public void testLock() {
93 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
93 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
94          rl.writeLock().lock();
95          assertTrue(rl.isWriteLocked());
96          assertTrue(rl.isWriteLockedByCurrentThread());
# Line 105 | Line 116 | public class ReentrantReadWriteLockTest
116       * locking an unlocked fair lock succeeds
117       */
118      public void testFairLock() {
119 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
119 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
120          rl.writeLock().lock();
121          assertTrue(rl.isWriteLocked());
122          assertTrue(rl.isWriteLockedByCurrentThread());
# Line 130 | Line 141 | public class ReentrantReadWriteLockTest
141       * getWriteHoldCount returns number of recursive holds
142       */
143      public void testGetWriteHoldCount() {
144 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
145 <        for (int i = 1; i <= SIZE; i++) {
146 <            lock.writeLock().lock();
147 <            assertEquals(i,lock.getWriteHoldCount());
148 <        }
149 <        for (int i = SIZE; i > 0; i--) {
150 <            lock.writeLock().unlock();
151 <            assertEquals(i-1,lock.getWriteHoldCount());
152 <        }
144 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
145 >        for (int i = 1; i <= SIZE; i++) {
146 >            lock.writeLock().lock();
147 >            assertEquals(i,lock.getWriteHoldCount());
148 >        }
149 >        for (int i = SIZE; i > 0; i--) {
150 >            lock.writeLock().unlock();
151 >            assertEquals(i-1,lock.getWriteHoldCount());
152 >        }
153      }
154  
155      /**
156       * WriteLock.getHoldCount returns number of recursive holds
157       */
158      public void testGetHoldCount() {
159 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
160 <        for (int i = 1; i <= SIZE; i++) {
161 <            lock.writeLock().lock();
162 <            assertEquals(i,lock.writeLock().getHoldCount());
163 <        }
164 <        for (int i = SIZE; i > 0; i--) {
165 <            lock.writeLock().unlock();
166 <            assertEquals(i-1,lock.writeLock().getHoldCount());
167 <        }
159 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
160 >        for (int i = 1; i <= SIZE; i++) {
161 >            lock.writeLock().lock();
162 >            assertEquals(i,lock.writeLock().getHoldCount());
163 >        }
164 >        for (int i = SIZE; i > 0; i--) {
165 >            lock.writeLock().unlock();
166 >            assertEquals(i-1,lock.writeLock().getHoldCount());
167 >        }
168      }
169  
170      /**
171       * getReadHoldCount returns number of recursive holds
172       */
173      public void testGetReadHoldCount() {
174 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
175 <        for (int i = 1; i <= SIZE; i++) {
176 <            lock.readLock().lock();
177 <            assertEquals(i,lock.getReadHoldCount());
178 <        }
179 <        for (int i = SIZE; i > 0; i--) {
180 <            lock.readLock().unlock();
181 <            assertEquals(i-1,lock.getReadHoldCount());
182 <        }
174 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
175 >        for (int i = 1; i <= SIZE; i++) {
176 >            lock.readLock().lock();
177 >            assertEquals(i,lock.getReadHoldCount());
178 >        }
179 >        for (int i = SIZE; i > 0; i--) {
180 >            lock.readLock().unlock();
181 >            assertEquals(i-1,lock.getReadHoldCount());
182 >        }
183      }
184  
185  
# Line 176 | Line 187 | public class ReentrantReadWriteLockTest
187       * write-unlocking an unlocked lock throws IllegalMonitorStateException
188       */
189      public void testUnlock_IllegalMonitorStateException() {
190 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
191 <        try {
192 <            rl.writeLock().unlock();
193 <            shouldThrow();
194 <        } catch (IllegalMonitorStateException success) {}
190 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
191 >        try {
192 >            rl.writeLock().unlock();
193 >            shouldThrow();
194 >        } catch (IllegalMonitorStateException success) {}
195      }
196  
197  
# Line 188 | Line 199 | public class ReentrantReadWriteLockTest
199       * write-lockInterruptibly is interruptible
200       */
201      public void testWriteLockInterruptibly_Interrupted() throws Exception {
202 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
203 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
202 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
203 >        lock.writeLock().lock();
204 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
205              public void realRun() throws InterruptedException {
206                  lock.writeLock().lockInterruptibly();
195                lock.writeLock().unlock();
196                lock.writeLock().lockInterruptibly();
197                lock.writeLock().unlock();
207              }});
208  
200        lock.writeLock().lock();
201        t.start();
209          Thread.sleep(SHORT_DELAY_MS);
210          t.interrupt();
211 <        Thread.sleep(SHORT_DELAY_MS);
212 <        lock.writeLock().unlock();
206 <        t.join();
211 >        awaitTermination(t, LONG_DELAY_MS);
212 >        releaseWriteLock(lock);
213      }
214  
215      /**
216       * timed write-tryLock is interruptible
217       */
218      public void testWriteTryLock_Interrupted() throws InterruptedException {
219 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
220 <        lock.writeLock().lock();
221 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
219 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
220 >        lock.writeLock().lock();
221 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
222              public void realRun() throws InterruptedException {
223 <                lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
223 >                lock.writeLock().tryLock(SMALL_DELAY_MS, MILLISECONDS);
224              }});
225  
226 <        t.start();
226 >        Thread.sleep(SHORT_DELAY_MS);
227          t.interrupt();
228 <        lock.writeLock().unlock();
229 <        t.join();
228 >        awaitTermination(t, LONG_DELAY_MS);
229 >        releaseWriteLock(lock);
230      }
231  
232      /**
233       * read-lockInterruptibly is interruptible
234       */
235      public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
236 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
237 <        lock.writeLock().lock();
238 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
236 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
237 >        lock.writeLock().lock();
238 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
239              public void realRun() throws InterruptedException {
240                  lock.readLock().lockInterruptibly();
241              }});
242  
237        t.start();
243          Thread.sleep(SHORT_DELAY_MS);
244          t.interrupt();
245 <        Thread.sleep(SHORT_DELAY_MS);
246 <        lock.writeLock().unlock();
242 <        t.join();
245 >        awaitTermination(t, LONG_DELAY_MS);
246 >        releaseWriteLock(lock);
247      }
248  
249      /**
250       * timed read-tryLock is interruptible
251       */
252      public void testReadTryLock_Interrupted() throws InterruptedException {
253 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
254 <        lock.writeLock().lock();
255 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
253 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
254 >        lock.writeLock().lock();
255 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
256              public void realRun() throws InterruptedException {
257 <                lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
257 >                lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
258              }});
259  
260 <        t.start();
260 >        Thread.sleep(SHORT_DELAY_MS);
261          t.interrupt();
262 <        t.join();
262 >        awaitTermination(t, LONG_DELAY_MS);
263 >        releaseWriteLock(lock);
264      }
265  
266  
# Line 263 | Line 268 | public class ReentrantReadWriteLockTest
268       * write-tryLock fails if locked
269       */
270      public void testWriteTryLockWhenLocked() throws InterruptedException {
271 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
272 <        lock.writeLock().lock();
273 <        Thread t = new Thread(new Runnable() {
274 <                public void run() {
275 <                    threadAssertFalse(lock.writeLock().tryLock());
276 <                }
272 <            });
271 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
272 >        lock.writeLock().lock();
273 >        Thread t = newStartedThread(new CheckedRunnable() {
274 >            public void realRun() {
275 >                assertFalse(lock.writeLock().tryLock());
276 >            }});
277  
278 <        t.start();
279 <        t.join();
276 <        lock.writeLock().unlock();
278 >        awaitTermination(t, LONG_DELAY_MS);
279 >        releaseWriteLock(lock);
280      }
281  
282      /**
283       * read-tryLock fails if locked
284       */
285      public void testReadTryLockWhenLocked() throws InterruptedException {
286 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
287 <        lock.writeLock().lock();
288 <        Thread t = new Thread(new Runnable() {
289 <                public void run() {
290 <                    threadAssertFalse(lock.readLock().tryLock());
291 <                }
289 <            });
286 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
287 >        lock.writeLock().lock();
288 >        Thread t = newStartedThread(new CheckedRunnable() {
289 >            public void realRun() {
290 >                assertFalse(lock.readLock().tryLock());
291 >            }});
292  
293 <        t.start();
294 <        t.join();
293 <        lock.writeLock().unlock();
293 >        awaitTermination(t, LONG_DELAY_MS);
294 >        releaseWriteLock(lock);
295      }
296  
297      /**
298       * Multiple threads can hold a read lock when not write-locked
299       */
300      public void testMultipleReadLocks() throws InterruptedException {
301 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
302 <        lock.readLock().lock();
303 <        Thread t = new Thread(new Runnable() {
304 <                public void run() {
305 <                    threadAssertTrue(lock.readLock().tryLock());
306 <                    lock.readLock().unlock();
307 <                }
307 <            });
301 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
302 >        lock.readLock().lock();
303 >        Thread t = newStartedThread(new CheckedRunnable() {
304 >            public void realRun() {
305 >                assertTrue(lock.readLock().tryLock());
306 >                lock.readLock().unlock();
307 >            }});
308  
309 <        t.start();
310 <        t.join();
309 >        awaitTermination(t, LONG_DELAY_MS);
310          lock.readLock().unlock();
311      }
312  
# Line 315 | Line 314 | public class ReentrantReadWriteLockTest
314       * A writelock succeeds after reading threads unlock
315       */
316      public void testWriteAfterMultipleReadLocks() throws InterruptedException {
317 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
318 <        lock.readLock().lock();
319 <        Thread t1 = new Thread(new Runnable() {
320 <                public void run() {
321 <                    lock.readLock().lock();
322 <                    lock.readLock().unlock();
323 <                }
324 <            });
325 <        Thread t2 = new Thread(new Runnable() {
326 <                public void run() {
327 <                    lock.writeLock().lock();
328 <                    lock.writeLock().unlock();
330 <                }
331 <            });
317 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
318 >        lock.readLock().lock();
319 >        Thread t1 = newStartedThread(new CheckedRunnable() {
320 >            public void realRun() {
321 >                lock.readLock().lock();
322 >                lock.readLock().unlock();
323 >            }});
324 >        Thread t2 = newStartedThread(new CheckedRunnable() {
325 >            public void realRun() {
326 >                lock.writeLock().lock();
327 >                lock.writeLock().unlock();
328 >            }});
329  
333        t1.start();
334        t2.start();
330          Thread.sleep(SHORT_DELAY_MS);
331          lock.readLock().unlock();
332 <        t1.join(MEDIUM_DELAY_MS);
333 <        t2.join(MEDIUM_DELAY_MS);
339 <        assertTrue(!t1.isAlive());
340 <        assertTrue(!t2.isAlive());
332 >        awaitTermination(t1, LONG_DELAY_MS);
333 >        awaitTermination(t2, LONG_DELAY_MS);
334      }
335  
336      /**
337       * Readlocks succeed after a writing thread unlocks
338       */
339      public void testReadAfterWriteLock() throws InterruptedException {
340 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
341 <        lock.writeLock().lock();
342 <        Thread t1 = new Thread(new Runnable() {
343 <                public void run() {
344 <                    lock.readLock().lock();
345 <                    lock.readLock().unlock();
346 <                }
347 <            });
348 <        Thread t2 = new Thread(new Runnable() {
349 <                public void run() {
350 <                    lock.readLock().lock();
351 <                    lock.readLock().unlock();
359 <                }
360 <            });
340 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
341 >        lock.writeLock().lock();
342 >        Thread t1 = newStartedThread(new CheckedRunnable() {
343 >            public void realRun() {
344 >                lock.readLock().lock();
345 >                lock.readLock().unlock();
346 >            }});
347 >        Thread t2 = newStartedThread(new CheckedRunnable() {
348 >            public void realRun() {
349 >                lock.readLock().lock();
350 >                lock.readLock().unlock();
351 >            }});
352  
362        t1.start();
363        t2.start();
353          Thread.sleep(SHORT_DELAY_MS);
354 <        lock.writeLock().unlock();
355 <        t1.join(MEDIUM_DELAY_MS);
356 <        t2.join(MEDIUM_DELAY_MS);
368 <        assertTrue(!t1.isAlive());
369 <        assertTrue(!t2.isAlive());
354 >        releaseWriteLock(lock);
355 >        awaitTermination(t1, LONG_DELAY_MS);
356 >        awaitTermination(t2, LONG_DELAY_MS);
357      }
358  
359      /**
360       * Read trylock succeeds if write locked by current thread
361       */
362      public void testReadHoldingWriteLock() {
363 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
364 <        lock.writeLock().lock();
363 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
364 >        lock.writeLock().lock();
365          assertTrue(lock.readLock().tryLock());
366          lock.readLock().unlock();
367          lock.writeLock().unlock();
# Line 385 | Line 372 | public class ReentrantReadWriteLockTest
372       * other threads are waiting for readlock
373       */
374      public void testReadHoldingWriteLock2() throws InterruptedException {
375 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
376 <        lock.writeLock().lock();
377 <        Thread t1 = new Thread(new Runnable() {
378 <                public void run() {
379 <                    lock.readLock().lock();
380 <                    lock.readLock().unlock();
381 <                }
382 <            });
383 <        Thread t2 = new Thread(new Runnable() {
384 <                public void run() {
385 <                    lock.readLock().lock();
386 <                    lock.readLock().unlock();
400 <                }
401 <            });
375 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
376 >        lock.writeLock().lock();
377 >        Thread t1 = newStartedThread(new CheckedRunnable() {
378 >            public void realRun() {
379 >                lock.readLock().lock();
380 >                lock.readLock().unlock();
381 >            }});
382 >        Thread t2 = newStartedThread(new CheckedRunnable() {
383 >            public void realRun() {
384 >                lock.readLock().lock();
385 >                lock.readLock().unlock();
386 >            }});
387  
403        t1.start();
404        t2.start();
388          lock.readLock().lock();
389          lock.readLock().unlock();
390          Thread.sleep(SHORT_DELAY_MS);
391          lock.readLock().lock();
392          lock.readLock().unlock();
393          lock.writeLock().unlock();
394 <        t1.join(MEDIUM_DELAY_MS);
395 <        t2.join(MEDIUM_DELAY_MS);
413 <        assertTrue(!t1.isAlive());
414 <        assertTrue(!t2.isAlive());
394 >        awaitTermination(t1, LONG_DELAY_MS);
395 >        awaitTermination(t2, LONG_DELAY_MS);
396      }
397  
398      /**
399 <     *  Read lock succeeds if write locked by current thread even if
399 >     * Read lock succeeds if write locked by current thread even if
400       * other threads are waiting for writelock
401       */
402      public void testReadHoldingWriteLock3() throws InterruptedException {
403 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
404 <        lock.writeLock().lock();
405 <        Thread t1 = new Thread(new Runnable() {
406 <                public void run() {
407 <                    lock.writeLock().lock();
408 <                    lock.writeLock().unlock();
409 <                }
410 <            });
411 <        Thread t2 = new Thread(new Runnable() {
412 <                public void run() {
413 <                    lock.writeLock().lock();
414 <                    lock.writeLock().unlock();
434 <                }
435 <            });
403 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
404 >        lock.writeLock().lock();
405 >        Thread t1 = newStartedThread(new CheckedRunnable() {
406 >            public void realRun() {
407 >                lock.writeLock().lock();
408 >                lock.writeLock().unlock();
409 >            }});
410 >        Thread t2 = newStartedThread(new CheckedRunnable() {
411 >            public void realRun() {
412 >                lock.writeLock().lock();
413 >                lock.writeLock().unlock();
414 >            }});
415  
437        t1.start();
438        t2.start();
416          lock.readLock().lock();
417          lock.readLock().unlock();
418          Thread.sleep(SHORT_DELAY_MS);
419          lock.readLock().lock();
420          lock.readLock().unlock();
421          lock.writeLock().unlock();
422 <        t1.join(MEDIUM_DELAY_MS);
423 <        t2.join(MEDIUM_DELAY_MS);
447 <        assertTrue(!t1.isAlive());
448 <        assertTrue(!t2.isAlive());
422 >        awaitTermination(t1, LONG_DELAY_MS);
423 >        awaitTermination(t2, LONG_DELAY_MS);
424      }
425  
426  
427      /**
428 <     *  Write lock succeeds if write locked by current thread even if
428 >     * Write lock succeeds if write locked by current thread even if
429       * other threads are waiting for writelock
430       */
431      public void testWriteHoldingWriteLock4() throws InterruptedException {
432 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
433 <        lock.writeLock().lock();
434 <        Thread t1 = new Thread(new Runnable() {
435 <                public void run() {
436 <                    lock.writeLock().lock();
437 <                    lock.writeLock().unlock();
438 <                }
439 <            });
440 <        Thread t2 = new Thread(new Runnable() {
441 <                public void run() {
442 <                    lock.writeLock().lock();
443 <                    lock.writeLock().unlock();
469 <                }
470 <            });
432 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
433 >        lock.writeLock().lock();
434 >        Thread t1 = newStartedThread(new CheckedRunnable() {
435 >            public void realRun() {
436 >                lock.writeLock().lock();
437 >                lock.writeLock().unlock();
438 >            }});
439 >        Thread t2 = newStartedThread(new CheckedRunnable() {
440 >            public void realRun() {
441 >                lock.writeLock().lock();
442 >                lock.writeLock().unlock();
443 >            }});
444  
472        t1.start();
473        t2.start();
445          lock.writeLock().lock();
446          lock.writeLock().unlock();
447          Thread.sleep(SHORT_DELAY_MS);
448          lock.writeLock().lock();
449          lock.writeLock().unlock();
450          lock.writeLock().unlock();
451 <        t1.join(MEDIUM_DELAY_MS);
452 <        t2.join(MEDIUM_DELAY_MS);
482 <        assertTrue(!t1.isAlive());
483 <        assertTrue(!t2.isAlive());
451 >        awaitTermination(t1, LONG_DELAY_MS);
452 >        awaitTermination(t2, LONG_DELAY_MS);
453      }
454  
455  
# Line 488 | Line 457 | public class ReentrantReadWriteLockTest
457       * Fair Read trylock succeeds if write locked by current thread
458       */
459      public void testReadHoldingWriteLockFair() {
460 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
461 <        lock.writeLock().lock();
460 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
461 >        lock.writeLock().lock();
462          assertTrue(lock.readLock().tryLock());
463          lock.readLock().unlock();
464          lock.writeLock().unlock();
# Line 500 | Line 469 | public class ReentrantReadWriteLockTest
469       * other threads are waiting for readlock
470       */
471      public void testReadHoldingWriteLockFair2() throws InterruptedException {
472 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
473 <        lock.writeLock().lock();
474 <        Thread t1 = new Thread(new Runnable() {
475 <                public void run() {
476 <                    lock.readLock().lock();
477 <                    lock.readLock().unlock();
478 <                }
479 <            });
480 <        Thread t2 = new Thread(new Runnable() {
481 <                public void run() {
482 <                    lock.readLock().lock();
483 <                    lock.readLock().unlock();
515 <                }
516 <            });
472 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
473 >        lock.writeLock().lock();
474 >        Thread t1 = newStartedThread(new CheckedRunnable() {
475 >            public void realRun() {
476 >                lock.readLock().lock();
477 >                lock.readLock().unlock();
478 >            }});
479 >        Thread t2 = newStartedThread(new CheckedRunnable() {
480 >            public void realRun() {
481 >                lock.readLock().lock();
482 >                lock.readLock().unlock();
483 >            }});
484  
518        t1.start();
519        t2.start();
485          lock.readLock().lock();
486          lock.readLock().unlock();
487          Thread.sleep(SHORT_DELAY_MS);
488          lock.readLock().lock();
489          lock.readLock().unlock();
490          lock.writeLock().unlock();
491 <        t1.join(MEDIUM_DELAY_MS);
492 <        t2.join(MEDIUM_DELAY_MS);
528 <        assertTrue(!t1.isAlive());
529 <        assertTrue(!t2.isAlive());
491 >        awaitTermination(t1, LONG_DELAY_MS);
492 >        awaitTermination(t2, LONG_DELAY_MS);
493      }
494  
495  
# Line 535 | Line 498 | public class ReentrantReadWriteLockTest
498       * other threads are waiting for writelock
499       */
500      public void testReadHoldingWriteLockFair3() throws InterruptedException {
501 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
502 <        lock.writeLock().lock();
503 <        Thread t1 = new Thread(new Runnable() {
504 <                public void run() {
505 <                    lock.writeLock().lock();
506 <                    lock.writeLock().unlock();
507 <                }
508 <            });
509 <        Thread t2 = new Thread(new Runnable() {
510 <                public void run() {
511 <                    lock.writeLock().lock();
512 <                    lock.writeLock().unlock();
550 <                }
551 <            });
501 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
502 >        lock.writeLock().lock();
503 >        Thread t1 = newStartedThread(new CheckedRunnable() {
504 >            public void realRun() {
505 >                lock.writeLock().lock();
506 >                lock.writeLock().unlock();
507 >            }});
508 >        Thread t2 = newStartedThread(new CheckedRunnable() {
509 >            public void realRun() {
510 >                lock.writeLock().lock();
511 >                lock.writeLock().unlock();
512 >            }});
513  
553        t1.start();
554        t2.start();
514          lock.readLock().lock();
515          lock.readLock().unlock();
516          Thread.sleep(SHORT_DELAY_MS);
517          lock.readLock().lock();
518          lock.readLock().unlock();
519          lock.writeLock().unlock();
520 <        t1.join(MEDIUM_DELAY_MS);
521 <        t2.join(MEDIUM_DELAY_MS);
563 <        assertTrue(!t1.isAlive());
564 <        assertTrue(!t2.isAlive());
520 >        awaitTermination(t1, LONG_DELAY_MS);
521 >        awaitTermination(t2, LONG_DELAY_MS);
522      }
523  
524  
# Line 570 | Line 527 | public class ReentrantReadWriteLockTest
527       * other threads are waiting for writelock
528       */
529      public void testWriteHoldingWriteLockFair4() throws InterruptedException {
530 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
531 <        lock.writeLock().lock();
532 <        Thread t1 = new Thread(new Runnable() {
533 <                public void run() {
534 <                    lock.writeLock().lock();
535 <                    lock.writeLock().unlock();
536 <                }
537 <            });
538 <        Thread t2 = new Thread(new Runnable() {
539 <                public void run() {
540 <                    lock.writeLock().lock();
541 <                    lock.writeLock().unlock();
585 <                }
586 <            });
530 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
531 >        lock.writeLock().lock();
532 >        Thread t1 = newStartedThread(new CheckedRunnable() {
533 >            public void realRun() {
534 >                lock.writeLock().lock();
535 >                lock.writeLock().unlock();
536 >            }});
537 >        Thread t2 = newStartedThread(new CheckedRunnable() {
538 >            public void realRun() {
539 >                lock.writeLock().lock();
540 >                lock.writeLock().unlock();
541 >            }});
542  
588        t1.start();
589        t2.start();
543          Thread.sleep(SHORT_DELAY_MS);
544          assertTrue(lock.isWriteLockedByCurrentThread());
545 <        assertTrue(lock.getWriteHoldCount() == 1);
545 >        assertEquals(1, lock.getWriteHoldCount());
546          lock.writeLock().lock();
547 <        assertTrue(lock.getWriteHoldCount() == 2);
547 >        assertEquals(2, lock.getWriteHoldCount());
548          lock.writeLock().unlock();
549          lock.writeLock().lock();
550          lock.writeLock().unlock();
551          lock.writeLock().unlock();
552 <        t1.join(MEDIUM_DELAY_MS);
553 <        t2.join(MEDIUM_DELAY_MS);
601 <        assertTrue(!t1.isAlive());
602 <        assertTrue(!t2.isAlive());
552 >        awaitTermination(t1, LONG_DELAY_MS);
553 >        awaitTermination(t2, LONG_DELAY_MS);
554      }
555  
556  
# Line 607 | Line 558 | public class ReentrantReadWriteLockTest
558       * Read tryLock succeeds if readlocked but not writelocked
559       */
560      public void testTryLockWhenReadLocked() throws InterruptedException {
561 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
562 <        lock.readLock().lock();
563 <        Thread t = new Thread(new Runnable() {
564 <                public void run() {
565 <                    threadAssertTrue(lock.readLock().tryLock());
566 <                    lock.readLock().unlock();
567 <                }
617 <            });
561 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
562 >        lock.readLock().lock();
563 >        Thread t = newStartedThread(new CheckedRunnable() {
564 >            public void realRun() {
565 >                assertTrue(lock.readLock().tryLock());
566 >                lock.readLock().unlock();
567 >            }});
568  
569 <        t.start();
620 <        t.join();
569 >        awaitTermination(t, LONG_DELAY_MS);
570          lock.readLock().unlock();
571      }
572  
624
625
573      /**
574       * write tryLock fails when readlocked
575       */
576      public void testWriteTryLockWhenReadLocked() throws InterruptedException {
577 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
578 <        lock.readLock().lock();
579 <        Thread t = new Thread(new Runnable() {
580 <                public void run() {
581 <                    threadAssertFalse(lock.writeLock().tryLock());
582 <                }
636 <            });
577 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
578 >        lock.readLock().lock();
579 >        Thread t = newStartedThread(new CheckedRunnable() {
580 >            public void realRun() {
581 >                assertFalse(lock.writeLock().tryLock());
582 >            }});
583  
584 <        t.start();
639 <        t.join();
584 >        awaitTermination(t, LONG_DELAY_MS);
585          lock.readLock().unlock();
586      }
587  
# Line 645 | Line 590 | public class ReentrantReadWriteLockTest
590       * Fair Read tryLock succeeds if readlocked but not writelocked
591       */
592      public void testTryLockWhenReadLockedFair() throws InterruptedException {
593 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
594 <        lock.readLock().lock();
595 <        Thread t = new Thread(new Runnable() {
596 <                public void run() {
597 <                    threadAssertTrue(lock.readLock().tryLock());
598 <                    lock.readLock().unlock();
599 <                }
655 <            });
593 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
594 >        lock.readLock().lock();
595 >        Thread t = newStartedThread(new CheckedRunnable() {
596 >            public void realRun() {
597 >                assertTrue(lock.readLock().tryLock());
598 >                lock.readLock().unlock();
599 >            }});
600  
601 <        t.start();
658 <        t.join();
601 >        awaitTermination(t, LONG_DELAY_MS);
602          lock.readLock().unlock();
603      }
604  
# Line 665 | Line 608 | public class ReentrantReadWriteLockTest
608       * Fair write tryLock fails when readlocked
609       */
610      public void testWriteTryLockWhenReadLockedFair() throws InterruptedException {
611 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
612 <        lock.readLock().lock();
613 <        Thread t = new Thread(new Runnable() {
614 <                public void run() {
615 <                    threadAssertFalse(lock.writeLock().tryLock());
616 <                }
674 <            });
611 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
612 >        lock.readLock().lock();
613 >        Thread t = newStartedThread(new CheckedRunnable() {
614 >            public void realRun() {
615 >                assertFalse(lock.writeLock().tryLock());
616 >            }});
617  
618 <        t.start();
677 <        t.join();
618 >        awaitTermination(t, LONG_DELAY_MS);
619          lock.readLock().unlock();
620      }
621  
# Line 684 | Line 625 | public class ReentrantReadWriteLockTest
625       * write timed tryLock times out if locked
626       */
627      public void testWriteTryLock_Timeout() throws InterruptedException {
628 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
629 <        lock.writeLock().lock();
630 <        Thread t = new Thread(new CheckedRunnable() {
628 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
629 >        lock.writeLock().lock();
630 >        Thread t = newStartedThread(new CheckedRunnable() {
631              public void realRun() throws InterruptedException {
632 <                threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
632 >                assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
633              }});
634  
635 <        t.start();
695 <        t.join();
635 >        awaitTermination(t, LONG_DELAY_MS);
636          assertTrue(lock.writeLock().isHeldByCurrentThread());
637          lock.writeLock().unlock();
638      }
# Line 701 | Line 641 | public class ReentrantReadWriteLockTest
641       * read timed tryLock times out if write-locked
642       */
643      public void testReadTryLock_Timeout() throws InterruptedException {
644 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
645 <        lock.writeLock().lock();
646 <        Thread t = new Thread(new CheckedRunnable() {
644 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
645 >        lock.writeLock().lock();
646 >        Thread t = newStartedThread(new CheckedRunnable() {
647              public void realRun() throws InterruptedException {
648 <                threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
648 >                assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
649              }});
650  
651 <        t.start();
712 <        t.join();
651 >        awaitTermination(t, LONG_DELAY_MS);
652          assertTrue(lock.writeLock().isHeldByCurrentThread());
653          lock.writeLock().unlock();
654      }
# Line 719 | Line 658 | public class ReentrantReadWriteLockTest
658       * write lockInterruptibly succeeds if lock free else is interruptible
659       */
660      public void testWriteLockInterruptibly() throws InterruptedException {
661 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
661 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
662          lock.writeLock().lockInterruptibly();
663 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
663 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
664              public void realRun() throws InterruptedException {
665                  lock.writeLock().lockInterruptibly();
666              }});
667  
729        t.start();
668          Thread.sleep(SHORT_DELAY_MS);
669          t.interrupt();
670 <        Thread.sleep(SHORT_DELAY_MS);
671 <        t.join();
734 <        lock.writeLock().unlock();
670 >        awaitTermination(t, LONG_DELAY_MS);
671 >        releaseWriteLock(lock);
672      }
673  
674      /**
675 <     *  read lockInterruptibly succeeds if lock free else is interruptible
675 >     * read lockInterruptibly succeeds if lock free else is interruptible
676       */
677      public void testReadLockInterruptibly() throws InterruptedException {
678 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
678 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
679          lock.writeLock().lockInterruptibly();
680 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
680 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
681              public void realRun() throws InterruptedException {
682                  lock.readLock().lockInterruptibly();
683              }});
684  
748        t.start();
685          Thread.sleep(SHORT_DELAY_MS);
686          t.interrupt();
687 <        t.join();
688 <        lock.writeLock().unlock();
687 >        awaitTermination(t, LONG_DELAY_MS);
688 >        releaseWriteLock(lock);
689      }
690  
691      /**
692       * Calling await without holding lock throws IllegalMonitorStateException
693       */
694      public void testAwait_IllegalMonitor() throws InterruptedException {
695 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
695 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
696          final Condition c = lock.writeLock().newCondition();
697          try {
698              c.await();
# Line 768 | Line 704 | public class ReentrantReadWriteLockTest
704       * Calling signal without holding lock throws IllegalMonitorStateException
705       */
706      public void testSignal_IllegalMonitor() {
707 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
707 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
708          final Condition c = lock.writeLock().newCondition();
709          try {
710              c.signal();
# Line 780 | Line 716 | public class ReentrantReadWriteLockTest
716       * awaitNanos without a signal times out
717       */
718      public void testAwaitNanos_Timeout() throws InterruptedException {
719 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
719 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
720          final Condition c = lock.writeLock().newCondition();
721  
722          lock.writeLock().lock();
# Line 791 | Line 727 | public class ReentrantReadWriteLockTest
727  
728  
729      /**
730 <     *  timed await without a signal times out
730 >     * timed await without a signal times out
731       */
732      public void testAwait_Timeout() throws InterruptedException {
733 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
733 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
734          final Condition c = lock.writeLock().newCondition();
735          lock.writeLock().lock();
736 <        assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
736 >        assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
737          lock.writeLock().unlock();
738      }
739  
# Line 805 | Line 741 | public class ReentrantReadWriteLockTest
741       * awaitUntil without a signal times out
742       */
743      public void testAwaitUntil_Timeout() throws InterruptedException {
744 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
744 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
745          final Condition c = lock.writeLock().newCondition();
746          lock.writeLock().lock();
747          java.util.Date d = new java.util.Date();
# Line 817 | Line 753 | public class ReentrantReadWriteLockTest
753       * await returns when signalled
754       */
755      public void testAwait() throws InterruptedException {
756 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
756 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
757          final Condition c = lock.writeLock().newCondition();
758 <        Thread t = new Thread(new CheckedRunnable() {
758 >        Thread t = newStartedThread(new CheckedRunnable() {
759              public void realRun() throws InterruptedException {
760                  lock.writeLock().lock();
761                  c.await();
762                  lock.writeLock().unlock();
763              }});
764  
829        t.start();
765          Thread.sleep(SHORT_DELAY_MS);
766          lock.writeLock().lock();
767          c.signal();
768          lock.writeLock().unlock();
769 <        t.join(SHORT_DELAY_MS);
835 <        assertFalse(t.isAlive());
769 >        awaitTermination(t, LONG_DELAY_MS);
770      }
771  
772      /** A helper class for uninterruptible wait tests */
# Line 885 | Line 819 | public class ReentrantReadWriteLockTest
819              lock.writeLock().unlock();
820          }
821  
822 <        thread.join();
822 >        awaitTermination(thread, LONG_DELAY_MS);
823          assertTrue(thread.interrupted);
890        assertFalse(thread.isAlive());
824      }
825  
826      /**
827       * await is interruptible
828       */
829      public void testAwait_Interrupt() throws InterruptedException {
830 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
830 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
831          final Condition c = lock.writeLock().newCondition();
832 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
832 >        final CountDownLatch locked = new CountDownLatch(1);
833 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
834              public void realRun() throws InterruptedException {
835                  lock.writeLock().lock();
836 <                c.await();
837 <                lock.writeLock().unlock();
836 >                assertTrue(lock.isWriteLocked());
837 >                locked.countDown();
838 >                try { c.await(); }
839 >                finally { lock.writeLock().unlock(); }
840              }});
841  
842 <        t.start();
843 <        Thread.sleep(SHORT_DELAY_MS);
842 >        locked.await();
843 >        while (lock.isWriteLocked())
844 >            Thread.yield();
845          t.interrupt();
846 <        t.join(SHORT_DELAY_MS);
847 <        assertFalse(t.isAlive());
846 >        awaitTermination(t, LONG_DELAY_MS);
847 >        assertFalse(lock.isWriteLocked());
848      }
849  
850      /**
851       * awaitNanos is interruptible
852       */
853      public void testAwaitNanos_Interrupt() throws InterruptedException {
854 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
854 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
855          final Condition c = lock.writeLock().newCondition();
856 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
856 >        final CountDownLatch locked = new CountDownLatch(1);
857 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
858              public void realRun() throws InterruptedException {
859                  lock.writeLock().lock();
860 <                c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
861 <                lock.writeLock().unlock();
860 >                assertTrue(lock.isWriteLocked());
861 >                locked.countDown();
862 >                try { c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS)); }
863 >                finally { lock.writeLock().unlock(); }
864              }});
865  
866 <        t.start();
867 <        Thread.sleep(SHORT_DELAY_MS);
866 >        locked.await();
867 >        while (lock.isWriteLocked())
868 >            Thread.yield();
869          t.interrupt();
870 <        t.join(SHORT_DELAY_MS);
871 <        assertFalse(t.isAlive());
870 >        awaitTermination(t, LONG_DELAY_MS);
871 >        assertFalse(lock.isWriteLocked());
872      }
873  
874      /**
875       * awaitUntil is interruptible
876       */
877      public void testAwaitUntil_Interrupt() throws InterruptedException {
878 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
878 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
879          final Condition c = lock.writeLock().newCondition();
880 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
880 >        final CountDownLatch locked = new CountDownLatch(1);
881 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
882              public void realRun() throws InterruptedException {
883                  lock.writeLock().lock();
884 +                assertTrue(lock.isWriteLocked());
885 +                locked.countDown();
886                  java.util.Date d = new java.util.Date();
887 <                c.awaitUntil(new java.util.Date(d.getTime() + 10000));
888 <                lock.writeLock().unlock();
887 >                try { c.awaitUntil(new java.util.Date(d.getTime() + 10000)); }
888 >                finally { lock.writeLock().unlock(); }
889              }});
890  
891 <        t.start();
892 <        Thread.sleep(SHORT_DELAY_MS);
891 >        locked.await();
892 >        while (lock.isWriteLocked())
893 >            Thread.yield();
894          t.interrupt();
895 <        t.join(SHORT_DELAY_MS);
896 <        assertFalse(t.isAlive());
895 >        awaitTermination(t, LONG_DELAY_MS);
896 >        assertFalse(lock.isWriteLocked());
897      }
898  
899      /**
900       * signalAll wakes up all threads
901       */
902      public void testSignalAll() throws InterruptedException {
903 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
903 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
904          final Condition c = lock.writeLock().newCondition();
905 <        Thread t1 = new Thread(new CheckedRunnable() {
905 >        Thread t1 = newStartedThread(new CheckedRunnable() {
906              public void realRun() throws InterruptedException {
907                  lock.writeLock().lock();
908                  c.await();
909                  lock.writeLock().unlock();
910              }});
911  
912 <        Thread t2 = new Thread(new CheckedRunnable() {
912 >        Thread t2 = newStartedThread(new CheckedRunnable() {
913              public void realRun() throws InterruptedException {
914                  lock.writeLock().lock();
915                  c.await();
916                  lock.writeLock().unlock();
917              }});
918  
974        t1.start();
975        t2.start();
919          Thread.sleep(SHORT_DELAY_MS);
920          lock.writeLock().lock();
921          c.signalAll();
922          lock.writeLock().unlock();
923 <        t1.join(SHORT_DELAY_MS);
924 <        t2.join(SHORT_DELAY_MS);
982 <        assertFalse(t1.isAlive());
983 <        assertFalse(t2.isAlive());
923 >        awaitTermination(t1, LONG_DELAY_MS);
924 >        awaitTermination(t2, LONG_DELAY_MS);
925      }
926  
927      /**
# Line 1007 | Line 948 | public class ReentrantReadWriteLockTest
948       * hasQueuedThreads reports whether there are waiting threads
949       */
950      public void testhasQueuedThreads() throws InterruptedException {
951 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
951 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
952          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
953          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
954          assertFalse(lock.hasQueuedThreads());
# Line 1024 | Line 965 | public class ReentrantReadWriteLockTest
965          lock.writeLock().unlock();
966          Thread.sleep(SHORT_DELAY_MS);
967          assertFalse(lock.hasQueuedThreads());
968 <        t1.join();
969 <        t2.join();
968 >        awaitTermination(t1, LONG_DELAY_MS);
969 >        awaitTermination(t2, LONG_DELAY_MS);
970      }
971  
972      /**
973       * hasQueuedThread(null) throws NPE
974       */
975      public void testHasQueuedThreadNPE() {
976 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
976 >        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
977          try {
978              sync.hasQueuedThread(null);
979              shouldThrow();
# Line 1043 | Line 984 | public class ReentrantReadWriteLockTest
984       * hasQueuedThread reports whether a thread is queued.
985       */
986      public void testHasQueuedThread() throws InterruptedException {
987 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
987 >        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
988          Thread t1 = new Thread(new InterruptedLockRunnable(sync));
989          Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
990          assertFalse(sync.hasQueuedThread(t1));
# Line 1065 | Line 1006 | public class ReentrantReadWriteLockTest
1006          assertFalse(sync.hasQueuedThread(t1));
1007          Thread.sleep(SHORT_DELAY_MS);
1008          assertFalse(sync.hasQueuedThread(t2));
1009 <        t1.join();
1010 <        t2.join();
1009 >        awaitTermination(t1, LONG_DELAY_MS);
1010 >        awaitTermination(t2, LONG_DELAY_MS);
1011      }
1012  
1013  
# Line 1074 | Line 1015 | public class ReentrantReadWriteLockTest
1015       * getQueueLength reports number of waiting threads
1016       */
1017      public void testGetQueueLength() throws InterruptedException {
1018 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1018 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1019          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1020          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1021          assertEquals(0, lock.getQueueLength());
# Line 1091 | Line 1032 | public class ReentrantReadWriteLockTest
1032          lock.writeLock().unlock();
1033          Thread.sleep(SHORT_DELAY_MS);
1034          assertEquals(0, lock.getQueueLength());
1035 <        t1.join();
1036 <        t2.join();
1035 >        awaitTermination(t1, LONG_DELAY_MS);
1036 >        awaitTermination(t2, LONG_DELAY_MS);
1037      }
1038  
1039      /**
1040       * getQueuedThreads includes waiting threads
1041       */
1042      public void testGetQueuedThreads() throws InterruptedException {
1043 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1043 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1044          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1045          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1046          assertTrue(lock.getQueuedThreads().isEmpty());
# Line 1119 | Line 1060 | public class ReentrantReadWriteLockTest
1060          lock.writeLock().unlock();
1061          Thread.sleep(SHORT_DELAY_MS);
1062          assertTrue(lock.getQueuedThreads().isEmpty());
1063 <        t1.join();
1064 <        t2.join();
1063 >        awaitTermination(t1, LONG_DELAY_MS);
1064 >        awaitTermination(t2, LONG_DELAY_MS);
1065      }
1066  
1067      /**
1068       * hasWaiters throws NPE if null
1069       */
1070      public void testHasWaitersNPE() {
1071 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1071 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1072          try {
1073              lock.hasWaiters(null);
1074              shouldThrow();
# Line 1138 | Line 1079 | public class ReentrantReadWriteLockTest
1079       * getWaitQueueLength throws NPE if null
1080       */
1081      public void testGetWaitQueueLengthNPE() {
1082 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1082 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1083          try {
1084              lock.getWaitQueueLength(null);
1085              shouldThrow();
# Line 1150 | Line 1091 | public class ReentrantReadWriteLockTest
1091       * getWaitingThreads throws NPE if null
1092       */
1093      public void testGetWaitingThreadsNPE() {
1094 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1094 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1095          try {
1096              lock.getWaitingThreads(null);
1097              shouldThrow();
# Line 1161 | Line 1102 | public class ReentrantReadWriteLockTest
1102       * hasWaiters throws IAE if not owned
1103       */
1104      public void testHasWaitersIAE() {
1105 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1105 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1106          final Condition c = lock.writeLock().newCondition();
1107 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1107 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1108          try {
1109              lock2.hasWaiters(c);
1110              shouldThrow();
# Line 1174 | Line 1115 | public class ReentrantReadWriteLockTest
1115       * hasWaiters throws IMSE if not locked
1116       */
1117      public void testHasWaitersIMSE() {
1118 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1118 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1119          final Condition c = lock.writeLock().newCondition();
1120          try {
1121              lock.hasWaiters(c);
# Line 1187 | Line 1128 | public class ReentrantReadWriteLockTest
1128       * getWaitQueueLength throws IAE if not owned
1129       */
1130      public void testGetWaitQueueLengthIAE() {
1131 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1131 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1132          final Condition c = lock.writeLock().newCondition();
1133 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1133 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1134          try {
1135              lock2.getWaitQueueLength(c);
1136              shouldThrow();
# Line 1200 | Line 1141 | public class ReentrantReadWriteLockTest
1141       * getWaitQueueLength throws IMSE if not locked
1142       */
1143      public void testGetWaitQueueLengthIMSE() {
1144 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1144 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1145          final Condition c = lock.writeLock().newCondition();
1146          try {
1147              lock.getWaitQueueLength(c);
# Line 1213 | Line 1154 | public class ReentrantReadWriteLockTest
1154       * getWaitingThreads throws IAE if not owned
1155       */
1156      public void testGetWaitingThreadsIAE() {
1157 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1157 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1158          final Condition c = lock.writeLock().newCondition();
1159 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1159 >        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1160          try {
1161              lock2.getWaitingThreads(c);
1162              shouldThrow();
# Line 1226 | Line 1167 | public class ReentrantReadWriteLockTest
1167       * getWaitingThreads throws IMSE if not locked
1168       */
1169      public void testGetWaitingThreadsIMSE() {
1170 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1170 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1171          final Condition c = lock.writeLock().newCondition();
1172          try {
1173              lock.getWaitingThreads(c);
# Line 1239 | Line 1180 | public class ReentrantReadWriteLockTest
1180       * hasWaiters returns true when a thread is waiting, else false
1181       */
1182      public void testHasWaiters() throws InterruptedException {
1183 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1183 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1184          final Condition c = lock.writeLock().newCondition();
1185 <        Thread t = new Thread(new CheckedRunnable() {
1185 >        Thread t = newStartedThread(new CheckedRunnable() {
1186              public void realRun() throws InterruptedException {
1187                  lock.writeLock().lock();
1188 <                threadAssertFalse(lock.hasWaiters(c));
1189 <                threadAssertEquals(0, lock.getWaitQueueLength(c));
1188 >                assertFalse(lock.hasWaiters(c));
1189 >                assertEquals(0, lock.getWaitQueueLength(c));
1190                  c.await();
1191                  lock.writeLock().unlock();
1192              }});
1193  
1253        t.start();
1194          Thread.sleep(SHORT_DELAY_MS);
1195          lock.writeLock().lock();
1196          assertTrue(lock.hasWaiters(c));
# Line 1262 | Line 1202 | public class ReentrantReadWriteLockTest
1202          assertFalse(lock.hasWaiters(c));
1203          assertEquals(0, lock.getWaitQueueLength(c));
1204          lock.writeLock().unlock();
1205 <        t.join(SHORT_DELAY_MS);
1266 <        assertFalse(t.isAlive());
1205 >        awaitTermination(t, LONG_DELAY_MS);
1206      }
1207  
1208      /**
1209       * getWaitQueueLength returns number of waiting threads
1210       */
1211      public void testGetWaitQueueLength() throws InterruptedException {
1212 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1212 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1213          final Condition c = lock.writeLock().newCondition();
1214 <        Thread t = new Thread(new CheckedRunnable() {
1214 >        Thread t = newStartedThread(new CheckedRunnable() {
1215              public void realRun() throws InterruptedException {
1216                  lock.writeLock().lock();
1217 <                threadAssertFalse(lock.hasWaiters(c));
1218 <                threadAssertEquals(0, lock.getWaitQueueLength(c));
1217 >                assertFalse(lock.hasWaiters(c));
1218 >                assertEquals(0, lock.getWaitQueueLength(c));
1219                  c.await();
1220                  lock.writeLock().unlock();
1221              }});
1222  
1284        t.start();
1223          Thread.sleep(SHORT_DELAY_MS);
1224          lock.writeLock().lock();
1225          assertTrue(lock.hasWaiters(c));
# Line 1293 | Line 1231 | public class ReentrantReadWriteLockTest
1231          assertFalse(lock.hasWaiters(c));
1232          assertEquals(0, lock.getWaitQueueLength(c));
1233          lock.writeLock().unlock();
1234 <        t.join(SHORT_DELAY_MS);
1297 <        assertFalse(t.isAlive());
1234 >        awaitTermination(t, LONG_DELAY_MS);
1235      }
1236  
1237  
# Line 1302 | Line 1239 | public class ReentrantReadWriteLockTest
1239       * getWaitingThreads returns only and all waiting threads
1240       */
1241      public void testGetWaitingThreads() throws InterruptedException {
1242 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1242 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1243          final Condition c = lock.writeLock().newCondition();
1244 <        Thread t1 = new Thread(new CheckedRunnable() {
1244 >        Thread t1 = new Thread(new CheckedRunnable() {
1245              public void realRun() throws InterruptedException {
1246                  lock.writeLock().lock();
1247 <                threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1247 >                assertTrue(lock.getWaitingThreads(c).isEmpty());
1248                  c.await();
1249                  lock.writeLock().unlock();
1250              }});
1251  
1252 <        Thread t2 = new Thread(new CheckedRunnable() {
1252 >        Thread t2 = new Thread(new CheckedRunnable() {
1253              public void realRun() throws InterruptedException {
1254                  lock.writeLock().lock();
1255 <                threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1255 >                assertFalse(lock.getWaitingThreads(c).isEmpty());
1256                  c.await();
1257                  lock.writeLock().unlock();
1258              }});
# Line 1338 | Line 1275 | public class ReentrantReadWriteLockTest
1275          assertFalse(lock.hasWaiters(c));
1276          assertTrue(lock.getWaitingThreads(c).isEmpty());
1277          lock.writeLock().unlock();
1278 <        t1.join(SHORT_DELAY_MS);
1279 <        t2.join(SHORT_DELAY_MS);
1343 <        assertFalse(t1.isAlive());
1344 <        assertFalse(t2.isAlive());
1278 >        awaitTermination(t1, LONG_DELAY_MS);
1279 >        awaitTermination(t2, LONG_DELAY_MS);
1280      }
1281  
1282      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines