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.39 by jsr166, Tue Mar 15 19:47:07 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 >    /**
37 >     * A runnable calling lockInterruptibly that expects to be
38 >     * interrupted
39 >     */
40 >    class InterruptedLockRunnable extends CheckedInterruptedRunnable {
41          final ReentrantLock lock;
42          InterruptedLockRunnable(ReentrantLock l) { lock = l; }
43 <        public void run(){
44 <            try{
40 <                lock.lockInterruptibly();
41 <                threadFail("should throw");
42 <            } catch(InterruptedException success){}
43 >        public void realRun() throws InterruptedException {
44 >            lock.lockInterruptibly();
45          }
46      }
47  
48      /**
49 <     * To expose protected methods
49 >     * Subclass to expose protected methods
50       */
51 <    static class MyReentrantLock extends ReentrantLock {
52 <        MyReentrantLock() { super(); }
53 <        public Collection<Thread> getQueuedThreads() {
54 <            return super.getQueuedThreads();
51 >    static class PublicReentrantLock extends ReentrantLock {
52 >        PublicReentrantLock() { super(); }
53 >        public Collection<Thread> getQueuedThreads() {
54 >            return super.getQueuedThreads();
55          }
56 <        public ConditionObject newCondition() {
57 <            return new MyCondition(this);
56 >        public Collection<Thread> getWaitingThreads(Condition c) {
57 >            return super.getWaitingThreads(c);
58          }
59 +    }
60  
61 <        static class MyCondition extends ReentrantLock.ConditionObject {
62 <            MyCondition(MyReentrantLock l) { super(l); }
63 <            public Collection<Thread> getWaitingThreads() {
64 <                return super.getWaitingThreads();
65 <            }
66 <        }
61 >    /**
62 >     * Constructor sets given fairness
63 >     */
64 >    public void testConstructor() {
65 >        assertFalse(new ReentrantLock().isFair());
66 >        assertFalse(new ReentrantLock(false).isFair());
67 >        assertTrue(new ReentrantLock(true).isFair());
68 >    }
69  
70 +    /**
71 +     * locking an unlocked lock succeeds
72 +     */
73 +    public void testLock() {
74 +        ReentrantLock rl = new ReentrantLock();
75 +        rl.lock();
76 +        assertTrue(rl.isLocked());
77 +        rl.unlock();
78 +        assertFalse(rl.isLocked());
79      }
80  
81 <    /*
81 >    /**
82 >     * locking an unlocked fair lock succeeds
83 >     */
84 >    public void testFairLock() {
85 >        ReentrantLock rl = new ReentrantLock(true);
86 >        rl.lock();
87 >        assertTrue(rl.isLocked());
88 >        rl.unlock();
89 >    }
90 >
91 >    /**
92       * Unlocking an unlocked lock throws IllegalMonitorStateException
93       */
94 <    public void testIllegalMonitorStateException(){
95 <        ReentrantLock rl = new ReentrantLock();
96 <        try{
97 <            rl.unlock();
98 <            fail("Should of thown Illegal Monitor State Exception");
94 >    public void testUnlock_IllegalMonitorStateException() {
95 >        ReentrantLock rl = new ReentrantLock();
96 >        try {
97 >            rl.unlock();
98 >            shouldThrow();
99 >        } catch (IllegalMonitorStateException success) {}
100 >    }
101  
102 <        } catch(IllegalMonitorStateException success){}
102 >    /**
103 >     * tryLock on an unlocked lock succeeds
104 >     */
105 >    public void testTryLock() {
106 >        ReentrantLock rl = new ReentrantLock();
107 >        assertTrue(rl.tryLock());
108 >        assertTrue(rl.isLocked());
109 >        rl.unlock();
110      }
111  
112 <    /*
113 <     * lockInterruptibly is interruptible.
112 >
113 >    /**
114 >     * hasQueuedThreads reports whether there are waiting threads
115       */
116 <    public void testInterruptedException(){
117 <        final ReentrantLock lock = new ReentrantLock();
118 <        lock.lock();
119 <        Thread t = new Thread(new InterruptedLockRunnable(lock));
120 <        try {
121 <            t.start();
122 <            t.interrupt();
123 <            lock.unlock();
124 <            t.join();
125 <        } catch(Exception e){
126 <            fail("unexpected exception");
127 <        }
128 <    }
116 >    public void testhasQueuedThreads() throws InterruptedException {
117 >        final ReentrantLock lock = new ReentrantLock();
118 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
119 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
120 >        assertFalse(lock.hasQueuedThreads());
121 >        lock.lock();
122 >        t1.start();
123 >        Thread.sleep(SHORT_DELAY_MS);
124 >        assertTrue(lock.hasQueuedThreads());
125 >        t2.start();
126 >        Thread.sleep(SHORT_DELAY_MS);
127 >        assertTrue(lock.hasQueuedThreads());
128 >        t1.interrupt();
129 >        Thread.sleep(SHORT_DELAY_MS);
130 >        assertTrue(lock.hasQueuedThreads());
131 >        lock.unlock();
132 >        Thread.sleep(SHORT_DELAY_MS);
133 >        assertFalse(lock.hasQueuedThreads());
134 >        t1.join();
135 >        t2.join();
136 >    }
137  
138 <    /*
139 <     * getLockQueueLength reports number of waiting threads
138 >    /**
139 >     * getQueueLength reports number of waiting threads
140       */
141 <    public void testgetLockQueueLength(){
142 <        final ReentrantLock lock = new ReentrantLock();
141 >    public void testGetQueueLength() throws InterruptedException {
142 >        final ReentrantLock lock = new ReentrantLock();
143          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
144          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
145 +        assertEquals(0, lock.getQueueLength());
146 +        lock.lock();
147 +        t1.start();
148 +        Thread.sleep(SHORT_DELAY_MS);
149 +        assertEquals(1, lock.getQueueLength());
150 +        t2.start();
151 +        Thread.sleep(SHORT_DELAY_MS);
152 +        assertEquals(2, lock.getQueueLength());
153 +        t1.interrupt();
154 +        Thread.sleep(SHORT_DELAY_MS);
155 +        assertEquals(1, lock.getQueueLength());
156 +        lock.unlock();
157 +        Thread.sleep(SHORT_DELAY_MS);
158 +        assertEquals(0, lock.getQueueLength());
159 +        t1.join();
160 +        t2.join();
161 +    }
162 +
163 +    /**
164 +     * getQueueLength reports number of waiting threads
165 +     */
166 +    public void testGetQueueLength_fair() throws InterruptedException {
167 +        final ReentrantLock lock = new ReentrantLock(true);
168 +        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
169 +        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
170 +        assertEquals(0, lock.getQueueLength());
171 +        lock.lock();
172 +        t1.start();
173 +        Thread.sleep(SHORT_DELAY_MS);
174 +        assertEquals(1, lock.getQueueLength());
175 +        t2.start();
176 +        Thread.sleep(SHORT_DELAY_MS);
177 +        assertEquals(2, lock.getQueueLength());
178 +        t1.interrupt();
179 +        Thread.sleep(SHORT_DELAY_MS);
180 +        assertEquals(1, lock.getQueueLength());
181 +        lock.unlock();
182 +        Thread.sleep(SHORT_DELAY_MS);
183 +        assertEquals(0, lock.getQueueLength());
184 +        t1.join();
185 +        t2.join();
186 +    }
187 +
188 +    /**
189 +     * hasQueuedThread(null) throws NPE
190 +     */
191 +    public void testHasQueuedThreadNPE() {
192 +        final ReentrantLock sync = new ReentrantLock();
193          try {
194 <            assertEquals(0, lock.getLockQueueLength());
195 <            lock.lock();
196 <            t1.start();
197 <            Thread.sleep(SHORT_DELAY_MS);
198 <            assertEquals(1, lock.getLockQueueLength());
199 <            t2.start();
200 <            Thread.sleep(SHORT_DELAY_MS);
201 <            assertEquals(2, lock.getLockQueueLength());
202 <            t1.interrupt();
203 <            Thread.sleep(SHORT_DELAY_MS);
204 <            assertEquals(1, lock.getLockQueueLength());
205 <            lock.unlock();
206 <            Thread.sleep(SHORT_DELAY_MS);
207 <            assertEquals(0, lock.getLockQueueLength());
208 <            t1.join();
209 <            t2.join();
210 <        } catch(Exception e){
211 <            fail("unexpected exception");
212 <        }
213 <    }
194 >            sync.hasQueuedThread(null);
195 >            shouldThrow();
196 >        } catch (NullPointerException success) {}
197 >    }
198 >
199 >    /**
200 >     * hasQueuedThread reports whether a thread is queued.
201 >     */
202 >    public void testHasQueuedThread() throws InterruptedException {
203 >        final ReentrantLock sync = new ReentrantLock();
204 >        Thread t1 = new Thread(new InterruptedLockRunnable(sync));
205 >        Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
206 >        assertFalse(sync.hasQueuedThread(t1));
207 >        assertFalse(sync.hasQueuedThread(t2));
208 >        sync.lock();
209 >        t1.start();
210 >        Thread.sleep(SHORT_DELAY_MS);
211 >        assertTrue(sync.hasQueuedThread(t1));
212 >        t2.start();
213 >        Thread.sleep(SHORT_DELAY_MS);
214 >        assertTrue(sync.hasQueuedThread(t1));
215 >        assertTrue(sync.hasQueuedThread(t2));
216 >        t1.interrupt();
217 >        Thread.sleep(SHORT_DELAY_MS);
218 >        assertFalse(sync.hasQueuedThread(t1));
219 >        assertTrue(sync.hasQueuedThread(t2));
220 >        sync.unlock();
221 >        Thread.sleep(SHORT_DELAY_MS);
222 >        assertFalse(sync.hasQueuedThread(t1));
223 >        Thread.sleep(SHORT_DELAY_MS);
224 >        assertFalse(sync.hasQueuedThread(t2));
225 >        t1.join();
226 >        t2.join();
227 >    }
228 >
229  
230 <    /*
230 >    /**
231       * getQueuedThreads includes waiting threads
232       */
233 <    public void testGetQueuedThreads(){
234 <        final MyReentrantLock lock = new MyReentrantLock();
233 >    public void testGetQueuedThreads() throws InterruptedException {
234 >        final PublicReentrantLock lock = new PublicReentrantLock();
235          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
236          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
237 <        try {
238 <            assertTrue(lock.getQueuedThreads().isEmpty());
239 <            lock.lock();
240 <            assertTrue(lock.getQueuedThreads().isEmpty());
241 <            t1.start();
242 <            Thread.sleep(SHORT_DELAY_MS);
243 <            assertTrue(lock.getQueuedThreads().contains(t1));
244 <            t2.start();
245 <            Thread.sleep(SHORT_DELAY_MS);
246 <            assertTrue(lock.getQueuedThreads().contains(t1));
247 <            assertTrue(lock.getQueuedThreads().contains(t2));
248 <            t1.interrupt();
249 <            Thread.sleep(SHORT_DELAY_MS);
250 <            assertFalse(lock.getQueuedThreads().contains(t1));
251 <            assertTrue(lock.getQueuedThreads().contains(t2));
252 <            lock.unlock();
253 <            Thread.sleep(SHORT_DELAY_MS);
254 <            assertTrue(lock.getQueuedThreads().isEmpty());
255 <            t1.join();
256 <            t2.join();
152 <        } catch(Exception e){
153 <            fail("unexpected exception");
154 <        }
155 <    }
237 >        assertTrue(lock.getQueuedThreads().isEmpty());
238 >        lock.lock();
239 >        assertTrue(lock.getQueuedThreads().isEmpty());
240 >        t1.start();
241 >        Thread.sleep(SHORT_DELAY_MS);
242 >        assertTrue(lock.getQueuedThreads().contains(t1));
243 >        t2.start();
244 >        Thread.sleep(SHORT_DELAY_MS);
245 >        assertTrue(lock.getQueuedThreads().contains(t1));
246 >        assertTrue(lock.getQueuedThreads().contains(t2));
247 >        t1.interrupt();
248 >        Thread.sleep(SHORT_DELAY_MS);
249 >        assertFalse(lock.getQueuedThreads().contains(t1));
250 >        assertTrue(lock.getQueuedThreads().contains(t2));
251 >        lock.unlock();
252 >        Thread.sleep(SHORT_DELAY_MS);
253 >        assertTrue(lock.getQueuedThreads().isEmpty());
254 >        t1.join();
255 >        t2.join();
256 >    }
257  
258  
259 <    /*
260 <     * timed trylock is interruptible.
259 >    /**
260 >     * timed tryLock is interruptible.
261       */
262 <    public void testInterruptedException2(){
263 <        final ReentrantLock lock = new ReentrantLock();
264 <        lock.lock();
265 <        Thread t = new Thread(new Runnable() {
266 <                public void run(){
267 <                    try{
268 <                        lock.tryLock(MEDIUM_DELAY_MS,TimeUnit.MILLISECONDS);
269 <                        threadFail("should throw");
270 <                    } catch(InterruptedException success){}
271 <                }
272 <            });
273 <        try {
173 <            t.start();
174 <            t.interrupt();
175 <        } catch(Exception e){
176 <            fail("unexpected exception");
177 <        }
262 >    public void testInterruptedException2() throws InterruptedException {
263 >        final ReentrantLock lock = new ReentrantLock();
264 >        lock.lock();
265 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
266 >            public void realRun() throws InterruptedException {
267 >                lock.tryLock(MEDIUM_DELAY_MS,MILLISECONDS);
268 >            }});
269 >
270 >        t.start();
271 >        Thread.sleep(SHORT_DELAY_MS);
272 >        t.interrupt();
273 >        t.join();
274      }
275  
276  
277      /**
278 <     * Trylock on a locked lock fails
278 >     * TryLock on a locked lock fails
279       */
280 <    public void testTryLockWhenLocked() {
281 <        final ReentrantLock lock = new ReentrantLock();
282 <        lock.lock();
283 <        Thread t = new Thread(new Runnable() {
284 <                public void run(){
285 <                    threadAssertFalse(lock.tryLock());
286 <                }
287 <            });
288 <        try {
289 <            t.start();
290 <            t.join();
291 <            lock.unlock();
196 <        } catch(Exception e){
197 <            fail("unexpected exception");
198 <        }
199 <    }
280 >    public void testTryLockWhenLocked() throws InterruptedException {
281 >        final ReentrantLock lock = new ReentrantLock();
282 >        lock.lock();
283 >        Thread t = new Thread(new CheckedRunnable() {
284 >            public void realRun() {
285 >                assertFalse(lock.tryLock());
286 >            }});
287 >
288 >        t.start();
289 >        t.join();
290 >        lock.unlock();
291 >    }
292  
293      /**
294 <     * Timed Trylock on a locked lock times out
294 >     * Timed tryLock on a locked lock times out
295       */
296 <    public void testTryLock_Timeout(){
297 <        final ReentrantLock lock = new ReentrantLock();
298 <        lock.lock();
299 <        Thread t = new Thread(new Runnable() {
300 <                public void run(){
301 <                    try {
302 <                        threadAssertFalse(lock.tryLock(1, TimeUnit.MILLISECONDS));
303 <                    } catch (Exception ex) {
304 <                        threadFail("unexpected exception");
305 <                    }
306 <                }
307 <            });
308 <        try {
217 <            t.start();
218 <            t.join();
219 <            lock.unlock();
220 <        } catch(Exception e){
221 <            fail("unexpected exception");
222 <        }
223 <    }
224 <    
296 >    public void testTryLock_Timeout() throws InterruptedException {
297 >        final ReentrantLock lock = new ReentrantLock();
298 >        lock.lock();
299 >        Thread t = new Thread(new CheckedRunnable() {
300 >            public void realRun() throws InterruptedException {
301 >                assertFalse(lock.tryLock(1, MILLISECONDS));
302 >            }});
303 >
304 >        t.start();
305 >        t.join();
306 >        lock.unlock();
307 >    }
308 >
309      /**
310       * getHoldCount returns number of recursive holds
311       */
312      public void testGetHoldCount() {
313 <        ReentrantLock lock = new ReentrantLock();
314 <        for(int i = 1; i <= ReentrantLockTest.HOLD_COUNT_TEST_LIMIT;i++) {
315 <            lock.lock();
316 <            assertEquals(i,lock.getHoldCount());
317 <        }
318 <        for(int i = ReentrantLockTest.HOLD_COUNT_TEST_LIMIT; i > 0; i--) {
319 <            lock.unlock();
320 <            assertEquals(i-1,lock.getHoldCount());
321 <        }
313 >        ReentrantLock lock = new ReentrantLock();
314 >        for (int i = 1; i <= SIZE; i++) {
315 >            lock.lock();
316 >            assertEquals(i, lock.getHoldCount());
317 >        }
318 >        for (int i = SIZE; i > 0; i--) {
319 >            lock.unlock();
320 >            assertEquals(i-1, lock.getHoldCount());
321 >        }
322      }
323 <    
324 <  
323 >
324 >
325      /**
326       * isLocked is true when locked and false when not
327       */
328 <    public void testIsLocked() {
329 <        final ReentrantLock lock = new ReentrantLock();
330 <        lock.lock();
331 <        assertTrue(lock.isLocked());
332 <        lock.unlock();
333 <        assertFalse(lock.isLocked());
334 <        Thread t = new Thread(new Runnable() {
335 <                public void run() {
336 <                    lock.lock();
337 <                    try {
338 <                        Thread.sleep(SMALL_DELAY_MS);
339 <                    }
340 <                    catch(Exception e) {
341 <                        threadFail("unexpected exception");
342 <                    }
343 <                    lock.unlock();
344 <                }
345 <            });
262 <        try{
263 <            t.start();
264 <            Thread.sleep(SHORT_DELAY_MS);
265 <            assertTrue(lock.isLocked());
266 <            t.join();
267 <            assertFalse(lock.isLocked());
268 <        } catch(Exception e){
269 <            fail("unexpected exception");
270 <        }
328 >    public void testIsLocked() throws InterruptedException {
329 >        final ReentrantLock lock = new ReentrantLock();
330 >        lock.lock();
331 >        assertTrue(lock.isLocked());
332 >        lock.unlock();
333 >        assertFalse(lock.isLocked());
334 >        Thread t = new Thread(new CheckedRunnable() {
335 >            public void realRun() throws InterruptedException {
336 >                lock.lock();
337 >                Thread.sleep(SMALL_DELAY_MS);
338 >                lock.unlock();
339 >            }});
340 >
341 >        t.start();
342 >        Thread.sleep(SHORT_DELAY_MS);
343 >        assertTrue(lock.isLocked());
344 >        t.join();
345 >        assertFalse(lock.isLocked());
346      }
347  
348  
349      /**
350 +     * lockInterruptibly is interruptible.
351 +     */
352 +    public void testLockInterruptibly1() throws InterruptedException {
353 +        final ReentrantLock lock = new ReentrantLock();
354 +        lock.lock();
355 +        Thread t = new Thread(new InterruptedLockRunnable(lock));
356 +        t.start();
357 +        Thread.sleep(SHORT_DELAY_MS);
358 +        t.interrupt();
359 +        Thread.sleep(SHORT_DELAY_MS);
360 +        lock.unlock();
361 +        t.join();
362 +    }
363 +
364 +    /**
365       * lockInterruptibly succeeds when unlocked, else is interruptible
366       */
367 <    public void testLockInterruptibly() {
368 <        final ReentrantLock lock = new ReentrantLock();
369 <        try {
370 <            lock.lockInterruptibly();
371 <        } catch(Exception e) {
372 <            fail("unexpected exception");
373 <        }
374 <        Thread t = new Thread(new InterruptedLockRunnable(lock));
375 <        try {
376 <            t.start();
287 <            t.interrupt();
288 <            assertTrue(lock.isLocked());
289 <            assertTrue(lock.isHeldByCurrentThread());
290 <            t.join();
291 <        } catch(Exception e){
292 <            fail("unexpected exception");
293 <        }
367 >    public void testLockInterruptibly2() throws InterruptedException {
368 >        final ReentrantLock lock = new ReentrantLock();
369 >        lock.lockInterruptibly();
370 >        Thread t = new Thread(new InterruptedLockRunnable(lock));
371 >        t.start();
372 >        Thread.sleep(SHORT_DELAY_MS);
373 >        t.interrupt();
374 >        assertTrue(lock.isLocked());
375 >        assertTrue(lock.isHeldByCurrentThread());
376 >        t.join();
377      }
378  
379 <    public void testAwait_IllegalMonitor() {
380 <        final ReentrantLock lock = new ReentrantLock();
379 >    /**
380 >     * Calling await without holding lock throws IllegalMonitorStateException
381 >     */
382 >    public void testAwait_IllegalMonitor() throws InterruptedException {
383 >        final ReentrantLock lock = new ReentrantLock();
384          final Condition c = lock.newCondition();
385          try {
386              c.await();
387 <            fail("should throw");
388 <        }
303 <        catch (IllegalMonitorStateException success) {
304 <        }
305 <        catch (Exception ex) {
306 <            fail("should throw IMSE");
307 <        }
387 >            shouldThrow();
388 >        } catch (IllegalMonitorStateException success) {}
389      }
390  
391 +    /**
392 +     * Calling signal without holding lock throws IllegalMonitorStateException
393 +     */
394      public void testSignal_IllegalMonitor() {
395 <        final ReentrantLock lock = new ReentrantLock();
395 >        final ReentrantLock lock = new ReentrantLock();
396          final Condition c = lock.newCondition();
397          try {
398              c.signal();
399 <            fail("should throw");
400 <        }
401 <        catch (IllegalMonitorStateException success) {
402 <        }
403 <        catch (Exception ex) {
404 <            fail("should throw IMSE");
405 <        }
399 >            shouldThrow();
400 >        } catch (IllegalMonitorStateException success) {}
401 >    }
402 >
403 >    /**
404 >     * awaitNanos without a signal times out
405 >     */
406 >    public void testAwaitNanos_Timeout() throws InterruptedException {
407 >        final ReentrantLock lock = new ReentrantLock();
408 >        final Condition c = lock.newCondition();
409 >        lock.lock();
410 >        long t = c.awaitNanos(100);
411 >        assertTrue(t <= 0);
412 >        lock.unlock();
413 >    }
414 >
415 >    /**
416 >     * timed await without a signal times out
417 >     */
418 >    public void testAwait_Timeout() throws InterruptedException {
419 >        final ReentrantLock lock = new ReentrantLock();
420 >        final Condition c = lock.newCondition();
421 >        lock.lock();
422 >        assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
423 >        lock.unlock();
424      }
425  
426 <    public void testAwaitNanos_Timeout() {
427 <        final ReentrantLock lock = new ReentrantLock();
426 >    /**
427 >     * awaitUntil without a signal times out
428 >     */
429 >    public void testAwaitUntil_Timeout() throws InterruptedException {
430 >        final ReentrantLock lock = new ReentrantLock();
431 >        final Condition c = lock.newCondition();
432 >        lock.lock();
433 >        java.util.Date d = new java.util.Date();
434 >        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
435 >        lock.unlock();
436 >    }
437 >
438 >    /**
439 >     * await returns when signalled
440 >     */
441 >    public void testAwait() throws InterruptedException {
442 >        final ReentrantLock lock = new ReentrantLock();
443          final Condition c = lock.newCondition();
444 +        Thread t = new Thread(new CheckedRunnable() {
445 +            public void realRun() throws InterruptedException {
446 +                lock.lock();
447 +                c.await();
448 +                lock.unlock();
449 +            }});
450 +
451 +        t.start();
452 +        Thread.sleep(SHORT_DELAY_MS);
453 +        lock.lock();
454 +        c.signal();
455 +        lock.unlock();
456 +        t.join(SHORT_DELAY_MS);
457 +        assertFalse(t.isAlive());
458 +    }
459 +
460 +    /**
461 +     * hasWaiters throws NPE if null
462 +     */
463 +    public void testHasWaitersNPE() {
464 +        final ReentrantLock lock = new ReentrantLock();
465          try {
466 <            lock.lock();
467 <            long t = c.awaitNanos(100);
468 <            assertTrue(t <= 0);
331 <            lock.unlock();
332 <        }
333 <        catch (Exception ex) {
334 <            fail("unexpected exception");
335 <        }
466 >            lock.hasWaiters(null);
467 >            shouldThrow();
468 >        } catch (NullPointerException success) {}
469      }
470  
471 <    public void testAwait_Timeout() {
472 <        final ReentrantLock lock = new ReentrantLock();
471 >    /**
472 >     * getWaitQueueLength throws NPE if null
473 >     */
474 >    public void testGetWaitQueueLengthNPE() {
475 >        final ReentrantLock lock = new ReentrantLock();
476 >        try {
477 >            lock.getWaitQueueLength(null);
478 >            shouldThrow();
479 >        } catch (NullPointerException success) {}
480 >    }
481 >
482 >
483 >    /**
484 >     * getWaitingThreads throws NPE if null
485 >     */
486 >    public void testGetWaitingThreadsNPE() {
487 >        final PublicReentrantLock lock = new PublicReentrantLock();
488 >        try {
489 >            lock.getWaitingThreads(null);
490 >            shouldThrow();
491 >        } catch (NullPointerException success) {}
492 >    }
493 >
494 >
495 >    /**
496 >     * hasWaiters throws IAE if not owned
497 >     */
498 >    public void testHasWaitersIAE() {
499 >        final ReentrantLock lock = new ReentrantLock();
500          final Condition c = lock.newCondition();
501 +        final ReentrantLock lock2 = new ReentrantLock();
502          try {
503 <            lock.lock();
504 <            assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
505 <            lock.unlock();
345 <        }
346 <        catch (Exception ex) {
347 <            fail("unexpected exception");
348 <        }
503 >            lock2.hasWaiters(c);
504 >            shouldThrow();
505 >        } catch (IllegalArgumentException success) {}
506      }
507  
508 <    public void testAwaitUntil_Timeout() {
509 <        final ReentrantLock lock = new ReentrantLock();
508 >    /**
509 >     * hasWaiters throws IMSE if not locked
510 >     */
511 >    public void testHasWaitersIMSE() {
512 >        final ReentrantLock lock = new ReentrantLock();
513          final Condition c = lock.newCondition();
514          try {
515 <            lock.lock();
516 <            java.util.Date d = new java.util.Date();
517 <            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
358 <            lock.unlock();
359 <        }
360 <        catch (Exception ex) {
361 <            fail("unexpected exception");
362 <        }
515 >            lock.hasWaiters(c);
516 >            shouldThrow();
517 >        } catch (IllegalMonitorStateException success) {}
518      }
519  
365    public void testAwait() {
366        final ReentrantLock lock = new ReentrantLock();
367        final ReentrantLock.ConditionObject c = lock.newCondition();
368        Thread t = new Thread(new Runnable() {
369                public void run() {
370                    try {
371                        lock.lock();
372                        c.await();
373                        lock.unlock();
374                    }
375                    catch(InterruptedException e) {
376                        threadFail("unexpected exception");
377                    }
378                }
379            });
520  
521 +    /**
522 +     * getWaitQueueLength throws IAE if not owned
523 +     */
524 +    public void testGetWaitQueueLengthIAE() {
525 +        final ReentrantLock lock = new ReentrantLock();
526 +        final Condition c = lock.newCondition();
527 +        final ReentrantLock lock2 = new ReentrantLock();
528          try {
529 <            t.start();
530 <            Thread.sleep(SHORT_DELAY_MS);
531 <            lock.lock();
532 <            c.signal();
533 <            lock.unlock();
534 <            t.join(SHORT_DELAY_MS);
535 <            assertFalse(t.isAlive());
536 <        }
537 <        catch (Exception ex) {
538 <            fail("unexpected exception");
539 <        }
529 >            lock2.getWaitQueueLength(c);
530 >            shouldThrow();
531 >        } catch (IllegalArgumentException success) {}
532 >    }
533 >
534 >    /**
535 >     * getWaitQueueLength throws IMSE if not locked
536 >     */
537 >    public void testGetWaitQueueLengthIMSE() {
538 >        final ReentrantLock lock = new ReentrantLock();
539 >        final Condition c = lock.newCondition();
540 >        try {
541 >            lock.getWaitQueueLength(c);
542 >            shouldThrow();
543 >        } catch (IllegalMonitorStateException success) {}
544      }
545  
395    public void testHasWaiters() {
396        final ReentrantLock lock = new ReentrantLock();
397        final ReentrantLock.ConditionObject c = lock.newCondition();
398        Thread t = new Thread(new Runnable() {
399                public void run() {
400                    try {
401                        lock.lock();
402                        threadAssertFalse(c.hasWaiters());
403                        threadAssertEquals(0, c.getWaitQueueLength());
404                        c.await();
405                        lock.unlock();
406                    }
407                    catch(InterruptedException e) {
408                        threadFail("unexpected exception");
409                    }
410                }
411            });
546  
547 +    /**
548 +     * getWaitingThreads throws IAE if not owned
549 +     */
550 +    public void testGetWaitingThreadsIAE() {
551 +        final PublicReentrantLock lock = new PublicReentrantLock();
552 +        final Condition c = lock.newCondition();
553 +        final PublicReentrantLock lock2 = new PublicReentrantLock();
554          try {
555 <            t.start();
556 <            Thread.sleep(SHORT_DELAY_MS);
557 <            lock.lock();
417 <            assertTrue(c.hasWaiters());
418 <            assertEquals(1, c.getWaitQueueLength());
419 <            c.signal();
420 <            lock.unlock();
421 <            Thread.sleep(SHORT_DELAY_MS);
422 <            lock.lock();
423 <            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 <        }
555 >            lock2.getWaitingThreads(c);
556 >            shouldThrow();
557 >        } catch (IllegalArgumentException success) {}
558      }
559  
560 <    public void testGetWaitQueueLength() {
561 <        final ReentrantLock lock = new ReentrantLock();
562 <        final ReentrantLock.ConditionObject c = lock.newCondition();
563 <        Thread t1 = new Thread(new Runnable() {
564 <                public void run() {
565 <                    try {
566 <                        lock.lock();
567 <                        threadAssertFalse(c.hasWaiters());
568 <                        threadAssertEquals(0, c.getWaitQueueLength());
569 <                        c.await();
444 <                        lock.unlock();
445 <                    }
446 <                    catch(InterruptedException e) {
447 <                        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 <            });
466 <
467 <        try {
468 <            t1.start();
469 <            Thread.sleep(SHORT_DELAY_MS);
470 <            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 <        }
560 >    /**
561 >     * getWaitingThreads throws IMSE if not locked
562 >     */
563 >    public void testGetWaitingThreadsIMSE() {
564 >        final PublicReentrantLock lock = new PublicReentrantLock();
565 >        final Condition c = lock.newCondition();
566 >        try {
567 >            lock.getWaitingThreads(c);
568 >            shouldThrow();
569 >        } catch (IllegalMonitorStateException success) {}
570      }
571  
492    public void testGetWaitingThreads() {
493        final MyReentrantLock lock = new MyReentrantLock();    
494        final MyReentrantLock.MyCondition c = (MyReentrantLock.MyCondition)lock.newCondition();
495        Thread t1 = new Thread(new Runnable() {
496                public void run() {
497                    try {
498                        lock.lock();
499                        threadAssertTrue(c.getWaitingThreads().isEmpty());
500                        c.await();
501                        lock.unlock();
502                    }
503                    catch(InterruptedException e) {
504                        threadFail("unexpected exception");
505                    }
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            });
572  
573 <        try {
574 <            lock.lock();
575 <            assertTrue(c.getWaitingThreads().isEmpty());
576 <            lock.unlock();
577 <            t1.start();
578 <            Thread.sleep(SHORT_DELAY_MS);
579 <            t2.start();
580 <            Thread.sleep(SHORT_DELAY_MS);
581 <            lock.lock();
582 <            assertTrue(c.hasWaiters());
583 <            assertTrue(c.getWaitingThreads().contains(t1));
584 <            assertTrue(c.getWaitingThreads().contains(t2));
585 <            c.signalAll();
586 <            lock.unlock();
587 <            Thread.sleep(SHORT_DELAY_MS);
573 >    /**
574 >     * hasWaiters returns true when a thread is waiting, else false
575 >     */
576 >    public void testHasWaiters() throws InterruptedException {
577 >        final ReentrantLock lock = new ReentrantLock();
578 >        final Condition c = lock.newCondition();
579 >        Thread t = new Thread(new CheckedRunnable() {
580 >            public void realRun() throws InterruptedException {
581 >                lock.lock();
582 >                assertFalse(lock.hasWaiters(c));
583 >                assertEquals(0, lock.getWaitQueueLength(c));
584 >                c.await();
585 >                lock.unlock();
586 >            }});
587 >
588 >        t.start();
589 >        Thread.sleep(SHORT_DELAY_MS);
590 >        lock.lock();
591 >        assertTrue(lock.hasWaiters(c));
592 >        assertEquals(1, lock.getWaitQueueLength(c));
593 >        c.signal();
594 >        lock.unlock();
595 >        Thread.sleep(SHORT_DELAY_MS);
596 >        lock.lock();
597 >        assertFalse(lock.hasWaiters(c));
598 >        assertEquals(0, lock.getWaitQueueLength(c));
599 >        lock.unlock();
600 >        t.join(SHORT_DELAY_MS);
601 >        assertFalse(t.isAlive());
602 >    }
603 >
604 >    /**
605 >     * getWaitQueueLength returns number of waiting threads
606 >     */
607 >    public void testGetWaitQueueLength() throws InterruptedException {
608 >        final ReentrantLock lock = new ReentrantLock();
609 >        final Condition c = lock.newCondition();
610 >        Thread t1 = new Thread(new CheckedRunnable() {
611 >            public void realRun() throws InterruptedException {
612 >                lock.lock();
613 >                assertFalse(lock.hasWaiters(c));
614 >                assertEquals(0, lock.getWaitQueueLength(c));
615 >                c.await();
616 >                lock.unlock();
617 >            }});
618 >
619 >        Thread t2 = new Thread(new CheckedRunnable() {
620 >            public void realRun() throws InterruptedException {
621 >                lock.lock();
622 >                assertTrue(lock.hasWaiters(c));
623 >                assertEquals(1, lock.getWaitQueueLength(c));
624 >                c.await();
625 >                lock.unlock();
626 >            }});
627 >
628 >        t1.start();
629 >        Thread.sleep(SHORT_DELAY_MS);
630 >        t2.start();
631 >        Thread.sleep(SHORT_DELAY_MS);
632 >        lock.lock();
633 >        assertTrue(lock.hasWaiters(c));
634 >        assertEquals(2, lock.getWaitQueueLength(c));
635 >        c.signalAll();
636 >        lock.unlock();
637 >        Thread.sleep(SHORT_DELAY_MS);
638 >        lock.lock();
639 >        assertFalse(lock.hasWaiters(c));
640 >        assertEquals(0, lock.getWaitQueueLength(c));
641 >        lock.unlock();
642 >        t1.join(SHORT_DELAY_MS);
643 >        t2.join(SHORT_DELAY_MS);
644 >        assertFalse(t1.isAlive());
645 >        assertFalse(t2.isAlive());
646 >    }
647 >
648 >    /**
649 >     * getWaitingThreads returns only and all waiting threads
650 >     */
651 >    public void testGetWaitingThreads() throws InterruptedException {
652 >        final PublicReentrantLock lock = new PublicReentrantLock();
653 >        final Condition c = lock.newCondition();
654 >        Thread t1 = new Thread(new CheckedRunnable() {
655 >            public void realRun() throws InterruptedException {
656 >                lock.lock();
657 >                assertTrue(lock.getWaitingThreads(c).isEmpty());
658 >                c.await();
659 >                lock.unlock();
660 >            }});
661 >
662 >        Thread t2 = new Thread(new CheckedRunnable() {
663 >            public void realRun() throws InterruptedException {
664 >                lock.lock();
665 >                assertFalse(lock.getWaitingThreads(c).isEmpty());
666 >                c.await();
667 >                lock.unlock();
668 >            }});
669 >
670 >        lock.lock();
671 >        assertTrue(lock.getWaitingThreads(c).isEmpty());
672 >        lock.unlock();
673 >        t1.start();
674 >        Thread.sleep(SHORT_DELAY_MS);
675 >        t2.start();
676 >        Thread.sleep(SHORT_DELAY_MS);
677 >        lock.lock();
678 >        assertTrue(lock.hasWaiters(c));
679 >        assertTrue(lock.getWaitingThreads(c).contains(t1));
680 >        assertTrue(lock.getWaitingThreads(c).contains(t2));
681 >        c.signalAll();
682 >        lock.unlock();
683 >        Thread.sleep(SHORT_DELAY_MS);
684 >        lock.lock();
685 >        assertFalse(lock.hasWaiters(c));
686 >        assertTrue(lock.getWaitingThreads(c).isEmpty());
687 >        lock.unlock();
688 >        t1.join(SHORT_DELAY_MS);
689 >        t2.join(SHORT_DELAY_MS);
690 >        assertFalse(t1.isAlive());
691 >        assertFalse(t2.isAlive());
692 >    }
693 >
694 >    /** A helper class for uninterruptible wait tests */
695 >    class UninterruptibleThread extends Thread {
696 >        private ReentrantLock lock;
697 >        private Condition c;
698 >
699 >        public volatile boolean canAwake = false;
700 >        public volatile boolean interrupted = false;
701 >        public volatile boolean lockStarted = false;
702 >
703 >        public UninterruptibleThread(ReentrantLock lock, Condition c) {
704 >            this.lock = lock;
705 >            this.c = c;
706 >        }
707 >
708 >        public synchronized void run() {
709              lock.lock();
710 <            assertFalse(c.hasWaiters());
711 <            assertTrue(c.getWaitingThreads().isEmpty());
710 >            lockStarted = true;
711 >
712 >            while (!canAwake) {
713 >                c.awaitUninterruptibly();
714 >            }
715 >
716 >            interrupted = isInterrupted();
717              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");
718          }
719      }
720  
721 <    public void testAwaitUninterruptibly() {
722 <        final ReentrantLock lock = new ReentrantLock();
721 >    /**
722 >     * awaitUninterruptibly doesn't abort on interrupt
723 >     */
724 >    public void testAwaitUninterruptibly() throws InterruptedException {
725 >        final ReentrantLock lock = new ReentrantLock();
726          final Condition c = lock.newCondition();
727 <        Thread t = new Thread(new Runnable() {
556 <                public void run() {
557 <                    lock.lock();
558 <                    c.awaitUninterruptibly();
559 <                    lock.unlock();
560 <                }
561 <            });
727 >        UninterruptibleThread thread = new UninterruptibleThread(lock, c);
728  
729 +        thread.start();
730 +
731 +        while (!thread.lockStarted) {
732 +            Thread.sleep(100);
733 +        }
734 +
735 +        lock.lock();
736          try {
737 <            t.start();
738 <            Thread.sleep(SHORT_DELAY_MS);
566 <            t.interrupt();
567 <            lock.lock();
737 >            thread.interrupt();
738 >            thread.canAwake = true;
739              c.signal();
740 +        } finally {
741              lock.unlock();
570            t.join(SHORT_DELAY_MS);
571            assertFalse(t.isAlive());
572        }
573        catch (Exception ex) {
574            fail("unexpected exception");
742          }
743 +
744 +        thread.join();
745 +        assertTrue(thread.interrupted);
746 +        assertFalse(thread.isAlive());
747 +    }
748 +
749 +    /**
750 +     * await is interruptible
751 +     */
752 +    public void testAwait_Interrupt() throws InterruptedException {
753 +        final ReentrantLock lock = new ReentrantLock();
754 +        final Condition c = lock.newCondition();
755 +        Thread t = new Thread(new CheckedInterruptedRunnable() {
756 +            public void realRun() throws InterruptedException {
757 +                lock.lock();
758 +                c.await();
759 +            }});
760 +
761 +        t.start();
762 +        Thread.sleep(SHORT_DELAY_MS);
763 +        t.interrupt();
764 +        t.join(SHORT_DELAY_MS);
765 +        assertFalse(t.isAlive());
766      }
767  
768 <    public void testAwait_Interrupt() {
769 <        final ReentrantLock lock = new ReentrantLock();
768 >    /**
769 >     * awaitNanos is interruptible
770 >     */
771 >    public void testAwaitNanos_Interrupt() throws InterruptedException {
772 >        final ReentrantLock lock = new ReentrantLock();
773          final Condition c = lock.newCondition();
774 <        Thread t = new Thread(new Runnable() {
775 <                public void run() {
776 <                    try {
777 <                        lock.lock();
778 <                        c.await();
779 <                        lock.unlock();
780 <                        threadFail("should throw");
781 <                    }
782 <                    catch(InterruptedException success) {
783 <                    }
784 <                }
592 <            });
593 <
594 <        try {
595 <            t.start();
596 <            Thread.sleep(SHORT_DELAY_MS);
597 <            t.interrupt();
598 <            t.join(SHORT_DELAY_MS);
599 <            assertFalse(t.isAlive());
600 <        }
601 <        catch (Exception ex) {
602 <            fail("unexpected exception");
603 <        }
774 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
775 >            public void realRun() throws InterruptedException {
776 >                lock.lock();
777 >                c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
778 >            }});
779 >
780 >        t.start();
781 >        Thread.sleep(SHORT_DELAY_MS);
782 >        t.interrupt();
783 >        t.join(SHORT_DELAY_MS);
784 >        assertFalse(t.isAlive());
785      }
786  
787 <    public void testAwaitNanos_Interrupt() {
788 <        final ReentrantLock lock = new ReentrantLock();
787 >    /**
788 >     * awaitUntil is interruptible
789 >     */
790 >    public void testAwaitUntil_Interrupt() throws InterruptedException {
791 >        final ReentrantLock lock = new ReentrantLock();
792          final Condition c = lock.newCondition();
793 <        Thread t = new Thread(new Runnable() {
794 <                public void run() {
795 <                    try {
796 <                        lock.lock();
797 <                        c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
798 <                        lock.unlock();
799 <                        threadFail("should throw");
800 <                    }
801 <                    catch(InterruptedException success) {
802 <                    }
803 <                }
804 <            });
621 <
622 <        try {
623 <            t.start();
624 <            Thread.sleep(SHORT_DELAY_MS);
625 <            t.interrupt();
626 <            t.join(SHORT_DELAY_MS);
627 <            assertFalse(t.isAlive());
628 <        }
629 <        catch (Exception ex) {
630 <            fail("unexpected exception");
631 <        }
793 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
794 >            public void realRun() throws InterruptedException {
795 >                lock.lock();
796 >                java.util.Date d = new java.util.Date();
797 >                c.awaitUntil(new java.util.Date(d.getTime() + 10000));
798 >            }});
799 >
800 >        t.start();
801 >        Thread.sleep(SHORT_DELAY_MS);
802 >        t.interrupt();
803 >        t.join(SHORT_DELAY_MS);
804 >        assertFalse(t.isAlive());
805      }
806  
807 <    public void testAwaitUntil_Interrupt() {
808 <        final ReentrantLock lock = new ReentrantLock();
807 >    /**
808 >     * signalAll wakes up all threads
809 >     */
810 >    public void testSignalAll() throws InterruptedException {
811 >        final ReentrantLock lock = new ReentrantLock();
812          final Condition c = lock.newCondition();
813 <        Thread t = new Thread(new Runnable() {
814 <                public void run() {
815 <                    try {
816 <                        lock.lock();
817 <                        java.util.Date d = new java.util.Date();
818 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
819 <                        lock.unlock();
820 <                        threadFail("should throw");
821 <                    }
822 <                    catch(InterruptedException success) {
823 <                    }
824 <                }
825 <            });
826 <
827 <        try {
828 <            t.start();
829 <            Thread.sleep(SHORT_DELAY_MS);
830 <            t.interrupt();
831 <            t.join(SHORT_DELAY_MS);
832 <            assertFalse(t.isAlive());
833 <        }
834 <        catch (Exception ex) {
835 <            fail("unexpected exception");
836 <        }
813 >        Thread t1 = new Thread(new CheckedRunnable() {
814 >            public void realRun() throws InterruptedException {
815 >                lock.lock();
816 >                c.await();
817 >                lock.unlock();
818 >            }});
819 >
820 >        Thread t2 = new Thread(new CheckedRunnable() {
821 >            public void realRun() throws InterruptedException {
822 >                lock.lock();
823 >                c.await();
824 >                lock.unlock();
825 >            }});
826 >
827 >        t1.start();
828 >        t2.start();
829 >        Thread.sleep(SHORT_DELAY_MS);
830 >        lock.lock();
831 >        c.signalAll();
832 >        lock.unlock();
833 >        t1.join(SHORT_DELAY_MS);
834 >        t2.join(SHORT_DELAY_MS);
835 >        assertFalse(t1.isAlive());
836 >        assertFalse(t2.isAlive());
837      }
838  
839 <    public void testSignalAll() {
840 <        final ReentrantLock lock = new ReentrantLock();
839 >    /**
840 >     * await after multiple reentrant locking preserves lock count
841 >     */
842 >    public void testAwaitLockCount() throws InterruptedException {
843 >        final ReentrantLock lock = new ReentrantLock();
844          final Condition c = lock.newCondition();
845 <        Thread t1 = new Thread(new Runnable() {
846 <                public void run() {
847 <                    try {
848 <                        lock.lock();
849 <                        c.await();
850 <                        lock.unlock();
851 <                    }
852 <                    catch(InterruptedException e) {
853 <                        threadFail("unexpected exception");
854 <                    }
855 <                }
856 <            });
857 <
858 <        Thread t2 = new Thread(new Runnable() {
859 <                public void run() {
860 <                    try {
861 <                        lock.lock();
862 <                        c.await();
863 <                        lock.unlock();
864 <                    }
865 <                    catch(InterruptedException e) {
866 <                        threadFail("unexpected exception");
867 <                    }
868 <                }
869 <            });
870 <
871 <        try {
872 <            t1.start();
873 <            t2.start();
874 <            Thread.sleep(SHORT_DELAY_MS);
696 <            lock.lock();
697 <            c.signalAll();
698 <            lock.unlock();
699 <            t1.join(SHORT_DELAY_MS);
700 <            t2.join(SHORT_DELAY_MS);
701 <            assertFalse(t1.isAlive());
702 <            assertFalse(t2.isAlive());
703 <        }
704 <        catch (Exception ex) {
705 <            fail("unexpected exception");
706 <        }
845 >        Thread t1 = new Thread(new CheckedRunnable() {
846 >            public void realRun() throws InterruptedException {
847 >                lock.lock();
848 >                assertEquals(1, lock.getHoldCount());
849 >                c.await();
850 >                assertEquals(1, lock.getHoldCount());
851 >                lock.unlock();
852 >            }});
853 >
854 >        Thread t2 = new Thread(new CheckedRunnable() {
855 >            public void realRun() throws InterruptedException {
856 >                lock.lock();
857 >                lock.lock();
858 >                assertEquals(2, lock.getHoldCount());
859 >                c.await();
860 >                assertEquals(2, lock.getHoldCount());
861 >                lock.unlock();
862 >                lock.unlock();
863 >            }});
864 >
865 >        t1.start();
866 >        t2.start();
867 >        Thread.sleep(SHORT_DELAY_MS);
868 >        lock.lock();
869 >        c.signalAll();
870 >        lock.unlock();
871 >        t1.join(SHORT_DELAY_MS);
872 >        t2.join(SHORT_DELAY_MS);
873 >        assertFalse(t1.isAlive());
874 >        assertFalse(t2.isAlive());
875      }
876  
877 <    public void testSerialization() {
877 >    /**
878 >     * A serialized lock deserializes as unlocked
879 >     */
880 >    public void testSerialization() throws Exception {
881          ReentrantLock l = new ReentrantLock();
882          l.lock();
883          l.unlock();
884  
885 <        try {
886 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
887 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
888 <            out.writeObject(l);
889 <            out.close();
890 <
891 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
892 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
893 <            ReentrantLock r = (ReentrantLock) in.readObject();
894 <            r.lock();
895 <            r.unlock();
896 <        } catch(Exception e){
897 <            e.printStackTrace();
898 <            fail("unexpected exception");
899 <        }
885 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
886 >        ObjectOutputStream out =
887 >            new ObjectOutputStream(new BufferedOutputStream(bout));
888 >        out.writeObject(l);
889 >        out.close();
890 >
891 >        ByteArrayInputStream bin =
892 >            new ByteArrayInputStream(bout.toByteArray());
893 >        ObjectInputStream in =
894 >            new ObjectInputStream(new BufferedInputStream(bin));
895 >        ReentrantLock r = (ReentrantLock) in.readObject();
896 >        r.lock();
897 >        r.unlock();
898 >    }
899 >
900 >    /**
901 >     * toString indicates current lock state
902 >     */
903 >    public void testToString() {
904 >        ReentrantLock lock = new ReentrantLock();
905 >        String us = lock.toString();
906 >        assertTrue(us.indexOf("Unlocked") >= 0);
907 >        lock.lock();
908 >        String ls = lock.toString();
909 >        assertTrue(ls.indexOf("Locked") >= 0);
910      }
911  
912   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines