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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines