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.121 by jsr166, Wed Jul 9 16:51:40 2014 UTC vs.
Revision 1.173 by jsr166, Fri Oct 9 16:24:12 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>	import static java.util.concurrent.TimeUnit.MINUTES;
11	>	import static java.util.concurrent.TimeUnit.NANOSECONDS;
12	>
13		import java.io.ByteArrayInputStream;
14		import java.io.ByteArrayOutputStream;
15		import java.io.ObjectInputStream;
16		import java.io.ObjectOutputStream;
17		import java.lang.management.ManagementFactory;
18		import java.lang.management.ThreadInfo;
19	+	import java.lang.management.ThreadMXBean;
20	+	import java.lang.reflect.Constructor;
21		import java.lang.reflect.Method;
22	+	import java.lang.reflect.Modifier;
23	+	import java.nio.file.Files;
24	+	import java.nio.file.Paths;
25	+	import java.security.CodeSource;
26	+	import java.security.Permission;
27	+	import java.security.PermissionCollection;
28	+	import java.security.Permissions;
29	+	import java.security.Policy;
30	+	import java.security.ProtectionDomain;
31	+	import java.security.SecurityPermission;
32		import java.util.ArrayList;
33		import java.util.Arrays;
34		import java.util.Date;
35		import java.util.Enumeration;
36	+	import java.util.Iterator;
37		import java.util.List;
38		import java.util.NoSuchElementException;
39		import java.util.PropertyPermission;
40	<	import java.util.concurrent.*;
41	<	import java.util.concurrent.atomic.AtomicBoolean;
40	>	import java.util.concurrent.BlockingQueue;
41	>	import java.util.concurrent.Callable;
42	>	import java.util.concurrent.CountDownLatch;
43	>	import java.util.concurrent.CyclicBarrier;
44	>	import java.util.concurrent.ExecutionException;
45	>	import java.util.concurrent.Executors;
46	>	import java.util.concurrent.ExecutorService;
47	>	import java.util.concurrent.ForkJoinPool;
48	>	import java.util.concurrent.Future;
49	>	import java.util.concurrent.RecursiveAction;
50	>	import java.util.concurrent.RecursiveTask;
51	>	import java.util.concurrent.RejectedExecutionHandler;
52	>	import java.util.concurrent.Semaphore;
53	>	import java.util.concurrent.ThreadFactory;
54	>	import java.util.concurrent.ThreadPoolExecutor;
55	>	import java.util.concurrent.TimeoutException;
56		import java.util.concurrent.atomic.AtomicReference;
57	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
28	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
57	>	import java.util.regex.Matcher;
58		import java.util.regex.Pattern;
59	<	import java.security.CodeSource;
60	<	import java.security.Permission;
61	<	import java.security.PermissionCollection;
62	<	import java.security.Permissions;
63	<	import java.security.Policy;
64	<	import java.security.ProtectionDomain;
36	<	import java.security.SecurityPermission;
59	>
60	>	import junit.framework.AssertionFailedError;
61	>	import junit.framework.Test;
62	>	import junit.framework.TestCase;
63	>	import junit.framework.TestResult;
64	>	import junit.framework.TestSuite;
65
66		/**
67		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 45 | Line 73 | import java.security.SecurityPermission;
73		*
74		* <ol>
75		*
76	<	* <li> All assertions in code running in generated threads must use
76	>	* <li>All assertions in code running in generated threads must use
77		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
78		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
79		* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
80		* particularly recommended) for other code to use these forms too.
81		* Only the most typically used JUnit assertion methods are defined
82	<	* this way, but enough to live with.</li>
82	>	* this way, but enough to live with.
83		*
84	<	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
84	>	* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
85		* to invoke {@code super.setUp} and {@code super.tearDown} within
86		* them. These methods are used to clear and check for thread
87	<	* assertion failures.</li>
87	>	* assertion failures.
88		*
89		* <li>All delays and timeouts must use one of the constants {@code
90		* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
#	Line 67 | Line 95 | import java.security.SecurityPermission;
95		* is always discriminable as larger than SHORT and smaller than
96		* MEDIUM.  And so on. These constants are set to conservative values,
97		* but even so, if there is ever any doubt, they can all be increased
98	<	* in one spot to rerun tests on slower platforms.</li>
98	>	* in one spot to rerun tests on slower platforms.
99		*
100	<	* <li> All threads generated must be joined inside each test case
100	>	* <li>All threads generated must be joined inside each test case
101		* method (or {@code fail} to do so) before returning from the
102		* method. The {@code joinPool} method can be used to do this when
103	<	* using Executors.</li>
103	>	* using Executors.
104		*
105		* </ol>
106		*
107		* <p><b>Other notes</b>
108		* <ul>
109		*
110	<	* <li> Usually, there is one testcase method per JSR166 method
110	>	* <li>Usually, there is one testcase method per JSR166 method
111		* covering "normal" operation, and then as many exception-testing
112		* methods as there are exceptions the method can throw. Sometimes
113		* there are multiple tests per JSR166 method when the different
114		* "normal" behaviors differ significantly. And sometimes testcases
115		* cover multiple methods when they cannot be tested in
116	<	* isolation.</li>
116	>	* isolation.
117		*
118	<	* <li> The documentation style for testcases is to provide as javadoc
118	>	* <li>The documentation style for testcases is to provide as javadoc
119		* a simple sentence or two describing the property that the testcase
120		* method purports to test. The javadocs do not say anything about how
121	<	* the property is tested. To find out, read the code.</li>
121	>	* the property is tested. To find out, read the code.
122		*
123	<	* <li> These tests are "conformance tests", and do not attempt to
123	>	* <li>These tests are "conformance tests", and do not attempt to
124		* test throughput, latency, scalability or other performance factors
125		* (see the separate "jtreg" tests for a set intended to check these
126		* for the most central aspects of functionality.) So, most tests use
127		* the smallest sensible numbers of threads, collection sizes, etc
128	<	* needed to check basic conformance.</li>
128	>	* needed to check basic conformance.
129		*
130		* <li>The test classes currently do not declare inclusion in
131		* any particular package to simplify things for people integrating
132	<	* them in TCK test suites.</li>
132	>	* them in TCK test suites.
133		*
134	<	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
135	<	* runs all JSR166 unit tests.</li>
134	>	* <li>As a convenience, the {@code main} of this class (JSR166TestCase)
135	>	* runs all JSR166 unit tests.
136		*
137		* </ul>
138		*/
#	Line 143 | Line 171 | public class JSR166TestCase extends Test
171		Integer.getInteger("jsr166.runsPerTest", 1);
172
173		/**
174	+	* The number of repetitions of the test suite (for finding leaks?).
175	+	*/
176	+	private static final int suiteRuns =
177	+	Integer.getInteger("jsr166.suiteRuns", 1);
178	+
179	+	public JSR166TestCase() { super(); }
180	+	public JSR166TestCase(String name) { super(name); }
181	+
182	+	/**
183		* A filter for tests to run, matching strings of the form
184		* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
185		* Usefully combined with jsr166.runsPerTest.
#	Line 154 | Line 191 | public class JSR166TestCase extends Test
191		return (regex == null) ? null : Pattern.compile(regex);
192		}
193
194	<	protected void runTest() throws Throwable {
194	>	// Instrumentation to debug very rare, but very annoying hung test runs.
195	>	static volatile TestCase currentTestCase;
196	>	// static volatile int currentRun = 0;
197	>	static {
198	>	Runnable checkForWedgedTest = new Runnable() { public void run() {
199	>	// avoid spurious reports with enormous runsPerTest
200	>	final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
201	>	for (TestCase lastTestCase = currentTestCase;;) {
202	>	try { MINUTES.sleep(timeoutMinutes); }
203	>	catch (InterruptedException unexpected) { break; }
204	>	if (lastTestCase == currentTestCase) {
205	>	System.err.printf(
206	>	"Looks like we're stuck running test: %s%n",
207	>	lastTestCase);
208	>	//                     System.err.printf(
209	>	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
210	>	//                         lastTestCase, currentRun, runsPerTest);
211	>	System.err.println("availableProcessors=" +
212	>	Runtime.getRuntime().availableProcessors());
213	>	System.err.printf("cpu model = %s%n", cpuModel());
214	>	dumpTestThreads();
215	>	// one stack dump is probably enough; more would be spam
216	>	break;
217	>	}
218	>	lastTestCase = currentTestCase;
219	>	}}};
220	>	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
221	>	thread.setDaemon(true);
222	>	thread.start();
223	>	}
224	>
225	>	public static String cpuModel() {
226	>	try {
227	>	Matcher matcher = Pattern.compile("model name\\s*: (.*)")
228	>	.matcher(new String(
229	>	Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
230	>	matcher.find();
231	>	return matcher.group(1);
232	>	} catch (Exception ex) { return null; }
233	>	}
234	>
235	>	public void runBare() throws Throwable {
236	>	currentTestCase = this;
237		if (methodFilter == null
238	<	|| methodFilter.matcher(toString()).find()) {
239	<	for (int i = 0; i < runsPerTest; i++) {
240	<	if (profileTests)
241	<	runTestProfiled();
242	<	else
243	<	super.runTest();
244	<	}
238	>	|| methodFilter.matcher(toString()).find())
239	>	super.runBare();
240	>	}
241	>
242	>	protected void runTest() throws Throwable {
243	>	for (int i = 0; i < runsPerTest; i++) {
244	>	// currentRun = i;
245	>	if (profileTests)
246	>	runTestProfiled();
247	>	else
248	>	super.runTest();
249		}
250		}
251
252		protected void runTestProfiled() throws Throwable {
253	<	// Warmup run, notably to trigger all needed classloading.
254	<	super.runTest();
172	<	long t0 = System.nanoTime();
173	<	try {
253	>	for (int i = 0; i < 2; i++) {
254	>	long startTime = System.nanoTime();
255		super.runTest();
256	<	} finally {
257	<	long elapsedMillis = millisElapsedSince(t0);
258	<	if (elapsedMillis >= profileThreshold)
256	>	long elapsedMillis = millisElapsedSince(startTime);
257	>	if (elapsedMillis < profileThreshold)
258	>	break;
259	>	// Never report first run of any test; treat it as a
260	>	// warmup run, notably to trigger all needed classloading,
261	>	if (i > 0)
262		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
263		}
264		}
265
266		/**
267		* Runs all JSR166 unit tests using junit.textui.TestRunner.
184	–	* Optional command line arg provides the number of iterations to
185	–	* repeat running the tests.
268		*/
269		public static void main(String[] args) {
270	+	main(suite(), args);
271	+	}
272	+
273	+	/**
274	+	* Runs all unit tests in the given test suite.
275	+	* Actual behavior influenced by jsr166.* system properties.
276	+	*/
277	+	static void main(Test suite, String[] args) {
278		if (useSecurityManager) {
279		System.err.println("Setting a permissive security manager");
280		Policy.setPolicy(permissivePolicy());
281		System.setSecurityManager(new SecurityManager());
282		}
283	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
284	<
285	<	Test s = suite();
286	<	for (int i = 0; i < iters; ++i) {
197	<	junit.textui.TestRunner.run(s);
283	>	for (int i = 0; i < suiteRuns; i++) {
284	>	TestResult result = junit.textui.TestRunner.run(suite);
285	>	if (!result.wasSuccessful())
286	>	System.exit(1);
287		System.gc();
288		System.runFinalization();
289		}
201	–	System.exit(0);
290		}
291
292		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 249 | Line 337 | public class JSR166TestCase extends Test
337		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
338		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
339		public static boolean atLeastJava9() {
340	<	// As of 2014-05, java9 still uses 52.0 class file version
341	<	return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
340	>	return JAVA_CLASS_VERSION >= 53.0
341	>	// As of 2015-09, java9 still uses 52.0 class file version
342	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
343	>	}
344	>	public static boolean atLeastJava10() {
345	>	return JAVA_CLASS_VERSION >= 54.0
346	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
347		}
348
349		/**
#	Line 339 | Line 432 | public class JSR166TestCase extends Test
432		"LongAdderTest",
433		"SplittableRandomTest",
434		"StampedLockTest",
435	+	"SubmissionPublisherTest",
436		"ThreadLocalRandom8Test",
437		};
438		addNamedTestClasses(suite, java8TestClassNames);
#	Line 347 | Line 441 | public class JSR166TestCase extends Test
441		// Java9+ test classes
442		if (atLeastJava9()) {
443		String[] java9TestClassNames = {
444	<	"ThreadPoolExecutor9Test",
444	>	// Currently empty, but expecting varhandle tests
445		};
446		addNamedTestClasses(suite, java9TestClassNames);
447		}
#	Line 355 | Line 449 | public class JSR166TestCase extends Test
449		return suite;
450		}
451
452	+	/** Returns list of junit-style test method names in given class. */
453	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
454	+	Method[] methods = testClass.getDeclaredMethods();
455	+	ArrayList<String> names = new ArrayList<String>(methods.length);
456	+	for (Method method : methods) {
457	+	if (method.getName().startsWith("test")
458	+	&& Modifier.isPublic(method.getModifiers())
459	+	// method.getParameterCount() requires jdk8+
460	+	&& method.getParameterTypes().length == 0) {
461	+	names.add(method.getName());
462	+	}
463	+	}
464	+	return names;
465	+	}
466	+
467	+	/**
468	+	* Returns junit-style testSuite for the given test class, but
469	+	* parameterized by passing extra data to each test.
470	+	*/
471	+	public static <ExtraData> Test parameterizedTestSuite
472	+	(Class<? extends JSR166TestCase> testClass,
473	+	Class<ExtraData> dataClass,
474	+	ExtraData data) {
475	+	try {
476	+	TestSuite suite = new TestSuite();
477	+	Constructor c =
478	+	testClass.getDeclaredConstructor(dataClass, String.class);
479	+	for (String methodName : testMethodNames(testClass))
480	+	suite.addTest((Test) c.newInstance(data, methodName));
481	+	return suite;
482	+	} catch (Exception e) {
483	+	throw new Error(e);
484	+	}
485	+	}
486	+
487	+	/**
488	+	* Returns junit-style testSuite for the jdk8 extension of the
489	+	* given test class, but parameterized by passing extra data to
490	+	* each test.  Uses reflection to allow compilation in jdk7.
491	+	*/
492	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
493	+	(Class<? extends JSR166TestCase> testClass,
494	+	Class<ExtraData> dataClass,
495	+	ExtraData data) {
496	+	if (atLeastJava8()) {
497	+	String name = testClass.getName();
498	+	String name8 = name.replaceAll("Test$", "8Test");
499	+	if (name.equals(name8)) throw new Error(name);
500	+	try {
501	+	return (Test)
502	+	Class.forName(name8)
503	+	.getMethod("testSuite", new Class[] { dataClass })
504	+	.invoke(null, data);
505	+	} catch (Exception e) {
506	+	throw new Error(e);
507	+	}
508	+	} else {
509	+	return new TestSuite();
510	+	}
511	+	}
512	+
513		// Delays for timing-dependent tests, in milliseconds.
514
515		public static long SHORT_DELAY_MS;
#	Line 389 | Line 544 | public class JSR166TestCase extends Test
544		}
545
546		/**
547	<	* Returns a new Date instance representing a time delayMillis
548	<	* milliseconds in the future.
547	>	* Returns a new Date instance representing a time at least
548	>	* delayMillis milliseconds in the future.
549		*/
550		Date delayedDate(long delayMillis) {
551	<	return new Date(System.currentTimeMillis() + delayMillis);
551	>	// Add 1 because currentTimeMillis is known to round into the past.
552	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
553		}
554
555		/**
#	Line 409 | Line 565 | public class JSR166TestCase extends Test
565		* the same test have no effect.
566		*/
567		public void threadRecordFailure(Throwable t) {
568	+	System.err.println(t);
569	+	dumpTestThreads();
570		threadFailure.compareAndSet(null, t);
571		}
572
#	Line 416 | Line 574 | public class JSR166TestCase extends Test
574		setDelays();
575		}
576
577	+	void tearDownFail(String format, Object... args) {
578	+	String msg = toString() + ": " + String.format(format, args);
579	+	System.err.println(msg);
580	+	dumpTestThreads();
581	+	throw new AssertionFailedError(msg);
582	+	}
583	+
584		/**
585		* Extra checks that get done for all test cases.
586		*
#	Line 443 | Line 608 | public class JSR166TestCase extends Test
608		}
609
610		if (Thread.interrupted())
611	<	throw new AssertionFailedError("interrupt status set in main thread");
611	>	tearDownFail("interrupt status set in main thread");
612
613		checkForkJoinPoolThreadLeaks();
614		}
615
616		/**
617	<	* Find missing try { ... } finally { joinPool(e); }
617	>	* Finds missing PoolCleaners
618		*/
619		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
620	<	Thread[] survivors = new Thread[5];
620	>	Thread[] survivors = new Thread[7];
621		int count = Thread.enumerate(survivors);
622		for (int i = 0; i < count; i++) {
623		Thread thread = survivors[i];
#	Line 460 | Line 625 | public class JSR166TestCase extends Test
625		if (name.startsWith("ForkJoinPool-")) {
626		// give thread some time to terminate
627		thread.join(LONG_DELAY_MS);
628	<	if (!thread.isAlive()) continue;
629	<	thread.stop();
630	<	throw new AssertionFailedError
466	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
467	<	toString(), name));
628	>	if (thread.isAlive())
629	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
630	>	thread);
631		}
632		}
633	+
634	+	if (!ForkJoinPool.commonPool()
635	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
636	+	tearDownFail("ForkJoin common pool thread stuck");
637		}
638
639		/**
#	Line 479 | Line 646 | public class JSR166TestCase extends Test
646		fail(reason);
647		} catch (AssertionFailedError t) {
648		threadRecordFailure(t);
649	<	fail(reason);
649	>	throw t;
650		}
651		}
652
#	Line 547 | Line 714 | public class JSR166TestCase extends Test
714		public void threadAssertEquals(Object x, Object y) {
715		try {
716		assertEquals(x, y);
717	<	} catch (AssertionFailedError t) {
718	<	threadRecordFailure(t);
719	<	throw t;
720	<	} catch (Throwable t) {
721	<	threadUnexpectedException(t);
717	>	} catch (AssertionFailedError fail) {
718	>	threadRecordFailure(fail);
719	>	throw fail;
720	>	} catch (Throwable fail) {
721	>	threadUnexpectedException(fail);
722		}
723		}
724
#	Line 563 | Line 730 | public class JSR166TestCase extends Test
730		public void threadAssertSame(Object x, Object y) {
731		try {
732		assertSame(x, y);
733	<	} catch (AssertionFailedError t) {
734	<	threadRecordFailure(t);
735	<	throw t;
733	>	} catch (AssertionFailedError fail) {
734	>	threadRecordFailure(fail);
735	>	throw fail;
736		}
737		}
738
#	Line 606 | Line 773 | public class JSR166TestCase extends Test
773		/**
774		* Delays, via Thread.sleep, for the given millisecond delay, but
775		* if the sleep is shorter than specified, may re-sleep or yield
776	<	* until time elapses.
776	>	* until time elapses.  Ensures that the given time, as measured
777	>	* by System.nanoTime(), has elapsed.
778		*/
779		static void delay(long millis) throws InterruptedException {
780	<	long startTime = System.nanoTime();
781	<	long ns = millis * 1000 * 1000;
782	<	for (;;) {
780	>	long nanos = millis * (1000 * 1000);
781	>	final long wakeupTime = System.nanoTime() + nanos;
782	>	do {
783		if (millis > 0L)
784		Thread.sleep(millis);
785		else // too short to sleep
786		Thread.yield();
787	<	long d = ns - (System.nanoTime() - startTime);
788	<	if (d > 0L)
789	<	millis = d / (1000 * 1000);
790	<	else
791	<	break;
787	>	nanos = wakeupTime - System.nanoTime();
788	>	millis = nanos / (1000 * 1000);
789	>	} while (nanos >= 0L);
790	>	}
791	>
792	>	/**
793	>	* Allows use of try-with-resources with per-test thread pools.
794	>	*/
795	>	class PoolCleaner implements AutoCloseable {
796	>	private final ExecutorService pool;
797	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
798	>	public void close() { joinPool(pool); }
799	>	}
800	>
801	>	/**
802	>	* An extension of PoolCleaner that has an action to release the pool.
803	>	*/
804	>	class PoolCleanerWithReleaser extends PoolCleaner {
805	>	private final Runnable releaser;
806	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
807	>	super(pool);
808	>	this.releaser = releaser;
809	>	}
810	>	public void close() {
811	>	try {
812	>	releaser.run();
813	>	} finally {
814	>	super.close();
815	>	}
816		}
817		}
818
819	+	PoolCleaner cleaner(ExecutorService pool) {
820	+	return new PoolCleaner(pool);
821	+	}
822	+
823	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
824	+	return new PoolCleanerWithReleaser(pool, releaser);
825	+	}
826	+
827	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
828	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
829	+	}
830	+
831	+	Runnable releaser(final CountDownLatch latch) {
832	+	return new Runnable() { public void run() {
833	+	do { latch.countDown(); }
834	+	while (latch.getCount() > 0);
835	+	}};
836	+	}
837	+
838		/**
839		* Waits out termination of a thread pool or fails doing so.
840		*/
841	<	void joinPool(ExecutorService exec) {
841	>	void joinPool(ExecutorService pool) {
842		try {
843	<	exec.shutdown();
844	<	if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
845	<	fail("ExecutorService " + exec +
846	<	" did not terminate in a timely manner");
843	>	pool.shutdown();
844	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
845	>	try {
846	>	threadFail("ExecutorService " + pool +
847	>	" did not terminate in a timely manner");
848	>	} finally {
849	>	// last resort, for the benefit of subsequent tests
850	>	pool.shutdownNow();
851	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
852	>	}
853	>	}
854		} catch (SecurityException ok) {
855		// Allowed in case test doesn't have privs
856	<	} catch (InterruptedException ie) {
857	<	fail("Unexpected InterruptedException");
856	>	} catch (InterruptedException fail) {
857	>	threadFail("Unexpected InterruptedException");
858		}
859		}
860
861	+	/** Like Runnable, but with the freedom to throw anything */
862	+	interface Action { public void run() throws Throwable; }
863	+
864		/**
865	<	* A debugging tool to print all stack traces, as jstack does.
865	>	* Runs all the given actions in parallel, failing if any fail.
866	>	* Useful for running multiple variants of tests that are
867	>	* necessarily individually slow because they must block.
868		*/
869	<	static void printAllStackTraces() {
870	<	for (ThreadInfo info :
871	<	ManagementFactory.getThreadMXBean()
872	<	.dumpAllThreads(true, true))
869	>	void testInParallel(Action ... actions) {
870	>	ExecutorService pool = Executors.newCachedThreadPool();
871	>	try (PoolCleaner cleaner = cleaner(pool)) {
872	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
873	>	for (final Action action : actions)
874	>	futures.add(pool.submit(new CheckedRunnable() {
875	>	public void realRun() throws Throwable { action.run();}}));
876	>	for (Future<?> future : futures)
877	>	try {
878	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
879	>	} catch (ExecutionException ex) {
880	>	threadUnexpectedException(ex.getCause());
881	>	} catch (Exception ex) {
882	>	threadUnexpectedException(ex);
883	>	}
884	>	}
885	>	}
886	>
887	>	/**
888	>	* A debugging tool to print stack traces of most threads, as jstack does.
889	>	* Uninteresting threads are filtered out.
890	>	*/
891	>	static void dumpTestThreads() {
892	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
893	>	System.err.println("------ stacktrace dump start ------");
894	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
895	>	String name = info.getThreadName();
896	>	if ("Signal Dispatcher".equals(name))
897	>	continue;
898	>	if ("Reference Handler".equals(name)
899	>	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
900	>	continue;
901	>	if ("Finalizer".equals(name)
902	>	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
903	>	continue;
904	>	if ("checkForWedgedTest".equals(name))
905	>	continue;
906		System.err.print(info);
907	+	}
908	+	System.err.println("------ stacktrace dump end ------");
909		}
910
911		/**
#	Line 666 | Line 924 | public class JSR166TestCase extends Test
924		// No need to optimize the failing case via Thread.join.
925		delay(millis);
926		assertTrue(thread.isAlive());
927	<	} catch (InterruptedException ie) {
928	<	fail("Unexpected InterruptedException");
927	>	} catch (InterruptedException fail) {
928	>	threadFail("Unexpected InterruptedException");
929		}
930		}
931
#	Line 688 | Line 946 | public class JSR166TestCase extends Test
946		delay(millis);
947		for (Thread thread : threads)
948		assertTrue(thread.isAlive());
949	<	} catch (InterruptedException ie) {
950	<	fail("Unexpected InterruptedException");
949	>	} catch (InterruptedException fail) {
950	>	threadFail("Unexpected InterruptedException");
951		}
952		}
953
#	Line 710 | Line 968 | public class JSR166TestCase extends Test
968		future.get(timeoutMillis, MILLISECONDS);
969		shouldThrow();
970		} catch (TimeoutException success) {
971	<	} catch (Exception e) {
972	<	threadUnexpectedException(e);
971	>	} catch (Exception fail) {
972	>	threadUnexpectedException(fail);
973		} finally { future.cancel(true); }
974		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
975		}
#	Line 867 | Line 1125 | public class JSR166TestCase extends Test
1125		void sleep(long millis) {
1126		try {
1127		delay(millis);
1128	<	} catch (InterruptedException ie) {
1128	>	} catch (InterruptedException fail) {
1129		AssertionFailedError afe =
1130		new AssertionFailedError("Unexpected InterruptedException");
1131	<	afe.initCause(ie);
1131	>	afe.initCause(fail);
1132		throw afe;
1133		}
1134		}
#	Line 908 | Line 1166 | public class JSR166TestCase extends Test
1166		/**
1167		* Returns the number of milliseconds since time given by
1168		* startNanoTime, which must have been previously returned from a
1169	<	* call to {@link System.nanoTime()}.
1169	>	* call to {@link System#nanoTime()}.
1170		*/
1171		static long millisElapsedSince(long startNanoTime) {
1172		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
#	Line 962 | Line 1220 | public class JSR166TestCase extends Test
1220		void awaitTermination(Thread t, long timeoutMillis) {
1221		try {
1222		t.join(timeoutMillis);
1223	<	} catch (InterruptedException ie) {
1224	<	threadUnexpectedException(ie);
1223	>	} catch (InterruptedException fail) {
1224	>	threadUnexpectedException(fail);
1225		} finally {
1226		if (t.getState() != Thread.State.TERMINATED) {
1227		t.interrupt();
1228	<	fail("Test timed out");
1228	>	threadFail("Test timed out");
1229		}
1230		}
1231		}
#	Line 989 | Line 1247 | public class JSR166TestCase extends Test
1247		public final void run() {
1248		try {
1249		realRun();
1250	<	} catch (Throwable t) {
1251	<	threadUnexpectedException(t);
1250	>	} catch (Throwable fail) {
1251	>	threadUnexpectedException(fail);
1252		}
1253		}
1254		}
#	Line 1044 | Line 1302 | public class JSR166TestCase extends Test
1302		threadShouldThrow("InterruptedException");
1303		} catch (InterruptedException success) {
1304		threadAssertFalse(Thread.interrupted());
1305	<	} catch (Throwable t) {
1306	<	threadUnexpectedException(t);
1305	>	} catch (Throwable fail) {
1306	>	threadUnexpectedException(fail);
1307		}
1308		}
1309		}
#	Line 1056 | Line 1314 | public class JSR166TestCase extends Test
1314		public final T call() {
1315		try {
1316		return realCall();
1317	<	} catch (Throwable t) {
1318	<	threadUnexpectedException(t);
1317	>	} catch (Throwable fail) {
1318	>	threadUnexpectedException(fail);
1319		return null;
1320		}
1321		}
#	Line 1074 | Line 1332 | public class JSR166TestCase extends Test
1332		return result;
1333		} catch (InterruptedException success) {
1334		threadAssertFalse(Thread.interrupted());
1335	<	} catch (Throwable t) {
1336	<	threadUnexpectedException(t);
1335	>	} catch (Throwable fail) {
1336	>	threadUnexpectedException(fail);
1337		}
1338		return null;
1339		}
#	Line 1092 | Line 1350 | public class JSR166TestCase extends Test
1350		public static final String TEST_STRING = "a test string";
1351
1352		public static class StringTask implements Callable<String> {
1353	<	public String call() { return TEST_STRING; }
1353	>	final String value;
1354	>	public StringTask() { this(TEST_STRING); }
1355	>	public StringTask(String value) { this.value = value; }
1356	>	public String call() { return value; }
1357		}
1358
1359		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1105 | Line 1366 | public class JSR166TestCase extends Test
1366		}};
1367		}
1368
1369	<	public Runnable awaiter(final CountDownLatch latch) {
1369	>	public Runnable countDowner(final CountDownLatch latch) {
1370		return new CheckedRunnable() {
1371		public void realRun() throws InterruptedException {
1372	<	await(latch);
1372	>	latch.countDown();
1373		}};
1374		}
1375
1376	+	class LatchAwaiter extends CheckedRunnable {
1377	+	static final int NEW = 0;
1378	+	static final int RUNNING = 1;
1379	+	static final int DONE = 2;
1380	+	final CountDownLatch latch;
1381	+	int state = NEW;
1382	+	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1383	+	public void realRun() throws InterruptedException {
1384	+	state = 1;
1385	+	await(latch);
1386	+	state = 2;
1387	+	}
1388	+	}
1389	+
1390	+	public LatchAwaiter awaiter(CountDownLatch latch) {
1391	+	return new LatchAwaiter(latch);
1392	+	}
1393	+
1394		public void await(CountDownLatch latch) {
1395		try {
1396		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1397	<	} catch (Throwable t) {
1398	<	threadUnexpectedException(t);
1397	>	} catch (Throwable fail) {
1398	>	threadUnexpectedException(fail);
1399		}
1400		}
1401
1402		public void await(Semaphore semaphore) {
1403		try {
1404		assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1405	<	} catch (Throwable t) {
1406	<	threadUnexpectedException(t);
1405	>	} catch (Throwable fail) {
1406	>	threadUnexpectedException(fail);
1407		}
1408		}
1409
#	Line 1318 | Line 1597 | public class JSR166TestCase extends Test
1597		@Override protected final void compute() {
1598		try {
1599		realCompute();
1600	<	} catch (Throwable t) {
1601	<	threadUnexpectedException(t);
1600	>	} catch (Throwable fail) {
1601	>	threadUnexpectedException(fail);
1602		}
1603		}
1604		}
#	Line 1333 | Line 1612 | public class JSR166TestCase extends Test
1612		@Override protected final T compute() {
1613		try {
1614		return realCompute();
1615	<	} catch (Throwable t) {
1616	<	threadUnexpectedException(t);
1615	>	} catch (Throwable fail) {
1616	>	threadUnexpectedException(fail);
1617		return null;
1618		}
1619		}
#	Line 1358 | Line 1637 | public class JSR166TestCase extends Test
1637		public int await() {
1638		try {
1639		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1640	<	} catch (TimeoutException e) {
1640	>	} catch (TimeoutException timedOut) {
1641		throw new AssertionFailedError("timed out");
1642	<	} catch (Exception e) {
1642	>	} catch (Exception fail) {
1643		AssertionFailedError afe =
1644	<	new AssertionFailedError("Unexpected exception: " + e);
1645	<	afe.initCause(e);
1644	>	new AssertionFailedError("Unexpected exception: " + fail);
1645	>	afe.initCause(fail);
1646		throw afe;
1647		}
1648		}
#	Line 1391 | Line 1670 | public class JSR166TestCase extends Test
1670		q.remove();
1671		shouldThrow();
1672		} catch (NoSuchElementException success) {}
1673	<	} catch (InterruptedException ie) {
1395	<	threadUnexpectedException(ie);
1396	<	}
1673	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1674		}
1675
1676		void assertSerialEquals(Object x, Object y) {
#	Line 1412 | Line 1689 | public class JSR166TestCase extends Test
1689		oos.flush();
1690		oos.close();
1691		return bos.toByteArray();
1692	<	} catch (Throwable t) {
1693	<	threadUnexpectedException(t);
1692	>	} catch (Throwable fail) {
1693	>	threadUnexpectedException(fail);
1694		return new byte[0];
1695		}
1696		}
#	Line 1426 | Line 1703 | public class JSR166TestCase extends Test
1703		T clone = (T) ois.readObject();
1704		assertSame(o.getClass(), clone.getClass());
1705		return clone;
1706	<	} catch (Throwable t) {
1707	<	threadUnexpectedException(t);
1706	>	} catch (Throwable fail) {
1707	>	threadUnexpectedException(fail);
1708		return null;
1709		}
1710		}
#	Line 1452 | Line 1729 | public class JSR166TestCase extends Test
1729		shouldThrow(expectedExceptionClass.getName());
1730		}
1731		}
1732	+
1733	+	public void assertIteratorExhausted(Iterator<?> it) {
1734	+	try {
1735	+	it.next();
1736	+	shouldThrow();
1737	+	} catch (NoSuchElementException success) {}
1738	+	assertFalse(it.hasNext());
1739	+	}
1740		}

Diff Legend

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