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.108 by jsr166, Mon Jun 3 18:20:05 2013 UTC vs.
Revision 1.161 by jsr166, Sun Oct 4 03:49:33 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 134 | Line 167 | public class JSR166TestCase extends Test
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	+	}
205	+	lastTestCase = currentTestCase;
206	+	}}};
207	+	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
208	+	thread.setDaemon(true);
209	+	thread.start();
210	+	}
211	+
212	+	public void runBare() throws Throwable {
213	+	currentTestCase = this;
214	+	if (methodFilter == null
215	+	|| methodFilter.matcher(toString()).find())
216	+	super.runBare();
217	+	}
218	+
219		protected void runTest() throws Throwable {
220		for (int i = 0; i < runsPerTest; i++) {
221		if (profileTests)
#	Line 144 | Line 226 | public class JSR166TestCase extends Test
226		}
227
228		protected void runTestProfiled() throws Throwable {
229	<	long t0 = System.nanoTime();
230	<	try {
229	>	for (int i = 0; i < 2; i++) {
230	>	long startTime = System.nanoTime();
231		super.runTest();
232	<	} finally {
233	<	long elapsedMillis =
234	<	(System.nanoTime() - t0) / (1000L * 1000L);
235	<	if (elapsedMillis >= profileThreshold)
232	>	long elapsedMillis = millisElapsedSince(startTime);
233	>	if (elapsedMillis < profileThreshold)
234	>	break;
235	>	// Never report first run of any test; treat it as a
236	>	// warmup run, notably to trigger all needed classloading,
237	>	if (i > 0)
238		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
239		}
240		}
241
242		/**
243		* Runs all JSR166 unit tests using junit.textui.TestRunner.
160	–	* Optional command line arg provides the number of iterations to
161	–	* repeat running the tests.
244		*/
245		public static void main(String[] args) {
246	+	main(suite(), args);
247	+	}
248	+
249	+	/**
250	+	* Runs all unit tests in the given test suite.
251	+	* Actual behavior influenced by jsr166.* system properties.
252	+	*/
253	+	static void main(Test suite, String[] args) {
254		if (useSecurityManager) {
255		System.err.println("Setting a permissive security manager");
256		Policy.setPolicy(permissivePolicy());
257		System.setSecurityManager(new SecurityManager());
258		}
259	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
260	<
261	<	Test s = suite();
262	<	for (int i = 0; i < iters; ++i) {
173	<	junit.textui.TestRunner.run(s);
259	>	for (int i = 0; i < suiteRuns; i++) {
260	>	TestResult result = junit.textui.TestRunner.run(suite);
261	>	if (!result.wasSuccessful())
262	>	System.exit(1);
263		System.gc();
264		System.runFinalization();
265		}
177	–	System.exit(0);
266		}
267
268		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 205 | Line 293 | public class JSR166TestCase extends Test
293		}
294
295		public static final double JAVA_CLASS_VERSION;
296	+	public static final String JAVA_SPECIFICATION_VERSION;
297		static {
298		try {
299		JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
300		new java.security.PrivilegedAction<Double>() {
301		public Double run() {
302		return Double.valueOf(System.getProperty("java.class.version"));}});
303	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
304	+	new java.security.PrivilegedAction<String>() {
305	+	public String run() {
306	+	return System.getProperty("java.specification.version");}});
307		} catch (Throwable t) {
308		throw new Error(t);
309		}
#	Line 219 | Line 312 | public class JSR166TestCase extends Test
312		public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
313		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
314		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
315	+	public static boolean atLeastJava9() {
316	+	return JAVA_CLASS_VERSION >= 53.0
317	+	// As of 2015-09, java9 still uses 52.0 class file version
318	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
319	+	}
320	+	public static boolean atLeastJava10() {
321	+	return JAVA_CLASS_VERSION >= 54.0
322	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
323	+	}
324
325		/**
326		* Collects all JSR166 unit tests as one suite.
#	Line 294 | Line 396 | public class JSR166TestCase extends Test
396		// Java8+ test classes
397		if (atLeastJava8()) {
398		String[] java8TestClassNames = {
399	+	"Atomic8Test",
400		"CompletableFutureTest",
401		"ConcurrentHashMap8Test",
402		"CountedCompleterTest",
403		"DoubleAccumulatorTest",
404		"DoubleAdderTest",
405		"ForkJoinPool8Test",
406	+	"ForkJoinTask8Test",
407		"LongAccumulatorTest",
408		"LongAdderTest",
409	+	"SplittableRandomTest",
410		"StampedLockTest",
411	+	"SubmissionPublisherTest",
412	+	"ThreadLocalRandom8Test",
413		};
414		addNamedTestClasses(suite, java8TestClassNames);
415		}
416
417	+	// Java9+ test classes
418	+	if (atLeastJava9()) {
419	+	String[] java9TestClassNames = {
420	+	// Currently empty, but expecting varhandle tests
421	+	};
422	+	addNamedTestClasses(suite, java9TestClassNames);
423	+	}
424	+
425		return suite;
426		}
427
428	+	/** Returns list of junit-style test method names in given class. */
429	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
430	+	Method[] methods = testClass.getDeclaredMethods();
431	+	ArrayList<String> names = new ArrayList<String>(methods.length);
432	+	for (Method method : methods) {
433	+	if (method.getName().startsWith("test")
434	+	&& Modifier.isPublic(method.getModifiers())
435	+	// method.getParameterCount() requires jdk8+
436	+	&& method.getParameterTypes().length == 0) {
437	+	names.add(method.getName());
438	+	}
439	+	}
440	+	return names;
441	+	}
442	+
443	+	/**
444	+	* Returns junit-style testSuite for the given test class, but
445	+	* parameterized by passing extra data to each test.
446	+	*/
447	+	public static <ExtraData> Test parameterizedTestSuite
448	+	(Class<? extends JSR166TestCase> testClass,
449	+	Class<ExtraData> dataClass,
450	+	ExtraData data) {
451	+	try {
452	+	TestSuite suite = new TestSuite();
453	+	Constructor c =
454	+	testClass.getDeclaredConstructor(dataClass, String.class);
455	+	for (String methodName : testMethodNames(testClass))
456	+	suite.addTest((Test) c.newInstance(data, methodName));
457	+	return suite;
458	+	} catch (Exception e) {
459	+	throw new Error(e);
460	+	}
461	+	}
462	+
463	+	/**
464	+	* Returns junit-style testSuite for the jdk8 extension of the
465	+	* given test class, but parameterized by passing extra data to
466	+	* each test.  Uses reflection to allow compilation in jdk7.
467	+	*/
468	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
469	+	(Class<? extends JSR166TestCase> testClass,
470	+	Class<ExtraData> dataClass,
471	+	ExtraData data) {
472	+	if (atLeastJava8()) {
473	+	String name = testClass.getName();
474	+	String name8 = name.replaceAll("Test$", "8Test");
475	+	if (name.equals(name8)) throw new Error(name);
476	+	try {
477	+	return (Test)
478	+	Class.forName(name8)
479	+	.getMethod("testSuite", new Class[] { dataClass })
480	+	.invoke(null, data);
481	+	} catch (Exception e) {
482	+	throw new Error(e);
483	+	}
484	+	} else {
485	+	return new TestSuite();
486	+	}
487	+	}
488	+
489	+	// Delays for timing-dependent tests, in milliseconds.
490
491		public static long SHORT_DELAY_MS;
492		public static long SMALL_DELAY_MS;
493		public static long MEDIUM_DELAY_MS;
494		public static long LONG_DELAY_MS;
495
319	–
496		/**
497		* Returns the shortest timed delay. This could
498		* be reimplemented to use for example a Property.
#	Line 344 | Line 520 | public class JSR166TestCase extends Test
520		}
521
522		/**
523	<	* Returns a new Date instance representing a time delayMillis
524	<	* milliseconds in the future.
523	>	* Returns a new Date instance representing a time at least
524	>	* delayMillis milliseconds in the future.
525		*/
526		Date delayedDate(long delayMillis) {
527	<	return new Date(System.currentTimeMillis() + delayMillis);
527	>	// Add 1 because currentTimeMillis is known to round into the past.
528	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
529		}
530
531		/**
#	Line 364 | Line 541 | public class JSR166TestCase extends Test
541		* the same test have no effect.
542		*/
543		public void threadRecordFailure(Throwable t) {
544	+	System.err.println(t);
545	+	dumpTestThreads();
546		threadFailure.compareAndSet(null, t);
547		}
548
#	Line 371 | Line 550 | public class JSR166TestCase extends Test
550		setDelays();
551		}
552
553	+	void tearDownFail(String format, Object... args) {
554	+	String msg = toString() + ": " + String.format(format, args);
555	+	System.err.println(msg);
556	+	dumpTestThreads();
557	+	throw new AssertionFailedError(msg);
558	+	}
559	+
560		/**
561		* Extra checks that get done for all test cases.
562		*
#	Line 398 | Line 584 | public class JSR166TestCase extends Test
584		}
585
586		if (Thread.interrupted())
587	<	throw new AssertionFailedError("interrupt status set in main thread");
587	>	tearDownFail("interrupt status set in main thread");
588
589		checkForkJoinPoolThreadLeaks();
590		}
591
592		/**
593	<	* Find missing try { ... } finally { joinPool(e); }
593	>	* Finds missing try { ... } finally { joinPool(e); }
594		*/
595		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
596	<	Thread[] survivors = new Thread[5];
596	>	Thread[] survivors = new Thread[7];
597		int count = Thread.enumerate(survivors);
598		for (int i = 0; i < count; i++) {
599		Thread thread = survivors[i];
#	Line 415 | Line 601 | public class JSR166TestCase extends Test
601		if (name.startsWith("ForkJoinPool-")) {
602		// give thread some time to terminate
603		thread.join(LONG_DELAY_MS);
604	<	if (!thread.isAlive()) continue;
605	<	thread.stop();
606	<	throw new AssertionFailedError
421	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
422	<	toString(), name));
604	>	if (thread.isAlive())
605	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
606	>	thread);
607		}
608		}
609	+
610	+	if (!ForkJoinPool.commonPool()
611	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
612	+	tearDownFail("ForkJoin common pool thread stuck");
613		}
614
615		/**
#	Line 434 | Line 622 | public class JSR166TestCase extends Test
622		fail(reason);
623		} catch (AssertionFailedError t) {
624		threadRecordFailure(t);
625	<	fail(reason);
625	>	throw t;
626		}
627		}
628
#	Line 502 | Line 690 | public class JSR166TestCase extends Test
690		public void threadAssertEquals(Object x, Object y) {
691		try {
692		assertEquals(x, y);
693	<	} catch (AssertionFailedError t) {
694	<	threadRecordFailure(t);
695	<	throw t;
696	<	} catch (Throwable t) {
697	<	threadUnexpectedException(t);
693	>	} catch (AssertionFailedError fail) {
694	>	threadRecordFailure(fail);
695	>	throw fail;
696	>	} catch (Throwable fail) {
697	>	threadUnexpectedException(fail);
698		}
699		}
700
#	Line 518 | Line 706 | public class JSR166TestCase extends Test
706		public void threadAssertSame(Object x, Object y) {
707		try {
708		assertSame(x, y);
709	<	} catch (AssertionFailedError t) {
710	<	threadRecordFailure(t);
711	<	throw t;
709	>	} catch (AssertionFailedError fail) {
710	>	threadRecordFailure(fail);
711	>	throw fail;
712		}
713		}
714
#	Line 580 | Line 768 | public class JSR166TestCase extends Test
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	<	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	<	* A debugging tool to print all stack traces, as jstack does.
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	<	static void printAllStackTraces() {
815	<	for (ThreadInfo info :
816	<	ManagementFactory.getThreadMXBean()
817	<	.dumpAllThreads(true, true))
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		/**
#	Line 620 | Line 869 | public class JSR166TestCase extends Test
869		// No need to optimize the failing case via Thread.join.
870		delay(millis);
871		assertTrue(thread.isAlive());
872	<	} catch (InterruptedException ie) {
873	<	fail("Unexpected InterruptedException");
872	>	} catch (InterruptedException fail) {
873	>	threadFail("Unexpected InterruptedException");
874		}
875		}
876
#	Line 642 | Line 891 | public class JSR166TestCase extends Test
891		delay(millis);
892		for (Thread thread : threads)
893		assertTrue(thread.isAlive());
894	<	} catch (InterruptedException ie) {
895	<	fail("Unexpected InterruptedException");
894	>	} catch (InterruptedException fail) {
895	>	threadFail("Unexpected InterruptedException");
896		}
897		}
898
#	Line 664 | Line 913 | public class JSR166TestCase extends Test
913		future.get(timeoutMillis, MILLISECONDS);
914		shouldThrow();
915		} catch (TimeoutException success) {
916	<	} catch (Exception e) {
917	<	threadUnexpectedException(e);
916	>	} catch (Exception fail) {
917	>	threadUnexpectedException(fail);
918		} finally { future.cancel(true); }
919		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
920		}
#	Line 709 | 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
712	–
961		/**
962		* Runs Runnable r with a security policy that permits precisely
963		* the specified permissions.  If there is no current security
#	Line 822 | 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		}
#	Line 863 | 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 887 | 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.getState() != Thread.State.TERMINATED) {
1172		t.interrupt();
#	Line 914 | 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 969 | Line 1247 | public class JSR166TestCase extends Test
1247		threadShouldThrow("InterruptedException");
1248		} catch (InterruptedException success) {
1249		threadAssertFalse(Thread.interrupted());
1250	<	} catch (Throwable t) {
1251	<	threadUnexpectedException(t);
1250	>	} catch (Throwable fail) {
1251	>	threadUnexpectedException(fail);
1252		}
1253		}
1254		}
#	Line 981 | 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 999 | Line 1277 | public class JSR166TestCase extends Test
1277		return result;
1278		} catch (InterruptedException success) {
1279		threadAssertFalse(Thread.interrupted());
1280	<	} catch (Throwable t) {
1281	<	threadUnexpectedException(t);
1280	>	} catch (Throwable fail) {
1281	>	threadUnexpectedException(fail);
1282		}
1283		return null;
1284		}
#	Line 1017 | 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 1030 | 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	<	await(latch);
1317	>	latch.countDown();
1318		}};
1319		}
1320
1321	+	class LatchAwaiter extends CheckedRunnable {
1322	+	final static int NEW = 0;
1323	+	final static int RUNNING = 1;
1324	+	final static 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 t) {
1343	<	threadUnexpectedException(t);
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 t) {
1351	<	threadUnexpectedException(t);
1350	>	} catch (Throwable fail) {
1351	>	threadUnexpectedException(fail);
1352		}
1353		}
1354
#	Line 1243 | Line 1542 | public class JSR166TestCase extends Test
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 1258 | Line 1557 | public class JSR166TestCase extends Test
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 1283 | Line 1582 | public class JSR166TestCase extends Test
1582		public int await() {
1583		try {
1584		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1585	<	} catch (TimeoutException e) {
1585	>	} catch (TimeoutException timedOut) {
1586		throw new AssertionFailedError("timed out");
1587	<	} catch (Exception e) {
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		}
#	Line 1316 | Line 1615 | public class JSR166TestCase extends Test
1615		q.remove();
1616		shouldThrow();
1617		} catch (NoSuchElementException success) {}
1618	<	} catch (InterruptedException ie) {
1320	<	threadUnexpectedException(ie);
1321	<	}
1618	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1619		}
1620
1621		void assertSerialEquals(Object x, Object y) {
#	Line 1337 | Line 1634 | public class JSR166TestCase extends Test
1634		oos.flush();
1635		oos.close();
1636		return bos.toByteArray();
1637	<	} catch (Throwable t) {
1638	<	threadUnexpectedException(t);
1637	>	} catch (Throwable fail) {
1638	>	threadUnexpectedException(fail);
1639		return new byte[0];
1640		}
1641		}
#	Line 1351 | Line 1648 | public class JSR166TestCase extends Test
1648		T clone = (T) ois.readObject();
1649		assertSame(o.getClass(), clone.getClass());
1650		return clone;
1651	<	} catch (Throwable t) {
1652	<	threadUnexpectedException(t);
1651	>	} catch (Throwable fail) {
1652	>	threadUnexpectedException(fail);
1653		return null;
1654		}
1655		}
#	Line 1377 | Line 1674 | public class JSR166TestCase extends Test
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