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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines