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.7 by dl, Thu Dec 4 20:54:46 2003 UTC vs.
Revision 1.22 by dl, Tue May 3 16:02:00 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 AbstractReentrantLock.ConditionObject {
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		/**
#	Line 163 | Line 156 | public class ReentrantReadWriteLockTest
156		*/
157		public void testWriteLockInterruptibly_Interrupted() {
158		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
166	–	lock.writeLock().lock();
159		Thread t = new Thread(new Runnable() {
160		public void run() {
161		try {
162		lock.writeLock().lockInterruptibly();
163	<	threadShouldThrow();
163	>	lock.writeLock().unlock();
164	>	lock.writeLock().lockInterruptibly();
165	>	lock.writeLock().unlock();
166		} catch(InterruptedException success){}
167		}
168		});
169		try {
170	+	lock.writeLock().lock();
171		t.start();
172		t.interrupt();
173		lock.writeLock().unlock();
#	Line 183 | Line 178 | public class ReentrantReadWriteLockTest
178		}
179
180		/**
181	<	* timed write-trylock is interruptible
181	>	* timed write-tryLock is interruptible
182		*/
183		public void testWriteTryLock_Interrupted() {
184		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 192 | Line 187 | public class ReentrantReadWriteLockTest
187		public void run() {
188		try {
189		lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
195	–	threadShouldThrow();
190		} catch(InterruptedException success){}
191		}
192		});
#	Line 216 | Line 210 | public class ReentrantReadWriteLockTest
210		public void run() {
211		try {
212		lock.readLock().lockInterruptibly();
219	–	threadShouldThrow();
213		} catch(InterruptedException success){}
214		}
215		});
#	Line 231 | Line 224 | public class ReentrantReadWriteLockTest
224		}
225
226		/**
227	<	* timed read-trylock is interruptible
227	>	* timed read-tryLock is interruptible
228		*/
229		public void testReadTryLock_Interrupted() {
230		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 255 | Line 248 | public class ReentrantReadWriteLockTest
248
249
250		/**
251	<	* write-trylock fails if locked
251	>	* write-tryLock fails if locked
252		*/
253		public void testWriteTryLockWhenLocked() {
254		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 275 | Line 268 | public class ReentrantReadWriteLockTest
268		}
269
270		/**
271	<	* read-trylock fails if locked
271	>	* read-tryLock fails if locked
272		*/
273		public void testReadTryLockWhenLocked() {
274		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 383 | Line 376 | public class ReentrantReadWriteLockTest
376		}
377		}
378
379	+	/**
380	+	* Read trylock succeeds if write locked by current thread
381	+	*/
382	+	public void testReadHoldingWriteLock() {
383	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
384	+	lock.writeLock().lock();
385	+	assertTrue(lock.readLock().tryLock());
386	+	lock.readLock().unlock();
387	+	lock.writeLock().unlock();
388	+	}
389	+
390	+	/**
391	+	* Read lock succeeds if write locked by current thread even if
392	+	* other threads are waiting
393	+	*/
394	+	public void testReadHoldingWriteLock2() {
395	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
396	+	lock.writeLock().lock();
397	+	Thread t1 = new Thread(new Runnable() {
398	+	public void run() {
399	+	lock.readLock().lock();
400	+	lock.readLock().unlock();
401	+	}
402	+	});
403	+	Thread t2 = new Thread(new Runnable() {
404	+	public void run() {
405	+	lock.readLock().lock();
406	+	lock.readLock().unlock();
407	+	}
408	+	});
409	+
410	+	try {
411	+	t1.start();
412	+	t2.start();
413	+	lock.readLock().lock();
414	+	lock.readLock().unlock();
415	+	Thread.sleep(SHORT_DELAY_MS);
416	+	lock.readLock().lock();
417	+	lock.readLock().unlock();
418	+	lock.writeLock().unlock();
419	+	t1.join(MEDIUM_DELAY_MS);
420	+	t2.join(MEDIUM_DELAY_MS);
421	+	assertTrue(!t1.isAlive());
422	+	assertTrue(!t2.isAlive());
423	+
424	+	} catch(Exception e){
425	+	unexpectedException();
426	+	}
427	+	}
428	+
429	+	/**
430	+	* Fair Read trylock succeeds if write locked by current thread
431	+	*/
432	+	public void testReadHoldingWriteLockFair() {
433	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
434	+	lock.writeLock().lock();
435	+	assertTrue(lock.readLock().tryLock());
436	+	lock.readLock().unlock();
437	+	lock.writeLock().unlock();
438	+	}
439	+
440	+	/**
441	+	* Fair Read lock succeeds if write locked by current thread even if
442	+	* other threads are waiting
443	+	*/
444	+	public void testReadHoldingWriteLockFair2() {
445	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
446	+	lock.writeLock().lock();
447	+	Thread t1 = new Thread(new Runnable() {
448	+	public void run() {
449	+	lock.readLock().lock();
450	+	lock.readLock().unlock();
451	+	}
452	+	});
453	+	Thread t2 = new Thread(new Runnable() {
454	+	public void run() {
455	+	lock.readLock().lock();
456	+	lock.readLock().unlock();
457	+	}
458	+	});
459	+
460	+	try {
461	+	t1.start();
462	+	t2.start();
463	+	lock.readLock().lock();
464	+	lock.readLock().unlock();
465	+	Thread.sleep(SHORT_DELAY_MS);
466	+	lock.readLock().lock();
467	+	lock.readLock().unlock();
468	+	lock.writeLock().unlock();
469	+	t1.join(MEDIUM_DELAY_MS);
470	+	t2.join(MEDIUM_DELAY_MS);
471	+	assertTrue(!t1.isAlive());
472	+	assertTrue(!t2.isAlive());
473	+
474	+	} catch(Exception e){
475	+	unexpectedException();
476	+	}
477	+	}
478	+
479
480		/**
481	<	* Read trylock succeeds if readlocked but not writelocked
481	>	* Read tryLock succeeds if readlocked but not writelocked
482		*/
483		public void testTryLockWhenReadLocked() {
484		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 408 | Line 501 | public class ReentrantReadWriteLockTest
501
502
503		/**
504	<	* write trylock fails when readlocked
504	>	* write tryLock fails when readlocked
505		*/
506		public void testWriteTryLockWhenReadLocked() {
507		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 430 | Line 523 | public class ReentrantReadWriteLockTest
523
524
525		/**
526	<	* write timed trylock times out if locked
526	>	* write timed tryLock times out if locked
527		*/
528		public void testWriteTryLock_Timeout() {
529		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 454 | Line 547 | public class ReentrantReadWriteLockTest
547		}
548
549		/**
550	<	* read timed trylock times out if write-locked
550	>	* read timed tryLock times out if write-locked
551		*/
552		public void testReadTryLock_Timeout() {
553		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 598 | Line 691 | public class ReentrantReadWriteLockTest
691		final Condition c = lock.writeLock().newCondition();
692		try {
693		lock.writeLock().lock();
601	–	assertFalse(c.await(10, TimeUnit.MILLISECONDS));
694		lock.writeLock().unlock();
695		}
696		catch (Exception ex) {
#	Line 615 | Line 707 | public class ReentrantReadWriteLockTest
707		try {
708		lock.writeLock().lock();
709		java.util.Date d = new java.util.Date();
618	–	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
710		lock.writeLock().unlock();
711		}
712		catch (Exception ex) {
#	Line 656 | Line 747 | public class ReentrantReadWriteLockTest
747		}
748		}
749
750	+	/** A helper class for uninterruptible wait tests */
751	+	class UninterruptableThread extends Thread {
752	+	private Lock lock;
753	+	private Condition c;
754	+
755	+	public volatile boolean canAwake = false;
756	+	public volatile boolean interrupted = false;
757	+	public volatile boolean lockStarted = false;
758	+
759	+	public UninterruptableThread(Lock lock, Condition c) {
760	+	this.lock = lock;
761	+	this.c = c;
762	+	}
763	+
764	+	public synchronized void run() {
765	+	lock.lock();
766	+	lockStarted = true;
767	+
768	+	while (!canAwake) {
769	+	c.awaitUninterruptibly();
770	+	}
771	+
772	+	interrupted = isInterrupted();
773	+	lock.unlock();
774	+	}
775	+	}
776	+
777		/**
778		* awaitUninterruptibly doesn't abort on interrupt
779		*/
780		public void testAwaitUninterruptibly() {
781	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
781	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
782		final Condition c = lock.writeLock().newCondition();
783	<	Thread t = new Thread(new Runnable() {
666	<	public void run() {
667	<	lock.writeLock().lock();
668	<	c.awaitUninterruptibly();
669	<	lock.writeLock().unlock();
670	<	}
671	<	});
783	>	UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
784
785		try {
786	<	t.start();
787	<	Thread.sleep(SHORT_DELAY_MS);
788	<	t.interrupt();
786	>	thread.start();
787	>
788	>	while (!thread.lockStarted) {
789	>	Thread.sleep(100);
790	>	}
791	>
792		lock.writeLock().lock();
793	<	c.signal();
794	<	lock.writeLock().unlock();
795	<	assert(t.isInterrupted());
796	<	t.join(SHORT_DELAY_MS);
797	<	assertFalse(t.isAlive());
798	<	}
799	<	catch (Exception ex) {
793	>	try {
794	>	thread.interrupt();
795	>	thread.canAwake = true;
796	>	c.signal();
797	>	} finally {
798	>	lock.writeLock().unlock();
799	>	}
800	>
801	>	thread.join();
802	>	assertTrue(thread.interrupted);
803	>	assertFalse(thread.isAlive());
804	>	} catch (Exception ex) {
805		unexpectedException();
806		}
807		}
#	Line 855 | Line 975 | public class ReentrantReadWriteLockTest
975		}
976
977		/**
978	+	* hasQueuedThreads reports whether there are waiting threads
979	+	*/
980	+	public void testhasQueuedThreads() {
981	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
982	+	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
983	+	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
984	+	try {
985	+	assertFalse(lock.hasQueuedThreads());
986	+	lock.writeLock().lock();
987	+	t1.start();
988	+	Thread.sleep(SHORT_DELAY_MS);
989	+	assertTrue(lock.hasQueuedThreads());
990	+	t2.start();
991	+	Thread.sleep(SHORT_DELAY_MS);
992	+	assertTrue(lock.hasQueuedThreads());
993	+	t1.interrupt();
994	+	Thread.sleep(SHORT_DELAY_MS);
995	+	assertTrue(lock.hasQueuedThreads());
996	+	lock.writeLock().unlock();
997	+	Thread.sleep(SHORT_DELAY_MS);
998	+	assertFalse(lock.hasQueuedThreads());
999	+	t1.join();
1000	+	t2.join();
1001	+	} catch(Exception e){
1002	+	unexpectedException();
1003	+	}
1004	+	}
1005	+
1006	+	/**
1007	+	* hasQueuedThread(null) throws NPE
1008	+	*/
1009	+	public void testHasQueuedThreadNPE() {
1010	+	final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1011	+	try {
1012	+	sync.hasQueuedThread(null);
1013	+	shouldThrow();
1014	+	} catch (NullPointerException success) {
1015	+	}
1016	+	}
1017	+
1018	+	/**
1019	+	* hasQueuedThread reports whether a thread is queued.
1020	+	*/
1021	+	public void testHasQueuedThread() {
1022	+	final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1023	+	Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1024	+	Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1025	+	try {
1026	+	assertFalse(sync.hasQueuedThread(t1));
1027	+	assertFalse(sync.hasQueuedThread(t2));
1028	+	sync.writeLock().lock();
1029	+	t1.start();
1030	+	Thread.sleep(SHORT_DELAY_MS);
1031	+	assertTrue(sync.hasQueuedThread(t1));
1032	+	t2.start();
1033	+	Thread.sleep(SHORT_DELAY_MS);
1034	+	assertTrue(sync.hasQueuedThread(t1));
1035	+	assertTrue(sync.hasQueuedThread(t2));
1036	+	t1.interrupt();
1037	+	Thread.sleep(SHORT_DELAY_MS);
1038	+	assertFalse(sync.hasQueuedThread(t1));
1039	+	assertTrue(sync.hasQueuedThread(t2));
1040	+	sync.writeLock().unlock();
1041	+	Thread.sleep(SHORT_DELAY_MS);
1042	+	assertFalse(sync.hasQueuedThread(t1));
1043	+	Thread.sleep(SHORT_DELAY_MS);
1044	+	assertFalse(sync.hasQueuedThread(t2));
1045	+	t1.join();
1046	+	t2.join();
1047	+	} catch(Exception e){
1048	+	unexpectedException();
1049	+	}
1050	+	}
1051	+
1052	+
1053	+	/**
1054		* getQueueLength reports number of waiting threads
1055		*/
1056		public void testGetQueueLength() {
#	Line 916 | Line 1112 | public class ReentrantReadWriteLockTest
1112		}
1113
1114		/**
1115	+	* hasWaiters throws NPE if null
1116	+	*/
1117	+	public void testHasWaitersNPE() {
1118	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1119	+	try {
1120	+	lock.hasWaiters(null);
1121	+	shouldThrow();
1122	+	} catch (NullPointerException success) {
1123	+	} catch (Exception ex) {
1124	+	unexpectedException();
1125	+	}
1126	+	}
1127	+
1128	+	/**
1129	+	* getWaitQueueLength throws NPE if null
1130	+	*/
1131	+	public void testGetWaitQueueLengthNPE() {
1132	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1133	+	try {
1134	+	lock.getWaitQueueLength(null);
1135	+	shouldThrow();
1136	+	} catch (NullPointerException success) {
1137	+	} catch (Exception ex) {
1138	+	unexpectedException();
1139	+	}
1140	+	}
1141	+
1142	+
1143	+	/**
1144	+	* getWaitingThreads throws NPE if null
1145	+	*/
1146	+	public void testGetWaitingThreadsNPE() {
1147	+	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1148	+	try {
1149	+	lock.getWaitingThreads(null);
1150	+	shouldThrow();
1151	+	} catch (NullPointerException success) {
1152	+	} catch (Exception ex) {
1153	+	unexpectedException();
1154	+	}
1155	+	}
1156	+
1157	+	/**
1158	+	* hasWaiters throws IAE if not owned
1159	+	*/
1160	+	public void testHasWaitersIAE() {
1161	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1162	+	final Condition c = (lock.writeLock().newCondition());
1163	+	final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1164	+	try {
1165	+	lock2.hasWaiters(c);
1166	+	shouldThrow();
1167	+	} catch (IllegalArgumentException success) {
1168	+	} catch (Exception ex) {
1169	+	unexpectedException();
1170	+	}
1171	+	}
1172	+
1173	+	/**
1174	+	* hasWaiters throws IMSE if not locked
1175	+	*/
1176	+	public void testHasWaitersIMSE() {
1177	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1178	+	final Condition c = (lock.writeLock().newCondition());
1179	+	try {
1180	+	lock.hasWaiters(c);
1181	+	shouldThrow();
1182	+	} catch (IllegalMonitorStateException success) {
1183	+	} catch (Exception ex) {
1184	+	unexpectedException();
1185	+	}
1186	+	}
1187	+
1188	+
1189	+	/**
1190	+	* getWaitQueueLength throws IAE if not owned
1191	+	*/
1192	+	public void testGetWaitQueueLengthIAE() {
1193	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1194	+	final Condition c = (lock.writeLock().newCondition());
1195	+	final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1196	+	try {
1197	+	lock2.getWaitQueueLength(c);
1198	+	shouldThrow();
1199	+	} catch (IllegalArgumentException success) {
1200	+	} catch (Exception ex) {
1201	+	unexpectedException();
1202	+	}
1203	+	}
1204	+
1205	+	/**
1206	+	* getWaitQueueLength throws IMSE if not locked
1207	+	*/
1208	+	public void testGetWaitQueueLengthIMSE() {
1209	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1210	+	final Condition c = (lock.writeLock().newCondition());
1211	+	try {
1212	+	lock.getWaitQueueLength(c);
1213	+	shouldThrow();
1214	+	} catch (IllegalMonitorStateException success) {
1215	+	} catch (Exception ex) {
1216	+	unexpectedException();
1217	+	}
1218	+	}
1219	+
1220	+
1221	+	/**
1222	+	* getWaitingThreads throws IAE if not owned
1223	+	*/
1224	+	public void testGetWaitingThreadsIAE() {
1225	+	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1226	+	final Condition c = (lock.writeLock().newCondition());
1227	+	final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1228	+	try {
1229	+	lock2.getWaitingThreads(c);
1230	+	shouldThrow();
1231	+	} catch (IllegalArgumentException success) {
1232	+	} catch (Exception ex) {
1233	+	unexpectedException();
1234	+	}
1235	+	}
1236	+
1237	+	/**
1238	+	* getWaitingThreads throws IMSE if not locked
1239	+	*/
1240	+	public void testGetWaitingThreadsIMSE() {
1241	+	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1242	+	final Condition c = (lock.writeLock().newCondition());
1243	+	try {
1244	+	lock.getWaitingThreads(c);
1245	+	shouldThrow();
1246	+	} catch (IllegalMonitorStateException success) {
1247	+	} catch (Exception ex) {
1248	+	unexpectedException();
1249	+	}
1250	+	}
1251	+
1252	+
1253	+	/**
1254		* hasWaiters returns true when a thread is waiting, else false
1255		*/
1256		public void testHasWaiters() {
1257	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1258	<	final AbstractReentrantLock.ConditionObject c = (AbstractReentrantLock.ConditionObject)(lock.writeLock().newCondition());
1257	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1258	>	final Condition c = (lock.writeLock().newCondition());
1259		Thread t = new Thread(new Runnable() {
1260		public void run() {
1261		try {
1262		lock.writeLock().lock();
1263	<	threadAssertFalse(c.hasWaiters());
1264	<	threadAssertEquals(0, c.getWaitQueueLength());
1263	>	threadAssertFalse(lock.hasWaiters(c));
1264	>	threadAssertEquals(0, lock.getWaitQueueLength(c));
1265		c.await();
1266		lock.writeLock().unlock();
1267		}
#	Line 940 | Line 1275 | public class ReentrantReadWriteLockTest
1275		t.start();
1276		Thread.sleep(SHORT_DELAY_MS);
1277		lock.writeLock().lock();
1278	<	assertTrue(c.hasWaiters());
1279	<	assertEquals(1, c.getWaitQueueLength());
1278	>	assertTrue(lock.hasWaiters(c));
1279	>	assertEquals(1, lock.getWaitQueueLength(c));
1280		c.signal();
1281		lock.writeLock().unlock();
1282		Thread.sleep(SHORT_DELAY_MS);
1283		lock.writeLock().lock();
1284	<	assertFalse(c.hasWaiters());
1285	<	assertEquals(0, c.getWaitQueueLength());
1284	>	assertFalse(lock.hasWaiters(c));
1285	>	assertEquals(0, lock.getWaitQueueLength(c));
1286		lock.writeLock().unlock();
1287		t.join(SHORT_DELAY_MS);
1288		assertFalse(t.isAlive());
#	Line 961 | Line 1296 | public class ReentrantReadWriteLockTest
1296		* getWaitQueueLength returns number of waiting threads
1297		*/
1298		public void testGetWaitQueueLength() {
1299	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1300	<	final AbstractReentrantLock.ConditionObject c = (AbstractReentrantLock.ConditionObject)(lock.writeLock().newCondition());
1301	<	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() {
1299	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1300	>	final Condition c = (lock.writeLock().newCondition());
1301	>	Thread t = new Thread(new Runnable() {
1302		public void run() {
1303		try {
1304		lock.writeLock().lock();
1305	<	threadAssertTrue(c.hasWaiters());
1306	<	threadAssertEquals(1, c.getWaitQueueLength());
1305	>	threadAssertFalse(lock.hasWaiters(c));
1306	>	threadAssertEquals(0, lock.getWaitQueueLength(c));
1307		c.await();
1308		lock.writeLock().unlock();
1309		}
#	Line 994 | Line 1314 | public class ReentrantReadWriteLockTest
1314		});
1315
1316		try {
1317	<	t1.start();
998	<	Thread.sleep(SHORT_DELAY_MS);
999	<	t2.start();
1317	>	t.start();
1318		Thread.sleep(SHORT_DELAY_MS);
1319		lock.writeLock().lock();
1320	<	assertTrue(c.hasWaiters());
1321	<	assertEquals(2, c.getWaitQueueLength());
1322	<	c.signalAll();
1320	>	assertTrue(lock.hasWaiters(c));
1321	>	assertEquals(1, lock.getWaitQueueLength(c));
1322	>	c.signal();
1323		lock.writeLock().unlock();
1324		Thread.sleep(SHORT_DELAY_MS);
1325		lock.writeLock().lock();
1326	<	assertFalse(c.hasWaiters());
1327	<	assertEquals(0, c.getWaitQueueLength());
1326	>	assertFalse(lock.hasWaiters(c));
1327	>	assertEquals(0, lock.getWaitQueueLength(c));
1328		lock.writeLock().unlock();
1329	<	t1.join(SHORT_DELAY_MS);
1330	<	t2.join(SHORT_DELAY_MS);
1013	<	assertFalse(t1.isAlive());
1014	<	assertFalse(t2.isAlive());
1329	>	t.join(SHORT_DELAY_MS);
1330	>	assertFalse(t.isAlive());
1331		}
1332		catch (Exception ex) {
1333		unexpectedException();
1334		}
1335		}
1336
1337	+
1338		/**
1339		* getWaitingThreads returns only and all waiting threads
1340		*/
1341		public void testGetWaitingThreads() {
1342		final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1343	<	final PublicReentrantReadWriteLock.PublicCondition c = (PublicReentrantReadWriteLock.PublicCondition)lock.newCondition();
1343	>	final Condition c = lock.writeLock().newCondition();
1344		Thread t1 = new Thread(new Runnable() {
1345		public void run() {
1346		try {
1347		lock.writeLock().lock();
1348	<	threadAssertTrue(c.getWaitingThreads().isEmpty());
1348	>	threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1349		c.await();
1350		lock.writeLock().unlock();
1351		}
#	Line 1042 | Line 1359 | public class ReentrantReadWriteLockTest
1359		public void run() {
1360		try {
1361		lock.writeLock().lock();
1362	<	threadAssertFalse(c.getWaitingThreads().isEmpty());
1362	>	threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1363		c.await();
1364		lock.writeLock().unlock();
1365		}
#	Line 1054 | Line 1371 | public class ReentrantReadWriteLockTest
1371
1372		try {
1373		lock.writeLock().lock();
1374	<	assertTrue(c.getWaitingThreads().isEmpty());
1374	>	assertTrue(lock.getWaitingThreads(c).isEmpty());
1375		lock.writeLock().unlock();
1376		t1.start();
1377		Thread.sleep(SHORT_DELAY_MS);
1378		t2.start();
1379		Thread.sleep(SHORT_DELAY_MS);
1380		lock.writeLock().lock();
1381	<	assertTrue(c.hasWaiters());
1382	<	assertTrue(c.getWaitingThreads().contains(t1));
1383	<	assertTrue(c.getWaitingThreads().contains(t2));
1381	>	assertTrue(lock.hasWaiters(c));
1382	>	assertTrue(lock.getWaitingThreads(c).contains(t1));
1383	>	assertTrue(lock.getWaitingThreads(c).contains(t2));
1384		c.signalAll();
1385		lock.writeLock().unlock();
1386		Thread.sleep(SHORT_DELAY_MS);
1387		lock.writeLock().lock();
1388	<	assertFalse(c.hasWaiters());
1389	<	assertTrue(c.getWaitingThreads().isEmpty());
1388	>	assertFalse(lock.hasWaiters(c));
1389	>	assertTrue(lock.getWaitingThreads(c).isEmpty());
1390		lock.writeLock().unlock();
1391		t1.join(SHORT_DELAY_MS);
1392		t2.join(SHORT_DELAY_MS);
#	Line 1081 | Line 1398 | public class ReentrantReadWriteLockTest
1398		}
1399		}
1400
1401	+	/**
1402	+	* toString indicates current lock state
1403	+	*/
1404	+	public void testToString() {
1405	+	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1406	+	String us = lock.toString();
1407	+	assertTrue(us.indexOf("Write locks = 0") >= 0);
1408	+	assertTrue(us.indexOf("Read locks = 0") >= 0);
1409	+	lock.writeLock().lock();
1410	+	String ws = lock.toString();
1411	+	assertTrue(ws.indexOf("Write locks = 1") >= 0);
1412	+	assertTrue(ws.indexOf("Read locks = 0") >= 0);
1413	+	lock.writeLock().unlock();
1414	+	lock.readLock().lock();
1415	+	lock.readLock().lock();
1416	+	String rs = lock.toString();
1417	+	assertTrue(rs.indexOf("Write locks = 0") >= 0);
1418	+	assertTrue(rs.indexOf("Read locks = 2") >= 0);
1419	+	}
1420	+
1421	+	/**
1422	+	* readLock.toString indicates current lock state
1423	+	*/
1424	+	public void testReadLockToString() {
1425	+	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1426	+	String us = lock.readLock().toString();
1427	+	assertTrue(us.indexOf("Read locks = 0") >= 0);
1428	+	lock.readLock().lock();
1429	+	lock.readLock().lock();
1430	+	String rs = lock.readLock().toString();
1431	+	assertTrue(rs.indexOf("Read locks = 2") >= 0);
1432	+	}
1433	+
1434	+	/**
1435	+	* writeLock.toString indicates current lock state
1436	+	*/
1437	+	public void testWriteLockToString() {
1438	+	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1439	+	String us = lock.writeLock().toString();
1440	+	assertTrue(us.indexOf("Unlocked") >= 0);
1441	+	lock.writeLock().lock();
1442	+	String ls = lock.writeLock().toString();
1443	+	assertTrue(ls.indexOf("Locked") >= 0);
1444	+	}
1445	+
1446		}

Diff Legend

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