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.105 by dl, Thu Mar 21 19:06:54 2013 UTC vs.
Revision 1.167 by jsr166, Mon Oct 5 22:34:45 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.security.CodeSource;
24	+	import java.security.Permission;
25	+	import java.security.PermissionCollection;
26	+	import java.security.Permissions;
27	+	import java.security.Policy;
28	+	import java.security.ProtectionDomain;
29	+	import java.security.SecurityPermission;
30		import java.util.ArrayList;
31		import java.util.Arrays;
32		import java.util.Date;
33		import java.util.Enumeration;
34	+	import java.util.Iterator;
35		import java.util.List;
36		import java.util.NoSuchElementException;
37		import java.util.PropertyPermission;
38	<	import java.util.concurrent.*;
39	<	import java.util.concurrent.atomic.AtomicBoolean;
38	>	import java.util.concurrent.BlockingQueue;
39	>	import java.util.concurrent.Callable;
40	>	import java.util.concurrent.CountDownLatch;
41	>	import java.util.concurrent.CyclicBarrier;
42	>	import java.util.concurrent.ExecutionException;
43	>	import java.util.concurrent.Executors;
44	>	import java.util.concurrent.ExecutorService;
45	>	import java.util.concurrent.ForkJoinPool;
46	>	import java.util.concurrent.Future;
47	>	import java.util.concurrent.RecursiveAction;
48	>	import java.util.concurrent.RecursiveTask;
49	>	import java.util.concurrent.RejectedExecutionHandler;
50	>	import java.util.concurrent.Semaphore;
51	>	import java.util.concurrent.ThreadFactory;
52	>	import java.util.concurrent.ThreadPoolExecutor;
53	>	import java.util.concurrent.TimeoutException;
54		import java.util.concurrent.atomic.AtomicReference;
55	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
56	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
57	<	import java.security.CodeSource;
58	<	import java.security.Permission;
59	<	import java.security.PermissionCollection;
60	<	import java.security.Permissions;
61	<	import java.security.Policy;
34	<	import java.security.ProtectionDomain;
35	<	import java.security.SecurityPermission;
55	>	import java.util.regex.Pattern;
56	>
57	>	import junit.framework.AssertionFailedError;
58	>	import junit.framework.Test;
59	>	import junit.framework.TestCase;
60	>	import junit.framework.TestResult;
61	>	import junit.framework.TestSuite;
62
63		/**
64		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 44 | Line 70 | import java.security.SecurityPermission;
70		*
71		* <ol>
72		*
73	<	* <li> All assertions in code running in generated threads must use
73	>	* <li>All assertions in code running in generated threads must use
74		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
75		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
76		* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
77		* particularly recommended) for other code to use these forms too.
78		* Only the most typically used JUnit assertion methods are defined
79	<	* this way, but enough to live with.</li>
79	>	* this way, but enough to live with.
80		*
81	<	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
81	>	* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
82		* to invoke {@code super.setUp} and {@code super.tearDown} within
83		* them. These methods are used to clear and check for thread
84	<	* assertion failures.</li>
84	>	* assertion failures.
85		*
86		* <li>All delays and timeouts must use one of the constants {@code
87		* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
#	Line 66 | Line 92 | import java.security.SecurityPermission;
92		* is always discriminable as larger than SHORT and smaller than
93		* MEDIUM.  And so on. These constants are set to conservative values,
94		* but even so, if there is ever any doubt, they can all be increased
95	<	* in one spot to rerun tests on slower platforms.</li>
95	>	* in one spot to rerun tests on slower platforms.
96		*
97	<	* <li> All threads generated must be joined inside each test case
97	>	* <li>All threads generated must be joined inside each test case
98		* method (or {@code fail} to do so) before returning from the
99		* method. The {@code joinPool} method can be used to do this when
100	<	* using Executors.</li>
100	>	* using Executors.
101		*
102		* </ol>
103		*
104		* <p><b>Other notes</b>
105		* <ul>
106		*
107	<	* <li> Usually, there is one testcase method per JSR166 method
107	>	* <li>Usually, there is one testcase method per JSR166 method
108		* covering "normal" operation, and then as many exception-testing
109		* methods as there are exceptions the method can throw. Sometimes
110		* there are multiple tests per JSR166 method when the different
111		* "normal" behaviors differ significantly. And sometimes testcases
112		* cover multiple methods when they cannot be tested in
113	<	* isolation.</li>
113	>	* isolation.
114		*
115	<	* <li> The documentation style for testcases is to provide as javadoc
115	>	* <li>The documentation style for testcases is to provide as javadoc
116		* a simple sentence or two describing the property that the testcase
117		* method purports to test. The javadocs do not say anything about how
118	<	* the property is tested. To find out, read the code.</li>
118	>	* the property is tested. To find out, read the code.
119		*
120	<	* <li> These tests are "conformance tests", and do not attempt to
120	>	* <li>These tests are "conformance tests", and do not attempt to
121		* test throughput, latency, scalability or other performance factors
122		* (see the separate "jtreg" tests for a set intended to check these
123		* for the most central aspects of functionality.) So, most tests use
124		* the smallest sensible numbers of threads, collection sizes, etc
125	<	* needed to check basic conformance.</li>
125	>	* needed to check basic conformance.
126		*
127		* <li>The test classes currently do not declare inclusion in
128		* any particular package to simplify things for people integrating
129	<	* them in TCK test suites.</li>
129	>	* them in TCK test suites.
130		*
131	<	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
132	<	* runs all JSR166 unit tests.</li>
131	>	* <li>As a convenience, the {@code main} of this class (JSR166TestCase)
132	>	* runs all JSR166 unit tests.
133		*
134		* </ul>
135		*/
#	Line 115 | Line 141 | public class JSR166TestCase extends Test
141		Boolean.getBoolean("jsr166.expensiveTests");
142
143		/**
144	+	* If true, also run tests that are not part of the official tck
145	+	* because they test unspecified implementation details.
146	+	*/
147	+	protected static final boolean testImplementationDetails =
148	+	Boolean.getBoolean("jsr166.testImplementationDetails");
149	+
150	+	/**
151		* If true, report on stdout all "slow" tests, that is, ones that
152		* take more than profileThreshold milliseconds to execute.
153		*/
#	Line 128 | Line 161 | public class JSR166TestCase extends Test
161		private static final long profileThreshold =
162		Long.getLong("jsr166.profileThreshold", 100);
163
164	+	/**
165	+	* The number of repetitions per test (for tickling rare bugs).
166	+	*/
167	+	private static final int runsPerTest =
168	+	Integer.getInteger("jsr166.runsPerTest", 1);
169	+
170	+	/**
171	+	* The number of repetitions of the test suite (for finding leaks?).
172	+	*/
173	+	private static final int suiteRuns =
174	+	Integer.getInteger("jsr166.suiteRuns", 1);
175	+
176	+	public JSR166TestCase() { super(); }
177	+	public JSR166TestCase(String name) { super(name); }
178	+
179	+	/**
180	+	* A filter for tests to run, matching strings of the form
181	+	* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
182	+	* Usefully combined with jsr166.runsPerTest.
183	+	*/
184	+	private static final Pattern methodFilter = methodFilter();
185	+
186	+	private static Pattern methodFilter() {
187	+	String regex = System.getProperty("jsr166.methodFilter");
188	+	return (regex == null) ? null : Pattern.compile(regex);
189	+	}
190	+
191	+	static volatile TestCase currentTestCase;
192	+	static {
193	+	Runnable checkForWedgedTest = new Runnable() { public void run() {
194	+	// avoid spurious reports with enormous runsPerTest
195	+	final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
196	+	for (TestCase lastTestCase = currentTestCase;;) {
197	+	try { MINUTES.sleep(timeoutMinutes); }
198	+	catch (InterruptedException unexpected) { break; }
199	+	if (lastTestCase == currentTestCase) {
200	+	System.err.println
201	+	("Looks like we're stuck running test: "
202	+	+ lastTestCase);
203	+	dumpTestThreads();
204	+	// one stack dump is probably enough; more would be spam
205	+	break;
206	+	}
207	+	lastTestCase = currentTestCase;
208	+	}}};
209	+	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
210	+	thread.setDaemon(true);
211	+	thread.start();
212	+	}
213	+
214	+	public void runBare() throws Throwable {
215	+	currentTestCase = this;
216	+	if (methodFilter == null
217	+	|| methodFilter.matcher(toString()).find())
218	+	super.runBare();
219	+	}
220	+
221		protected void runTest() throws Throwable {
222	<	if (profileTests)
223	<	runTestProfiled();
224	<	else
225	<	super.runTest();
222	>	for (int i = 0; i < runsPerTest; i++) {
223	>	if (profileTests)
224	>	runTestProfiled();
225	>	else
226	>	super.runTest();
227	>	}
228		}
229
230		protected void runTestProfiled() throws Throwable {
231	<	long t0 = System.nanoTime();
232	<	try {
231	>	for (int i = 0; i < 2; i++) {
232	>	long startTime = System.nanoTime();
233		super.runTest();
234	<	} finally {
235	<	long elapsedMillis =
236	<	(System.nanoTime() - t0) / (1000L * 1000L);
237	<	if (elapsedMillis >= profileThreshold)
234	>	long elapsedMillis = millisElapsedSince(startTime);
235	>	if (elapsedMillis < profileThreshold)
236	>	break;
237	>	// Never report first run of any test; treat it as a
238	>	// warmup run, notably to trigger all needed classloading,
239	>	if (i > 0)
240		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
241		}
242		}
243
244		/**
245		* Runs all JSR166 unit tests using junit.textui.TestRunner.
152	–	* Optional command line arg provides the number of iterations to
153	–	* repeat running the tests.
246		*/
247		public static void main(String[] args) {
248	+	main(suite(), args);
249	+	}
250	+
251	+	/**
252	+	* Runs all unit tests in the given test suite.
253	+	* Actual behavior influenced by jsr166.* system properties.
254	+	*/
255	+	static void main(Test suite, String[] args) {
256		if (useSecurityManager) {
257		System.err.println("Setting a permissive security manager");
258		Policy.setPolicy(permissivePolicy());
259		System.setSecurityManager(new SecurityManager());
260		}
261	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
262	<
263	<	Test s = suite();
264	<	for (int i = 0; i < iters; ++i) {
165	<	junit.textui.TestRunner.run(s);
261	>	for (int i = 0; i < suiteRuns; i++) {
262	>	TestResult result = junit.textui.TestRunner.run(suite);
263	>	if (!result.wasSuccessful())
264	>	System.exit(1);
265		System.gc();
266		System.runFinalization();
267		}
169	–	System.exit(0);
268		}
269
270		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 197 | Line 295 | public class JSR166TestCase extends Test
295		}
296
297		public static final double JAVA_CLASS_VERSION;
298	+	public static final String JAVA_SPECIFICATION_VERSION;
299		static {
300		try {
301		JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
302		new java.security.PrivilegedAction<Double>() {
303		public Double run() {
304		return Double.valueOf(System.getProperty("java.class.version"));}});
305	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
306	+	new java.security.PrivilegedAction<String>() {
307	+	public String run() {
308	+	return System.getProperty("java.specification.version");}});
309		} catch (Throwable t) {
310		throw new Error(t);
311		}
#	Line 211 | Line 314 | public class JSR166TestCase extends Test
314		public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
315		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
316		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
317	+	public static boolean atLeastJava9() {
318	+	return JAVA_CLASS_VERSION >= 53.0
319	+	// As of 2015-09, java9 still uses 52.0 class file version
320	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
321	+	}
322	+	public static boolean atLeastJava10() {
323	+	return JAVA_CLASS_VERSION >= 54.0
324	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
325	+	}
326
327		/**
328		* Collects all JSR166 unit tests as one suite.
#	Line 286 | Line 398 | public class JSR166TestCase extends Test
398		// Java8+ test classes
399		if (atLeastJava8()) {
400		String[] java8TestClassNames = {
401	+	"Atomic8Test",
402		"CompletableFutureTest",
403		"ConcurrentHashMap8Test",
404		"CountedCompleterTest",
405		"DoubleAccumulatorTest",
406		"DoubleAdderTest",
407		"ForkJoinPool8Test",
408	+	"ForkJoinTask8Test",
409		"LongAccumulatorTest",
410		"LongAdderTest",
411	+	"SplittableRandomTest",
412		"StampedLockTest",
413	+	"SubmissionPublisherTest",
414	+	"ThreadLocalRandom8Test",
415		};
416		addNamedTestClasses(suite, java8TestClassNames);
417		}
418
419	+	// Java9+ test classes
420	+	if (atLeastJava9()) {
421	+	String[] java9TestClassNames = {
422	+	// Currently empty, but expecting varhandle tests
423	+	};
424	+	addNamedTestClasses(suite, java9TestClassNames);
425	+	}
426	+
427		return suite;
428		}
429
430	+	/** Returns list of junit-style test method names in given class. */
431	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
432	+	Method[] methods = testClass.getDeclaredMethods();
433	+	ArrayList<String> names = new ArrayList<String>(methods.length);
434	+	for (Method method : methods) {
435	+	if (method.getName().startsWith("test")
436	+	&& Modifier.isPublic(method.getModifiers())
437	+	// method.getParameterCount() requires jdk8+
438	+	&& method.getParameterTypes().length == 0) {
439	+	names.add(method.getName());
440	+	}
441	+	}
442	+	return names;
443	+	}
444	+
445	+	/**
446	+	* Returns junit-style testSuite for the given test class, but
447	+	* parameterized by passing extra data to each test.
448	+	*/
449	+	public static <ExtraData> Test parameterizedTestSuite
450	+	(Class<? extends JSR166TestCase> testClass,
451	+	Class<ExtraData> dataClass,
452	+	ExtraData data) {
453	+	try {
454	+	TestSuite suite = new TestSuite();
455	+	Constructor c =
456	+	testClass.getDeclaredConstructor(dataClass, String.class);
457	+	for (String methodName : testMethodNames(testClass))
458	+	suite.addTest((Test) c.newInstance(data, methodName));
459	+	return suite;
460	+	} catch (Exception e) {
461	+	throw new Error(e);
462	+	}
463	+	}
464	+
465	+	/**
466	+	* Returns junit-style testSuite for the jdk8 extension of the
467	+	* given test class, but parameterized by passing extra data to
468	+	* each test.  Uses reflection to allow compilation in jdk7.
469	+	*/
470	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
471	+	(Class<? extends JSR166TestCase> testClass,
472	+	Class<ExtraData> dataClass,
473	+	ExtraData data) {
474	+	if (atLeastJava8()) {
475	+	String name = testClass.getName();
476	+	String name8 = name.replaceAll("Test$", "8Test");
477	+	if (name.equals(name8)) throw new Error(name);
478	+	try {
479	+	return (Test)
480	+	Class.forName(name8)
481	+	.getMethod("testSuite", new Class[] { dataClass })
482	+	.invoke(null, data);
483	+	} catch (Exception e) {
484	+	throw new Error(e);
485	+	}
486	+	} else {
487	+	return new TestSuite();
488	+	}
489	+	}
490	+
491	+	// Delays for timing-dependent tests, in milliseconds.
492
493		public static long SHORT_DELAY_MS;
494		public static long SMALL_DELAY_MS;
495		public static long MEDIUM_DELAY_MS;
496		public static long LONG_DELAY_MS;
497
311	–
498		/**
499		* Returns the shortest timed delay. This could
500		* be reimplemented to use for example a Property.
#	Line 336 | Line 522 | public class JSR166TestCase extends Test
522		}
523
524		/**
525	<	* Returns a new Date instance representing a time delayMillis
526	<	* milliseconds in the future.
525	>	* Returns a new Date instance representing a time at least
526	>	* delayMillis milliseconds in the future.
527		*/
528		Date delayedDate(long delayMillis) {
529	<	return new Date(System.currentTimeMillis() + delayMillis);
529	>	// Add 1 because currentTimeMillis is known to round into the past.
530	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
531		}
532
533		/**
#	Line 356 | Line 543 | public class JSR166TestCase extends Test
543		* the same test have no effect.
544		*/
545		public void threadRecordFailure(Throwable t) {
546	+	System.err.println(t);
547	+	dumpTestThreads();
548		threadFailure.compareAndSet(null, t);
549		}
550
#	Line 363 | Line 552 | public class JSR166TestCase extends Test
552		setDelays();
553		}
554
555	+	void tearDownFail(String format, Object... args) {
556	+	String msg = toString() + ": " + String.format(format, args);
557	+	System.err.println(msg);
558	+	dumpTestThreads();
559	+	throw new AssertionFailedError(msg);
560	+	}
561	+
562		/**
563		* Extra checks that get done for all test cases.
564		*
#	Line 390 | Line 586 | public class JSR166TestCase extends Test
586		}
587
588		if (Thread.interrupted())
589	<	throw new AssertionFailedError("interrupt status set in main thread");
589	>	tearDownFail("interrupt status set in main thread");
590
591		checkForkJoinPoolThreadLeaks();
592		}
593
594		/**
595	<	* Find missing try { ... } finally { joinPool(e); }
595	>	* Finds missing PoolCleaners
596		*/
597		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
598	<	Thread[] survivors = new Thread[5];
598	>	Thread[] survivors = new Thread[7];
599		int count = Thread.enumerate(survivors);
600		for (int i = 0; i < count; i++) {
601		Thread thread = survivors[i];
#	Line 407 | Line 603 | public class JSR166TestCase extends Test
603		if (name.startsWith("ForkJoinPool-")) {
604		// give thread some time to terminate
605		thread.join(LONG_DELAY_MS);
606	<	if (!thread.isAlive()) continue;
607	<	thread.stop();
608	<	throw new AssertionFailedError
413	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
414	<	toString(), name));
606	>	if (thread.isAlive())
607	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
608	>	thread);
609		}
610		}
611	+
612	+	if (!ForkJoinPool.commonPool()
613	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
614	+	tearDownFail("ForkJoin common pool thread stuck");
615		}
616
617		/**
#	Line 426 | Line 624 | public class JSR166TestCase extends Test
624		fail(reason);
625		} catch (AssertionFailedError t) {
626		threadRecordFailure(t);
627	<	fail(reason);
627	>	throw t;
628		}
629		}
630
#	Line 494 | Line 692 | public class JSR166TestCase extends Test
692		public void threadAssertEquals(Object x, Object y) {
693		try {
694		assertEquals(x, y);
695	<	} catch (AssertionFailedError t) {
696	<	threadRecordFailure(t);
697	<	throw t;
698	<	} catch (Throwable t) {
699	<	threadUnexpectedException(t);
695	>	} catch (AssertionFailedError fail) {
696	>	threadRecordFailure(fail);
697	>	throw fail;
698	>	} catch (Throwable fail) {
699	>	threadUnexpectedException(fail);
700		}
701		}
702
#	Line 510 | Line 708 | public class JSR166TestCase extends Test
708		public void threadAssertSame(Object x, Object y) {
709		try {
710		assertSame(x, y);
711	<	} catch (AssertionFailedError t) {
712	<	threadRecordFailure(t);
713	<	throw t;
711	>	} catch (AssertionFailedError fail) {
712	>	threadRecordFailure(fail);
713	>	throw fail;
714		}
715		}
716
#	Line 553 | Line 751 | public class JSR166TestCase extends Test
751		/**
752		* Delays, via Thread.sleep, for the given millisecond delay, but
753		* if the sleep is shorter than specified, may re-sleep or yield
754	<	* until time elapses.
754	>	* until time elapses.  Ensures that the given time, as measured
755	>	* by System.nanoTime(), has elapsed.
756		*/
757		static void delay(long millis) throws InterruptedException {
758	<	long startTime = System.nanoTime();
759	<	long ns = millis * 1000 * 1000;
760	<	for (;;) {
758	>	long nanos = millis * (1000 * 1000);
759	>	final long wakeupTime = System.nanoTime() + nanos;
760	>	do {
761		if (millis > 0L)
762		Thread.sleep(millis);
763		else // too short to sleep
764		Thread.yield();
765	<	long d = ns - (System.nanoTime() - startTime);
766	<	if (d > 0L)
767	<	millis = d / (1000 * 1000);
768	<	else
769	<	break;
765	>	nanos = wakeupTime - System.nanoTime();
766	>	millis = nanos / (1000 * 1000);
767	>	} while (nanos >= 0L);
768	>	}
769	>
770	>	/**
771	>	* Allows use of try-with-resources with per-test thread pools.
772	>	*/
773	>	class PoolCleaner implements AutoCloseable {
774	>	private final ExecutorService pool;
775	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
776	>	public void close() { joinPool(pool); }
777	>	}
778	>
779	>	/**
780	>	* An extension of PoolCleaner that has an action to release the pool.
781	>	*/
782	>	class PoolCleanerWithReleaser extends PoolCleaner {
783	>	private final Runnable releaser;
784	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
785	>	super(pool);
786	>	this.releaser = releaser;
787	>	}
788	>	public void close() {
789	>	try {
790	>	releaser.run();
791	>	} finally {
792	>	super.close();
793	>	}
794		}
795		}
796
797	+	PoolCleaner cleaner(ExecutorService pool) {
798	+	return new PoolCleaner(pool);
799	+	}
800	+
801	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
802	+	return new PoolCleanerWithReleaser(pool, releaser);
803	+	}
804	+
805	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
806	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
807	+	}
808	+
809	+	Runnable releaser(final CountDownLatch latch) {
810	+	return new Runnable() { public void run() {
811	+	do { latch.countDown(); }
812	+	while (latch.getCount() > 0);
813	+	}};
814	+	}
815	+
816		/**
817		* Waits out termination of a thread pool or fails doing so.
818		*/
819	<	void joinPool(ExecutorService exec) {
819	>	void joinPool(ExecutorService pool) {
820		try {
821	<	exec.shutdown();
822	<	assertTrue("ExecutorService did not terminate in a timely manner",
823	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
821	>	pool.shutdown();
822	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
823	>	try {
824	>	threadFail("ExecutorService " + pool +
825	>	" did not terminate in a timely manner");
826	>	} finally {
827	>	// last resort, for the benefit of subsequent tests
828	>	pool.shutdownNow();
829	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
830	>	}
831	>	}
832		} catch (SecurityException ok) {
833		// Allowed in case test doesn't have privs
834	<	} catch (InterruptedException ie) {
835	<	fail("Unexpected InterruptedException");
834	>	} catch (InterruptedException fail) {
835	>	threadFail("Unexpected InterruptedException");
836	>	}
837	>	}
838	>
839	>	/** Like Runnable, but with the freedom to throw anything */
840	>	interface Action { public void run() throws Throwable; }
841	>
842	>	/**
843	>	* Runs all the given actions in parallel, failing if any fail.
844	>	* Useful for running multiple variants of tests that are
845	>	* necessarily individually slow because they must block.
846	>	*/
847	>	void testInParallel(Action ... actions) {
848	>	ExecutorService pool = Executors.newCachedThreadPool();
849	>	try (PoolCleaner cleaner = cleaner(pool)) {
850	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
851	>	for (final Action action : actions)
852	>	futures.add(pool.submit(new CheckedRunnable() {
853	>	public void realRun() throws Throwable { action.run();}}));
854	>	for (Future<?> future : futures)
855	>	try {
856	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
857	>	} catch (ExecutionException ex) {
858	>	threadUnexpectedException(ex.getCause());
859	>	} catch (Exception ex) {
860	>	threadUnexpectedException(ex);
861	>	}
862		}
863		}
864
865		/**
866	<	* A debugging tool to print all stack traces, as jstack does.
866	>	* A debugging tool to print stack traces of most threads, as jstack does.
867	>	* Uninteresting threads are filtered out.
868		*/
869	<	static void printAllStackTraces() {
870	<	for (ThreadInfo info :
871	<	ManagementFactory.getThreadMXBean()
872	<	.dumpAllThreads(true, true))
869	>	static void dumpTestThreads() {
870	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
871	>	System.err.println("------ stacktrace dump start ------");
872	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
873	>	String name = info.getThreadName();
874	>	if ("Signal Dispatcher".equals(name))
875	>	continue;
876	>	if ("Reference Handler".equals(name)
877	>	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
878	>	continue;
879	>	if ("Finalizer".equals(name)
880	>	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
881	>	continue;
882	>	if ("checkForWedgedTest".equals(name))
883	>	continue;
884		System.err.print(info);
885	+	}
886	+	System.err.println("------ stacktrace dump end ------");
887		}
888
889		/**
#	Line 612 | Line 902 | public class JSR166TestCase extends Test
902		// No need to optimize the failing case via Thread.join.
903		delay(millis);
904		assertTrue(thread.isAlive());
905	<	} catch (InterruptedException ie) {
906	<	fail("Unexpected InterruptedException");
905	>	} catch (InterruptedException fail) {
906	>	threadFail("Unexpected InterruptedException");
907		}
908		}
909
#	Line 634 | Line 924 | public class JSR166TestCase extends Test
924		delay(millis);
925		for (Thread thread : threads)
926		assertTrue(thread.isAlive());
927	<	} catch (InterruptedException ie) {
928	<	fail("Unexpected InterruptedException");
927	>	} catch (InterruptedException fail) {
928	>	threadFail("Unexpected InterruptedException");
929		}
930		}
931
#	Line 656 | Line 946 | public class JSR166TestCase extends Test
946		future.get(timeoutMillis, MILLISECONDS);
947		shouldThrow();
948		} catch (TimeoutException success) {
949	<	} catch (Exception e) {
950	<	threadUnexpectedException(e);
949	>	} catch (Exception fail) {
950	>	threadUnexpectedException(fail);
951		} finally { future.cancel(true); }
952		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
953		}
#	Line 701 | Line 991 | public class JSR166TestCase extends Test
991		public static final Integer m6  = new Integer(-6);
992		public static final Integer m10 = new Integer(-10);
993
704	–
994		/**
995		* Runs Runnable r with a security policy that permits precisely
996		* the specified permissions.  If there is no current security
#	Line 814 | Line 1103 | public class JSR166TestCase extends Test
1103		void sleep(long millis) {
1104		try {
1105		delay(millis);
1106	<	} catch (InterruptedException ie) {
1106	>	} catch (InterruptedException fail) {
1107		AssertionFailedError afe =
1108		new AssertionFailedError("Unexpected InterruptedException");
1109	<	afe.initCause(ie);
1109	>	afe.initCause(fail);
1110		throw afe;
1111		}
1112		}
#	Line 855 | Line 1144 | public class JSR166TestCase extends Test
1144		/**
1145		* Returns the number of milliseconds since time given by
1146		* startNanoTime, which must have been previously returned from a
1147	<	* call to {@link System.nanoTime()}.
1147	>	* call to {@link System#nanoTime()}.
1148		*/
1149	<	long millisElapsedSince(long startNanoTime) {
1149	>	static long millisElapsedSince(long startNanoTime) {
1150		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1151		}
1152
1153	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1154	+	//         long startTime = System.nanoTime();
1155	+	//         try {
1156	+	//             r.run();
1157	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1158	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1159	+	//             throw new AssertionFailedError("did not return promptly");
1160	+	//     }
1161	+
1162	+	//     void assertTerminatesPromptly(Runnable r) {
1163	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1164	+	//     }
1165	+
1166	+	/**
1167	+	* Checks that timed f.get() returns the expected value, and does not
1168	+	* wait for the timeout to elapse before returning.
1169	+	*/
1170	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1171	+	long startTime = System.nanoTime();
1172	+	try {
1173	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1174	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1175	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1176	+	throw new AssertionFailedError("timed get did not return promptly");
1177	+	}
1178	+
1179	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1180	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1181	+	}
1182	+
1183		/**
1184		* Returns a new started daemon Thread running the given runnable.
1185		*/
#	Line 879 | Line 1198 | public class JSR166TestCase extends Test
1198		void awaitTermination(Thread t, long timeoutMillis) {
1199		try {
1200		t.join(timeoutMillis);
1201	<	} catch (InterruptedException ie) {
1202	<	threadUnexpectedException(ie);
1201	>	} catch (InterruptedException fail) {
1202	>	threadUnexpectedException(fail);
1203		} finally {
1204		if (t.getState() != Thread.State.TERMINATED) {
1205		t.interrupt();
#	Line 906 | Line 1225 | public class JSR166TestCase extends Test
1225		public final void run() {
1226		try {
1227		realRun();
1228	<	} catch (Throwable t) {
1229	<	threadUnexpectedException(t);
1228	>	} catch (Throwable fail) {
1229	>	threadUnexpectedException(fail);
1230		}
1231		}
1232		}
#	Line 961 | Line 1280 | public class JSR166TestCase extends Test
1280		threadShouldThrow("InterruptedException");
1281		} catch (InterruptedException success) {
1282		threadAssertFalse(Thread.interrupted());
1283	<	} catch (Throwable t) {
1284	<	threadUnexpectedException(t);
1283	>	} catch (Throwable fail) {
1284	>	threadUnexpectedException(fail);
1285		}
1286		}
1287		}
#	Line 973 | Line 1292 | public class JSR166TestCase extends Test
1292		public final T call() {
1293		try {
1294		return realCall();
1295	<	} catch (Throwable t) {
1296	<	threadUnexpectedException(t);
1295	>	} catch (Throwable fail) {
1296	>	threadUnexpectedException(fail);
1297		return null;
1298		}
1299		}
#	Line 991 | Line 1310 | public class JSR166TestCase extends Test
1310		return result;
1311		} catch (InterruptedException success) {
1312		threadAssertFalse(Thread.interrupted());
1313	<	} catch (Throwable t) {
1314	<	threadUnexpectedException(t);
1313	>	} catch (Throwable fail) {
1314	>	threadUnexpectedException(fail);
1315		}
1316		return null;
1317		}
#	Line 1009 | Line 1328 | public class JSR166TestCase extends Test
1328		public static final String TEST_STRING = "a test string";
1329
1330		public static class StringTask implements Callable<String> {
1331	<	public String call() { return TEST_STRING; }
1331	>	final String value;
1332	>	public StringTask() { this(TEST_STRING); }
1333	>	public StringTask(String value) { this.value = value; }
1334	>	public String call() { return value; }
1335		}
1336
1337		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1022 | Line 1344 | public class JSR166TestCase extends Test
1344		}};
1345		}
1346
1347	<	public Runnable awaiter(final CountDownLatch latch) {
1347	>	public Runnable countDowner(final CountDownLatch latch) {
1348		return new CheckedRunnable() {
1349		public void realRun() throws InterruptedException {
1350	<	await(latch);
1350	>	latch.countDown();
1351		}};
1352		}
1353
1354	+	class LatchAwaiter extends CheckedRunnable {
1355	+	static final int NEW = 0;
1356	+	static final int RUNNING = 1;
1357	+	static final int DONE = 2;
1358	+	final CountDownLatch latch;
1359	+	int state = NEW;
1360	+	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1361	+	public void realRun() throws InterruptedException {
1362	+	state = 1;
1363	+	await(latch);
1364	+	state = 2;
1365	+	}
1366	+	}
1367	+
1368	+	public LatchAwaiter awaiter(CountDownLatch latch) {
1369	+	return new LatchAwaiter(latch);
1370	+	}
1371	+
1372		public void await(CountDownLatch latch) {
1373		try {
1374		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1375	<	} catch (Throwable t) {
1376	<	threadUnexpectedException(t);
1375	>	} catch (Throwable fail) {
1376	>	threadUnexpectedException(fail);
1377		}
1378		}
1379
1380		public void await(Semaphore semaphore) {
1381		try {
1382		assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1383	<	} catch (Throwable t) {
1384	<	threadUnexpectedException(t);
1383	>	} catch (Throwable fail) {
1384	>	threadUnexpectedException(fail);
1385		}
1386		}
1387
#	Line 1232 | Line 1572 | public class JSR166TestCase extends Test
1572		public abstract class CheckedRecursiveAction extends RecursiveAction {
1573		protected abstract void realCompute() throws Throwable;
1574
1575	<	public final void compute() {
1575	>	@Override protected final void compute() {
1576		try {
1577		realCompute();
1578	<	} catch (Throwable t) {
1579	<	threadUnexpectedException(t);
1578	>	} catch (Throwable fail) {
1579	>	threadUnexpectedException(fail);
1580		}
1581		}
1582		}
#	Line 1247 | Line 1587 | public class JSR166TestCase extends Test
1587		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1588		protected abstract T realCompute() throws Throwable;
1589
1590	<	public final T compute() {
1590	>	@Override protected final T compute() {
1591		try {
1592		return realCompute();
1593	<	} catch (Throwable t) {
1594	<	threadUnexpectedException(t);
1593	>	} catch (Throwable fail) {
1594	>	threadUnexpectedException(fail);
1595		return null;
1596		}
1597		}
#	Line 1275 | Line 1615 | public class JSR166TestCase extends Test
1615		public int await() {
1616		try {
1617		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1618	<	} catch (TimeoutException e) {
1618	>	} catch (TimeoutException timedOut) {
1619		throw new AssertionFailedError("timed out");
1620	<	} catch (Exception e) {
1620	>	} catch (Exception fail) {
1621		AssertionFailedError afe =
1622	<	new AssertionFailedError("Unexpected exception: " + e);
1623	<	afe.initCause(e);
1622	>	new AssertionFailedError("Unexpected exception: " + fail);
1623	>	afe.initCause(fail);
1624		throw afe;
1625		}
1626		}
#	Line 1308 | Line 1648 | public class JSR166TestCase extends Test
1648		q.remove();
1649		shouldThrow();
1650		} catch (NoSuchElementException success) {}
1651	<	} catch (InterruptedException ie) {
1312	<	threadUnexpectedException(ie);
1313	<	}
1651	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1652		}
1653
1654		void assertSerialEquals(Object x, Object y) {
#	Line 1329 | Line 1667 | public class JSR166TestCase extends Test
1667		oos.flush();
1668		oos.close();
1669		return bos.toByteArray();
1670	<	} catch (Throwable t) {
1671	<	threadUnexpectedException(t);
1670	>	} catch (Throwable fail) {
1671	>	threadUnexpectedException(fail);
1672		return new byte[0];
1673		}
1674		}
#	Line 1343 | Line 1681 | public class JSR166TestCase extends Test
1681		T clone = (T) ois.readObject();
1682		assertSame(o.getClass(), clone.getClass());
1683		return clone;
1684	<	} catch (Throwable t) {
1685	<	threadUnexpectedException(t);
1684	>	} catch (Throwable fail) {
1685	>	threadUnexpectedException(fail);
1686		return null;
1687		}
1688		}
1689	+
1690	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1691	+	Runnable... throwingActions) {
1692	+	for (Runnable throwingAction : throwingActions) {
1693	+	boolean threw = false;
1694	+	try { throwingAction.run(); }
1695	+	catch (Throwable t) {
1696	+	threw = true;
1697	+	if (!expectedExceptionClass.isInstance(t)) {
1698	+	AssertionFailedError afe =
1699	+	new AssertionFailedError
1700	+	("Expected " + expectedExceptionClass.getName() +
1701	+	", got " + t.getClass().getName());
1702	+	afe.initCause(t);
1703	+	threadUnexpectedException(afe);
1704	+	}
1705	+	}
1706	+	if (!threw)
1707	+	shouldThrow(expectedExceptionClass.getName());
1708	+	}
1709	+	}
1710	+
1711	+	public void assertIteratorExhausted(Iterator<?> it) {
1712	+	try {
1713	+	it.next();
1714	+	shouldThrow();
1715	+	} catch (NoSuchElementException success) {}
1716	+	assertFalse(it.hasNext());
1717	+	}
1718		}

Diff Legend

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