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.36 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.45 by jsr166, Sun May 1 23:49:41 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 15 | Line 15 | 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 190 | Line 190 | public class ReentrantReadWriteLockTest
190		*/
191		public void testWriteLockInterruptibly_Interrupted() throws Exception {
192		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
193	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
193	>	lock.writeLock().lock();
194	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
195		public void realRun() throws InterruptedException {
196		lock.writeLock().lockInterruptibly();
197		lock.writeLock().unlock();
#	Line 198 | Line 199 | public class ReentrantReadWriteLockTest
199		lock.writeLock().unlock();
200		}});
201
201	–	lock.writeLock().lock();
202	–	t.start();
202		Thread.sleep(SHORT_DELAY_MS);
203		t.interrupt();
204		Thread.sleep(SHORT_DELAY_MS);
#	Line 213 | Line 212 | public class ReentrantReadWriteLockTest
212		public void testWriteTryLock_Interrupted() throws InterruptedException {
213		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
214		lock.writeLock().lock();
215	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
215	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
216		public void realRun() throws InterruptedException {
217	<	lock.writeLock().tryLock(1000,MILLISECONDS);
217	>	lock.writeLock().tryLock(SMALL_DELAY_MS, MILLISECONDS);
218		}});
219
220	<	t.start();
220	>	Thread.sleep(SHORT_DELAY_MS);
221		t.interrupt();
222		lock.writeLock().unlock();
223		t.join();
#	Line 230 | Line 229 | public class ReentrantReadWriteLockTest
229		public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
230		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
231		lock.writeLock().lock();
232	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
232	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
233		public void realRun() throws InterruptedException {
234		lock.readLock().lockInterruptibly();
235		}});
236
238	–	t.start();
237		Thread.sleep(SHORT_DELAY_MS);
238		t.interrupt();
239		Thread.sleep(SHORT_DELAY_MS);
#	Line 249 | Line 247 | public class ReentrantReadWriteLockTest
247		public void testReadTryLock_Interrupted() throws InterruptedException {
248		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
249		lock.writeLock().lock();
250	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
250	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
251		public void realRun() throws InterruptedException {
252	<	lock.readLock().tryLock(1000,MILLISECONDS);
252	>	lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
253		}});
254
255	<	t.start();
255	>	Thread.sleep(SHORT_DELAY_MS);
256		t.interrupt();
257		t.join();
258		}
#	Line 266 | Line 264 | public class ReentrantReadWriteLockTest
264		public void testWriteTryLockWhenLocked() throws InterruptedException {
265		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
266		lock.writeLock().lock();
267	<	Thread t = new Thread(new Runnable() {
268	<	public void run() {
269	<	threadAssertFalse(lock.writeLock().tryLock());
270	<	}
273	<	});
267	>	Thread t = newStartedThread(new CheckedRunnable() {
268	>	public void realRun() {
269	>	assertFalse(lock.writeLock().tryLock());
270	>	}});
271
275	–	t.start();
272		t.join();
273		lock.writeLock().unlock();
274		}
#	Line 283 | Line 279 | public class ReentrantReadWriteLockTest
279		public void testReadTryLockWhenLocked() throws InterruptedException {
280		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
281		lock.writeLock().lock();
282	<	Thread t = new Thread(new Runnable() {
283	<	public void run() {
284	<	threadAssertFalse(lock.readLock().tryLock());
285	<	}
290	<	});
282	>	Thread t = newStartedThread(new CheckedRunnable() {
283	>	public void realRun() {
284	>	assertFalse(lock.readLock().tryLock());
285	>	}});
286
292	–	t.start();
287		t.join();
288		lock.writeLock().unlock();
289		}
#	Line 300 | Line 294 | public class ReentrantReadWriteLockTest
294		public void testMultipleReadLocks() throws InterruptedException {
295		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
296		lock.readLock().lock();
297	<	Thread t = new Thread(new Runnable() {
298	<	public void run() {
299	<	threadAssertTrue(lock.readLock().tryLock());
300	<	lock.readLock().unlock();
301	<	}
308	<	});
297	>	Thread t = newStartedThread(new CheckedRunnable() {
298	>	public void realRun() {
299	>	assertTrue(lock.readLock().tryLock());
300	>	lock.readLock().unlock();
301	>	}});
302
310	–	t.start();
303		t.join();
304		lock.readLock().unlock();
305		}
#	Line 318 | Line 310 | public class ReentrantReadWriteLockTest
310		public void testWriteAfterMultipleReadLocks() throws InterruptedException {
311		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
312		lock.readLock().lock();
313	<	Thread t1 = new Thread(new Runnable() {
314	<	public void run() {
315	<	lock.readLock().lock();
316	<	lock.readLock().unlock();
317	<	}
318	<	});
319	<	Thread t2 = new Thread(new Runnable() {
320	<	public void run() {
321	<	lock.writeLock().lock();
322	<	lock.writeLock().unlock();
331	<	}
332	<	});
313	>	Thread t1 = newStartedThread(new CheckedRunnable() {
314	>	public void realRun() {
315	>	lock.readLock().lock();
316	>	lock.readLock().unlock();
317	>	}});
318	>	Thread t2 = newStartedThread(new CheckedRunnable() {
319	>	public void realRun() {
320	>	lock.writeLock().lock();
321	>	lock.writeLock().unlock();
322	>	}});
323
334	–	t1.start();
335	–	t2.start();
324		Thread.sleep(SHORT_DELAY_MS);
325		lock.readLock().unlock();
326		t1.join(MEDIUM_DELAY_MS);
#	Line 347 | Line 335 | public class ReentrantReadWriteLockTest
335		public void testReadAfterWriteLock() throws InterruptedException {
336		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
337		lock.writeLock().lock();
338	<	Thread t1 = new Thread(new Runnable() {
339	<	public void run() {
340	<	lock.readLock().lock();
341	<	lock.readLock().unlock();
342	<	}
343	<	});
344	<	Thread t2 = new Thread(new Runnable() {
345	<	public void run() {
346	<	lock.readLock().lock();
347	<	lock.readLock().unlock();
360	<	}
361	<	});
338	>	Thread t1 = newStartedThread(new CheckedRunnable() {
339	>	public void realRun() {
340	>	lock.readLock().lock();
341	>	lock.readLock().unlock();
342	>	}});
343	>	Thread t2 = newStartedThread(new CheckedRunnable() {
344	>	public void realRun() {
345	>	lock.readLock().lock();
346	>	lock.readLock().unlock();
347	>	}});
348
363	–	t1.start();
364	–	t2.start();
349		Thread.sleep(SHORT_DELAY_MS);
350		lock.writeLock().unlock();
351		t1.join(MEDIUM_DELAY_MS);
#	Line 388 | Line 372 | public class ReentrantReadWriteLockTest
372		public void testReadHoldingWriteLock2() throws InterruptedException {
373		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
374		lock.writeLock().lock();
375	<	Thread t1 = new Thread(new Runnable() {
376	<	public void run() {
377	<	lock.readLock().lock();
378	<	lock.readLock().unlock();
379	<	}
380	<	});
381	<	Thread t2 = new Thread(new Runnable() {
382	<	public void run() {
383	<	lock.readLock().lock();
384	<	lock.readLock().unlock();
401	<	}
402	<	});
375	>	Thread t1 = newStartedThread(new CheckedRunnable() {
376	>	public void realRun() {
377	>	lock.readLock().lock();
378	>	lock.readLock().unlock();
379	>	}});
380	>	Thread t2 = newStartedThread(new CheckedRunnable() {
381	>	public void realRun() {
382	>	lock.readLock().lock();
383	>	lock.readLock().unlock();
384	>	}});
385
404	–	t1.start();
405	–	t2.start();
386		lock.readLock().lock();
387		lock.readLock().unlock();
388		Thread.sleep(SHORT_DELAY_MS);
#	Line 416 | Line 396 | public class ReentrantReadWriteLockTest
396		}
397
398		/**
399	<	*  Read lock succeeds if write locked by current thread even if
399	>	* Read lock succeeds if write locked by current thread even if
400		* other threads are waiting for writelock
401		*/
402		public void testReadHoldingWriteLock3() throws InterruptedException {
403		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
404		lock.writeLock().lock();
405	<	Thread t1 = new Thread(new Runnable() {
406	<	public void run() {
407	<	lock.writeLock().lock();
408	<	lock.writeLock().unlock();
409	<	}
410	<	});
411	<	Thread t2 = new Thread(new Runnable() {
412	<	public void run() {
413	<	lock.writeLock().lock();
414	<	lock.writeLock().unlock();
435	<	}
436	<	});
405	>	Thread t1 = newStartedThread(new CheckedRunnable() {
406	>	public void realRun() {
407	>	lock.writeLock().lock();
408	>	lock.writeLock().unlock();
409	>	}});
410	>	Thread t2 = newStartedThread(new CheckedRunnable() {
411	>	public void realRun() {
412	>	lock.writeLock().lock();
413	>	lock.writeLock().unlock();
414	>	}});
415
438	–	t1.start();
439	–	t2.start();
416		lock.readLock().lock();
417		lock.readLock().unlock();
418		Thread.sleep(SHORT_DELAY_MS);
#	Line 451 | Line 427 | public class ReentrantReadWriteLockTest
427
428
429		/**
430	<	*  Write lock succeeds if write locked by current thread even if
430	>	* Write lock succeeds if write locked by current thread even if
431		* other threads are waiting for writelock
432		*/
433		public void testWriteHoldingWriteLock4() throws InterruptedException {
434		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
435		lock.writeLock().lock();
436	<	Thread t1 = new Thread(new Runnable() {
437	<	public void run() {
438	<	lock.writeLock().lock();
439	<	lock.writeLock().unlock();
440	<	}
441	<	});
442	<	Thread t2 = new Thread(new Runnable() {
443	<	public void run() {
444	<	lock.writeLock().lock();
445	<	lock.writeLock().unlock();
470	<	}
471	<	});
436	>	Thread t1 = newStartedThread(new CheckedRunnable() {
437	>	public void realRun() {
438	>	lock.writeLock().lock();
439	>	lock.writeLock().unlock();
440	>	}});
441	>	Thread t2 = newStartedThread(new CheckedRunnable() {
442	>	public void realRun() {
443	>	lock.writeLock().lock();
444	>	lock.writeLock().unlock();
445	>	}});
446
473	–	t1.start();
474	–	t2.start();
447		lock.writeLock().lock();
448		lock.writeLock().unlock();
449		Thread.sleep(SHORT_DELAY_MS);
#	Line 503 | Line 475 | public class ReentrantReadWriteLockTest
475		public void testReadHoldingWriteLockFair2() throws InterruptedException {
476		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
477		lock.writeLock().lock();
478	<	Thread t1 = new Thread(new Runnable() {
479	<	public void run() {
480	<	lock.readLock().lock();
481	<	lock.readLock().unlock();
482	<	}
483	<	});
484	<	Thread t2 = new Thread(new Runnable() {
485	<	public void run() {
486	<	lock.readLock().lock();
487	<	lock.readLock().unlock();
516	<	}
517	<	});
478	>	Thread t1 = newStartedThread(new CheckedRunnable() {
479	>	public void realRun() {
480	>	lock.readLock().lock();
481	>	lock.readLock().unlock();
482	>	}});
483	>	Thread t2 = newStartedThread(new CheckedRunnable() {
484	>	public void realRun() {
485	>	lock.readLock().lock();
486	>	lock.readLock().unlock();
487	>	}});
488
519	–	t1.start();
520	–	t2.start();
489		lock.readLock().lock();
490		lock.readLock().unlock();
491		Thread.sleep(SHORT_DELAY_MS);
#	Line 538 | Line 506 | public class ReentrantReadWriteLockTest
506		public void testReadHoldingWriteLockFair3() throws InterruptedException {
507		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
508		lock.writeLock().lock();
509	<	Thread t1 = new Thread(new Runnable() {
510	<	public void run() {
511	<	lock.writeLock().lock();
512	<	lock.writeLock().unlock();
513	<	}
514	<	});
515	<	Thread t2 = new Thread(new Runnable() {
516	<	public void run() {
517	<	lock.writeLock().lock();
518	<	lock.writeLock().unlock();
551	<	}
552	<	});
509	>	Thread t1 = newStartedThread(new CheckedRunnable() {
510	>	public void realRun() {
511	>	lock.writeLock().lock();
512	>	lock.writeLock().unlock();
513	>	}});
514	>	Thread t2 = newStartedThread(new CheckedRunnable() {
515	>	public void realRun() {
516	>	lock.writeLock().lock();
517	>	lock.writeLock().unlock();
518	>	}});
519
554	–	t1.start();
555	–	t2.start();
520		lock.readLock().lock();
521		lock.readLock().unlock();
522		Thread.sleep(SHORT_DELAY_MS);
#	Line 573 | Line 537 | public class ReentrantReadWriteLockTest
537		public void testWriteHoldingWriteLockFair4() throws InterruptedException {
538		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
539		lock.writeLock().lock();
540	<	Thread t1 = new Thread(new Runnable() {
541	<	public void run() {
542	<	lock.writeLock().lock();
543	<	lock.writeLock().unlock();
544	<	}
545	<	});
546	<	Thread t2 = new Thread(new Runnable() {
547	<	public void run() {
548	<	lock.writeLock().lock();
549	<	lock.writeLock().unlock();
586	<	}
587	<	});
540	>	Thread t1 = newStartedThread(new CheckedRunnable() {
541	>	public void realRun() {
542	>	lock.writeLock().lock();
543	>	lock.writeLock().unlock();
544	>	}});
545	>	Thread t2 = newStartedThread(new CheckedRunnable() {
546	>	public void realRun() {
547	>	lock.writeLock().lock();
548	>	lock.writeLock().unlock();
549	>	}});
550
589	–	t1.start();
590	–	t2.start();
551		Thread.sleep(SHORT_DELAY_MS);
552		assertTrue(lock.isWriteLockedByCurrentThread());
553	<	assertTrue(lock.getWriteHoldCount() == 1);
553	>	assertEquals(1, lock.getWriteHoldCount());
554		lock.writeLock().lock();
555	<	assertTrue(lock.getWriteHoldCount() == 2);
555	>	assertEquals(2, lock.getWriteHoldCount());
556		lock.writeLock().unlock();
557		lock.writeLock().lock();
558		lock.writeLock().unlock();
#	Line 610 | Line 570 | public class ReentrantReadWriteLockTest
570		public void testTryLockWhenReadLocked() throws InterruptedException {
571		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
572		lock.readLock().lock();
573	<	Thread t = new Thread(new Runnable() {
574	<	public void run() {
575	<	threadAssertTrue(lock.readLock().tryLock());
576	<	lock.readLock().unlock();
577	<	}
618	<	});
573	>	Thread t = newStartedThread(new CheckedRunnable() {
574	>	public void realRun() {
575	>	assertTrue(lock.readLock().tryLock());
576	>	lock.readLock().unlock();
577	>	}});
578
620	–	t.start();
579		t.join();
580		lock.readLock().unlock();
581		}
582
625	–
626	–
583		/**
584		* write tryLock fails when readlocked
585		*/
586		public void testWriteTryLockWhenReadLocked() throws InterruptedException {
587		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
588		lock.readLock().lock();
589	<	Thread t = new Thread(new Runnable() {
590	<	public void run() {
591	<	threadAssertFalse(lock.writeLock().tryLock());
592	<	}
637	<	});
589	>	Thread t = newStartedThread(new CheckedRunnable() {
590	>	public void realRun() {
591	>	assertFalse(lock.writeLock().tryLock());
592	>	}});
593
639	–	t.start();
594		t.join();
595		lock.readLock().unlock();
596		}
#	Line 648 | Line 602 | public class ReentrantReadWriteLockTest
602		public void testTryLockWhenReadLockedFair() throws InterruptedException {
603		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
604		lock.readLock().lock();
605	<	Thread t = new Thread(new Runnable() {
606	<	public void run() {
607	<	threadAssertTrue(lock.readLock().tryLock());
608	<	lock.readLock().unlock();
609	<	}
656	<	});
605	>	Thread t = newStartedThread(new CheckedRunnable() {
606	>	public void realRun() {
607	>	assertTrue(lock.readLock().tryLock());
608	>	lock.readLock().unlock();
609	>	}});
610
658	–	t.start();
611		t.join();
612		lock.readLock().unlock();
613		}
#	Line 668 | Line 620 | public class ReentrantReadWriteLockTest
620		public void testWriteTryLockWhenReadLockedFair() throws InterruptedException {
621		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
622		lock.readLock().lock();
623	<	Thread t = new Thread(new Runnable() {
624	<	public void run() {
625	<	threadAssertFalse(lock.writeLock().tryLock());
626	<	}
675	<	});
623	>	Thread t = newStartedThread(new CheckedRunnable() {
624	>	public void realRun() {
625	>	assertFalse(lock.writeLock().tryLock());
626	>	}});
627
677	–	t.start();
628		t.join();
629		lock.readLock().unlock();
630		}
#	Line 687 | Line 637 | public class ReentrantReadWriteLockTest
637		public void testWriteTryLock_Timeout() throws InterruptedException {
638		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
639		lock.writeLock().lock();
640	<	Thread t = new Thread(new CheckedRunnable() {
640	>	Thread t = newStartedThread(new CheckedRunnable() {
641		public void realRun() throws InterruptedException {
642	<	threadAssertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
642	>	assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
643		}});
644
695	–	t.start();
645		t.join();
646		assertTrue(lock.writeLock().isHeldByCurrentThread());
647		lock.writeLock().unlock();
#	Line 704 | Line 653 | public class ReentrantReadWriteLockTest
653		public void testReadTryLock_Timeout() throws InterruptedException {
654		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
655		lock.writeLock().lock();
656	<	Thread t = new Thread(new CheckedRunnable() {
656	>	Thread t = newStartedThread(new CheckedRunnable() {
657		public void realRun() throws InterruptedException {
658	<	threadAssertFalse(lock.readLock().tryLock(1, MILLISECONDS));
658	>	assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
659		}});
660
712	–	t.start();
661		t.join();
662		assertTrue(lock.writeLock().isHeldByCurrentThread());
663		lock.writeLock().unlock();
#	Line 722 | Line 670 | public class ReentrantReadWriteLockTest
670		public void testWriteLockInterruptibly() throws InterruptedException {
671		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
672		lock.writeLock().lockInterruptibly();
673	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
673	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
674		public void realRun() throws InterruptedException {
675		lock.writeLock().lockInterruptibly();
676		}});
677
730	–	t.start();
678		Thread.sleep(SHORT_DELAY_MS);
679		t.interrupt();
680		Thread.sleep(SHORT_DELAY_MS);
#	Line 736 | Line 683 | public class ReentrantReadWriteLockTest
683		}
684
685		/**
686	<	*  read lockInterruptibly succeeds if lock free else is interruptible
686	>	* read lockInterruptibly succeeds if lock free else is interruptible
687		*/
688		public void testReadLockInterruptibly() throws InterruptedException {
689		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
690		lock.writeLock().lockInterruptibly();
691	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
691	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
692		public void realRun() throws InterruptedException {
693		lock.readLock().lockInterruptibly();
694		}});
695
749	–	t.start();
696		Thread.sleep(SHORT_DELAY_MS);
697		t.interrupt();
698		t.join();
#	Line 792 | Line 738 | public class ReentrantReadWriteLockTest
738
739
740		/**
741	<	*  timed await without a signal times out
741	>	* timed await without a signal times out
742		*/
743		public void testAwait_Timeout() throws InterruptedException {
744		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 820 | Line 766 | public class ReentrantReadWriteLockTest
766		public void testAwait() throws InterruptedException {
767		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
768		final Condition c = lock.writeLock().newCondition();
769	<	Thread t = new Thread(new CheckedRunnable() {
769	>	Thread t = newStartedThread(new CheckedRunnable() {
770		public void realRun() throws InterruptedException {
771		lock.writeLock().lock();
772		c.await();
773		lock.writeLock().unlock();
774		}});
775
830	–	t.start();
776		Thread.sleep(SHORT_DELAY_MS);
777		lock.writeLock().lock();
778		c.signal();
#	Line 897 | Line 842 | public class ReentrantReadWriteLockTest
842		public void testAwait_Interrupt() throws InterruptedException {
843		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
844		final Condition c = lock.writeLock().newCondition();
845	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
845	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
846		public void realRun() throws InterruptedException {
847		lock.writeLock().lock();
848		c.await();
849		lock.writeLock().unlock();
850		}});
851
907	–	t.start();
852		Thread.sleep(SHORT_DELAY_MS);
853		t.interrupt();
854		t.join(SHORT_DELAY_MS);
#	Line 917 | Line 861 | public class ReentrantReadWriteLockTest
861		public void testAwaitNanos_Interrupt() throws InterruptedException {
862		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
863		final Condition c = lock.writeLock().newCondition();
864	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
864	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
865		public void realRun() throws InterruptedException {
866		lock.writeLock().lock();
867	<	c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
867	>	c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
868		lock.writeLock().unlock();
869		}});
870
927	–	t.start();
871		Thread.sleep(SHORT_DELAY_MS);
872		t.interrupt();
873		t.join(SHORT_DELAY_MS);
#	Line 937 | Line 880 | public class ReentrantReadWriteLockTest
880		public void testAwaitUntil_Interrupt() throws InterruptedException {
881		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
882		final Condition c = lock.writeLock().newCondition();
883	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
883	>	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
884		public void realRun() throws InterruptedException {
885		lock.writeLock().lock();
886		java.util.Date d = new java.util.Date();
#	Line 945 | Line 888 | public class ReentrantReadWriteLockTest
888		lock.writeLock().unlock();
889		}});
890
948	–	t.start();
891		Thread.sleep(SHORT_DELAY_MS);
892		t.interrupt();
893		t.join(SHORT_DELAY_MS);
#	Line 958 | Line 900 | public class ReentrantReadWriteLockTest
900		public void testSignalAll() throws InterruptedException {
901		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
902		final Condition c = lock.writeLock().newCondition();
903	<	Thread t1 = new Thread(new CheckedRunnable() {
903	>	Thread t1 = newStartedThread(new CheckedRunnable() {
904		public void realRun() throws InterruptedException {
905		lock.writeLock().lock();
906		c.await();
907		lock.writeLock().unlock();
908		}});
909
910	<	Thread t2 = new Thread(new CheckedRunnable() {
910	>	Thread t2 = newStartedThread(new CheckedRunnable() {
911		public void realRun() throws InterruptedException {
912		lock.writeLock().lock();
913		c.await();
914		lock.writeLock().unlock();
915		}});
916
975	–	t1.start();
976	–	t2.start();
917		Thread.sleep(SHORT_DELAY_MS);
918		lock.writeLock().lock();
919		c.signalAll();
#	Line 1242 | Line 1182 | public class ReentrantReadWriteLockTest
1182		public void testHasWaiters() throws InterruptedException {
1183		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1184		final Condition c = lock.writeLock().newCondition();
1185	<	Thread t = new Thread(new CheckedRunnable() {
1185	>	Thread t = newStartedThread(new CheckedRunnable() {
1186		public void realRun() throws InterruptedException {
1187		lock.writeLock().lock();
1188	<	threadAssertFalse(lock.hasWaiters(c));
1189	<	threadAssertEquals(0, lock.getWaitQueueLength(c));
1188	>	assertFalse(lock.hasWaiters(c));
1189	>	assertEquals(0, lock.getWaitQueueLength(c));
1190		c.await();
1191		lock.writeLock().unlock();
1192		}});
1193
1254	–	t.start();
1194		Thread.sleep(SHORT_DELAY_MS);
1195		lock.writeLock().lock();
1196		assertTrue(lock.hasWaiters(c));
#	Line 1273 | Line 1212 | public class ReentrantReadWriteLockTest
1212		public void testGetWaitQueueLength() throws InterruptedException {
1213		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1214		final Condition c = lock.writeLock().newCondition();
1215	<	Thread t = new Thread(new CheckedRunnable() {
1215	>	Thread t = newStartedThread(new CheckedRunnable() {
1216		public void realRun() throws InterruptedException {
1217		lock.writeLock().lock();
1218	<	threadAssertFalse(lock.hasWaiters(c));
1219	<	threadAssertEquals(0, lock.getWaitQueueLength(c));
1218	>	assertFalse(lock.hasWaiters(c));
1219	>	assertEquals(0, lock.getWaitQueueLength(c));
1220		c.await();
1221		lock.writeLock().unlock();
1222		}});
1223
1285	–	t.start();
1224		Thread.sleep(SHORT_DELAY_MS);
1225		lock.writeLock().lock();
1226		assertTrue(lock.hasWaiters(c));
#	Line 1308 | Line 1246 | public class ReentrantReadWriteLockTest
1246		Thread t1 = new Thread(new CheckedRunnable() {
1247		public void realRun() throws InterruptedException {
1248		lock.writeLock().lock();
1249	<	threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1249	>	assertTrue(lock.getWaitingThreads(c).isEmpty());
1250		c.await();
1251		lock.writeLock().unlock();
1252		}});
#	Line 1316 | Line 1254 | public class ReentrantReadWriteLockTest
1254		Thread t2 = new Thread(new CheckedRunnable() {
1255		public void realRun() throws InterruptedException {
1256		lock.writeLock().lock();
1257	<	threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1257	>	assertFalse(lock.getWaitingThreads(c).isEmpty());
1258		c.await();
1259		lock.writeLock().unlock();
1260		}});

Diff Legend

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