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.106 by jsr166, Mon Apr 1 20:06:26 2013 UTC vs.
Revision 1.221 by jsr166, Tue Mar 14 00:54:27 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;
94	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
95	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
96	<	import java.security.CodeSource;
97	<	import java.security.Permission;
98	<	import java.security.PermissionCollection;
99	<	import java.security.Permissions;
100	<	import java.security.Policy;
34	<	import java.security.ProtectionDomain;
35	<	import java.security.SecurityPermission;
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		/**
103		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 44 | 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 66 | 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
87	<	* 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 115 | 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 128 | Line 199 | public class JSR166TestCase extends Test
199		private static final long profileThreshold =
200		Long.getLong("jsr166.profileThreshold", 100);
201
202	+	/**
203	+	* The number of repetitions per test (for tickling rare bugs).
204	+	*/
205	+	private static final int runsPerTest =
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.
259	+	*/
260	+	private static final Pattern methodFilter = methodFilter();
261	+
262	+	private static Pattern methodFilter() {
263	+	String regex = System.getProperty("jsr166.methodFilter");
264	+	return (regex == null) ? null : Pattern.compile(regex);
265	+	}
266	+
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	+	super.runBare();
318	+	}
319	+
320		protected void runTest() throws Throwable {
321	<	if (profileTests)
322	<	runTestProfiled();
323	<	else
324	<	super.runTest();
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	<	long t0 = System.nanoTime();
332	<	try {
331	>	for (int i = 0; i < 2; i++) {
332	>	long startTime = System.nanoTime();
333		super.runTest();
334	<	} finally {
335	<	long elapsedMillis =
336	<	(System.nanoTime() - t0) / (1000L * 1000L);
337	<	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.
152	–	* Optional command line arg provides the number of iterations to
153	–	* 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) {
165	<	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		}
169	–	System.exit(0);
396		}
397
398		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 197 | Line 423 | public class JSR166TestCase extends Test
423		}
424
425		public static final double JAVA_CLASS_VERSION;
426	+	public static final String JAVA_SPECIFICATION_VERSION;
427		static {
428		try {
429		JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
430		new java.security.PrivilegedAction<Double>() {
431		public Double run() {
432		return Double.valueOf(System.getProperty("java.class.version"));}});
433	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
434	+	new java.security.PrivilegedAction<String>() {
435	+	public String run() {
436	+	return System.getProperty("java.specification.version");}});
437		} catch (Throwable t) {
438		throw new Error(t);
439		}
#	Line 211 | Line 442 | public class JSR166TestCase extends Test
442		public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
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	+	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		/**
456		* Collects all JSR166 unit tests as one suite.
#	Line 231 | 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 253 | 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 281 | 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		}
553
554	+	// Java9+ test classes
555	+	if (atLeastJava9()) {
556	+	String[] java9TestClassNames = {
557	+	"AtomicBoolean9Test",
558	+	"AtomicInteger9Test",
559	+	"AtomicIntegerArray9Test",
560	+	"AtomicLong9Test",
561	+	"AtomicLongArray9Test",
562	+	"AtomicReference9Test",
563	+	"AtomicReferenceArray9Test",
564	+	"ExecutorCompletionService9Test",
565	+	"ForkJoinPool9Test",
566	+	};
567	+	addNamedTestClasses(suite, java9TestClassNames);
568	+	}
569	+
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;
637		public static long SMALL_DELAY_MS;
638		public static long MEDIUM_DELAY_MS;
639		public static long LONG_DELAY_MS;
640
311	–
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 336 | Line 667 | public class JSR166TestCase extends Test
667		}
668
669		/**
670	<	* Returns a new Date instance representing a time delayMillis
671	<	* milliseconds in the future.
670	>	* Returns a new Date instance representing a time at least
671	>	* delayMillis milliseconds in the future.
672		*/
673		Date delayedDate(long delayMillis) {
674	<	return new Date(System.currentTimeMillis() + delayMillis);
674	>	// Add 1 because currentTimeMillis is known to round into the past.
675	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
676		}
677
678		/**
679		* The first exception encountered if any threadAssertXXX method fails.
680		*/
681		private final AtomicReference<Throwable> threadFailure
682	<	= new AtomicReference<Throwable>(null);
682	>	= new AtomicReference<>(null);
683
684		/**
685		* Records an exception so that it can be rethrown later in the test
#	Line 356 | Line 688 | public class JSR166TestCase extends Test
688		* the same test have no effect.
689		*/
690		public void threadRecordFailure(Throwable t) {
691	+	System.err.println(t);
692	+	dumpTestThreads();
693		threadFailure.compareAndSet(null, t);
694		}
695
#	Line 363 | Line 697 | public class JSR166TestCase extends Test
697		setDelays();
698		}
699
700	+	void tearDownFail(String format, Object... args) {
701	+	String msg = toString() + ": " + String.format(format, args);
702	+	System.err.println(msg);
703	+	dumpTestThreads();
704	+	throw new AssertionFailedError(msg);
705	+	}
706	+
707		/**
708		* Extra checks that get done for all test cases.
709		*
#	Line 390 | Line 731 | public class JSR166TestCase extends Test
731		}
732
733		if (Thread.interrupted())
734	<	throw new AssertionFailedError("interrupt status set in main thread");
734	>	tearDownFail("interrupt status set in main thread");
735
736		checkForkJoinPoolThreadLeaks();
737		}
738
739		/**
740	<	* Find missing try { ... } finally { joinPool(e); }
740	>	* Finds missing PoolCleaners
741		*/
742		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
743	<	Thread[] survivors = new Thread[5];
743	>	Thread[] survivors = new Thread[7];
744		int count = Thread.enumerate(survivors);
745		for (int i = 0; i < count; i++) {
746		Thread thread = survivors[i];
#	Line 407 | Line 748 | public class JSR166TestCase extends Test
748		if (name.startsWith("ForkJoinPool-")) {
749		// give thread some time to terminate
750		thread.join(LONG_DELAY_MS);
751	<	if (!thread.isAlive()) continue;
752	<	thread.stop();
753	<	throw new AssertionFailedError
413	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
414	<	toString(), name));
751	>	if (thread.isAlive())
752	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
753	>	thread);
754		}
755		}
756	+
757	+	if (!ForkJoinPool.commonPool()
758	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
759	+	tearDownFail("ForkJoin common pool thread stuck");
760		}
761
762		/**
#	Line 426 | Line 769 | public class JSR166TestCase extends Test
769		fail(reason);
770		} catch (AssertionFailedError t) {
771		threadRecordFailure(t);
772	<	fail(reason);
772	>	throw t;
773		}
774		}
775
#	Line 494 | Line 837 | public class JSR166TestCase extends Test
837		public void threadAssertEquals(Object x, Object y) {
838		try {
839		assertEquals(x, y);
840	<	} catch (AssertionFailedError t) {
841	<	threadRecordFailure(t);
842	<	throw t;
843	<	} catch (Throwable t) {
844	<	threadUnexpectedException(t);
840	>	} catch (AssertionFailedError fail) {
841	>	threadRecordFailure(fail);
842	>	throw fail;
843	>	} catch (Throwable fail) {
844	>	threadUnexpectedException(fail);
845		}
846		}
847
#	Line 510 | Line 853 | public class JSR166TestCase extends Test
853		public void threadAssertSame(Object x, Object y) {
854		try {
855		assertSame(x, y);
856	<	} catch (AssertionFailedError t) {
857	<	threadRecordFailure(t);
858	<	throw t;
856	>	} catch (AssertionFailedError fail) {
857	>	threadRecordFailure(fail);
858	>	throw fail;
859		}
860		}
861
#	Line 553 | Line 896 | public class JSR166TestCase extends Test
896		/**
897		* Delays, via Thread.sleep, for the given millisecond delay, but
898		* if the sleep is shorter than specified, may re-sleep or yield
899	<	* until time elapses.
899	>	* until time elapses.  Ensures that the given time, as measured
900	>	* by System.nanoTime(), has elapsed.
901		*/
902		static void delay(long millis) throws InterruptedException {
903	<	long startTime = System.nanoTime();
904	<	long ns = millis * 1000 * 1000;
905	<	for (;;) {
903	>	long nanos = millis * (1000 * 1000);
904	>	final long wakeupTime = System.nanoTime() + nanos;
905	>	do {
906		if (millis > 0L)
907		Thread.sleep(millis);
908		else // too short to sleep
909		Thread.yield();
910	<	long d = ns - (System.nanoTime() - startTime);
911	<	if (d > 0L)
912	<	millis = d / (1000 * 1000);
913	<	else
914	<	break;
910	>	nanos = wakeupTime - System.nanoTime();
911	>	millis = nanos / (1000 * 1000);
912	>	} while (nanos >= 0L);
913	>	}
914	>
915	>	/**
916	>	* Allows use of try-with-resources with per-test thread pools.
917	>	*/
918	>	class PoolCleaner implements AutoCloseable {
919	>	private final ExecutorService pool;
920	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
921	>	public void close() { joinPool(pool); }
922	>	}
923	>
924	>	/**
925	>	* An extension of PoolCleaner that has an action to release the pool.
926	>	*/
927	>	class PoolCleanerWithReleaser extends PoolCleaner {
928	>	private final Runnable releaser;
929	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
930	>	super(pool);
931	>	this.releaser = releaser;
932		}
933	+	public void close() {
934	+	try {
935	+	releaser.run();
936	+	} finally {
937	+	super.close();
938	+	}
939	+	}
940	+	}
941	+
942	+	PoolCleaner cleaner(ExecutorService pool) {
943	+	return new PoolCleaner(pool);
944	+	}
945	+
946	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
947	+	return new PoolCleanerWithReleaser(pool, releaser);
948	+	}
949	+
950	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
951	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
952	+	}
953	+
954	+	Runnable releaser(final CountDownLatch latch) {
955	+	return new Runnable() { public void run() {
956	+	do { latch.countDown(); }
957	+	while (latch.getCount() > 0);
958	+	}};
959	+	}
960	+
961	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
962	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
963	+	}
964	+
965	+	Runnable releaser(final AtomicBoolean flag) {
966	+	return new Runnable() { public void run() { flag.set(true); }};
967		}
968
969		/**
970		* Waits out termination of a thread pool or fails doing so.
971		*/
972	<	void joinPool(ExecutorService exec) {
972	>	void joinPool(ExecutorService pool) {
973		try {
974	<	exec.shutdown();
975	<	assertTrue("ExecutorService did not terminate in a timely manner",
976	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
974	>	pool.shutdown();
975	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
976	>	try {
977	>	threadFail("ExecutorService " + pool +
978	>	" did not terminate in a timely manner");
979	>	} finally {
980	>	// last resort, for the benefit of subsequent tests
981	>	pool.shutdownNow();
982	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
983	>	}
984	>	}
985		} catch (SecurityException ok) {
986		// Allowed in case test doesn't have privs
987	<	} catch (InterruptedException ie) {
988	<	fail("Unexpected InterruptedException");
987	>	} catch (InterruptedException fail) {
988	>	threadFail("Unexpected InterruptedException");
989		}
990		}
991
992		/**
993	<	* A debugging tool to print all stack traces, as jstack does.
993	>	* Like Runnable, but with the freedom to throw anything.
994	>	* junit folks had the same idea:
995	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
996	>	*/
997	>	interface Action { public void run() throws Throwable; }
998	>
999	>	/**
1000	>	* Runs all the given actions in parallel, failing if any fail.
1001	>	* Useful for running multiple variants of tests that are
1002	>	* necessarily individually slow because they must block.
1003		*/
1004	<	static void printAllStackTraces() {
1005	<	for (ThreadInfo info :
1006	<	ManagementFactory.getThreadMXBean()
1007	<	.dumpAllThreads(true, true))
1004	>	void testInParallel(Action ... actions) {
1005	>	ExecutorService pool = Executors.newCachedThreadPool();
1006	>	try (PoolCleaner cleaner = cleaner(pool)) {
1007	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1008	>	for (final Action action : actions)
1009	>	futures.add(pool.submit(new CheckedRunnable() {
1010	>	public void realRun() throws Throwable { action.run();}}));
1011	>	for (Future<?> future : futures)
1012	>	try {
1013	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
1014	>	} catch (ExecutionException ex) {
1015	>	threadUnexpectedException(ex.getCause());
1016	>	} catch (Exception ex) {
1017	>	threadUnexpectedException(ex);
1018	>	}
1019	>	}
1020	>	}
1021	>
1022	>	/**
1023	>	* A debugging tool to print stack traces of most threads, as jstack does.
1024	>	* Uninteresting threads are filtered out.
1025	>	*/
1026	>	static void dumpTestThreads() {
1027	>	SecurityManager sm = System.getSecurityManager();
1028	>	if (sm != null) {
1029	>	try {
1030	>	System.setSecurityManager(null);
1031	>	} catch (SecurityException giveUp) {
1032	>	return;
1033	>	}
1034	>	}
1035	>
1036	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1037	>	System.err.println("------ stacktrace dump start ------");
1038	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1039	>	final String name = info.getThreadName();
1040	>	String lockName;
1041	>	if ("Signal Dispatcher".equals(name))
1042	>	continue;
1043	>	if ("Reference Handler".equals(name)
1044	>	&& (lockName = info.getLockName()) != null
1045	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1046	>	continue;
1047	>	if ("Finalizer".equals(name)
1048	>	&& (lockName = info.getLockName()) != null
1049	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1050	>	continue;
1051	>	if ("checkForWedgedTest".equals(name))
1052	>	continue;
1053		System.err.print(info);
1054	+	}
1055	+	System.err.println("------ stacktrace dump end ------");
1056	+
1057	+	if (sm != null) System.setSecurityManager(sm);
1058		}
1059
1060		/**
#	Line 612 | Line 1073 | public class JSR166TestCase extends Test
1073		// No need to optimize the failing case via Thread.join.
1074		delay(millis);
1075		assertTrue(thread.isAlive());
1076	<	} catch (InterruptedException ie) {
1077	<	fail("Unexpected InterruptedException");
1076	>	} catch (InterruptedException fail) {
1077	>	threadFail("Unexpected InterruptedException");
1078		}
1079		}
1080
#	Line 634 | Line 1095 | public class JSR166TestCase extends Test
1095		delay(millis);
1096		for (Thread thread : threads)
1097		assertTrue(thread.isAlive());
1098	<	} catch (InterruptedException ie) {
1099	<	fail("Unexpected InterruptedException");
1098	>	} catch (InterruptedException fail) {
1099	>	threadFail("Unexpected InterruptedException");
1100		}
1101		}
1102
#	Line 656 | Line 1117 | public class JSR166TestCase extends Test
1117		future.get(timeoutMillis, MILLISECONDS);
1118		shouldThrow();
1119		} catch (TimeoutException success) {
1120	<	} catch (Exception e) {
1121	<	threadUnexpectedException(e);
1120	>	} catch (Exception fail) {
1121	>	threadUnexpectedException(fail);
1122		} finally { future.cancel(true); }
1123		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1124		}
#	Line 701 | Line 1162 | public class JSR166TestCase extends Test
1162		public static final Integer m6  = new Integer(-6);
1163		public static final Integer m10 = new Integer(-10);
1164
704	–
1165		/**
1166		* Runs Runnable r with a security policy that permits precisely
1167		* the specified permissions.  If there is no current security
#	Line 781 | Line 1241 | public class JSR166TestCase extends Test
1241		}
1242		public void refresh() {}
1243		public String toString() {
1244	<	List<Permission> ps = new ArrayList<Permission>();
1244	>	List<Permission> ps = new ArrayList<>();
1245		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1246		ps.add(e.nextElement());
1247		return "AdjustablePolicy with permissions " + ps;
#	Line 811 | Line 1271 | public class JSR166TestCase extends Test
1271		* Sleeps until the given time has elapsed.
1272		* Throws AssertionFailedError if interrupted.
1273		*/
1274	<	void sleep(long millis) {
1274	>	static void sleep(long millis) {
1275		try {
1276		delay(millis);
1277	<	} catch (InterruptedException ie) {
1277	>	} catch (InterruptedException fail) {
1278		AssertionFailedError afe =
1279		new AssertionFailedError("Unexpected InterruptedException");
1280	<	afe.initCause(ie);
1280	>	afe.initCause(fail);
1281		throw afe;
1282		}
1283		}
#	Line 827 | Line 1287 | public class JSR166TestCase extends Test
1287		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1288		*/
1289		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1290	<	long startTime = System.nanoTime();
1290	>	long startTime = 0L;
1291		for (;;) {
1292		Thread.State s = thread.getState();
1293		if (s == Thread.State.BLOCKED ||
#	Line 836 | Line 1296 | public class JSR166TestCase extends Test
1296		return;
1297		else if (s == Thread.State.TERMINATED)
1298		fail("Unexpected thread termination");
1299	+	else if (startTime == 0L)
1300	+	startTime = System.nanoTime();
1301		else if (millisElapsedSince(startTime) > timeoutMillis) {
1302		threadAssertTrue(thread.isAlive());
1303	<	return;
1303	>	fail("timed out waiting for thread to enter wait state");
1304		}
1305		Thread.yield();
1306		}
1307		}
1308
1309		/**
1310	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1311	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1310	>	* Spin-waits up to the specified number of milliseconds for the given
1311	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1312	>	* and additionally satisfy the given condition.
1313	>	*/
1314	>	void waitForThreadToEnterWaitState(
1315	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1316	>	long startTime = 0L;
1317	>	for (;;) {
1318	>	Thread.State s = thread.getState();
1319	>	if (s == Thread.State.BLOCKED ||
1320	>	s == Thread.State.WAITING ||
1321	>	s == Thread.State.TIMED_WAITING) {
1322	>	try {
1323	>	if (waitingForGodot.call())
1324	>	return;
1325	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1326	>	}
1327	>	else if (s == Thread.State.TERMINATED)
1328	>	fail("Unexpected thread termination");
1329	>	else if (startTime == 0L)
1330	>	startTime = System.nanoTime();
1331	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1332	>	threadAssertTrue(thread.isAlive());
1333	>	fail("timed out waiting for thread to enter wait state");
1334	>	}
1335	>	Thread.yield();
1336	>	}
1337	>	}
1338	>
1339	>	/**
1340	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1341	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1342		*/
1343		void waitForThreadToEnterWaitState(Thread thread) {
1344		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1345		}
1346
1347		/**
1348	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1349	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1350	+	* and additionally satisfy the given condition.
1351	+	*/
1352	+	void waitForThreadToEnterWaitState(
1353	+	Thread thread, Callable<Boolean> waitingForGodot) {
1354	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1355	+	}
1356	+
1357	+	/**
1358		* Returns the number of milliseconds since time given by
1359		* startNanoTime, which must have been previously returned from a
1360	<	* call to {@link System.nanoTime()}.
1360	>	* call to {@link System#nanoTime()}.
1361		*/
1362	<	long millisElapsedSince(long startNanoTime) {
1362	>	static long millisElapsedSince(long startNanoTime) {
1363		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1364		}
1365
1366	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1367	+	//         long startTime = System.nanoTime();
1368	+	//         try {
1369	+	//             r.run();
1370	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1371	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1372	+	//             throw new AssertionFailedError("did not return promptly");
1373	+	//     }
1374	+
1375	+	//     void assertTerminatesPromptly(Runnable r) {
1376	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1377	+	//     }
1378	+
1379	+	/**
1380	+	* Checks that timed f.get() returns the expected value, and does not
1381	+	* wait for the timeout to elapse before returning.
1382	+	*/
1383	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1384	+	long startTime = System.nanoTime();
1385	+	try {
1386	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1387	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1388	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1389	+	throw new AssertionFailedError("timed get did not return promptly");
1390	+	}
1391	+
1392	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1393	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1394	+	}
1395	+
1396		/**
1397		* Returns a new started daemon Thread running the given runnable.
1398		*/
#	Line 879 | Line 1411 | public class JSR166TestCase extends Test
1411		void awaitTermination(Thread t, long timeoutMillis) {
1412		try {
1413		t.join(timeoutMillis);
1414	<	} catch (InterruptedException ie) {
1415	<	threadUnexpectedException(ie);
1414	>	} catch (InterruptedException fail) {
1415	>	threadUnexpectedException(fail);
1416		} finally {
1417		if (t.getState() != Thread.State.TERMINATED) {
1418		t.interrupt();
1419	<	fail("Test timed out");
1419	>	threadFail("timed out waiting for thread to terminate");
1420		}
1421		}
1422		}
#	Line 906 | Line 1438 | public class JSR166TestCase extends Test
1438		public final void run() {
1439		try {
1440		realRun();
1441	<	} catch (Throwable t) {
1442	<	threadUnexpectedException(t);
1441	>	} catch (Throwable fail) {
1442	>	threadUnexpectedException(fail);
1443		}
1444		}
1445		}
#	Line 961 | Line 1493 | public class JSR166TestCase extends Test
1493		threadShouldThrow("InterruptedException");
1494		} catch (InterruptedException success) {
1495		threadAssertFalse(Thread.interrupted());
1496	<	} catch (Throwable t) {
1497	<	threadUnexpectedException(t);
1496	>	} catch (Throwable fail) {
1497	>	threadUnexpectedException(fail);
1498		}
1499		}
1500		}
#	Line 973 | Line 1505 | public class JSR166TestCase extends Test
1505		public final T call() {
1506		try {
1507		return realCall();
1508	<	} catch (Throwable t) {
1509	<	threadUnexpectedException(t);
1508	>	} catch (Throwable fail) {
1509	>	threadUnexpectedException(fail);
1510		return null;
1511		}
1512		}
#	Line 991 | Line 1523 | public class JSR166TestCase extends Test
1523		return result;
1524		} catch (InterruptedException success) {
1525		threadAssertFalse(Thread.interrupted());
1526	<	} catch (Throwable t) {
1527	<	threadUnexpectedException(t);
1526	>	} catch (Throwable fail) {
1527	>	threadUnexpectedException(fail);
1528		}
1529		return null;
1530		}
#	Line 1009 | Line 1541 | public class JSR166TestCase extends Test
1541		public static final String TEST_STRING = "a test string";
1542
1543		public static class StringTask implements Callable<String> {
1544	<	public String call() { return TEST_STRING; }
1544	>	final String value;
1545	>	public StringTask() { this(TEST_STRING); }
1546	>	public StringTask(String value) { this.value = value; }
1547	>	public String call() { return value; }
1548		}
1549
1550		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1022 | Line 1557 | public class JSR166TestCase extends Test
1557		}};
1558		}
1559
1560	<	public Runnable awaiter(final CountDownLatch latch) {
1560	>	public Runnable countDowner(final CountDownLatch latch) {
1561		return new CheckedRunnable() {
1562		public void realRun() throws InterruptedException {
1563	<	await(latch);
1563	>	latch.countDown();
1564		}};
1565		}
1566
1567	<	public void await(CountDownLatch latch) {
1567	>	class LatchAwaiter extends CheckedRunnable {
1568	>	static final int NEW = 0;
1569	>	static final int RUNNING = 1;
1570	>	static final int DONE = 2;
1571	>	final CountDownLatch latch;
1572	>	int state = NEW;
1573	>	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1574	>	public void realRun() throws InterruptedException {
1575	>	state = 1;
1576	>	await(latch);
1577	>	state = 2;
1578	>	}
1579	>	}
1580	>
1581	>	public LatchAwaiter awaiter(CountDownLatch latch) {
1582	>	return new LatchAwaiter(latch);
1583	>	}
1584	>
1585	>	public void await(CountDownLatch latch, long timeoutMillis) {
1586		try {
1587	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1588	<	} catch (Throwable t) {
1589	<	threadUnexpectedException(t);
1587	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1588	>	fail("timed out waiting for CountDownLatch for "
1589	>	+ (timeoutMillis/1000) + " sec");
1590	>	} catch (Throwable fail) {
1591	>	threadUnexpectedException(fail);
1592		}
1593		}
1594
1595	+	public void await(CountDownLatch latch) {
1596	+	await(latch, LONG_DELAY_MS);
1597	+	}
1598	+
1599		public void await(Semaphore semaphore) {
1600		try {
1601	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1602	<	} catch (Throwable t) {
1603	<	threadUnexpectedException(t);
1601	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1602	>	fail("timed out waiting for Semaphore for "
1603	>	+ (LONG_DELAY_MS/1000) + " sec");
1604	>	} catch (Throwable fail) {
1605	>	threadUnexpectedException(fail);
1606		}
1607		}
1608
#	Line 1232 | Line 1793 | public class JSR166TestCase extends Test
1793		public abstract class CheckedRecursiveAction extends RecursiveAction {
1794		protected abstract void realCompute() throws Throwable;
1795
1796	<	public final void compute() {
1796	>	@Override protected final void compute() {
1797		try {
1798		realCompute();
1799	<	} catch (Throwable t) {
1800	<	threadUnexpectedException(t);
1799	>	} catch (Throwable fail) {
1800	>	threadUnexpectedException(fail);
1801		}
1802		}
1803		}
#	Line 1247 | Line 1808 | public class JSR166TestCase extends Test
1808		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1809		protected abstract T realCompute() throws Throwable;
1810
1811	<	public final T compute() {
1811	>	@Override protected final T compute() {
1812		try {
1813		return realCompute();
1814	<	} catch (Throwable t) {
1815	<	threadUnexpectedException(t);
1814	>	} catch (Throwable fail) {
1815	>	threadUnexpectedException(fail);
1816		return null;
1817		}
1818		}
#	Line 1269 | Line 1830 | public class JSR166TestCase extends Test
1830		* A CyclicBarrier that uses timed await and fails with
1831		* AssertionFailedErrors instead of throwing checked exceptions.
1832		*/
1833	<	public class CheckedBarrier extends CyclicBarrier {
1833	>	public static class CheckedBarrier extends CyclicBarrier {
1834		public CheckedBarrier(int parties) { super(parties); }
1835
1836		public int await() {
1837		try {
1838		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1839	<	} catch (TimeoutException e) {
1839	>	} catch (TimeoutException timedOut) {
1840		throw new AssertionFailedError("timed out");
1841	<	} catch (Exception e) {
1841	>	} catch (Exception fail) {
1842		AssertionFailedError afe =
1843	<	new AssertionFailedError("Unexpected exception: " + e);
1844	<	afe.initCause(e);
1843	>	new AssertionFailedError("Unexpected exception: " + fail);
1844	>	afe.initCause(fail);
1845		throw afe;
1846		}
1847		}
#	Line 1308 | Line 1869 | public class JSR166TestCase extends Test
1869		q.remove();
1870		shouldThrow();
1871		} catch (NoSuchElementException success) {}
1872	<	} catch (InterruptedException ie) {
1312	<	threadUnexpectedException(ie);
1313	<	}
1872	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1873		}
1874
1875		void assertSerialEquals(Object x, Object y) {
#	Line 1329 | Line 1888 | public class JSR166TestCase extends Test
1888		oos.flush();
1889		oos.close();
1890		return bos.toByteArray();
1891	<	} catch (Throwable t) {
1892	<	threadUnexpectedException(t);
1891	>	} catch (Throwable fail) {
1892	>	threadUnexpectedException(fail);
1893		return new byte[0];
1894		}
1895		}
1896
1897	+	void assertImmutable(final Object o) {
1898	+	if (o instanceof Collection) {
1899	+	assertThrows(
1900	+	UnsupportedOperationException.class,
1901	+	new Runnable() { public void run() {
1902	+	((Collection) o).add(null);}});
1903	+	}
1904	+	}
1905	+
1906		@SuppressWarnings("unchecked")
1907		<T> T serialClone(T o) {
1908		try {
1909		ObjectInputStream ois = new ObjectInputStream
1910		(new ByteArrayInputStream(serialBytes(o)));
1911		T clone = (T) ois.readObject();
1912	+	if (o == clone) assertImmutable(o);
1913		assertSame(o.getClass(), clone.getClass());
1914		return clone;
1915	<	} catch (Throwable t) {
1916	<	threadUnexpectedException(t);
1915	>	} catch (Throwable fail) {
1916	>	threadUnexpectedException(fail);
1917	>	return null;
1918	>	}
1919	>	}
1920	>
1921	>	/**
1922	>	* A version of serialClone that leaves error handling (for
1923	>	* e.g. NotSerializableException) up to the caller.
1924	>	*/
1925	>	@SuppressWarnings("unchecked")
1926	>	<T> T serialClonePossiblyFailing(T o)
1927	>	throws ReflectiveOperationException, java.io.IOException {
1928	>	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1929	>	ObjectOutputStream oos = new ObjectOutputStream(bos);
1930	>	oos.writeObject(o);
1931	>	oos.flush();
1932	>	oos.close();
1933	>	ObjectInputStream ois = new ObjectInputStream
1934	>	(new ByteArrayInputStream(bos.toByteArray()));
1935	>	T clone = (T) ois.readObject();
1936	>	if (o == clone) assertImmutable(o);
1937	>	assertSame(o.getClass(), clone.getClass());
1938	>	return clone;
1939	>	}
1940	>
1941	>	/**
1942	>	* If o implements Cloneable and has a public clone method,
1943	>	* returns a clone of o, else null.
1944	>	*/
1945	>	@SuppressWarnings("unchecked")
1946	>	<T> T cloneableClone(T o) {
1947	>	if (!(o instanceof Cloneable)) return null;
1948	>	final T clone;
1949	>	try {
1950	>	clone = (T) o.getClass().getMethod("clone").invoke(o);
1951	>	} catch (NoSuchMethodException ok) {
1952		return null;
1953	+	} catch (ReflectiveOperationException unexpected) {
1954	+	throw new Error(unexpected);
1955		}
1956	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1957	+	assertSame(o.getClass(), clone.getClass());
1958	+	return clone;
1959		}
1960
1961		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
#	Line 1369 | Line 1978 | public class JSR166TestCase extends Test
1978		shouldThrow(expectedExceptionClass.getName());
1979		}
1980		}
1981	+
1982	+	public void assertIteratorExhausted(Iterator<?> it) {
1983	+	try {
1984	+	it.next();
1985	+	shouldThrow();
1986	+	} catch (NoSuchElementException success) {}
1987	+	assertFalse(it.hasNext());
1988	+	}
1989	+
1990	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1991	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1992	+	}
1993	+
1994	+	public Runnable runnableThrowing(final RuntimeException ex) {
1995	+	return new Runnable() { public void run() { throw ex; }};
1996	+	}
1997	+
1998	+	/** A reusable thread pool to be shared by tests. */
1999	+	static final ExecutorService cachedThreadPool =
2000	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2001	+	1000L, MILLISECONDS,
2002	+	new SynchronousQueue<Runnable>());
2003	+
2004	+	static <T> void shuffle(T[] array) {
2005	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2006	+	}
2007		}

Diff Legend

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