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.60 by jsr166, Mon May 9 20:00:19 2011 UTC vs.
Revision 1.80 by jsr166, Sun May 14 02:03:15 2017 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.concurrent.atomic.AtomicBoolean;
11	–	import java.util.concurrent.locks.*;
12	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.io.*;
11	<	import java.util.*;
10	>
11	>	import java.util.Arrays;
12	>	import java.util.Collection;
13	>	import java.util.HashSet;
14	>	import java.util.concurrent.CountDownLatch;
15	>	import java.util.concurrent.atomic.AtomicBoolean;
16	>	import java.util.concurrent.locks.Condition;
17	>	import java.util.concurrent.locks.Lock;
18	>	import java.util.concurrent.locks.ReentrantReadWriteLock;
19	>
20	>	import junit.framework.AssertionFailedError;
21	>	import junit.framework.Test;
22	>	import junit.framework.TestSuite;
23
24		public class ReentrantReadWriteLockTest extends JSR166TestCase {
25		public static void main(String[] args) {
26	<	junit.textui.TestRunner.run(suite());
26	>	main(suite(), args);
27		}
28		public static Test suite() {
29		return new TestSuite(ReentrantReadWriteLockTest.class);
#	Line 67 | Line 74 | public class ReentrantReadWriteLockTest
74		*/
75		void releaseWriteLock(PublicReentrantReadWriteLock lock) {
76		ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
77	<	assertWriteLockedBy(lock, Thread.currentThread());
77	>	assertWriteLockedByMoi(lock);
78		assertEquals(1, lock.getWriteHoldCount());
79		writeLock.unlock();
80		assertNotWriteLocked(lock);
#	Line 80 | Line 87 | public class ReentrantReadWriteLockTest
87		long startTime = System.nanoTime();
88		while (!lock.hasQueuedThread(t)) {
89		if (millisElapsedSince(startTime) > LONG_DELAY_MS)
90	<	throw new AssertionError("timed out");
90	>	throw new AssertionFailedError("timed out");
91		Thread.yield();
92		}
93		assertTrue(t.isAlive());
94	<	assertTrue(lock.getOwner() != t);
94	>	assertNotSame(t, lock.getOwner());
95		}
96
97		/**
#	Line 94 | Line 101 | public class ReentrantReadWriteLockTest
101		assertFalse(lock.isWriteLocked());
102		assertFalse(lock.isWriteLockedByCurrentThread());
103		assertFalse(lock.writeLock().isHeldByCurrentThread());
97	–	assertNull(lock.getOwner());
104		assertEquals(0, lock.getWriteHoldCount());
105	+	assertEquals(0, lock.writeLock().getHoldCount());
106	+	assertNull(lock.getOwner());
107		}
108
109		/**
#	Line 110 | Line 118 | public class ReentrantReadWriteLockTest
118		lock.writeLock().isHeldByCurrentThread());
119		assertEquals(t == Thread.currentThread(),
120		lock.getWriteHoldCount() > 0);
121	+	assertEquals(t == Thread.currentThread(),
122	+	lock.writeLock().getHoldCount() > 0);
123		assertEquals(0, lock.getReadLockCount());
124		}
125
126		/**
127	+	* Checks that lock is write-locked by the current thread.
128	+	*/
129	+	void assertWriteLockedByMoi(PublicReentrantReadWriteLock lock) {
130	+	assertWriteLockedBy(lock, Thread.currentThread());
131	+	}
132	+
133	+	/**
134		* Checks that condition c has no waiters.
135		*/
136		void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
#	Line 135 | Line 152 | public class ReentrantReadWriteLockTest
152		lock.writeLock().unlock();
153		}
154
155	<	enum AwaitMethod { await, awaitNanos, awaitUntil };
155	>	enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
156
157		/**
158	<	* Awaits condition using the specified AwaitMethod
158	>	* Awaits condition "indefinitely" using the specified AwaitMethod.
159		*/
160		void await(Condition c, AwaitMethod awaitMethod)
161		throws InterruptedException {
162	+	long timeoutMillis = 2 * LONG_DELAY_MS;
163		switch (awaitMethod) {
164		case await:
165		c.await();
166		break;
167	+	case awaitTimed:
168	+	assertTrue(c.await(timeoutMillis, MILLISECONDS));
169	+	break;
170		case awaitNanos:
171	<	long nanosRemaining = c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
172	<	assertTrue(nanosRemaining > 0);
171	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
172	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
173	>	assertTrue(nanosRemaining > timeoutNanos / 2);
174	>	assertTrue(nanosRemaining <= timeoutNanos);
175		break;
176		case awaitUntil:
177	<	java.util.Date d = new java.util.Date();
155	<	assertTrue(c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS)));
177	>	assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
178		break;
179	+	default:
180	+	throw new AssertionError();
181		}
182		}
183
#	Line 189 | Line 213 | public class ReentrantReadWriteLockTest
213		new PublicReentrantReadWriteLock(fair);
214		assertNotWriteLocked(lock);
215		lock.writeLock().lock();
216	<	assertWriteLockedBy(lock, Thread.currentThread());
216	>	assertWriteLockedByMoi(lock);
217		lock.writeLock().unlock();
218		assertNotWriteLocked(lock);
219		assertEquals(0, lock.getReadLockCount());
#	Line 207 | Line 231 | public class ReentrantReadWriteLockTest
231		public void testGetWriteHoldCount()      { testGetWriteHoldCount(false); }
232		public void testGetWriteHoldCount_fair() { testGetWriteHoldCount(true); }
233		public void testGetWriteHoldCount(boolean fair) {
234	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
234	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
235		for (int i = 1; i <= SIZE; i++) {
236		lock.writeLock().lock();
237		assertEquals(i,lock.getWriteHoldCount());
238		}
239		for (int i = SIZE; i > 0; i--) {
240		lock.writeLock().unlock();
241	<	assertEquals(i-1,lock.getWriteHoldCount());
241	>	assertEquals(i - 1,lock.getWriteHoldCount());
242		}
243		}
244
#	Line 224 | Line 248 | public class ReentrantReadWriteLockTest
248		public void testGetHoldCount()      { testGetHoldCount(false); }
249		public void testGetHoldCount_fair() { testGetHoldCount(true); }
250		public void testGetHoldCount(boolean fair) {
251	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
251	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
252		for (int i = 1; i <= SIZE; i++) {
253		lock.writeLock().lock();
254		assertEquals(i,lock.writeLock().getHoldCount());
255		}
256		for (int i = SIZE; i > 0; i--) {
257		lock.writeLock().unlock();
258	<	assertEquals(i-1,lock.writeLock().getHoldCount());
258	>	assertEquals(i - 1,lock.writeLock().getHoldCount());
259		}
260		}
261
#	Line 241 | Line 265 | public class ReentrantReadWriteLockTest
265		public void testGetReadHoldCount()      { testGetReadHoldCount(false); }
266		public void testGetReadHoldCount_fair() { testGetReadHoldCount(true); }
267		public void testGetReadHoldCount(boolean fair) {
268	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
268	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
269		for (int i = 1; i <= SIZE; i++) {
270		lock.readLock().lock();
271		assertEquals(i,lock.getReadHoldCount());
272		}
273		for (int i = SIZE; i > 0; i--) {
274		lock.readLock().unlock();
275	<	assertEquals(i-1,lock.getReadHoldCount());
275	>	assertEquals(i - 1,lock.getReadHoldCount());
276		}
277		}
278
#	Line 258 | Line 282 | public class ReentrantReadWriteLockTest
282		public void testWriteUnlock_IMSE()      { testWriteUnlock_IMSE(false); }
283		public void testWriteUnlock_IMSE_fair() { testWriteUnlock_IMSE(true); }
284		public void testWriteUnlock_IMSE(boolean fair) {
285	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
285	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
286		try {
287		lock.writeLock().unlock();
288		shouldThrow();
#	Line 271 | Line 295 | public class ReentrantReadWriteLockTest
295		public void testReadUnlock_IMSE()      { testReadUnlock_IMSE(false); }
296		public void testReadUnlock_IMSE_fair() { testReadUnlock_IMSE(true); }
297		public void testReadUnlock_IMSE(boolean fair) {
298	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
298	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
299		try {
300		lock.readLock().unlock();
301		shouldThrow();
#	Line 359 | Line 383 | public class ReentrantReadWriteLockTest
383		}
384
385		/**
386	+	* write-tryLock on an unlocked lock succeeds
387	+	*/
388	+	public void testWriteTryLock()      { testWriteTryLock(false); }
389	+	public void testWriteTryLock_fair() { testWriteTryLock(true); }
390	+	public void testWriteTryLock(boolean fair) {
391	+	final PublicReentrantReadWriteLock lock =
392	+	new PublicReentrantReadWriteLock(fair);
393	+	assertTrue(lock.writeLock().tryLock());
394	+	assertWriteLockedByMoi(lock);
395	+	assertTrue(lock.writeLock().tryLock());
396	+	assertWriteLockedByMoi(lock);
397	+	lock.writeLock().unlock();
398	+	releaseWriteLock(lock);
399	+	}
400	+
401	+	/**
402		* write-tryLock fails if locked
403		*/
404		public void testWriteTryLockWhenLocked()      { testWriteTryLockWhenLocked(false); }
#	Line 478 | Line 518 | public class ReentrantReadWriteLockTest
518
519		/**
520		* A thread that tries to acquire a fair read lock (non-reentrantly)
521	<	* will block if there is a waiting writer thread.
521	>	* will block if there is a waiting writer thread
522		*/
523		public void testReaderWriterReaderFairFifo() {
524		final PublicReentrantReadWriteLock lock =
#	Line 555 | Line 595 | public class ReentrantReadWriteLockTest
595		}
596
597		/**
598	<	* Read trylock succeeds (barging) even in the presence of waiting readers and/or writers.
598	>	* Read trylock succeeds (barging) even in the presence of waiting
599	>	* readers and/or writers
600		*/
601		public void testReadTryLockBarging()      { testReadTryLockBarging(false); }
602		public void testReadTryLockBarging_fair() { testReadTryLockBarging(true); }
#	Line 622 | Line 663 | public class ReentrantReadWriteLockTest
663
664		waitForQueuedThread(lock, t1);
665		waitForQueuedThread(lock, t2);
666	<	assertWriteLockedBy(lock, Thread.currentThread());
666	>	assertWriteLockedByMoi(lock);
667		lock.readLock().lock();
668		lock.readLock().unlock();
669		releaseWriteLock(lock);
#	Line 656 | Line 697 | public class ReentrantReadWriteLockTest
697
698		waitForQueuedThread(lock, t1);
699		waitForQueuedThread(lock, t2);
700	<	assertWriteLockedBy(lock, Thread.currentThread());
700	>	assertWriteLockedByMoi(lock);
701		lock.readLock().lock();
702		lock.readLock().unlock();
703	<	assertWriteLockedBy(lock, Thread.currentThread());
703	>	assertWriteLockedByMoi(lock);
704		lock.writeLock().unlock();
705		awaitTermination(t1);
706		awaitTermination(t2);
#	Line 691 | Line 732 | public class ReentrantReadWriteLockTest
732
733		waitForQueuedThread(lock, t1);
734		waitForQueuedThread(lock, t2);
735	<	assertWriteLockedBy(lock, Thread.currentThread());
735	>	assertWriteLockedByMoi(lock);
736		assertEquals(1, lock.getWriteHoldCount());
737		lock.writeLock().lock();
738	<	assertWriteLockedBy(lock, Thread.currentThread());
738	>	assertWriteLockedByMoi(lock);
739		assertEquals(2, lock.getWriteHoldCount());
740		lock.writeLock().unlock();
741	<	assertWriteLockedBy(lock, Thread.currentThread());
741	>	assertWriteLockedByMoi(lock);
742		assertEquals(1, lock.getWriteHoldCount());
743		lock.writeLock().unlock();
744		awaitTermination(t1);
#	Line 745 | Line 786 | public class ReentrantReadWriteLockTest
786		public void testWriteTryLock_Timeout()      { testWriteTryLock_Timeout(false); }
787		public void testWriteTryLock_Timeout_fair() { testWriteTryLock_Timeout(true); }
788		public void testWriteTryLock_Timeout(boolean fair) {
789	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
789	>	final PublicReentrantReadWriteLock lock =
790	>	new PublicReentrantReadWriteLock(fair);
791	>	final long timeoutMillis = timeoutMillis();
792		lock.writeLock().lock();
793		Thread t = newStartedThread(new CheckedRunnable() {
794		public void realRun() throws InterruptedException {
795		long startTime = System.nanoTime();
753	–	long timeoutMillis = 10;
796		assertFalse(lock.writeLock().tryLock(timeoutMillis, MILLISECONDS));
797		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
798		}});
799
800		awaitTermination(t);
801	<	assertTrue(lock.writeLock().isHeldByCurrentThread());
760	<	lock.writeLock().unlock();
801	>	releaseWriteLock(lock);
802		}
803
804		/**
#	Line 771 | Line 812 | public class ReentrantReadWriteLockTest
812		Thread t = newStartedThread(new CheckedRunnable() {
813		public void realRun() throws InterruptedException {
814		long startTime = System.nanoTime();
815	<	long timeoutMillis = 10;
815	>	long timeoutMillis = timeoutMillis();
816		assertFalse(lock.readLock().tryLock(timeoutMillis, MILLISECONDS));
817		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
818		}});
#	Line 782 | Line 823 | public class ReentrantReadWriteLockTest
823		}
824
825		/**
826	<	* write lockInterruptibly succeeds if lock free else is interruptible
826	>	* write lockInterruptibly succeeds if unlocked, else is interruptible
827		*/
828		public void testWriteLockInterruptibly()      { testWriteLockInterruptibly(false); }
829		public void testWriteLockInterruptibly_fair() { testWriteLockInterruptibly(true); }
#	Line 791 | Line 832 | public class ReentrantReadWriteLockTest
832		new PublicReentrantReadWriteLock(fair);
833		try {
834		lock.writeLock().lockInterruptibly();
835	<	} catch (Throwable t) {
795	<	threadUnexpectedException(t);
796	<	}
835	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
836		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
837		public void realRun() throws InterruptedException {
838		lock.writeLock().lockInterruptibly();
#	Line 801 | Line 840 | public class ReentrantReadWriteLockTest
840
841		waitForQueuedThread(lock, t);
842		t.interrupt();
843	+	assertTrue(lock.writeLock().isHeldByCurrentThread());
844		awaitTermination(t);
845		releaseWriteLock(lock);
846		}
#	Line 817 | Line 857 | public class ReentrantReadWriteLockTest
857		lock.readLock().lockInterruptibly();
858		lock.readLock().unlock();
859		lock.writeLock().lockInterruptibly();
860	<	} catch (Throwable t) {
821	<	threadUnexpectedException(t);
822	<	}
860	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
861		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
862		public void realRun() throws InterruptedException {
863		lock.readLock().lockInterruptibly();
#	Line 839 | Line 877 | public class ReentrantReadWriteLockTest
877		public void testAwait_IMSE(boolean fair) {
878		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
879		final Condition c = lock.writeLock().newCondition();
880	<	long startTime = System.nanoTime();
881	<	try {
844	<	try {
845	<	c.await();
846	<	shouldThrow();
847	<	} catch (IllegalMonitorStateException success) {}
848	<	try {
849	<	c.await(LONG_DELAY_MS, MILLISECONDS);
850	<	shouldThrow();
851	<	} catch (IllegalMonitorStateException success) {}
852	<	try {
853	<	c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
854	<	shouldThrow();
855	<	} catch (IllegalMonitorStateException success) {}
880	>	for (AwaitMethod awaitMethod : AwaitMethod.values()) {
881	>	long startTime = System.nanoTime();
882		try {
883	<	c.awaitUninterruptibly();
883	>	await(c, awaitMethod);
884		shouldThrow();
885	<	} catch (IllegalMonitorStateException success) {}
886	<	} catch (Throwable t) {
887	<	threadUnexpectedException(t);
885	>	} catch (IllegalMonitorStateException success) {
886	>	} catch (InterruptedException fail) {
887	>	threadUnexpectedException(fail);
888	>	}
889	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
890		}
863	–	assertTrue(millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
891		}
892
893		/**
#	Line 897 | Line 924 | public class ReentrantReadWriteLockTest
924		public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
925		public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
926		public void testAwaitNanos_Timeout(boolean fair) {
927	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
928	+	final Condition c = lock.writeLock().newCondition();
929	+	final long timeoutMillis = timeoutMillis();
930	+	lock.writeLock().lock();
931	+	final long startTime = System.nanoTime();
932	+	final long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
933		try {
901	–	final ReentrantReadWriteLock lock =
902	–	new ReentrantReadWriteLock(fair);
903	–	final Condition c = lock.writeLock().newCondition();
904	–	lock.writeLock().lock();
905	–	long startTime = System.nanoTime();
906	–	long timeoutMillis = 10;
907	–	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
934		long nanosRemaining = c.awaitNanos(timeoutNanos);
935		assertTrue(nanosRemaining <= 0);
936	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
937	<	lock.writeLock().unlock();
938	<	} catch (InterruptedException e) {
913	<	threadUnexpectedException(e);
914	<	}
936	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
937	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
938	>	lock.writeLock().unlock();
939		}
940
941		/**
#	Line 920 | Line 944 | public class ReentrantReadWriteLockTest
944		public void testAwait_Timeout()      { testAwait_Timeout(false); }
945		public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
946		public void testAwait_Timeout(boolean fair) {
947	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
948	+	final Condition c = lock.writeLock().newCondition();
949	+	final long timeoutMillis = timeoutMillis();
950	+	lock.writeLock().lock();
951	+	final long startTime = System.nanoTime();
952		try {
924	–	final ReentrantReadWriteLock lock =
925	–	new ReentrantReadWriteLock(fair);
926	–	final Condition c = lock.writeLock().newCondition();
927	–	lock.writeLock().lock();
928	–	long startTime = System.nanoTime();
929	–	long timeoutMillis = 10;
953		assertFalse(c.await(timeoutMillis, MILLISECONDS));
954	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
955	<	lock.writeLock().unlock();
956	<	} catch (InterruptedException e) {
934	<	threadUnexpectedException(e);
935	<	}
954	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
955	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
956	>	lock.writeLock().unlock();
957		}
958
959		/**
#	Line 941 | Line 962 | public class ReentrantReadWriteLockTest
962		public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
963		public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
964		public void testAwaitUntil_Timeout(boolean fair) {
965	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
966	+	final Condition c = lock.writeLock().newCondition();
967	+	lock.writeLock().lock();
968	+	// We shouldn't assume that nanoTime and currentTimeMillis
969	+	// use the same time source, so don't use nanoTime here.
970	+	final java.util.Date delayedDate = delayedDate(timeoutMillis());
971		try {
972	<	final ReentrantReadWriteLock lock =
973	<	new ReentrantReadWriteLock(fair);
974	<	final Condition c = lock.writeLock().newCondition();
975	<	lock.writeLock().lock();
949	<	long startTime = System.nanoTime();
950	<	long timeoutMillis = 10;
951	<	java.util.Date d = new java.util.Date();
952	<	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
953	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
954	<	lock.writeLock().unlock();
955	<	} catch (InterruptedException e) {
956	<	threadUnexpectedException(e);
957	<	}
972	>	assertFalse(c.awaitUntil(delayedDate));
973	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
974	>	assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
975	>	lock.writeLock().unlock();
976		}
977
978		/**
#	Line 986 | Line 1004 | public class ReentrantReadWriteLockTest
1004		}
1005
1006		/**
1007	<	* awaitUninterruptibly doesn't abort on interrupt
1007	>	* awaitUninterruptibly is uninterruptible
1008		*/
1009		public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
1010		public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
1011		public void testAwaitUninterruptibly(boolean fair) {
1012	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1013	<	final Condition c = lock.writeLock().newCondition();
1014	<	final CountDownLatch locked = new CountDownLatch(1);
1015	<	Thread t = newStartedThread(new CheckedRunnable() {
1012	>	final Lock lock = new ReentrantReadWriteLock(fair).writeLock();
1013	>	final Condition condition = lock.newCondition();
1014	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
1015	>
1016	>	Thread t1 = newStartedThread(new CheckedRunnable() {
1017		public void realRun() {
1018	<	lock.writeLock().lock();
1019	<	locked.countDown();
1020	<	c.awaitUninterruptibly();
1018	>	// Interrupt before awaitUninterruptibly
1019	>	lock.lock();
1020	>	pleaseInterrupt.countDown();
1021	>	Thread.currentThread().interrupt();
1022	>	condition.awaitUninterruptibly();
1023		assertTrue(Thread.interrupted());
1024	<	lock.writeLock().unlock();
1024	>	lock.unlock();
1025		}});
1026
1027	<	await(locked);
1028	<	lock.writeLock().lock();
1029	<	lock.writeLock().unlock();
1030	<	t.interrupt();
1031	<	long timeoutMillis = 10;
1032	<	assertThreadJoinTimesOut(t, timeoutMillis);
1033	<	lock.writeLock().lock();
1034	<	c.signal();
1035	<	lock.writeLock().unlock();
1036	<	awaitTermination(t);
1027	>	Thread t2 = newStartedThread(new CheckedRunnable() {
1028	>	public void realRun() {
1029	>	// Interrupt during awaitUninterruptibly
1030	>	lock.lock();
1031	>	pleaseInterrupt.countDown();
1032	>	condition.awaitUninterruptibly();
1033	>	assertTrue(Thread.interrupted());
1034	>	lock.unlock();
1035	>	}});
1036	>
1037	>	await(pleaseInterrupt);
1038	>	t2.interrupt();
1039	>	lock.lock();
1040	>	lock.unlock();
1041	>	assertThreadBlocks(t1, Thread.State.WAITING);
1042	>	assertThreadBlocks(t2, Thread.State.WAITING);
1043	>
1044	>	lock.lock();
1045	>	condition.signalAll();
1046	>	lock.unlock();
1047	>
1048	>	awaitTermination(t1);
1049	>	awaitTermination(t2);
1050		}
1051
1052		/**
#	Line 1020 | Line 1054 | public class ReentrantReadWriteLockTest
1054		*/
1055		public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
1056		public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
1057	+	public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
1058	+	public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
1059		public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
1060		public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
1061		public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
#	Line 1032 | Line 1068 | public class ReentrantReadWriteLockTest
1068		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1069		public void realRun() throws InterruptedException {
1070		lock.writeLock().lock();
1071	<	assertWriteLockedBy(lock, Thread.currentThread());
1071	>	assertWriteLockedByMoi(lock);
1072		assertHasNoWaiters(lock, c);
1073		locked.countDown();
1074		try {
1075		await(c, awaitMethod);
1076		} finally {
1077	<	assertWriteLockedBy(lock, Thread.currentThread());
1077	>	assertWriteLockedByMoi(lock);
1078		assertHasNoWaiters(lock, c);
1079		lock.writeLock().unlock();
1080		assertFalse(Thread.interrupted());
#	Line 1057 | Line 1093 | public class ReentrantReadWriteLockTest
1093		*/
1094		public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
1095		public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
1096	+	public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
1097	+	public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
1098		public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
1099		public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
1100		public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
#	Line 1090 | Line 1128 | public class ReentrantReadWriteLockTest
1128		}
1129
1130		/**
1131	<	* signal wakes up waiting threads in FIFO order.
1131	>	* signal wakes up waiting threads in FIFO order
1132		*/
1133		public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1134		public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
#	Line 1150 | Line 1188 | public class ReentrantReadWriteLockTest
1188		Thread t1 = newStartedThread(new CheckedRunnable() {
1189		public void realRun() throws InterruptedException {
1190		lock.writeLock().lock();
1191	<	assertWriteLockedBy(lock, Thread.currentThread());
1191	>	assertWriteLockedByMoi(lock);
1192		assertEquals(1, lock.writeLock().getHoldCount());
1193		locked.countDown();
1194		c.await();
1195	<	assertWriteLockedBy(lock, Thread.currentThread());
1195	>	assertWriteLockedByMoi(lock);
1196		assertEquals(1, lock.writeLock().getHoldCount());
1197		lock.writeLock().unlock();
1198		}});
#	Line 1163 | Line 1201 | public class ReentrantReadWriteLockTest
1201		public void realRun() throws InterruptedException {
1202		lock.writeLock().lock();
1203		lock.writeLock().lock();
1204	<	assertWriteLockedBy(lock, Thread.currentThread());
1204	>	assertWriteLockedByMoi(lock);
1205		assertEquals(2, lock.writeLock().getHoldCount());
1206		locked.countDown();
1207		c.await();
1208	<	assertWriteLockedBy(lock, Thread.currentThread());
1208	>	assertWriteLockedByMoi(lock);
1209		assertEquals(2, lock.writeLock().getHoldCount());
1210		lock.writeLock().unlock();
1211		lock.writeLock().unlock();
#	Line 1189 | Line 1227 | public class ReentrantReadWriteLockTest
1227		public void testSerialization()      { testSerialization(false); }
1228		public void testSerialization_fair() { testSerialization(true); }
1229		public void testSerialization(boolean fair) {
1230	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1230	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1231		lock.writeLock().lock();
1232		lock.readLock().lock();
1233
#	Line 1205 | Line 1243 | public class ReentrantReadWriteLockTest
1243		assertEquals(1, clone.getReadLockCount());
1244		clone.readLock().unlock();
1245		clone.writeLock().unlock();
1246	+	assertFalse(clone.isWriteLocked());
1247	+	assertEquals(1, lock.getReadLockCount());
1248	+	assertEquals(0, clone.getReadLockCount());
1249		}
1250
1251		/**
#	Line 1248 | Line 1289 | public class ReentrantReadWriteLockTest
1289		}
1290
1291		/**
1292	<	* hasQueuedThread reports whether a thread is queued.
1292	>	* hasQueuedThread reports whether a thread is queued
1293		*/
1294		public void testHasQueuedThread()      { testHasQueuedThread(false); }
1295		public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
#	Line 1588 | Line 1629 | public class ReentrantReadWriteLockTest
1629		public void testToString()      { testToString(false); }
1630		public void testToString_fair() { testToString(true); }
1631		public void testToString(boolean fair) {
1632	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1633	<	String us = lock.toString();
1634	<	assertTrue(us.indexOf("Write locks = 0") >= 0);
1635	<	assertTrue(us.indexOf("Read locks = 0") >= 0);
1636	<	lock.writeLock().lock();
1637	<	String ws = lock.toString();
1638	<	assertTrue(ws.indexOf("Write locks = 1") >= 0);
1639	<	assertTrue(ws.indexOf("Read locks = 0") >= 0);
1632	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1633	>	assertTrue(lock.toString().contains("Write locks = 0"));
1634	>	assertTrue(lock.toString().contains("Read locks = 0"));
1635	>	lock.writeLock().lock();
1636	>	assertTrue(lock.toString().contains("Write locks = 1"));
1637	>	assertTrue(lock.toString().contains("Read locks = 0"));
1638	>	lock.writeLock().lock();
1639	>	assertTrue(lock.toString().contains("Write locks = 2"));
1640	>	assertTrue(lock.toString().contains("Read locks = 0"));
1641	>	lock.writeLock().unlock();
1642		lock.writeLock().unlock();
1643		lock.readLock().lock();
1644	+	assertTrue(lock.toString().contains("Write locks = 0"));
1645	+	assertTrue(lock.toString().contains("Read locks = 1"));
1646		lock.readLock().lock();
1647	<	String rs = lock.toString();
1648	<	assertTrue(rs.indexOf("Write locks = 0") >= 0);
1604	<	assertTrue(rs.indexOf("Read locks = 2") >= 0);
1647	>	assertTrue(lock.toString().contains("Write locks = 0"));
1648	>	assertTrue(lock.toString().contains("Read locks = 2"));
1649		}
1650
1651		/**
#	Line 1610 | Line 1654 | public class ReentrantReadWriteLockTest
1654		public void testReadLockToString()      { testReadLockToString(false); }
1655		public void testReadLockToString_fair() { testReadLockToString(true); }
1656		public void testReadLockToString(boolean fair) {
1657	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1658	<	String us = lock.readLock().toString();
1615	<	assertTrue(us.indexOf("Read locks = 0") >= 0);
1657	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1658	>	assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1659		lock.readLock().lock();
1660	+	assertTrue(lock.readLock().toString().contains("Read locks = 1"));
1661		lock.readLock().lock();
1662	<	String rs = lock.readLock().toString();
1663	<	assertTrue(rs.indexOf("Read locks = 2") >= 0);
1662	>	assertTrue(lock.readLock().toString().contains("Read locks = 2"));
1663	>	lock.readLock().unlock();
1664	>	assertTrue(lock.readLock().toString().contains("Read locks = 1"));
1665	>	lock.readLock().unlock();
1666	>	assertTrue(lock.readLock().toString().contains("Read locks = 0"));
1667		}
1668
1669		/**
#	Line 1625 | Line 1672 | public class ReentrantReadWriteLockTest
1672		public void testWriteLockToString()      { testWriteLockToString(false); }
1673		public void testWriteLockToString_fair() { testWriteLockToString(true); }
1674		public void testWriteLockToString(boolean fair) {
1675	<	ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1676	<	String us = lock.writeLock().toString();
1630	<	assertTrue(us.indexOf("Unlocked") >= 0);
1675	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);
1676	>	assertTrue(lock.writeLock().toString().contains("Unlocked"));
1677		lock.writeLock().lock();
1678	<	String ls = lock.writeLock().toString();
1679	<	assertTrue(ls.indexOf("Locked") >= 0);
1678	>	assertTrue(lock.writeLock().toString().contains("Locked by"));
1679	>	lock.writeLock().unlock();
1680	>	assertTrue(lock.writeLock().toString().contains("Unlocked"));
1681		}
1682
1683		}

Diff Legend

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