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.113 by dl, Sun Sep 8 23:00:36 2013 UTC vs.
Revision 1.202 by jsr166, Thu Sep 15 00:32:45 2016 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
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;
24		import java.io.ByteArrayOutputStream;
25		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;
38	+	import java.security.Permissions;
39	+	import java.security.Policy;
40	+	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;
48		import java.util.List;
49		import java.util.NoSuchElementException;
50		import java.util.PropertyPermission;
51	<	import java.util.concurrent.*;
51	>	import java.util.concurrent.BlockingQueue;
52	>	import java.util.concurrent.Callable;
53	>	import java.util.concurrent.CountDownLatch;
54	>	import java.util.concurrent.CyclicBarrier;
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 static java.util.concurrent.TimeUnit.MILLISECONDS;
72	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
73	<	import java.security.CodeSource;
74	<	import java.security.Permission;
75	<	import java.security.PermissionCollection;
76	<	import java.security.Permissions;
77	<	import java.security.Policy;
78	<	import java.security.ProtectionDomain;
35	<	import java.security.SecurityPermission;
71	>	import java.util.regex.Matcher;
72	>	import java.util.regex.Pattern;
73	>
74	>	import junit.framework.AssertionFailedError;
75	>	import junit.framework.Test;
76	>	import junit.framework.TestCase;
77	>	import junit.framework.TestResult;
78	>	import junit.framework.TestSuite;
79
80		/**
81		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 44 | Line 87 | import java.security.SecurityPermission;
87		*
88		* <ol>
89		*
90	<	* <li> All assertions in code running in generated threads must use
90	>	* <li>All assertions in code running in generated threads must use
91		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
92		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
93		* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
94		* particularly recommended) for other code to use these forms too.
95		* Only the most typically used JUnit assertion methods are defined
96	<	* this way, but enough to live with.</li>
96	>	* this way, but enough to live with.
97		*
98	<	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
98	>	* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
99		* to invoke {@code super.setUp} and {@code super.tearDown} within
100		* them. These methods are used to clear and check for thread
101	<	* assertion failures.</li>
101	>	* assertion failures.
102		*
103		* <li>All delays and timeouts must use one of the constants {@code
104		* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
#	Line 66 | Line 109 | import java.security.SecurityPermission;
109		* is always discriminable as larger than SHORT and smaller than
110		* MEDIUM.  And so on. These constants are set to conservative values,
111		* but even so, if there is ever any doubt, they can all be increased
112	<	* in one spot to rerun tests on slower platforms.</li>
112	>	* in one spot to rerun tests on slower platforms.
113		*
114	<	* <li> All threads generated must be joined inside each test case
114	>	* <li>All threads generated must be joined inside each test case
115		* method (or {@code fail} to do so) before returning from the
116		* method. The {@code joinPool} method can be used to do this when
117	<	* using Executors.</li>
117	>	* using Executors.
118		*
119		* </ol>
120		*
121		* <p><b>Other notes</b>
122		* <ul>
123		*
124	<	* <li> Usually, there is one testcase method per JSR166 method
124	>	* <li>Usually, there is one testcase method per JSR166 method
125		* covering "normal" operation, and then as many exception-testing
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
87	<	* isolation.</li>
129	>	* cover multiple methods when they cannot be tested in isolation.
130		*
131	<	* <li> The documentation style for testcases is to provide as javadoc
131	>	* <li>The documentation style for testcases is to provide as javadoc
132		* a simple sentence or two describing the property that the testcase
133		* method purports to test. The javadocs do not say anything about how
134	<	* the property is tested. To find out, read the code.</li>
134	>	* the property is tested. To find out, read the code.
135		*
136	<	* <li> These tests are "conformance tests", and do not attempt to
136	>	* <li>These tests are "conformance tests", and do not attempt to
137		* test throughput, latency, scalability or other performance factors
138		* (see the separate "jtreg" tests for a set intended to check these
139		* for the most central aspects of functionality.) So, most tests use
140		* the smallest sensible numbers of threads, collection sizes, etc
141	<	* needed to check basic conformance.</li>
141	>	* needed to check basic conformance.
142		*
143		* <li>The test classes currently do not declare inclusion in
144		* any particular package to simplify things for people integrating
145	<	* them in TCK test suites.</li>
145	>	* them in TCK test suites.
146		*
147	<	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
148	<	* runs all JSR166 unit tests.</li>
147	>	* <li>As a convenience, the {@code main} of this class (JSR166TestCase)
148	>	* runs all JSR166 unit tests.
149		*
150		* </ul>
151		*/
#	Line 115 | Line 157 | public class JSR166TestCase extends Test
157		Boolean.getBoolean("jsr166.expensiveTests");
158
159		/**
160	+	* If true, also run tests that are not part of the official tck
161	+	* because they test unspecified implementation details.
162	+	*/
163	+	protected static final boolean testImplementationDetails =
164	+	Boolean.getBoolean("jsr166.testImplementationDetails");
165	+
166	+	/**
167		* If true, report on stdout all "slow" tests, that is, ones that
168		* take more than profileThreshold milliseconds to execute.
169		*/
#	Line 134 | Line 183 | public class JSR166TestCase extends Test
183		private static final int runsPerTest =
184		Integer.getInteger("jsr166.runsPerTest", 1);
185
186	+	/**
187	+	* The number of repetitions of the test suite (for finding leaks?).
188	+	*/
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	+
233	+	/**
234	+	* A filter for tests to run, matching strings of the form
235	+	* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
236	+	* Usefully combined with jsr166.runsPerTest.
237	+	*/
238	+	private static final Pattern methodFilter = methodFilter();
239	+
240	+	private static Pattern methodFilter() {
241	+	String regex = System.getProperty("jsr166.methodFilter");
242	+	return (regex == null) ? null : Pattern.compile(regex);
243	+	}
244	+
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	+	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
#	Line 144 | Line 304 | public class JSR166TestCase extends Test
304		}
305
306		protected void runTestProfiled() throws Throwable {
307	<	long t0 = System.nanoTime();
308	<	try {
307	>	for (int i = 0; i < 2; i++) {
308	>	long startTime = System.nanoTime();
309		super.runTest();
310	<	} finally {
311	<	long elapsedMillis =
312	<	(System.nanoTime() - t0) / (1000L * 1000L);
313	<	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		}
319
320		/**
321		* Runs all JSR166 unit tests using junit.textui.TestRunner.
160	–	* Optional command line arg provides the number of iterations to
161	–	* repeat running the tests.
322		*/
323		public static void main(String[] args) {
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.
358	+	*/
359	+	static void main(Test suite, String[] args) {
360		if (useSecurityManager) {
361		System.err.println("Setting a permissive security manager");
362		Policy.setPolicy(permissivePolicy());
363		System.setSecurityManager(new SecurityManager());
364		}
365	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
366	<
367	<	Test s = suite();
368	<	for (int i = 0; i < iters; ++i) {
173	<	junit.textui.TestRunner.run(s);
365	>	for (int i = 0; i < suiteRuns; i++) {
366	>	TestResult result = newPithyTestRunner().doRun(suite);
367	>	if (!result.wasSuccessful())
368	>	System.exit(1);
369		System.gc();
370		System.runFinalization();
371		}
177	–	System.exit(0);
372		}
373
374		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 205 | Line 399 | public class JSR166TestCase extends Test
399		}
400
401		public static final double JAVA_CLASS_VERSION;
402	+	public static final String JAVA_SPECIFICATION_VERSION;
403		static {
404		try {
405		JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
406		new java.security.PrivilegedAction<Double>() {
407		public Double run() {
408		return Double.valueOf(System.getProperty("java.class.version"));}});
409	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
410	+	new java.security.PrivilegedAction<String>() {
411	+	public String run() {
412	+	return System.getProperty("java.specification.version");}});
413		} catch (Throwable t) {
414		throw new Error(t);
415		}
#	Line 219 | Line 418 | public class JSR166TestCase extends Test
418		public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
419		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
420		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
421	+	public static boolean atLeastJava9() {
422	+	return JAVA_CLASS_VERSION >= 53.0
423	+	// As of 2015-09, java9 still uses 52.0 class file version
424	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
425	+	}
426	+	public static boolean atLeastJava10() {
427	+	return JAVA_CLASS_VERSION >= 54.0
428	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
429	+	}
430
431		/**
432		* Collects all JSR166 unit tests as one suite.
#	Line 306 | Line 514 | public class JSR166TestCase extends Test
514		"LongAdderTest",
515		"SplittableRandomTest",
516		"StampedLockTest",
517	+	"SubmissionPublisherTest",
518		"ThreadLocalRandom8Test",
519	+	"TimeUnit8Test",
520		};
521		addNamedTestClasses(suite, java8TestClassNames);
522		}
523
524	+	// Java9+ test classes
525	+	if (atLeastJava9()) {
526	+	String[] java9TestClassNames = {
527	+	"AtomicBoolean9Test",
528	+	"AtomicInteger9Test",
529	+	"AtomicIntegerArray9Test",
530	+	"AtomicLong9Test",
531	+	"AtomicLongArray9Test",
532	+	"AtomicReference9Test",
533	+	"AtomicReferenceArray9Test",
534	+	"ExecutorCompletionService9Test",
535	+	};
536	+	addNamedTestClasses(suite, java9TestClassNames);
537	+	}
538	+
539		return suite;
540		}
541
542	+	/** Returns list of junit-style test method names in given class. */
543	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
544	+	Method[] methods = testClass.getDeclaredMethods();
545	+	ArrayList<String> names = new ArrayList<String>(methods.length);
546	+	for (Method method : methods) {
547	+	if (method.getName().startsWith("test")
548	+	&& Modifier.isPublic(method.getModifiers())
549	+	// method.getParameterCount() requires jdk8+
550	+	&& method.getParameterTypes().length == 0) {
551	+	names.add(method.getName());
552	+	}
553	+	}
554	+	return names;
555	+	}
556	+
557	+	/**
558	+	* Returns junit-style testSuite for the given test class, but
559	+	* parameterized by passing extra data to each test.
560	+	*/
561	+	public static <ExtraData> Test parameterizedTestSuite
562	+	(Class<? extends JSR166TestCase> testClass,
563	+	Class<ExtraData> dataClass,
564	+	ExtraData data) {
565	+	try {
566	+	TestSuite suite = new TestSuite();
567	+	Constructor c =
568	+	testClass.getDeclaredConstructor(dataClass, String.class);
569	+	for (String methodName : testMethodNames(testClass))
570	+	suite.addTest((Test) c.newInstance(data, methodName));
571	+	return suite;
572	+	} catch (Exception e) {
573	+	throw new Error(e);
574	+	}
575	+	}
576	+
577	+	/**
578	+	* Returns junit-style testSuite for the jdk8 extension of the
579	+	* given test class, but parameterized by passing extra data to
580	+	* each test.  Uses reflection to allow compilation in jdk7.
581	+	*/
582	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
583	+	(Class<? extends JSR166TestCase> testClass,
584	+	Class<ExtraData> dataClass,
585	+	ExtraData data) {
586	+	if (atLeastJava8()) {
587	+	String name = testClass.getName();
588	+	String name8 = name.replaceAll("Test$", "8Test");
589	+	if (name.equals(name8)) throw new Error(name);
590	+	try {
591	+	return (Test)
592	+	Class.forName(name8)
593	+	.getMethod("testSuite", new Class[] { dataClass })
594	+	.invoke(null, data);
595	+	} catch (Exception e) {
596	+	throw new Error(e);
597	+	}
598	+	} else {
599	+	return new TestSuite();
600	+	}
601	+	}
602	+
603		// Delays for timing-dependent tests, in milliseconds.
604
605		public static long SHORT_DELAY_MS;
#	Line 322 | Line 608 | public class JSR166TestCase extends Test
608		public static long LONG_DELAY_MS;
609
610		/**
611	<	* Returns the shortest timed delay. This could
612	<	* be reimplemented to use for example a Property.
611	>	* Returns the shortest timed delay. This can be scaled up for
612	>	* slow machines using the jsr166.delay.factor system property,
613	>	* or via jtreg's -timeoutFactor: flag.
614	>	* http://openjdk.java.net/jtreg/command-help.html
615		*/
616		protected long getShortDelay() {
617	<	return 50;
617	>	return (long) (50 * delayFactor);
618		}
619
620		/**
#	Line 348 | Line 636 | public class JSR166TestCase extends Test
636		}
637
638		/**
639	<	* Returns a new Date instance representing a time delayMillis
640	<	* milliseconds in the future.
639	>	* Returns a new Date instance representing a time at least
640	>	* delayMillis milliseconds in the future.
641		*/
642		Date delayedDate(long delayMillis) {
643	<	return new Date(System.currentTimeMillis() + delayMillis);
643	>	// Add 1 because currentTimeMillis is known to round into the past.
644	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
645		}
646
647		/**
#	Line 368 | Line 657 | public class JSR166TestCase extends Test
657		* the same test have no effect.
658		*/
659		public void threadRecordFailure(Throwable t) {
660	+	System.err.println(t);
661	+	dumpTestThreads();
662		threadFailure.compareAndSet(null, t);
663		}
664
#	Line 375 | Line 666 | public class JSR166TestCase extends Test
666		setDelays();
667		}
668
669	+	void tearDownFail(String format, Object... args) {
670	+	String msg = toString() + ": " + String.format(format, args);
671	+	System.err.println(msg);
672	+	dumpTestThreads();
673	+	throw new AssertionFailedError(msg);
674	+	}
675	+
676		/**
677		* Extra checks that get done for all test cases.
678		*
#	Line 402 | Line 700 | public class JSR166TestCase extends Test
700		}
701
702		if (Thread.interrupted())
703	<	throw new AssertionFailedError("interrupt status set in main thread");
703	>	tearDownFail("interrupt status set in main thread");
704
705		checkForkJoinPoolThreadLeaks();
706		}
707
708		/**
709	<	* Find missing try { ... } finally { joinPool(e); }
709	>	* Finds missing PoolCleaners
710		*/
711		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
712	<	Thread[] survivors = new Thread[5];
712	>	Thread[] survivors = new Thread[7];
713		int count = Thread.enumerate(survivors);
714		for (int i = 0; i < count; i++) {
715		Thread thread = survivors[i];
#	Line 419 | Line 717 | public class JSR166TestCase extends Test
717		if (name.startsWith("ForkJoinPool-")) {
718		// give thread some time to terminate
719		thread.join(LONG_DELAY_MS);
720	<	if (!thread.isAlive()) continue;
721	<	thread.stop();
722	<	throw new AssertionFailedError
425	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
426	<	toString(), name));
720	>	if (thread.isAlive())
721	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
722	>	thread);
723		}
724		}
725	+
726	+	if (!ForkJoinPool.commonPool()
727	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
728	+	tearDownFail("ForkJoin common pool thread stuck");
729		}
730
731		/**
#	Line 438 | Line 738 | public class JSR166TestCase extends Test
738		fail(reason);
739		} catch (AssertionFailedError t) {
740		threadRecordFailure(t);
741	<	fail(reason);
741	>	throw t;
742		}
743		}
744
#	Line 506 | Line 806 | public class JSR166TestCase extends Test
806		public void threadAssertEquals(Object x, Object y) {
807		try {
808		assertEquals(x, y);
809	<	} catch (AssertionFailedError t) {
810	<	threadRecordFailure(t);
811	<	throw t;
812	<	} catch (Throwable t) {
813	<	threadUnexpectedException(t);
809	>	} catch (AssertionFailedError fail) {
810	>	threadRecordFailure(fail);
811	>	throw fail;
812	>	} catch (Throwable fail) {
813	>	threadUnexpectedException(fail);
814		}
815		}
816
#	Line 522 | Line 822 | public class JSR166TestCase extends Test
822		public void threadAssertSame(Object x, Object y) {
823		try {
824		assertSame(x, y);
825	<	} catch (AssertionFailedError t) {
826	<	threadRecordFailure(t);
827	<	throw t;
825	>	} catch (AssertionFailedError fail) {
826	>	threadRecordFailure(fail);
827	>	throw fail;
828		}
829		}
830
#	Line 565 | Line 865 | public class JSR166TestCase extends Test
865		/**
866		* Delays, via Thread.sleep, for the given millisecond delay, but
867		* if the sleep is shorter than specified, may re-sleep or yield
868	<	* until time elapses.
868	>	* until time elapses.  Ensures that the given time, as measured
869	>	* by System.nanoTime(), has elapsed.
870		*/
871		static void delay(long millis) throws InterruptedException {
872	<	long startTime = System.nanoTime();
873	<	long ns = millis * 1000 * 1000;
874	<	for (;;) {
872	>	long nanos = millis * (1000 * 1000);
873	>	final long wakeupTime = System.nanoTime() + nanos;
874	>	do {
875		if (millis > 0L)
876		Thread.sleep(millis);
877		else // too short to sleep
878		Thread.yield();
879	<	long d = ns - (System.nanoTime() - startTime);
880	<	if (d > 0L)
881	<	millis = d / (1000 * 1000);
882	<	else
883	<	break;
879	>	nanos = wakeupTime - System.nanoTime();
880	>	millis = nanos / (1000 * 1000);
881	>	} while (nanos >= 0L);
882	>	}
883	>
884	>	/**
885	>	* Allows use of try-with-resources with per-test thread pools.
886	>	*/
887	>	class PoolCleaner implements AutoCloseable {
888	>	private final ExecutorService pool;
889	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
890	>	public void close() { joinPool(pool); }
891	>	}
892	>
893	>	/**
894	>	* An extension of PoolCleaner that has an action to release the pool.
895	>	*/
896	>	class PoolCleanerWithReleaser extends PoolCleaner {
897	>	private final Runnable releaser;
898	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
899	>	super(pool);
900	>	this.releaser = releaser;
901	>	}
902	>	public void close() {
903	>	try {
904	>	releaser.run();
905	>	} finally {
906	>	super.close();
907	>	}
908		}
909		}
910
911	+	PoolCleaner cleaner(ExecutorService pool) {
912	+	return new PoolCleaner(pool);
913	+	}
914	+
915	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
916	+	return new PoolCleanerWithReleaser(pool, releaser);
917	+	}
918	+
919	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
920	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
921	+	}
922	+
923	+	Runnable releaser(final CountDownLatch latch) {
924	+	return new Runnable() { public void run() {
925	+	do { latch.countDown(); }
926	+	while (latch.getCount() > 0);
927	+	}};
928	+	}
929	+
930	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
931	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
932	+	}
933	+
934	+	Runnable releaser(final AtomicBoolean flag) {
935	+	return new Runnable() { public void run() { flag.set(true); }};
936	+	}
937	+
938		/**
939		* Waits out termination of a thread pool or fails doing so.
940		*/
941	<	void joinPool(ExecutorService exec) {
941	>	void joinPool(ExecutorService pool) {
942		try {
943	<	exec.shutdown();
944	<	assertTrue("ExecutorService did not terminate in a timely manner",
945	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
943	>	pool.shutdown();
944	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
945	>	try {
946	>	threadFail("ExecutorService " + pool +
947	>	" did not terminate in a timely manner");
948	>	} finally {
949	>	// last resort, for the benefit of subsequent tests
950	>	pool.shutdownNow();
951	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
952	>	}
953	>	}
954		} catch (SecurityException ok) {
955		// Allowed in case test doesn't have privs
956	<	} catch (InterruptedException ie) {
957	<	fail("Unexpected InterruptedException");
956	>	} catch (InterruptedException fail) {
957	>	threadFail("Unexpected InterruptedException");
958		}
959		}
960
961		/**
962	<	* A debugging tool to print all stack traces, as jstack does.
962	>	* Like Runnable, but with the freedom to throw anything.
963	>	* junit folks had the same idea:
964	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
965	>	*/
966	>	interface Action { public void run() throws Throwable; }
967	>
968	>	/**
969	>	* Runs all the given actions in parallel, failing if any fail.
970	>	* Useful for running multiple variants of tests that are
971	>	* necessarily individually slow because they must block.
972		*/
973	<	static void printAllStackTraces() {
974	<	for (ThreadInfo info :
975	<	ManagementFactory.getThreadMXBean()
976	<	.dumpAllThreads(true, true))
973	>	void testInParallel(Action ... actions) {
974	>	ExecutorService pool = Executors.newCachedThreadPool();
975	>	try (PoolCleaner cleaner = cleaner(pool)) {
976	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
977	>	for (final Action action : actions)
978	>	futures.add(pool.submit(new CheckedRunnable() {
979	>	public void realRun() throws Throwable { action.run();}}));
980	>	for (Future<?> future : futures)
981	>	try {
982	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
983	>	} catch (ExecutionException ex) {
984	>	threadUnexpectedException(ex.getCause());
985	>	} catch (Exception ex) {
986	>	threadUnexpectedException(ex);
987	>	}
988	>	}
989	>	}
990	>
991	>	/**
992	>	* A debugging tool to print stack traces of most threads, as jstack does.
993	>	* Uninteresting threads are filtered out.
994	>	*/
995	>	static void dumpTestThreads() {
996	>	SecurityManager sm = System.getSecurityManager();
997	>	if (sm != null) {
998	>	try {
999	>	System.setSecurityManager(null);
1000	>	} catch (SecurityException giveUp) {
1001	>	return;
1002	>	}
1003	>	}
1004	>
1005	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1006	>	System.err.println("------ stacktrace dump start ------");
1007	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1008	>	String name = info.getThreadName();
1009	>	if ("Signal Dispatcher".equals(name))
1010	>	continue;
1011	>	if ("Reference Handler".equals(name)
1012	>	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1013	>	continue;
1014	>	if ("Finalizer".equals(name)
1015	>	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1016	>	continue;
1017	>	if ("checkForWedgedTest".equals(name))
1018	>	continue;
1019		System.err.print(info);
1020	+	}
1021	+	System.err.println("------ stacktrace dump end ------");
1022	+
1023	+	if (sm != null) System.setSecurityManager(sm);
1024		}
1025
1026		/**
#	Line 624 | Line 1039 | public class JSR166TestCase extends Test
1039		// No need to optimize the failing case via Thread.join.
1040		delay(millis);
1041		assertTrue(thread.isAlive());
1042	<	} catch (InterruptedException ie) {
1043	<	fail("Unexpected InterruptedException");
1042	>	} catch (InterruptedException fail) {
1043	>	threadFail("Unexpected InterruptedException");
1044		}
1045		}
1046
#	Line 646 | Line 1061 | public class JSR166TestCase extends Test
1061		delay(millis);
1062		for (Thread thread : threads)
1063		assertTrue(thread.isAlive());
1064	<	} catch (InterruptedException ie) {
1065	<	fail("Unexpected InterruptedException");
1064	>	} catch (InterruptedException fail) {
1065	>	threadFail("Unexpected InterruptedException");
1066		}
1067		}
1068
#	Line 668 | Line 1083 | public class JSR166TestCase extends Test
1083		future.get(timeoutMillis, MILLISECONDS);
1084		shouldThrow();
1085		} catch (TimeoutException success) {
1086	<	} catch (Exception e) {
1087	<	threadUnexpectedException(e);
1086	>	} catch (Exception fail) {
1087	>	threadUnexpectedException(fail);
1088		} finally { future.cancel(true); }
1089		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1090		}
#	Line 822 | Line 1237 | public class JSR166TestCase extends Test
1237		* Sleeps until the given time has elapsed.
1238		* Throws AssertionFailedError if interrupted.
1239		*/
1240	<	void sleep(long millis) {
1240	>	static void sleep(long millis) {
1241		try {
1242		delay(millis);
1243	<	} catch (InterruptedException ie) {
1243	>	} catch (InterruptedException fail) {
1244		AssertionFailedError afe =
1245		new AssertionFailedError("Unexpected InterruptedException");
1246	<	afe.initCause(ie);
1246	>	afe.initCause(fail);
1247		throw afe;
1248		}
1249		}
#	Line 838 | 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 847 | 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 866 | Line 1283 | public class JSR166TestCase extends Test
1283		/**
1284		* Returns the number of milliseconds since time given by
1285		* startNanoTime, which must have been previously returned from a
1286	<	* call to {@link System.nanoTime()}.
1286	>	* call to {@link System#nanoTime()}.
1287		*/
1288	<	long millisElapsedSince(long startNanoTime) {
1288	>	static long millisElapsedSince(long startNanoTime) {
1289		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1290		}
1291
1292	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1293	+	//         long startTime = System.nanoTime();
1294	+	//         try {
1295	+	//             r.run();
1296	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1297	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1298	+	//             throw new AssertionFailedError("did not return promptly");
1299	+	//     }
1300	+
1301	+	//     void assertTerminatesPromptly(Runnable r) {
1302	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1303	+	//     }
1304	+
1305	+	/**
1306	+	* Checks that timed f.get() returns the expected value, and does not
1307	+	* wait for the timeout to elapse before returning.
1308	+	*/
1309	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1310	+	long startTime = System.nanoTime();
1311	+	try {
1312	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1313	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1314	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1315	+	throw new AssertionFailedError("timed get did not return promptly");
1316	+	}
1317	+
1318	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1319	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1320	+	}
1321	+
1322		/**
1323		* Returns a new started daemon Thread running the given runnable.
1324		*/
#	Line 890 | Line 1337 | public class JSR166TestCase extends Test
1337		void awaitTermination(Thread t, long timeoutMillis) {
1338		try {
1339		t.join(timeoutMillis);
1340	<	} catch (InterruptedException ie) {
1341	<	threadUnexpectedException(ie);
1340	>	} catch (InterruptedException fail) {
1341	>	threadUnexpectedException(fail);
1342		} finally {
1343		if (t.getState() != Thread.State.TERMINATED) {
1344		t.interrupt();
1345	<	fail("Test timed out");
1345	>	threadFail("timed out waiting for thread to terminate");
1346		}
1347		}
1348		}
#	Line 917 | Line 1364 | public class JSR166TestCase extends Test
1364		public final void run() {
1365		try {
1366		realRun();
1367	<	} catch (Throwable t) {
1368	<	threadUnexpectedException(t);
1367	>	} catch (Throwable fail) {
1368	>	threadUnexpectedException(fail);
1369		}
1370		}
1371		}
#	Line 972 | Line 1419 | public class JSR166TestCase extends Test
1419		threadShouldThrow("InterruptedException");
1420		} catch (InterruptedException success) {
1421		threadAssertFalse(Thread.interrupted());
1422	<	} catch (Throwable t) {
1423	<	threadUnexpectedException(t);
1422	>	} catch (Throwable fail) {
1423	>	threadUnexpectedException(fail);
1424		}
1425		}
1426		}
#	Line 984 | Line 1431 | public class JSR166TestCase extends Test
1431		public final T call() {
1432		try {
1433		return realCall();
1434	<	} catch (Throwable t) {
1435	<	threadUnexpectedException(t);
1434	>	} catch (Throwable fail) {
1435	>	threadUnexpectedException(fail);
1436		return null;
1437		}
1438		}
#	Line 1002 | Line 1449 | public class JSR166TestCase extends Test
1449		return result;
1450		} catch (InterruptedException success) {
1451		threadAssertFalse(Thread.interrupted());
1452	<	} catch (Throwable t) {
1453	<	threadUnexpectedException(t);
1452	>	} catch (Throwable fail) {
1453	>	threadUnexpectedException(fail);
1454		}
1455		return null;
1456		}
#	Line 1020 | Line 1467 | public class JSR166TestCase extends Test
1467		public static final String TEST_STRING = "a test string";
1468
1469		public static class StringTask implements Callable<String> {
1470	<	public String call() { return TEST_STRING; }
1470	>	final String value;
1471	>	public StringTask() { this(TEST_STRING); }
1472	>	public StringTask(String value) { this.value = value; }
1473	>	public String call() { return value; }
1474		}
1475
1476		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1033 | Line 1483 | public class JSR166TestCase extends Test
1483		}};
1484		}
1485
1486	<	public Runnable awaiter(final CountDownLatch latch) {
1486	>	public Runnable countDowner(final CountDownLatch latch) {
1487		return new CheckedRunnable() {
1488		public void realRun() throws InterruptedException {
1489	<	await(latch);
1489	>	latch.countDown();
1490		}};
1491		}
1492
1493	<	public void await(CountDownLatch latch) {
1493	>	class LatchAwaiter extends CheckedRunnable {
1494	>	static final int NEW = 0;
1495	>	static final int RUNNING = 1;
1496	>	static final int DONE = 2;
1497	>	final CountDownLatch latch;
1498	>	int state = NEW;
1499	>	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1500	>	public void realRun() throws InterruptedException {
1501	>	state = 1;
1502	>	await(latch);
1503	>	state = 2;
1504	>	}
1505	>	}
1506	>
1507	>	public LatchAwaiter awaiter(CountDownLatch latch) {
1508	>	return new LatchAwaiter(latch);
1509	>	}
1510	>
1511	>	public void await(CountDownLatch latch, long timeoutMillis) {
1512		try {
1513	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1514	<	} catch (Throwable t) {
1515	<	threadUnexpectedException(t);
1513	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1514	>	fail("timed out waiting for CountDownLatch for "
1515	>	+ (timeoutMillis/1000) + " sec");
1516	>	} catch (Throwable fail) {
1517	>	threadUnexpectedException(fail);
1518		}
1519		}
1520
1521	+	public void await(CountDownLatch latch) {
1522	+	await(latch, LONG_DELAY_MS);
1523	+	}
1524	+
1525		public void await(Semaphore semaphore) {
1526		try {
1527	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1528	<	} catch (Throwable t) {
1529	<	threadUnexpectedException(t);
1527	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1528	>	fail("timed out waiting for Semaphore for "
1529	>	+ (LONG_DELAY_MS/1000) + " sec");
1530	>	} catch (Throwable fail) {
1531	>	threadUnexpectedException(fail);
1532		}
1533		}
1534
#	Line 1246 | Line 1722 | public class JSR166TestCase extends Test
1722		@Override protected final void compute() {
1723		try {
1724		realCompute();
1725	<	} catch (Throwable t) {
1726	<	threadUnexpectedException(t);
1725	>	} catch (Throwable fail) {
1726	>	threadUnexpectedException(fail);
1727		}
1728		}
1729		}
#	Line 1261 | Line 1737 | public class JSR166TestCase extends Test
1737		@Override protected final T compute() {
1738		try {
1739		return realCompute();
1740	<	} catch (Throwable t) {
1741	<	threadUnexpectedException(t);
1740	>	} catch (Throwable fail) {
1741	>	threadUnexpectedException(fail);
1742		return null;
1743		}
1744		}
#	Line 1280 | Line 1756 | public class JSR166TestCase extends Test
1756		* A CyclicBarrier that uses timed await and fails with
1757		* AssertionFailedErrors instead of throwing checked exceptions.
1758		*/
1759	<	public class CheckedBarrier extends CyclicBarrier {
1759	>	public static class CheckedBarrier extends CyclicBarrier {
1760		public CheckedBarrier(int parties) { super(parties); }
1761
1762		public int await() {
1763		try {
1764		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1765	<	} catch (TimeoutException e) {
1765	>	} catch (TimeoutException timedOut) {
1766		throw new AssertionFailedError("timed out");
1767	<	} catch (Exception e) {
1767	>	} catch (Exception fail) {
1768		AssertionFailedError afe =
1769	<	new AssertionFailedError("Unexpected exception: " + e);
1770	<	afe.initCause(e);
1769	>	new AssertionFailedError("Unexpected exception: " + fail);
1770	>	afe.initCause(fail);
1771		throw afe;
1772		}
1773		}
#	Line 1319 | Line 1795 | public class JSR166TestCase extends Test
1795		q.remove();
1796		shouldThrow();
1797		} catch (NoSuchElementException success) {}
1798	<	} catch (InterruptedException ie) {
1323	<	threadUnexpectedException(ie);
1324	<	}
1798	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1799		}
1800
1801		void assertSerialEquals(Object x, Object y) {
#	Line 1340 | Line 1814 | public class JSR166TestCase extends Test
1814		oos.flush();
1815		oos.close();
1816		return bos.toByteArray();
1817	<	} catch (Throwable t) {
1818	<	threadUnexpectedException(t);
1817	>	} catch (Throwable fail) {
1818	>	threadUnexpectedException(fail);
1819		return new byte[0];
1820		}
1821		}
#	Line 1354 | Line 1828 | public class JSR166TestCase extends Test
1828		T clone = (T) ois.readObject();
1829		assertSame(o.getClass(), clone.getClass());
1830		return clone;
1831	<	} catch (Throwable t) {
1832	<	threadUnexpectedException(t);
1831	>	} catch (Throwable fail) {
1832	>	threadUnexpectedException(fail);
1833		return null;
1834		}
1835		}
#	Line 1380 | Line 1854 | public class JSR166TestCase extends Test
1854		shouldThrow(expectedExceptionClass.getName());
1855		}
1856		}
1857	+
1858	+	public void assertIteratorExhausted(Iterator<?> it) {
1859	+	try {
1860	+	it.next();
1861	+	shouldThrow();
1862	+	} catch (NoSuchElementException success) {}
1863	+	assertFalse(it.hasNext());
1864	+	}
1865	+
1866	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1867	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1868	+	}
1869	+
1870	+	public Runnable runnableThrowing(final RuntimeException ex) {
1871	+	return new Runnable() { public void run() { throw ex; }};
1872	+	}
1873	+
1874	+	/** A reusable thread pool to be shared by tests. */
1875	+	static final ExecutorService cachedThreadPool =
1876	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
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