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.127 by jsr166, Sat Jan 17 23:14:17 2015 UTC vs.
Revision 1.223 by jsr166, Sat May 13 19:13:09 2017 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by Doug Lea with assistance from members of JCP JSR-166
3	<	* Expert Group and released to the public domain, as explained at
2	>	* Written by Doug Lea and Martin Buchholz with assistance from
3	>	* members of JCP JSR-166 Expert Group and released to the public
4	>	* domain, as explained at
5		* http://creativecommons.org/publicdomain/zero/1.0/
6		* Other contributors include Andrew Wright, Jeffrey Hayes,
7		* Pat Fisher, Mike Judd.
8		*/
9
10	+	/*
11	+	* @test
12	+	* @summary JSR-166 tck tests, in a number of variations.
13	+	*          The first is the conformance testing variant,
14	+	*          while others also test implementation details.
15	+	* @build *
16	+	* @modules java.management
17	+	* @run junit/othervm/timeout=1000 JSR166TestCase
18	+	* @run junit/othervm/timeout=1000
19	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
21	+	*      -Djsr166.testImplementationDetails=true
22	+	*      JSR166TestCase
23	+	* @run junit/othervm/timeout=1000
24	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
26	+	*      -Djsr166.testImplementationDetails=true
27	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28	+	*      JSR166TestCase
29	+	* @run junit/othervm/timeout=1000
30	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
32	+	*      -Djsr166.testImplementationDetails=true
33	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34	+	*      -Djava.util.secureRandomSeed=true
35	+	*      JSR166TestCase
36	+	* @run junit/othervm/timeout=1000/policy=tck.policy
37	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
39	+	*      -Djsr166.testImplementationDetails=true
40	+	*      JSR166TestCase
41	+	*/
42	+
43		import static java.util.concurrent.TimeUnit.MILLISECONDS;
44	+	import static java.util.concurrent.TimeUnit.MINUTES;
45		import static java.util.concurrent.TimeUnit.NANOSECONDS;
46
47		import java.io.ByteArrayInputStream;
#	Line 15 | Line 50 | import java.io.ObjectInputStream;
50		import java.io.ObjectOutputStream;
51		import java.lang.management.ManagementFactory;
52		import java.lang.management.ThreadInfo;
53	+	import java.lang.management.ThreadMXBean;
54	+	import java.lang.reflect.Constructor;
55		import java.lang.reflect.Method;
56	+	import java.lang.reflect.Modifier;
57		import java.security.CodeSource;
58		import java.security.Permission;
59		import java.security.PermissionCollection;
#	Line 25 | Line 63 | import java.security.ProtectionDomain;
63		import java.security.SecurityPermission;
64		import java.util.ArrayList;
65		import java.util.Arrays;
66	+	import java.util.Collection;
67	+	import java.util.Collections;
68		import java.util.Date;
69		import java.util.Enumeration;
70		import java.util.Iterator;
#	Line 35 | Line 75 | import java.util.concurrent.BlockingQueu
75		import java.util.concurrent.Callable;
76		import java.util.concurrent.CountDownLatch;
77		import java.util.concurrent.CyclicBarrier;
78	+	import java.util.concurrent.ExecutionException;
79	+	import java.util.concurrent.Executors;
80		import java.util.concurrent.ExecutorService;
81	+	import java.util.concurrent.ForkJoinPool;
82		import java.util.concurrent.Future;
83		import java.util.concurrent.RecursiveAction;
84		import java.util.concurrent.RecursiveTask;
85		import java.util.concurrent.RejectedExecutionHandler;
86		import java.util.concurrent.Semaphore;
87	+	import java.util.concurrent.SynchronousQueue;
88		import java.util.concurrent.ThreadFactory;
89	+	import java.util.concurrent.ThreadLocalRandom;
90		import java.util.concurrent.ThreadPoolExecutor;
91		import java.util.concurrent.TimeoutException;
92	+	import java.util.concurrent.atomic.AtomicBoolean;
93		import java.util.concurrent.atomic.AtomicReference;
94		import java.util.regex.Pattern;
95
96		import junit.framework.AssertionFailedError;
97		import junit.framework.Test;
98		import junit.framework.TestCase;
99	+	import junit.framework.TestResult;
100		import junit.framework.TestSuite;
101
102		/**
#	Line 62 | Line 109 | import junit.framework.TestSuite;
109		*
110		* <ol>
111		*
112	<	* <li> All assertions in code running in generated threads must use
112	>	* <li>All assertions in code running in generated threads must use
113		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
114		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
115		* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
116		* particularly recommended) for other code to use these forms too.
117		* Only the most typically used JUnit assertion methods are defined
118	<	* this way, but enough to live with.</li>
118	>	* this way, but enough to live with.
119		*
120	<	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
120	>	* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
121		* to invoke {@code super.setUp} and {@code super.tearDown} within
122		* them. These methods are used to clear and check for thread
123	<	* assertion failures.</li>
123	>	* assertion failures.
124		*
125		* <li>All delays and timeouts must use one of the constants {@code
126		* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
#	Line 84 | Line 131 | import junit.framework.TestSuite;
131		* is always discriminable as larger than SHORT and smaller than
132		* MEDIUM.  And so on. These constants are set to conservative values,
133		* but even so, if there is ever any doubt, they can all be increased
134	<	* in one spot to rerun tests on slower platforms.</li>
134	>	* in one spot to rerun tests on slower platforms.
135		*
136	<	* <li> All threads generated must be joined inside each test case
136	>	* <li>All threads generated must be joined inside each test case
137		* method (or {@code fail} to do so) before returning from the
138		* method. The {@code joinPool} method can be used to do this when
139	<	* using Executors.</li>
139	>	* using Executors.
140		*
141		* </ol>
142		*
143		* <p><b>Other notes</b>
144		* <ul>
145		*
146	<	* <li> Usually, there is one testcase method per JSR166 method
146	>	* <li>Usually, there is one testcase method per JSR166 method
147		* covering "normal" operation, and then as many exception-testing
148		* methods as there are exceptions the method can throw. Sometimes
149		* there are multiple tests per JSR166 method when the different
150		* "normal" behaviors differ significantly. And sometimes testcases
151	<	* cover multiple methods when they cannot be tested in
105	<	* isolation.</li>
151	>	* cover multiple methods when they cannot be tested in isolation.
152		*
153	<	* <li> The documentation style for testcases is to provide as javadoc
153	>	* <li>The documentation style for testcases is to provide as javadoc
154		* a simple sentence or two describing the property that the testcase
155		* method purports to test. The javadocs do not say anything about how
156	<	* the property is tested. To find out, read the code.</li>
156	>	* the property is tested. To find out, read the code.
157		*
158	<	* <li> These tests are "conformance tests", and do not attempt to
158	>	* <li>These tests are "conformance tests", and do not attempt to
159		* test throughput, latency, scalability or other performance factors
160		* (see the separate "jtreg" tests for a set intended to check these
161		* for the most central aspects of functionality.) So, most tests use
162		* the smallest sensible numbers of threads, collection sizes, etc
163	<	* needed to check basic conformance.</li>
163	>	* needed to check basic conformance.
164		*
165		* <li>The test classes currently do not declare inclusion in
166		* any particular package to simplify things for people integrating
167	<	* them in TCK test suites.</li>
167	>	* them in TCK test suites.
168		*
169	<	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
170	<	* runs all JSR166 unit tests.</li>
169	>	* <li>As a convenience, the {@code main} of this class (JSR166TestCase)
170	>	* runs all JSR166 unit tests.
171		*
172		* </ul>
173		*/
#	Line 160 | Line 206 | public class JSR166TestCase extends Test
206		Integer.getInteger("jsr166.runsPerTest", 1);
207
208		/**
209	+	* The number of repetitions of the test suite (for finding leaks?).
210	+	*/
211	+	private static final int suiteRuns =
212	+	Integer.getInteger("jsr166.suiteRuns", 1);
213	+
214	+	/**
215	+	* Returns the value of the system property, or NaN if not defined.
216	+	*/
217	+	private static float systemPropertyValue(String name) {
218	+	String floatString = System.getProperty(name);
219	+	if (floatString == null)
220	+	return Float.NaN;
221	+	try {
222	+	return Float.parseFloat(floatString);
223	+	} catch (NumberFormatException ex) {
224	+	throw new IllegalArgumentException(
225	+	String.format("Bad float value in system property %s=%s",
226	+	name, floatString));
227	+	}
228	+	}
229	+
230	+	/**
231	+	* The scaling factor to apply to standard delays used in tests.
232	+	* May be initialized from any of:
233	+	* - the "jsr166.delay.factor" system property
234	+	* - the "test.timeout.factor" system property (as used by jtreg)
235	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
236	+	* - hard-coded fuzz factor when using a known slowpoke VM
237	+	*/
238	+	private static final float delayFactor = delayFactor();
239	+
240	+	private static float delayFactor() {
241	+	float x;
242	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
243	+	return x;
244	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
245	+	return x;
246	+	String prop = System.getProperty("java.vm.version");
247	+	if (prop != null && prop.matches(".*debug.*"))
248	+	return 4.0f; // How much slower is fastdebug than product?!
249	+	return 1.0f;
250	+	}
251	+
252	+	public JSR166TestCase() { super(); }
253	+	public JSR166TestCase(String name) { super(name); }
254	+
255	+	/**
256		* A filter for tests to run, matching strings of the form
257		* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
258		* Usefully combined with jsr166.runsPerTest.
#	Line 171 | Line 264 | public class JSR166TestCase extends Test
264		return (regex == null) ? null : Pattern.compile(regex);
265		}
266
267	<	protected void runTest() throws Throwable {
267	>	// Instrumentation to debug very rare, but very annoying hung test runs.
268	>	static volatile TestCase currentTestCase;
269	>	// static volatile int currentRun = 0;
270	>	static {
271	>	Runnable checkForWedgedTest = new Runnable() { public void run() {
272	>	// Avoid spurious reports with enormous runsPerTest.
273	>	// A single test case run should never take more than 1 second.
274	>	// But let's cap it at the high end too ...
275	>	final int timeoutMinutes =
276	>	Math.min(15, Math.max(runsPerTest / 60, 1));
277	>	for (TestCase lastTestCase = currentTestCase;;) {
278	>	try { MINUTES.sleep(timeoutMinutes); }
279	>	catch (InterruptedException unexpected) { break; }
280	>	if (lastTestCase == currentTestCase) {
281	>	System.err.printf(
282	>	"Looks like we're stuck running test: %s%n",
283	>	lastTestCase);
284	>	//                     System.err.printf(
285	>	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
286	>	//                         lastTestCase, currentRun, runsPerTest);
287	>	//                     System.err.println("availableProcessors=" +
288	>	//                         Runtime.getRuntime().availableProcessors());
289	>	//                     System.err.printf("cpu model = %s%n", cpuModel());
290	>	dumpTestThreads();
291	>	// one stack dump is probably enough; more would be spam
292	>	break;
293	>	}
294	>	lastTestCase = currentTestCase;
295	>	}}};
296	>	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
297	>	thread.setDaemon(true);
298	>	thread.start();
299	>	}
300	>
301	>	//     public static String cpuModel() {
302	>	//         try {
303	>	//             java.util.regex.Matcher matcher
304	>	//               = Pattern.compile("model name\\s*: (.*)")
305	>	//                 .matcher(new String(
306	>	//                     java.nio.file.Files.readAllBytes(
307	>	//                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
308	>	//             matcher.find();
309	>	//             return matcher.group(1);
310	>	//         } catch (Exception ex) { return null; }
311	>	//     }
312	>
313	>	public void runBare() throws Throwable {
314	>	currentTestCase = this;
315		if (methodFilter == null
316	<	|| methodFilter.matcher(toString()).find()) {
317	<	for (int i = 0; i < runsPerTest; i++) {
318	<	if (profileTests)
319	<	runTestProfiled();
320	<	else
321	<	super.runTest();
322	<	}
316	>	|| methodFilter.matcher(toString()).find())
317	>	super.runBare();
318	>	}
319	>
320	>	protected void runTest() throws Throwable {
321	>	for (int i = 0; i < runsPerTest; i++) {
322	>	// currentRun = i;
323	>	if (profileTests)
324	>	runTestProfiled();
325	>	else
326	>	super.runTest();
327		}
328		}
329
330		protected void runTestProfiled() throws Throwable {
331	<	// Warmup run, notably to trigger all needed classloading.
332	<	super.runTest();
189	<	long t0 = System.nanoTime();
190	<	try {
331	>	for (int i = 0; i < 2; i++) {
332	>	long startTime = System.nanoTime();
333		super.runTest();
334	<	} finally {
335	<	long elapsedMillis = millisElapsedSince(t0);
336	<	if (elapsedMillis >= profileThreshold)
334	>	long elapsedMillis = millisElapsedSince(startTime);
335	>	if (elapsedMillis < profileThreshold)
336	>	break;
337	>	// Never report first run of any test; treat it as a
338	>	// warmup run, notably to trigger all needed classloading,
339	>	if (i > 0)
340		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
341		}
342		}
343
344		/**
345		* Runs all JSR166 unit tests using junit.textui.TestRunner.
201	–	* Optional command line arg provides the number of iterations to
202	–	* repeat running the tests.
346		*/
347		public static void main(String[] args) {
348	+	main(suite(), args);
349	+	}
350	+
351	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
352	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
353	+	long runTime;
354	+	public void startTest(Test test) {}
355	+	protected void printHeader(long runTime) {
356	+	this.runTime = runTime; // defer printing for later
357	+	}
358	+	protected void printFooter(TestResult result) {
359	+	if (result.wasSuccessful()) {
360	+	getWriter().println("OK (" + result.runCount() + " tests)"
361	+	+ "  Time: " + elapsedTimeAsString(runTime));
362	+	} else {
363	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
364	+	super.printFooter(result);
365	+	}
366	+	}
367	+	}
368	+
369	+	/**
370	+	* Returns a TestRunner that doesn't bother with unnecessary
371	+	* fluff, like printing a "." for each test case.
372	+	*/
373	+	static junit.textui.TestRunner newPithyTestRunner() {
374	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
375	+	runner.setPrinter(new PithyResultPrinter(System.out));
376	+	return runner;
377	+	}
378	+
379	+	/**
380	+	* Runs all unit tests in the given test suite.
381	+	* Actual behavior influenced by jsr166.* system properties.
382	+	*/
383	+	static void main(Test suite, String[] args) {
384		if (useSecurityManager) {
385		System.err.println("Setting a permissive security manager");
386		Policy.setPolicy(permissivePolicy());
387		System.setSecurityManager(new SecurityManager());
388		}
389	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
390	<
391	<	Test s = suite();
392	<	for (int i = 0; i < iters; ++i) {
214	<	junit.textui.TestRunner.run(s);
389	>	for (int i = 0; i < suiteRuns; i++) {
390	>	TestResult result = newPithyTestRunner().doRun(suite);
391	>	if (!result.wasSuccessful())
392	>	System.exit(1);
393		System.gc();
394		System.runFinalization();
395		}
218	–	System.exit(0);
396		}
397
398		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 266 | Line 443 | public class JSR166TestCase extends Test
443		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
444		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
445		public static boolean atLeastJava9() {
446	<	// As of 2014-05, java9 still uses 52.0 class file version
447	<	return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
446	>	return JAVA_CLASS_VERSION >= 53.0
447	>	// As of 2015-09, java9 still uses 52.0 class file version
448	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
449	>	}
450	>	public static boolean atLeastJava10() {
451	>	return JAVA_CLASS_VERSION >= 54.0
452	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
453		}
454
455		/**
#	Line 289 | Line 471 | public class JSR166TestCase extends Test
471		AbstractQueuedLongSynchronizerTest.suite(),
472		ArrayBlockingQueueTest.suite(),
473		ArrayDequeTest.suite(),
474	+	ArrayListTest.suite(),
475		AtomicBooleanTest.suite(),
476		AtomicIntegerArrayTest.suite(),
477		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 311 | Line 494 | public class JSR166TestCase extends Test
494		CopyOnWriteArrayListTest.suite(),
495		CopyOnWriteArraySetTest.suite(),
496		CountDownLatchTest.suite(),
497	+	CountedCompleterTest.suite(),
498		CyclicBarrierTest.suite(),
499		DelayQueueTest.suite(),
500		EntryTest.suite(),
#	Line 339 | Line 523 | public class JSR166TestCase extends Test
523		TreeMapTest.suite(),
524		TreeSetTest.suite(),
525		TreeSubMapTest.suite(),
526	<	TreeSubSetTest.suite());
526	>	TreeSubSetTest.suite(),
527	>	VectorTest.suite());
528
529		// Java8+ test classes
530		if (atLeastJava8()) {
531		String[] java8TestClassNames = {
532	+	"ArrayDeque8Test",
533		"Atomic8Test",
534		"CompletableFutureTest",
535		"ConcurrentHashMap8Test",
536	<	"CountedCompleterTest",
536	>	"CountedCompleter8Test",
537		"DoubleAccumulatorTest",
538		"DoubleAdderTest",
539		"ForkJoinPool8Test",
540		"ForkJoinTask8Test",
541	+	"LinkedBlockingDeque8Test",
542	+	"LinkedBlockingQueue8Test",
543		"LongAccumulatorTest",
544		"LongAdderTest",
545		"SplittableRandomTest",
546		"StampedLockTest",
547	+	"SubmissionPublisherTest",
548		"ThreadLocalRandom8Test",
549	+	"TimeUnit8Test",
550		};
551		addNamedTestClasses(suite, java8TestClassNames);
552		}
#	Line 364 | Line 554 | public class JSR166TestCase extends Test
554		// Java9+ test classes
555		if (atLeastJava9()) {
556		String[] java9TestClassNames = {
557	<	"ThreadPoolExecutor9Test",
557	>	"AtomicBoolean9Test",
558	>	"AtomicInteger9Test",
559	>	"AtomicIntegerArray9Test",
560	>	"AtomicLong9Test",
561	>	"AtomicLongArray9Test",
562	>	"AtomicReference9Test",
563	>	"AtomicReferenceArray9Test",
564	>	"ExecutorCompletionService9Test",
565	>	"ForkJoinPool9Test",
566		};
567		addNamedTestClasses(suite, java9TestClassNames);
568		}
#	Line 372 | Line 570 | public class JSR166TestCase extends Test
570		return suite;
571		}
572
573	+	/** Returns list of junit-style test method names in given class. */
574	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
575	+	Method[] methods = testClass.getDeclaredMethods();
576	+	ArrayList<String> names = new ArrayList<>(methods.length);
577	+	for (Method method : methods) {
578	+	if (method.getName().startsWith("test")
579	+	&& Modifier.isPublic(method.getModifiers())
580	+	// method.getParameterCount() requires jdk8+
581	+	&& method.getParameterTypes().length == 0) {
582	+	names.add(method.getName());
583	+	}
584	+	}
585	+	return names;
586	+	}
587	+
588	+	/**
589	+	* Returns junit-style testSuite for the given test class, but
590	+	* parameterized by passing extra data to each test.
591	+	*/
592	+	public static <ExtraData> Test parameterizedTestSuite
593	+	(Class<? extends JSR166TestCase> testClass,
594	+	Class<ExtraData> dataClass,
595	+	ExtraData data) {
596	+	try {
597	+	TestSuite suite = new TestSuite();
598	+	Constructor c =
599	+	testClass.getDeclaredConstructor(dataClass, String.class);
600	+	for (String methodName : testMethodNames(testClass))
601	+	suite.addTest((Test) c.newInstance(data, methodName));
602	+	return suite;
603	+	} catch (Exception e) {
604	+	throw new Error(e);
605	+	}
606	+	}
607	+
608	+	/**
609	+	* Returns junit-style testSuite for the jdk8 extension of the
610	+	* given test class, but parameterized by passing extra data to
611	+	* each test.  Uses reflection to allow compilation in jdk7.
612	+	*/
613	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
614	+	(Class<? extends JSR166TestCase> testClass,
615	+	Class<ExtraData> dataClass,
616	+	ExtraData data) {
617	+	if (atLeastJava8()) {
618	+	String name = testClass.getName();
619	+	String name8 = name.replaceAll("Test$", "8Test");
620	+	if (name.equals(name8)) throw new Error(name);
621	+	try {
622	+	return (Test)
623	+	Class.forName(name8)
624	+	.getMethod("testSuite", new Class[] { dataClass })
625	+	.invoke(null, data);
626	+	} catch (Exception e) {
627	+	throw new Error(e);
628	+	}
629	+	} else {
630	+	return new TestSuite();
631	+	}
632	+	}
633	+
634		// Delays for timing-dependent tests, in milliseconds.
635
636		public static long SHORT_DELAY_MS;
#	Line 380 | Line 639 | public class JSR166TestCase extends Test
639		public static long LONG_DELAY_MS;
640
641		/**
642	<	* Returns the shortest timed delay. This could
643	<	* be reimplemented to use for example a Property.
642	>	* Returns the shortest timed delay. This can be scaled up for
643	>	* slow machines using the jsr166.delay.factor system property,
644	>	* or via jtreg's -timeoutFactor: flag.
645	>	* http://openjdk.java.net/jtreg/command-help.html
646		*/
647		protected long getShortDelay() {
648	<	return 50;
648	>	return (long) (50 * delayFactor);
649		}
650
651		/**
#	Line 397 | Line 658 | public class JSR166TestCase extends Test
658		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
659		}
660
661	+	private static final long TIMEOUT_DELAY_MS
662	+	= (long) (12.0 * Math.cbrt(delayFactor));
663	+
664		/**
665	<	* Returns a timeout in milliseconds to be used in tests that
666	<	* verify that operations block or time out.
665	>	* Returns a timeout in milliseconds to be used in tests that verify
666	>	* that operations block or time out.  We want this to be longer
667	>	* than the OS scheduling quantum, but not too long, so don't scale
668	>	* linearly with delayFactor; we use "crazy" cube root instead.
669		*/
670	<	long timeoutMillis() {
671	<	return SHORT_DELAY_MS / 4;
670	>	static long timeoutMillis() {
671	>	return TIMEOUT_DELAY_MS;
672		}
673
674		/**
675	<	* Returns a new Date instance representing a time delayMillis
676	<	* milliseconds in the future.
675	>	* Returns a new Date instance representing a time at least
676	>	* delayMillis milliseconds in the future.
677		*/
678		Date delayedDate(long delayMillis) {
679	<	return new Date(System.currentTimeMillis() + delayMillis);
679	>	// Add 1 because currentTimeMillis is known to round into the past.
680	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
681		}
682
683		/**
684		* The first exception encountered if any threadAssertXXX method fails.
685		*/
686		private final AtomicReference<Throwable> threadFailure
687	<	= new AtomicReference<Throwable>(null);
687	>	= new AtomicReference<>(null);
688
689		/**
690		* Records an exception so that it can be rethrown later in the test
#	Line 426 | Line 693 | public class JSR166TestCase extends Test
693		* the same test have no effect.
694		*/
695		public void threadRecordFailure(Throwable t) {
696	+	System.err.println(t);
697	+	dumpTestThreads();
698		threadFailure.compareAndSet(null, t);
699		}
700
#	Line 433 | Line 702 | public class JSR166TestCase extends Test
702		setDelays();
703		}
704
705	+	void tearDownFail(String format, Object... args) {
706	+	String msg = toString() + ": " + String.format(format, args);
707	+	System.err.println(msg);
708	+	dumpTestThreads();
709	+	throw new AssertionFailedError(msg);
710	+	}
711	+
712		/**
713		* Extra checks that get done for all test cases.
714		*
#	Line 460 | Line 736 | public class JSR166TestCase extends Test
736		}
737
738		if (Thread.interrupted())
739	<	throw new AssertionFailedError("interrupt status set in main thread");
739	>	tearDownFail("interrupt status set in main thread");
740
741		checkForkJoinPoolThreadLeaks();
742		}
743
744		/**
745	<	* Finds missing try { ... } finally { joinPool(e); }
745	>	* Finds missing PoolCleaners
746		*/
747		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
748	<	Thread[] survivors = new Thread[5];
748	>	Thread[] survivors = new Thread[7];
749		int count = Thread.enumerate(survivors);
750		for (int i = 0; i < count; i++) {
751		Thread thread = survivors[i];
#	Line 477 | Line 753 | public class JSR166TestCase extends Test
753		if (name.startsWith("ForkJoinPool-")) {
754		// give thread some time to terminate
755		thread.join(LONG_DELAY_MS);
756	<	if (!thread.isAlive()) continue;
757	<	thread.stop();
758	<	throw new AssertionFailedError
483	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
484	<	toString(), name));
756	>	if (thread.isAlive())
757	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
758	>	thread);
759		}
760		}
761	+
762	+	if (!ForkJoinPool.commonPool()
763	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
764	+	tearDownFail("ForkJoin common pool thread stuck");
765		}
766
767		/**
#	Line 496 | Line 774 | public class JSR166TestCase extends Test
774		fail(reason);
775		} catch (AssertionFailedError t) {
776		threadRecordFailure(t);
777	<	fail(reason);
777	>	throw t;
778		}
779		}
780
#	Line 564 | Line 842 | public class JSR166TestCase extends Test
842		public void threadAssertEquals(Object x, Object y) {
843		try {
844		assertEquals(x, y);
845	<	} catch (AssertionFailedError t) {
846	<	threadRecordFailure(t);
847	<	throw t;
848	<	} catch (Throwable t) {
849	<	threadUnexpectedException(t);
845	>	} catch (AssertionFailedError fail) {
846	>	threadRecordFailure(fail);
847	>	throw fail;
848	>	} catch (Throwable fail) {
849	>	threadUnexpectedException(fail);
850		}
851		}
852
#	Line 580 | Line 858 | public class JSR166TestCase extends Test
858		public void threadAssertSame(Object x, Object y) {
859		try {
860		assertSame(x, y);
861	<	} catch (AssertionFailedError t) {
862	<	threadRecordFailure(t);
863	<	throw t;
861	>	} catch (AssertionFailedError fail) {
862	>	threadRecordFailure(fail);
863	>	throw fail;
864		}
865		}
866
#	Line 623 | Line 901 | public class JSR166TestCase extends Test
901		/**
902		* Delays, via Thread.sleep, for the given millisecond delay, but
903		* if the sleep is shorter than specified, may re-sleep or yield
904	<	* until time elapses.
904	>	* until time elapses.  Ensures that the given time, as measured
905	>	* by System.nanoTime(), has elapsed.
906		*/
907		static void delay(long millis) throws InterruptedException {
908	<	long startTime = System.nanoTime();
909	<	long ns = millis * 1000 * 1000;
910	<	for (;;) {
908	>	long nanos = millis * (1000 * 1000);
909	>	final long wakeupTime = System.nanoTime() + nanos;
910	>	do {
911		if (millis > 0L)
912		Thread.sleep(millis);
913		else // too short to sleep
914		Thread.yield();
915	<	long d = ns - (System.nanoTime() - startTime);
916	<	if (d > 0L)
917	<	millis = d / (1000 * 1000);
918	<	else
919	<	break;
915	>	nanos = wakeupTime - System.nanoTime();
916	>	millis = nanos / (1000 * 1000);
917	>	} while (nanos >= 0L);
918	>	}
919	>
920	>	/**
921	>	* Allows use of try-with-resources with per-test thread pools.
922	>	*/
923	>	class PoolCleaner implements AutoCloseable {
924	>	private final ExecutorService pool;
925	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
926	>	public void close() { joinPool(pool); }
927	>	}
928	>
929	>	/**
930	>	* An extension of PoolCleaner that has an action to release the pool.
931	>	*/
932	>	class PoolCleanerWithReleaser extends PoolCleaner {
933	>	private final Runnable releaser;
934	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
935	>	super(pool);
936	>	this.releaser = releaser;
937	>	}
938	>	public void close() {
939	>	try {
940	>	releaser.run();
941	>	} finally {
942	>	super.close();
943	>	}
944		}
945		}
946
947	+	PoolCleaner cleaner(ExecutorService pool) {
948	+	return new PoolCleaner(pool);
949	+	}
950	+
951	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
952	+	return new PoolCleanerWithReleaser(pool, releaser);
953	+	}
954	+
955	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
956	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
957	+	}
958	+
959	+	Runnable releaser(final CountDownLatch latch) {
960	+	return new Runnable() { public void run() {
961	+	do { latch.countDown(); }
962	+	while (latch.getCount() > 0);
963	+	}};
964	+	}
965	+
966	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
967	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
968	+	}
969	+
970	+	Runnable releaser(final AtomicBoolean flag) {
971	+	return new Runnable() { public void run() { flag.set(true); }};
972	+	}
973	+
974		/**
975		* Waits out termination of a thread pool or fails doing so.
976		*/
977	<	void joinPool(ExecutorService exec) {
977	>	void joinPool(ExecutorService pool) {
978		try {
979	<	exec.shutdown();
980	<	if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
981	<	fail("ExecutorService " + exec +
982	<	" did not terminate in a timely manner");
979	>	pool.shutdown();
980	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
981	>	try {
982	>	threadFail("ExecutorService " + pool +
983	>	" did not terminate in a timely manner");
984	>	} finally {
985	>	// last resort, for the benefit of subsequent tests
986	>	pool.shutdownNow();
987	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
988	>	}
989	>	}
990		} catch (SecurityException ok) {
991		// Allowed in case test doesn't have privs
992	<	} catch (InterruptedException ie) {
993	<	fail("Unexpected InterruptedException");
992	>	} catch (InterruptedException fail) {
993	>	threadFail("Unexpected InterruptedException");
994		}
995		}
996
997		/**
998	<	* A debugging tool to print all stack traces, as jstack does.
998	>	* Like Runnable, but with the freedom to throw anything.
999	>	* junit folks had the same idea:
1000	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1001		*/
1002	<	static void printAllStackTraces() {
1003	<	for (ThreadInfo info :
1004	<	ManagementFactory.getThreadMXBean()
1005	<	.dumpAllThreads(true, true))
1002	>	interface Action { public void run() throws Throwable; }
1003	>
1004	>	/**
1005	>	* Runs all the given actions in parallel, failing if any fail.
1006	>	* Useful for running multiple variants of tests that are
1007	>	* necessarily individually slow because they must block.
1008	>	*/
1009	>	void testInParallel(Action ... actions) {
1010	>	ExecutorService pool = Executors.newCachedThreadPool();
1011	>	try (PoolCleaner cleaner = cleaner(pool)) {
1012	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1013	>	for (final Action action : actions)
1014	>	futures.add(pool.submit(new CheckedRunnable() {
1015	>	public void realRun() throws Throwable { action.run();}}));
1016	>	for (Future<?> future : futures)
1017	>	try {
1018	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
1019	>	} catch (ExecutionException ex) {
1020	>	threadUnexpectedException(ex.getCause());
1021	>	} catch (Exception ex) {
1022	>	threadUnexpectedException(ex);
1023	>	}
1024	>	}
1025	>	}
1026	>
1027	>	/**
1028	>	* A debugging tool to print stack traces of most threads, as jstack does.
1029	>	* Uninteresting threads are filtered out.
1030	>	*/
1031	>	static void dumpTestThreads() {
1032	>	SecurityManager sm = System.getSecurityManager();
1033	>	if (sm != null) {
1034	>	try {
1035	>	System.setSecurityManager(null);
1036	>	} catch (SecurityException giveUp) {
1037	>	return;
1038	>	}
1039	>	}
1040	>
1041	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1042	>	System.err.println("------ stacktrace dump start ------");
1043	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1044	>	final String name = info.getThreadName();
1045	>	String lockName;
1046	>	if ("Signal Dispatcher".equals(name))
1047	>	continue;
1048	>	if ("Reference Handler".equals(name)
1049	>	&& (lockName = info.getLockName()) != null
1050	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1051	>	continue;
1052	>	if ("Finalizer".equals(name)
1053	>	&& (lockName = info.getLockName()) != null
1054	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1055	>	continue;
1056	>	if ("checkForWedgedTest".equals(name))
1057	>	continue;
1058		System.err.print(info);
1059	+	}
1060	+	System.err.println("------ stacktrace dump end ------");
1061	+
1062	+	if (sm != null) System.setSecurityManager(sm);
1063		}
1064
1065		/**
#	Line 683 | Line 1078 | public class JSR166TestCase extends Test
1078		// No need to optimize the failing case via Thread.join.
1079		delay(millis);
1080		assertTrue(thread.isAlive());
1081	<	} catch (InterruptedException ie) {
1082	<	fail("Unexpected InterruptedException");
1081	>	} catch (InterruptedException fail) {
1082	>	threadFail("Unexpected InterruptedException");
1083		}
1084		}
1085
#	Line 705 | Line 1100 | public class JSR166TestCase extends Test
1100		delay(millis);
1101		for (Thread thread : threads)
1102		assertTrue(thread.isAlive());
1103	<	} catch (InterruptedException ie) {
1104	<	fail("Unexpected InterruptedException");
1103	>	} catch (InterruptedException fail) {
1104	>	threadFail("Unexpected InterruptedException");
1105		}
1106		}
1107
#	Line 727 | Line 1122 | public class JSR166TestCase extends Test
1122		future.get(timeoutMillis, MILLISECONDS);
1123		shouldThrow();
1124		} catch (TimeoutException success) {
1125	<	} catch (Exception e) {
1126	<	threadUnexpectedException(e);
1125	>	} catch (Exception fail) {
1126	>	threadUnexpectedException(fail);
1127		} finally { future.cancel(true); }
1128		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1129		}
#	Line 748 | Line 1143 | public class JSR166TestCase extends Test
1143		}
1144
1145		/**
1146	+	* The maximum number of consecutive spurious wakeups we should
1147	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1148	+	*/
1149	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1150	+
1151	+	/**
1152		* The number of elements to place in collections, arrays, etc.
1153		*/
1154		public static final int SIZE = 20;
#	Line 851 | Line 1252 | public class JSR166TestCase extends Test
1252		}
1253		public void refresh() {}
1254		public String toString() {
1255	<	List<Permission> ps = new ArrayList<Permission>();
1255	>	List<Permission> ps = new ArrayList<>();
1256		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1257		ps.add(e.nextElement());
1258		return "AdjustablePolicy with permissions " + ps;
#	Line 881 | Line 1282 | public class JSR166TestCase extends Test
1282		* Sleeps until the given time has elapsed.
1283		* Throws AssertionFailedError if interrupted.
1284		*/
1285	<	void sleep(long millis) {
1285	>	static void sleep(long millis) {
1286		try {
1287		delay(millis);
1288	<	} catch (InterruptedException ie) {
1288	>	} catch (InterruptedException fail) {
1289		AssertionFailedError afe =
1290		new AssertionFailedError("Unexpected InterruptedException");
1291	<	afe.initCause(ie);
1291	>	afe.initCause(fail);
1292		throw afe;
1293		}
1294		}
#	Line 897 | Line 1298 | public class JSR166TestCase extends Test
1298		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1299		*/
1300		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1301	<	long startTime = System.nanoTime();
1301	>	long startTime = 0L;
1302		for (;;) {
1303		Thread.State s = thread.getState();
1304		if (s == Thread.State.BLOCKED ||
#	Line 906 | Line 1307 | public class JSR166TestCase extends Test
1307		return;
1308		else if (s == Thread.State.TERMINATED)
1309		fail("Unexpected thread termination");
1310	+	else if (startTime == 0L)
1311	+	startTime = System.nanoTime();
1312		else if (millisElapsedSince(startTime) > timeoutMillis) {
1313		threadAssertTrue(thread.isAlive());
1314	<	return;
1314	>	fail("timed out waiting for thread to enter wait state");
1315	>	}
1316	>	Thread.yield();
1317	>	}
1318	>	}
1319	>
1320	>	/**
1321	>	* Spin-waits up to the specified number of milliseconds for the given
1322	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1323	>	* and additionally satisfy the given condition.
1324	>	*/
1325	>	void waitForThreadToEnterWaitState(
1326	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1327	>	long startTime = 0L;
1328	>	for (;;) {
1329	>	Thread.State s = thread.getState();
1330	>	if (s == Thread.State.BLOCKED ||
1331	>	s == Thread.State.WAITING ||
1332	>	s == Thread.State.TIMED_WAITING) {
1333	>	try {
1334	>	if (waitingForGodot.call())
1335	>	return;
1336	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1337	>	}
1338	>	else if (s == Thread.State.TERMINATED)
1339	>	fail("Unexpected thread termination");
1340	>	else if (startTime == 0L)
1341	>	startTime = System.nanoTime();
1342	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1343	>	threadAssertTrue(thread.isAlive());
1344	>	fail("timed out waiting for thread to enter wait state");
1345		}
1346		Thread.yield();
1347		}
1348		}
1349
1350		/**
1351	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1352	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1351	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1352	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1353		*/
1354		void waitForThreadToEnterWaitState(Thread thread) {
1355		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1356		}
1357
1358		/**
1359	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1360	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1361	+	* and additionally satisfy the given condition.
1362	+	*/
1363	+	void waitForThreadToEnterWaitState(
1364	+	Thread thread, Callable<Boolean> waitingForGodot) {
1365	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1366	+	}
1367	+
1368	+	/**
1369		* Returns the number of milliseconds since time given by
1370		* startNanoTime, which must have been previously returned from a
1371		* call to {@link System#nanoTime()}.
#	Line 979 | Line 1422 | public class JSR166TestCase extends Test
1422		void awaitTermination(Thread t, long timeoutMillis) {
1423		try {
1424		t.join(timeoutMillis);
1425	<	} catch (InterruptedException ie) {
1426	<	threadUnexpectedException(ie);
1425	>	} catch (InterruptedException fail) {
1426	>	threadUnexpectedException(fail);
1427		} finally {
1428		if (t.getState() != Thread.State.TERMINATED) {
1429		t.interrupt();
1430	<	fail("Test timed out");
1430	>	threadFail("timed out waiting for thread to terminate");
1431		}
1432		}
1433		}
#	Line 1006 | Line 1449 | public class JSR166TestCase extends Test
1449		public final void run() {
1450		try {
1451		realRun();
1452	<	} catch (Throwable t) {
1453	<	threadUnexpectedException(t);
1452	>	} catch (Throwable fail) {
1453	>	threadUnexpectedException(fail);
1454		}
1455		}
1456		}
#	Line 1061 | Line 1504 | public class JSR166TestCase extends Test
1504		threadShouldThrow("InterruptedException");
1505		} catch (InterruptedException success) {
1506		threadAssertFalse(Thread.interrupted());
1507	<	} catch (Throwable t) {
1508	<	threadUnexpectedException(t);
1507	>	} catch (Throwable fail) {
1508	>	threadUnexpectedException(fail);
1509		}
1510		}
1511		}
#	Line 1073 | Line 1516 | public class JSR166TestCase extends Test
1516		public final T call() {
1517		try {
1518		return realCall();
1519	<	} catch (Throwable t) {
1520	<	threadUnexpectedException(t);
1519	>	} catch (Throwable fail) {
1520	>	threadUnexpectedException(fail);
1521		return null;
1522		}
1523		}
#	Line 1091 | Line 1534 | public class JSR166TestCase extends Test
1534		return result;
1535		} catch (InterruptedException success) {
1536		threadAssertFalse(Thread.interrupted());
1537	<	} catch (Throwable t) {
1538	<	threadUnexpectedException(t);
1537	>	} catch (Throwable fail) {
1538	>	threadUnexpectedException(fail);
1539		}
1540		return null;
1541		}
#	Line 1109 | Line 1552 | public class JSR166TestCase extends Test
1552		public static final String TEST_STRING = "a test string";
1553
1554		public static class StringTask implements Callable<String> {
1555	<	public String call() { return TEST_STRING; }
1555	>	final String value;
1556	>	public StringTask() { this(TEST_STRING); }
1557	>	public StringTask(String value) { this.value = value; }
1558	>	public String call() { return value; }
1559		}
1560
1561		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1122 | Line 1568 | public class JSR166TestCase extends Test
1568		}};
1569		}
1570
1571	<	public Runnable awaiter(final CountDownLatch latch) {
1571	>	public Runnable countDowner(final CountDownLatch latch) {
1572		return new CheckedRunnable() {
1573		public void realRun() throws InterruptedException {
1574	<	await(latch);
1574	>	latch.countDown();
1575		}};
1576		}
1577
1578	<	public void await(CountDownLatch latch) {
1579	<	try {
1580	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1581	<	} catch (Throwable t) {
1582	<	threadUnexpectedException(t);
1578	>	class LatchAwaiter extends CheckedRunnable {
1579	>	static final int NEW = 0;
1580	>	static final int RUNNING = 1;
1581	>	static final int DONE = 2;
1582	>	final CountDownLatch latch;
1583	>	int state = NEW;
1584	>	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1585	>	public void realRun() throws InterruptedException {
1586	>	state = 1;
1587	>	await(latch);
1588	>	state = 2;
1589	>	}
1590	>	}
1591	>
1592	>	public LatchAwaiter awaiter(CountDownLatch latch) {
1593	>	return new LatchAwaiter(latch);
1594	>	}
1595	>
1596	>	public void await(CountDownLatch latch, long timeoutMillis) {
1597	>	try {
1598	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1599	>	fail("timed out waiting for CountDownLatch for "
1600	>	+ (timeoutMillis/1000) + " sec");
1601	>	} catch (Throwable fail) {
1602	>	threadUnexpectedException(fail);
1603		}
1604		}
1605
1606	+	public void await(CountDownLatch latch) {
1607	+	await(latch, LONG_DELAY_MS);
1608	+	}
1609	+
1610		public void await(Semaphore semaphore) {
1611		try {
1612	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1613	<	} catch (Throwable t) {
1614	<	threadUnexpectedException(t);
1612	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1613	>	fail("timed out waiting for Semaphore for "
1614	>	+ (LONG_DELAY_MS/1000) + " sec");
1615	>	} catch (Throwable fail) {
1616	>	threadUnexpectedException(fail);
1617		}
1618		}
1619
#	Line 1335 | Line 1807 | public class JSR166TestCase extends Test
1807		@Override protected final void compute() {
1808		try {
1809		realCompute();
1810	<	} catch (Throwable t) {
1811	<	threadUnexpectedException(t);
1810	>	} catch (Throwable fail) {
1811	>	threadUnexpectedException(fail);
1812		}
1813		}
1814		}
#	Line 1350 | Line 1822 | public class JSR166TestCase extends Test
1822		@Override protected final T compute() {
1823		try {
1824		return realCompute();
1825	<	} catch (Throwable t) {
1826	<	threadUnexpectedException(t);
1825	>	} catch (Throwable fail) {
1826	>	threadUnexpectedException(fail);
1827		return null;
1828		}
1829		}
#	Line 1369 | Line 1841 | public class JSR166TestCase extends Test
1841		* A CyclicBarrier that uses timed await and fails with
1842		* AssertionFailedErrors instead of throwing checked exceptions.
1843		*/
1844	<	public class CheckedBarrier extends CyclicBarrier {
1844	>	public static class CheckedBarrier extends CyclicBarrier {
1845		public CheckedBarrier(int parties) { super(parties); }
1846
1847		public int await() {
1848		try {
1849		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1850	<	} catch (TimeoutException e) {
1850	>	} catch (TimeoutException timedOut) {
1851		throw new AssertionFailedError("timed out");
1852	<	} catch (Exception e) {
1852	>	} catch (Exception fail) {
1853		AssertionFailedError afe =
1854	<	new AssertionFailedError("Unexpected exception: " + e);
1855	<	afe.initCause(e);
1854	>	new AssertionFailedError("Unexpected exception: " + fail);
1855	>	afe.initCause(fail);
1856		throw afe;
1857		}
1858		}
#	Line 1408 | Line 1880 | public class JSR166TestCase extends Test
1880		q.remove();
1881		shouldThrow();
1882		} catch (NoSuchElementException success) {}
1883	<	} catch (InterruptedException ie) {
1412	<	threadUnexpectedException(ie);
1413	<	}
1883	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1884		}
1885
1886		void assertSerialEquals(Object x, Object y) {
#	Line 1429 | Line 1899 | public class JSR166TestCase extends Test
1899		oos.flush();
1900		oos.close();
1901		return bos.toByteArray();
1902	<	} catch (Throwable t) {
1903	<	threadUnexpectedException(t);
1902	>	} catch (Throwable fail) {
1903	>	threadUnexpectedException(fail);
1904		return new byte[0];
1905		}
1906		}
1907
1908	+	void assertImmutable(final Object o) {
1909	+	if (o instanceof Collection) {
1910	+	assertThrows(
1911	+	UnsupportedOperationException.class,
1912	+	new Runnable() { public void run() {
1913	+	((Collection) o).add(null);}});
1914	+	}
1915	+	}
1916	+
1917		@SuppressWarnings("unchecked")
1918		<T> T serialClone(T o) {
1919		try {
1920		ObjectInputStream ois = new ObjectInputStream
1921		(new ByteArrayInputStream(serialBytes(o)));
1922		T clone = (T) ois.readObject();
1923	+	if (o == clone) assertImmutable(o);
1924		assertSame(o.getClass(), clone.getClass());
1925		return clone;
1926	<	} catch (Throwable t) {
1927	<	threadUnexpectedException(t);
1926	>	} catch (Throwable fail) {
1927	>	threadUnexpectedException(fail);
1928		return null;
1929		}
1930		}
1931
1932	+	/**
1933	+	* A version of serialClone that leaves error handling (for
1934	+	* e.g. NotSerializableException) up to the caller.
1935	+	*/
1936	+	@SuppressWarnings("unchecked")
1937	+	<T> T serialClonePossiblyFailing(T o)
1938	+	throws ReflectiveOperationException, java.io.IOException {
1939	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1940	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1941	+	oos.writeObject(o);
1942	+	oos.flush();
1943	+	oos.close();
1944	+	ObjectInputStream ois = new ObjectInputStream
1945	+	(new ByteArrayInputStream(bos.toByteArray()));
1946	+	T clone = (T) ois.readObject();
1947	+	if (o == clone) assertImmutable(o);
1948	+	assertSame(o.getClass(), clone.getClass());
1949	+	return clone;
1950	+	}
1951	+
1952	+	/**
1953	+	* If o implements Cloneable and has a public clone method,
1954	+	* returns a clone of o, else null.
1955	+	*/
1956	+	@SuppressWarnings("unchecked")
1957	+	<T> T cloneableClone(T o) {
1958	+	if (!(o instanceof Cloneable)) return null;
1959	+	final T clone;
1960	+	try {
1961	+	clone = (T) o.getClass().getMethod("clone").invoke(o);
1962	+	} catch (NoSuchMethodException ok) {
1963	+	return null;
1964	+	} catch (ReflectiveOperationException unexpected) {
1965	+	throw new Error(unexpected);
1966	+	}
1967	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1968	+	assertSame(o.getClass(), clone.getClass());
1969	+	return clone;
1970	+	}
1971	+
1972		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1973		Runnable... throwingActions) {
1974		for (Runnable throwingAction : throwingActions) {
#	Line 1477 | Line 1997 | public class JSR166TestCase extends Test
1997		} catch (NoSuchElementException success) {}
1998		assertFalse(it.hasNext());
1999		}
2000	+
2001	+	public <T> Callable<T> callableThrowing(final Exception ex) {
2002	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
2003	+	}
2004	+
2005	+	public Runnable runnableThrowing(final RuntimeException ex) {
2006	+	return new Runnable() { public void run() { throw ex; }};
2007	+	}
2008	+
2009	+	/** A reusable thread pool to be shared by tests. */
2010	+	static final ExecutorService cachedThreadPool =
2011	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2012	+	1000L, MILLISECONDS,
2013	+	new SynchronousQueue<Runnable>());
2014	+
2015	+	static <T> void shuffle(T[] array) {
2016	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2017	+	}
2018		}

Diff Legend

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