ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ReentrantLockTest.java

Comparing jsr166/src/test/tck/ReentrantLockTest.java (file contents):
Revision 1.45 by jsr166, Sat May 7 19:03:26 2011 UTC vs.
Revision 1.61 by jsr166, Fri Jul 3 00:25:35 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.concurrent.locks.*;
11	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.util.*;
11	<	import java.io.*;
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);
29		}
30
31		/**
32	<	* A runnable calling lockInterruptibly
32	>	* A checked runnable calling lockInterruptibly
33		*/
34		class InterruptibleLockRunnable extends CheckedRunnable {
35		final ReentrantLock lock;
36	<	InterruptibleLockRunnable(ReentrantLock l) { lock = l; }
36	>	InterruptibleLockRunnable(ReentrantLock lock) { this.lock = lock; }
37		public void realRun() throws InterruptedException {
38		lock.lockInterruptibly();
39		}
40		}
41
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 extends CheckedInterruptedRunnable {
47		final ReentrantLock lock;
48	<	InterruptedLockRunnable(ReentrantLock l) { lock = l; }
48	>	InterruptedLockRunnable(ReentrantLock lock) { this.lock = lock; }
49		public void realRun() throws InterruptedException {
50		lock.lockInterruptibly();
51		}
#	Line 65 | Line 72 | public class ReentrantLockTest extends J
72		* Releases write lock, checking that it had a hold count of 1.
73		*/
74		void releaseLock(PublicReentrantLock lock) {
75	<	assertLockedBy(lock, Thread.currentThread());
75	>	assertLockedByMoi(lock);
76		lock.unlock();
77		assertFalse(lock.isHeldByCurrentThread());
78		assertNotLocked(lock);
#	Line 78 | Line 85 | public class ReentrantLockTest extends J
85		long startTime = System.nanoTime();
86		while (!lock.hasQueuedThread(t)) {
87		if (millisElapsedSince(startTime) > LONG_DELAY_MS)
88	<	throw new AssertionError("timed out");
88	>	throw new AssertionFailedError("timed out");
89		Thread.yield();
90		}
91		assertTrue(t.isAlive());
92	<	assertTrue(lock.getOwner() != t);
92	>	assertNotSame(t, lock.getOwner());
93		}
94
95		/**
#	Line 108 | Line 115 | public class ReentrantLockTest extends J
115		}
116
117		/**
118	+	* Checks that lock is locked by the current thread.
119	+	*/
120	+	void assertLockedByMoi(PublicReentrantLock lock) {
121	+	assertLockedBy(lock, Thread.currentThread());
122	+	}
123	+
124	+	/**
125		* Checks that condition c has no waiters.
126		*/
127		void assertHasNoWaiters(PublicReentrantLock lock, Condition c) {
#	Line 129 | Line 143 | public class ReentrantLockTest extends J
143		lock.unlock();
144		}
145
146	+	enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
147	+
148	+	/**
149	+	* Awaits condition "indefinitely" using the specified AwaitMethod.
150	+	*/
151	+	void await(Condition c, AwaitMethod awaitMethod)
152	+	throws InterruptedException {
153	+	long timeoutMillis = 2 * LONG_DELAY_MS;
154	+	switch (awaitMethod) {
155	+	case await:
156	+	c.await();
157	+	break;
158	+	case awaitTimed:
159	+	assertTrue(c.await(timeoutMillis, MILLISECONDS));
160	+	break;
161	+	case awaitNanos:
162	+	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
163	+	long nanosRemaining = c.awaitNanos(timeoutNanos);
164	+	assertTrue(nanosRemaining > timeoutNanos / 2);
165	+	assertTrue(nanosRemaining <= timeoutNanos);
166	+	break;
167	+	case awaitUntil:
168	+	assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
169	+	break;
170	+	default:
171	+	throw new AssertionError();
172	+	}
173	+	}
174	+
175		/**
176		* Constructor sets given fairness, and is in unlocked state
177		*/
#	Line 151 | Line 194 | public class ReentrantLockTest extends J
194		/**
195		* locking an unlocked lock succeeds
196		*/
197	<	public void testLock() {
198	<	PublicReentrantLock lock = new PublicReentrantLock();
197	>	public void testLock()      { testLock(false); }
198	>	public void testLock_fair() { testLock(true); }
199	>	public void testLock(boolean fair) {
200	>	PublicReentrantLock lock = new PublicReentrantLock(fair);
201		lock.lock();
202	<	assertLockedBy(lock, Thread.currentThread());
158	<	releaseLock(lock);
159	<	}
160	<
161	<	/**
162	<	* locking an unlocked fair lock succeeds
163	<	*/
164	<	public void testFairLock() {
165	<	PublicReentrantLock lock = new PublicReentrantLock(true);
166	<	lock.lock();
167	<	assertLockedBy(lock, Thread.currentThread());
202	>	assertLockedByMoi(lock);
203		releaseLock(lock);
204		}
205
206		/**
207		* Unlocking an unlocked lock throws IllegalMonitorStateException
208		*/
209	<	public void testUnlock_IllegalMonitorStateException() {
210	<	ReentrantLock lock = new ReentrantLock();
209	>	public void testUnlock_IMSE()      { testUnlock_IMSE(false); }
210	>	public void testUnlock_IMSE_fair() { testUnlock_IMSE(true); }
211	>	public void testUnlock_IMSE(boolean fair) {
212	>	ReentrantLock lock = new ReentrantLock(fair);
213		try {
214		lock.unlock();
215		shouldThrow();
#	Line 182 | Line 219 | public class ReentrantLockTest extends J
219		/**
220		* tryLock on an unlocked lock succeeds
221		*/
222	<	public void testTryLock() {
223	<	PublicReentrantLock lock = new PublicReentrantLock();
222	>	public void testTryLock()      { testTryLock(false); }
223	>	public void testTryLock_fair() { testTryLock(true); }
224	>	public void testTryLock(boolean fair) {
225	>	PublicReentrantLock lock = new PublicReentrantLock(fair);
226		assertTrue(lock.tryLock());
227	<	assertLockedBy(lock, Thread.currentThread());
227	>	assertLockedByMoi(lock);
228	>	assertTrue(lock.tryLock());
229	>	assertLockedByMoi(lock);
230	>	lock.unlock();
231		releaseLock(lock);
232		}
233
234		/**
235		* hasQueuedThreads reports whether there are waiting threads
236		*/
237	<	public void testHasQueuedThreads() throws InterruptedException {
238	<	final PublicReentrantLock lock = new PublicReentrantLock();
237	>	public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
238	>	public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
239	>	public void testHasQueuedThreads(boolean fair) {
240	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
241		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
242		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
243		assertFalse(lock.hasQueuedThreads());
#	Line 216 | Line 260 | public class ReentrantLockTest extends J
260		/**
261		* getQueueLength reports number of waiting threads
262		*/
263	<	public void testGetQueueLength() throws InterruptedException {
264	<	final PublicReentrantLock lock = new PublicReentrantLock();
265	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
266	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
223	<	assertEquals(0, lock.getQueueLength());
224	<	lock.lock();
225	<	t1.start();
226	<	waitForQueuedThread(lock, t1);
227	<	assertEquals(1, lock.getQueueLength());
228	<	t2.start();
229	<	waitForQueuedThread(lock, t2);
230	<	assertEquals(2, lock.getQueueLength());
231	<	t1.interrupt();
232	<	awaitTermination(t1);
233	<	assertEquals(1, lock.getQueueLength());
234	<	lock.unlock();
235	<	awaitTermination(t2);
236	<	assertEquals(0, lock.getQueueLength());
237	<	}
238	<
239	<	/**
240	<	* getQueueLength reports number of waiting threads
241	<	*/
242	<	public void testGetQueueLength_fair() throws InterruptedException {
243	<	final PublicReentrantLock lock = new PublicReentrantLock(true);
263	>	public void testGetQueueLength()      { testGetQueueLength(false); }
264	>	public void testGetQueueLength_fair() { testGetQueueLength(true); }
265	>	public void testGetQueueLength(boolean fair) {
266	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
267		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
268		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
269		assertEquals(0, lock.getQueueLength());
#	Line 262 | Line 285 | public class ReentrantLockTest extends J
285		/**
286		* hasQueuedThread(null) throws NPE
287		*/
288	<	public void testHasQueuedThreadNPE() {
289	<	final ReentrantLock lock = new ReentrantLock();
288	>	public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
289	>	public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
290	>	public void testHasQueuedThreadNPE(boolean fair) {
291	>	final ReentrantLock lock = new ReentrantLock(fair);
292		try {
293		lock.hasQueuedThread(null);
294		shouldThrow();
#	Line 271 | Line 296 | public class ReentrantLockTest extends J
296		}
297
298		/**
299	<	* hasQueuedThread reports whether a thread is queued.
299	>	* hasQueuedThread reports whether a thread is queued
300		*/
301	<	public void testHasQueuedThread() throws InterruptedException {
302	<	final PublicReentrantLock lock = new PublicReentrantLock();
301	>	public void testHasQueuedThread()      { testHasQueuedThread(false); }
302	>	public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
303	>	public void testHasQueuedThread(boolean fair) {
304	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
305		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
306		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
307		assertFalse(lock.hasQueuedThread(t1));
#	Line 301 | Line 328 | public class ReentrantLockTest extends J
328		/**
329		* getQueuedThreads includes waiting threads
330		*/
331	<	public void testGetQueuedThreads() throws InterruptedException {
332	<	final PublicReentrantLock lock = new PublicReentrantLock();
331	>	public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
332	>	public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
333	>	public void testGetQueuedThreads(boolean fair) {
334	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
335		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
336		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
337		assertTrue(lock.getQueuedThreads().isEmpty());
#	Line 328 | Line 357 | public class ReentrantLockTest extends J
357		}
358
359		/**
360	<	* timed tryLock is interruptible.
360	>	* timed tryLock is interruptible
361		*/
362	<	public void testTryLock_Interrupted() throws InterruptedException {
363	<	final PublicReentrantLock lock = new PublicReentrantLock();
362	>	public void testTryLock_Interruptible()      { testTryLock_Interruptible(false); }
363	>	public void testTryLock_Interruptible_fair() { testTryLock_Interruptible(true); }
364	>	public void testTryLock_Interruptible(boolean fair) {
365	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
366		lock.lock();
367		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
368		public void realRun() throws InterruptedException {
#	Line 347 | Line 378 | public class ReentrantLockTest extends J
378		/**
379		* tryLock on a locked lock fails
380		*/
381	<	public void testTryLockWhenLocked() throws InterruptedException {
382	<	final PublicReentrantLock lock = new PublicReentrantLock();
381	>	public void testTryLockWhenLocked()      { testTryLockWhenLocked(false); }
382	>	public void testTryLockWhenLocked_fair() { testTryLockWhenLocked(true); }
383	>	public void testTryLockWhenLocked(boolean fair) {
384	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
385		lock.lock();
386		Thread t = newStartedThread(new CheckedRunnable() {
387		public void realRun() {
#	Line 362 | Line 395 | public class ReentrantLockTest extends J
395		/**
396		* Timed tryLock on a locked lock times out
397		*/
398	<	public void testTryLock_Timeout() throws InterruptedException {
399	<	final PublicReentrantLock lock = new PublicReentrantLock();
398	>	public void testTryLock_Timeout()      { testTryLock_Timeout(false); }
399	>	public void testTryLock_Timeout_fair() { testTryLock_Timeout(true); }
400	>	public void testTryLock_Timeout(boolean fair) {
401	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
402		lock.lock();
403		Thread t = newStartedThread(new CheckedRunnable() {
404		public void realRun() throws InterruptedException {
#	Line 380 | Line 415 | public class ReentrantLockTest extends J
415		/**
416		* getHoldCount returns number of recursive holds
417		*/
418	<	public void testGetHoldCount() {
419	<	ReentrantLock lock = new ReentrantLock();
418	>	public void testGetHoldCount()      { testGetHoldCount(false); }
419	>	public void testGetHoldCount_fair() { testGetHoldCount(true); }
420	>	public void testGetHoldCount(boolean fair) {
421	>	ReentrantLock lock = new ReentrantLock(fair);
422		for (int i = 1; i <= SIZE; i++) {
423		lock.lock();
424		assertEquals(i, lock.getHoldCount());
425		}
426		for (int i = SIZE; i > 0; i--) {
427		lock.unlock();
428	<	assertEquals(i-1, lock.getHoldCount());
428	>	assertEquals(i - 1, lock.getHoldCount());
429		}
430		}
431
432		/**
433		* isLocked is true when locked and false when not
434		*/
435	<	public void testIsLocked() throws Exception {
436	<	final ReentrantLock lock = new ReentrantLock();
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	<	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	<	}
462	<
463	<	/**
464	<	* lockInterruptibly is interruptible.
428	<	*/
429	<	public void testLockInterruptibly_Interrupted() throws InterruptedException {
430	<	final PublicReentrantLock lock = new PublicReentrantLock();
431	<	lock.lock();
432	<	Thread t = newStartedThread(new InterruptedLockRunnable(lock));
433	<	waitForQueuedThread(lock, t);
434	<	t.interrupt();
435	<	awaitTermination(t);
436	<	releaseLock(lock);
435	>	public void testIsLocked()      { testIsLocked(false); }
436	>	public void testIsLocked_fair() { testIsLocked(true); }
437	>	public void testIsLocked(boolean fair) {
438	>	try {
439	>	final ReentrantLock lock = new ReentrantLock(fair);
440	>	assertFalse(lock.isLocked());
441	>	lock.lock();
442	>	assertTrue(lock.isLocked());
443	>	lock.lock();
444	>	assertTrue(lock.isLocked());
445	>	lock.unlock();
446	>	assertTrue(lock.isLocked());
447	>	lock.unlock();
448	>	assertFalse(lock.isLocked());
449	>	final CyclicBarrier barrier = new CyclicBarrier(2);
450	>	Thread t = newStartedThread(new CheckedRunnable() {
451	>	public void realRun() throws Exception {
452	>	lock.lock();
453	>	assertTrue(lock.isLocked());
454	>	barrier.await();
455	>	barrier.await();
456	>	lock.unlock();
457	>	}});
458	>
459	>	barrier.await();
460	>	assertTrue(lock.isLocked());
461	>	barrier.await();
462	>	awaitTermination(t);
463	>	assertFalse(lock.isLocked());
464	>	} catch (Exception fail) { threadUnexpectedException(fail); }
465		}
466
467		/**
468		* lockInterruptibly succeeds when unlocked, else is interruptible
469		*/
470	<	public void testLockInterruptibly_Interrupted2() throws InterruptedException {
471	<	final PublicReentrantLock lock = new PublicReentrantLock();
472	<	lock.lockInterruptibly();
470	>	public void testLockInterruptibly()      { testLockInterruptibly(false); }
471	>	public void testLockInterruptibly_fair() { testLockInterruptibly(true); }
472	>	public void testLockInterruptibly(boolean fair) {
473	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
474	>	try {
475	>	lock.lockInterruptibly();
476	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
477	>	assertLockedByMoi(lock);
478		Thread t = newStartedThread(new InterruptedLockRunnable(lock));
479		waitForQueuedThread(lock, t);
480		t.interrupt();
#	Line 454 | Line 487 | public class ReentrantLockTest extends J
487		/**
488		* Calling await without holding lock throws IllegalMonitorStateException
489		*/
490	<	public void testAwait_IllegalMonitor() throws InterruptedException {
491	<	final ReentrantLock lock = new ReentrantLock();
492	<	final Condition c = lock.newCondition();
493	<	try {
494	<	c.await();
495	<	shouldThrow();
496	<	} catch (IllegalMonitorStateException success) {}
497	<	try {
498	<	c.await(LONG_DELAY_MS, MILLISECONDS);
499	<	shouldThrow();
500	<	} catch (IllegalMonitorStateException success) {}
501	<	try {
502	<	c.awaitNanos(100);
503	<	shouldThrow();
471	<	} catch (IllegalMonitorStateException success) {}
472	<	try {
473	<	c.awaitUninterruptibly();
474	<	shouldThrow();
475	<	} catch (IllegalMonitorStateException success) {}
490	>	public void testAwait_IMSE()      { testAwait_IMSE(false); }
491	>	public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
492	>	public void testAwait_IMSE(boolean fair) {
493	>	final ReentrantLock lock = new ReentrantLock(fair);
494	>	final Condition c = lock.newCondition();
495	>	for (AwaitMethod awaitMethod : AwaitMethod.values()) {
496	>	long startTime = System.nanoTime();
497	>	try {
498	>	await(c, awaitMethod);
499	>	shouldThrow();
500	>	} catch (IllegalMonitorStateException success) {
501	>	} catch (InterruptedException e) { threadUnexpectedException(e); }
502	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
503	>	}
504		}
505
506		/**
507		* Calling signal without holding lock throws IllegalMonitorStateException
508		*/
509	<	public void testSignal_IllegalMonitor() {
510	<	final ReentrantLock lock = new ReentrantLock();
509	>	public void testSignal_IMSE()      { testSignal_IMSE(false); }
510	>	public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
511	>	public void testSignal_IMSE(boolean fair) {
512	>	final ReentrantLock lock = new ReentrantLock(fair);
513		final Condition c = lock.newCondition();
514		try {
515		c.signal();
#	Line 490 | Line 520 | public class ReentrantLockTest extends J
520		/**
521		* awaitNanos without a signal times out
522		*/
523	<	public void testAwaitNanos_Timeout() throws InterruptedException {
524	<	final ReentrantLock lock = new ReentrantLock();
525	<	final Condition c = lock.newCondition();
526	<	lock.lock();
527	<	long startTime = System.nanoTime();
528	<	long timeoutMillis = 10;
529	<	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
530	<	long nanosRemaining = c.awaitNanos(timeoutNanos);
531	<	assertTrue(nanosRemaining <= 0);
532	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
533	<	lock.unlock();
523	>	public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
524	>	public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
525	>	public void testAwaitNanos_Timeout(boolean fair) {
526	>	try {
527	>	final ReentrantLock lock = new ReentrantLock(fair);
528	>	final Condition c = lock.newCondition();
529	>	lock.lock();
530	>	long startTime = System.nanoTime();
531	>	long timeoutMillis = 10;
532	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
533	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
534	>	assertTrue(nanosRemaining <= 0);
535	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
536	>	lock.unlock();
537	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
538		}
539
540		/**
541		* timed await without a signal times out
542		*/
543	<	public void testAwait_Timeout() throws InterruptedException {
544	<	final ReentrantLock lock = new ReentrantLock();
545	<	final Condition c = lock.newCondition();
546	<	lock.lock();
547	<	long startTime = System.nanoTime();
548	<	long timeoutMillis = 10;
549	<	assertFalse(c.await(timeoutMillis, MILLISECONDS));
550	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
551	<	lock.unlock();
543	>	public void testAwait_Timeout()      { testAwait_Timeout(false); }
544	>	public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
545	>	public void testAwait_Timeout(boolean fair) {
546	>	try {
547	>	final ReentrantLock lock = new ReentrantLock(fair);
548	>	final Condition c = lock.newCondition();
549	>	lock.lock();
550	>	long startTime = System.nanoTime();
551	>	long timeoutMillis = 10;
552	>	assertFalse(c.await(timeoutMillis, MILLISECONDS));
553	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
554	>	lock.unlock();
555	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
556		}
557
558		/**
559		* awaitUntil without a signal times out
560		*/
561	<	public void testAwaitUntil_Timeout() throws InterruptedException {
562	<	final ReentrantLock lock = new ReentrantLock();
563	<	final Condition c = lock.newCondition();
564	<	lock.lock();
565	<	long startTime = System.nanoTime();
566	<	long timeoutMillis = 10;
567	<	java.util.Date d = new java.util.Date();
568	<	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
569	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
570	<	lock.unlock();
561	>	public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
562	>	public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
563	>	public void testAwaitUntil_Timeout(boolean fair) {
564	>	try {
565	>	final ReentrantLock lock = new ReentrantLock(fair);
566	>	final Condition c = lock.newCondition();
567	>	lock.lock();
568	>	long startTime = System.nanoTime();
569	>	long timeoutMillis = 10;
570	>	java.util.Date d = new java.util.Date();
571	>	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
572	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
573	>	lock.unlock();
574	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
575		}
576
577		/**
578		* await returns when signalled
579		*/
580	<	public void testAwait() throws InterruptedException {
581	<	final PublicReentrantLock lock = new PublicReentrantLock();
580	>	public void testAwait()      { testAwait(false); }
581	>	public void testAwait_fair() { testAwait(true); }
582	>	public void testAwait(boolean fair) {
583	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
584		final Condition c = lock.newCondition();
585		final CountDownLatch locked = new CountDownLatch(1);
586		Thread t = newStartedThread(new CheckedRunnable() {
#	Line 547 | Line 591 | public class ReentrantLockTest extends J
591		lock.unlock();
592		}});
593
594	<	locked.await();
594	>	await(locked);
595		lock.lock();
596		assertHasWaiters(lock, c, t);
597		c.signal();
#	Line 560 | Line 604 | public class ReentrantLockTest extends J
604		/**
605		* hasWaiters throws NPE if null
606		*/
607	<	public void testHasWaitersNPE() {
608	<	final ReentrantLock lock = new ReentrantLock();
607	>	public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
608	>	public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
609	>	public void testHasWaitersNPE(boolean fair) {
610	>	final ReentrantLock lock = new ReentrantLock(fair);
611		try {
612		lock.hasWaiters(null);
613		shouldThrow();
#	Line 571 | Line 617 | public class ReentrantLockTest extends J
617		/**
618		* getWaitQueueLength throws NPE if null
619		*/
620	<	public void testGetWaitQueueLengthNPE() {
621	<	final ReentrantLock lock = new ReentrantLock();
620	>	public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
621	>	public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
622	>	public void testGetWaitQueueLengthNPE(boolean fair) {
623	>	final ReentrantLock lock = new ReentrantLock(fair);
624		try {
625		lock.getWaitQueueLength(null);
626		shouldThrow();
#	Line 582 | Line 630 | public class ReentrantLockTest extends J
630		/**
631		* getWaitingThreads throws NPE if null
632		*/
633	<	public void testGetWaitingThreadsNPE() {
634	<	final PublicReentrantLock lock = new PublicReentrantLock();
633	>	public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
634	>	public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
635	>	public void testGetWaitingThreadsNPE(boolean fair) {
636	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
637		try {
638		lock.getWaitingThreads(null);
639		shouldThrow();
#	Line 593 | Line 643 | public class ReentrantLockTest extends J
643		/**
644		* hasWaiters throws IllegalArgumentException if not owned
645		*/
646	<	public void testHasWaitersIAE() {
647	<	final ReentrantLock lock = new ReentrantLock();
646	>	public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
647	>	public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
648	>	public void testHasWaitersIAE(boolean fair) {
649	>	final ReentrantLock lock = new ReentrantLock(fair);
650		final Condition c = lock.newCondition();
651	<	final ReentrantLock lock2 = new ReentrantLock();
651	>	final ReentrantLock lock2 = new ReentrantLock(fair);
652		try {
653		lock2.hasWaiters(c);
654		shouldThrow();
#	Line 606 | Line 658 | public class ReentrantLockTest extends J
658		/**
659		* hasWaiters throws IllegalMonitorStateException if not locked
660		*/
661	<	public void testHasWaitersIMSE() {
662	<	final ReentrantLock lock = new ReentrantLock();
661	>	public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
662	>	public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
663	>	public void testHasWaitersIMSE(boolean fair) {
664	>	final ReentrantLock lock = new ReentrantLock(fair);
665		final Condition c = lock.newCondition();
666		try {
667		lock.hasWaiters(c);
#	Line 618 | Line 672 | public class ReentrantLockTest extends J
672		/**
673		* getWaitQueueLength throws IllegalArgumentException if not owned
674		*/
675	<	public void testGetWaitQueueLengthIAE() {
676	<	final ReentrantLock lock = new ReentrantLock();
675	>	public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
676	>	public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
677	>	public void testGetWaitQueueLengthIAE(boolean fair) {
678	>	final ReentrantLock lock = new ReentrantLock(fair);
679		final Condition c = lock.newCondition();
680	<	final ReentrantLock lock2 = new ReentrantLock();
680	>	final ReentrantLock lock2 = new ReentrantLock(fair);
681		try {
682		lock2.getWaitQueueLength(c);
683		shouldThrow();
#	Line 631 | Line 687 | public class ReentrantLockTest extends J
687		/**
688		* getWaitQueueLength throws IllegalMonitorStateException if not locked
689		*/
690	<	public void testGetWaitQueueLengthIMSE() {
691	<	final ReentrantLock lock = new ReentrantLock();
690	>	public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
691	>	public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
692	>	public void testGetWaitQueueLengthIMSE(boolean fair) {
693	>	final ReentrantLock lock = new ReentrantLock(fair);
694		final Condition c = lock.newCondition();
695		try {
696		lock.getWaitQueueLength(c);
#	Line 643 | Line 701 | public class ReentrantLockTest extends J
701		/**
702		* getWaitingThreads throws IllegalArgumentException if not owned
703		*/
704	<	public void testGetWaitingThreadsIAE() {
705	<	final PublicReentrantLock lock = new PublicReentrantLock();
704	>	public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
705	>	public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
706	>	public void testGetWaitingThreadsIAE(boolean fair) {
707	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
708		final Condition c = lock.newCondition();
709	<	final PublicReentrantLock lock2 = new PublicReentrantLock();
709	>	final PublicReentrantLock lock2 = new PublicReentrantLock(fair);
710		try {
711		lock2.getWaitingThreads(c);
712		shouldThrow();
#	Line 656 | Line 716 | public class ReentrantLockTest extends J
716		/**
717		* getWaitingThreads throws IllegalMonitorStateException if not locked
718		*/
719	<	public void testGetWaitingThreadsIMSE() {
720	<	final PublicReentrantLock lock = new PublicReentrantLock();
719	>	public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
720	>	public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
721	>	public void testGetWaitingThreadsIMSE(boolean fair) {
722	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
723		final Condition c = lock.newCondition();
724		try {
725		lock.getWaitingThreads(c);
#	Line 668 | Line 730 | public class ReentrantLockTest extends J
730		/**
731		* hasWaiters returns true when a thread is waiting, else false
732		*/
733	<	public void testHasWaiters() throws InterruptedException {
734	<	final PublicReentrantLock lock = new PublicReentrantLock();
733	>	public void testHasWaiters()      { testHasWaiters(false); }
734	>	public void testHasWaiters_fair() { testHasWaiters(true); }
735	>	public void testHasWaiters(boolean fair) {
736	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
737		final Condition c = lock.newCondition();
738	<	final CountDownLatch locked = new CountDownLatch(1);
738	>	final CountDownLatch pleaseSignal = new CountDownLatch(1);
739		Thread t = newStartedThread(new CheckedRunnable() {
740		public void realRun() throws InterruptedException {
741		lock.lock();
742		assertHasNoWaiters(lock, c);
743		assertFalse(lock.hasWaiters(c));
744	<	locked.countDown();
744	>	pleaseSignal.countDown();
745		c.await();
746		assertHasNoWaiters(lock, c);
747		assertFalse(lock.hasWaiters(c));
748		lock.unlock();
749		}});
750
751	<	locked.await();
751	>	await(pleaseSignal);
752		lock.lock();
753		assertHasWaiters(lock, c, t);
754		assertTrue(lock.hasWaiters(c));
#	Line 699 | Line 763 | public class ReentrantLockTest extends J
763		/**
764		* getWaitQueueLength returns number of waiting threads
765		*/
766	<	public void testGetWaitQueueLength() throws InterruptedException {
767	<	final PublicReentrantLock lock = new PublicReentrantLock();
766	>	public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
767	>	public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
768	>	public void testGetWaitQueueLength(boolean fair) {
769	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
770		final Condition c = lock.newCondition();
771		final CountDownLatch locked1 = new CountDownLatch(1);
772		final CountDownLatch locked2 = new CountDownLatch(1);
#	Line 729 | Line 795 | public class ReentrantLockTest extends J
795		lock.unlock();
796
797		t1.start();
798	<	locked1.await();
798	>	await(locked1);
799
800		lock.lock();
801		assertHasWaiters(lock, c, t1);
#	Line 737 | Line 803 | public class ReentrantLockTest extends J
803		lock.unlock();
804
805		t2.start();
806	<	locked2.await();
806	>	await(locked2);
807
808		lock.lock();
809		assertHasWaiters(lock, c, t1, t2);
#	Line 755 | Line 821 | public class ReentrantLockTest extends J
821		/**
822		* getWaitingThreads returns only and all waiting threads
823		*/
824	<	public void testGetWaitingThreads() throws InterruptedException {
825	<	final PublicReentrantLock lock = new PublicReentrantLock();
824	>	public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
825	>	public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
826	>	public void testGetWaitingThreads(boolean fair) {
827	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
828		final Condition c = lock.newCondition();
829		final CountDownLatch locked1 = new CountDownLatch(1);
830		final CountDownLatch locked2 = new CountDownLatch(1);
#	Line 783 | Line 851 | public class ReentrantLockTest extends J
851		lock.unlock();
852
853		t1.start();
854	<	locked1.await();
854	>	await(locked1);
855
856		lock.lock();
857		assertHasWaiters(lock, c, t1);
#	Line 793 | Line 861 | public class ReentrantLockTest extends J
861		lock.unlock();
862
863		t2.start();
864	<	locked2.await();
864	>	await(locked2);
865
866		lock.lock();
867		assertHasWaiters(lock, c, t1, t2);
#	Line 811 | Line 879 | public class ReentrantLockTest extends J
879		}
880
881		/**
882	<	* awaitUninterruptibly doesn't abort on interrupt
882	>	* awaitUninterruptibly is uninterruptible
883		*/
884	<	public void testAwaitUninterruptibly() throws InterruptedException {
885	<	final ReentrantLock lock = new ReentrantLock();
884	>	public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
885	>	public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
886	>	public void testAwaitUninterruptibly(boolean fair) {
887	>	final ReentrantLock lock = new ReentrantLock(fair);
888		final Condition c = lock.newCondition();
889	<	final CountDownLatch locked = new CountDownLatch(1);
890	<	Thread t = newStartedThread(new CheckedRunnable() {
889	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
890	>
891	>	Thread t1 = newStartedThread(new CheckedRunnable() {
892		public void realRun() {
893	+	// Interrupt before awaitUninterruptibly
894		lock.lock();
895	<	locked.countDown();
895	>	pleaseInterrupt.countDown();
896	>	Thread.currentThread().interrupt();
897		c.awaitUninterruptibly();
898		assertTrue(Thread.interrupted());
899		lock.unlock();
900		}});
901
902	<	locked.await();
902	>	Thread t2 = newStartedThread(new CheckedRunnable() {
903	>	public void realRun() {
904	>	// Interrupt during awaitUninterruptibly
905	>	lock.lock();
906	>	pleaseInterrupt.countDown();
907	>	c.awaitUninterruptibly();
908	>	assertTrue(Thread.interrupted());
909	>	lock.unlock();
910	>	}});
911	>
912	>	await(pleaseInterrupt);
913		lock.lock();
914		lock.unlock();
915	<	t.interrupt();
916	<	long timeoutMillis = 10;
917	<	assertThreadJoinTimesOut(t, timeoutMillis);
915	>	t2.interrupt();
916	>
917	>	assertThreadStaysAlive(t1);
918	>	assertTrue(t2.isAlive());
919	>
920		lock.lock();
921	<	c.signal();
921	>	c.signalAll();
922		lock.unlock();
838	–	awaitTermination(t);
839	–	}
923
924	<	/**
925	<	* await is interruptible
843	<	*/
844	<	public void testAwait_Interrupt() throws InterruptedException {
845	<	final PublicReentrantLock lock = new PublicReentrantLock();
846	<	final Condition c = lock.newCondition();
847	<	final CountDownLatch locked = new CountDownLatch(1);
848	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
849	<	public void realRun() throws InterruptedException {
850	<	lock.lock();
851	<	assertTrue(lock.isLocked());
852	<	assertTrue(lock.isHeldByCurrentThread());
853	<	assertHasNoWaiters(lock, c);
854	<	locked.countDown();
855	<	try {
856	<	c.await();
857	<	} finally {
858	<	assertTrue(lock.isLocked());
859	<	assertTrue(lock.isHeldByCurrentThread());
860	<	assertHasNoWaiters(lock, c);
861	<	lock.unlock();
862	<	assertFalse(Thread.interrupted());
863	<	}
864	<	}});
865	<
866	<	locked.await();
867	<	assertHasWaiters(lock, c, t);
868	<	t.interrupt();
869	<	awaitTermination(t);
870	<	assertFalse(lock.isLocked());
924	>	awaitTermination(t1);
925	>	awaitTermination(t2);
926		}
927
928		/**
929	<	* awaitNanos is interruptible
929	>	* await/awaitNanos/awaitUntil is interruptible
930		*/
931	<	public void testAwaitNanos_Interrupt() throws InterruptedException {
932	<	final PublicReentrantLock lock = new PublicReentrantLock();
931	>	public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
932	>	public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
933	>	public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
934	>	public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
935	>	public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
936	>	public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
937	>	public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
938	>	public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
939	>	public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
940	>	final PublicReentrantLock lock =
941	>	new PublicReentrantLock(fair);
942		final Condition c = lock.newCondition();
943	<	final CountDownLatch locked = new CountDownLatch(1);
943	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
944		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
945		public void realRun() throws InterruptedException {
946		lock.lock();
947	<	assertTrue(lock.isLocked());
884	<	assertTrue(lock.isHeldByCurrentThread());
947	>	assertLockedByMoi(lock);
948		assertHasNoWaiters(lock, c);
949	<	locked.countDown();
949	>	pleaseInterrupt.countDown();
950		try {
951	<	c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
951	>	await(c, awaitMethod);
952		} finally {
953	<	assertTrue(lock.isLocked());
891	<	assertTrue(lock.isHeldByCurrentThread());
953	>	assertLockedByMoi(lock);
954		assertHasNoWaiters(lock, c);
955		lock.unlock();
956		assertFalse(Thread.interrupted());
957		}
958		}});
959
960	<	locked.await();
960	>	await(pleaseInterrupt);
961		assertHasWaiters(lock, c, t);
962		t.interrupt();
963		awaitTermination(t);
964	<	assertFalse(lock.isLocked());
964	>	assertNotLocked(lock);
965		}
966
967		/**
968	<	* awaitUntil is interruptible
968	>	* signalAll wakes up all threads
969		*/
970	<	public void testAwaitUntil_Interrupt() throws InterruptedException {
971	<	final PublicReentrantLock lock = new PublicReentrantLock();
970	>	public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
971	>	public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
972	>	public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
973	>	public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
974	>	public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
975	>	public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
976	>	public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
977	>	public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
978	>	public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
979	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
980		final Condition c = lock.newCondition();
981	<	final CountDownLatch locked = new CountDownLatch(1);
982	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
981	>	final CountDownLatch pleaseSignal = new CountDownLatch(2);
982	>	class Awaiter extends CheckedRunnable {
983		public void realRun() throws InterruptedException {
984		lock.lock();
985	<	assertTrue(lock.isLocked());
986	<	assertTrue(lock.isHeldByCurrentThread());
987	<	assertHasNoWaiters(lock, c);
988	<	locked.countDown();
989	<	java.util.Date d = new java.util.Date();
920	<	try {
921	<	c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS));
922	<	} finally {
923	<	assertTrue(lock.isLocked());
924	<	assertTrue(lock.isHeldByCurrentThread());
925	<	assertHasNoWaiters(lock, c);
926	<	lock.unlock();
927	<	assertFalse(Thread.interrupted());
928	<	}
929	<	}});
985	>	pleaseSignal.countDown();
986	>	await(c, awaitMethod);
987	>	lock.unlock();
988	>	}
989	>	}
990
991	<	locked.await();
992	<	assertHasWaiters(lock, c, t);
993	<	t.interrupt();
994	<	awaitTermination(t);
995	<	assertFalse(lock.isLocked());
991	>	Thread t1 = newStartedThread(new Awaiter());
992	>	Thread t2 = newStartedThread(new Awaiter());
993	>
994	>	await(pleaseSignal);
995	>	lock.lock();
996	>	assertHasWaiters(lock, c, t1, t2);
997	>	c.signalAll();
998	>	assertHasNoWaiters(lock, c);
999	>	lock.unlock();
1000	>	awaitTermination(t1);
1001	>	awaitTermination(t2);
1002		}
1003
1004		/**
1005	<	* signalAll wakes up all threads
1005	>	* signal wakes up waiting threads in FIFO order
1006		*/
1007	<	public void testSignalAll() throws InterruptedException {
1008	<	final PublicReentrantLock lock = new PublicReentrantLock();
1007	>	public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1008	>	public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1009	>	public void testSignalWakesFifo(boolean fair) {
1010	>	final PublicReentrantLock lock =
1011	>	new PublicReentrantLock(fair);
1012		final Condition c = lock.newCondition();
1013	<	final CountDownLatch locked = new CountDownLatch(2);
1013	>	final CountDownLatch locked1 = new CountDownLatch(1);
1014	>	final CountDownLatch locked2 = new CountDownLatch(1);
1015		Thread t1 = newStartedThread(new CheckedRunnable() {
1016		public void realRun() throws InterruptedException {
1017		lock.lock();
1018	<	locked.countDown();
1018	>	locked1.countDown();
1019		c.await();
1020		lock.unlock();
1021		}});
1022
1023	+	await(locked1);
1024	+
1025		Thread t2 = newStartedThread(new CheckedRunnable() {
1026		public void realRun() throws InterruptedException {
1027		lock.lock();
1028	<	locked.countDown();
1028	>	locked2.countDown();
1029		c.await();
1030		lock.unlock();
1031		}});
1032
1033	<	locked.await();
1033	>	await(locked2);
1034	>
1035		lock.lock();
1036		assertHasWaiters(lock, c, t1, t2);
1037	<	c.signalAll();
1037	>	assertFalse(lock.hasQueuedThreads());
1038	>	c.signal();
1039	>	assertHasWaiters(lock, c, t2);
1040	>	assertTrue(lock.hasQueuedThread(t1));
1041	>	assertFalse(lock.hasQueuedThread(t2));
1042	>	c.signal();
1043		assertHasNoWaiters(lock, c);
1044	+	assertTrue(lock.hasQueuedThread(t1));
1045	+	assertTrue(lock.hasQueuedThread(t2));
1046		lock.unlock();
1047		awaitTermination(t1);
1048		awaitTermination(t2);
#	Line 971 | Line 1051 | public class ReentrantLockTest extends J
1051		/**
1052		* await after multiple reentrant locking preserves lock count
1053		*/
1054	<	public void testAwaitLockCount() throws InterruptedException {
1055	<	final PublicReentrantLock lock = new PublicReentrantLock();
1054	>	public void testAwaitLockCount()      { testAwaitLockCount(false); }
1055	>	public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1056	>	public void testAwaitLockCount(boolean fair) {
1057	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
1058		final Condition c = lock.newCondition();
1059	<	final CountDownLatch locked = new CountDownLatch(2);
1059	>	final CountDownLatch pleaseSignal = new CountDownLatch(2);
1060		Thread t1 = newStartedThread(new CheckedRunnable() {
1061		public void realRun() throws InterruptedException {
1062		lock.lock();
1063	<	assertLockedBy(lock, Thread.currentThread());
1063	>	assertLockedByMoi(lock);
1064		assertEquals(1, lock.getHoldCount());
1065	<	locked.countDown();
1065	>	pleaseSignal.countDown();
1066		c.await();
1067	<	assertLockedBy(lock, Thread.currentThread());
1067	>	assertLockedByMoi(lock);
1068		assertEquals(1, lock.getHoldCount());
1069		lock.unlock();
1070		}});
#	Line 991 | Line 1073 | public class ReentrantLockTest extends J
1073		public void realRun() throws InterruptedException {
1074		lock.lock();
1075		lock.lock();
1076	<	assertLockedBy(lock, Thread.currentThread());
1076	>	assertLockedByMoi(lock);
1077		assertEquals(2, lock.getHoldCount());
1078	<	locked.countDown();
1078	>	pleaseSignal.countDown();
1079		c.await();
1080	<	assertLockedBy(lock, Thread.currentThread());
1080	>	assertLockedByMoi(lock);
1081		assertEquals(2, lock.getHoldCount());
1082		lock.unlock();
1083		lock.unlock();
1084		}});
1085
1086	<	locked.await();
1086	>	await(pleaseSignal);
1087		lock.lock();
1088		assertHasWaiters(lock, c, t1, t2);
1089		assertEquals(1, lock.getHoldCount());
#	Line 1015 | Line 1097 | public class ReentrantLockTest extends J
1097		/**
1098		* A serialized lock deserializes as unlocked
1099		*/
1100	<	public void testSerialization() throws Exception {
1101	<	ReentrantLock l = new ReentrantLock();
1102	<	l.lock();
1103	<	l.unlock();
1104	<
1105	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1106	<	ObjectOutputStream out =
1107	<	new ObjectOutputStream(new BufferedOutputStream(bout));
1108	<	out.writeObject(l);
1109	<	out.close();
1110	<
1111	<	ByteArrayInputStream bin =
1112	<	new ByteArrayInputStream(bout.toByteArray());
1113	<	ObjectInputStream in =
1114	<	new ObjectInputStream(new BufferedInputStream(bin));
1115	<	ReentrantLock r = (ReentrantLock) in.readObject();
1116	<	r.lock();
1117	<	r.unlock();
1100	>	public void testSerialization()      { testSerialization(false); }
1101	>	public void testSerialization_fair() { testSerialization(true); }
1102	>	public void testSerialization(boolean fair) {
1103	>	ReentrantLock lock = new ReentrantLock(fair);
1104	>	lock.lock();
1105	>
1106	>	ReentrantLock clone = serialClone(lock);
1107	>	assertEquals(lock.isFair(), clone.isFair());
1108	>	assertTrue(lock.isLocked());
1109	>	assertFalse(clone.isLocked());
1110	>	assertEquals(1, lock.getHoldCount());
1111	>	assertEquals(0, clone.getHoldCount());
1112	>	clone.lock();
1113	>	clone.lock();
1114	>	assertTrue(clone.isLocked());
1115	>	assertEquals(2, clone.getHoldCount());
1116	>	assertEquals(1, lock.getHoldCount());
1117	>	clone.unlock();
1118	>	clone.unlock();
1119	>	assertTrue(lock.isLocked());
1120	>	assertFalse(clone.isLocked());
1121		}
1122
1123		/**
1124		* toString indicates current lock state
1125		*/
1126	<	public void testToString() {
1127	<	ReentrantLock lock = new ReentrantLock();
1128	<	String us = lock.toString();
1129	<	assertTrue(us.indexOf("Unlocked") >= 0);
1126	>	public void testToString()      { testToString(false); }
1127	>	public void testToString_fair() { testToString(true); }
1128	>	public void testToString(boolean fair) {
1129	>	ReentrantLock lock = new ReentrantLock(fair);
1130	>	assertTrue(lock.toString().contains("Unlocked"));
1131		lock.lock();
1132	<	String ls = lock.toString();
1133	<	assertTrue(ls.indexOf("Locked") >= 0);
1132	>	assertTrue(lock.toString().contains("Locked"));
1133	>	lock.unlock();
1134	>	assertTrue(lock.toString().contains("Unlocked"));
1135		}
1136		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines