ViewVC Help

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

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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.198 by jsr166, Wed Jul 27 17:16:23 2016 UTC vs.
Revision 1.200 by jsr166, Wed Aug 10 01:28:14 2016 UTC

#	Line 41 | Line 41 | import java.security.ProtectionDomain;
41		import java.security.SecurityPermission;
42		import java.util.ArrayList;
43		import java.util.Arrays;
44	+	import java.util.Collections;
45		import java.util.Date;
46		import java.util.Enumeration;
47		import java.util.Iterator;
#	Line 62 | Line 63 | import java.util.concurrent.RejectedExec
63		import java.util.concurrent.Semaphore;
64		import java.util.concurrent.SynchronousQueue;
65		import java.util.concurrent.ThreadFactory;
66	+	import java.util.concurrent.ThreadLocalRandom;
67		import java.util.concurrent.ThreadPoolExecutor;
68		import java.util.concurrent.TimeoutException;
69		import java.util.concurrent.atomic.AtomicBoolean;
#	Line 1251 | Line 1253 | public class JSR166TestCase extends Test
1253		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1254		*/
1255		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1256	<	long startTime = System.nanoTime();
1256	>	long startTime = 0L;
1257		for (;;) {
1258		Thread.State s = thread.getState();
1259		if (s == Thread.State.BLOCKED ||
#	Line 1260 | Line 1262 | public class JSR166TestCase extends Test
1262		return;
1263		else if (s == Thread.State.TERMINATED)
1264		fail("Unexpected thread termination");
1265	+	else if (startTime == 0L)
1266	+	startTime = System.nanoTime();
1267		else if (millisElapsedSince(startTime) > timeoutMillis) {
1268		threadAssertTrue(thread.isAlive());
1269		return;
#	Line 1873 | Line 1877 | public class JSR166TestCase extends Test
1877		1000L, MILLISECONDS,
1878		new SynchronousQueue<Runnable>());
1879
1880	+	static <T> void shuffle(T[] array) {
1881	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1882	+	}
1883		}

Diff Legend

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