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.116 by jsr166, Sun Jun 8 00:15:50 2014 UTC vs.
Revision 1.228 by jsr166, Sun May 14 03:14:25 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	<	import junit.framework.*;
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;
48		import java.io.ByteArrayOutputStream;
49		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;
60	+	import java.security.Permissions;
61	+	import java.security.Policy;
62	+	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;
71		import java.util.List;
72		import java.util.NoSuchElementException;
73		import java.util.PropertyPermission;
74	<	import java.util.concurrent.*;
74	>	import java.util.concurrent.BlockingQueue;
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;
27	–	import static java.util.concurrent.TimeUnit.MILLISECONDS;
28	–	import static java.util.concurrent.TimeUnit.NANOSECONDS;
94		import java.util.regex.Pattern;
95	<	import java.security.CodeSource;
96	<	import java.security.Permission;
97	<	import java.security.PermissionCollection;
98	<	import java.security.Permissions;
99	<	import java.security.Policy;
100	<	import java.security.ProtectionDomain;
36	<	import java.security.SecurityPermission;
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		/**
103		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 45 | Line 109 | import java.security.SecurityPermission;
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 67 | Line 131 | import java.security.SecurityPermission;
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
88	<	* 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 116 | Line 179 | public class JSR166TestCase extends Test
179		Boolean.getBoolean("jsr166.expensiveTests");
180
181		/**
182	+	* If true, also run tests that are not part of the official tck
183	+	* because they test unspecified implementation details.
184	+	*/
185	+	protected static final boolean testImplementationDetails =
186	+	Boolean.getBoolean("jsr166.testImplementationDetails");
187	+
188	+	/**
189		* If true, report on stdout all "slow" tests, that is, ones that
190		* take more than profileThreshold milliseconds to execute.
191		*/
#	Line 136 | 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 147 | 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();
165	<	long t0 = System.nanoTime();
166	<	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.
177	–	* Optional command line arg provides the number of iterations to
178	–	* 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) {
190	<	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		}
194	–	System.exit(0);
396		}
397
398		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 242 | 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 265 | 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 287 | 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 315 | 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 340 | 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 348 | 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 356 | 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 373 | 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 402 | 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 409 | 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 436 | 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	<	* Find 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 453 | 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
459	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
460	<	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 472 | 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 540 | 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 556 | 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 599 | 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	<	assertTrue("ExecutorService did not terminate in a timely manner",
981	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
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))
1006	<	System.err.print(info);
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	<	* Checks that thread does not terminate within the default
1029	<	* millisecond delay of {@code timeoutMillis()}.
1028	>	* A debugging tool to print stack traces of most threads, as jstack does.
1029	>	* Uninteresting threads are filtered out.
1030		*/
1031	<	void assertThreadStaysAlive(Thread thread) {
1032	<	assertThreadStaysAlive(thread, timeoutMillis());
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		/**
1066	<	* Checks that thread does not terminate within the given millisecond delay.
1066	>	* Checks that thread eventually enters the expected blocked thread state.
1067		*/
1068	<	void assertThreadStaysAlive(Thread thread, long millis) {
1069	<	try {
1070	<	// No need to optimize the failing case via Thread.join.
1071	<	delay(millis);
1072	<	assertTrue(thread.isAlive());
1073	<	} catch (InterruptedException ie) {
1074	<	fail("Unexpected InterruptedException");
1068	>	void assertThreadBlocks(Thread thread, Thread.State expected) {
1069	>	// always sleep at least 1 ms, with high probability avoiding
1070	>	// transitory states
1071	>	for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1072	>	try { delay(1); }
1073	>	catch (InterruptedException fail) {
1074	>	fail("Unexpected InterruptedException");
1075	>	}
1076	>	Thread.State s = thread.getState();
1077	>	if (s == expected)
1078	>	return;
1079	>	else if (s == Thread.State.TERMINATED)
1080	>	fail("Unexpected thread termination");
1081		}
1082	+	fail("timed out waiting for thread to enter thread state " + expected);
1083		}
1084
1085		/**
1086	<	* Checks that the threads do not terminate within the default
1086	>	* Checks that thread does not terminate within the default
1087		* millisecond delay of {@code timeoutMillis()}.
1088		*/
1089	<	void assertThreadsStayAlive(Thread... threads) {
1090	<	assertThreadsStayAlive(timeoutMillis(), threads);
1089	>	void assertThreadStaysAlive(Thread thread) {
1090	>	assertThreadStaysAlive(thread, timeoutMillis());
1091		}
1092
1093		/**
1094	<	* Checks that the threads do not terminate within the given millisecond delay.
1094	>	* Checks that thread does not terminate within the given millisecond delay.
1095		*/
1096	<	void assertThreadsStayAlive(long millis, Thread... threads) {
1096	>	void assertThreadStaysAlive(Thread thread, long millis) {
1097		try {
1098		// No need to optimize the failing case via Thread.join.
1099		delay(millis);
1100	<	for (Thread thread : threads)
1101	<	assertTrue(thread.isAlive());
1102	<	} catch (InterruptedException ie) {
684	<	fail("Unexpected InterruptedException");
1100	>	assertTrue(thread.isAlive());
1101	>	} catch (InterruptedException fail) {
1102	>	threadFail("Unexpected InterruptedException");
1103		}
1104		}
1105
#	Line 702 | Line 1120 | public class JSR166TestCase extends Test
1120		future.get(timeoutMillis, MILLISECONDS);
1121		shouldThrow();
1122		} catch (TimeoutException success) {
1123	<	} catch (Exception e) {
1124	<	threadUnexpectedException(e);
1123	>	} catch (Exception fail) {
1124	>	threadUnexpectedException(fail);
1125		} finally { future.cancel(true); }
1126		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1127		}
#	Line 723 | Line 1141 | public class JSR166TestCase extends Test
1141		}
1142
1143		/**
1144	+	* The maximum number of consecutive spurious wakeups we should
1145	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1146	+	*/
1147	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1148	+
1149	+	/**
1150		* The number of elements to place in collections, arrays, etc.
1151		*/
1152		public static final int SIZE = 20;
#	Line 826 | Line 1250 | public class JSR166TestCase extends Test
1250		}
1251		public void refresh() {}
1252		public String toString() {
1253	<	List<Permission> ps = new ArrayList<Permission>();
1253	>	List<Permission> ps = new ArrayList<>();
1254		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1255		ps.add(e.nextElement());
1256		return "AdjustablePolicy with permissions " + ps;
#	Line 856 | Line 1280 | public class JSR166TestCase extends Test
1280		* Sleeps until the given time has elapsed.
1281		* Throws AssertionFailedError if interrupted.
1282		*/
1283	<	void sleep(long millis) {
1283	>	static void sleep(long millis) {
1284		try {
1285		delay(millis);
1286	<	} catch (InterruptedException ie) {
1286	>	} catch (InterruptedException fail) {
1287		AssertionFailedError afe =
1288		new AssertionFailedError("Unexpected InterruptedException");
1289	<	afe.initCause(ie);
1289	>	afe.initCause(fail);
1290		throw afe;
1291		}
1292		}
#	Line 872 | Line 1296 | public class JSR166TestCase extends Test
1296		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1297		*/
1298		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1299	<	long startTime = System.nanoTime();
1299	>	long startTime = 0L;
1300		for (;;) {
1301		Thread.State s = thread.getState();
1302		if (s == Thread.State.BLOCKED ||
#	Line 881 | Line 1305 | public class JSR166TestCase extends Test
1305		return;
1306		else if (s == Thread.State.TERMINATED)
1307		fail("Unexpected thread termination");
1308	+	else if (startTime == 0L)
1309	+	startTime = System.nanoTime();
1310		else if (millisElapsedSince(startTime) > timeoutMillis) {
1311		threadAssertTrue(thread.isAlive());
1312	<	return;
1312	>	fail("timed out waiting for thread to enter wait state");
1313	>	}
1314	>	Thread.yield();
1315	>	}
1316	>	}
1317	>
1318	>	/**
1319	>	* Spin-waits up to the specified number of milliseconds for the given
1320	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1321	>	* and additionally satisfy the given condition.
1322	>	*/
1323	>	void waitForThreadToEnterWaitState(
1324	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1325	>	long startTime = 0L;
1326	>	for (;;) {
1327	>	Thread.State s = thread.getState();
1328	>	if (s == Thread.State.BLOCKED ||
1329	>	s == Thread.State.WAITING ||
1330	>	s == Thread.State.TIMED_WAITING) {
1331	>	try {
1332	>	if (waitingForGodot.call())
1333	>	return;
1334	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1335	>	}
1336	>	else if (s == Thread.State.TERMINATED)
1337	>	fail("Unexpected thread termination");
1338	>	else if (startTime == 0L)
1339	>	startTime = System.nanoTime();
1340	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1341	>	threadAssertTrue(thread.isAlive());
1342	>	fail("timed out waiting for thread to enter wait state");
1343		}
1344		Thread.yield();
1345		}
1346		}
1347
1348		/**
1349	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1350	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1349	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1350	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1351		*/
1352		void waitForThreadToEnterWaitState(Thread thread) {
1353		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1354		}
1355
1356		/**
1357	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1358	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1359	+	* and additionally satisfy the given condition.
1360	+	*/
1361	+	void waitForThreadToEnterWaitState(
1362	+	Thread thread, Callable<Boolean> waitingForGodot) {
1363	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1364	+	}
1365	+
1366	+	/**
1367		* Returns the number of milliseconds since time given by
1368		* startNanoTime, which must have been previously returned from a
1369	<	* call to {@link System.nanoTime()}.
1369	>	* call to {@link System#nanoTime()}.
1370		*/
1371	<	long millisElapsedSince(long startNanoTime) {
1371	>	static long millisElapsedSince(long startNanoTime) {
1372		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1373		}
1374
1375	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1376	+	//         long startTime = System.nanoTime();
1377	+	//         try {
1378	+	//             r.run();
1379	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1380	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1381	+	//             throw new AssertionFailedError("did not return promptly");
1382	+	//     }
1383	+
1384	+	//     void assertTerminatesPromptly(Runnable r) {
1385	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1386	+	//     }
1387	+
1388	+	/**
1389	+	* Checks that timed f.get() returns the expected value, and does not
1390	+	* wait for the timeout to elapse before returning.
1391	+	*/
1392	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1393	+	long startTime = System.nanoTime();
1394	+	try {
1395	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1396	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1397	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1398	+	throw new AssertionFailedError("timed get did not return promptly");
1399	+	}
1400	+
1401	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1402	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1403	+	}
1404	+
1405		/**
1406		* Returns a new started daemon Thread running the given runnable.
1407		*/
#	Line 924 | Line 1420 | public class JSR166TestCase extends Test
1420		void awaitTermination(Thread t, long timeoutMillis) {
1421		try {
1422		t.join(timeoutMillis);
1423	<	} catch (InterruptedException ie) {
1424	<	threadUnexpectedException(ie);
1423	>	} catch (InterruptedException fail) {
1424	>	threadUnexpectedException(fail);
1425		} finally {
1426		if (t.getState() != Thread.State.TERMINATED) {
1427		t.interrupt();
1428	<	fail("Test timed out");
1428	>	threadFail("timed out waiting for thread to terminate");
1429		}
1430		}
1431		}
#	Line 951 | Line 1447 | public class JSR166TestCase extends Test
1447		public final void run() {
1448		try {
1449		realRun();
1450	<	} catch (Throwable t) {
1451	<	threadUnexpectedException(t);
1450	>	} catch (Throwable fail) {
1451	>	threadUnexpectedException(fail);
1452		}
1453		}
1454		}
#	Line 1006 | Line 1502 | public class JSR166TestCase extends Test
1502		threadShouldThrow("InterruptedException");
1503		} catch (InterruptedException success) {
1504		threadAssertFalse(Thread.interrupted());
1505	<	} catch (Throwable t) {
1506	<	threadUnexpectedException(t);
1505	>	} catch (Throwable fail) {
1506	>	threadUnexpectedException(fail);
1507		}
1508		}
1509		}
#	Line 1018 | Line 1514 | public class JSR166TestCase extends Test
1514		public final T call() {
1515		try {
1516		return realCall();
1517	<	} catch (Throwable t) {
1518	<	threadUnexpectedException(t);
1517	>	} catch (Throwable fail) {
1518	>	threadUnexpectedException(fail);
1519		return null;
1520		}
1521		}
#	Line 1036 | Line 1532 | public class JSR166TestCase extends Test
1532		return result;
1533		} catch (InterruptedException success) {
1534		threadAssertFalse(Thread.interrupted());
1535	<	} catch (Throwable t) {
1536	<	threadUnexpectedException(t);
1535	>	} catch (Throwable fail) {
1536	>	threadUnexpectedException(fail);
1537		}
1538		return null;
1539		}
#	Line 1054 | Line 1550 | public class JSR166TestCase extends Test
1550		public static final String TEST_STRING = "a test string";
1551
1552		public static class StringTask implements Callable<String> {
1553	<	public String call() { return TEST_STRING; }
1553	>	final String value;
1554	>	public StringTask() { this(TEST_STRING); }
1555	>	public StringTask(String value) { this.value = value; }
1556	>	public String call() { return value; }
1557		}
1558
1559		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1067 | Line 1566 | public class JSR166TestCase extends Test
1566		}};
1567		}
1568
1569	<	public Runnable awaiter(final CountDownLatch latch) {
1569	>	public Runnable countDowner(final CountDownLatch latch) {
1570		return new CheckedRunnable() {
1571		public void realRun() throws InterruptedException {
1572	<	await(latch);
1572	>	latch.countDown();
1573		}};
1574		}
1575
1576	<	public void await(CountDownLatch latch) {
1576	>	class LatchAwaiter extends CheckedRunnable {
1577	>	static final int NEW = 0;
1578	>	static final int RUNNING = 1;
1579	>	static final int DONE = 2;
1580	>	final CountDownLatch latch;
1581	>	int state = NEW;
1582	>	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1583	>	public void realRun() throws InterruptedException {
1584	>	state = 1;
1585	>	await(latch);
1586	>	state = 2;
1587	>	}
1588	>	}
1589	>
1590	>	public LatchAwaiter awaiter(CountDownLatch latch) {
1591	>	return new LatchAwaiter(latch);
1592	>	}
1593	>
1594	>	public void await(CountDownLatch latch, long timeoutMillis) {
1595		try {
1596	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1597	<	} catch (Throwable t) {
1598	<	threadUnexpectedException(t);
1596	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1597	>	fail("timed out waiting for CountDownLatch for "
1598	>	+ (timeoutMillis/1000) + " sec");
1599	>	} catch (Throwable fail) {
1600	>	threadUnexpectedException(fail);
1601		}
1602		}
1603
1604	+	public void await(CountDownLatch latch) {
1605	+	await(latch, LONG_DELAY_MS);
1606	+	}
1607	+
1608		public void await(Semaphore semaphore) {
1609		try {
1610	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1611	<	} catch (Throwable t) {
1612	<	threadUnexpectedException(t);
1610	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1611	>	fail("timed out waiting for Semaphore for "
1612	>	+ (LONG_DELAY_MS/1000) + " sec");
1613	>	} catch (Throwable fail) {
1614	>	threadUnexpectedException(fail);
1615	>	}
1616	>	}
1617	>
1618	>	public void await(CyclicBarrier barrier) {
1619	>	try {
1620	>	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1621	>	} catch (Throwable fail) {
1622	>	threadUnexpectedException(fail);
1623		}
1624		}
1625
#	Line 1280 | Line 1813 | public class JSR166TestCase extends Test
1813		@Override protected final void compute() {
1814		try {
1815		realCompute();
1816	<	} catch (Throwable t) {
1817	<	threadUnexpectedException(t);
1816	>	} catch (Throwable fail) {
1817	>	threadUnexpectedException(fail);
1818		}
1819		}
1820		}
#	Line 1295 | Line 1828 | public class JSR166TestCase extends Test
1828		@Override protected final T compute() {
1829		try {
1830		return realCompute();
1831	<	} catch (Throwable t) {
1832	<	threadUnexpectedException(t);
1831	>	} catch (Throwable fail) {
1832	>	threadUnexpectedException(fail);
1833		return null;
1834		}
1835		}
#	Line 1314 | Line 1847 | public class JSR166TestCase extends Test
1847		* A CyclicBarrier that uses timed await and fails with
1848		* AssertionFailedErrors instead of throwing checked exceptions.
1849		*/
1850	<	public class CheckedBarrier extends CyclicBarrier {
1850	>	public static class CheckedBarrier extends CyclicBarrier {
1851		public CheckedBarrier(int parties) { super(parties); }
1852
1853		public int await() {
1854		try {
1855		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1856	<	} catch (TimeoutException e) {
1856	>	} catch (TimeoutException timedOut) {
1857		throw new AssertionFailedError("timed out");
1858	<	} catch (Exception e) {
1858	>	} catch (Exception fail) {
1859		AssertionFailedError afe =
1860	<	new AssertionFailedError("Unexpected exception: " + e);
1861	<	afe.initCause(e);
1860	>	new AssertionFailedError("Unexpected exception: " + fail);
1861	>	afe.initCause(fail);
1862		throw afe;
1863		}
1864		}
#	Line 1353 | Line 1886 | public class JSR166TestCase extends Test
1886		q.remove();
1887		shouldThrow();
1888		} catch (NoSuchElementException success) {}
1889	<	} catch (InterruptedException ie) {
1357	<	threadUnexpectedException(ie);
1358	<	}
1889	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1890		}
1891
1892		void assertSerialEquals(Object x, Object y) {
#	Line 1374 | Line 1905 | public class JSR166TestCase extends Test
1905		oos.flush();
1906		oos.close();
1907		return bos.toByteArray();
1908	<	} catch (Throwable t) {
1909	<	threadUnexpectedException(t);
1908	>	} catch (Throwable fail) {
1909	>	threadUnexpectedException(fail);
1910		return new byte[0];
1911		}
1912		}
1913
1914	+	void assertImmutable(final Object o) {
1915	+	if (o instanceof Collection) {
1916	+	assertThrows(
1917	+	UnsupportedOperationException.class,
1918	+	new Runnable() { public void run() {
1919	+	((Collection) o).add(null);}});
1920	+	}
1921	+	}
1922	+
1923		@SuppressWarnings("unchecked")
1924		<T> T serialClone(T o) {
1925		try {
1926		ObjectInputStream ois = new ObjectInputStream
1927		(new ByteArrayInputStream(serialBytes(o)));
1928		T clone = (T) ois.readObject();
1929	+	if (o == clone) assertImmutable(o);
1930		assertSame(o.getClass(), clone.getClass());
1931		return clone;
1932	<	} catch (Throwable t) {
1933	<	threadUnexpectedException(t);
1932	>	} catch (Throwable fail) {
1933	>	threadUnexpectedException(fail);
1934	>	return null;
1935	>	}
1936	>	}
1937	>
1938	>	/**
1939	>	* A version of serialClone that leaves error handling (for
1940	>	* e.g. NotSerializableException) up to the caller.
1941	>	*/
1942	>	@SuppressWarnings("unchecked")
1943	>	<T> T serialClonePossiblyFailing(T o)
1944	>	throws ReflectiveOperationException, java.io.IOException {
1945	>	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1946	>	ObjectOutputStream oos = new ObjectOutputStream(bos);
1947	>	oos.writeObject(o);
1948	>	oos.flush();
1949	>	oos.close();
1950	>	ObjectInputStream ois = new ObjectInputStream
1951	>	(new ByteArrayInputStream(bos.toByteArray()));
1952	>	T clone = (T) ois.readObject();
1953	>	if (o == clone) assertImmutable(o);
1954	>	assertSame(o.getClass(), clone.getClass());
1955	>	return clone;
1956	>	}
1957	>
1958	>	/**
1959	>	* If o implements Cloneable and has a public clone method,
1960	>	* returns a clone of o, else null.
1961	>	*/
1962	>	@SuppressWarnings("unchecked")
1963	>	<T> T cloneableClone(T o) {
1964	>	if (!(o instanceof Cloneable)) return null;
1965	>	final T clone;
1966	>	try {
1967	>	clone = (T) o.getClass().getMethod("clone").invoke(o);
1968	>	} catch (NoSuchMethodException ok) {
1969		return null;
1970	+	} catch (ReflectiveOperationException unexpected) {
1971	+	throw new Error(unexpected);
1972		}
1973	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1974	+	assertSame(o.getClass(), clone.getClass());
1975	+	return clone;
1976		}
1977
1978		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
#	Line 1414 | Line 1995 | public class JSR166TestCase extends Test
1995		shouldThrow(expectedExceptionClass.getName());
1996		}
1997		}
1998	+
1999	+	public void assertIteratorExhausted(Iterator<?> it) {
2000	+	try {
2001	+	it.next();
2002	+	shouldThrow();
2003	+	} catch (NoSuchElementException success) {}
2004	+	assertFalse(it.hasNext());
2005	+	}
2006	+
2007	+	public <T> Callable<T> callableThrowing(final Exception ex) {
2008	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
2009	+	}
2010	+
2011	+	public Runnable runnableThrowing(final RuntimeException ex) {
2012	+	return new Runnable() { public void run() { throw ex; }};
2013	+	}
2014	+
2015	+	/** A reusable thread pool to be shared by tests. */
2016	+	static final ExecutorService cachedThreadPool =
2017	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2018	+	1000L, MILLISECONDS,
2019	+	new SynchronousQueue<Runnable>());
2020	+
2021	+	static <T> void shuffle(T[] array) {
2022	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2023	+	}
2024		}

Diff Legend

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