ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ReentrantLockTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ReentrantLockTest.java (file contents):
Revision 1.31 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.48 by jsr166, Sat May 21 06:24:33 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 15 | Line 15 | import java.io.*;
15  
16   public class ReentrantLockTest 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(ReentrantLockTest.class);
# Line 32 | Line 32 | public class ReentrantLockTest extends J
32          }
33      }
34  
35
35      /**
36       * A runnable calling lockInterruptibly that expects to be
37       * interrupted
# Line 50 | Line 49 | public class ReentrantLockTest extends J
49       */
50      static class PublicReentrantLock extends ReentrantLock {
51          PublicReentrantLock() { super(); }
52 +        PublicReentrantLock(boolean fair) { super(fair); }
53 +        public Thread getOwner() {
54 +            return super.getOwner();
55 +        }
56          public Collection<Thread> getQueuedThreads() {
57              return super.getQueuedThreads();
58          }
59          public Collection<Thread> getWaitingThreads(Condition c) {
60              return super.getWaitingThreads(c);
61          }
62 +    }
63  
64 +    /**
65 +     * Releases write lock, checking that it had a hold count of 1.
66 +     */
67 +    void releaseLock(PublicReentrantLock lock) {
68 +        assertLockedByMoi(lock);
69 +        lock.unlock();
70 +        assertFalse(lock.isHeldByCurrentThread());
71 +        assertNotLocked(lock);
72 +    }
73  
74 +    /**
75 +     * Spin-waits until lock.hasQueuedThread(t) becomes true.
76 +     */
77 +    void waitForQueuedThread(PublicReentrantLock lock, Thread t) {
78 +        long startTime = System.nanoTime();
79 +        while (!lock.hasQueuedThread(t)) {
80 +            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
81 +                throw new AssertionFailedError("timed out");
82 +            Thread.yield();
83 +        }
84 +        assertTrue(t.isAlive());
85 +        assertTrue(lock.getOwner() != t);
86      }
87  
88      /**
89 <     * Constructor sets given fairness
89 >     * Checks that lock is not locked.
90       */
91 <    public void testConstructor() {
92 <        assertFalse(new ReentrantLock().isFair());
93 <        assertFalse(new ReentrantLock(false).isFair());
94 <        assertTrue(new ReentrantLock(true).isFair());
91 >    void assertNotLocked(PublicReentrantLock lock) {
92 >        assertFalse(lock.isLocked());
93 >        assertFalse(lock.isHeldByCurrentThread());
94 >        assertNull(lock.getOwner());
95 >        assertEquals(0, lock.getHoldCount());
96      }
97  
98      /**
99 <     * locking an unlocked lock succeeds
99 >     * Checks that lock is locked by the given thread.
100 >     */
101 >    void assertLockedBy(PublicReentrantLock lock, Thread t) {
102 >        assertTrue(lock.isLocked());
103 >        assertSame(t, lock.getOwner());
104 >        assertEquals(t == Thread.currentThread(),
105 >                     lock.isHeldByCurrentThread());
106 >        assertEquals(t == Thread.currentThread(),
107 >                     lock.getHoldCount() > 0);
108 >    }
109 >
110 >    /**
111 >     * Checks that lock is locked by the current thread.
112       */
113 <    public void testLock() {
114 <        ReentrantLock rl = new ReentrantLock();
77 <        rl.lock();
78 <        assertTrue(rl.isLocked());
79 <        rl.unlock();
80 <        assertFalse(rl.isLocked());
113 >    void assertLockedByMoi(PublicReentrantLock lock) {
114 >        assertLockedBy(lock, Thread.currentThread());
115      }
116  
117      /**
118 <     * locking an unlocked fair lock succeeds
119 <     */
120 <    public void testFairLock() {
121 <        ReentrantLock rl = new ReentrantLock(true);
122 <        rl.lock();
123 <        assertTrue(rl.isLocked());
124 <        rl.unlock();
118 >     * Checks that condition c has no waiters.
119 >     */
120 >    void assertHasNoWaiters(PublicReentrantLock lock, Condition c) {
121 >        assertHasWaiters(lock, c, new Thread[] {});
122 >    }
123 >
124 >    /**
125 >     * Checks that condition c has exactly the given waiter threads.
126 >     */
127 >    void assertHasWaiters(PublicReentrantLock lock, Condition c,
128 >                          Thread... threads) {
129 >        lock.lock();
130 >        assertEquals(threads.length > 0, lock.hasWaiters(c));
131 >        assertEquals(threads.length, lock.getWaitQueueLength(c));
132 >        assertEquals(threads.length == 0, lock.getWaitingThreads(c).isEmpty());
133 >        assertEquals(threads.length, lock.getWaitingThreads(c).size());
134 >        assertEquals(new HashSet<Thread>(lock.getWaitingThreads(c)),
135 >                     new HashSet<Thread>(Arrays.asList(threads)));
136 >        lock.unlock();
137 >    }
138 >
139 >    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
140 >
141 >    /**
142 >     * Awaits condition using the specified AwaitMethod.
143 >     */
144 >    void await(Condition c, AwaitMethod awaitMethod)
145 >            throws InterruptedException {
146 >        long timeoutMillis = 2 * LONG_DELAY_MS;
147 >        switch (awaitMethod) {
148 >        case await:
149 >            c.await();
150 >            break;
151 >        case awaitTimed:
152 >            assertTrue(c.await(timeoutMillis, MILLISECONDS));
153 >            break;
154 >        case awaitNanos:
155 >            long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
156 >            long nanosRemaining = c.awaitNanos(nanosTimeout);
157 >            assertTrue(nanosRemaining > 0);
158 >            break;
159 >        case awaitUntil:
160 >            assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
161 >            break;
162 >        }
163 >    }
164 >
165 >    /**
166 >     * Constructor sets given fairness, and is in unlocked state
167 >     */
168 >    public void testConstructor() {
169 >        PublicReentrantLock lock;
170 >
171 >        lock = new PublicReentrantLock();
172 >        assertFalse(lock.isFair());
173 >        assertNotLocked(lock);
174 >
175 >        lock = new PublicReentrantLock(true);
176 >        assertTrue(lock.isFair());
177 >        assertNotLocked(lock);
178 >
179 >        lock = new PublicReentrantLock(false);
180 >        assertFalse(lock.isFair());
181 >        assertNotLocked(lock);
182 >    }
183 >
184 >    /**
185 >     * locking an unlocked lock succeeds
186 >     */
187 >    public void testLock()      { testLock(false); }
188 >    public void testLock_fair() { testLock(true); }
189 >    public void testLock(boolean fair) {
190 >        PublicReentrantLock lock = new PublicReentrantLock(fair);
191 >        lock.lock();
192 >        assertLockedByMoi(lock);
193 >        releaseLock(lock);
194      }
195  
196      /**
197       * Unlocking an unlocked lock throws IllegalMonitorStateException
198       */
199 <    public void testUnlock_IllegalMonitorStateException() {
200 <        ReentrantLock rl = new ReentrantLock();
199 >    public void testUnlock_IMSE()      { testUnlock_IMSE(false); }
200 >    public void testUnlock_IMSE_fair() { testUnlock_IMSE(true); }
201 >    public void testUnlock_IMSE(boolean fair) {
202 >        ReentrantLock lock = new ReentrantLock(fair);
203          try {
204 <            rl.unlock();
204 >            lock.unlock();
205              shouldThrow();
206          } catch (IllegalMonitorStateException success) {}
207      }
# Line 104 | Line 209 | public class ReentrantLockTest extends J
209      /**
210       * tryLock on an unlocked lock succeeds
211       */
212 <    public void testTryLock() {
213 <        ReentrantLock rl = new ReentrantLock();
214 <        assertTrue(rl.tryLock());
215 <        assertTrue(rl.isLocked());
216 <        rl.unlock();
212 >    public void testTryLock()      { testTryLock(false); }
213 >    public void testTryLock_fair() { testTryLock(true); }
214 >    public void testTryLock(boolean fair) {
215 >        PublicReentrantLock lock = new PublicReentrantLock(fair);
216 >        assertTrue(lock.tryLock());
217 >        assertLockedByMoi(lock);
218 >        assertTrue(lock.tryLock());
219 >        assertLockedByMoi(lock);
220 >        lock.unlock();
221 >        releaseLock(lock);
222      }
223  
114
224      /**
225       * hasQueuedThreads reports whether there are waiting threads
226       */
227 <    public void testhasQueuedThreads() throws InterruptedException {
228 <        final ReentrantLock lock = new ReentrantLock();
227 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
228 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
229 >    public void testHasQueuedThreads(boolean fair) {
230 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
231          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
232          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
233          assertFalse(lock.hasQueuedThreads());
234          lock.lock();
235 +        assertFalse(lock.hasQueuedThreads());
236          t1.start();
237 <        Thread.sleep(SHORT_DELAY_MS);
237 >        waitForQueuedThread(lock, t1);
238          assertTrue(lock.hasQueuedThreads());
239          t2.start();
240 <        Thread.sleep(SHORT_DELAY_MS);
240 >        waitForQueuedThread(lock, t2);
241          assertTrue(lock.hasQueuedThreads());
242          t1.interrupt();
243 <        Thread.sleep(SHORT_DELAY_MS);
243 >        awaitTermination(t1);
244          assertTrue(lock.hasQueuedThreads());
245          lock.unlock();
246 <        Thread.sleep(SHORT_DELAY_MS);
246 >        awaitTermination(t2);
247          assertFalse(lock.hasQueuedThreads());
136        t1.join();
137        t2.join();
248      }
249  
250      /**
251       * getQueueLength reports number of waiting threads
252       */
253 <    public void testGetQueueLength() throws InterruptedException {
254 <        final ReentrantLock lock = new ReentrantLock();
253 >    public void testGetQueueLength()      { testGetQueueLength(false); }
254 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
255 >    public void testGetQueueLength(boolean fair) {
256 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
257          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
258          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
259          assertEquals(0, lock.getQueueLength());
260          lock.lock();
261          t1.start();
262 <        Thread.sleep(SHORT_DELAY_MS);
262 >        waitForQueuedThread(lock, t1);
263          assertEquals(1, lock.getQueueLength());
264          t2.start();
265 <        Thread.sleep(SHORT_DELAY_MS);
265 >        waitForQueuedThread(lock, t2);
266          assertEquals(2, lock.getQueueLength());
267          t1.interrupt();
268 <        Thread.sleep(SHORT_DELAY_MS);
268 >        awaitTermination(t1);
269          assertEquals(1, lock.getQueueLength());
270          lock.unlock();
271 <        Thread.sleep(SHORT_DELAY_MS);
271 >        awaitTermination(t2);
272          assertEquals(0, lock.getQueueLength());
161        t1.join();
162        t2.join();
163    }
164
165    /**
166     * getQueueLength reports number of waiting threads
167     */
168    public void testGetQueueLength_fair() throws InterruptedException {
169        final ReentrantLock lock = new ReentrantLock(true);
170        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
171        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
172        assertEquals(0, lock.getQueueLength());
173        lock.lock();
174        t1.start();
175        Thread.sleep(SHORT_DELAY_MS);
176        assertEquals(1, lock.getQueueLength());
177        t2.start();
178        Thread.sleep(SHORT_DELAY_MS);
179        assertEquals(2, lock.getQueueLength());
180        t1.interrupt();
181        Thread.sleep(SHORT_DELAY_MS);
182        assertEquals(1, lock.getQueueLength());
183        lock.unlock();
184        Thread.sleep(SHORT_DELAY_MS);
185        assertEquals(0, lock.getQueueLength());
186        t1.join();
187        t2.join();
273      }
274  
275      /**
276       * hasQueuedThread(null) throws NPE
277       */
278 <    public void testHasQueuedThreadNPE() {
279 <        final ReentrantLock sync = new ReentrantLock();
278 >    public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
279 >    public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
280 >    public void testHasQueuedThreadNPE(boolean fair) {
281 >        final ReentrantLock lock = new ReentrantLock(fair);
282          try {
283 <            sync.hasQueuedThread(null);
283 >            lock.hasQueuedThread(null);
284              shouldThrow();
285          } catch (NullPointerException success) {}
286      }
# Line 201 | Line 288 | public class ReentrantLockTest extends J
288      /**
289       * hasQueuedThread reports whether a thread is queued.
290       */
291 <    public void testHasQueuedThread() throws InterruptedException {
292 <        final ReentrantLock sync = new ReentrantLock();
293 <        Thread t1 = new Thread(new InterruptedLockRunnable(sync));
294 <        Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
295 <        assertFalse(sync.hasQueuedThread(t1));
296 <        assertFalse(sync.hasQueuedThread(t2));
297 <        sync.lock();
291 >    public void testHasQueuedThread()      { testHasQueuedThread(false); }
292 >    public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
293 >    public void testHasQueuedThread(boolean fair) {
294 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
295 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
296 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
297 >        assertFalse(lock.hasQueuedThread(t1));
298 >        assertFalse(lock.hasQueuedThread(t2));
299 >        lock.lock();
300          t1.start();
301 <        Thread.sleep(SHORT_DELAY_MS);
302 <        assertTrue(sync.hasQueuedThread(t1));
301 >        waitForQueuedThread(lock, t1);
302 >        assertTrue(lock.hasQueuedThread(t1));
303 >        assertFalse(lock.hasQueuedThread(t2));
304          t2.start();
305 <        Thread.sleep(SHORT_DELAY_MS);
306 <        assertTrue(sync.hasQueuedThread(t1));
307 <        assertTrue(sync.hasQueuedThread(t2));
305 >        waitForQueuedThread(lock, t2);
306 >        assertTrue(lock.hasQueuedThread(t1));
307 >        assertTrue(lock.hasQueuedThread(t2));
308          t1.interrupt();
309 <        Thread.sleep(SHORT_DELAY_MS);
310 <        assertFalse(sync.hasQueuedThread(t1));
311 <        assertTrue(sync.hasQueuedThread(t2));
312 <        sync.unlock();
313 <        Thread.sleep(SHORT_DELAY_MS);
314 <        assertFalse(sync.hasQueuedThread(t1));
315 <        Thread.sleep(SHORT_DELAY_MS);
226 <        assertFalse(sync.hasQueuedThread(t2));
227 <        t1.join();
228 <        t2.join();
309 >        awaitTermination(t1);
310 >        assertFalse(lock.hasQueuedThread(t1));
311 >        assertTrue(lock.hasQueuedThread(t2));
312 >        lock.unlock();
313 >        awaitTermination(t2);
314 >        assertFalse(lock.hasQueuedThread(t1));
315 >        assertFalse(lock.hasQueuedThread(t2));
316      }
317  
231
318      /**
319       * getQueuedThreads includes waiting threads
320       */
321 <    public void testGetQueuedThreads() throws InterruptedException {
322 <        final PublicReentrantLock lock = new PublicReentrantLock();
321 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
322 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
323 >    public void testGetQueuedThreads(boolean fair) {
324 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
325          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
326          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
327          assertTrue(lock.getQueuedThreads().isEmpty());
328          lock.lock();
329          assertTrue(lock.getQueuedThreads().isEmpty());
330          t1.start();
331 <        Thread.sleep(SHORT_DELAY_MS);
331 >        waitForQueuedThread(lock, t1);
332 >        assertEquals(1, lock.getQueuedThreads().size());
333          assertTrue(lock.getQueuedThreads().contains(t1));
334          t2.start();
335 <        Thread.sleep(SHORT_DELAY_MS);
335 >        waitForQueuedThread(lock, t2);
336 >        assertEquals(2, lock.getQueuedThreads().size());
337          assertTrue(lock.getQueuedThreads().contains(t1));
338          assertTrue(lock.getQueuedThreads().contains(t2));
339          t1.interrupt();
340 <        Thread.sleep(SHORT_DELAY_MS);
340 >        awaitTermination(t1);
341          assertFalse(lock.getQueuedThreads().contains(t1));
342          assertTrue(lock.getQueuedThreads().contains(t2));
343 +        assertEquals(1, lock.getQueuedThreads().size());
344          lock.unlock();
345 <        Thread.sleep(SHORT_DELAY_MS);
345 >        awaitTermination(t2);
346          assertTrue(lock.getQueuedThreads().isEmpty());
256        t1.join();
257        t2.join();
347      }
348  
260
349      /**
350       * timed tryLock is interruptible.
351       */
352 <    public void testInterruptedException2() throws InterruptedException {
353 <        final ReentrantLock lock = new ReentrantLock();
352 >    public void testTryLock_Interruptible()      { testTryLock_Interruptible(false); }
353 >    public void testTryLock_Interruptible_fair() { testTryLock_Interruptible(true); }
354 >    public void testTryLock_Interruptible(boolean fair) {
355 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
356          lock.lock();
357 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
357 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
358              public void realRun() throws InterruptedException {
359 <                lock.tryLock(MEDIUM_DELAY_MS,MILLISECONDS);
359 >                lock.tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
360              }});
361  
362 <        t.start();
362 >        waitForQueuedThread(lock, t);
363          t.interrupt();
364 <        t.join();
364 >        awaitTermination(t);
365 >        releaseLock(lock);
366      }
367  
277
368      /**
369 <     * TryLock on a locked lock fails
369 >     * tryLock on a locked lock fails
370       */
371 <    public void testTryLockWhenLocked() throws InterruptedException {
372 <        final ReentrantLock lock = new ReentrantLock();
371 >    public void testTryLockWhenLocked()      { testTryLockWhenLocked(false); }
372 >    public void testTryLockWhenLocked_fair() { testTryLockWhenLocked(true); }
373 >    public void testTryLockWhenLocked(boolean fair) {
374 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
375          lock.lock();
376 <        Thread t = new Thread(new CheckedRunnable() {
376 >        Thread t = newStartedThread(new CheckedRunnable() {
377              public void realRun() {
378 <                threadAssertFalse(lock.tryLock());
378 >                assertFalse(lock.tryLock());
379              }});
380  
381 <        t.start();
382 <        t.join();
291 <        lock.unlock();
381 >        awaitTermination(t);
382 >        releaseLock(lock);
383      }
384  
385      /**
386       * Timed tryLock on a locked lock times out
387       */
388 <    public void testTryLock_Timeout() throws InterruptedException {
389 <        final ReentrantLock lock = new ReentrantLock();
388 >    public void testTryLock_Timeout()      { testTryLock_Timeout(false); }
389 >    public void testTryLock_Timeout_fair() { testTryLock_Timeout(true); }
390 >    public void testTryLock_Timeout(boolean fair) {
391 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
392          lock.lock();
393 <        Thread t = new Thread(new CheckedRunnable() {
393 >        Thread t = newStartedThread(new CheckedRunnable() {
394              public void realRun() throws InterruptedException {
395 <                threadAssertFalse(lock.tryLock(1, MILLISECONDS));
395 >                long startTime = System.nanoTime();
396 >                long timeoutMillis = 10;
397 >                assertFalse(lock.tryLock(timeoutMillis, MILLISECONDS));
398 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
399              }});
400  
401 <        t.start();
402 <        t.join();
307 <        lock.unlock();
401 >        awaitTermination(t);
402 >        releaseLock(lock);
403      }
404  
405      /**
406       * getHoldCount returns number of recursive holds
407       */
408 <    public void testGetHoldCount() {
409 <        ReentrantLock lock = new ReentrantLock();
408 >    public void testGetHoldCount()      { testGetHoldCount(false); }
409 >    public void testGetHoldCount_fair() { testGetHoldCount(true); }
410 >    public void testGetHoldCount(boolean fair) {
411 >        ReentrantLock lock = new ReentrantLock(fair);
412          for (int i = 1; i <= SIZE; i++) {
413              lock.lock();
414              assertEquals(i, lock.getHoldCount());
# Line 322 | Line 419 | public class ReentrantLockTest extends J
419          }
420      }
421  
325
422      /**
423       * isLocked is true when locked and false when not
424       */
425 <    public void testIsLocked() throws InterruptedException {
426 <        final ReentrantLock lock = new ReentrantLock();
427 <        lock.lock();
428 <        assertTrue(lock.isLocked());
429 <        lock.unlock();
430 <        assertFalse(lock.isLocked());
431 <        Thread t = new Thread(new CheckedRunnable() {
432 <            public void realRun() throws InterruptedException {
433 <                lock.lock();
434 <                Thread.sleep(SMALL_DELAY_MS);
435 <                lock.unlock();
436 <            }});
437 <
438 <        t.start();
439 <        Thread.sleep(SHORT_DELAY_MS);
440 <        assertTrue(lock.isLocked());
441 <        t.join();
442 <        assertFalse(lock.isLocked());
443 <    }
444 <
445 <
446 <    /**
447 <     * lockInterruptibly is interruptible.
448 <     */
449 <    public void testLockInterruptibly1() throws InterruptedException {
450 <        final ReentrantLock lock = new ReentrantLock();
451 <        lock.lock();
452 <        Thread t = new Thread(new InterruptedLockRunnable(lock));
453 <        t.start();
454 <        Thread.sleep(SHORT_DELAY_MS);
455 <        t.interrupt();
456 <        Thread.sleep(SHORT_DELAY_MS);
361 <        lock.unlock();
362 <        t.join();
425 >    public void testIsLocked()      { testIsLocked(false); }
426 >    public void testIsLocked_fair() { testIsLocked(true); }
427 >    public void testIsLocked(boolean fair) {
428 >        try {
429 >            final ReentrantLock lock = new ReentrantLock(fair);
430 >            assertFalse(lock.isLocked());
431 >            lock.lock();
432 >            assertTrue(lock.isLocked());
433 >            lock.lock();
434 >            assertTrue(lock.isLocked());
435 >            lock.unlock();
436 >            assertTrue(lock.isLocked());
437 >            lock.unlock();
438 >            assertFalse(lock.isLocked());
439 >            final CyclicBarrier barrier = new CyclicBarrier(2);
440 >            Thread t = newStartedThread(new CheckedRunnable() {
441 >                    public void realRun() throws Exception {
442 >                        lock.lock();
443 >                        assertTrue(lock.isLocked());
444 >                        barrier.await();
445 >                        barrier.await();
446 >                        lock.unlock();
447 >                    }});
448 >
449 >            barrier.await();
450 >            assertTrue(lock.isLocked());
451 >            barrier.await();
452 >            awaitTermination(t);
453 >            assertFalse(lock.isLocked());
454 >        } catch (Exception e) {
455 >            threadUnexpectedException(e);
456 >        }
457      }
458  
459      /**
460       * lockInterruptibly succeeds when unlocked, else is interruptible
461       */
462 <    public void testLockInterruptibly2() throws InterruptedException {
463 <        final ReentrantLock lock = new ReentrantLock();
464 <        lock.lockInterruptibly();
465 <        Thread t = new Thread(new InterruptedLockRunnable(lock));
466 <        t.start();
462 >    public void testLockInterruptibly()      { testLockInterruptibly(false); }
463 >    public void testLockInterruptibly_fair() { testLockInterruptibly(true); }
464 >    public void testLockInterruptibly(boolean fair) {
465 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
466 >        try {
467 >            lock.lockInterruptibly();
468 >        } catch (InterruptedException ie) {
469 >            threadUnexpectedException(ie);
470 >        }
471 >        assertLockedByMoi(lock);
472 >        Thread t = newStartedThread(new InterruptedLockRunnable(lock));
473 >        waitForQueuedThread(lock, t);
474          t.interrupt();
475          assertTrue(lock.isLocked());
476          assertTrue(lock.isHeldByCurrentThread());
477 <        t.join();
477 >        awaitTermination(t);
478 >        releaseLock(lock);
479      }
480  
481      /**
482       * Calling await without holding lock throws IllegalMonitorStateException
483       */
484 <    public void testAwait_IllegalMonitor() throws InterruptedException {
485 <        final ReentrantLock lock = new ReentrantLock();
486 <        final Condition c = lock.newCondition();
487 <        try {
488 <            c.await();
489 <            shouldThrow();
490 <        } catch (IllegalMonitorStateException success) {}
484 >    public void testAwait_IMSE()      { testAwait_IMSE(false); }
485 >    public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
486 >    public void testAwait_IMSE(boolean fair) {
487 >        final ReentrantLock lock = new ReentrantLock(fair);
488 >        final Condition c = lock.newCondition();
489 >        for (AwaitMethod awaitMethod : AwaitMethod.values()) {
490 >            long startTime = System.nanoTime();
491 >            try {
492 >                await(c, awaitMethod);
493 >                shouldThrow();
494 >            } catch (IllegalMonitorStateException success) {
495 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
496 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
497 >        }
498      }
499  
500      /**
501       * Calling signal without holding lock throws IllegalMonitorStateException
502       */
503 <    public void testSignal_IllegalMonitor() {
504 <        final ReentrantLock lock = new ReentrantLock();
503 >    public void testSignal_IMSE()      { testSignal_IMSE(false); }
504 >    public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
505 >    public void testSignal_IMSE(boolean fair) {
506 >        final ReentrantLock lock = new ReentrantLock(fair);
507          final Condition c = lock.newCondition();
508          try {
509              c.signal();
# Line 403 | Line 514 | public class ReentrantLockTest extends J
514      /**
515       * awaitNanos without a signal times out
516       */
517 <    public void testAwaitNanos_Timeout() throws InterruptedException {
518 <        final ReentrantLock lock = new ReentrantLock();
519 <        final Condition c = lock.newCondition();
520 <        lock.lock();
521 <        long t = c.awaitNanos(100);
522 <        assertTrue(t <= 0);
523 <        lock.unlock();
517 >    public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
518 >    public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
519 >    public void testAwaitNanos_Timeout(boolean fair) {
520 >        try {
521 >            final ReentrantLock lock = new ReentrantLock(fair);
522 >            final Condition c = lock.newCondition();
523 >            lock.lock();
524 >            long startTime = System.nanoTime();
525 >            long timeoutMillis = 10;
526 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
527 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
528 >            assertTrue(nanosRemaining <= 0);
529 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
530 >            lock.unlock();
531 >        } catch (InterruptedException e) {
532 >            threadUnexpectedException(e);
533 >        }
534      }
535  
536      /**
537 <     *  timed await without a signal times out
537 >     * timed await without a signal times out
538       */
539 <    public void testAwait_Timeout() throws InterruptedException {
540 <        final ReentrantLock lock = new ReentrantLock();
541 <        final Condition c = lock.newCondition();
542 <        lock.lock();
543 <        assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
544 <        lock.unlock();
539 >    public void testAwait_Timeout()      { testAwait_Timeout(false); }
540 >    public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
541 >    public void testAwait_Timeout(boolean fair) {
542 >        try {
543 >            final ReentrantLock lock = new ReentrantLock(fair);
544 >            final Condition c = lock.newCondition();
545 >            lock.lock();
546 >            long startTime = System.nanoTime();
547 >            long timeoutMillis = 10;
548 >            assertFalse(c.await(timeoutMillis, MILLISECONDS));
549 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
550 >            lock.unlock();
551 >        } catch (InterruptedException e) {
552 >            threadUnexpectedException(e);
553 >        }
554      }
555  
556      /**
557       * awaitUntil without a signal times out
558       */
559 <    public void testAwaitUntil_Timeout() throws InterruptedException {
560 <        final ReentrantLock lock = new ReentrantLock();
561 <        final Condition c = lock.newCondition();
562 <        lock.lock();
563 <        java.util.Date d = new java.util.Date();
564 <        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
565 <        lock.unlock();
559 >    public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
560 >    public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
561 >    public void testAwaitUntil_Timeout(boolean fair) {
562 >        try {
563 >            final ReentrantLock lock = new ReentrantLock(fair);
564 >            final Condition c = lock.newCondition();
565 >            lock.lock();
566 >            long startTime = System.nanoTime();
567 >            long timeoutMillis = 10;
568 >            java.util.Date d = new java.util.Date();
569 >            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
570 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
571 >            lock.unlock();
572 >        } catch (InterruptedException e) {
573 >            threadUnexpectedException(e);
574 >        }
575      }
576  
577      /**
578       * await returns when signalled
579       */
580 <    public void testAwait() throws InterruptedException {
581 <        final ReentrantLock lock = new ReentrantLock();
580 >    public void testAwait()      { testAwait(false); }
581 >    public void testAwait_fair() { testAwait(true); }
582 >    public void testAwait(boolean fair) {
583 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
584          final Condition c = lock.newCondition();
585 <        Thread t = new Thread(new CheckedRunnable() {
585 >        final CountDownLatch locked = new CountDownLatch(1);
586 >        Thread t = newStartedThread(new CheckedRunnable() {
587              public void realRun() throws InterruptedException {
588                  lock.lock();
589 +                locked.countDown();
590                  c.await();
591                  lock.unlock();
592              }});
593  
594 <        t.start();
452 <        Thread.sleep(SHORT_DELAY_MS);
594 >        await(locked);
595          lock.lock();
596 +        assertHasWaiters(lock, c, t);
597          c.signal();
598 +        assertHasNoWaiters(lock, c);
599 +        assertTrue(t.isAlive());
600          lock.unlock();
601 <        t.join(SHORT_DELAY_MS);
457 <        assertFalse(t.isAlive());
601 >        awaitTermination(t);
602      }
603  
604      /**
605       * hasWaiters throws NPE if null
606       */
607 <    public void testHasWaitersNPE() {
608 <        final ReentrantLock lock = new ReentrantLock();
607 >    public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
608 >    public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
609 >    public void testHasWaitersNPE(boolean fair) {
610 >        final ReentrantLock lock = new ReentrantLock(fair);
611          try {
612              lock.hasWaiters(null);
613              shouldThrow();
# Line 471 | Line 617 | public class ReentrantLockTest extends J
617      /**
618       * getWaitQueueLength throws NPE if null
619       */
620 <    public void testGetWaitQueueLengthNPE() {
621 <        final ReentrantLock lock = new ReentrantLock();
620 >    public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
621 >    public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
622 >    public void testGetWaitQueueLengthNPE(boolean fair) {
623 >        final ReentrantLock lock = new ReentrantLock(fair);
624          try {
625              lock.getWaitQueueLength(null);
626              shouldThrow();
627          } catch (NullPointerException success) {}
628      }
629  
482
630      /**
631       * getWaitingThreads throws NPE if null
632       */
633 <    public void testGetWaitingThreadsNPE() {
634 <        final PublicReentrantLock lock = new PublicReentrantLock();
633 >    public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
634 >    public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
635 >    public void testGetWaitingThreadsNPE(boolean fair) {
636 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
637          try {
638              lock.getWaitingThreads(null);
639              shouldThrow();
640          } catch (NullPointerException success) {}
641      }
642  
494
643      /**
644 <     * hasWaiters throws IAE if not owned
644 >     * hasWaiters throws IllegalArgumentException if not owned
645       */
646 <    public void testHasWaitersIAE() {
647 <        final ReentrantLock lock = new ReentrantLock();
646 >    public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
647 >    public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
648 >    public void testHasWaitersIAE(boolean fair) {
649 >        final ReentrantLock lock = new ReentrantLock(fair);
650          final Condition c = lock.newCondition();
651 <        final ReentrantLock lock2 = new ReentrantLock();
651 >        final ReentrantLock lock2 = new ReentrantLock(fair);
652          try {
653              lock2.hasWaiters(c);
654              shouldThrow();
# Line 506 | Line 656 | public class ReentrantLockTest extends J
656      }
657  
658      /**
659 <     * hasWaiters throws IMSE if not locked
659 >     * hasWaiters throws IllegalMonitorStateException if not locked
660       */
661 <    public void testHasWaitersIMSE() {
662 <        final ReentrantLock lock = new ReentrantLock();
661 >    public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
662 >    public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
663 >    public void testHasWaitersIMSE(boolean fair) {
664 >        final ReentrantLock lock = new ReentrantLock(fair);
665          final Condition c = lock.newCondition();
666          try {
667              lock.hasWaiters(c);
# Line 517 | Line 669 | public class ReentrantLockTest extends J
669          } catch (IllegalMonitorStateException success) {}
670      }
671  
520
672      /**
673 <     * getWaitQueueLength throws IAE if not owned
673 >     * getWaitQueueLength throws IllegalArgumentException if not owned
674       */
675 <    public void testGetWaitQueueLengthIAE() {
676 <        final ReentrantLock lock = new ReentrantLock();
675 >    public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
676 >    public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
677 >    public void testGetWaitQueueLengthIAE(boolean fair) {
678 >        final ReentrantLock lock = new ReentrantLock(fair);
679          final Condition c = lock.newCondition();
680 <        final ReentrantLock lock2 = new ReentrantLock();
680 >        final ReentrantLock lock2 = new ReentrantLock(fair);
681          try {
682              lock2.getWaitQueueLength(c);
683              shouldThrow();
# Line 532 | Line 685 | public class ReentrantLockTest extends J
685      }
686  
687      /**
688 <     * getWaitQueueLength throws IMSE if not locked
688 >     * getWaitQueueLength throws IllegalMonitorStateException if not locked
689       */
690 <    public void testGetWaitQueueLengthIMSE() {
691 <        final ReentrantLock lock = new ReentrantLock();
690 >    public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
691 >    public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
692 >    public void testGetWaitQueueLengthIMSE(boolean fair) {
693 >        final ReentrantLock lock = new ReentrantLock(fair);
694          final Condition c = lock.newCondition();
695          try {
696              lock.getWaitQueueLength(c);
# Line 543 | Line 698 | public class ReentrantLockTest extends J
698          } catch (IllegalMonitorStateException success) {}
699      }
700  
546
701      /**
702 <     * getWaitingThreads throws IAE if not owned
702 >     * getWaitingThreads throws IllegalArgumentException if not owned
703       */
704 <    public void testGetWaitingThreadsIAE() {
705 <        final PublicReentrantLock lock = new PublicReentrantLock();
704 >    public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
705 >    public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
706 >    public void testGetWaitingThreadsIAE(boolean fair) {
707 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
708          final Condition c = lock.newCondition();
709 <        final PublicReentrantLock lock2 = new PublicReentrantLock();
709 >        final PublicReentrantLock lock2 = new PublicReentrantLock(fair);
710          try {
711              lock2.getWaitingThreads(c);
712              shouldThrow();
# Line 558 | Line 714 | public class ReentrantLockTest extends J
714      }
715  
716      /**
717 <     * getWaitingThreads throws IMSE if not locked
717 >     * getWaitingThreads throws IllegalMonitorStateException if not locked
718       */
719 <    public void testGetWaitingThreadsIMSE() {
720 <        final PublicReentrantLock lock = new PublicReentrantLock();
719 >    public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
720 >    public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
721 >    public void testGetWaitingThreadsIMSE(boolean fair) {
722 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
723          final Condition c = lock.newCondition();
724          try {
725              lock.getWaitingThreads(c);
# Line 569 | Line 727 | public class ReentrantLockTest extends J
727          } catch (IllegalMonitorStateException success) {}
728      }
729  
572
730      /**
731       * hasWaiters returns true when a thread is waiting, else false
732       */
733 <    public void testHasWaiters() throws InterruptedException {
734 <        final ReentrantLock lock = new ReentrantLock();
733 >    public void testHasWaiters()      { testHasWaiters(false); }
734 >    public void testHasWaiters_fair() { testHasWaiters(true); }
735 >    public void testHasWaiters(boolean fair) {
736 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
737          final Condition c = lock.newCondition();
738 <        Thread t = new Thread(new CheckedRunnable() {
738 >        final CountDownLatch locked = new CountDownLatch(1);
739 >        Thread t = newStartedThread(new CheckedRunnable() {
740              public void realRun() throws InterruptedException {
741                  lock.lock();
742 <                threadAssertFalse(lock.hasWaiters(c));
743 <                threadAssertEquals(0, lock.getWaitQueueLength(c));
742 >                assertHasNoWaiters(lock, c);
743 >                assertFalse(lock.hasWaiters(c));
744 >                locked.countDown();
745                  c.await();
746 +                assertHasNoWaiters(lock, c);
747 +                assertFalse(lock.hasWaiters(c));
748                  lock.unlock();
749              }});
750  
751 <        t.start();
589 <        Thread.sleep(SHORT_DELAY_MS);
751 >        await(locked);
752          lock.lock();
753 +        assertHasWaiters(lock, c, t);
754          assertTrue(lock.hasWaiters(c));
592        assertEquals(1, lock.getWaitQueueLength(c));
755          c.signal();
756 <        lock.unlock();
595 <        Thread.sleep(SHORT_DELAY_MS);
596 <        lock.lock();
756 >        assertHasNoWaiters(lock, c);
757          assertFalse(lock.hasWaiters(c));
598        assertEquals(0, lock.getWaitQueueLength(c));
758          lock.unlock();
759 <        t.join(SHORT_DELAY_MS);
760 <        assertFalse(t.isAlive());
759 >        awaitTermination(t);
760 >        assertHasNoWaiters(lock, c);
761      }
762  
763      /**
764       * getWaitQueueLength returns number of waiting threads
765       */
766 <    public void testGetWaitQueueLength() throws InterruptedException {
767 <        final ReentrantLock lock = new ReentrantLock();
766 >    public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
767 >    public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
768 >    public void testGetWaitQueueLength(boolean fair) {
769 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
770          final Condition c = lock.newCondition();
771 +        final CountDownLatch locked1 = new CountDownLatch(1);
772 +        final CountDownLatch locked2 = new CountDownLatch(1);
773          Thread t1 = new Thread(new CheckedRunnable() {
774              public void realRun() throws InterruptedException {
775                  lock.lock();
776 <                threadAssertFalse(lock.hasWaiters(c));
777 <                threadAssertEquals(0, lock.getWaitQueueLength(c));
776 >                assertFalse(lock.hasWaiters(c));
777 >                assertEquals(0, lock.getWaitQueueLength(c));
778 >                locked1.countDown();
779                  c.await();
780                  lock.unlock();
781              }});
# Line 619 | Line 783 | public class ReentrantLockTest extends J
783          Thread t2 = new Thread(new CheckedRunnable() {
784              public void realRun() throws InterruptedException {
785                  lock.lock();
786 <                threadAssertTrue(lock.hasWaiters(c));
787 <                threadAssertEquals(1, lock.getWaitQueueLength(c));
786 >                assertTrue(lock.hasWaiters(c));
787 >                assertEquals(1, lock.getWaitQueueLength(c));
788 >                locked2.countDown();
789                  c.await();
790                  lock.unlock();
791              }});
792  
793 +        lock.lock();
794 +        assertEquals(0, lock.getWaitQueueLength(c));
795 +        lock.unlock();
796 +
797          t1.start();
798 <        Thread.sleep(SHORT_DELAY_MS);
798 >        await(locked1);
799 >
800 >        lock.lock();
801 >        assertHasWaiters(lock, c, t1);
802 >        assertEquals(1, lock.getWaitQueueLength(c));
803 >        lock.unlock();
804 >
805          t2.start();
806 <        Thread.sleep(SHORT_DELAY_MS);
806 >        await(locked2);
807 >
808          lock.lock();
809 <        assertTrue(lock.hasWaiters(c));
809 >        assertHasWaiters(lock, c, t1, t2);
810          assertEquals(2, lock.getWaitQueueLength(c));
811          c.signalAll();
812 +        assertHasNoWaiters(lock, c);
813          lock.unlock();
814 <        Thread.sleep(SHORT_DELAY_MS);
815 <        lock.lock();
816 <        assertFalse(lock.hasWaiters(c));
817 <        assertEquals(0, lock.getWaitQueueLength(c));
818 <        lock.unlock();
642 <        t1.join(SHORT_DELAY_MS);
643 <        t2.join(SHORT_DELAY_MS);
644 <        assertFalse(t1.isAlive());
645 <        assertFalse(t2.isAlive());
814 >
815 >        awaitTermination(t1);
816 >        awaitTermination(t2);
817 >
818 >        assertHasNoWaiters(lock, c);
819      }
820  
821      /**
822       * getWaitingThreads returns only and all waiting threads
823       */
824 <    public void testGetWaitingThreads() throws InterruptedException {
825 <        final PublicReentrantLock lock = new PublicReentrantLock();
824 >    public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
825 >    public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
826 >    public void testGetWaitingThreads(boolean fair) {
827 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
828          final Condition c = lock.newCondition();
829 +        final CountDownLatch locked1 = new CountDownLatch(1);
830 +        final CountDownLatch locked2 = new CountDownLatch(1);
831          Thread t1 = new Thread(new CheckedRunnable() {
832              public void realRun() throws InterruptedException {
833                  lock.lock();
834 <                threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
834 >                assertTrue(lock.getWaitingThreads(c).isEmpty());
835 >                locked1.countDown();
836                  c.await();
837                  lock.unlock();
838              }});
# Line 662 | Line 840 | public class ReentrantLockTest extends J
840          Thread t2 = new Thread(new CheckedRunnable() {
841              public void realRun() throws InterruptedException {
842                  lock.lock();
843 <                threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
843 >                assertFalse(lock.getWaitingThreads(c).isEmpty());
844 >                locked2.countDown();
845                  c.await();
846                  lock.unlock();
847              }});
# Line 670 | Line 849 | public class ReentrantLockTest extends J
849          lock.lock();
850          assertTrue(lock.getWaitingThreads(c).isEmpty());
851          lock.unlock();
852 +
853          t1.start();
854 <        Thread.sleep(SHORT_DELAY_MS);
854 >        await(locked1);
855 >
856 >        lock.lock();
857 >        assertHasWaiters(lock, c, t1);
858 >        assertTrue(lock.getWaitingThreads(c).contains(t1));
859 >        assertFalse(lock.getWaitingThreads(c).contains(t2));
860 >        assertEquals(1, lock.getWaitingThreads(c).size());
861 >        lock.unlock();
862 >
863          t2.start();
864 <        Thread.sleep(SHORT_DELAY_MS);
864 >        await(locked2);
865 >
866          lock.lock();
867 <        assertTrue(lock.hasWaiters(c));
867 >        assertHasWaiters(lock, c, t1, t2);
868          assertTrue(lock.getWaitingThreads(c).contains(t1));
869          assertTrue(lock.getWaitingThreads(c).contains(t2));
870 +        assertEquals(2, lock.getWaitingThreads(c).size());
871          c.signalAll();
872 +        assertHasNoWaiters(lock, c);
873          lock.unlock();
683        Thread.sleep(SHORT_DELAY_MS);
684        lock.lock();
685        assertFalse(lock.hasWaiters(c));
686        assertTrue(lock.getWaitingThreads(c).isEmpty());
687        lock.unlock();
688        t1.join(SHORT_DELAY_MS);
689        t2.join(SHORT_DELAY_MS);
690        assertFalse(t1.isAlive());
691        assertFalse(t2.isAlive());
692    }
874  
875 <    /** A helper class for uninterruptible wait tests */
876 <    class UninterruptibleThread extends Thread {
696 <        private ReentrantLock lock;
697 <        private Condition c;
698 <
699 <        public volatile boolean canAwake = false;
700 <        public volatile boolean interrupted = false;
701 <        public volatile boolean lockStarted = false;
702 <
703 <        public UninterruptibleThread(ReentrantLock lock, Condition c) {
704 <            this.lock = lock;
705 <            this.c = c;
706 <        }
707 <
708 <        public synchronized void run() {
709 <            lock.lock();
710 <            lockStarted = true;
711 <
712 <            while (!canAwake) {
713 <                c.awaitUninterruptibly();
714 <            }
875 >        awaitTermination(t1);
876 >        awaitTermination(t2);
877  
878 <            interrupted = isInterrupted();
717 <            lock.unlock();
718 <        }
878 >        assertHasNoWaiters(lock, c);
879      }
880  
881      /**
882       * awaitUninterruptibly doesn't abort on interrupt
883       */
884 <    public void testAwaitUninterruptibly() throws InterruptedException {
885 <        final ReentrantLock lock = new ReentrantLock();
884 >    public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
885 >    public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
886 >    public void testAwaitUninterruptibly(boolean fair) {
887 >        final ReentrantLock lock = new ReentrantLock(fair);
888          final Condition c = lock.newCondition();
889 <        UninterruptibleThread thread = new UninterruptibleThread(lock, c);
890 <
891 <        thread.start();
730 <
731 <        while (!thread.lockStarted) {
732 <            Thread.sleep(100);
733 <        }
734 <
735 <        lock.lock();
736 <        try {
737 <            thread.interrupt();
738 <            thread.canAwake = true;
739 <            c.signal();
740 <        } finally {
741 <            lock.unlock();
742 <        }
743 <
744 <        thread.join();
745 <        assertTrue(thread.interrupted);
746 <        assertFalse(thread.isAlive());
747 <    }
748 <
749 <    /**
750 <     * await is interruptible
751 <     */
752 <    public void testAwait_Interrupt() throws InterruptedException {
753 <        final ReentrantLock lock = new ReentrantLock();
754 <        final Condition c = lock.newCondition();
755 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
756 <            public void realRun() throws InterruptedException {
889 >        final CountDownLatch locked = new CountDownLatch(1);
890 >        Thread t = newStartedThread(new CheckedRunnable() {
891 >            public void realRun() {
892                  lock.lock();
893 <                c.await();
893 >                locked.countDown();
894 >                c.awaitUninterruptibly();
895 >                assertTrue(Thread.interrupted());
896 >                lock.unlock();
897              }});
898  
899 <        t.start();
900 <        Thread.sleep(SHORT_DELAY_MS);
899 >        await(locked);
900 >        lock.lock();
901 >        lock.unlock();
902          t.interrupt();
903 <        t.join(SHORT_DELAY_MS);
904 <        assertFalse(t.isAlive());
903 >        long timeoutMillis = 10;
904 >        assertThreadStaysAlive(t, timeoutMillis);
905 >        lock.lock();
906 >        c.signal();
907 >        lock.unlock();
908 >        awaitTermination(t);
909      }
910  
911      /**
912 <     * awaitNanos is interruptible
912 >     * await/awaitNanos/awaitUntil is interruptible
913       */
914 <    public void testAwaitNanos_Interrupt() throws InterruptedException {
915 <        final ReentrantLock lock = new ReentrantLock();
914 >    public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
915 >    public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
916 >    public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
917 >    public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
918 >    public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
919 >    public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
920 >    public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
921 >    public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
922 >    public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
923 >        final PublicReentrantLock lock =
924 >            new PublicReentrantLock(fair);
925          final Condition c = lock.newCondition();
926 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
926 >        final CountDownLatch locked = new CountDownLatch(1);
927 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
928              public void realRun() throws InterruptedException {
929                  lock.lock();
930 <                c.awaitNanos(1000 * 1000 * 1000); // 1 sec
930 >                assertLockedByMoi(lock);
931 >                assertHasNoWaiters(lock, c);
932 >                locked.countDown();
933 >                try {
934 >                    await(c, awaitMethod);
935 >                } finally {
936 >                    assertLockedByMoi(lock);
937 >                    assertHasNoWaiters(lock, c);
938 >                    lock.unlock();
939 >                    assertFalse(Thread.interrupted());
940 >                }
941              }});
942  
943 <        t.start();
944 <        Thread.sleep(SHORT_DELAY_MS);
943 >        await(locked);
944 >        assertHasWaiters(lock, c, t);
945          t.interrupt();
946 <        t.join(SHORT_DELAY_MS);
947 <        assertFalse(t.isAlive());
946 >        awaitTermination(t);
947 >        assertNotLocked(lock);
948      }
949  
950      /**
951 <     * awaitUntil is interruptible
951 >     * signalAll wakes up all threads
952       */
953 <    public void testAwaitUntil_Interrupt() throws InterruptedException {
954 <        final ReentrantLock lock = new ReentrantLock();
953 >    public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
954 >    public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
955 >    public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
956 >    public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
957 >    public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
958 >    public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
959 >    public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
960 >    public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
961 >    public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
962 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
963          final Condition c = lock.newCondition();
964 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
964 >        final CountDownLatch locked = new CountDownLatch(2);
965 >        class Awaiter extends CheckedRunnable {
966              public void realRun() throws InterruptedException {
967                  lock.lock();
968 <                java.util.Date d = new java.util.Date();
969 <                c.awaitUntil(new java.util.Date(d.getTime() + 10000));
970 <            }});
968 >                locked.countDown();
969 >                await(c, awaitMethod);
970 >                lock.unlock();
971 >            }
972 >        }
973  
974 <        t.start();
975 <        Thread.sleep(SHORT_DELAY_MS);
976 <        t.interrupt();
977 <        t.join(SHORT_DELAY_MS);
978 <        assertFalse(t.isAlive());
974 >        Thread t1 = newStartedThread(new Awaiter());
975 >        Thread t2 = newStartedThread(new Awaiter());
976 >
977 >        await(locked);
978 >        lock.lock();
979 >        assertHasWaiters(lock, c, t1, t2);
980 >        c.signalAll();
981 >        assertHasNoWaiters(lock, c);
982 >        lock.unlock();
983 >        awaitTermination(t1);
984 >        awaitTermination(t2);
985      }
986  
987      /**
988 <     * signalAll wakes up all threads
988 >     * signal wakes up waiting threads in FIFO order.
989       */
990 <    public void testSignalAll() throws InterruptedException {
991 <        final ReentrantLock lock = new ReentrantLock();
990 >    public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
991 >    public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
992 >    public void testSignalWakesFifo(boolean fair) {
993 >        final PublicReentrantLock lock =
994 >            new PublicReentrantLock(fair);
995          final Condition c = lock.newCondition();
996 <        Thread t1 = new Thread(new CheckedRunnable() {
996 >        final CountDownLatch locked1 = new CountDownLatch(1);
997 >        final CountDownLatch locked2 = new CountDownLatch(1);
998 >        Thread t1 = newStartedThread(new CheckedRunnable() {
999              public void realRun() throws InterruptedException {
1000                  lock.lock();
1001 +                locked1.countDown();
1002                  c.await();
1003                  lock.unlock();
1004              }});
1005  
1006 <        Thread t2 = new Thread(new CheckedRunnable() {
1006 >        await(locked1);
1007 >
1008 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1009              public void realRun() throws InterruptedException {
1010                  lock.lock();
1011 +                locked2.countDown();
1012                  c.await();
1013                  lock.unlock();
1014              }});
1015  
1016 <        t1.start();
1017 <        t2.start();
829 <        Thread.sleep(SHORT_DELAY_MS);
1016 >        await(locked2);
1017 >
1018          lock.lock();
1019 <        c.signalAll();
1019 >        assertHasWaiters(lock, c, t1, t2);
1020 >        assertFalse(lock.hasQueuedThreads());
1021 >        c.signal();
1022 >        assertHasWaiters(lock, c, t2);
1023 >        assertTrue(lock.hasQueuedThread(t1));
1024 >        assertFalse(lock.hasQueuedThread(t2));
1025 >        c.signal();
1026 >        assertHasNoWaiters(lock, c);
1027 >        assertTrue(lock.hasQueuedThread(t1));
1028 >        assertTrue(lock.hasQueuedThread(t2));
1029          lock.unlock();
1030 <        t1.join(SHORT_DELAY_MS);
1031 <        t2.join(SHORT_DELAY_MS);
835 <        assertFalse(t1.isAlive());
836 <        assertFalse(t2.isAlive());
1030 >        awaitTermination(t1);
1031 >        awaitTermination(t2);
1032      }
1033  
1034      /**
1035       * await after multiple reentrant locking preserves lock count
1036       */
1037 <    public void testAwaitLockCount() throws InterruptedException {
1038 <        final ReentrantLock lock = new ReentrantLock();
1037 >    public void testAwaitLockCount()      { testAwaitLockCount(false); }
1038 >    public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1039 >    public void testAwaitLockCount(boolean fair) {
1040 >        final PublicReentrantLock lock = new PublicReentrantLock(fair);
1041          final Condition c = lock.newCondition();
1042 <        Thread t1 = new Thread(new CheckedRunnable() {
1042 >        final CountDownLatch locked = new CountDownLatch(2);
1043 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1044              public void realRun() throws InterruptedException {
1045                  lock.lock();
1046 <                threadAssertEquals(1, lock.getHoldCount());
1046 >                assertLockedByMoi(lock);
1047 >                assertEquals(1, lock.getHoldCount());
1048 >                locked.countDown();
1049                  c.await();
1050 <                threadAssertEquals(1, lock.getHoldCount());
1050 >                assertLockedByMoi(lock);
1051 >                assertEquals(1, lock.getHoldCount());
1052                  lock.unlock();
1053              }});
1054  
1055 <        Thread t2 = new Thread(new CheckedRunnable() {
1055 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1056              public void realRun() throws InterruptedException {
1057                  lock.lock();
1058                  lock.lock();
1059 <                threadAssertEquals(2, lock.getHoldCount());
1059 >                assertLockedByMoi(lock);
1060 >                assertEquals(2, lock.getHoldCount());
1061 >                locked.countDown();
1062                  c.await();
1063 <                threadAssertEquals(2, lock.getHoldCount());
1063 >                assertLockedByMoi(lock);
1064 >                assertEquals(2, lock.getHoldCount());
1065                  lock.unlock();
1066                  lock.unlock();
1067              }});
1068  
1069 <        t1.start();
866 <        t2.start();
867 <        Thread.sleep(SHORT_DELAY_MS);
1069 >        await(locked);
1070          lock.lock();
1071 +        assertHasWaiters(lock, c, t1, t2);
1072 +        assertEquals(1, lock.getHoldCount());
1073          c.signalAll();
1074 +        assertHasNoWaiters(lock, c);
1075          lock.unlock();
1076 <        t1.join(SHORT_DELAY_MS);
1077 <        t2.join(SHORT_DELAY_MS);
873 <        assertFalse(t1.isAlive());
874 <        assertFalse(t2.isAlive());
1076 >        awaitTermination(t1);
1077 >        awaitTermination(t2);
1078      }
1079  
1080      /**
1081       * A serialized lock deserializes as unlocked
1082       */
1083 <    public void testSerialization() throws Exception {
1084 <        ReentrantLock l = new ReentrantLock();
1085 <        l.lock();
1086 <        l.unlock();
1087 <
1088 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1089 <        ObjectOutputStream out =
1090 <            new ObjectOutputStream(new BufferedOutputStream(bout));
1091 <        out.writeObject(l);
1092 <        out.close();
1093 <        
1094 <        ByteArrayInputStream bin =
1095 <            new ByteArrayInputStream(bout.toByteArray());
1096 <        ObjectInputStream in =
1097 <            new ObjectInputStream(new BufferedInputStream(bin));
1098 <        ReentrantLock r = (ReentrantLock) in.readObject();
1099 <        r.lock();
1100 <        r.unlock();
1083 >    public void testSerialization()      { testSerialization(false); }
1084 >    public void testSerialization_fair() { testSerialization(true); }
1085 >    public void testSerialization(boolean fair) {
1086 >        ReentrantLock lock = new ReentrantLock(fair);
1087 >        lock.lock();
1088 >
1089 >        ReentrantLock clone = serialClone(lock);
1090 >        assertEquals(lock.isFair(), clone.isFair());
1091 >        assertTrue(lock.isLocked());
1092 >        assertFalse(clone.isLocked());
1093 >        assertEquals(1, lock.getHoldCount());
1094 >        assertEquals(0, clone.getHoldCount());
1095 >        clone.lock();
1096 >        clone.lock();
1097 >        assertTrue(clone.isLocked());
1098 >        assertEquals(2, clone.getHoldCount());
1099 >        assertEquals(1, lock.getHoldCount());
1100 >        clone.unlock();
1101 >        clone.unlock();
1102 >        assertTrue(lock.isLocked());
1103 >        assertFalse(clone.isLocked());
1104      }
1105  
1106      /**
1107       * toString indicates current lock state
1108       */
1109 <    public void testToString() {
1110 <        ReentrantLock lock = new ReentrantLock();
1109 >    public void testToString()      { testToString(false); }
1110 >    public void testToString_fair() { testToString(true); }
1111 >    public void testToString(boolean fair) {
1112 >        ReentrantLock lock = new ReentrantLock(fair);
1113          String us = lock.toString();
1114          assertTrue(us.indexOf("Unlocked") >= 0);
1115          lock.lock();
1116          String ls = lock.toString();
1117          assertTrue(ls.indexOf("Locked") >= 0);
1118      }
911
1119   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines