ViewVC Help

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

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

Comparing jsr166/src/test/tck/ReentrantReadWriteLockTest.java (file contents):
Revision 1.35 by jsr166, Sat Nov 21 02:07:27 2009 UTC vs.
Revision 1.48 by jsr166, Mon May 2 00:06:45 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
#	Line 9 | Line 9
9		import junit.framework.*;
10		import java.util.concurrent.locks.*;
11		import java.util.concurrent.*;
12	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
13		import java.io.*;
14		import java.util.*;
15
16		public class ReentrantReadWriteLockTest extends JSR166TestCase {
17		public static void main(String[] args) {
18	<	junit.textui.TestRunner.run (suite());
18	>	junit.textui.TestRunner.run(suite());
19		}
20		public static Test suite() {
21		return new TestSuite(ReentrantReadWriteLockTest.class);
#	Line 58 | Line 59 | public class ReentrantReadWriteLockTest
59		}
60
61		/**
62	+	* Releases lock, checking that it had a hold count of 1.
63	+	*/
64	+	void releaseLock(ReentrantReadWriteLock.WriteLock lock) {
65	+	assertTrue(lock.isHeldByCurrentThread());
66	+	lock.unlock();
67	+	assertFalse(lock.isHeldByCurrentThread());
68	+	}
69	+
70	+	/**
71		* Constructor sets given fairness, and is in unlocked state
72		*/
73		public void testConstructor() {
#	Line 189 | Line 199 | public class ReentrantReadWriteLockTest
199		*/
200		public void testWriteLockInterruptibly_Interrupted() throws Exception {
201		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
202	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
202	>	lock.writeLock().lock();
203	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
204		public void realRun() throws InterruptedException {
205		lock.writeLock().lockInterruptibly();
195	–	lock.writeLock().unlock();
196	–	lock.writeLock().lockInterruptibly();
197	–	lock.writeLock().unlock();
206		}});
207
200	–	lock.writeLock().lock();
201	–	t.start();
208		Thread.sleep(SHORT_DELAY_MS);
209		t.interrupt();
204	–	Thread.sleep(SHORT_DELAY_MS);
205	–	lock.writeLock().unlock();
210		t.join();
211	+	releaseLock(lock.writeLock());
212		}
213
214		/**
#	Line 212 | Line 217 | public class ReentrantReadWriteLockTest
217		public void testWriteTryLock_Interrupted() throws InterruptedException {
218		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
219		lock.writeLock().lock();
220	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
220	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
221		public void realRun() throws InterruptedException {
222	<	lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
222	>	lock.writeLock().tryLock(SMALL_DELAY_MS, MILLISECONDS);
223		}});
224
225	<	t.start();
225	>	Thread.sleep(SHORT_DELAY_MS);
226		t.interrupt();
222	–	lock.writeLock().unlock();
227		t.join();
228	+	releaseLock(lock.writeLock());
229		}
230
231		/**
#	Line 229 | Line 234 | public class ReentrantReadWriteLockTest
234		public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
235		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
236		lock.writeLock().lock();
237	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
237	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
238		public void realRun() throws InterruptedException {
239		lock.readLock().lockInterruptibly();
240		}});
241
237	–	t.start();
242		Thread.sleep(SHORT_DELAY_MS);
243		t.interrupt();
240	–	Thread.sleep(SHORT_DELAY_MS);
241	–	lock.writeLock().unlock();
244		t.join();
245	+	releaseLock(lock.writeLock());
246		}
247
248		/**
#	Line 248 | Line 251 | public class ReentrantReadWriteLockTest
251		public void testReadTryLock_Interrupted() throws InterruptedException {
252		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
253		lock.writeLock().lock();
254	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
254	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
255		public void realRun() throws InterruptedException {
256	<	lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
256	>	lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
257		}});
258
259	<	t.start();
259	>	Thread.sleep(SHORT_DELAY_MS);
260		t.interrupt();
261		t.join();
262		}
#	Line 265 | Line 268 | public class ReentrantReadWriteLockTest
268		public void testWriteTryLockWhenLocked() throws InterruptedException {
269		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
270		lock.writeLock().lock();
271	<	Thread t = new Thread(new Runnable() {
272	<	public void run() {
273	<	threadAssertFalse(lock.writeLock().tryLock());
274	<	}
272	<	});
271	>	Thread t = newStartedThread(new CheckedRunnable() {
272	>	public void realRun() {
273	>	assertFalse(lock.writeLock().tryLock());
274	>	}});
275
274	–	t.start();
276		t.join();
277		lock.writeLock().unlock();
278		}
#	Line 282 | Line 283 | public class ReentrantReadWriteLockTest
283		public void testReadTryLockWhenLocked() throws InterruptedException {
284		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
285		lock.writeLock().lock();
286	<	Thread t = new Thread(new Runnable() {
287	<	public void run() {
288	<	threadAssertFalse(lock.readLock().tryLock());
289	<	}
289	<	});
286	>	Thread t = newStartedThread(new CheckedRunnable() {
287	>	public void realRun() {
288	>	assertFalse(lock.readLock().tryLock());
289	>	}});
290
291	–	t.start();
291		t.join();
292		lock.writeLock().unlock();
293		}
#	Line 299 | Line 298 | public class ReentrantReadWriteLockTest
298		public void testMultipleReadLocks() throws InterruptedException {
299		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
300		lock.readLock().lock();
301	<	Thread t = new Thread(new Runnable() {
302	<	public void run() {
303	<	threadAssertTrue(lock.readLock().tryLock());
304	<	lock.readLock().unlock();
305	<	}
307	<	});
301	>	Thread t = newStartedThread(new CheckedRunnable() {
302	>	public void realRun() {
303	>	assertTrue(lock.readLock().tryLock());
304	>	lock.readLock().unlock();
305	>	}});
306
309	–	t.start();
307		t.join();
308		lock.readLock().unlock();
309		}
#	Line 317 | Line 314 | public class ReentrantReadWriteLockTest
314		public void testWriteAfterMultipleReadLocks() throws InterruptedException {
315		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
316		lock.readLock().lock();
317	<	Thread t1 = new Thread(new Runnable() {
318	<	public void run() {
319	<	lock.readLock().lock();
320	<	lock.readLock().unlock();
321	<	}
322	<	});
323	<	Thread t2 = new Thread(new Runnable() {
324	<	public void run() {
325	<	lock.writeLock().lock();
326	<	lock.writeLock().unlock();
330	<	}
331	<	});
317	>	Thread t1 = newStartedThread(new CheckedRunnable() {
318	>	public void realRun() {
319	>	lock.readLock().lock();
320	>	lock.readLock().unlock();
321	>	}});
322	>	Thread t2 = newStartedThread(new CheckedRunnable() {
323	>	public void realRun() {
324	>	lock.writeLock().lock();
325	>	lock.writeLock().unlock();
326	>	}});
327
333	–	t1.start();
334	–	t2.start();
328		Thread.sleep(SHORT_DELAY_MS);
329		lock.readLock().unlock();
330		t1.join(MEDIUM_DELAY_MS);
#	Line 346 | Line 339 | public class ReentrantReadWriteLockTest
339		public void testReadAfterWriteLock() throws InterruptedException {
340		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
341		lock.writeLock().lock();
342	<	Thread t1 = new Thread(new Runnable() {
343	<	public void run() {
344	<	lock.readLock().lock();
345	<	lock.readLock().unlock();
346	<	}
347	<	});
348	<	Thread t2 = new Thread(new Runnable() {
349	<	public void run() {
350	<	lock.readLock().lock();
351	<	lock.readLock().unlock();
359	<	}
360	<	});
342	>	Thread t1 = newStartedThread(new CheckedRunnable() {
343	>	public void realRun() {
344	>	lock.readLock().lock();
345	>	lock.readLock().unlock();
346	>	}});
347	>	Thread t2 = newStartedThread(new CheckedRunnable() {
348	>	public void realRun() {
349	>	lock.readLock().lock();
350	>	lock.readLock().unlock();
351	>	}});
352
362	–	t1.start();
363	–	t2.start();
353		Thread.sleep(SHORT_DELAY_MS);
354		lock.writeLock().unlock();
355		t1.join(MEDIUM_DELAY_MS);
#	Line 387 | Line 376 | public class ReentrantReadWriteLockTest
376		public void testReadHoldingWriteLock2() throws InterruptedException {
377		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
378		lock.writeLock().lock();
379	<	Thread t1 = new Thread(new Runnable() {
380	<	public void run() {
381	<	lock.readLock().lock();
382	<	lock.readLock().unlock();
383	<	}
384	<	});
385	<	Thread t2 = new Thread(new Runnable() {
386	<	public void run() {
387	<	lock.readLock().lock();
388	<	lock.readLock().unlock();
400	<	}
401	<	});
379	>	Thread t1 = newStartedThread(new CheckedRunnable() {
380	>	public void realRun() {
381	>	lock.readLock().lock();
382	>	lock.readLock().unlock();
383	>	}});
384	>	Thread t2 = newStartedThread(new CheckedRunnable() {
385	>	public void realRun() {
386	>	lock.readLock().lock();
387	>	lock.readLock().unlock();
388	>	}});
389
403	–	t1.start();
404	–	t2.start();
390		lock.readLock().lock();
391		lock.readLock().unlock();
392		Thread.sleep(SHORT_DELAY_MS);
#	Line 415 | Line 400 | public class ReentrantReadWriteLockTest
400		}
401
402		/**
403	<	*  Read lock succeeds if write locked by current thread even if
403	>	* Read lock succeeds if write locked by current thread even if
404		* other threads are waiting for writelock
405		*/
406		public void testReadHoldingWriteLock3() throws InterruptedException {
407		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
408		lock.writeLock().lock();
409	<	Thread t1 = new Thread(new Runnable() {
410	<	public void run() {
411	<	lock.writeLock().lock();
412	<	lock.writeLock().unlock();
413	<	}
414	<	});
415	<	Thread t2 = new Thread(new Runnable() {
416	<	public void run() {
417	<	lock.writeLock().lock();
418	<	lock.writeLock().unlock();
434	<	}
435	<	});
409	>	Thread t1 = newStartedThread(new CheckedRunnable() {
410	>	public void realRun() {
411	>	lock.writeLock().lock();
412	>	lock.writeLock().unlock();
413	>	}});
414	>	Thread t2 = newStartedThread(new CheckedRunnable() {
415	>	public void realRun() {
416	>	lock.writeLock().lock();
417	>	lock.writeLock().unlock();
418	>	}});
419
437	–	t1.start();
438	–	t2.start();
420		lock.readLock().lock();
421		lock.readLock().unlock();
422		Thread.sleep(SHORT_DELAY_MS);
#	Line 450 | Line 431 | public class ReentrantReadWriteLockTest
431
432
433		/**
434	<	*  Write lock succeeds if write locked by current thread even if
434	>	* Write lock succeeds if write locked by current thread even if
435		* other threads are waiting for writelock
436		*/
437		public void testWriteHoldingWriteLock4() throws InterruptedException {
438		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
439		lock.writeLock().lock();
440	<	Thread t1 = new Thread(new Runnable() {
441	<	public void run() {
442	<	lock.writeLock().lock();
443	<	lock.writeLock().unlock();
444	<	}
445	<	});
446	<	Thread t2 = new Thread(new Runnable() {
447	<	public void run() {
448	<	lock.writeLock().lock();
449	<	lock.writeLock().unlock();
469	<	}
470	<	});
440	>	Thread t1 = newStartedThread(new CheckedRunnable() {
441	>	public void realRun() {
442	>	lock.writeLock().lock();
443	>	lock.writeLock().unlock();
444	>	}});
445	>	Thread t2 = newStartedThread(new CheckedRunnable() {
446	>	public void realRun() {
447	>	lock.writeLock().lock();
448	>	lock.writeLock().unlock();
449	>	}});
450
472	–	t1.start();
473	–	t2.start();
451		lock.writeLock().lock();
452		lock.writeLock().unlock();
453		Thread.sleep(SHORT_DELAY_MS);
#	Line 502 | Line 479 | public class ReentrantReadWriteLockTest
479		public void testReadHoldingWriteLockFair2() throws InterruptedException {
480		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
481		lock.writeLock().lock();
482	<	Thread t1 = new Thread(new Runnable() {
483	<	public void run() {
484	<	lock.readLock().lock();
485	<	lock.readLock().unlock();
486	<	}
487	<	});
488	<	Thread t2 = new Thread(new Runnable() {
489	<	public void run() {
490	<	lock.readLock().lock();
491	<	lock.readLock().unlock();
515	<	}
516	<	});
482	>	Thread t1 = newStartedThread(new CheckedRunnable() {
483	>	public void realRun() {
484	>	lock.readLock().lock();
485	>	lock.readLock().unlock();
486	>	}});
487	>	Thread t2 = newStartedThread(new CheckedRunnable() {
488	>	public void realRun() {
489	>	lock.readLock().lock();
490	>	lock.readLock().unlock();
491	>	}});
492
518	–	t1.start();
519	–	t2.start();
493		lock.readLock().lock();
494		lock.readLock().unlock();
495		Thread.sleep(SHORT_DELAY_MS);
#	Line 537 | Line 510 | public class ReentrantReadWriteLockTest
510		public void testReadHoldingWriteLockFair3() throws InterruptedException {
511		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
512		lock.writeLock().lock();
513	<	Thread t1 = new Thread(new Runnable() {
514	<	public void run() {
515	<	lock.writeLock().lock();
516	<	lock.writeLock().unlock();
517	<	}
518	<	});
519	<	Thread t2 = new Thread(new Runnable() {
520	<	public void run() {
521	<	lock.writeLock().lock();
522	<	lock.writeLock().unlock();
550	<	}
551	<	});
513	>	Thread t1 = newStartedThread(new CheckedRunnable() {
514	>	public void realRun() {
515	>	lock.writeLock().lock();
516	>	lock.writeLock().unlock();
517	>	}});
518	>	Thread t2 = newStartedThread(new CheckedRunnable() {
519	>	public void realRun() {
520	>	lock.writeLock().lock();
521	>	lock.writeLock().unlock();
522	>	}});
523
553	–	t1.start();
554	–	t2.start();
524		lock.readLock().lock();
525		lock.readLock().unlock();
526		Thread.sleep(SHORT_DELAY_MS);
#	Line 572 | Line 541 | public class ReentrantReadWriteLockTest
541		public void testWriteHoldingWriteLockFair4() throws InterruptedException {
542		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
543		lock.writeLock().lock();
544	<	Thread t1 = new Thread(new Runnable() {
545	<	public void run() {
546	<	lock.writeLock().lock();
547	<	lock.writeLock().unlock();
548	<	}
549	<	});
550	<	Thread t2 = new Thread(new Runnable() {
551	<	public void run() {
552	<	lock.writeLock().lock();
553	<	lock.writeLock().unlock();
585	<	}
586	<	});
544	>	Thread t1 = newStartedThread(new CheckedRunnable() {
545	>	public void realRun() {
546	>	lock.writeLock().lock();
547	>	lock.writeLock().unlock();
548	>	}});
549	>	Thread t2 = newStartedThread(new CheckedRunnable() {
550	>	public void realRun() {
551	>	lock.writeLock().lock();
552	>	lock.writeLock().unlock();
553	>	}});
554
588	–	t1.start();
589	–	t2.start();
555		Thread.sleep(SHORT_DELAY_MS);
556		assertTrue(lock.isWriteLockedByCurrentThread());
557	<	assertTrue(lock.getWriteHoldCount() == 1);
557	>	assertEquals(1, lock.getWriteHoldCount());
558		lock.writeLock().lock();
559	<	assertTrue(lock.getWriteHoldCount() == 2);
559	>	assertEquals(2, lock.getWriteHoldCount());
560		lock.writeLock().unlock();
561		lock.writeLock().lock();
562		lock.writeLock().unlock();
#	Line 609 | Line 574 | public class ReentrantReadWriteLockTest
574		public void testTryLockWhenReadLocked() throws InterruptedException {
575		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
576		lock.readLock().lock();
577	<	Thread t = new Thread(new Runnable() {
578	<	public void run() {
579	<	threadAssertTrue(lock.readLock().tryLock());
580	<	lock.readLock().unlock();
581	<	}
617	<	});
577	>	Thread t = newStartedThread(new CheckedRunnable() {
578	>	public void realRun() {
579	>	assertTrue(lock.readLock().tryLock());
580	>	lock.readLock().unlock();
581	>	}});
582
619	–	t.start();
583		t.join();
584		lock.readLock().unlock();
585		}
586
624	–
625	–
587		/**
588		* write tryLock fails when readlocked
589		*/
590		public void testWriteTryLockWhenReadLocked() throws InterruptedException {
591		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
592		lock.readLock().lock();
593	<	Thread t = new Thread(new Runnable() {
594	<	public void run() {
595	<	threadAssertFalse(lock.writeLock().tryLock());
596	<	}
636	<	});
593	>	Thread t = newStartedThread(new CheckedRunnable() {
594	>	public void realRun() {
595	>	assertFalse(lock.writeLock().tryLock());
596	>	}});
597
638	–	t.start();
598		t.join();
599		lock.readLock().unlock();
600		}
#	Line 647 | Line 606 | public class ReentrantReadWriteLockTest
606		public void testTryLockWhenReadLockedFair() throws InterruptedException {
607		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
608		lock.readLock().lock();
609	<	Thread t = new Thread(new Runnable() {
610	<	public void run() {
611	<	threadAssertTrue(lock.readLock().tryLock());
612	<	lock.readLock().unlock();
613	<	}
655	<	});
609	>	Thread t = newStartedThread(new CheckedRunnable() {
610	>	public void realRun() {
611	>	assertTrue(lock.readLock().tryLock());
612	>	lock.readLock().unlock();
613	>	}});
614
657	–	t.start();
615		t.join();
616		lock.readLock().unlock();
617		}
#	Line 667 | Line 624 | public class ReentrantReadWriteLockTest
624		public void testWriteTryLockWhenReadLockedFair() throws InterruptedException {
625		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
626		lock.readLock().lock();
627	<	Thread t = new Thread(new Runnable() {
628	<	public void run() {
629	<	threadAssertFalse(lock.writeLock().tryLock());
630	<	}
674	<	});
627	>	Thread t = newStartedThread(new CheckedRunnable() {
628	>	public void realRun() {
629	>	assertFalse(lock.writeLock().tryLock());
630	>	}});
631
676	–	t.start();
632		t.join();
633		lock.readLock().unlock();
634		}
#	Line 686 | Line 641 | public class ReentrantReadWriteLockTest
641		public void testWriteTryLock_Timeout() throws InterruptedException {
642		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
643		lock.writeLock().lock();
644	<	Thread t = new Thread(new CheckedRunnable() {
644	>	Thread t = newStartedThread(new CheckedRunnable() {
645		public void realRun() throws InterruptedException {
646	<	threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
646	>	assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
647		}});
648
694	–	t.start();
649		t.join();
650		assertTrue(lock.writeLock().isHeldByCurrentThread());
651		lock.writeLock().unlock();
#	Line 703 | Line 657 | public class ReentrantReadWriteLockTest
657		public void testReadTryLock_Timeout() throws InterruptedException {
658		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
659		lock.writeLock().lock();
660	<	Thread t = new Thread(new CheckedRunnable() {
660	>	Thread t = newStartedThread(new CheckedRunnable() {
661		public void realRun() throws InterruptedException {
662	<	threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
662	>	assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
663		}});
664
711	–	t.start();
665		t.join();
666		assertTrue(lock.writeLock().isHeldByCurrentThread());
667		lock.writeLock().unlock();
#	Line 721 | Line 674 | public class ReentrantReadWriteLockTest
674		public void testWriteLockInterruptibly() throws InterruptedException {
675		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
676		lock.writeLock().lockInterruptibly();
677	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
677	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
678		public void realRun() throws InterruptedException {
679		lock.writeLock().lockInterruptibly();
680		}});
681
729	–	t.start();
682		Thread.sleep(SHORT_DELAY_MS);
683		t.interrupt();
684		Thread.sleep(SHORT_DELAY_MS);
#	Line 735 | Line 687 | public class ReentrantReadWriteLockTest
687		}
688
689		/**
690	<	*  read lockInterruptibly succeeds if lock free else is interruptible
690	>	* read lockInterruptibly succeeds if lock free else is interruptible
691		*/
692		public void testReadLockInterruptibly() throws InterruptedException {
693		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
694		lock.writeLock().lockInterruptibly();
695	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
695	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
696		public void realRun() throws InterruptedException {
697		lock.readLock().lockInterruptibly();
698		}});
699
748	–	t.start();
700		Thread.sleep(SHORT_DELAY_MS);
701		t.interrupt();
702		t.join();
#	Line 791 | Line 742 | public class ReentrantReadWriteLockTest
742
743
744		/**
745	<	*  timed await without a signal times out
745	>	* timed await without a signal times out
746		*/
747		public void testAwait_Timeout() throws InterruptedException {
748		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
749		final Condition c = lock.writeLock().newCondition();
750		lock.writeLock().lock();
751	<	assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
751	>	assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
752		lock.writeLock().unlock();
753		}
754
#	Line 819 | Line 770 | public class ReentrantReadWriteLockTest
770		public void testAwait() throws InterruptedException {
771		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
772		final Condition c = lock.writeLock().newCondition();
773	<	Thread t = new Thread(new CheckedRunnable() {
773	>	Thread t = newStartedThread(new CheckedRunnable() {
774		public void realRun() throws InterruptedException {
775		lock.writeLock().lock();
776		c.await();
777		lock.writeLock().unlock();
778		}});
779
829	–	t.start();
780		Thread.sleep(SHORT_DELAY_MS);
781		lock.writeLock().lock();
782		c.signal();
#	Line 896 | Line 846 | public class ReentrantReadWriteLockTest
846		public void testAwait_Interrupt() throws InterruptedException {
847		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
848		final Condition c = lock.writeLock().newCondition();
849	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
849	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
850		public void realRun() throws InterruptedException {
851		lock.writeLock().lock();
852		c.await();
853		lock.writeLock().unlock();
854		}});
855
906	–	t.start();
856		Thread.sleep(SHORT_DELAY_MS);
857		t.interrupt();
858		t.join(SHORT_DELAY_MS);
#	Line 916 | Line 865 | public class ReentrantReadWriteLockTest
865		public void testAwaitNanos_Interrupt() throws InterruptedException {
866		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
867		final Condition c = lock.writeLock().newCondition();
868	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
868	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
869		public void realRun() throws InterruptedException {
870		lock.writeLock().lock();
871	<	c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
871	>	c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
872		lock.writeLock().unlock();
873		}});
874
926	–	t.start();
875		Thread.sleep(SHORT_DELAY_MS);
876		t.interrupt();
877		t.join(SHORT_DELAY_MS);
#	Line 936 | Line 884 | public class ReentrantReadWriteLockTest
884		public void testAwaitUntil_Interrupt() throws InterruptedException {
885		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
886		final Condition c = lock.writeLock().newCondition();
887	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
887	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
888		public void realRun() throws InterruptedException {
889		lock.writeLock().lock();
890		java.util.Date d = new java.util.Date();
#	Line 944 | Line 892 | public class ReentrantReadWriteLockTest
892		lock.writeLock().unlock();
893		}});
894
947	–	t.start();
895		Thread.sleep(SHORT_DELAY_MS);
896		t.interrupt();
897		t.join(SHORT_DELAY_MS);
#	Line 957 | Line 904 | public class ReentrantReadWriteLockTest
904		public void testSignalAll() throws InterruptedException {
905		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
906		final Condition c = lock.writeLock().newCondition();
907	<	Thread t1 = new Thread(new CheckedRunnable() {
907	>	Thread t1 = newStartedThread(new CheckedRunnable() {
908		public void realRun() throws InterruptedException {
909		lock.writeLock().lock();
910		c.await();
911		lock.writeLock().unlock();
912		}});
913
914	<	Thread t2 = new Thread(new CheckedRunnable() {
914	>	Thread t2 = newStartedThread(new CheckedRunnable() {
915		public void realRun() throws InterruptedException {
916		lock.writeLock().lock();
917		c.await();
918		lock.writeLock().unlock();
919		}});
920
974	–	t1.start();
975	–	t2.start();
921		Thread.sleep(SHORT_DELAY_MS);
922		lock.writeLock().lock();
923		c.signalAll();
#	Line 1241 | Line 1186 | public class ReentrantReadWriteLockTest
1186		public void testHasWaiters() throws InterruptedException {
1187		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1188		final Condition c = lock.writeLock().newCondition();
1189	<	Thread t = new Thread(new CheckedRunnable() {
1189	>	Thread t = newStartedThread(new CheckedRunnable() {
1190		public void realRun() throws InterruptedException {
1191		lock.writeLock().lock();
1192	<	threadAssertFalse(lock.hasWaiters(c));
1193	<	threadAssertEquals(0, lock.getWaitQueueLength(c));
1192	>	assertFalse(lock.hasWaiters(c));
1193	>	assertEquals(0, lock.getWaitQueueLength(c));
1194		c.await();
1195		lock.writeLock().unlock();
1196		}});
1197
1253	–	t.start();
1198		Thread.sleep(SHORT_DELAY_MS);
1199		lock.writeLock().lock();
1200		assertTrue(lock.hasWaiters(c));
#	Line 1272 | Line 1216 | public class ReentrantReadWriteLockTest
1216		public void testGetWaitQueueLength() throws InterruptedException {
1217		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1218		final Condition c = lock.writeLock().newCondition();
1219	<	Thread t = new Thread(new CheckedRunnable() {
1219	>	Thread t = newStartedThread(new CheckedRunnable() {
1220		public void realRun() throws InterruptedException {
1221		lock.writeLock().lock();
1222	<	threadAssertFalse(lock.hasWaiters(c));
1223	<	threadAssertEquals(0, lock.getWaitQueueLength(c));
1222	>	assertFalse(lock.hasWaiters(c));
1223	>	assertEquals(0, lock.getWaitQueueLength(c));
1224		c.await();
1225		lock.writeLock().unlock();
1226		}});
1227
1284	–	t.start();
1228		Thread.sleep(SHORT_DELAY_MS);
1229		lock.writeLock().lock();
1230		assertTrue(lock.hasWaiters(c));
#	Line 1307 | Line 1250 | public class ReentrantReadWriteLockTest
1250		Thread t1 = new Thread(new CheckedRunnable() {
1251		public void realRun() throws InterruptedException {
1252		lock.writeLock().lock();
1253	<	threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1253	>	assertTrue(lock.getWaitingThreads(c).isEmpty());
1254		c.await();
1255		lock.writeLock().unlock();
1256		}});
#	Line 1315 | Line 1258 | public class ReentrantReadWriteLockTest
1258		Thread t2 = new Thread(new CheckedRunnable() {
1259		public void realRun() throws InterruptedException {
1260		lock.writeLock().lock();
1261	<	threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1261	>	assertFalse(lock.getWaitingThreads(c).isEmpty());
1262		c.await();
1263		lock.writeLock().unlock();
1264		}});

Diff Legend

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