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.8 by dl, Fri Dec 19 14:44:25 2003 UTC vs.
Revision 1.23 by dl, Mon Aug 1 19:53:01 2005 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by members of JCP JSR-166 Expert Group and released to the
3	<	* public domain. Use, modify, and redistribute this code in any way
4	<	* without acknowledgement. Other contributors include Andrew Wright,
5	<	* Jeffrey Hayes, Pat Fischer, Mike Judd.
2	>	* Written by Doug Lea with assistance from members of JCP JSR-166
3	>	* Expert Group and released to the public domain, as explained at
4	>	* http://creativecommons.org/licenses/publicdomain
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
#	Line 56 | Line 57 | public class ReentrantReadWriteLockTest
57		public Collection<Thread> getQueuedThreads() {
58		return super.getQueuedThreads();
59		}
60	<	public PublicCondition newCondition() {
61	<	return new PublicCondition(this);
60	>	public Collection<Thread> getWaitingThreads(Condition c) {
61	>	return super.getWaitingThreads(c);
62		}
62	–
63	–	static class PublicCondition extends ReentrantReadWriteLock.WriterConditionObject {
64	–	PublicCondition(PublicReentrantReadWriteLock l) { super(l); }
65	–	public Collection<Thread> getWaitingThreads() {
66	–	return super.getWaitingThreads();
67	–	}
68	–	}
69	–
63		}
64
65		/**
#	Line 76 | Line 69 | public class ReentrantReadWriteLockTest
69		ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
70		assertFalse(rl.isFair());
71		assertFalse(rl.isWriteLocked());
72	<	assertEquals(0, rl.getReadLocks());
72	>	assertEquals(0, rl.getReadLockCount());
73		ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
74		assertTrue(r2.isFair());
75		assertFalse(r2.isWriteLocked());
76	<	assertEquals(0, r2.getReadLocks());
76	>	assertEquals(0, r2.getReadLockCount());
77		}
78
79		/**
#	Line 91 | Line 84 | public class ReentrantReadWriteLockTest
84		rl.writeLock().lock();
85		assertTrue(rl.isWriteLocked());
86		assertTrue(rl.isWriteLockedByCurrentThread());
87	<	assertEquals(0, rl.getReadLocks());
87	>	assertEquals(0, rl.getReadLockCount());
88		rl.writeLock().unlock();
89		assertFalse(rl.isWriteLocked());
90		assertFalse(rl.isWriteLockedByCurrentThread());
91	<	assertEquals(0, rl.getReadLocks());
91	>	assertEquals(0, rl.getReadLockCount());
92		rl.readLock().lock();
93		assertFalse(rl.isWriteLocked());
94		assertFalse(rl.isWriteLockedByCurrentThread());
95	<	assertEquals(1, rl.getReadLocks());
95	>	assertEquals(1, rl.getReadLockCount());
96		rl.readLock().unlock();
97		assertFalse(rl.isWriteLocked());
98		assertFalse(rl.isWriteLockedByCurrentThread());
99	<	assertEquals(0, rl.getReadLocks());
99	>	assertEquals(0, rl.getReadLockCount());
100		}
101
102
#	Line 115 | Line 108 | public class ReentrantReadWriteLockTest
108		rl.writeLock().lock();
109		assertTrue(rl.isWriteLocked());
110		assertTrue(rl.isWriteLockedByCurrentThread());
111	<	assertEquals(0, rl.getReadLocks());
111	>	assertEquals(0, rl.getReadLockCount());
112		rl.writeLock().unlock();
113		assertFalse(rl.isWriteLocked());
114		assertFalse(rl.isWriteLockedByCurrentThread());
115	<	assertEquals(0, rl.getReadLocks());
115	>	assertEquals(0, rl.getReadLockCount());
116		rl.readLock().lock();
117		assertFalse(rl.isWriteLocked());
118		assertFalse(rl.isWriteLockedByCurrentThread());
119	<	assertEquals(1, rl.getReadLocks());
119	>	assertEquals(1, rl.getReadLockCount());
120		rl.readLock().unlock();
121		assertFalse(rl.isWriteLocked());
122		assertFalse(rl.isWriteLockedByCurrentThread());
123	<	assertEquals(0, rl.getReadLocks());
123	>	assertEquals(0, rl.getReadLockCount());
124		}
125
126		/**
127		* getWriteHoldCount returns number of recursive holds
128		*/
129	<	public void testGetHoldCount() {
129	>	public void testGetWriteHoldCount() {
130		ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
131		for(int i = 1; i <= SIZE; i++) {
132		lock.writeLock().lock();
#	Line 144 | Line 137 | public class ReentrantReadWriteLockTest
137		assertEquals(i-1,lock.getWriteHoldCount());
138		}
139		}
140	+
141	+	/**
142	+	* getReadHoldCount returns number of recursive holds
143	+	*/
144	+	public void testGetReadHoldCount() {
145	+	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
146	+	for(int i = 1; i <= SIZE; i++) {
147	+	lock.readLock().lock();
148	+	assertEquals(i,lock.getReadHoldCount());
149	+	}
150	+	for(int i = SIZE; i > 0; i--) {
151	+	lock.readLock().unlock();
152	+	assertEquals(i-1,lock.getReadHoldCount());
153	+	}
154	+	}
155
156
157		/**
#	Line 163 | Line 171 | public class ReentrantReadWriteLockTest
171		*/
172		public void testWriteLockInterruptibly_Interrupted() {
173		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
166	–	lock.writeLock().lock();
174		Thread t = new Thread(new Runnable() {
175		public void run() {
176		try {
177		lock.writeLock().lockInterruptibly();
178	<	threadShouldThrow();
178	>	lock.writeLock().unlock();
179	>	lock.writeLock().lockInterruptibly();
180	>	lock.writeLock().unlock();
181		} catch(InterruptedException success){}
182		}
183		});
184		try {
185	+	lock.writeLock().lock();
186		t.start();
187		t.interrupt();
188		lock.writeLock().unlock();
#	Line 183 | Line 193 | public class ReentrantReadWriteLockTest
193		}
194
195		/**
196	<	* timed write-trylock is interruptible
196	>	* timed write-tryLock is interruptible
197		*/
198		public void testWriteTryLock_Interrupted() {
199		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 192 | Line 202 | public class ReentrantReadWriteLockTest
202		public void run() {
203		try {
204		lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
195	–	threadShouldThrow();
205		} catch(InterruptedException success){}
206		}
207		});
#	Line 216 | Line 225 | public class ReentrantReadWriteLockTest
225		public void run() {
226		try {
227		lock.readLock().lockInterruptibly();
219	–	threadShouldThrow();
228		} catch(InterruptedException success){}
229		}
230		});
#	Line 231 | Line 239 | public class ReentrantReadWriteLockTest
239		}
240
241		/**
242	<	* timed read-trylock is interruptible
242	>	* timed read-tryLock is interruptible
243		*/
244		public void testReadTryLock_Interrupted() {
245		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 255 | Line 263 | public class ReentrantReadWriteLockTest
263
264
265		/**
266	<	* write-trylock fails if locked
266	>	* write-tryLock fails if locked
267		*/
268		public void testWriteTryLockWhenLocked() {
269		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 275 | Line 283 | public class ReentrantReadWriteLockTest
283		}
284
285		/**
286	<	* read-trylock fails if locked
286	>	* read-tryLock fails if locked
287		*/
288		public void testReadTryLockWhenLocked() {
289		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 383 | Line 391 | public class ReentrantReadWriteLockTest
391		}
392		}
393
394	+	/**
395	+	* Read trylock succeeds if write locked by current thread
396	+	*/
397	+	public void testReadHoldingWriteLock() {
398	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
399	+	lock.writeLock().lock();
400	+	assertTrue(lock.readLock().tryLock());
401	+	lock.readLock().unlock();
402	+	lock.writeLock().unlock();
403	+	}
404	+
405	+	/**
406	+	* Read lock succeeds if write locked by current thread even if
407	+	* other threads are waiting for readlock
408	+	*/
409	+	public void testReadHoldingWriteLock2() {
410	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
411	+	lock.writeLock().lock();
412	+	Thread t1 = new Thread(new Runnable() {
413	+	public void run() {
414	+	lock.readLock().lock();
415	+	lock.readLock().unlock();
416	+	}
417	+	});
418	+	Thread t2 = new Thread(new Runnable() {
419	+	public void run() {
420	+	lock.readLock().lock();
421	+	lock.readLock().unlock();
422	+	}
423	+	});
424	+
425	+	try {
426	+	t1.start();
427	+	t2.start();
428	+	lock.readLock().lock();
429	+	lock.readLock().unlock();
430	+	Thread.sleep(SHORT_DELAY_MS);
431	+	lock.readLock().lock();
432	+	lock.readLock().unlock();
433	+	lock.writeLock().unlock();
434	+	t1.join(MEDIUM_DELAY_MS);
435	+	t2.join(MEDIUM_DELAY_MS);
436	+	assertTrue(!t1.isAlive());
437	+	assertTrue(!t2.isAlive());
438	+
439	+	} catch(Exception e){
440	+	unexpectedException();
441	+	}
442	+	}
443	+
444	+	/**
445	+	*  Read lock succeeds if write locked by current thread even if
446	+	* other threads are waiting for writelock
447	+	*/
448	+	public void testReadHoldingWriteLock3() {
449	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
450	+	lock.writeLock().lock();
451	+	Thread t1 = new Thread(new Runnable() {
452	+	public void run() {
453	+	lock.writeLock().lock();
454	+	lock.writeLock().unlock();
455	+	}
456	+	});
457	+	Thread t2 = new Thread(new Runnable() {
458	+	public void run() {
459	+	lock.writeLock().lock();
460	+	lock.writeLock().unlock();
461	+	}
462	+	});
463	+
464	+	try {
465	+	t1.start();
466	+	t2.start();
467	+	lock.readLock().lock();
468	+	lock.readLock().unlock();
469	+	Thread.sleep(SHORT_DELAY_MS);
470	+	lock.readLock().lock();
471	+	lock.readLock().unlock();
472	+	lock.writeLock().unlock();
473	+	t1.join(MEDIUM_DELAY_MS);
474	+	t2.join(MEDIUM_DELAY_MS);
475	+	assertTrue(!t1.isAlive());
476	+	assertTrue(!t2.isAlive());
477	+
478	+	} catch(Exception e){
479	+	unexpectedException();
480	+	}
481	+	}
482	+
483	+
484	+	/**
485	+	*  Write lock succeeds if write locked by current thread even if
486	+	* other threads are waiting for writelock
487	+	*/
488	+	public void testWriteHoldingWriteLock4() {
489	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
490	+	lock.writeLock().lock();
491	+	Thread t1 = new Thread(new Runnable() {
492	+	public void run() {
493	+	lock.writeLock().lock();
494	+	lock.writeLock().unlock();
495	+	}
496	+	});
497	+	Thread t2 = new Thread(new Runnable() {
498	+	public void run() {
499	+	lock.writeLock().lock();
500	+	lock.writeLock().unlock();
501	+	}
502	+	});
503	+
504	+	try {
505	+	t1.start();
506	+	t2.start();
507	+	lock.writeLock().lock();
508	+	lock.writeLock().unlock();
509	+	Thread.sleep(SHORT_DELAY_MS);
510	+	lock.writeLock().lock();
511	+	lock.writeLock().unlock();
512	+	lock.writeLock().unlock();
513	+	t1.join(MEDIUM_DELAY_MS);
514	+	t2.join(MEDIUM_DELAY_MS);
515	+	assertTrue(!t1.isAlive());
516	+	assertTrue(!t2.isAlive());
517	+
518	+	} catch(Exception e){
519	+	unexpectedException();
520	+	}
521	+	}
522	+
523	+
524	+	/**
525	+	* Fair Read trylock succeeds if write locked by current thread
526	+	*/
527	+	public void testReadHoldingWriteLockFair() {
528	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
529	+	lock.writeLock().lock();
530	+	assertTrue(lock.readLock().tryLock());
531	+	lock.readLock().unlock();
532	+	lock.writeLock().unlock();
533	+	}
534	+
535	+	/**
536	+	* Fair Read lock succeeds if write locked by current thread even if
537	+	* other threads are waiting for readlock
538	+	*/
539	+	public void testReadHoldingWriteLockFair2() {
540	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
541	+	lock.writeLock().lock();
542	+	Thread t1 = new Thread(new Runnable() {
543	+	public void run() {
544	+	lock.readLock().lock();
545	+	lock.readLock().unlock();
546	+	}
547	+	});
548	+	Thread t2 = new Thread(new Runnable() {
549	+	public void run() {
550	+	lock.readLock().lock();
551	+	lock.readLock().unlock();
552	+	}
553	+	});
554	+
555	+	try {
556	+	t1.start();
557	+	t2.start();
558	+	lock.readLock().lock();
559	+	lock.readLock().unlock();
560	+	Thread.sleep(SHORT_DELAY_MS);
561	+	lock.readLock().lock();
562	+	lock.readLock().unlock();
563	+	lock.writeLock().unlock();
564	+	t1.join(MEDIUM_DELAY_MS);
565	+	t2.join(MEDIUM_DELAY_MS);
566	+	assertTrue(!t1.isAlive());
567	+	assertTrue(!t2.isAlive());
568	+
569	+	} catch(Exception e){
570	+	unexpectedException();
571	+	}
572	+	}
573	+
574
575		/**
576	<	* Read trylock succeeds if readlocked but not writelocked
576	>	* Fair Read lock succeeds if write locked by current thread even if
577	>	* other threads are waiting for writelock
578	>	*/
579	>	public void testReadHoldingWriteLockFair3() {
580	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
581	>	lock.writeLock().lock();
582	>	Thread t1 = new Thread(new Runnable() {
583	>	public void run() {
584	>	lock.writeLock().lock();
585	>	lock.writeLock().unlock();
586	>	}
587	>	});
588	>	Thread t2 = new Thread(new Runnable() {
589	>	public void run() {
590	>	lock.writeLock().lock();
591	>	lock.writeLock().unlock();
592	>	}
593	>	});
594	>
595	>	try {
596	>	t1.start();
597	>	t2.start();
598	>	lock.readLock().lock();
599	>	lock.readLock().unlock();
600	>	Thread.sleep(SHORT_DELAY_MS);
601	>	lock.readLock().lock();
602	>	lock.readLock().unlock();
603	>	lock.writeLock().unlock();
604	>	t1.join(MEDIUM_DELAY_MS);
605	>	t2.join(MEDIUM_DELAY_MS);
606	>	assertTrue(!t1.isAlive());
607	>	assertTrue(!t2.isAlive());
608	>
609	>	} catch(Exception e){
610	>	unexpectedException();
611	>	}
612	>	}
613	>
614	>
615	>	/**
616	>	* Fair Write lock succeeds if write locked by current thread even if
617	>	* other threads are waiting for writelock
618	>	*/
619	>	public void testWriteHoldingWriteLockFair4() {
620	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
621	>	lock.writeLock().lock();
622	>	Thread t1 = new Thread(new Runnable() {
623	>	public void run() {
624	>	lock.writeLock().lock();
625	>	lock.writeLock().unlock();
626	>	}
627	>	});
628	>	Thread t2 = new Thread(new Runnable() {
629	>	public void run() {
630	>	lock.writeLock().lock();
631	>	lock.writeLock().unlock();
632	>	}
633	>	});
634	>
635	>	try {
636	>	t1.start();
637	>	t2.start();
638	>	Thread.sleep(SHORT_DELAY_MS);
639	>	assertTrue(lock.isWriteLockedByCurrentThread());
640	>	assertTrue(lock.getWriteHoldCount() == 1);
641	>	lock.writeLock().lock();
642	>	assertTrue(lock.getWriteHoldCount() == 2);
643	>	lock.writeLock().unlock();
644	>	lock.writeLock().lock();
645	>	lock.writeLock().unlock();
646	>	lock.writeLock().unlock();
647	>	t1.join(MEDIUM_DELAY_MS);
648	>	t2.join(MEDIUM_DELAY_MS);
649	>	assertTrue(!t1.isAlive());
650	>	assertTrue(!t2.isAlive());
651	>
652	>	} catch(Exception e){
653	>	unexpectedException();
654	>	}
655	>	}
656	>
657	>
658	>	/**
659	>	* Read tryLock succeeds if readlocked but not writelocked
660		*/
661		public void testTryLockWhenReadLocked() {
662		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 408 | Line 679 | public class ReentrantReadWriteLockTest
679
680
681		/**
682	<	* write trylock fails when readlocked
682	>	* write tryLock fails when readlocked
683		*/
684		public void testWriteTryLockWhenReadLocked() {
685		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 430 | Line 701 | public class ReentrantReadWriteLockTest
701
702
703		/**
704	<	* write timed trylock times out if locked
704	>	* write timed tryLock times out if locked
705		*/
706		public void testWriteTryLock_Timeout() {
707		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 454 | Line 725 | public class ReentrantReadWriteLockTest
725		}
726
727		/**
728	<	* read timed trylock times out if write-locked
728	>	* read timed tryLock times out if write-locked
729		*/
730		public void testReadTryLock_Timeout() {
731		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 598 | Line 869 | public class ReentrantReadWriteLockTest
869		final Condition c = lock.writeLock().newCondition();
870		try {
871		lock.writeLock().lock();
601	–	assertFalse(c.await(10, TimeUnit.MILLISECONDS));
872		lock.writeLock().unlock();
873		}
874		catch (Exception ex) {
#	Line 615 | Line 885 | public class ReentrantReadWriteLockTest
885		try {
886		lock.writeLock().lock();
887		java.util.Date d = new java.util.Date();
618	–	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
888		lock.writeLock().unlock();
889		}
890		catch (Exception ex) {
#	Line 656 | Line 925 | public class ReentrantReadWriteLockTest
925		}
926		}
927
928	+	/** A helper class for uninterruptible wait tests */
929	+	class UninterruptableThread extends Thread {
930	+	private Lock lock;
931	+	private Condition c;
932	+
933	+	public volatile boolean canAwake = false;
934	+	public volatile boolean interrupted = false;
935	+	public volatile boolean lockStarted = false;
936	+
937	+	public UninterruptableThread(Lock lock, Condition c) {
938	+	this.lock = lock;
939	+	this.c = c;
940	+	}
941	+
942	+	public synchronized void run() {
943	+	lock.lock();
944	+	lockStarted = true;
945	+
946	+	while (!canAwake) {
947	+	c.awaitUninterruptibly();
948	+	}
949	+
950	+	interrupted = isInterrupted();
951	+	lock.unlock();
952	+	}
953	+	}
954	+
955		/**
956		* awaitUninterruptibly doesn't abort on interrupt
957		*/
958		public void testAwaitUninterruptibly() {
959	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
959	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
960		final Condition c = lock.writeLock().newCondition();
961	<	Thread t = new Thread(new Runnable() {
666	<	public void run() {
667	<	lock.writeLock().lock();
668	<	c.awaitUninterruptibly();
669	<	lock.writeLock().unlock();
670	<	}
671	<	});
961	>	UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
962
963		try {
964	<	t.start();
965	<	Thread.sleep(SHORT_DELAY_MS);
966	<	t.interrupt();
964	>	thread.start();
965	>
966	>	while (!thread.lockStarted) {
967	>	Thread.sleep(100);
968	>	}
969	>
970		lock.writeLock().lock();
971	<	c.signal();
972	<	lock.writeLock().unlock();
973	<	assert(t.isInterrupted());
974	<	t.join(SHORT_DELAY_MS);
975	<	assertFalse(t.isAlive());
976	<	}
977	<	catch (Exception ex) {
971	>	try {
972	>	thread.interrupt();
973	>	thread.canAwake = true;
974	>	c.signal();
975	>	} finally {
976	>	lock.writeLock().unlock();
977	>	}
978	>
979	>	thread.join();
980	>	assertTrue(thread.interrupted);
981	>	assertFalse(thread.isAlive());
982	>	} catch (Exception ex) {
983		unexpectedException();
984		}
985		}
#	Line 855 | Line 1153 | public class ReentrantReadWriteLockTest
1153		}
1154
1155		/**
1156	+	* hasQueuedThreads reports whether there are waiting threads
1157	+	*/
1158	+	public void testhasQueuedThreads() {
1159	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1160	+	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1161	+	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1162	+	try {
1163	+	assertFalse(lock.hasQueuedThreads());
1164	+	lock.writeLock().lock();
1165	+	t1.start();
1166	+	Thread.sleep(SHORT_DELAY_MS);
1167	+	assertTrue(lock.hasQueuedThreads());
1168	+	t2.start();
1169	+	Thread.sleep(SHORT_DELAY_MS);
1170	+	assertTrue(lock.hasQueuedThreads());
1171	+	t1.interrupt();
1172	+	Thread.sleep(SHORT_DELAY_MS);
1173	+	assertTrue(lock.hasQueuedThreads());
1174	+	lock.writeLock().unlock();
1175	+	Thread.sleep(SHORT_DELAY_MS);
1176	+	assertFalse(lock.hasQueuedThreads());
1177	+	t1.join();
1178	+	t2.join();
1179	+	} catch(Exception e){
1180	+	unexpectedException();
1181	+	}
1182	+	}
1183	+
1184	+	/**
1185	+	* hasQueuedThread(null) throws NPE
1186	+	*/
1187	+	public void testHasQueuedThreadNPE() {
1188	+	final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1189	+	try {
1190	+	sync.hasQueuedThread(null);
1191	+	shouldThrow();
1192	+	} catch (NullPointerException success) {
1193	+	}
1194	+	}
1195	+
1196	+	/**
1197	+	* hasQueuedThread reports whether a thread is queued.
1198	+	*/
1199	+	public void testHasQueuedThread() {
1200	+	final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1201	+	Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1202	+	Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1203	+	try {
1204	+	assertFalse(sync.hasQueuedThread(t1));
1205	+	assertFalse(sync.hasQueuedThread(t2));
1206	+	sync.writeLock().lock();
1207	+	t1.start();
1208	+	Thread.sleep(SHORT_DELAY_MS);
1209	+	assertTrue(sync.hasQueuedThread(t1));
1210	+	t2.start();
1211	+	Thread.sleep(SHORT_DELAY_MS);
1212	+	assertTrue(sync.hasQueuedThread(t1));
1213	+	assertTrue(sync.hasQueuedThread(t2));
1214	+	t1.interrupt();
1215	+	Thread.sleep(SHORT_DELAY_MS);
1216	+	assertFalse(sync.hasQueuedThread(t1));
1217	+	assertTrue(sync.hasQueuedThread(t2));
1218	+	sync.writeLock().unlock();
1219	+	Thread.sleep(SHORT_DELAY_MS);
1220	+	assertFalse(sync.hasQueuedThread(t1));
1221	+	Thread.sleep(SHORT_DELAY_MS);
1222	+	assertFalse(sync.hasQueuedThread(t2));
1223	+	t1.join();
1224	+	t2.join();
1225	+	} catch(Exception e){
1226	+	unexpectedException();
1227	+	}
1228	+	}
1229	+
1230	+
1231	+	/**
1232		* getQueueLength reports number of waiting threads
1233		*/
1234		public void testGetQueueLength() {
#	Line 916 | Line 1290 | public class ReentrantReadWriteLockTest
1290		}
1291
1292		/**
1293	+	* hasWaiters throws NPE if null
1294	+	*/
1295	+	public void testHasWaitersNPE() {
1296	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1297	+	try {
1298	+	lock.hasWaiters(null);
1299	+	shouldThrow();
1300	+	} catch (NullPointerException success) {
1301	+	} catch (Exception ex) {
1302	+	unexpectedException();
1303	+	}
1304	+	}
1305	+
1306	+	/**
1307	+	* getWaitQueueLength throws NPE if null
1308	+	*/
1309	+	public void testGetWaitQueueLengthNPE() {
1310	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1311	+	try {
1312	+	lock.getWaitQueueLength(null);
1313	+	shouldThrow();
1314	+	} catch (NullPointerException success) {
1315	+	} catch (Exception ex) {
1316	+	unexpectedException();
1317	+	}
1318	+	}
1319	+
1320	+
1321	+	/**
1322	+	* getWaitingThreads throws NPE if null
1323	+	*/
1324	+	public void testGetWaitingThreadsNPE() {
1325	+	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1326	+	try {
1327	+	lock.getWaitingThreads(null);
1328	+	shouldThrow();
1329	+	} catch (NullPointerException success) {
1330	+	} catch (Exception ex) {
1331	+	unexpectedException();
1332	+	}
1333	+	}
1334	+
1335	+	/**
1336	+	* hasWaiters throws IAE if not owned
1337	+	*/
1338	+	public void testHasWaitersIAE() {
1339	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1340	+	final Condition c = (lock.writeLock().newCondition());
1341	+	final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1342	+	try {
1343	+	lock2.hasWaiters(c);
1344	+	shouldThrow();
1345	+	} catch (IllegalArgumentException success) {
1346	+	} catch (Exception ex) {
1347	+	unexpectedException();
1348	+	}
1349	+	}
1350	+
1351	+	/**
1352	+	* hasWaiters throws IMSE if not locked
1353	+	*/
1354	+	public void testHasWaitersIMSE() {
1355	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1356	+	final Condition c = (lock.writeLock().newCondition());
1357	+	try {
1358	+	lock.hasWaiters(c);
1359	+	shouldThrow();
1360	+	} catch (IllegalMonitorStateException success) {
1361	+	} catch (Exception ex) {
1362	+	unexpectedException();
1363	+	}
1364	+	}
1365	+
1366	+
1367	+	/**
1368	+	* getWaitQueueLength throws IAE if not owned
1369	+	*/
1370	+	public void testGetWaitQueueLengthIAE() {
1371	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1372	+	final Condition c = (lock.writeLock().newCondition());
1373	+	final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1374	+	try {
1375	+	lock2.getWaitQueueLength(c);
1376	+	shouldThrow();
1377	+	} catch (IllegalArgumentException success) {
1378	+	} catch (Exception ex) {
1379	+	unexpectedException();
1380	+	}
1381	+	}
1382	+
1383	+	/**
1384	+	* getWaitQueueLength throws IMSE if not locked
1385	+	*/
1386	+	public void testGetWaitQueueLengthIMSE() {
1387	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1388	+	final Condition c = (lock.writeLock().newCondition());
1389	+	try {
1390	+	lock.getWaitQueueLength(c);
1391	+	shouldThrow();
1392	+	} catch (IllegalMonitorStateException success) {
1393	+	} catch (Exception ex) {
1394	+	unexpectedException();
1395	+	}
1396	+	}
1397	+
1398	+
1399	+	/**
1400	+	* getWaitingThreads throws IAE if not owned
1401	+	*/
1402	+	public void testGetWaitingThreadsIAE() {
1403	+	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1404	+	final Condition c = (lock.writeLock().newCondition());
1405	+	final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1406	+	try {
1407	+	lock2.getWaitingThreads(c);
1408	+	shouldThrow();
1409	+	} catch (IllegalArgumentException success) {
1410	+	} catch (Exception ex) {
1411	+	unexpectedException();
1412	+	}
1413	+	}
1414	+
1415	+	/**
1416	+	* getWaitingThreads throws IMSE if not locked
1417	+	*/
1418	+	public void testGetWaitingThreadsIMSE() {
1419	+	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1420	+	final Condition c = (lock.writeLock().newCondition());
1421	+	try {
1422	+	lock.getWaitingThreads(c);
1423	+	shouldThrow();
1424	+	} catch (IllegalMonitorStateException success) {
1425	+	} catch (Exception ex) {
1426	+	unexpectedException();
1427	+	}
1428	+	}
1429	+
1430	+
1431	+	/**
1432		* hasWaiters returns true when a thread is waiting, else false
1433		*/
1434		public void testHasWaiters() {
1435	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1436	<	final ReentrantReadWriteLock.WriterConditionObject c = (ReentrantReadWriteLock.WriterConditionObject)(lock.writeLock().newCondition());
1435	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1436	>	final Condition c = (lock.writeLock().newCondition());
1437		Thread t = new Thread(new Runnable() {
1438		public void run() {
1439		try {
1440		lock.writeLock().lock();
1441	<	threadAssertFalse(c.hasWaiters());
1442	<	threadAssertEquals(0, c.getWaitQueueLength());
1441	>	threadAssertFalse(lock.hasWaiters(c));
1442	>	threadAssertEquals(0, lock.getWaitQueueLength(c));
1443		c.await();
1444		lock.writeLock().unlock();
1445		}
#	Line 940 | Line 1453 | public class ReentrantReadWriteLockTest
1453		t.start();
1454		Thread.sleep(SHORT_DELAY_MS);
1455		lock.writeLock().lock();
1456	<	assertTrue(c.hasWaiters());
1457	<	assertEquals(1, c.getWaitQueueLength());
1456	>	assertTrue(lock.hasWaiters(c));
1457	>	assertEquals(1, lock.getWaitQueueLength(c));
1458		c.signal();
1459		lock.writeLock().unlock();
1460		Thread.sleep(SHORT_DELAY_MS);
1461		lock.writeLock().lock();
1462	<	assertFalse(c.hasWaiters());
1463	<	assertEquals(0, c.getWaitQueueLength());
1462	>	assertFalse(lock.hasWaiters(c));
1463	>	assertEquals(0, lock.getWaitQueueLength(c));
1464		lock.writeLock().unlock();
1465		t.join(SHORT_DELAY_MS);
1466		assertFalse(t.isAlive());
#	Line 961 | Line 1474 | public class ReentrantReadWriteLockTest
1474		* getWaitQueueLength returns number of waiting threads
1475		*/
1476		public void testGetWaitQueueLength() {
1477	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1478	<	final ReentrantReadWriteLock.WriterConditionObject c = (ReentrantReadWriteLock.WriterConditionObject)(lock.writeLock().newCondition());
1479	<	Thread t1 = new Thread(new Runnable() {
967	<	public void run() {
968	<	try {
969	<	lock.writeLock().lock();
970	<	threadAssertFalse(c.hasWaiters());
971	<	threadAssertEquals(0, c.getWaitQueueLength());
972	<	c.await();
973	<	lock.writeLock().unlock();
974	<	}
975	<	catch(InterruptedException e) {
976	<	threadUnexpectedException();
977	<	}
978	<	}
979	<	});
980	<
981	<	Thread t2 = new Thread(new Runnable() {
1477	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1478	>	final Condition c = (lock.writeLock().newCondition());
1479	>	Thread t = new Thread(new Runnable() {
1480		public void run() {
1481		try {
1482		lock.writeLock().lock();
1483	<	threadAssertTrue(c.hasWaiters());
1484	<	threadAssertEquals(1, c.getWaitQueueLength());
1483	>	threadAssertFalse(lock.hasWaiters(c));
1484	>	threadAssertEquals(0, lock.getWaitQueueLength(c));
1485		c.await();
1486		lock.writeLock().unlock();
1487		}
#	Line 994 | Line 1492 | public class ReentrantReadWriteLockTest
1492		});
1493
1494		try {
1495	<	t1.start();
998	<	Thread.sleep(SHORT_DELAY_MS);
999	<	t2.start();
1495	>	t.start();
1496		Thread.sleep(SHORT_DELAY_MS);
1497		lock.writeLock().lock();
1498	<	assertTrue(c.hasWaiters());
1499	<	assertEquals(2, c.getWaitQueueLength());
1500	<	c.signalAll();
1498	>	assertTrue(lock.hasWaiters(c));
1499	>	assertEquals(1, lock.getWaitQueueLength(c));
1500	>	c.signal();
1501		lock.writeLock().unlock();
1502		Thread.sleep(SHORT_DELAY_MS);
1503		lock.writeLock().lock();
1504	<	assertFalse(c.hasWaiters());
1505	<	assertEquals(0, c.getWaitQueueLength());
1504	>	assertFalse(lock.hasWaiters(c));
1505	>	assertEquals(0, lock.getWaitQueueLength(c));
1506		lock.writeLock().unlock();
1507	<	t1.join(SHORT_DELAY_MS);
1508	<	t2.join(SHORT_DELAY_MS);
1013	<	assertFalse(t1.isAlive());
1014	<	assertFalse(t2.isAlive());
1507	>	t.join(SHORT_DELAY_MS);
1508	>	assertFalse(t.isAlive());
1509		}
1510		catch (Exception ex) {
1511		unexpectedException();
1512		}
1513		}
1514
1515	+
1516		/**
1517		* getWaitingThreads returns only and all waiting threads
1518		*/
1519		public void testGetWaitingThreads() {
1520		final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1521	<	final PublicReentrantReadWriteLock.PublicCondition c = (PublicReentrantReadWriteLock.PublicCondition)lock.newCondition();
1521	>	final Condition c = lock.writeLock().newCondition();
1522		Thread t1 = new Thread(new Runnable() {
1523		public void run() {
1524		try {
1525		lock.writeLock().lock();
1526	<	threadAssertTrue(c.getWaitingThreads().isEmpty());
1526	>	threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1527		c.await();
1528		lock.writeLock().unlock();
1529		}
#	Line 1042 | Line 1537 | public class ReentrantReadWriteLockTest
1537		public void run() {
1538		try {
1539		lock.writeLock().lock();
1540	<	threadAssertFalse(c.getWaitingThreads().isEmpty());
1540	>	threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1541		c.await();
1542		lock.writeLock().unlock();
1543		}
#	Line 1054 | Line 1549 | public class ReentrantReadWriteLockTest
1549
1550		try {
1551		lock.writeLock().lock();
1552	<	assertTrue(c.getWaitingThreads().isEmpty());
1552	>	assertTrue(lock.getWaitingThreads(c).isEmpty());
1553		lock.writeLock().unlock();
1554		t1.start();
1555		Thread.sleep(SHORT_DELAY_MS);
1556		t2.start();
1557		Thread.sleep(SHORT_DELAY_MS);
1558		lock.writeLock().lock();
1559	<	assertTrue(c.hasWaiters());
1560	<	assertTrue(c.getWaitingThreads().contains(t1));
1561	<	assertTrue(c.getWaitingThreads().contains(t2));
1559	>	assertTrue(lock.hasWaiters(c));
1560	>	assertTrue(lock.getWaitingThreads(c).contains(t1));
1561	>	assertTrue(lock.getWaitingThreads(c).contains(t2));
1562		c.signalAll();
1563		lock.writeLock().unlock();
1564		Thread.sleep(SHORT_DELAY_MS);
1565		lock.writeLock().lock();
1566	<	assertFalse(c.hasWaiters());
1567	<	assertTrue(c.getWaitingThreads().isEmpty());
1566	>	assertFalse(lock.hasWaiters(c));
1567	>	assertTrue(lock.getWaitingThreads(c).isEmpty());
1568		lock.writeLock().unlock();
1569		t1.join(SHORT_DELAY_MS);
1570		t2.join(SHORT_DELAY_MS);
#	Line 1081 | Line 1576 | public class ReentrantReadWriteLockTest
1576		}
1577		}
1578
1579	+	/**
1580	+	* toString indicates current lock state
1581	+	*/
1582	+	public void testToString() {
1583	+	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1584	+	String us = lock.toString();
1585	+	assertTrue(us.indexOf("Write locks = 0") >= 0);
1586	+	assertTrue(us.indexOf("Read locks = 0") >= 0);
1587	+	lock.writeLock().lock();
1588	+	String ws = lock.toString();
1589	+	assertTrue(ws.indexOf("Write locks = 1") >= 0);
1590	+	assertTrue(ws.indexOf("Read locks = 0") >= 0);
1591	+	lock.writeLock().unlock();
1592	+	lock.readLock().lock();
1593	+	lock.readLock().lock();
1594	+	String rs = lock.toString();
1595	+	assertTrue(rs.indexOf("Write locks = 0") >= 0);
1596	+	assertTrue(rs.indexOf("Read locks = 2") >= 0);
1597	+	}
1598	+
1599	+	/**
1600	+	* readLock.toString indicates current lock state
1601	+	*/
1602	+	public void testReadLockToString() {
1603	+	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1604	+	String us = lock.readLock().toString();
1605	+	assertTrue(us.indexOf("Read locks = 0") >= 0);
1606	+	lock.readLock().lock();
1607	+	lock.readLock().lock();
1608	+	String rs = lock.readLock().toString();
1609	+	assertTrue(rs.indexOf("Read locks = 2") >= 0);
1610	+	}
1611	+
1612	+	/**
1613	+	* writeLock.toString indicates current lock state
1614	+	*/
1615	+	public void testWriteLockToString() {
1616	+	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1617	+	String us = lock.writeLock().toString();
1618	+	assertTrue(us.indexOf("Unlocked") >= 0);
1619	+	lock.writeLock().lock();
1620	+	String ls = lock.writeLock().toString();
1621	+	assertTrue(ls.indexOf("Locked") >= 0);
1622	+	}
1623	+
1624		}

Diff Legend

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