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.76 by dl, Fri May 6 11:22:07 2011 UTC vs.
Revision 1.165 by jsr166, Mon Oct 5 01:10:09 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.Arrays;
11	–	import java.util.NoSuchElementException;
12	–	import java.util.PropertyPermission;
13	–	import java.util.concurrent.*;
14	–	import java.util.concurrent.atomic.AtomicReference;
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;
#	Line 21 | Line 27 | 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.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 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 32 | 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 54 | 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>
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 103 | 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 116 | 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
245	>	* Runs all JSR166 unit tests using junit.textui.TestRunner.
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) {
151	<	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		}
155	–	System.exit(0);
268		}
269
270		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 168 | Line 280 | public class JSR166TestCase extends Test
280		return suite;
281		}
282
283	+	public static void addNamedTestClasses(TestSuite suite,
284	+	String... testClassNames) {
285	+	for (String testClassName : testClassNames) {
286	+	try {
287	+	Class<?> testClass = Class.forName(testClassName);
288	+	Method m = testClass.getDeclaredMethod("suite",
289	+	new Class<?>[0]);
290	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
291	+	} catch (Exception e) {
292	+	throw new Error("Missing test class", e);
293	+	}
294	+	}
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	+	}
312	+	}
313	+
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.
329		*/
330		public static Test suite() {
331	<	return newTestSuite(
331	>	// Java7+ test classes
332	>	TestSuite suite = newTestSuite(
333		ForkJoinPoolTest.suite(),
334		ForkJoinTaskTest.suite(),
335		RecursiveActionTest.suite(),
#	Line 237 | Line 394 | public class JSR166TestCase extends Test
394		TreeSetTest.suite(),
395		TreeSubMapTest.suite(),
396		TreeSubSetTest.suite());
397	+
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
248	–
498		/**
499		* Returns the shortest timed delay. This could
500		* be reimplemented to use for example a Property.
#	Line 254 | Line 503 | public class JSR166TestCase extends Test
503		return 50;
504		}
505
257	–
506		/**
507		* Sets delays as multiples of SHORT_DELAY.
508		*/
#	Line 266 | Line 514 | public class JSR166TestCase extends Test
514		}
515
516		/**
517	+	* Returns a timeout in milliseconds to be used in tests that
518	+	* verify that operations block or time out.
519	+	*/
520	+	long timeoutMillis() {
521	+	return SHORT_DELAY_MS / 4;
522	+	}
523	+
524	+	/**
525	+	* Returns a new Date instance representing a time at least
526	+	* delayMillis milliseconds in the future.
527	+	*/
528	+	Date delayedDate(long delayMillis) {
529	+	// Add 1 because currentTimeMillis is known to round into the past.
530	+	return new Date(System.currentTimeMillis() + delayMillis + 1);
531	+	}
532	+
533	+	/**
534		* The first exception encountered if any threadAssertXXX method fails.
535		*/
536		private final AtomicReference<Throwable> threadFailure
#	Line 278 | 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 285 | 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	+	*
565		* Triggers test case failure if any thread assertions have failed,
566		* by rethrowing, in the test harness thread, any exception recorded
567		* earlier by threadRecordFailure.
568	+	*
569	+	* Triggers test case failure if interrupt status is set in the main thread.
570		*/
571		public void tearDown() throws Exception {
572		Throwable t = threadFailure.getAndSet(null);
#	Line 306 | Line 584 | public class JSR166TestCase extends Test
584		throw afe;
585		}
586		}
587	+
588	+	if (Thread.interrupted())
589	+	tearDownFail("interrupt status set in main thread");
590	+
591	+	checkForkJoinPoolThreadLeaks();
592	+	}
593	+
594	+	/**
595	+	* Finds missing PoolCleaners
596	+	*/
597	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
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];
602	+	String name = thread.getName();
603	+	if (name.startsWith("ForkJoinPool-")) {
604	+	// give thread some time to terminate
605	+	thread.join(LONG_DELAY_MS);
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 318 | 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 386 | 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 402 | 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 437 | Line 743 | public class JSR166TestCase extends Test
743		else {
744		AssertionFailedError afe =
745		new AssertionFailedError("unexpected exception: " + t);
746	<	t.initCause(t);
746	>	afe.initCause(t);
747		throw afe;
748		}
749		}
750
751		/**
752	<	* Delays, via Thread.sleep for the given millisecond delay, but
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	<	public static void delay(long ms) throws InterruptedException {
758	<	long startTime = System.nanoTime();
759	<	long ns = ms * 1000 * 1000;
760	<	for (;;) {
761	<	if (ms > 0L)
762	<	Thread.sleep(ms);
757	>	static void delay(long millis) throws InterruptedException {
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	<	ms = d / (1000 * 1000);
768	<	else
769	<	break;
770	<	}
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	>	PoolCleaner cleaner(ExecutorService pool) {
780	>	return new PoolCleaner(pool);
781		}
782
783		/**
784		* Waits out termination of a thread pool or fails doing so.
785		*/
786	<	public void joinPool(ExecutorService exec) {
786	>	void joinPool(ExecutorService pool) {
787		try {
788	<	exec.shutdown();
789	<	assertTrue("ExecutorService did not terminate in a timely manner",
790	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
788	>	pool.shutdown();
789	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
790	>	try {
791	>	threadFail("ExecutorService " + pool +
792	>	" did not terminate in a timely manner");
793	>	} finally {
794	>	// last resort, for the benefit of subsequent tests
795	>	pool.shutdownNow();
796	>	pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
797	>	}
798	>	}
799		} catch (SecurityException ok) {
800		// Allowed in case test doesn't have privs
801	<	} catch (InterruptedException ie) {
802	<	fail("Unexpected InterruptedException");
801	>	} catch (InterruptedException fail) {
802	>	threadFail("Unexpected InterruptedException");
803	>	}
804	>	}
805	>
806	>	/** Like Runnable, but with the freedom to throw anything */
807	>	interface Action { public void run() throws Throwable; }
808	>
809	>	/**
810	>	* Runs all the given actions in parallel, failing if any fail.
811	>	* Useful for running multiple variants of tests that are
812	>	* necessarily individually slow because they must block.
813	>	*/
814	>	void testInParallel(Action ... actions) {
815	>	ExecutorService pool = Executors.newCachedThreadPool();
816	>	try (PoolCleaner cleaner = cleaner(pool)) {
817	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
818	>	for (final Action action : actions)
819	>	futures.add(pool.submit(new CheckedRunnable() {
820	>	public void realRun() throws Throwable { action.run();}}));
821	>	for (Future<?> future : futures)
822	>	try {
823	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
824	>	} catch (ExecutionException ex) {
825	>	threadUnexpectedException(ex.getCause());
826	>	} catch (Exception ex) {
827	>	threadUnexpectedException(ex);
828	>	}
829	>	}
830	>	}
831	>
832	>	/**
833	>	* A debugging tool to print stack traces of most threads, as jstack does.
834	>	* Uninteresting threads are filtered out.
835	>	*/
836	>	static void dumpTestThreads() {
837	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
838	>	System.err.println("------ stacktrace dump start ------");
839	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
840	>	String name = info.getThreadName();
841	>	if ("Signal Dispatcher".equals(name))
842	>	continue;
843	>	if ("Reference Handler".equals(name)
844	>	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
845	>	continue;
846	>	if ("Finalizer".equals(name)
847	>	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
848	>	continue;
849	>	if ("checkForWedgedTest".equals(name))
850	>	continue;
851	>	System.err.print(info);
852		}
853	+	System.err.println("------ stacktrace dump end ------");
854		}
855
856	+	/**
857	+	* Checks that thread does not terminate within the default
858	+	* millisecond delay of {@code timeoutMillis()}.
859	+	*/
860	+	void assertThreadStaysAlive(Thread thread) {
861	+	assertThreadStaysAlive(thread, timeoutMillis());
862	+	}
863	+
864	+	/**
865	+	* Checks that thread does not terminate within the given millisecond delay.
866	+	*/
867	+	void assertThreadStaysAlive(Thread thread, long millis) {
868	+	try {
869	+	// No need to optimize the failing case via Thread.join.
870	+	delay(millis);
871	+	assertTrue(thread.isAlive());
872	+	} catch (InterruptedException fail) {
873	+	threadFail("Unexpected InterruptedException");
874	+	}
875	+	}
876	+
877	+	/**
878	+	* Checks that the threads do not terminate within the default
879	+	* millisecond delay of {@code timeoutMillis()}.
880	+	*/
881	+	void assertThreadsStayAlive(Thread... threads) {
882	+	assertThreadsStayAlive(timeoutMillis(), threads);
883	+	}
884	+
885	+	/**
886	+	* Checks that the threads do not terminate within the given millisecond delay.
887	+	*/
888	+	void assertThreadsStayAlive(long millis, Thread... threads) {
889	+	try {
890	+	// No need to optimize the failing case via Thread.join.
891	+	delay(millis);
892	+	for (Thread thread : threads)
893	+	assertTrue(thread.isAlive());
894	+	} catch (InterruptedException fail) {
895	+	threadFail("Unexpected InterruptedException");
896	+	}
897	+	}
898	+
899	+	/**
900	+	* Checks that future.get times out, with the default timeout of
901	+	* {@code timeoutMillis()}.
902	+	*/
903	+	void assertFutureTimesOut(Future future) {
904	+	assertFutureTimesOut(future, timeoutMillis());
905	+	}
906	+
907	+	/**
908	+	* Checks that future.get times out, with the given millisecond timeout.
909	+	*/
910	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
911	+	long startTime = System.nanoTime();
912	+	try {
913	+	future.get(timeoutMillis, MILLISECONDS);
914	+	shouldThrow();
915	+	} catch (TimeoutException success) {
916	+	} catch (Exception fail) {
917	+	threadUnexpectedException(fail);
918	+	} finally { future.cancel(true); }
919	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
920	+	}
921
922		/**
923		* Fails with message "should throw exception".
#	Line 518 | Line 958 | public class JSR166TestCase extends Test
958		public static final Integer m6  = new Integer(-6);
959		public static final Integer m10 = new Integer(-10);
960
521	–
961		/**
962		* Runs Runnable r with a security policy that permits precisely
963		* the specified permissions.  If there is no current security
#	Line 530 | Line 969 | public class JSR166TestCase extends Test
969		SecurityManager sm = System.getSecurityManager();
970		if (sm == null) {
971		r.run();
972	+	}
973	+	runWithSecurityManagerWithPermissions(r, permissions);
974	+	}
975	+
976	+	/**
977	+	* Runs Runnable r with a security policy that permits precisely
978	+	* the specified permissions.  If there is no current security
979	+	* manager, a temporary one is set for the duration of the
980	+	* Runnable.  We require that any security manager permit
981	+	* getPolicy/setPolicy.
982	+	*/
983	+	public void runWithSecurityManagerWithPermissions(Runnable r,
984	+	Permission... permissions) {
985	+	SecurityManager sm = System.getSecurityManager();
986	+	if (sm == null) {
987		Policy savedPolicy = Policy.getPolicy();
988		try {
989		Policy.setPolicy(permissivePolicy());
990		System.setSecurityManager(new SecurityManager());
991	<	runWithPermissions(r, permissions);
991	>	runWithSecurityManagerWithPermissions(r, permissions);
992		} finally {
993		System.setSecurityManager(null);
994		Policy.setPolicy(savedPolicy);
#	Line 582 | Line 1036 | public class JSR166TestCase extends Test
1036		return perms.implies(p);
1037		}
1038		public void refresh() {}
1039	+	public String toString() {
1040	+	List<Permission> ps = new ArrayList<Permission>();
1041	+	for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1042	+	ps.add(e.nextElement());
1043	+	return "AdjustablePolicy with permissions " + ps;
1044	+	}
1045		}
1046
1047		/**
#	Line 610 | Line 1070 | public class JSR166TestCase extends Test
1070		void sleep(long millis) {
1071		try {
1072		delay(millis);
1073	<	} catch (InterruptedException ie) {
1073	>	} catch (InterruptedException fail) {
1074		AssertionFailedError afe =
1075		new AssertionFailedError("Unexpected InterruptedException");
1076	<	afe.initCause(ie);
1076	>	afe.initCause(fail);
1077		throw afe;
1078		}
1079		}
1080
1081		/**
1082	<	* Sleeps until the timeout has elapsed, or interrupted.
623	<	* Does <em>NOT</em> throw InterruptedException.
624	<	*/
625	<	void sleepTillInterrupted(long timeoutMillis) {
626	<	try {
627	<	Thread.sleep(timeoutMillis);
628	<	} catch (InterruptedException wakeup) {}
629	<	}
630	<
631	<	/**
632	<	* Waits up to the specified number of milliseconds for the given
1082	>	* Spin-waits up to the specified number of milliseconds for the given
1083		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1084		*/
1085		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1086	<	long timeoutNanos = timeoutMillis * 1000L * 1000L;
637	<	long t0 = System.nanoTime();
1086	>	long startTime = System.nanoTime();
1087		for (;;) {
1088		Thread.State s = thread.getState();
1089		if (s == Thread.State.BLOCKED ||
#	Line 643 | Line 1092 | public class JSR166TestCase extends Test
1092		return;
1093		else if (s == Thread.State.TERMINATED)
1094		fail("Unexpected thread termination");
1095	<	else if (System.nanoTime() - t0 > timeoutNanos) {
1095	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1096		threadAssertTrue(thread.isAlive());
1097		return;
1098		}
#	Line 662 | Line 1111 | public class JSR166TestCase extends Test
1111		/**
1112		* Returns the number of milliseconds since time given by
1113		* startNanoTime, which must have been previously returned from a
1114	<	* call to {@link System.nanoTime()}.
1114	>	* call to {@link System#nanoTime()}.
1115		*/
1116	<	long millisElapsedSince(long startNanoTime) {
1116	>	static long millisElapsedSince(long startNanoTime) {
1117		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1118		}
1119
1120	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1121	+	//         long startTime = System.nanoTime();
1122	+	//         try {
1123	+	//             r.run();
1124	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1125	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1126	+	//             throw new AssertionFailedError("did not return promptly");
1127	+	//     }
1128	+
1129	+	//     void assertTerminatesPromptly(Runnable r) {
1130	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1131	+	//     }
1132	+
1133	+	/**
1134	+	* Checks that timed f.get() returns the expected value, and does not
1135	+	* wait for the timeout to elapse before returning.
1136	+	*/
1137	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1138	+	long startTime = System.nanoTime();
1139	+	try {
1140	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1141	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1142	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1143	+	throw new AssertionFailedError("timed get did not return promptly");
1144	+	}
1145	+
1146	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1147	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1148	+	}
1149	+
1150		/**
1151		* Returns a new started daemon Thread running the given runnable.
1152		*/
#	Line 686 | Line 1165 | public class JSR166TestCase extends Test
1165		void awaitTermination(Thread t, long timeoutMillis) {
1166		try {
1167		t.join(timeoutMillis);
1168	<	} catch (InterruptedException ie) {
1169	<	threadUnexpectedException(ie);
1168	>	} catch (InterruptedException fail) {
1169	>	threadUnexpectedException(fail);
1170		} finally {
1171	<	if (t.isAlive()) {
1171	>	if (t.getState() != Thread.State.TERMINATED) {
1172		t.interrupt();
1173		fail("Test timed out");
1174		}
#	Line 713 | Line 1192 | public class JSR166TestCase extends Test
1192		public final void run() {
1193		try {
1194		realRun();
1195	<	} catch (Throwable t) {
1196	<	threadUnexpectedException(t);
1195	>	} catch (Throwable fail) {
1196	>	threadUnexpectedException(fail);
1197		}
1198		}
1199		}
#	Line 767 | Line 1246 | public class JSR166TestCase extends Test
1246		realRun();
1247		threadShouldThrow("InterruptedException");
1248		} catch (InterruptedException success) {
1249	<	} catch (Throwable t) {
1250	<	threadUnexpectedException(t);
1249	>	threadAssertFalse(Thread.interrupted());
1250	>	} catch (Throwable fail) {
1251	>	threadUnexpectedException(fail);
1252		}
1253		}
1254		}
#	Line 779 | Line 1259 | public class JSR166TestCase extends Test
1259		public final T call() {
1260		try {
1261		return realCall();
1262	<	} catch (Throwable t) {
1263	<	threadUnexpectedException(t);
1262	>	} catch (Throwable fail) {
1263	>	threadUnexpectedException(fail);
1264		return null;
1265		}
1266		}
#	Line 796 | Line 1276 | public class JSR166TestCase extends Test
1276		threadShouldThrow("InterruptedException");
1277		return result;
1278		} catch (InterruptedException success) {
1279	<	} catch (Throwable t) {
1280	<	threadUnexpectedException(t);
1279	>	threadAssertFalse(Thread.interrupted());
1280	>	} catch (Throwable fail) {
1281	>	threadUnexpectedException(fail);
1282		}
1283		return null;
1284		}
#	Line 814 | Line 1295 | public class JSR166TestCase extends Test
1295		public static final String TEST_STRING = "a test string";
1296
1297		public static class StringTask implements Callable<String> {
1298	<	public String call() { return TEST_STRING; }
1298	>	final String value;
1299	>	public StringTask() { this(TEST_STRING); }
1300	>	public StringTask(String value) { this.value = value; }
1301	>	public String call() { return value; }
1302		}
1303
1304		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 827 | Line 1311 | public class JSR166TestCase extends Test
1311		}};
1312		}
1313
1314	<	public Runnable awaiter(final CountDownLatch latch) {
1314	>	public Runnable countDowner(final CountDownLatch latch) {
1315		return new CheckedRunnable() {
1316		public void realRun() throws InterruptedException {
1317	<	latch.await();
1317	>	latch.countDown();
1318		}};
1319		}
1320
1321	+	class LatchAwaiter extends CheckedRunnable {
1322	+	static final int NEW = 0;
1323	+	static final int RUNNING = 1;
1324	+	static final int DONE = 2;
1325	+	final CountDownLatch latch;
1326	+	int state = NEW;
1327	+	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1328	+	public void realRun() throws InterruptedException {
1329	+	state = 1;
1330	+	await(latch);
1331	+	state = 2;
1332	+	}
1333	+	}
1334	+
1335	+	public LatchAwaiter awaiter(CountDownLatch latch) {
1336	+	return new LatchAwaiter(latch);
1337	+	}
1338	+
1339	+	public void await(CountDownLatch latch) {
1340	+	try {
1341	+	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1342	+	} catch (Throwable fail) {
1343	+	threadUnexpectedException(fail);
1344	+	}
1345	+	}
1346	+
1347	+	public void await(Semaphore semaphore) {
1348	+	try {
1349	+	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1350	+	} catch (Throwable fail) {
1351	+	threadUnexpectedException(fail);
1352	+	}
1353	+	}
1354	+
1355	+	//     /**
1356	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1357	+	//      */
1358	+	//     public void await(AtomicBoolean flag) {
1359	+	//         await(flag, LONG_DELAY_MS);
1360	+	//     }
1361	+
1362	+	//     /**
1363	+	//      * Spin-waits up to the specified timeout until flag becomes true.
1364	+	//      */
1365	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
1366	+	//         long startTime = System.nanoTime();
1367	+	//         while (!flag.get()) {
1368	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
1369	+	//                 throw new AssertionFailedError("timed out");
1370	+	//             Thread.yield();
1371	+	//         }
1372	+	//     }
1373	+
1374		public static class NPETask implements Callable<String> {
1375		public String call() { throw new NullPointerException(); }
1376		}
#	Line 1002 | Line 1539 | public class JSR166TestCase extends Test
1539		public abstract class CheckedRecursiveAction extends RecursiveAction {
1540		protected abstract void realCompute() throws Throwable;
1541
1542	<	public final void compute() {
1542	>	@Override protected final void compute() {
1543		try {
1544		realCompute();
1545	<	} catch (Throwable t) {
1546	<	threadUnexpectedException(t);
1545	>	} catch (Throwable fail) {
1546	>	threadUnexpectedException(fail);
1547		}
1548		}
1549		}
#	Line 1017 | Line 1554 | public class JSR166TestCase extends Test
1554		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1555		protected abstract T realCompute() throws Throwable;
1556
1557	<	public final T compute() {
1557	>	@Override protected final T compute() {
1558		try {
1559		return realCompute();
1560	<	} catch (Throwable t) {
1561	<	threadUnexpectedException(t);
1560	>	} catch (Throwable fail) {
1561	>	threadUnexpectedException(fail);
1562		return null;
1563		}
1564		}
#	Line 1036 | Line 1573 | public class JSR166TestCase extends Test
1573		}
1574
1575		/**
1576	<	* A CyclicBarrier that fails with AssertionFailedErrors instead
1577	<	* of throwing checked exceptions.
1576	>	* A CyclicBarrier that uses timed await and fails with
1577	>	* AssertionFailedErrors instead of throwing checked exceptions.
1578		*/
1579		public class CheckedBarrier extends CyclicBarrier {
1580		public CheckedBarrier(int parties) { super(parties); }
1581
1582		public int await() {
1583		try {
1584	<	return super.await();
1585	<	} catch (Exception e) {
1584	>	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1585	>	} catch (TimeoutException timedOut) {
1586	>	throw new AssertionFailedError("timed out");
1587	>	} catch (Exception fail) {
1588		AssertionFailedError afe =
1589	<	new AssertionFailedError("Unexpected exception: " + e);
1590	<	afe.initCause(e);
1589	>	new AssertionFailedError("Unexpected exception: " + fail);
1590	>	afe.initCause(fail);
1591		throw afe;
1592		}
1593		}
1594		}
1595
1596	<	public void checkEmpty(BlockingQueue q) {
1596	>	void checkEmpty(BlockingQueue q) {
1597		try {
1598		assertTrue(q.isEmpty());
1599		assertEquals(0, q.size());
#	Line 1076 | Line 1615 | public class JSR166TestCase extends Test
1615		q.remove();
1616		shouldThrow();
1617		} catch (NoSuchElementException success) {}
1618	<	} catch (InterruptedException ie) {
1619	<	threadUnexpectedException(ie);
1618	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1619	>	}
1620	>
1621	>	void assertSerialEquals(Object x, Object y) {
1622	>	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1623	>	}
1624	>
1625	>	void assertNotSerialEquals(Object x, Object y) {
1626	>	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1627	>	}
1628	>
1629	>	byte[] serialBytes(Object o) {
1630	>	try {
1631	>	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1632	>	ObjectOutputStream oos = new ObjectOutputStream(bos);
1633	>	oos.writeObject(o);
1634	>	oos.flush();
1635	>	oos.close();
1636	>	return bos.toByteArray();
1637	>	} catch (Throwable fail) {
1638	>	threadUnexpectedException(fail);
1639	>	return new byte[0];
1640	>	}
1641	>	}
1642	>
1643	>	@SuppressWarnings("unchecked")
1644	>	<T> T serialClone(T o) {
1645	>	try {
1646	>	ObjectInputStream ois = new ObjectInputStream
1647	>	(new ByteArrayInputStream(serialBytes(o)));
1648	>	T clone = (T) ois.readObject();
1649	>	assertSame(o.getClass(), clone.getClass());
1650	>	return clone;
1651	>	} catch (Throwable fail) {
1652	>	threadUnexpectedException(fail);
1653	>	return null;
1654		}
1655		}
1656
1657	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1658	+	Runnable... throwingActions) {
1659	+	for (Runnable throwingAction : throwingActions) {
1660	+	boolean threw = false;
1661	+	try { throwingAction.run(); }
1662	+	catch (Throwable t) {
1663	+	threw = true;
1664	+	if (!expectedExceptionClass.isInstance(t)) {
1665	+	AssertionFailedError afe =
1666	+	new AssertionFailedError
1667	+	("Expected " + expectedExceptionClass.getName() +
1668	+	", got " + t.getClass().getName());
1669	+	afe.initCause(t);
1670	+	threadUnexpectedException(afe);
1671	+	}
1672	+	}
1673	+	if (!threw)
1674	+	shouldThrow(expectedExceptionClass.getName());
1675	+	}
1676	+	}
1677	+
1678	+	public void assertIteratorExhausted(Iterator<?> it) {
1679	+	try {
1680	+	it.next();
1681	+	shouldThrow();
1682	+	} catch (NoSuchElementException success) {}
1683	+	assertFalse(it.hasNext());
1684	+	}
1685		}

Diff Legend

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