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.4 by dl, Sun Sep 14 20:42:40 2003 UTC vs.
Revision 1.48 by jsr166, Sat May 21 06:24:33 2011 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
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.util.*;
14   import java.io.*;
15  
16   public class ReentrantLockTest extends JSR166TestCase {
14    static int HOLD_COUNT_TEST_LIMIT = 20;
15
17      public static void main(String[] args) {
18 <        junit.textui.TestRunner.run (suite());  
18 >        junit.textui.TestRunner.run(suite());
19      }
19    
20      public static Test suite() {
21 <        return new TestSuite(ReentrantLockTest.class);
21 >        return new TestSuite(ReentrantLockTest.class);
22 >    }
23 >
24 >    /**
25 >     * A runnable calling lockInterruptibly
26 >     */
27 >    class InterruptibleLockRunnable extends CheckedRunnable {
28 >        final ReentrantLock lock;
29 >        InterruptibleLockRunnable(ReentrantLock l) { lock = l; }
30 >        public void realRun() throws InterruptedException {
31 >            lock.lockInterruptibly();
32 >        }
33 >    }
34 >
35 >    /**
36 >     * A runnable calling lockInterruptibly that expects to be
37 >     * interrupted
38 >     */
39 >    class InterruptedLockRunnable extends CheckedInterruptedRunnable {
40 >        final ReentrantLock lock;
41 >        InterruptedLockRunnable(ReentrantLock l) { lock = l; }
42 >        public void realRun() throws InterruptedException {
43 >            lock.lockInterruptibly();
44 >        }
45 >    }
46 >
47 >    /**
48 >     * Subclass to expose protected methods
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 <     * Unlocks an unlocked lock, throws Illegal Monitor State
26 <     *
64 >    /**
65 >     * Releases write lock, checking that it had a hold count of 1.
66       */
67 <    public void testIllegalMonitorStateException(){
68 <        ReentrantLock rl = new ReentrantLock();
69 <        try{
70 <            rl.unlock();
71 <            fail("Should of thown Illegal Monitor State Exception");
67 >    void releaseLock(PublicReentrantLock lock) {
68 >        assertLockedByMoi(lock);
69 >        lock.unlock();
70 >        assertFalse(lock.isHeldByCurrentThread());
71 >        assertNotLocked(lock);
72 >    }
73  
74 <        } catch(IllegalMonitorStateException success){}
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 +     * Checks that lock is not locked.
90 +     */
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 +     * 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 <     * makes a lock, locks it, tries to aquire the lock in another thread
41 <     * interrupts that thread and waits for an interrupted Exception to
42 <     * be thrown.
109 >
110 >    /**
111 >     * Checks that lock is locked by the current thread.
112       */
113 +    void assertLockedByMoi(PublicReentrantLock lock) {
114 +        assertLockedBy(lock, Thread.currentThread());
115 +    }
116  
117 <    public void testInterruptedException(){
118 <        final ReentrantLock lock = new ReentrantLock();
119 <        lock.lock();
120 <        Thread t = new Thread(new Runnable() {
121 <                public void run(){
122 <                    try{
123 <                        lock.lockInterruptibly();
124 <                        threadFail("should throw");
125 <                    } catch(InterruptedException success){}
126 <                }
127 <            });
117 >    /**
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_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 {
57            t.start();
58            t.interrupt();
204              lock.unlock();
205 <            t.join();
206 <        } catch(Exception e){
207 <            fail("unexpected exception");
208 <        }
209 <    }
210 <
211 <    /*
212 <     * tests for interrupted exception on a timed wait
213 <     *
214 <     */
215 <    
216 <
217 <    public void testInterruptedException2(){
218 <        final ReentrantLock lock = new ReentrantLock();
219 <        lock.lock();
220 <        Thread t = new Thread(new Runnable() {
221 <                public void run(){
222 <                    try{
223 <                        lock.tryLock(MEDIUM_DELAY_MS,TimeUnit.MILLISECONDS);
224 <                        threadFail("should throw");
225 <                    } catch(InterruptedException success){}
226 <                }
227 <            });
228 <        try {
229 <            t.start();
230 <            t.interrupt();
231 <        } catch(Exception e){
232 <            fail("unexpected exception");
233 <        }
205 >            shouldThrow();
206 >        } catch (IllegalMonitorStateException success) {}
207 >    }
208 >
209 >    /**
210 >     * tryLock on an unlocked lock succeeds
211 >     */
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 >
224 >    /**
225 >     * hasQueuedThreads reports whether there are waiting threads
226 >     */
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 >        waitForQueuedThread(lock, t1);
238 >        assertTrue(lock.hasQueuedThreads());
239 >        t2.start();
240 >        waitForQueuedThread(lock, t2);
241 >        assertTrue(lock.hasQueuedThreads());
242 >        t1.interrupt();
243 >        awaitTermination(t1);
244 >        assertTrue(lock.hasQueuedThreads());
245 >        lock.unlock();
246 >        awaitTermination(t2);
247 >        assertFalse(lock.hasQueuedThreads());
248      }
249  
250 +    /**
251 +     * getQueueLength reports number of waiting threads
252 +     */
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 +        waitForQueuedThread(lock, t1);
263 +        assertEquals(1, lock.getQueueLength());
264 +        t2.start();
265 +        waitForQueuedThread(lock, t2);
266 +        assertEquals(2, lock.getQueueLength());
267 +        t1.interrupt();
268 +        awaitTermination(t1);
269 +        assertEquals(1, lock.getQueueLength());
270 +        lock.unlock();
271 +        awaitTermination(t2);
272 +        assertEquals(0, lock.getQueueLength());
273 +    }
274  
275 <    public void testTryLockWhenLocked() {
276 <        final ReentrantLock lock = new ReentrantLock();
277 <        lock.lock();
278 <        Thread t = new Thread(new Runnable() {
279 <                public void run(){
280 <                    threadAssertFalse(lock.tryLock());
281 <                }
99 <            });
275 >    /**
276 >     * hasQueuedThread(null) throws NPE
277 >     */
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 <            t.start();
284 <            t.join();
283 >            lock.hasQueuedThread(null);
284 >            shouldThrow();
285 >        } catch (NullPointerException success) {}
286 >    }
287 >
288 >    /**
289 >     * hasQueuedThread reports whether a thread is queued.
290 >     */
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 >        waitForQueuedThread(lock, t1);
302 >        assertTrue(lock.hasQueuedThread(t1));
303 >        assertFalse(lock.hasQueuedThread(t2));
304 >        t2.start();
305 >        waitForQueuedThread(lock, t2);
306 >        assertTrue(lock.hasQueuedThread(t1));
307 >        assertTrue(lock.hasQueuedThread(t2));
308 >        t1.interrupt();
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 >
318 >    /**
319 >     * getQueuedThreads includes waiting threads
320 >     */
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 >        waitForQueuedThread(lock, t1);
332 >        assertEquals(1, lock.getQueuedThreads().size());
333 >        assertTrue(lock.getQueuedThreads().contains(t1));
334 >        t2.start();
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 >        awaitTermination(t1);
341 >        assertFalse(lock.getQueuedThreads().contains(t1));
342 >        assertTrue(lock.getQueuedThreads().contains(t2));
343 >        assertEquals(1, lock.getQueuedThreads().size());
344 >        lock.unlock();
345 >        awaitTermination(t2);
346 >        assertTrue(lock.getQueuedThreads().isEmpty());
347 >    }
348 >
349 >    /**
350 >     * timed tryLock is interruptible.
351 >     */
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 = newStartedThread(new CheckedInterruptedRunnable() {
358 >            public void realRun() throws InterruptedException {
359 >                lock.tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
360 >            }});
361 >
362 >        waitForQueuedThread(lock, t);
363 >        t.interrupt();
364 >        awaitTermination(t);
365 >        releaseLock(lock);
366 >    }
367 >
368 >    /**
369 >     * tryLock on a locked lock fails
370 >     */
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 = newStartedThread(new CheckedRunnable() {
377 >            public void realRun() {
378 >                assertFalse(lock.tryLock());
379 >            }});
380 >
381 >        awaitTermination(t);
382 >        releaseLock(lock);
383 >    }
384 >
385 >    /**
386 >     * Timed tryLock on a locked lock times out
387 >     */
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 = newStartedThread(new CheckedRunnable() {
394 >            public void realRun() throws InterruptedException {
395 >                long startTime = System.nanoTime();
396 >                long timeoutMillis = 10;
397 >                assertFalse(lock.tryLock(timeoutMillis, MILLISECONDS));
398 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
399 >            }});
400 >
401 >        awaitTermination(t);
402 >        releaseLock(lock);
403 >    }
404 >
405 >    /**
406 >     * getHoldCount returns number of recursive holds
407 >     */
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());
415 >        }
416 >        for (int i = SIZE; i > 0; i--) {
417              lock.unlock();
418 <        } catch(Exception e){
105 <            fail("unexpected exception");
418 >            assertEquals(i-1, lock.getHoldCount());
419          }
420 <    }
420 >    }
421  
422 <    public void testTryLock_Timeout(){
423 <        final ReentrantLock lock = new ReentrantLock();
424 <        lock.lock();
425 <        Thread t = new Thread(new Runnable() {
426 <                public void run(){
427 <                    try {
115 <                        threadAssertFalse(lock.tryLock(1, TimeUnit.MILLISECONDS));
116 <                    } catch (Exception ex) {
117 <                        threadFail("unexpected exception");
118 <                    }
119 <                }
120 <            });
422 >    /**
423 >     * isLocked is true when locked and false when not
424 >     */
425 >    public void testIsLocked()      { testIsLocked(false); }
426 >    public void testIsLocked_fair() { testIsLocked(true); }
427 >    public void testIsLocked(boolean fair) {
428          try {
429 <            t.start();
430 <            t.join();
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();
125        } catch(Exception e){
126            fail("unexpected exception");
127        }
128    }
129    
130    public void testGetHoldCount() {
131        ReentrantLock lock = new ReentrantLock();
132        for(int i = 1; i <= ReentrantLockTest.HOLD_COUNT_TEST_LIMIT;i++) {
133            lock.lock();
134            assertEquals(i,lock.getHoldCount());
135        }
136        for(int i = ReentrantLockTest.HOLD_COUNT_TEST_LIMIT; i > 0; i--) {
137            lock.unlock();
138            assertEquals(i-1,lock.getHoldCount());
139        }
140    }
141    
142  
143
144
145    public void testIsLocked() {
146        final ReentrantLock lock = new ReentrantLock();
147        lock.lock();
148        assertTrue(lock.isLocked());
149        lock.unlock();
150        assertFalse(lock.isLocked());
151        Thread t = new Thread(new Runnable() {
152                public void run() {
153                    lock.lock();
154                    try {
155                        Thread.sleep(SMALL_DELAY_MS);
156                    }
157                    catch(Exception e) {
158                        threadFail("unexpected exception");
159                    }
160                    lock.unlock();
161                }
162            });
163        try{
164            t.start();
165            Thread.sleep(SHORT_DELAY_MS);
436              assertTrue(lock.isLocked());
437 <            t.join();
437 >            lock.unlock();
438              assertFalse(lock.isLocked());
439 <        } catch(Exception e){
440 <            fail("unexpected exception");
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 <    public void testLockInterruptibly() {
461 <        final ReentrantLock lock = new ReentrantLock();
462 <        try {
463 <            lock.lockInterruptibly();
464 <        } catch(Exception e) {
465 <            fail("unexpected exception");
181 <        }
182 <        Thread t = new Thread(new Runnable() {
183 <                public void run() {
184 <                    try {
185 <                        lock.lockInterruptibly();
186 <                        threadFail("should throw");
187 <                    }
188 <                    catch(InterruptedException e) {}
189 <                }
190 <            });
459 >    /**
460 >     * lockInterruptibly succeeds when unlocked, else is interruptible
461 >     */
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 <            t.start();
468 <            t.interrupt();
469 <            assertTrue(lock.isLocked());
195 <            assertTrue(lock.isHeldByCurrentThread());
196 <            t.join();
197 <        } catch(Exception e){
198 <            fail("unexpected exception");
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 +        awaitTermination(t);
478 +        releaseLock(lock);
479      }
480  
481 <    public void testAwait_IllegalMonitor() {
482 <        final ReentrantLock lock = new ReentrantLock();
481 >    /**
482 >     * Calling await without holding lock throws IllegalMonitorStateException
483 >     */
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 <        try {
490 <            c.await();
491 <            fail("should throw");
492 <        }
493 <        catch (IllegalMonitorStateException success) {
494 <        }
495 <        catch (Exception ex) {
496 <            fail("should throw IMSE");
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 <    public void testSignal_IllegalMonitor() {
501 <        final ReentrantLock lock = new ReentrantLock();
500 >    /**
501 >     * Calling signal without holding lock throws IllegalMonitorStateException
502 >     */
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();
510 <            fail("should throw");
511 <        }
223 <        catch (IllegalMonitorStateException success) {
224 <        }
225 <        catch (Exception ex) {
226 <            fail("should throw IMSE");
227 <        }
510 >            shouldThrow();
511 >        } catch (IllegalMonitorStateException success) {}
512      }
513  
514 <    public void testAwaitNanos_Timeout() {
515 <        final ReentrantLock lock = new ReentrantLock();
516 <        final Condition c = lock.newCondition();
514 >    /**
515 >     * awaitNanos without a signal times out
516 >     */
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 t = c.awaitNanos(100);
525 <            assertTrue(t <= 0);
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 <        }
532 <        catch (Exception ex) {
240 <            fail("unexpected exception");
531 >        } catch (InterruptedException e) {
532 >            threadUnexpectedException(e);
533          }
534      }
535  
536 <    public void testAwait_Timeout() {
537 <        final ReentrantLock lock = new ReentrantLock();
538 <        final Condition c = lock.newCondition();
536 >    /**
537 >     * timed await without a signal times out
538 >     */
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 <            assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
546 >            long startTime = System.nanoTime();
547 >            long timeoutMillis = 10;
548 >            assertFalse(c.await(timeoutMillis, MILLISECONDS));
549 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
550              lock.unlock();
551 <        }
552 <        catch (Exception ex) {
253 <            fail("unexpected exception");
551 >        } catch (InterruptedException e) {
552 >            threadUnexpectedException(e);
553          }
554      }
555  
556 <    public void testAwaitUntil_Timeout() {
557 <        final ReentrantLock lock = new ReentrantLock();
558 <        final Condition c = lock.newCondition();
556 >    /**
557 >     * awaitUntil without a signal times out
558 >     */
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() + 10)));
569 >            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
570 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
571              lock.unlock();
572 <        }
573 <        catch (Exception ex) {
267 <            fail("unexpected exception");
572 >        } catch (InterruptedException e) {
573 >            threadUnexpectedException(e);
574          }
575      }
576  
577 <    public void testAwait() {
578 <        final ReentrantLock lock = new ReentrantLock();
577 >    /**
578 >     * await returns when signalled
579 >     */
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 Runnable() {
586 <                public void run() {
587 <                    try {
588 <                        lock.lock();
589 <                        c.await();
590 <                        lock.unlock();
591 <                    }
592 <                    catch(InterruptedException e) {
593 <                        threadFail("unexpected exception");
594 <                    }
595 <                }
596 <            });
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 >        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 >        awaitTermination(t);
602 >    }
603  
604 +    /**
605 +     * hasWaiters throws NPE if null
606 +     */
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 <            t.start();
613 <            Thread.sleep(SHORT_DELAY_MS);
614 <            lock.lock();
291 <            c.signal();
292 <            lock.unlock();
293 <            t.join(SHORT_DELAY_MS);
294 <            assertFalse(t.isAlive());
295 <        }
296 <        catch (Exception ex) {
297 <            fail("unexpected exception");
298 <        }
612 >            lock.hasWaiters(null);
613 >            shouldThrow();
614 >        } catch (NullPointerException success) {}
615      }
616  
617 <    public void testAwaitUninterruptibly() {
618 <        final ReentrantLock lock = new ReentrantLock();
619 <        final Condition c = lock.newCondition();
620 <        Thread t = new Thread(new Runnable() {
621 <                public void run() {
622 <                    lock.lock();
623 <                    c.awaitUninterruptibly();
624 <                    lock.unlock();
625 <                }
626 <            });
617 >    /**
618 >     * getWaitQueueLength throws NPE if null
619 >     */
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  
630 +    /**
631 +     * getWaitingThreads throws NPE if null
632 +     */
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 <            t.start();
639 <            Thread.sleep(SHORT_DELAY_MS);
640 <            t.interrupt();
316 <            lock.lock();
317 <            c.signal();
318 <            lock.unlock();
319 <            t.join(SHORT_DELAY_MS);
320 <            assertFalse(t.isAlive());
321 <        }
322 <        catch (Exception ex) {
323 <            fail("unexpected exception");
324 <        }
638 >            lock.getWaitingThreads(null);
639 >            shouldThrow();
640 >        } catch (NullPointerException success) {}
641      }
642  
643 <    public void testAwait_Interrupt() {
644 <        final ReentrantLock lock = new ReentrantLock();
643 >    /**
644 >     * hasWaiters throws IllegalArgumentException if not owned
645 >     */
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 <        Thread t = new Thread(new Runnable() {
331 <                public void run() {
332 <                    try {
333 <                        lock.lock();
334 <                        c.await();
335 <                        lock.unlock();
336 <                        threadFail("should throw");
337 <                    }
338 <                    catch(InterruptedException success) {
339 <                    }
340 <                }
341 <            });
342 <
651 >        final ReentrantLock lock2 = new ReentrantLock(fair);
652          try {
653 <            t.start();
654 <            Thread.sleep(SHORT_DELAY_MS);
655 <            t.interrupt();
347 <            t.join(SHORT_DELAY_MS);
348 <            assertFalse(t.isAlive());
349 <        }
350 <        catch (Exception ex) {
351 <            fail("unexpected exception");
352 <        }
653 >            lock2.hasWaiters(c);
654 >            shouldThrow();
655 >        } catch (IllegalArgumentException success) {}
656      }
657  
658 <    public void testAwaitNanos_Interrupt() {
659 <        final ReentrantLock lock = new ReentrantLock();
658 >    /**
659 >     * hasWaiters throws IllegalMonitorStateException if not locked
660 >     */
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 <        Thread t = new Thread(new Runnable() {
667 <                public void run() {
668 <                    try {
669 <                        lock.lock();
362 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
363 <                        lock.unlock();
364 <                        threadFail("should throw");
365 <                    }
366 <                    catch(InterruptedException success) {
367 <                    }
368 <                }
369 <            });
370 <
371 <        try {
372 <            t.start();
373 <            Thread.sleep(SHORT_DELAY_MS);
374 <            t.interrupt();
375 <            t.join(SHORT_DELAY_MS);
376 <            assertFalse(t.isAlive());
377 <        }
378 <        catch (Exception ex) {
379 <            fail("unexpected exception");
380 <        }
666 >        try {
667 >            lock.hasWaiters(c);
668 >            shouldThrow();
669 >        } catch (IllegalMonitorStateException success) {}
670      }
671  
672 <    public void testAwaitUntil_Interrupt() {
673 <        final ReentrantLock lock = new ReentrantLock();
674 <        final Condition c = lock.newCondition();
675 <        Thread t = new Thread(new Runnable() {
676 <                public void run() {
677 <                    try {
678 <                        lock.lock();
679 <                        java.util.Date d = new java.util.Date();
680 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
681 <                        lock.unlock();
682 <                        threadFail("should throw");
683 <                    }
684 <                    catch(InterruptedException success) {
685 <                    }
397 <                }
398 <            });
672 >    /**
673 >     * getWaitQueueLength throws IllegalArgumentException if not owned
674 >     */
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(fair);
681 >        try {
682 >            lock2.getWaitQueueLength(c);
683 >            shouldThrow();
684 >        } catch (IllegalArgumentException success) {}
685 >    }
686  
687 +    /**
688 +     * getWaitQueueLength throws IllegalMonitorStateException if not locked
689 +     */
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 <            t.start();
697 <            Thread.sleep(SHORT_DELAY_MS);
698 <            t.interrupt();
404 <            t.join(SHORT_DELAY_MS);
405 <            assertFalse(t.isAlive());
406 <        }
407 <        catch (Exception ex) {
408 <            fail("unexpected exception");
409 <        }
696 >            lock.getWaitQueueLength(c);
697 >            shouldThrow();
698 >        } catch (IllegalMonitorStateException success) {}
699      }
700  
701 <    public void testSignalAll() {
702 <        final ReentrantLock lock = new ReentrantLock();
701 >    /**
702 >     * getWaitingThreads throws IllegalArgumentException if not owned
703 >     */
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 <        Thread t1 = new Thread(new Runnable() {
710 <                public void run() {
711 <                    try {
712 <                        lock.lock();
713 <                        c.await();
714 <                        lock.unlock();
421 <                    }
422 <                    catch(InterruptedException e) {
423 <                        threadFail("unexpected exception");
424 <                    }
425 <                }
426 <            });
427 <
428 <        Thread t2 = new Thread(new Runnable() {
429 <                public void run() {
430 <                    try {
431 <                        lock.lock();
432 <                        c.await();
433 <                        lock.unlock();
434 <                    }
435 <                    catch(InterruptedException e) {
436 <                        threadFail("unexpected exception");
437 <                    }
438 <                }
439 <            });
709 >        final PublicReentrantLock lock2 = new PublicReentrantLock(fair);
710 >        try {
711 >            lock2.getWaitingThreads(c);
712 >            shouldThrow();
713 >        } catch (IllegalArgumentException success) {}
714 >    }
715  
716 +    /**
717 +     * getWaitingThreads throws IllegalMonitorStateException if not locked
718 +     */
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 <            t1.start();
726 <            t2.start();
727 <            Thread.sleep(SHORT_DELAY_MS);
445 <            lock.lock();
446 <            c.signalAll();
447 <            lock.unlock();
448 <            t1.join(SHORT_DELAY_MS);
449 <            t2.join(SHORT_DELAY_MS);
450 <            assertFalse(t1.isAlive());
451 <            assertFalse(t2.isAlive());
452 <        }
453 <        catch (Exception ex) {
454 <            fail("unexpected exception");
455 <        }
725 >            lock.getWaitingThreads(c);
726 >            shouldThrow();
727 >        } catch (IllegalMonitorStateException success) {}
728      }
729  
730 <    public void testSerialization() {
731 <        ReentrantLock l = new ReentrantLock();
732 <        l.lock();
733 <        l.unlock();
734 <
735 <        try {
736 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
737 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
738 <            out.writeObject(l);
739 <            out.close();
740 <
741 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
742 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
743 <            ReentrantLock r = (ReentrantLock) in.readObject();
744 <            r.lock();
745 <            r.unlock();
746 <        } catch(Exception e){
747 <            e.printStackTrace();
748 <            fail("unexpected exception");
749 <        }
730 >    /**
731 >     * hasWaiters returns true when a thread is waiting, else false
732 >     */
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 >        final CountDownLatch locked = new CountDownLatch(1);
739 >        Thread t = newStartedThread(new CheckedRunnable() {
740 >            public void realRun() throws InterruptedException {
741 >                lock.lock();
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 >        await(locked);
752 >        lock.lock();
753 >        assertHasWaiters(lock, c, t);
754 >        assertTrue(lock.hasWaiters(c));
755 >        c.signal();
756 >        assertHasNoWaiters(lock, c);
757 >        assertFalse(lock.hasWaiters(c));
758 >        lock.unlock();
759 >        awaitTermination(t);
760 >        assertHasNoWaiters(lock, c);
761      }
762  
763 +    /**
764 +     * getWaitQueueLength returns number of waiting threads
765 +     */
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 +                assertFalse(lock.hasWaiters(c));
777 +                assertEquals(0, lock.getWaitQueueLength(c));
778 +                locked1.countDown();
779 +                c.await();
780 +                lock.unlock();
781 +            }});
782 +
783 +        Thread t2 = new Thread(new CheckedRunnable() {
784 +            public void realRun() throws InterruptedException {
785 +                lock.lock();
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 +        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 +        await(locked2);
807 +
808 +        lock.lock();
809 +        assertHasWaiters(lock, c, t1, t2);
810 +        assertEquals(2, lock.getWaitQueueLength(c));
811 +        c.signalAll();
812 +        assertHasNoWaiters(lock, c);
813 +        lock.unlock();
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()      { 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 +                assertTrue(lock.getWaitingThreads(c).isEmpty());
835 +                locked1.countDown();
836 +                c.await();
837 +                lock.unlock();
838 +            }});
839 +
840 +        Thread t2 = new Thread(new CheckedRunnable() {
841 +            public void realRun() throws InterruptedException {
842 +                lock.lock();
843 +                assertFalse(lock.getWaitingThreads(c).isEmpty());
844 +                locked2.countDown();
845 +                c.await();
846 +                lock.unlock();
847 +            }});
848 +
849 +        lock.lock();
850 +        assertTrue(lock.getWaitingThreads(c).isEmpty());
851 +        lock.unlock();
852 +
853 +        t1.start();
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 +        await(locked2);
865 +
866 +        lock.lock();
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();
874 +
875 +        awaitTermination(t1);
876 +        awaitTermination(t2);
877 +
878 +        assertHasNoWaiters(lock, c);
879 +    }
880 +
881 +    /**
882 +     * awaitUninterruptibly doesn't abort on interrupt
883 +     */
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 +        final CountDownLatch locked = new CountDownLatch(1);
890 +        Thread t = newStartedThread(new CheckedRunnable() {
891 +            public void realRun() {
892 +                lock.lock();
893 +                locked.countDown();
894 +                c.awaitUninterruptibly();
895 +                assertTrue(Thread.interrupted());
896 +                lock.unlock();
897 +            }});
898 +
899 +        await(locked);
900 +        lock.lock();
901 +        lock.unlock();
902 +        t.interrupt();
903 +        long timeoutMillis = 10;
904 +        assertThreadStaysAlive(t, timeoutMillis);
905 +        lock.lock();
906 +        c.signal();
907 +        lock.unlock();
908 +        awaitTermination(t);
909 +    }
910 +
911 +    /**
912 +     * await/awaitNanos/awaitUntil is interruptible
913 +     */
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 +        final CountDownLatch locked = new CountDownLatch(1);
927 +        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
928 +            public void realRun() throws InterruptedException {
929 +                lock.lock();
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 +        await(locked);
944 +        assertHasWaiters(lock, c, t);
945 +        t.interrupt();
946 +        awaitTermination(t);
947 +        assertNotLocked(lock);
948 +    }
949 +
950 +    /**
951 +     * signalAll wakes up all threads
952 +     */
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 +        final CountDownLatch locked = new CountDownLatch(2);
965 +        class Awaiter extends CheckedRunnable {
966 +            public void realRun() throws InterruptedException {
967 +                lock.lock();
968 +                locked.countDown();
969 +                await(c, awaitMethod);
970 +                lock.unlock();
971 +            }
972 +        }
973 +
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 +     * signal wakes up waiting threads in FIFO order.
989 +     */
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 +        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 +        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 +        await(locked2);
1017 +
1018 +        lock.lock();
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 +        awaitTermination(t1);
1031 +        awaitTermination(t2);
1032 +    }
1033 +
1034 +    /**
1035 +     * await after multiple reentrant locking preserves lock count
1036 +     */
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 +        final CountDownLatch locked = new CountDownLatch(2);
1043 +        Thread t1 = newStartedThread(new CheckedRunnable() {
1044 +            public void realRun() throws InterruptedException {
1045 +                lock.lock();
1046 +                assertLockedByMoi(lock);
1047 +                assertEquals(1, lock.getHoldCount());
1048 +                locked.countDown();
1049 +                c.await();
1050 +                assertLockedByMoi(lock);
1051 +                assertEquals(1, lock.getHoldCount());
1052 +                lock.unlock();
1053 +            }});
1054 +
1055 +        Thread t2 = newStartedThread(new CheckedRunnable() {
1056 +            public void realRun() throws InterruptedException {
1057 +                lock.lock();
1058 +                lock.lock();
1059 +                assertLockedByMoi(lock);
1060 +                assertEquals(2, lock.getHoldCount());
1061 +                locked.countDown();
1062 +                c.await();
1063 +                assertLockedByMoi(lock);
1064 +                assertEquals(2, lock.getHoldCount());
1065 +                lock.unlock();
1066 +                lock.unlock();
1067 +            }});
1068 +
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 +        awaitTermination(t1);
1077 +        awaitTermination(t2);
1078 +    }
1079 +
1080 +    /**
1081 +     * A serialized lock deserializes as unlocked
1082 +     */
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()      { 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 +    }
1119   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines