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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines