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.161 by jsr166, Sun Oct 4 03:49:33 2015 UTC vs.
Revision 1.221 by jsr166, Tue Mar 14 00:54:27 2017 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by Doug Lea with assistance from members of JCP JSR-166
3	<	* Expert Group and released to the public domain, as explained at
2	>	* Written by Doug Lea and Martin Buchholz with assistance from
3	>	* members of JCP JSR-166 Expert Group and released to the public
4	>	* domain, as explained at
5		* http://creativecommons.org/publicdomain/zero/1.0/
6		* Other contributors include Andrew Wright, Jeffrey Hayes,
7		* Pat Fisher, Mike Judd.
8		*/
9
10	+	/*
11	+	* @test
12	+	* @summary JSR-166 tck tests, in a number of variations.
13	+	*          The first is the conformance testing variant,
14	+	*          while others also test implementation details.
15	+	* @build *
16	+	* @modules java.management
17	+	* @run junit/othervm/timeout=1000 JSR166TestCase
18	+	* @run junit/othervm/timeout=1000
19	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
21	+	*      -Djsr166.testImplementationDetails=true
22	+	*      JSR166TestCase
23	+	* @run junit/othervm/timeout=1000
24	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
26	+	*      -Djsr166.testImplementationDetails=true
27	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28	+	*      JSR166TestCase
29	+	* @run junit/othervm/timeout=1000
30	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
32	+	*      -Djsr166.testImplementationDetails=true
33	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34	+	*      -Djava.util.secureRandomSeed=true
35	+	*      JSR166TestCase
36	+	* @run junit/othervm/timeout=1000/policy=tck.policy
37	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
39	+	*      -Djsr166.testImplementationDetails=true
40	+	*      JSR166TestCase
41	+	*/
42	+
43		import static java.util.concurrent.TimeUnit.MILLISECONDS;
44		import static java.util.concurrent.TimeUnit.MINUTES;
45		import static java.util.concurrent.TimeUnit.NANOSECONDS;
#	Line 29 | Line 63 | import java.security.ProtectionDomain;
63		import java.security.SecurityPermission;
64		import java.util.ArrayList;
65		import java.util.Arrays;
66	+	import java.util.Collection;
67	+	import java.util.Collections;
68		import java.util.Date;
69		import java.util.Enumeration;
70		import java.util.Iterator;
#	Line 48 | Line 84 | import java.util.concurrent.RecursiveAct
84		import java.util.concurrent.RecursiveTask;
85		import java.util.concurrent.RejectedExecutionHandler;
86		import java.util.concurrent.Semaphore;
87	+	import java.util.concurrent.SynchronousQueue;
88		import java.util.concurrent.ThreadFactory;
89	+	import java.util.concurrent.ThreadLocalRandom;
90		import java.util.concurrent.ThreadPoolExecutor;
91		import java.util.concurrent.TimeoutException;
92	+	import java.util.concurrent.atomic.AtomicBoolean;
93		import java.util.concurrent.atomic.AtomicReference;
94		import java.util.regex.Pattern;
95
#	Line 109 | Line 148 | import junit.framework.TestSuite;
148		* methods as there are exceptions the method can throw. Sometimes
149		* there are multiple tests per JSR166 method when the different
150		* "normal" behaviors differ significantly. And sometimes testcases
151	<	* cover multiple methods when they cannot be tested in
113	<	* isolation.
151	>	* cover multiple methods when they cannot be tested in isolation.
152		*
153		* <li>The documentation style for testcases is to provide as javadoc
154		* a simple sentence or two describing the property that the testcase
#	Line 173 | Line 211 | public class JSR166TestCase extends Test
211		private static final int suiteRuns =
212		Integer.getInteger("jsr166.suiteRuns", 1);
213
214	+	/**
215	+	* Returns the value of the system property, or NaN if not defined.
216	+	*/
217	+	private static float systemPropertyValue(String name) {
218	+	String floatString = System.getProperty(name);
219	+	if (floatString == null)
220	+	return Float.NaN;
221	+	try {
222	+	return Float.parseFloat(floatString);
223	+	} catch (NumberFormatException ex) {
224	+	throw new IllegalArgumentException(
225	+	String.format("Bad float value in system property %s=%s",
226	+	name, floatString));
227	+	}
228	+	}
229	+
230	+	/**
231	+	* The scaling factor to apply to standard delays used in tests.
232	+	* May be initialized from any of:
233	+	* - the "jsr166.delay.factor" system property
234	+	* - the "test.timeout.factor" system property (as used by jtreg)
235	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
236	+	* - hard-coded fuzz factor when using a known slowpoke VM
237	+	*/
238	+	private static final float delayFactor = delayFactor();
239	+
240	+	private static float delayFactor() {
241	+	float x;
242	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
243	+	return x;
244	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
245	+	return x;
246	+	String prop = System.getProperty("java.vm.version");
247	+	if (prop != null && prop.matches(".*debug.*"))
248	+	return 4.0f; // How much slower is fastdebug than product?!
249	+	return 1.0f;
250	+	}
251	+
252		public JSR166TestCase() { super(); }
253		public JSR166TestCase(String name) { super(name); }
254
#	Line 188 | Line 264 | public class JSR166TestCase extends Test
264		return (regex == null) ? null : Pattern.compile(regex);
265		}
266
267	+	// Instrumentation to debug very rare, but very annoying hung test runs.
268		static volatile TestCase currentTestCase;
269	+	// static volatile int currentRun = 0;
270		static {
271		Runnable checkForWedgedTest = new Runnable() { public void run() {
272	<	// avoid spurious reports with enormous runsPerTest
273	<	final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
272	>	// Avoid spurious reports with enormous runsPerTest.
273	>	// A single test case run should never take more than 1 second.
274	>	// But let's cap it at the high end too ...
275	>	final int timeoutMinutes =
276	>	Math.min(15, Math.max(runsPerTest / 60, 1));
277		for (TestCase lastTestCase = currentTestCase;;) {
278		try { MINUTES.sleep(timeoutMinutes); }
279		catch (InterruptedException unexpected) { break; }
280		if (lastTestCase == currentTestCase) {
281	<	System.err.println
282	<	("Looks like we're stuck running test: "
283	<	+ lastTestCase);
281	>	System.err.printf(
282	>	"Looks like we're stuck running test: %s%n",
283	>	lastTestCase);
284	>	//                     System.err.printf(
285	>	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
286	>	//                         lastTestCase, currentRun, runsPerTest);
287	>	//                     System.err.println("availableProcessors=" +
288	>	//                         Runtime.getRuntime().availableProcessors());
289	>	//                     System.err.printf("cpu model = %s%n", cpuModel());
290		dumpTestThreads();
291	+	// one stack dump is probably enough; more would be spam
292	+	break;
293		}
294		lastTestCase = currentTestCase;
295		}}};
#	Line 209 | Line 298 | public class JSR166TestCase extends Test
298		thread.start();
299		}
300
301	+	//     public static String cpuModel() {
302	+	//         try {
303	+	//             java.util.regex.Matcher matcher
304	+	//               = Pattern.compile("model name\\s*: (.*)")
305	+	//                 .matcher(new String(
306	+	//                     java.nio.file.Files.readAllBytes(
307	+	//                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
308	+	//             matcher.find();
309	+	//             return matcher.group(1);
310	+	//         } catch (Exception ex) { return null; }
311	+	//     }
312	+
313		public void runBare() throws Throwable {
314		currentTestCase = this;
315		if (methodFilter == null
#	Line 218 | Line 319 | public class JSR166TestCase extends Test
319
320		protected void runTest() throws Throwable {
321		for (int i = 0; i < runsPerTest; i++) {
322	+	// currentRun = i;
323		if (profileTests)
324		runTestProfiled();
325		else
#	Line 246 | Line 348 | public class JSR166TestCase extends Test
348		main(suite(), args);
349		}
350
351	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
352	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
353	+	long runTime;
354	+	public void startTest(Test test) {}
355	+	protected void printHeader(long runTime) {
356	+	this.runTime = runTime; // defer printing for later
357	+	}
358	+	protected void printFooter(TestResult result) {
359	+	if (result.wasSuccessful()) {
360	+	getWriter().println("OK (" + result.runCount() + " tests)"
361	+	+ "  Time: " + elapsedTimeAsString(runTime));
362	+	} else {
363	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
364	+	super.printFooter(result);
365	+	}
366	+	}
367	+	}
368	+
369	+	/**
370	+	* Returns a TestRunner that doesn't bother with unnecessary
371	+	* fluff, like printing a "." for each test case.
372	+	*/
373	+	static junit.textui.TestRunner newPithyTestRunner() {
374	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
375	+	runner.setPrinter(new PithyResultPrinter(System.out));
376	+	return runner;
377	+	}
378	+
379		/**
380		* Runs all unit tests in the given test suite.
381		* Actual behavior influenced by jsr166.* system properties.
#	Line 257 | Line 387 | public class JSR166TestCase extends Test
387		System.setSecurityManager(new SecurityManager());
388		}
389		for (int i = 0; i < suiteRuns; i++) {
390	<	TestResult result = junit.textui.TestRunner.run(suite);
390	>	TestResult result = newPithyTestRunner().doRun(suite);
391		if (!result.wasSuccessful())
392		System.exit(1);
393		System.gc();
#	Line 341 | Line 471 | public class JSR166TestCase extends Test
471		AbstractQueuedLongSynchronizerTest.suite(),
472		ArrayBlockingQueueTest.suite(),
473		ArrayDequeTest.suite(),
474	+	ArrayListTest.suite(),
475		AtomicBooleanTest.suite(),
476		AtomicIntegerArrayTest.suite(),
477		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 363 | Line 494 | public class JSR166TestCase extends Test
494		CopyOnWriteArrayListTest.suite(),
495		CopyOnWriteArraySetTest.suite(),
496		CountDownLatchTest.suite(),
497	+	CountedCompleterTest.suite(),
498		CyclicBarrierTest.suite(),
499		DelayQueueTest.suite(),
500		EntryTest.suite(),
#	Line 391 | Line 523 | public class JSR166TestCase extends Test
523		TreeMapTest.suite(),
524		TreeSetTest.suite(),
525		TreeSubMapTest.suite(),
526	<	TreeSubSetTest.suite());
526	>	TreeSubSetTest.suite(),
527	>	VectorTest.suite());
528
529		// Java8+ test classes
530		if (atLeastJava8()) {
531		String[] java8TestClassNames = {
532	+	"ArrayDeque8Test",
533		"Atomic8Test",
534		"CompletableFutureTest",
535		"ConcurrentHashMap8Test",
536	<	"CountedCompleterTest",
536	>	"CountedCompleter8Test",
537		"DoubleAccumulatorTest",
538		"DoubleAdderTest",
539		"ForkJoinPool8Test",
540		"ForkJoinTask8Test",
541	+	"LinkedBlockingDeque8Test",
542	+	"LinkedBlockingQueue8Test",
543		"LongAccumulatorTest",
544		"LongAdderTest",
545		"SplittableRandomTest",
546		"StampedLockTest",
547		"SubmissionPublisherTest",
548		"ThreadLocalRandom8Test",
549	+	"TimeUnit8Test",
550		};
551		addNamedTestClasses(suite, java8TestClassNames);
552		}
#	Line 417 | Line 554 | public class JSR166TestCase extends Test
554		// Java9+ test classes
555		if (atLeastJava9()) {
556		String[] java9TestClassNames = {
557	<	// Currently empty, but expecting varhandle tests
557	>	"AtomicBoolean9Test",
558	>	"AtomicInteger9Test",
559	>	"AtomicIntegerArray9Test",
560	>	"AtomicLong9Test",
561	>	"AtomicLongArray9Test",
562	>	"AtomicReference9Test",
563	>	"AtomicReferenceArray9Test",
564	>	"ExecutorCompletionService9Test",
565	>	"ForkJoinPool9Test",
566		};
567		addNamedTestClasses(suite, java9TestClassNames);
568		}
#	Line 428 | Line 573 | public class JSR166TestCase extends Test
573		/** Returns list of junit-style test method names in given class. */
574		public static ArrayList<String> testMethodNames(Class<?> testClass) {
575		Method[] methods = testClass.getDeclaredMethods();
576	<	ArrayList<String> names = new ArrayList<String>(methods.length);
576	>	ArrayList<String> names = new ArrayList<>(methods.length);
577		for (Method method : methods) {
578		if (method.getName().startsWith("test")
579		&& Modifier.isPublic(method.getModifiers())
#	Line 494 | Line 639 | public class JSR166TestCase extends Test
639		public static long LONG_DELAY_MS;
640
641		/**
642	<	* Returns the shortest timed delay. This could
643	<	* be reimplemented to use for example a Property.
642	>	* Returns the shortest timed delay. This can be scaled up for
643	>	* slow machines using the jsr166.delay.factor system property,
644	>	* or via jtreg's -timeoutFactor: flag.
645	>	* http://openjdk.java.net/jtreg/command-help.html
646		*/
647		protected long getShortDelay() {
648	<	return 50;
648	>	return (long) (50 * delayFactor);
649		}
650
651		/**
#	Line 532 | Line 679 | public class JSR166TestCase extends Test
679		* The first exception encountered if any threadAssertXXX method fails.
680		*/
681		private final AtomicReference<Throwable> threadFailure
682	<	= new AtomicReference<Throwable>(null);
682	>	= new AtomicReference<>(null);
683
684		/**
685		* Records an exception so that it can be rethrown later in the test
#	Line 590 | Line 737 | public class JSR166TestCase extends Test
737		}
738
739		/**
740	<	* Finds missing try { ... } finally { joinPool(e); }
740	>	* Finds missing PoolCleaners
741		*/
742		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
743		Thread[] survivors = new Thread[7];
#	Line 749 | Line 896 | public class JSR166TestCase extends Test
896		/**
897		* Delays, via Thread.sleep, for the given millisecond delay, but
898		* if the sleep is shorter than specified, may re-sleep or yield
899	<	* until time elapses.
899	>	* until time elapses.  Ensures that the given time, as measured
900	>	* by System.nanoTime(), has elapsed.
901		*/
902		static void delay(long millis) throws InterruptedException {
903	<	long startTime = System.nanoTime();
904	<	long ns = millis * 1000 * 1000;
905	<	for (;;) {
903	>	long nanos = millis * (1000 * 1000);
904	>	final long wakeupTime = System.nanoTime() + nanos;
905	>	do {
906		if (millis > 0L)
907		Thread.sleep(millis);
908		else // too short to sleep
909		Thread.yield();
910	<	long d = ns - (System.nanoTime() - startTime);
911	<	if (d > 0L)
912	<	millis = d / (1000 * 1000);
765	<	else
766	<	break;
767	<	}
910	>	nanos = wakeupTime - System.nanoTime();
911	>	millis = nanos / (1000 * 1000);
912	>	} while (nanos >= 0L);
913		}
914
915		/**
#	Line 776 | Line 921 | public class JSR166TestCase extends Test
921		public void close() { joinPool(pool); }
922		}
923
924	+	/**
925	+	* An extension of PoolCleaner that has an action to release the pool.
926	+	*/
927	+	class PoolCleanerWithReleaser extends PoolCleaner {
928	+	private final Runnable releaser;
929	+	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
930	+	super(pool);
931	+	this.releaser = releaser;
932	+	}
933	+	public void close() {
934	+	try {
935	+	releaser.run();
936	+	} finally {
937	+	super.close();
938	+	}
939	+	}
940	+	}
941	+
942		PoolCleaner cleaner(ExecutorService pool) {
943		return new PoolCleaner(pool);
944		}
945
946	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
947	+	return new PoolCleanerWithReleaser(pool, releaser);
948	+	}
949	+
950	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
951	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
952	+	}
953	+
954	+	Runnable releaser(final CountDownLatch latch) {
955	+	return new Runnable() { public void run() {
956	+	do { latch.countDown(); }
957	+	while (latch.getCount() > 0);
958	+	}};
959	+	}
960	+
961	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
962	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
963	+	}
964	+
965	+	Runnable releaser(final AtomicBoolean flag) {
966	+	return new Runnable() { public void run() { flag.set(true); }};
967	+	}
968	+
969		/**
970		* Waits out termination of a thread pool or fails doing so.
971		*/
#	Line 793 | Line 979 | public class JSR166TestCase extends Test
979		} finally {
980		// last resort, for the benefit of subsequent tests
981		pool.shutdownNow();
982	<	pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
982	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
983		}
984		}
985		} catch (SecurityException ok) {
#	Line 803 | Line 989 | public class JSR166TestCase extends Test
989		}
990		}
991
992	<	/** Like Runnable, but with the freedom to throw anything */
992	>	/**
993	>	* Like Runnable, but with the freedom to throw anything.
994	>	* junit folks had the same idea:
995	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
996	>	*/
997		interface Action { public void run() throws Throwable; }
998
999		/**
#	Line 834 | Line 1024 | public class JSR166TestCase extends Test
1024		* Uninteresting threads are filtered out.
1025		*/
1026		static void dumpTestThreads() {
1027	+	SecurityManager sm = System.getSecurityManager();
1028	+	if (sm != null) {
1029	+	try {
1030	+	System.setSecurityManager(null);
1031	+	} catch (SecurityException giveUp) {
1032	+	return;
1033	+	}
1034	+	}
1035	+
1036		ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1037		System.err.println("------ stacktrace dump start ------");
1038		for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1039	<	String name = info.getThreadName();
1039	>	final String name = info.getThreadName();
1040	>	String lockName;
1041		if ("Signal Dispatcher".equals(name))
1042		continue;
1043		if ("Reference Handler".equals(name)
1044	<	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1044	>	&& (lockName = info.getLockName()) != null
1045	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1046		continue;
1047		if ("Finalizer".equals(name)
1048	<	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1048	>	&& (lockName = info.getLockName()) != null
1049	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1050		continue;
1051		if ("checkForWedgedTest".equals(name))
1052		continue;
1053		System.err.print(info);
1054		}
1055		System.err.println("------ stacktrace dump end ------");
1056	+
1057	+	if (sm != null) System.setSecurityManager(sm);
1058		}
1059
1060		/**
#	Line 1037 | Line 1241 | public class JSR166TestCase extends Test
1241		}
1242		public void refresh() {}
1243		public String toString() {
1244	<	List<Permission> ps = new ArrayList<Permission>();
1244	>	List<Permission> ps = new ArrayList<>();
1245		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1246		ps.add(e.nextElement());
1247		return "AdjustablePolicy with permissions " + ps;
#	Line 1067 | Line 1271 | public class JSR166TestCase extends Test
1271		* Sleeps until the given time has elapsed.
1272		* Throws AssertionFailedError if interrupted.
1273		*/
1274	<	void sleep(long millis) {
1274	>	static void sleep(long millis) {
1275		try {
1276		delay(millis);
1277		} catch (InterruptedException fail) {
#	Line 1083 | Line 1287 | public class JSR166TestCase extends Test
1287		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1288		*/
1289		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1290	<	long startTime = System.nanoTime();
1290	>	long startTime = 0L;
1291		for (;;) {
1292		Thread.State s = thread.getState();
1293		if (s == Thread.State.BLOCKED ||
#	Line 1092 | Line 1296 | public class JSR166TestCase extends Test
1296		return;
1297		else if (s == Thread.State.TERMINATED)
1298		fail("Unexpected thread termination");
1299	+	else if (startTime == 0L)
1300	+	startTime = System.nanoTime();
1301		else if (millisElapsedSince(startTime) > timeoutMillis) {
1302		threadAssertTrue(thread.isAlive());
1303	<	return;
1303	>	fail("timed out waiting for thread to enter wait state");
1304		}
1305		Thread.yield();
1306		}
1307		}
1308
1309		/**
1310	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1311	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1310	>	* Spin-waits up to the specified number of milliseconds for the given
1311	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1312	>	* and additionally satisfy the given condition.
1313	>	*/
1314	>	void waitForThreadToEnterWaitState(
1315	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1316	>	long startTime = 0L;
1317	>	for (;;) {
1318	>	Thread.State s = thread.getState();
1319	>	if (s == Thread.State.BLOCKED ||
1320	>	s == Thread.State.WAITING ||
1321	>	s == Thread.State.TIMED_WAITING) {
1322	>	try {
1323	>	if (waitingForGodot.call())
1324	>	return;
1325	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1326	>	}
1327	>	else if (s == Thread.State.TERMINATED)
1328	>	fail("Unexpected thread termination");
1329	>	else if (startTime == 0L)
1330	>	startTime = System.nanoTime();
1331	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1332	>	threadAssertTrue(thread.isAlive());
1333	>	fail("timed out waiting for thread to enter wait state");
1334	>	}
1335	>	Thread.yield();
1336	>	}
1337	>	}
1338	>
1339	>	/**
1340	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1341	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1342		*/
1343		void waitForThreadToEnterWaitState(Thread thread) {
1344		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1345		}
1346
1347		/**
1348	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1349	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1350	+	* and additionally satisfy the given condition.
1351	+	*/
1352	+	void waitForThreadToEnterWaitState(
1353	+	Thread thread, Callable<Boolean> waitingForGodot) {
1354	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1355	+	}
1356	+
1357	+	/**
1358		* Returns the number of milliseconds since time given by
1359		* startNanoTime, which must have been previously returned from a
1360		* call to {@link System#nanoTime()}.
#	Line 1170 | Line 1416 | public class JSR166TestCase extends Test
1416		} finally {
1417		if (t.getState() != Thread.State.TERMINATED) {
1418		t.interrupt();
1419	<	fail("Test timed out");
1419	>	threadFail("timed out waiting for thread to terminate");
1420		}
1421		}
1422		}
#	Line 1319 | Line 1565 | public class JSR166TestCase extends Test
1565		}
1566
1567		class LatchAwaiter extends CheckedRunnable {
1568	<	final static int NEW = 0;
1569	<	final static int RUNNING = 1;
1570	<	final static int DONE = 2;
1568	>	static final int NEW = 0;
1569	>	static final int RUNNING = 1;
1570	>	static final int DONE = 2;
1571		final CountDownLatch latch;
1572		int state = NEW;
1573		LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
#	Line 1331 | Line 1577 | public class JSR166TestCase extends Test
1577		state = 2;
1578		}
1579		}
1580	<
1580	>
1581		public LatchAwaiter awaiter(CountDownLatch latch) {
1582		return new LatchAwaiter(latch);
1583		}
1584
1585	<	public void await(CountDownLatch latch) {
1585	>	public void await(CountDownLatch latch, long timeoutMillis) {
1586		try {
1587	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1587	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1588	>	fail("timed out waiting for CountDownLatch for "
1589	>	+ (timeoutMillis/1000) + " sec");
1590		} catch (Throwable fail) {
1591		threadUnexpectedException(fail);
1592		}
1593		}
1594
1595	+	public void await(CountDownLatch latch) {
1596	+	await(latch, LONG_DELAY_MS);
1597	+	}
1598	+
1599		public void await(Semaphore semaphore) {
1600		try {
1601	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1601	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1602	>	fail("timed out waiting for Semaphore for "
1603	>	+ (LONG_DELAY_MS/1000) + " sec");
1604		} catch (Throwable fail) {
1605		threadUnexpectedException(fail);
1606		}
#	Line 1576 | Line 1830 | public class JSR166TestCase extends Test
1830		* A CyclicBarrier that uses timed await and fails with
1831		* AssertionFailedErrors instead of throwing checked exceptions.
1832		*/
1833	<	public class CheckedBarrier extends CyclicBarrier {
1833	>	public static class CheckedBarrier extends CyclicBarrier {
1834		public CheckedBarrier(int parties) { super(parties); }
1835
1836		public int await() {
#	Line 1640 | Line 1894 | public class JSR166TestCase extends Test
1894		}
1895		}
1896
1897	+	void assertImmutable(final Object o) {
1898	+	if (o instanceof Collection) {
1899	+	assertThrows(
1900	+	UnsupportedOperationException.class,
1901	+	new Runnable() { public void run() {
1902	+	((Collection) o).add(null);}});
1903	+	}
1904	+	}
1905	+
1906		@SuppressWarnings("unchecked")
1907		<T> T serialClone(T o) {
1908		try {
1909		ObjectInputStream ois = new ObjectInputStream
1910		(new ByteArrayInputStream(serialBytes(o)));
1911		T clone = (T) ois.readObject();
1912	+	if (o == clone) assertImmutable(o);
1913		assertSame(o.getClass(), clone.getClass());
1914		return clone;
1915		} catch (Throwable fail) {
#	Line 1654 | Line 1918 | public class JSR166TestCase extends Test
1918		}
1919		}
1920
1921	+	/**
1922	+	* A version of serialClone that leaves error handling (for
1923	+	* e.g. NotSerializableException) up to the caller.
1924	+	*/
1925	+	@SuppressWarnings("unchecked")
1926	+	<T> T serialClonePossiblyFailing(T o)
1927	+	throws ReflectiveOperationException, java.io.IOException {
1928	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1929	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1930	+	oos.writeObject(o);
1931	+	oos.flush();
1932	+	oos.close();
1933	+	ObjectInputStream ois = new ObjectInputStream
1934	+	(new ByteArrayInputStream(bos.toByteArray()));
1935	+	T clone = (T) ois.readObject();
1936	+	if (o == clone) assertImmutable(o);
1937	+	assertSame(o.getClass(), clone.getClass());
1938	+	return clone;
1939	+	}
1940	+
1941	+	/**
1942	+	* If o implements Cloneable and has a public clone method,
1943	+	* returns a clone of o, else null.
1944	+	*/
1945	+	@SuppressWarnings("unchecked")
1946	+	<T> T cloneableClone(T o) {
1947	+	if (!(o instanceof Cloneable)) return null;
1948	+	final T clone;
1949	+	try {
1950	+	clone = (T) o.getClass().getMethod("clone").invoke(o);
1951	+	} catch (NoSuchMethodException ok) {
1952	+	return null;
1953	+	} catch (ReflectiveOperationException unexpected) {
1954	+	throw new Error(unexpected);
1955	+	}
1956	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1957	+	assertSame(o.getClass(), clone.getClass());
1958	+	return clone;
1959	+	}
1960	+
1961		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1962		Runnable... throwingActions) {
1963		for (Runnable throwingAction : throwingActions) {
#	Line 1682 | Line 1986 | public class JSR166TestCase extends Test
1986		} catch (NoSuchElementException success) {}
1987		assertFalse(it.hasNext());
1988		}
1989	+
1990	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1991	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1992	+	}
1993	+
1994	+	public Runnable runnableThrowing(final RuntimeException ex) {
1995	+	return new Runnable() { public void run() { throw ex; }};
1996	+	}
1997	+
1998	+	/** A reusable thread pool to be shared by tests. */
1999	+	static final ExecutorService cachedThreadPool =
2000	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2001	+	1000L, MILLISECONDS,
2002	+	new SynchronousQueue<Runnable>());
2003	+
2004	+	static <T> void shuffle(T[] array) {
2005	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2006	+	}
2007		}

Diff Legend

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