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.66 by jsr166, Fri Jun 3 05:07:14 2011 UTC vs.
Revision 1.69 by jsr166, Wed Dec 31 19:05:43 2014 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
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	<	import java.util.concurrent.CountDownLatch;
20	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
21	<	import java.util.*;
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) {
#	Line 85 | Line 91 | public class ReentrantReadWriteLockTest
91		Thread.yield();
92		}
93		assertTrue(t.isAlive());
94	<	assertTrue(lock.getOwner() != t);
94	>	assertNotSame(t, lock.getOwner());
95		}
96
97		/**
#	Line 146 | Line 152 | public class ReentrantReadWriteLockTest
152		lock.writeLock().unlock();
153		}
154
155	<	enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
155	>	enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
156
157		/**
158		* Awaits condition using the specified AwaitMethod.

Diff Legend

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