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.143 by jsr166, Sun Sep 13 16:28:14 2015 UTC vs.
Revision 1.205 by jsr166, Mon Oct 17 17:52:30 2016 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	+	/*
10	+	* @test
11	+	* @summary JSR-166 tck tests
12	+	* @modules java.management
13	+	* @build *
14	+	* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
15	+	* @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -Djsr166.testImplementationDetails=true JSR166TestCase
16	+	* @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -Djava.util.secureRandomSeed=true JSR166TestCase
17	+	*/
18	+
19		import static java.util.concurrent.TimeUnit.MILLISECONDS;
20	+	import static java.util.concurrent.TimeUnit.MINUTES;
21		import static java.util.concurrent.TimeUnit.NANOSECONDS;
22
23		import java.io.ByteArrayInputStream;
#	Line 15 | Line 26 | import java.io.ObjectInputStream;
26		import java.io.ObjectOutputStream;
27		import java.lang.management.ManagementFactory;
28		import java.lang.management.ThreadInfo;
29	+	import java.lang.management.ThreadMXBean;
30		import java.lang.reflect.Constructor;
31		import java.lang.reflect.Method;
32		import java.lang.reflect.Modifier;
33	+	import java.nio.file.Files;
34	+	import java.nio.file.Paths;
35		import java.security.CodeSource;
36		import java.security.Permission;
37		import java.security.PermissionCollection;
#	Line 27 | 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 40 | Line 55 | import java.util.concurrent.CyclicBarrie
55		import java.util.concurrent.ExecutionException;
56		import java.util.concurrent.Executors;
57		import java.util.concurrent.ExecutorService;
58	+	import java.util.concurrent.ForkJoinPool;
59		import java.util.concurrent.Future;
60		import java.util.concurrent.RecursiveAction;
61		import java.util.concurrent.RecursiveTask;
62		import java.util.concurrent.RejectedExecutionHandler;
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;
70		import java.util.concurrent.atomic.AtomicReference;
71	+	import java.util.regex.Matcher;
72		import java.util.regex.Pattern;
73
74		import junit.framework.AssertionFailedError;
#	Line 106 | Line 126 | import junit.framework.TestSuite;
126		* methods as there are exceptions the method can throw. Sometimes
127		* there are multiple tests per JSR166 method when the different
128		* "normal" behaviors differ significantly. And sometimes testcases
129	<	* cover multiple methods when they cannot be tested in
110	<	* isolation.
129	>	* cover multiple methods when they cannot be tested in isolation.
130		*
131		* <li>The documentation style for testcases is to provide as javadoc
132		* a simple sentence or two describing the property that the testcase
#	Line 170 | Line 189 | public class JSR166TestCase extends Test
189		private static final int suiteRuns =
190		Integer.getInteger("jsr166.suiteRuns", 1);
191
192	+	/**
193	+	* Returns the value of the system property, or NaN if not defined.
194	+	*/
195	+	private static float systemPropertyValue(String name) {
196	+	String floatString = System.getProperty(name);
197	+	if (floatString == null)
198	+	return Float.NaN;
199	+	try {
200	+	return Float.parseFloat(floatString);
201	+	} catch (NumberFormatException ex) {
202	+	throw new IllegalArgumentException(
203	+	String.format("Bad float value in system property %s=%s",
204	+	name, floatString));
205	+	}
206	+	}
207	+
208	+	/**
209	+	* The scaling factor to apply to standard delays used in tests.
210	+	* May be initialized from any of:
211	+	* - the "jsr166.delay.factor" system property
212	+	* - the "test.timeout.factor" system property (as used by jtreg)
213	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
214	+	* - hard-coded fuzz factor when using a known slowpoke VM
215	+	*/
216	+	private static final float delayFactor = delayFactor();
217	+
218	+	private static float delayFactor() {
219	+	float x;
220	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
221	+	return x;
222	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
223	+	return x;
224	+	String prop = System.getProperty("java.vm.version");
225	+	if (prop != null && prop.matches(".*debug.*"))
226	+	return 4.0f; // How much slower is fastdebug than product?!
227	+	return 1.0f;
228	+	}
229	+
230		public JSR166TestCase() { super(); }
231		public JSR166TestCase(String name) { super(name); }
232
#	Line 185 | Line 242 | public class JSR166TestCase extends Test
242		return (regex == null) ? null : Pattern.compile(regex);
243		}
244
245	<	protected void runTest() throws Throwable {
245	>	// Instrumentation to debug very rare, but very annoying hung test runs.
246	>	static volatile TestCase currentTestCase;
247	>	// static volatile int currentRun = 0;
248	>	static {
249	>	Runnable checkForWedgedTest = new Runnable() { public void run() {
250	>	// Avoid spurious reports with enormous runsPerTest.
251	>	// A single test case run should never take more than 1 second.
252	>	// But let's cap it at the high end too ...
253	>	final int timeoutMinutes =
254	>	Math.min(15, Math.max(runsPerTest / 60, 1));
255	>	for (TestCase lastTestCase = currentTestCase;;) {
256	>	try { MINUTES.sleep(timeoutMinutes); }
257	>	catch (InterruptedException unexpected) { break; }
258	>	if (lastTestCase == currentTestCase) {
259	>	System.err.printf(
260	>	"Looks like we're stuck running test: %s%n",
261	>	lastTestCase);
262	>	//                     System.err.printf(
263	>	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
264	>	//                         lastTestCase, currentRun, runsPerTest);
265	>	//                     System.err.println("availableProcessors=" +
266	>	//                         Runtime.getRuntime().availableProcessors());
267	>	//                     System.err.printf("cpu model = %s%n", cpuModel());
268	>	dumpTestThreads();
269	>	// one stack dump is probably enough; more would be spam
270	>	break;
271	>	}
272	>	lastTestCase = currentTestCase;
273	>	}}};
274	>	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
275	>	thread.setDaemon(true);
276	>	thread.start();
277	>	}
278	>
279	>	//     public static String cpuModel() {
280	>	//         try {
281	>	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
282	>	//                 .matcher(new String(
283	>	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
284	>	//             matcher.find();
285	>	//             return matcher.group(1);
286	>	//         } catch (Exception ex) { return null; }
287	>	//     }
288	>
289	>	public void runBare() throws Throwable {
290	>	currentTestCase = this;
291		if (methodFilter == null
292	<	|| methodFilter.matcher(toString()).find()) {
293	<	for (int i = 0; i < runsPerTest; i++) {
294	<	if (profileTests)
295	<	runTestProfiled();
296	<	else
297	<	super.runTest();
298	<	}
292	>	|| methodFilter.matcher(toString()).find())
293	>	super.runBare();
294	>	}
295	>
296	>	protected void runTest() throws Throwable {
297	>	for (int i = 0; i < runsPerTest; i++) {
298	>	// currentRun = i;
299	>	if (profileTests)
300	>	runTestProfiled();
301	>	else
302	>	super.runTest();
303		}
304		}
305
306		protected void runTestProfiled() throws Throwable {
307	<	// Warmup run, notably to trigger all needed classloading.
308	<	super.runTest();
203	<	long t0 = System.nanoTime();
204	<	try {
307	>	for (int i = 0; i < 2; i++) {
308	>	long startTime = System.nanoTime();
309		super.runTest();
310	<	} finally {
311	<	long elapsedMillis = millisElapsedSince(t0);
312	<	if (elapsedMillis >= profileThreshold)
310	>	long elapsedMillis = millisElapsedSince(startTime);
311	>	if (elapsedMillis < profileThreshold)
312	>	break;
313	>	// Never report first run of any test; treat it as a
314	>	// warmup run, notably to trigger all needed classloading,
315	>	if (i > 0)
316		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
317		}
318		}
#	Line 217 | Line 324 | public class JSR166TestCase extends Test
324		main(suite(), args);
325		}
326
327	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
328	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
329	+	long runTime;
330	+	public void startTest(Test test) {}
331	+	protected void printHeader(long runTime) {
332	+	this.runTime = runTime; // defer printing for later
333	+	}
334	+	protected void printFooter(TestResult result) {
335	+	if (result.wasSuccessful()) {
336	+	getWriter().println("OK (" + result.runCount() + " tests)"
337	+	+ "  Time: " + elapsedTimeAsString(runTime));
338	+	} else {
339	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
340	+	super.printFooter(result);
341	+	}
342	+	}
343	+	}
344	+
345	+	/**
346	+	* Returns a TestRunner that doesn't bother with unnecessary
347	+	* fluff, like printing a "." for each test case.
348	+	*/
349	+	static junit.textui.TestRunner newPithyTestRunner() {
350	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
351	+	runner.setPrinter(new PithyResultPrinter(System.out));
352	+	return runner;
353	+	}
354	+
355		/**
356		* Runs all unit tests in the given test suite.
357		* Actual behavior influenced by jsr166.* system properties.
#	Line 228 | Line 363 | public class JSR166TestCase extends Test
363		System.setSecurityManager(new SecurityManager());
364		}
365		for (int i = 0; i < suiteRuns; i++) {
366	<	TestResult result = junit.textui.TestRunner.run(suite);
366	>	TestResult result = newPithyTestRunner().doRun(suite);
367		if (!result.wasSuccessful())
368		System.exit(1);
369		System.gc();
#	Line 312 | Line 447 | public class JSR166TestCase extends Test
447		AbstractQueuedLongSynchronizerTest.suite(),
448		ArrayBlockingQueueTest.suite(),
449		ArrayDequeTest.suite(),
450	+	ArrayListTest.suite(),
451		AtomicBooleanTest.suite(),
452		AtomicIntegerArrayTest.suite(),
453		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 334 | Line 470 | public class JSR166TestCase extends Test
470		CopyOnWriteArrayListTest.suite(),
471		CopyOnWriteArraySetTest.suite(),
472		CountDownLatchTest.suite(),
473	+	CountedCompleterTest.suite(),
474		CyclicBarrierTest.suite(),
475		DelayQueueTest.suite(),
476		EntryTest.suite(),
#	Line 370 | Line 507 | public class JSR166TestCase extends Test
507		"Atomic8Test",
508		"CompletableFutureTest",
509		"ConcurrentHashMap8Test",
510	<	"CountedCompleterTest",
510	>	"CountedCompleter8Test",
511		"DoubleAccumulatorTest",
512		"DoubleAdderTest",
513		"ForkJoinPool8Test",
#	Line 381 | Line 518 | public class JSR166TestCase extends Test
518		"StampedLockTest",
519		"SubmissionPublisherTest",
520		"ThreadLocalRandom8Test",
521	+	"TimeUnit8Test",
522		};
523		addNamedTestClasses(suite, java8TestClassNames);
524		}
#	Line 388 | Line 526 | public class JSR166TestCase extends Test
526		// Java9+ test classes
527		if (atLeastJava9()) {
528		String[] java9TestClassNames = {
529	<	// Currently empty, but expecting varhandle tests
529	>	"AtomicBoolean9Test",
530	>	"AtomicInteger9Test",
531	>	"AtomicIntegerArray9Test",
532	>	"AtomicLong9Test",
533	>	"AtomicLongArray9Test",
534	>	"AtomicReference9Test",
535	>	"AtomicReferenceArray9Test",
536	>	"ExecutorCompletionService9Test",
537		};
538		addNamedTestClasses(suite, java9TestClassNames);
539		}
#	Line 455 | Line 600 | public class JSR166TestCase extends Test
600		} else {
601		return new TestSuite();
602		}
458	–
603		}
604
605		// Delays for timing-dependent tests, in milliseconds.
#	Line 466 | Line 610 | public class JSR166TestCase extends Test
610		public static long LONG_DELAY_MS;
611
612		/**
613	<	* Returns the shortest timed delay. This could
614	<	* be reimplemented to use for example a Property.
613	>	* Returns the shortest timed delay. This can be scaled up for
614	>	* slow machines using the jsr166.delay.factor system property,
615	>	* or via jtreg's -timeoutFactor: flag.
616	>	* http://openjdk.java.net/jtreg/command-help.html
617		*/
618		protected long getShortDelay() {
619	<	return 50;
619	>	return (long) (50 * delayFactor);
620		}
621
622		/**
#	Line 513 | Line 659 | public class JSR166TestCase extends Test
659		* the same test have no effect.
660		*/
661		public void threadRecordFailure(Throwable t) {
662	+	System.err.println(t);
663	+	dumpTestThreads();
664		threadFailure.compareAndSet(null, t);
665		}
666
#	Line 520 | Line 668 | public class JSR166TestCase extends Test
668		setDelays();
669		}
670
671	+	void tearDownFail(String format, Object... args) {
672	+	String msg = toString() + ": " + String.format(format, args);
673	+	System.err.println(msg);
674	+	dumpTestThreads();
675	+	throw new AssertionFailedError(msg);
676	+	}
677	+
678		/**
679		* Extra checks that get done for all test cases.
680		*
#	Line 547 | Line 702 | public class JSR166TestCase extends Test
702		}
703
704		if (Thread.interrupted())
705	<	throw new AssertionFailedError("interrupt status set in main thread");
705	>	tearDownFail("interrupt status set in main thread");
706
707		checkForkJoinPoolThreadLeaks();
708		}
709
710		/**
711	<	* Finds missing try { ... } finally { joinPool(e); }
711	>	* Finds missing PoolCleaners
712		*/
713		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
714	<	Thread[] survivors = new Thread[5];
714	>	Thread[] survivors = new Thread[7];
715		int count = Thread.enumerate(survivors);
716		for (int i = 0; i < count; i++) {
717		Thread thread = survivors[i];
#	Line 564 | Line 719 | public class JSR166TestCase extends Test
719		if (name.startsWith("ForkJoinPool-")) {
720		// give thread some time to terminate
721		thread.join(LONG_DELAY_MS);
722	<	if (!thread.isAlive()) continue;
723	<	throw new AssertionFailedError
724	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
570	<	toString(), name));
722	>	if (thread.isAlive())
723	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
724	>	thread);
725		}
726		}
727	+
728	+	if (!ForkJoinPool.commonPool()
729	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
730	+	tearDownFail("ForkJoin common pool thread stuck");
731		}
732
733		/**
#	Line 582 | Line 740 | public class JSR166TestCase extends Test
740		fail(reason);
741		} catch (AssertionFailedError t) {
742		threadRecordFailure(t);
743	<	fail(reason);
743	>	throw t;
744		}
745		}
746
#	Line 709 | Line 867 | public class JSR166TestCase extends Test
867		/**
868		* Delays, via Thread.sleep, for the given millisecond delay, but
869		* if the sleep is shorter than specified, may re-sleep or yield
870	<	* until time elapses.
870	>	* until time elapses.  Ensures that the given time, as measured
871	>	* by System.nanoTime(), has elapsed.
872		*/
873		static void delay(long millis) throws InterruptedException {
874	<	long startTime = System.nanoTime();
875	<	long ns = millis * 1000 * 1000;
876	<	for (;;) {
874	>	long nanos = millis * (1000 * 1000);
875	>	final long wakeupTime = System.nanoTime() + nanos;
876	>	do {
877		if (millis > 0L)
878		Thread.sleep(millis);
879		else // too short to sleep
880		Thread.yield();
881	<	long d = ns - (System.nanoTime() - startTime);
882	<	if (d > 0L)
883	<	millis = d / (1000 * 1000);
884	<	else
885	<	break;
881	>	nanos = wakeupTime - System.nanoTime();
882	>	millis = nanos / (1000 * 1000);
883	>	} while (nanos >= 0L);
884	>	}
885	>
886	>	/**
887	>	* Allows use of try-with-resources with per-test thread pools.
888	>	*/
889	>	class PoolCleaner implements AutoCloseable {
890	>	private final ExecutorService pool;
891	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
892	>	public void close() { joinPool(pool); }
893	>	}
894	>
895	>	/**
896	>	* An extension of PoolCleaner that has an action to release the pool.
897	>	*/
898	>	class PoolCleanerWithReleaser extends PoolCleaner {
899	>	private final Runnable releaser;
900	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
901	>	super(pool);
902	>	this.releaser = releaser;
903		}
904	+	public void close() {
905	+	try {
906	+	releaser.run();
907	+	} finally {
908	+	super.close();
909	+	}
910	+	}
911	+	}
912	+
913	+	PoolCleaner cleaner(ExecutorService pool) {
914	+	return new PoolCleaner(pool);
915	+	}
916	+
917	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
918	+	return new PoolCleanerWithReleaser(pool, releaser);
919	+	}
920	+
921	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
922	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
923	+	}
924	+
925	+	Runnable releaser(final CountDownLatch latch) {
926	+	return new Runnable() { public void run() {
927	+	do { latch.countDown(); }
928	+	while (latch.getCount() > 0);
929	+	}};
930	+	}
931	+
932	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
933	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
934	+	}
935	+
936	+	Runnable releaser(final AtomicBoolean flag) {
937	+	return new Runnable() { public void run() { flag.set(true); }};
938		}
939
940		/**
#	Line 733 | Line 943 | public class JSR166TestCase extends Test
943		void joinPool(ExecutorService pool) {
944		try {
945		pool.shutdown();
946	<	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
947	<	fail("ExecutorService " + pool +
948	<	" did not terminate in a timely manner");
946	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
947	>	try {
948	>	threadFail("ExecutorService " + pool +
949	>	" did not terminate in a timely manner");
950	>	} finally {
951	>	// last resort, for the benefit of subsequent tests
952	>	pool.shutdownNow();
953	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
954	>	}
955	>	}
956		} catch (SecurityException ok) {
957		// Allowed in case test doesn't have privs
958		} catch (InterruptedException fail) {
959	<	fail("Unexpected InterruptedException");
959	>	threadFail("Unexpected InterruptedException");
960		}
961		}
962
963	<	/** Like Runnable, but with the freedom to throw anything */
963	>	/**
964	>	* Like Runnable, but with the freedom to throw anything.
965	>	* junit folks had the same idea:
966	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
967	>	*/
968		interface Action { public void run() throws Throwable; }
969
970		/**
#	Line 753 | Line 974 | public class JSR166TestCase extends Test
974		*/
975		void testInParallel(Action ... actions) {
976		ExecutorService pool = Executors.newCachedThreadPool();
977	<	try {
977	>	try (PoolCleaner cleaner = cleaner(pool)) {
978		ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
979		for (final Action action : actions)
980		futures.add(pool.submit(new CheckedRunnable() {
#	Line 766 | Line 987 | public class JSR166TestCase extends Test
987		} catch (Exception ex) {
988		threadUnexpectedException(ex);
989		}
769	–	} finally {
770	–	joinPool(pool);
990		}
991		}
992
993		/**
994	<	* A debugging tool to print all stack traces, as jstack does.
994	>	* A debugging tool to print stack traces of most threads, as jstack does.
995	>	* Uninteresting threads are filtered out.
996		*/
997	<	static void printAllStackTraces() {
998	<	for (ThreadInfo info :
999	<	ManagementFactory.getThreadMXBean()
1000	<	.dumpAllThreads(true, true))
997	>	static void dumpTestThreads() {
998	>	SecurityManager sm = System.getSecurityManager();
999	>	if (sm != null) {
1000	>	try {
1001	>	System.setSecurityManager(null);
1002	>	} catch (SecurityException giveUp) {
1003	>	return;
1004	>	}
1005	>	}
1006	>
1007	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1008	>	System.err.println("------ stacktrace dump start ------");
1009	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1010	>	final String name = info.getThreadName();
1011	>	String lockName;
1012	>	if ("Signal Dispatcher".equals(name))
1013	>	continue;
1014	>	if ("Reference Handler".equals(name)
1015	>	&& (lockName = info.getLockName()) != null
1016	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1017	>	continue;
1018	>	if ("Finalizer".equals(name)
1019	>	&& (lockName = info.getLockName()) != null
1020	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1021	>	continue;
1022	>	if ("checkForWedgedTest".equals(name))
1023	>	continue;
1024		System.err.print(info);
1025	+	}
1026	+	System.err.println("------ stacktrace dump end ------");
1027	+
1028	+	if (sm != null) System.setSecurityManager(sm);
1029		}
1030
1031		/**
#	Line 798 | Line 1045 | public class JSR166TestCase extends Test
1045		delay(millis);
1046		assertTrue(thread.isAlive());
1047		} catch (InterruptedException fail) {
1048	<	fail("Unexpected InterruptedException");
1048	>	threadFail("Unexpected InterruptedException");
1049		}
1050		}
1051
#	Line 820 | Line 1067 | public class JSR166TestCase extends Test
1067		for (Thread thread : threads)
1068		assertTrue(thread.isAlive());
1069		} catch (InterruptedException fail) {
1070	<	fail("Unexpected InterruptedException");
1070	>	threadFail("Unexpected InterruptedException");
1071		}
1072		}
1073
#	Line 995 | Line 1242 | public class JSR166TestCase extends Test
1242		* Sleeps until the given time has elapsed.
1243		* Throws AssertionFailedError if interrupted.
1244		*/
1245	<	void sleep(long millis) {
1245	>	static void sleep(long millis) {
1246		try {
1247		delay(millis);
1248		} catch (InterruptedException fail) {
#	Line 1011 | Line 1258 | public class JSR166TestCase extends Test
1258		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1259		*/
1260		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1261	<	long startTime = System.nanoTime();
1261	>	long startTime = 0L;
1262		for (;;) {
1263		Thread.State s = thread.getState();
1264		if (s == Thread.State.BLOCKED ||
#	Line 1020 | Line 1267 | public class JSR166TestCase extends Test
1267		return;
1268		else if (s == Thread.State.TERMINATED)
1269		fail("Unexpected thread termination");
1270	+	else if (startTime == 0L)
1271	+	startTime = System.nanoTime();
1272		else if (millisElapsedSince(startTime) > timeoutMillis) {
1273		threadAssertTrue(thread.isAlive());
1274		return;
#	Line 1098 | Line 1347 | public class JSR166TestCase extends Test
1347		} finally {
1348		if (t.getState() != Thread.State.TERMINATED) {
1349		t.interrupt();
1350	<	fail("Test timed out");
1350	>	threadFail("timed out waiting for thread to terminate");
1351		}
1352		}
1353		}
#	Line 1223 | Line 1472 | public class JSR166TestCase extends Test
1472		public static final String TEST_STRING = "a test string";
1473
1474		public static class StringTask implements Callable<String> {
1475	<	public String call() { return TEST_STRING; }
1475	>	final String value;
1476	>	public StringTask() { this(TEST_STRING); }
1477	>	public StringTask(String value) { this.value = value; }
1478	>	public String call() { return value; }
1479		}
1480
1481		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1236 | Line 1488 | public class JSR166TestCase extends Test
1488		}};
1489		}
1490
1491	<	public Runnable awaiter(final CountDownLatch latch) {
1491	>	public Runnable countDowner(final CountDownLatch latch) {
1492		return new CheckedRunnable() {
1493		public void realRun() throws InterruptedException {
1494	<	await(latch);
1494	>	latch.countDown();
1495		}};
1496		}
1497
1498	<	public void await(CountDownLatch latch) {
1498	>	class LatchAwaiter extends CheckedRunnable {
1499	>	static final int NEW = 0;
1500	>	static final int RUNNING = 1;
1501	>	static final int DONE = 2;
1502	>	final CountDownLatch latch;
1503	>	int state = NEW;
1504	>	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1505	>	public void realRun() throws InterruptedException {
1506	>	state = 1;
1507	>	await(latch);
1508	>	state = 2;
1509	>	}
1510	>	}
1511	>
1512	>	public LatchAwaiter awaiter(CountDownLatch latch) {
1513	>	return new LatchAwaiter(latch);
1514	>	}
1515	>
1516	>	public void await(CountDownLatch latch, long timeoutMillis) {
1517		try {
1518	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1518	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1519	>	fail("timed out waiting for CountDownLatch for "
1520	>	+ (timeoutMillis/1000) + " sec");
1521		} catch (Throwable fail) {
1522		threadUnexpectedException(fail);
1523		}
1524		}
1525
1526	+	public void await(CountDownLatch latch) {
1527	+	await(latch, LONG_DELAY_MS);
1528	+	}
1529	+
1530		public void await(Semaphore semaphore) {
1531		try {
1532	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1532	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1533	>	fail("timed out waiting for Semaphore for "
1534	>	+ (LONG_DELAY_MS/1000) + " sec");
1535		} catch (Throwable fail) {
1536		threadUnexpectedException(fail);
1537		}
#	Line 1483 | Line 1761 | public class JSR166TestCase extends Test
1761		* A CyclicBarrier that uses timed await and fails with
1762		* AssertionFailedErrors instead of throwing checked exceptions.
1763		*/
1764	<	public class CheckedBarrier extends CyclicBarrier {
1764	>	public static class CheckedBarrier extends CyclicBarrier {
1765		public CheckedBarrier(int parties) { super(parties); }
1766
1767		public int await() {
#	Line 1589 | Line 1867 | public class JSR166TestCase extends Test
1867		} catch (NoSuchElementException success) {}
1868		assertFalse(it.hasNext());
1869		}
1870	+
1871	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1872	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1873	+	}
1874	+
1875	+	public Runnable runnableThrowing(final RuntimeException ex) {
1876	+	return new Runnable() { public void run() { throw ex; }};
1877	+	}
1878	+
1879	+	/** A reusable thread pool to be shared by tests. */
1880	+	static final ExecutorService cachedThreadPool =
1881	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1882	+	1000L, MILLISECONDS,
1883	+	new SynchronousQueue<Runnable>());
1884	+
1885	+	static <T> void shuffle(T[] array) {
1886	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1887	+	}
1888		}

Diff Legend

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