ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ReentrantLockTest.java

Comparing jsr166/src/test/tck/ReentrantLockTest.java (file contents):
Revision 1.52 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.54 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.*;
10	<	import java.util.concurrent.locks.Condition;
11	<	import java.util.concurrent.locks.ReentrantLock;
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.CyclicBarrier;
16	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
17	<	import java.util.*;
16	>	import java.util.concurrent.locks.Condition;
17	>	import java.util.concurrent.locks.ReentrantLock;
18	>
19	>	import junit.framework.AssertionFailedError;
20	>	import junit.framework.Test;
21	>	import junit.framework.TestSuite;
22
23		public class ReentrantLockTest extends JSR166TestCase {
24		public static void main(String[] args) {
#	Line 137 | Line 143 | public class ReentrantLockTest extends J
143		lock.unlock();
144		}
145
146	<	enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
146	>	enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
147
148		/**
149		* Awaits condition using the specified AwaitMethod.

Diff Legend

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