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.15 by dl, Mon Dec 29 19:05:40 2003 UTC vs.
Revision 1.62 by jsr166, Fri Jul 3 01:25:15 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines