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.32 by jsr166, Tue Nov 17 14:18:28 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();
192 <        Thread t = new Thread(new Runnable() {
193 <                public void run() {
194 <                    try {
195 <                        lock.writeLock().lockInterruptibly();
196 <                        lock.writeLock().unlock();
197 <                        lock.writeLock().lockInterruptibly();
198 <                        lock.writeLock().unlock();
199 <                    } catch (InterruptedException success) {}
200 <                }
201 <            });
202 <
202 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
203          lock.writeLock().lock();
204 <        t.start();
204 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
205 >            public void realRun() throws InterruptedException {
206 >                lock.writeLock().lockInterruptibly();
207 >            }});
208 >
209          Thread.sleep(SHORT_DELAY_MS);
210          t.interrupt();
211 <        Thread.sleep(SHORT_DELAY_MS);
212 <        lock.writeLock().unlock();
209 <        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 Runnable() {
222 <                public void run() {
223 <                    try {
224 <                        lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
222 <                    } catch (InterruptedException success) {}
223 <                }
224 <            });
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(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 Runnable() {
239 <                public void run() {
240 <                    try {
241 <                        lock.readLock().lockInterruptibly();
242 <                    } catch (InterruptedException success) {}
243 <                }
244 <            });
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  
246        t.start();
243          Thread.sleep(SHORT_DELAY_MS);
244          t.interrupt();
245 <        Thread.sleep(SHORT_DELAY_MS);
246 <        lock.writeLock().unlock();
251 <        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 Runnable() {
256 <                public void run() {
257 <                    try {
258 <                        lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
264 <                        threadShouldThrow();
265 <                    } catch (InterruptedException success) {}
266 <                }
267 <            });
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(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 276 | 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 <                }
285 <            });
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();
289 <        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 <                }
302 <            });
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();
306 <        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 <                }
320 <            });
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();
323 <        t.join();
309 >        awaitTermination(t, LONG_DELAY_MS);
310          lock.readLock().unlock();
311      }
312  
# Line 328 | 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();
343 <                }
344 <            });
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  
346        t1.start();
347        t2.start();
330          Thread.sleep(SHORT_DELAY_MS);
331          lock.readLock().unlock();
332 <        t1.join(MEDIUM_DELAY_MS);
333 <        t2.join(MEDIUM_DELAY_MS);
352 <        assertTrue(!t1.isAlive());
353 <        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();
372 <                }
373 <            });
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  
375        t1.start();
376        t2.start();
353          Thread.sleep(SHORT_DELAY_MS);
354 <        lock.writeLock().unlock();
355 <        t1.join(MEDIUM_DELAY_MS);
356 <        t2.join(MEDIUM_DELAY_MS);
381 <        assertTrue(!t1.isAlive());
382 <        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 398 | 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();
413 <                }
414 <            });
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  
416        t1.start();
417        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);
426 <        assertTrue(!t1.isAlive());
427 <        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();
447 <                }
448 <            });
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  
450        t1.start();
451        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);
460 <        assertTrue(!t1.isAlive());
461 <        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();
482 <                }
483 <            });
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  
485        t1.start();
486        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);
495 <        assertTrue(!t1.isAlive());
496 <        assertTrue(!t2.isAlive());
451 >        awaitTermination(t1, LONG_DELAY_MS);
452 >        awaitTermination(t2, LONG_DELAY_MS);
453      }
454  
455  
# Line 501 | 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 513 | 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();
528 <                }
529 <            });
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  
531        t1.start();
532        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);
541 <        assertTrue(!t1.isAlive());
542 <        assertTrue(!t2.isAlive());
491 >        awaitTermination(t1, LONG_DELAY_MS);
492 >        awaitTermination(t2, LONG_DELAY_MS);
493      }
494  
495  
# Line 548 | 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();
563 <                }
564 <            });
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  
566        t1.start();
567        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);
576 <        assertTrue(!t1.isAlive());
577 <        assertTrue(!t2.isAlive());
520 >        awaitTermination(t1, LONG_DELAY_MS);
521 >        awaitTermination(t2, LONG_DELAY_MS);
522      }
523  
524  
# Line 583 | 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();
598 <                }
599 <            });
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  
601        t1.start();
602        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);
614 <        assertTrue(!t1.isAlive());
615 <        assertTrue(!t2.isAlive());
552 >        awaitTermination(t1, LONG_DELAY_MS);
553 >        awaitTermination(t2, LONG_DELAY_MS);
554      }
555  
556  
# Line 620 | 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 <                }
630 <            });
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();
633 <        t.join();
569 >        awaitTermination(t, LONG_DELAY_MS);
570          lock.readLock().unlock();
571      }
572  
637
638
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 <                }
649 <            });
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();
652 <        t.join();
584 >        awaitTermination(t, LONG_DELAY_MS);
585          lock.readLock().unlock();
586      }
587  
# Line 658 | 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 <                }
668 <            });
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();
671 <        t.join();
601 >        awaitTermination(t, LONG_DELAY_MS);
602          lock.readLock().unlock();
603      }
604  
# Line 678 | 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 <                }
687 <            });
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();
690 <        t.join();
618 >        awaitTermination(t, LONG_DELAY_MS);
619          lock.readLock().unlock();
620      }
621  
# Line 697 | 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 Runnable() {
631 <                public void run() {
632 <                    try {
633 <                        threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
706 <                    } catch (Exception ex) {
707 <                        threadUnexpectedException();
708 <                    }
709 <                }
710 <            });
628 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
629 >        lock.writeLock().lock();
630 >        Thread t = newStartedThread(new CheckedRunnable() {
631 >            public void realRun() throws InterruptedException {
632 >                assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
633 >            }});
634  
635 <        t.start();
636 <        t.join();
635 >        awaitTermination(t, LONG_DELAY_MS);
636 >        assertTrue(lock.writeLock().isHeldByCurrentThread());
637          lock.writeLock().unlock();
638      }
639  
# Line 718 | 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 Runnable() {
647 <                public void run() {
648 <                    try {
649 <                        threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
727 <                    } catch (Exception ex) {
728 <                        threadUnexpectedException();
729 <                    }
730 <                }
731 <            });
644 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
645 >        lock.writeLock().lock();
646 >        Thread t = newStartedThread(new CheckedRunnable() {
647 >            public void realRun() throws InterruptedException {
648 >                assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
649 >            }});
650  
651 <        t.start();
652 <        t.join();
651 >        awaitTermination(t, LONG_DELAY_MS);
652 >        assertTrue(lock.writeLock().isHeldByCurrentThread());
653          lock.writeLock().unlock();
654      }
655  
# Line 740 | 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 Runnable() {
664 <                public void run() {
665 <                    try {
666 <                        lock.writeLock().lockInterruptibly();
749 <                        threadShouldThrow();
750 <                    }
751 <                    catch (InterruptedException success) {
752 <                    }
753 <                }
754 <            });
663 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
664 >            public void realRun() throws InterruptedException {
665 >                lock.writeLock().lockInterruptibly();
666 >            }});
667  
756        t.start();
668          Thread.sleep(SHORT_DELAY_MS);
669          t.interrupt();
670 <        Thread.sleep(SHORT_DELAY_MS);
671 <        t.join();
761 <        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 Runnable() {
681 <                public void run() {
682 <                    try {
683 <                        lock.readLock().lockInterruptibly();
774 <                        threadShouldThrow();
775 <                    }
776 <                    catch (InterruptedException success) {
777 <                    }
778 <                }
779 <            });
680 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
681 >            public void realRun() throws InterruptedException {
682 >                lock.readLock().lockInterruptibly();
683 >            }});
684  
781        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 801 | 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 813 | 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 824 | 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() {
733 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
732 >    public void testAwait_Timeout() throws InterruptedException {
733 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
734          final Condition c = lock.writeLock().newCondition();
735          lock.writeLock().lock();
736 +        assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
737          lock.writeLock().unlock();
738      }
739  
740      /**
741       * awaitUntil without a signal times out
742       */
743 <    public void testAwaitUntil_Timeout() {
744 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
743 >    public void testAwaitUntil_Timeout() throws InterruptedException {
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();
748 +        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
749          lock.writeLock().unlock();
750      }
751  
# Line 848 | 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 Runnable() {
759 <                public void run() {
760 <                    try {
761 <                        lock.writeLock().lock();
762 <                        c.await();
763 <                        lock.writeLock().unlock();
859 <                    }
860 <                    catch (InterruptedException e) {
861 <                        threadUnexpectedException();
862 <                    }
863 <                }
864 <            });
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  
866        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);
872 <        assertFalse(t.isAlive());
769 >        awaitTermination(t, LONG_DELAY_MS);
770      }
771  
772      /** A helper class for uninterruptible wait tests */
# Line 922 | Line 819 | public class ReentrantReadWriteLockTest
819              lock.writeLock().unlock();
820          }
821  
822 <        thread.join();
822 >        awaitTermination(thread, LONG_DELAY_MS);
823          assertTrue(thread.interrupted);
927        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 Runnable() {
833 <                public void run() {
834 <                    try {
835 <                        lock.writeLock().lock();
836 <                        c.await();
837 <                        lock.writeLock().unlock();
838 <                        threadShouldThrow();
839 <                    }
840 <                    catch (InterruptedException success) {
841 <                    }
842 <                }
843 <            });
844 <
949 <        t.start();
950 <        Thread.sleep(SHORT_DELAY_MS);
832 >        final CountDownLatch locked = new CountDownLatch(1);
833 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
834 >            public void realRun() throws InterruptedException {
835 >                lock.writeLock().lock();
836 >                assertTrue(lock.isWriteLocked());
837 >                locked.countDown();
838 >                try { c.await(); }
839 >                finally { lock.writeLock().unlock(); }
840 >            }});
841 >
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 Runnable() {
857 <                public void run() {
858 <                    try {
859 <                        lock.writeLock().lock();
860 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
861 <                        lock.writeLock().unlock();
862 <                        threadShouldThrow();
863 <                    }
864 <                    catch (InterruptedException success) {
865 <                    }
866 <                }
867 <            });
868 <
975 <        t.start();
976 <        Thread.sleep(SHORT_DELAY_MS);
856 >        final CountDownLatch locked = new CountDownLatch(1);
857 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
858 >            public void realRun() throws InterruptedException {
859 >                lock.writeLock().lock();
860 >                assertTrue(lock.isWriteLocked());
861 >                locked.countDown();
862 >                try { c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS)); }
863 >                finally { lock.writeLock().unlock(); }
864 >            }});
865 >
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 Runnable() {
881 <                public void run() {
882 <                    try {
883 <                        lock.writeLock().lock();
884 <                        java.util.Date d = new java.util.Date();
885 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
886 <                        lock.writeLock().unlock();
887 <                        threadShouldThrow();
888 <                    }
889 <                    catch (InterruptedException success) {
890 <                    }
891 <                }
892 <            });
893 <
1002 <        t.start();
1003 <        Thread.sleep(SHORT_DELAY_MS);
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 >                try { c.awaitUntil(new java.util.Date(d.getTime() + 10000)); }
888 >                finally { lock.writeLock().unlock(); }
889 >            }});
890 >
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 Runnable() {
906 <                public void run() {
907 <                    try {
908 <                        lock.writeLock().lock();
909 <                        c.await();
910 <                        lock.writeLock().unlock();
911 <                    }
912 <                    catch (InterruptedException e) {
913 <                        threadUnexpectedException();
914 <                    }
915 <                }
916 <            });
917 <
1028 <        Thread t2 = new Thread(new Runnable() {
1029 <                public void run() {
1030 <                    try {
1031 <                        lock.writeLock().lock();
1032 <                        c.await();
1033 <                        lock.writeLock().unlock();
1034 <                    }
1035 <                    catch (InterruptedException e) {
1036 <                        threadUnexpectedException();
1037 <                    }
1038 <                }
1039 <            });
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 = newStartedThread(new CheckedRunnable() {
913 >            public void realRun() throws InterruptedException {
914 >                lock.writeLock().lock();
915 >                c.await();
916 >                lock.writeLock().unlock();
917 >            }});
918  
1041        t1.start();
1042        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);
1049 <        assertFalse(t1.isAlive());
1050 <        assertFalse(t2.isAlive());
923 >        awaitTermination(t1, LONG_DELAY_MS);
924 >        awaitTermination(t2, LONG_DELAY_MS);
925      }
926  
927      /**
# Line 1074 | 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 1091 | 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();
980 <        } catch (NullPointerException success) {
1107 <        }
980 >        } catch (NullPointerException success) {}
981      }
982  
983      /**
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 1133 | 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 1142 | 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 1159 | 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 1187 | 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 1206 | 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 1218 | 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 1229 | 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 1242 | 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 1255 | 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 1268 | 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 1281 | 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 1294 | 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 1307 | 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 Runnable() {
1186 <                public void run() {
1187 <                    try {
1188 <                        lock.writeLock().lock();
1189 <                        threadAssertFalse(lock.hasWaiters(c));
1190 <                        threadAssertEquals(0, lock.getWaitQueueLength(c));
1191 <                        c.await();
1192 <                        lock.writeLock().unlock();
1320 <                    }
1321 <                    catch (InterruptedException e) {
1322 <                        threadUnexpectedException();
1323 <                    }
1324 <                }
1325 <            });
1185 >        Thread t = newStartedThread(new CheckedRunnable() {
1186 >            public void realRun() throws InterruptedException {
1187 >                lock.writeLock().lock();
1188 >                assertFalse(lock.hasWaiters(c));
1189 >                assertEquals(0, lock.getWaitQueueLength(c));
1190 >                c.await();
1191 >                lock.writeLock().unlock();
1192 >            }});
1193  
1327        t.start();
1194          Thread.sleep(SHORT_DELAY_MS);
1195          lock.writeLock().lock();
1196          assertTrue(lock.hasWaiters(c));
# Line 1336 | 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);
1340 <        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 Runnable() {
1215 <                public void run() {
1216 <                    try {
1217 <                        lock.writeLock().lock();
1218 <                        threadAssertFalse(lock.hasWaiters(c));
1219 <                        threadAssertEquals(0, lock.getWaitQueueLength(c));
1220 <                        c.await();
1221 <                        lock.writeLock().unlock();
1357 <                    }
1358 <                    catch (InterruptedException e) {
1359 <                        threadUnexpectedException();
1360 <                    }
1361 <                }
1362 <            });
1214 >        Thread t = newStartedThread(new CheckedRunnable() {
1215 >            public void realRun() throws InterruptedException {
1216 >                lock.writeLock().lock();
1217 >                assertFalse(lock.hasWaiters(c));
1218 >                assertEquals(0, lock.getWaitQueueLength(c));
1219 >                c.await();
1220 >                lock.writeLock().unlock();
1221 >            }});
1222  
1364        t.start();
1223          Thread.sleep(SHORT_DELAY_MS);
1224          lock.writeLock().lock();
1225          assertTrue(lock.hasWaiters(c));
# Line 1373 | 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);
1377 <        assertFalse(t.isAlive());
1234 >        awaitTermination(t, LONG_DELAY_MS);
1235      }
1236  
1237  
# Line 1382 | 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 Runnable() {
1245 <                public void run() {
1246 <                    try {
1247 <                        lock.writeLock().lock();
1248 <                        threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1249 <                        c.await();
1250 <                        lock.writeLock().unlock();
1251 <                    }
1252 <                    catch (InterruptedException e) {
1253 <                        threadUnexpectedException();
1254 <                    }
1255 <                }
1256 <            });
1257 <
1258 <        Thread t2 = new Thread(new Runnable() {
1402 <                public void run() {
1403 <                    try {
1404 <                        lock.writeLock().lock();
1405 <                        threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1406 <                        c.await();
1407 <                        lock.writeLock().unlock();
1408 <                    }
1409 <                    catch (InterruptedException e) {
1410 <                        threadUnexpectedException();
1411 <                    }
1412 <                }
1413 <            });
1244 >        Thread t1 = new Thread(new CheckedRunnable() {
1245 >            public void realRun() throws InterruptedException {
1246 >                lock.writeLock().lock();
1247 >                assertTrue(lock.getWaitingThreads(c).isEmpty());
1248 >                c.await();
1249 >                lock.writeLock().unlock();
1250 >            }});
1251 >
1252 >        Thread t2 = new Thread(new CheckedRunnable() {
1253 >            public void realRun() throws InterruptedException {
1254 >                lock.writeLock().lock();
1255 >                assertFalse(lock.getWaitingThreads(c).isEmpty());
1256 >                c.await();
1257 >                lock.writeLock().unlock();
1258 >            }});
1259  
1260          lock.writeLock().lock();
1261          assertTrue(lock.getWaitingThreads(c).isEmpty());
# Line 1430 | 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);
1435 <        assertFalse(t1.isAlive());
1436 <        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