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.41 by jsr166, Sat May 7 02:51:33 2011 UTC vs.
Revision 1.46 by jsr166, Fri May 13 21:48:59 2011 UTC

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

Diff Legend

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