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.82 by jsr166, Tue May 24 23:34:03 2011 UTC vs.
Revision 1.195 by jsr166, Sat Jun 4 23:49:29 2016 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
9	>	/*
10	>	* @test
11	>	* @summary JSR-166 tck tests
12	>	* @modules java.management
13	>	* @build *
14	>	* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
15	>	* @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -Djsr166.testImplementationDetails=true JSR166TestCase
16	>	*/
17	>
18	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
19	>	import static java.util.concurrent.TimeUnit.MINUTES;
20	>	import static java.util.concurrent.TimeUnit.NANOSECONDS;
21	>
22		import java.io.ByteArrayInputStream;
23		import java.io.ByteArrayOutputStream;
24		import java.io.ObjectInputStream;
25		import java.io.ObjectOutputStream;
26	<	import java.util.Arrays;
27	<	import java.util.Date;
28	<	import java.util.NoSuchElementException;
29	<	import java.util.PropertyPermission;
30	<	import java.util.concurrent.*;
31	<	import java.util.concurrent.atomic.AtomicBoolean;
32	<	import java.util.concurrent.atomic.AtomicReference;
33	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
22	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
26	>	import java.lang.management.ManagementFactory;
27	>	import java.lang.management.ThreadInfo;
28	>	import java.lang.management.ThreadMXBean;
29	>	import java.lang.reflect.Constructor;
30	>	import java.lang.reflect.Method;
31	>	import java.lang.reflect.Modifier;
32	>	import java.nio.file.Files;
33	>	import java.nio.file.Paths;
34		import java.security.CodeSource;
35		import java.security.Permission;
36		import java.security.PermissionCollection;
#	Line 27 | Line 38 | import java.security.Permissions;
38		import java.security.Policy;
39		import java.security.ProtectionDomain;
40		import java.security.SecurityPermission;
41	+	import java.util.ArrayList;
42	+	import java.util.Arrays;
43	+	import java.util.Date;
44	+	import java.util.Enumeration;
45	+	import java.util.Iterator;
46	+	import java.util.List;
47	+	import java.util.NoSuchElementException;
48	+	import java.util.PropertyPermission;
49	+	import java.util.concurrent.BlockingQueue;
50	+	import java.util.concurrent.Callable;
51	+	import java.util.concurrent.CountDownLatch;
52	+	import java.util.concurrent.CyclicBarrier;
53	+	import java.util.concurrent.ExecutionException;
54	+	import java.util.concurrent.Executors;
55	+	import java.util.concurrent.ExecutorService;
56	+	import java.util.concurrent.ForkJoinPool;
57	+	import java.util.concurrent.Future;
58	+	import java.util.concurrent.RecursiveAction;
59	+	import java.util.concurrent.RecursiveTask;
60	+	import java.util.concurrent.RejectedExecutionHandler;
61	+	import java.util.concurrent.Semaphore;
62	+	import java.util.concurrent.SynchronousQueue;
63	+	import java.util.concurrent.ThreadFactory;
64	+	import java.util.concurrent.ThreadPoolExecutor;
65	+	import java.util.concurrent.TimeoutException;
66	+	import java.util.concurrent.atomic.AtomicBoolean;
67	+	import java.util.concurrent.atomic.AtomicReference;
68	+	import java.util.regex.Matcher;
69	+	import java.util.regex.Pattern;
70	+
71	+	import junit.framework.AssertionFailedError;
72	+	import junit.framework.Test;
73	+	import junit.framework.TestCase;
74	+	import junit.framework.TestResult;
75	+	import junit.framework.TestSuite;
76
77		/**
78		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 38 | Line 84 | import java.security.SecurityPermission;
84		*
85		* <ol>
86		*
87	<	* <li> All assertions in code running in generated threads must use
87	>	* <li>All assertions in code running in generated threads must use
88		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
89		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
90		* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
91		* particularly recommended) for other code to use these forms too.
92		* Only the most typically used JUnit assertion methods are defined
93	<	* this way, but enough to live with.</li>
93	>	* this way, but enough to live with.
94		*
95	<	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
95	>	* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
96		* to invoke {@code super.setUp} and {@code super.tearDown} within
97		* them. These methods are used to clear and check for thread
98	<	* assertion failures.</li>
98	>	* assertion failures.
99		*
100		* <li>All delays and timeouts must use one of the constants {@code
101		* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
#	Line 60 | Line 106 | import java.security.SecurityPermission;
106		* is always discriminable as larger than SHORT and smaller than
107		* MEDIUM.  And so on. These constants are set to conservative values,
108		* but even so, if there is ever any doubt, they can all be increased
109	<	* in one spot to rerun tests on slower platforms.</li>
109	>	* in one spot to rerun tests on slower platforms.
110		*
111	<	* <li> All threads generated must be joined inside each test case
111	>	* <li>All threads generated must be joined inside each test case
112		* method (or {@code fail} to do so) before returning from the
113		* method. The {@code joinPool} method can be used to do this when
114	<	* using Executors.</li>
114	>	* using Executors.
115		*
116		* </ol>
117		*
118	<	* <p> <b>Other notes</b>
118	>	* <p><b>Other notes</b>
119		* <ul>
120		*
121	<	* <li> Usually, there is one testcase method per JSR166 method
121	>	* <li>Usually, there is one testcase method per JSR166 method
122		* covering "normal" operation, and then as many exception-testing
123		* methods as there are exceptions the method can throw. Sometimes
124		* there are multiple tests per JSR166 method when the different
125		* "normal" behaviors differ significantly. And sometimes testcases
126	<	* cover multiple methods when they cannot be tested in
81	<	* isolation.</li>
126	>	* cover multiple methods when they cannot be tested in isolation.
127		*
128	<	* <li> The documentation style for testcases is to provide as javadoc
128	>	* <li>The documentation style for testcases is to provide as javadoc
129		* a simple sentence or two describing the property that the testcase
130		* method purports to test. The javadocs do not say anything about how
131	<	* the property is tested. To find out, read the code.</li>
131	>	* the property is tested. To find out, read the code.
132		*
133	<	* <li> These tests are "conformance tests", and do not attempt to
133	>	* <li>These tests are "conformance tests", and do not attempt to
134		* test throughput, latency, scalability or other performance factors
135		* (see the separate "jtreg" tests for a set intended to check these
136		* for the most central aspects of functionality.) So, most tests use
137		* the smallest sensible numbers of threads, collection sizes, etc
138	<	* needed to check basic conformance.</li>
138	>	* needed to check basic conformance.
139		*
140		* <li>The test classes currently do not declare inclusion in
141		* any particular package to simplify things for people integrating
142	<	* them in TCK test suites.</li>
142	>	* them in TCK test suites.
143		*
144	<	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
145	<	* runs all JSR166 unit tests.</li>
144	>	* <li>As a convenience, the {@code main} of this class (JSR166TestCase)
145	>	* runs all JSR166 unit tests.
146		*
147		* </ul>
148		*/
#	Line 109 | Line 154 | public class JSR166TestCase extends Test
154		Boolean.getBoolean("jsr166.expensiveTests");
155
156		/**
157	+	* If true, also run tests that are not part of the official tck
158	+	* because they test unspecified implementation details.
159	+	*/
160	+	protected static final boolean testImplementationDetails =
161	+	Boolean.getBoolean("jsr166.testImplementationDetails");
162	+
163	+	/**
164		* If true, report on stdout all "slow" tests, that is, ones that
165		* take more than profileThreshold milliseconds to execute.
166		*/
#	Line 122 | Line 174 | public class JSR166TestCase extends Test
174		private static final long profileThreshold =
175		Long.getLong("jsr166.profileThreshold", 100);
176
177	+	/**
178	+	* The number of repetitions per test (for tickling rare bugs).
179	+	*/
180	+	private static final int runsPerTest =
181	+	Integer.getInteger("jsr166.runsPerTest", 1);
182	+
183	+	/**
184	+	* The number of repetitions of the test suite (for finding leaks?).
185	+	*/
186	+	private static final int suiteRuns =
187	+	Integer.getInteger("jsr166.suiteRuns", 1);
188	+
189	+	/**
190	+	* Returns the value of the system property, or NaN if not defined.
191	+	*/
192	+	private static float systemPropertyValue(String name) {
193	+	String floatString = System.getProperty(name);
194	+	if (floatString == null)
195	+	return Float.NaN;
196	+	try {
197	+	return Float.parseFloat(floatString);
198	+	} catch (NumberFormatException ex) {
199	+	throw new IllegalArgumentException(
200	+	String.format("Bad float value in system property %s=%s",
201	+	name, floatString));
202	+	}
203	+	}
204	+
205	+	/**
206	+	* The scaling factor to apply to standard delays used in tests.
207	+	* May be initialized from any of:
208	+	* - the "jsr166.delay.factor" system property
209	+	* - the "test.timeout.factor" system property (as used by jtreg)
210	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
211	+	* - hard-coded fuzz factor when using a known slowpoke VM
212	+	*/
213	+	private static final float delayFactor = delayFactor();
214	+
215	+	private static float delayFactor() {
216	+	float x;
217	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
218	+	return x;
219	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
220	+	return x;
221	+	String prop = System.getProperty("java.vm.version");
222	+	if (prop != null && prop.matches(".*debug.*"))
223	+	return 4.0f; // How much slower is fastdebug than product?!
224	+	return 1.0f;
225	+	}
226	+
227	+	public JSR166TestCase() { super(); }
228	+	public JSR166TestCase(String name) { super(name); }
229	+
230	+	/**
231	+	* A filter for tests to run, matching strings of the form
232	+	* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
233	+	* Usefully combined with jsr166.runsPerTest.
234	+	*/
235	+	private static final Pattern methodFilter = methodFilter();
236	+
237	+	private static Pattern methodFilter() {
238	+	String regex = System.getProperty("jsr166.methodFilter");
239	+	return (regex == null) ? null : Pattern.compile(regex);
240	+	}
241	+
242	+	// Instrumentation to debug very rare, but very annoying hung test runs.
243	+	static volatile TestCase currentTestCase;
244	+	// static volatile int currentRun = 0;
245	+	static {
246	+	Runnable checkForWedgedTest = new Runnable() { public void run() {
247	+	// Avoid spurious reports with enormous runsPerTest.
248	+	// A single test case run should never take more than 1 second.
249	+	// But let's cap it at the high end too ...
250	+	final int timeoutMinutes =
251	+	Math.min(15, Math.max(runsPerTest / 60, 1));
252	+	for (TestCase lastTestCase = currentTestCase;;) {
253	+	try { MINUTES.sleep(timeoutMinutes); }
254	+	catch (InterruptedException unexpected) { break; }
255	+	if (lastTestCase == currentTestCase) {
256	+	System.err.printf(
257	+	"Looks like we're stuck running test: %s%n",
258	+	lastTestCase);
259	+	//                     System.err.printf(
260	+	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
261	+	//                         lastTestCase, currentRun, runsPerTest);
262	+	//                     System.err.println("availableProcessors=" +
263	+	//                         Runtime.getRuntime().availableProcessors());
264	+	//                     System.err.printf("cpu model = %s%n", cpuModel());
265	+	dumpTestThreads();
266	+	// one stack dump is probably enough; more would be spam
267	+	break;
268	+	}
269	+	lastTestCase = currentTestCase;
270	+	}}};
271	+	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
272	+	thread.setDaemon(true);
273	+	thread.start();
274	+	}
275	+
276	+	//     public static String cpuModel() {
277	+	//         try {
278	+	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
279	+	//                 .matcher(new String(
280	+	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
281	+	//             matcher.find();
282	+	//             return matcher.group(1);
283	+	//         } catch (Exception ex) { return null; }
284	+	//     }
285	+
286	+	public void runBare() throws Throwable {
287	+	currentTestCase = this;
288	+	if (methodFilter == null
289	+	|| methodFilter.matcher(toString()).find())
290	+	super.runBare();
291	+	}
292	+
293		protected void runTest() throws Throwable {
294	<	if (profileTests)
295	<	runTestProfiled();
296	<	else
297	<	super.runTest();
294	>	for (int i = 0; i < runsPerTest; i++) {
295	>	// currentRun = i;
296	>	if (profileTests)
297	>	runTestProfiled();
298	>	else
299	>	super.runTest();
300	>	}
301		}
302
303		protected void runTestProfiled() throws Throwable {
304	<	long t0 = System.nanoTime();
305	<	try {
304	>	for (int i = 0; i < 2; i++) {
305	>	long startTime = System.nanoTime();
306		super.runTest();
307	<	} finally {
308	<	long elapsedMillis =
309	<	(System.nanoTime() - t0) / (1000L * 1000L);
310	<	if (elapsedMillis >= profileThreshold)
307	>	long elapsedMillis = millisElapsedSince(startTime);
308	>	if (elapsedMillis < profileThreshold)
309	>	break;
310	>	// Never report first run of any test; treat it as a
311	>	// warmup run, notably to trigger all needed classloading,
312	>	if (i > 0)
313		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
314		}
315		}
316
317		/**
318	<	* Runs all JSR166 unit tests using junit.textui.TestRunner
318	>	* Runs all JSR166 unit tests using junit.textui.TestRunner.
319		*/
320		public static void main(String[] args) {
321	+	main(suite(), args);
322	+	}
323	+
324	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
325	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
326	+	long runTime;
327	+	public void startTest(Test test) {}
328	+	protected void printHeader(long runTime) {
329	+	this.runTime = runTime; // defer printing for later
330	+	}
331	+	protected void printFooter(TestResult result) {
332	+	if (result.wasSuccessful()) {
333	+	getWriter().println("OK (" + result.runCount() + " tests)"
334	+	+ "  Time: " + elapsedTimeAsString(runTime));
335	+	} else {
336	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
337	+	super.printFooter(result);
338	+	}
339	+	}
340	+	}
341	+
342	+	/**
343	+	* Returns a TestRunner that doesn't bother with unnecessary
344	+	* fluff, like printing a "." for each test case.
345	+	*/
346	+	static junit.textui.TestRunner newPithyTestRunner() {
347	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
348	+	runner.setPrinter(new PithyResultPrinter(System.out));
349	+	return runner;
350	+	}
351	+
352	+	/**
353	+	* Runs all unit tests in the given test suite.
354	+	* Actual behavior influenced by jsr166.* system properties.
355	+	*/
356	+	static void main(Test suite, String[] args) {
357		if (useSecurityManager) {
358		System.err.println("Setting a permissive security manager");
359		Policy.setPolicy(permissivePolicy());
360		System.setSecurityManager(new SecurityManager());
361		}
362	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
363	<
364	<	Test s = suite();
365	<	for (int i = 0; i < iters; ++i) {
157	<	junit.textui.TestRunner.run(s);
362	>	for (int i = 0; i < suiteRuns; i++) {
363	>	TestResult result = newPithyTestRunner().doRun(suite);
364	>	if (!result.wasSuccessful())
365	>	System.exit(1);
366		System.gc();
367		System.runFinalization();
368		}
161	–	System.exit(0);
369		}
370
371		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 174 | Line 381 | public class JSR166TestCase extends Test
381		return suite;
382		}
383
384	+	public static void addNamedTestClasses(TestSuite suite,
385	+	String... testClassNames) {
386	+	for (String testClassName : testClassNames) {
387	+	try {
388	+	Class<?> testClass = Class.forName(testClassName);
389	+	Method m = testClass.getDeclaredMethod("suite",
390	+	new Class<?>[0]);
391	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
392	+	} catch (Exception e) {
393	+	throw new Error("Missing test class", e);
394	+	}
395	+	}
396	+	}
397	+
398	+	public static final double JAVA_CLASS_VERSION;
399	+	public static final String JAVA_SPECIFICATION_VERSION;
400	+	static {
401	+	try {
402	+	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
403	+	new java.security.PrivilegedAction<Double>() {
404	+	public Double run() {
405	+	return Double.valueOf(System.getProperty("java.class.version"));}});
406	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
407	+	new java.security.PrivilegedAction<String>() {
408	+	public String run() {
409	+	return System.getProperty("java.specification.version");}});
410	+	} catch (Throwable t) {
411	+	throw new Error(t);
412	+	}
413	+	}
414	+
415	+	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
416	+	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
417	+	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
418	+	public static boolean atLeastJava9() {
419	+	return JAVA_CLASS_VERSION >= 53.0
420	+	// As of 2015-09, java9 still uses 52.0 class file version
421	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
422	+	}
423	+	public static boolean atLeastJava10() {
424	+	return JAVA_CLASS_VERSION >= 54.0
425	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
426	+	}
427	+
428		/**
429		* Collects all JSR166 unit tests as one suite.
430		*/
431		public static Test suite() {
432	<	return newTestSuite(
432	>	// Java7+ test classes
433	>	TestSuite suite = newTestSuite(
434		ForkJoinPoolTest.suite(),
435		ForkJoinTaskTest.suite(),
436		RecursiveActionTest.suite(),
#	Line 243 | Line 495 | public class JSR166TestCase extends Test
495		TreeSetTest.suite(),
496		TreeSubMapTest.suite(),
497		TreeSubSetTest.suite());
498	+
499	+	// Java8+ test classes
500	+	if (atLeastJava8()) {
501	+	String[] java8TestClassNames = {
502	+	"Atomic8Test",
503	+	"CompletableFutureTest",
504	+	"ConcurrentHashMap8Test",
505	+	"CountedCompleterTest",
506	+	"DoubleAccumulatorTest",
507	+	"DoubleAdderTest",
508	+	"ForkJoinPool8Test",
509	+	"ForkJoinTask8Test",
510	+	"LongAccumulatorTest",
511	+	"LongAdderTest",
512	+	"SplittableRandomTest",
513	+	"StampedLockTest",
514	+	"SubmissionPublisherTest",
515	+	"ThreadLocalRandom8Test",
516	+	"TimeUnit8Test",
517	+	};
518	+	addNamedTestClasses(suite, java8TestClassNames);
519	+	}
520	+
521	+	// Java9+ test classes
522	+	if (atLeastJava9()) {
523	+	String[] java9TestClassNames = {
524	+	"ExecutorCompletionService9Test",
525	+	};
526	+	addNamedTestClasses(suite, java9TestClassNames);
527	+	}
528	+
529	+	return suite;
530		}
531
532	+	/** Returns list of junit-style test method names in given class. */
533	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
534	+	Method[] methods = testClass.getDeclaredMethods();
535	+	ArrayList<String> names = new ArrayList<String>(methods.length);
536	+	for (Method method : methods) {
537	+	if (method.getName().startsWith("test")
538	+	&& Modifier.isPublic(method.getModifiers())
539	+	// method.getParameterCount() requires jdk8+
540	+	&& method.getParameterTypes().length == 0) {
541	+	names.add(method.getName());
542	+	}
543	+	}
544	+	return names;
545	+	}
546	+
547	+	/**
548	+	* Returns junit-style testSuite for the given test class, but
549	+	* parameterized by passing extra data to each test.
550	+	*/
551	+	public static <ExtraData> Test parameterizedTestSuite
552	+	(Class<? extends JSR166TestCase> testClass,
553	+	Class<ExtraData> dataClass,
554	+	ExtraData data) {
555	+	try {
556	+	TestSuite suite = new TestSuite();
557	+	Constructor c =
558	+	testClass.getDeclaredConstructor(dataClass, String.class);
559	+	for (String methodName : testMethodNames(testClass))
560	+	suite.addTest((Test) c.newInstance(data, methodName));
561	+	return suite;
562	+	} catch (Exception e) {
563	+	throw new Error(e);
564	+	}
565	+	}
566	+
567	+	/**
568	+	* Returns junit-style testSuite for the jdk8 extension of the
569	+	* given test class, but parameterized by passing extra data to
570	+	* each test.  Uses reflection to allow compilation in jdk7.
571	+	*/
572	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
573	+	(Class<? extends JSR166TestCase> testClass,
574	+	Class<ExtraData> dataClass,
575	+	ExtraData data) {
576	+	if (atLeastJava8()) {
577	+	String name = testClass.getName();
578	+	String name8 = name.replaceAll("Test$", "8Test");
579	+	if (name.equals(name8)) throw new Error(name);
580	+	try {
581	+	return (Test)
582	+	Class.forName(name8)
583	+	.getMethod("testSuite", new Class[] { dataClass })
584	+	.invoke(null, data);
585	+	} catch (Exception e) {
586	+	throw new Error(e);
587	+	}
588	+	} else {
589	+	return new TestSuite();
590	+	}
591	+	}
592	+
593	+	// Delays for timing-dependent tests, in milliseconds.
594
595		public static long SHORT_DELAY_MS;
596		public static long SMALL_DELAY_MS;
597		public static long MEDIUM_DELAY_MS;
598		public static long LONG_DELAY_MS;
599
254	–
600		/**
601	<	* Returns the shortest timed delay. This could
602	<	* be reimplemented to use for example a Property.
601	>	* Returns the shortest timed delay. This can be scaled up for
602	>	* slow machines using the jsr166.delay.factor system property,
603	>	* or via jtreg's -timeoutFactor: flag.
604	>	* http://openjdk.java.net/jtreg/command-help.html
605		*/
606		protected long getShortDelay() {
607	<	return 50;
607	>	return (long) (50 * delayFactor);
608		}
609
263	–
610		/**
611		* Sets delays as multiples of SHORT_DELAY.
612		*/
#	Line 280 | Line 626 | public class JSR166TestCase extends Test
626		}
627
628		/**
629	<	* Returns a new Date instance representing a time delayMillis
630	<	* milliseconds in the future.
629	>	* Returns a new Date instance representing a time at least
630	>	* delayMillis milliseconds in the future.
631		*/
632		Date delayedDate(long delayMillis) {
633	<	return new Date(new Date().getTime() + delayMillis);
633	>	// Add 1 because currentTimeMillis is known to round into the past.
634	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
635		}
636
637		/**
#	Line 300 | Line 647 | public class JSR166TestCase extends Test
647		* the same test have no effect.
648		*/
649		public void threadRecordFailure(Throwable t) {
650	+	System.err.println(t);
651	+	dumpTestThreads();
652		threadFailure.compareAndSet(null, t);
653		}
654
#	Line 307 | Line 656 | public class JSR166TestCase extends Test
656		setDelays();
657		}
658
659	+	void tearDownFail(String format, Object... args) {
660	+	String msg = toString() + ": " + String.format(format, args);
661	+	System.err.println(msg);
662	+	dumpTestThreads();
663	+	throw new AssertionFailedError(msg);
664	+	}
665	+
666		/**
667	+	* Extra checks that get done for all test cases.
668	+	*
669		* Triggers test case failure if any thread assertions have failed,
670		* by rethrowing, in the test harness thread, any exception recorded
671		* earlier by threadRecordFailure.
672	+	*
673	+	* Triggers test case failure if interrupt status is set in the main thread.
674		*/
675		public void tearDown() throws Exception {
676		Throwable t = threadFailure.getAndSet(null);
#	Line 328 | Line 688 | public class JSR166TestCase extends Test
688		throw afe;
689		}
690		}
691	+
692	+	if (Thread.interrupted())
693	+	tearDownFail("interrupt status set in main thread");
694	+
695	+	checkForkJoinPoolThreadLeaks();
696	+	}
697	+
698	+	/**
699	+	* Finds missing PoolCleaners
700	+	*/
701	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
702	+	Thread[] survivors = new Thread[7];
703	+	int count = Thread.enumerate(survivors);
704	+	for (int i = 0; i < count; i++) {
705	+	Thread thread = survivors[i];
706	+	String name = thread.getName();
707	+	if (name.startsWith("ForkJoinPool-")) {
708	+	// give thread some time to terminate
709	+	thread.join(LONG_DELAY_MS);
710	+	if (thread.isAlive())
711	+	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
712	+	thread);
713	+	}
714	+	}
715	+
716	+	if (!ForkJoinPool.commonPool()
717	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
718	+	tearDownFail("ForkJoin common pool thread stuck");
719		}
720
721		/**
#	Line 340 | Line 728 | public class JSR166TestCase extends Test
728		fail(reason);
729		} catch (AssertionFailedError t) {
730		threadRecordFailure(t);
731	<	fail(reason);
731	>	throw t;
732		}
733		}
734
#	Line 408 | Line 796 | public class JSR166TestCase extends Test
796		public void threadAssertEquals(Object x, Object y) {
797		try {
798		assertEquals(x, y);
799	<	} catch (AssertionFailedError t) {
800	<	threadRecordFailure(t);
801	<	throw t;
802	<	} catch (Throwable t) {
803	<	threadUnexpectedException(t);
799	>	} catch (AssertionFailedError fail) {
800	>	threadRecordFailure(fail);
801	>	throw fail;
802	>	} catch (Throwable fail) {
803	>	threadUnexpectedException(fail);
804		}
805		}
806
#	Line 424 | Line 812 | public class JSR166TestCase extends Test
812		public void threadAssertSame(Object x, Object y) {
813		try {
814		assertSame(x, y);
815	<	} catch (AssertionFailedError t) {
816	<	threadRecordFailure(t);
817	<	throw t;
815	>	} catch (AssertionFailedError fail) {
816	>	threadRecordFailure(fail);
817	>	throw fail;
818		}
819		}
820
#	Line 467 | Line 855 | public class JSR166TestCase extends Test
855		/**
856		* Delays, via Thread.sleep, for the given millisecond delay, but
857		* if the sleep is shorter than specified, may re-sleep or yield
858	<	* until time elapses.
858	>	* until time elapses.  Ensures that the given time, as measured
859	>	* by System.nanoTime(), has elapsed.
860		*/
861		static void delay(long millis) throws InterruptedException {
862	<	long startTime = System.nanoTime();
863	<	long ns = millis * 1000 * 1000;
864	<	for (;;) {
862	>	long nanos = millis * (1000 * 1000);
863	>	final long wakeupTime = System.nanoTime() + nanos;
864	>	do {
865		if (millis > 0L)
866		Thread.sleep(millis);
867		else // too short to sleep
868		Thread.yield();
869	<	long d = ns - (System.nanoTime() - startTime);
870	<	if (d > 0L)
871	<	millis = d / (1000 * 1000);
872	<	else
873	<	break;
869	>	nanos = wakeupTime - System.nanoTime();
870	>	millis = nanos / (1000 * 1000);
871	>	} while (nanos >= 0L);
872	>	}
873	>
874	>	/**
875	>	* Allows use of try-with-resources with per-test thread pools.
876	>	*/
877	>	class PoolCleaner implements AutoCloseable {
878	>	private final ExecutorService pool;
879	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
880	>	public void close() { joinPool(pool); }
881	>	}
882	>
883	>	/**
884	>	* An extension of PoolCleaner that has an action to release the pool.
885	>	*/
886	>	class PoolCleanerWithReleaser extends PoolCleaner {
887	>	private final Runnable releaser;
888	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
889	>	super(pool);
890	>	this.releaser = releaser;
891	>	}
892	>	public void close() {
893	>	try {
894	>	releaser.run();
895	>	} finally {
896	>	super.close();
897	>	}
898		}
899		}
900
901	+	PoolCleaner cleaner(ExecutorService pool) {
902	+	return new PoolCleaner(pool);
903	+	}
904	+
905	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
906	+	return new PoolCleanerWithReleaser(pool, releaser);
907	+	}
908	+
909	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
910	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
911	+	}
912	+
913	+	Runnable releaser(final CountDownLatch latch) {
914	+	return new Runnable() { public void run() {
915	+	do { latch.countDown(); }
916	+	while (latch.getCount() > 0);
917	+	}};
918	+	}
919	+
920	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
921	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
922	+	}
923	+
924	+	Runnable releaser(final AtomicBoolean flag) {
925	+	return new Runnable() { public void run() { flag.set(true); }};
926	+	}
927	+
928		/**
929		* Waits out termination of a thread pool or fails doing so.
930		*/
931	<	void joinPool(ExecutorService exec) {
931	>	void joinPool(ExecutorService pool) {
932		try {
933	<	exec.shutdown();
934	<	assertTrue("ExecutorService did not terminate in a timely manner",
935	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
933	>	pool.shutdown();
934	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
935	>	try {
936	>	threadFail("ExecutorService " + pool +
937	>	" did not terminate in a timely manner");
938	>	} finally {
939	>	// last resort, for the benefit of subsequent tests
940	>	pool.shutdownNow();
941	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
942	>	}
943	>	}
944		} catch (SecurityException ok) {
945		// Allowed in case test doesn't have privs
946	<	} catch (InterruptedException ie) {
947	<	fail("Unexpected InterruptedException");
946	>	} catch (InterruptedException fail) {
947	>	threadFail("Unexpected InterruptedException");
948	>	}
949	>	}
950	>
951	>	/** Like Runnable, but with the freedom to throw anything */
952	>	interface Action { public void run() throws Throwable; }
953	>
954	>	/**
955	>	* Runs all the given actions in parallel, failing if any fail.
956	>	* Useful for running multiple variants of tests that are
957	>	* necessarily individually slow because they must block.
958	>	*/
959	>	void testInParallel(Action ... actions) {
960	>	ExecutorService pool = Executors.newCachedThreadPool();
961	>	try (PoolCleaner cleaner = cleaner(pool)) {
962	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
963	>	for (final Action action : actions)
964	>	futures.add(pool.submit(new CheckedRunnable() {
965	>	public void realRun() throws Throwable { action.run();}}));
966	>	for (Future<?> future : futures)
967	>	try {
968	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
969	>	} catch (ExecutionException ex) {
970	>	threadUnexpectedException(ex.getCause());
971	>	} catch (Exception ex) {
972	>	threadUnexpectedException(ex);
973	>	}
974		}
975		}
976
977		/**
978	+	* A debugging tool to print stack traces of most threads, as jstack does.
979	+	* Uninteresting threads are filtered out.
980	+	*/
981	+	static void dumpTestThreads() {
982	+	SecurityManager sm = System.getSecurityManager();
983	+	if (sm != null) {
984	+	try {
985	+	System.setSecurityManager(null);
986	+	} catch (SecurityException giveUp) {
987	+	return;
988	+	}
989	+	}
990	+
991	+	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
992	+	System.err.println("------ stacktrace dump start ------");
993	+	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
994	+	String name = info.getThreadName();
995	+	if ("Signal Dispatcher".equals(name))
996	+	continue;
997	+	if ("Reference Handler".equals(name)
998	+	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
999	+	continue;
1000	+	if ("Finalizer".equals(name)
1001	+	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1002	+	continue;
1003	+	if ("checkForWedgedTest".equals(name))
1004	+	continue;
1005	+	System.err.print(info);
1006	+	}
1007	+	System.err.println("------ stacktrace dump end ------");
1008	+
1009	+	if (sm != null) System.setSecurityManager(sm);
1010	+	}
1011	+
1012	+	/**
1013		* Checks that thread does not terminate within the default
1014		* millisecond delay of {@code timeoutMillis()}.
1015		*/
#	Line 516 | Line 1025 | public class JSR166TestCase extends Test
1025		// No need to optimize the failing case via Thread.join.
1026		delay(millis);
1027		assertTrue(thread.isAlive());
1028	<	} catch (InterruptedException ie) {
1029	<	fail("Unexpected InterruptedException");
1028	>	} catch (InterruptedException fail) {
1029	>	threadFail("Unexpected InterruptedException");
1030		}
1031		}
1032
1033		/**
1034	+	* Checks that the threads do not terminate within the default
1035	+	* millisecond delay of {@code timeoutMillis()}.
1036	+	*/
1037	+	void assertThreadsStayAlive(Thread... threads) {
1038	+	assertThreadsStayAlive(timeoutMillis(), threads);
1039	+	}
1040	+
1041	+	/**
1042	+	* Checks that the threads do not terminate within the given millisecond delay.
1043	+	*/
1044	+	void assertThreadsStayAlive(long millis, Thread... threads) {
1045	+	try {
1046	+	// No need to optimize the failing case via Thread.join.
1047	+	delay(millis);
1048	+	for (Thread thread : threads)
1049	+	assertTrue(thread.isAlive());
1050	+	} catch (InterruptedException fail) {
1051	+	threadFail("Unexpected InterruptedException");
1052	+	}
1053	+	}
1054	+
1055	+	/**
1056	+	* Checks that future.get times out, with the default timeout of
1057	+	* {@code timeoutMillis()}.
1058	+	*/
1059	+	void assertFutureTimesOut(Future future) {
1060	+	assertFutureTimesOut(future, timeoutMillis());
1061	+	}
1062	+
1063	+	/**
1064	+	* Checks that future.get times out, with the given millisecond timeout.
1065	+	*/
1066	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
1067	+	long startTime = System.nanoTime();
1068	+	try {
1069	+	future.get(timeoutMillis, MILLISECONDS);
1070	+	shouldThrow();
1071	+	} catch (TimeoutException success) {
1072	+	} catch (Exception fail) {
1073	+	threadUnexpectedException(fail);
1074	+	} finally { future.cancel(true); }
1075	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1076	+	}
1077	+
1078	+	/**
1079		* Fails with message "should throw exception".
1080		*/
1081		public void shouldThrow() {
#	Line 560 | Line 1114 | public class JSR166TestCase extends Test
1114		public static final Integer m6  = new Integer(-6);
1115		public static final Integer m10 = new Integer(-10);
1116
563	–
1117		/**
1118		* Runs Runnable r with a security policy that permits precisely
1119		* the specified permissions.  If there is no current security
#	Line 572 | Line 1125 | public class JSR166TestCase extends Test
1125		SecurityManager sm = System.getSecurityManager();
1126		if (sm == null) {
1127		r.run();
1128	+	}
1129	+	runWithSecurityManagerWithPermissions(r, permissions);
1130	+	}
1131	+
1132	+	/**
1133	+	* Runs Runnable r with a security policy that permits precisely
1134	+	* the specified permissions.  If there is no current security
1135	+	* manager, a temporary one is set for the duration of the
1136	+	* Runnable.  We require that any security manager permit
1137	+	* getPolicy/setPolicy.
1138	+	*/
1139	+	public void runWithSecurityManagerWithPermissions(Runnable r,
1140	+	Permission... permissions) {
1141	+	SecurityManager sm = System.getSecurityManager();
1142	+	if (sm == null) {
1143		Policy savedPolicy = Policy.getPolicy();
1144		try {
1145		Policy.setPolicy(permissivePolicy());
1146		System.setSecurityManager(new SecurityManager());
1147	<	runWithPermissions(r, permissions);
1147	>	runWithSecurityManagerWithPermissions(r, permissions);
1148		} finally {
1149		System.setSecurityManager(null);
1150		Policy.setPolicy(savedPolicy);
#	Line 624 | Line 1192 | public class JSR166TestCase extends Test
1192		return perms.implies(p);
1193		}
1194		public void refresh() {}
1195	+	public String toString() {
1196	+	List<Permission> ps = new ArrayList<Permission>();
1197	+	for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1198	+	ps.add(e.nextElement());
1199	+	return "AdjustablePolicy with permissions " + ps;
1200	+	}
1201		}
1202
1203		/**
#	Line 652 | Line 1226 | public class JSR166TestCase extends Test
1226		void sleep(long millis) {
1227		try {
1228		delay(millis);
1229	<	} catch (InterruptedException ie) {
1229	>	} catch (InterruptedException fail) {
1230		AssertionFailedError afe =
1231		new AssertionFailedError("Unexpected InterruptedException");
1232	<	afe.initCause(ie);
1232	>	afe.initCause(fail);
1233		throw afe;
1234		}
1235		}
1236
1237		/**
1238	<	* Waits up to the specified number of milliseconds for the given
1238	>	* Spin-waits up to the specified number of milliseconds for the given
1239		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1240		*/
1241		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1242	<	long timeoutNanos = timeoutMillis * 1000L * 1000L;
669	<	long t0 = System.nanoTime();
1242	>	long startTime = System.nanoTime();
1243		for (;;) {
1244		Thread.State s = thread.getState();
1245		if (s == Thread.State.BLOCKED ||
#	Line 675 | Line 1248 | public class JSR166TestCase extends Test
1248		return;
1249		else if (s == Thread.State.TERMINATED)
1250		fail("Unexpected thread termination");
1251	<	else if (System.nanoTime() - t0 > timeoutNanos) {
1251	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1252		threadAssertTrue(thread.isAlive());
1253		return;
1254		}
#	Line 694 | Line 1267 | public class JSR166TestCase extends Test
1267		/**
1268		* Returns the number of milliseconds since time given by
1269		* startNanoTime, which must have been previously returned from a
1270	<	* call to {@link System.nanoTime()}.
1270	>	* call to {@link System#nanoTime()}.
1271		*/
1272	<	long millisElapsedSince(long startNanoTime) {
1272	>	static long millisElapsedSince(long startNanoTime) {
1273		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1274		}
1275
1276	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1277	+	//         long startTime = System.nanoTime();
1278	+	//         try {
1279	+	//             r.run();
1280	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1281	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1282	+	//             throw new AssertionFailedError("did not return promptly");
1283	+	//     }
1284	+
1285	+	//     void assertTerminatesPromptly(Runnable r) {
1286	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1287	+	//     }
1288	+
1289	+	/**
1290	+	* Checks that timed f.get() returns the expected value, and does not
1291	+	* wait for the timeout to elapse before returning.
1292	+	*/
1293	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1294	+	long startTime = System.nanoTime();
1295	+	try {
1296	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1297	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1298	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1299	+	throw new AssertionFailedError("timed get did not return promptly");
1300	+	}
1301	+
1302	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1303	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1304	+	}
1305	+
1306		/**
1307		* Returns a new started daemon Thread running the given runnable.
1308		*/
#	Line 718 | Line 1321 | public class JSR166TestCase extends Test
1321		void awaitTermination(Thread t, long timeoutMillis) {
1322		try {
1323		t.join(timeoutMillis);
1324	<	} catch (InterruptedException ie) {
1325	<	threadUnexpectedException(ie);
1324	>	} catch (InterruptedException fail) {
1325	>	threadUnexpectedException(fail);
1326		} finally {
1327	<	if (t.isAlive()) {
1327	>	if (t.getState() != Thread.State.TERMINATED) {
1328		t.interrupt();
1329	<	fail("Test timed out");
1329	>	threadFail("timed out waiting for thread to terminate");
1330		}
1331		}
1332		}
#	Line 745 | Line 1348 | public class JSR166TestCase extends Test
1348		public final void run() {
1349		try {
1350		realRun();
1351	<	} catch (Throwable t) {
1352	<	threadUnexpectedException(t);
1351	>	} catch (Throwable fail) {
1352	>	threadUnexpectedException(fail);
1353		}
1354		}
1355		}
#	Line 800 | Line 1403 | public class JSR166TestCase extends Test
1403		threadShouldThrow("InterruptedException");
1404		} catch (InterruptedException success) {
1405		threadAssertFalse(Thread.interrupted());
1406	<	} catch (Throwable t) {
1407	<	threadUnexpectedException(t);
1406	>	} catch (Throwable fail) {
1407	>	threadUnexpectedException(fail);
1408		}
1409		}
1410		}
#	Line 812 | Line 1415 | public class JSR166TestCase extends Test
1415		public final T call() {
1416		try {
1417		return realCall();
1418	<	} catch (Throwable t) {
1419	<	threadUnexpectedException(t);
1418	>	} catch (Throwable fail) {
1419	>	threadUnexpectedException(fail);
1420		return null;
1421		}
1422		}
#	Line 830 | Line 1433 | public class JSR166TestCase extends Test
1433		return result;
1434		} catch (InterruptedException success) {
1435		threadAssertFalse(Thread.interrupted());
1436	<	} catch (Throwable t) {
1437	<	threadUnexpectedException(t);
1436	>	} catch (Throwable fail) {
1437	>	threadUnexpectedException(fail);
1438		}
1439		return null;
1440		}
#	Line 848 | Line 1451 | public class JSR166TestCase extends Test
1451		public static final String TEST_STRING = "a test string";
1452
1453		public static class StringTask implements Callable<String> {
1454	<	public String call() { return TEST_STRING; }
1454	>	final String value;
1455	>	public StringTask() { this(TEST_STRING); }
1456	>	public StringTask(String value) { this.value = value; }
1457	>	public String call() { return value; }
1458		}
1459
1460		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 861 | Line 1467 | public class JSR166TestCase extends Test
1467		}};
1468		}
1469
1470	<	public Runnable awaiter(final CountDownLatch latch) {
1470	>	public Runnable countDowner(final CountDownLatch latch) {
1471		return new CheckedRunnable() {
1472		public void realRun() throws InterruptedException {
1473	<	await(latch);
1473	>	latch.countDown();
1474		}};
1475		}
1476
1477	+	class LatchAwaiter extends CheckedRunnable {
1478	+	static final int NEW = 0;
1479	+	static final int RUNNING = 1;
1480	+	static final int DONE = 2;
1481	+	final CountDownLatch latch;
1482	+	int state = NEW;
1483	+	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1484	+	public void realRun() throws InterruptedException {
1485	+	state = 1;
1486	+	await(latch);
1487	+	state = 2;
1488	+	}
1489	+	}
1490	+
1491	+	public LatchAwaiter awaiter(CountDownLatch latch) {
1492	+	return new LatchAwaiter(latch);
1493	+	}
1494	+
1495	+	public void await(CountDownLatch latch, long timeoutMillis) {
1496	+	try {
1497	+	if (!latch.await(timeoutMillis, MILLISECONDS))
1498	+	fail("timed out waiting for CountDownLatch for "
1499	+	+ (timeoutMillis/1000) + " sec");
1500	+	} catch (Throwable fail) {
1501	+	threadUnexpectedException(fail);
1502	+	}
1503	+	}
1504	+
1505		public void await(CountDownLatch latch) {
1506	+	await(latch, LONG_DELAY_MS);
1507	+	}
1508	+
1509	+	public void await(Semaphore semaphore) {
1510		try {
1511	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1512	<	} catch (Throwable t) {
1513	<	threadUnexpectedException(t);
1511	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1512	>	fail("timed out waiting for Semaphore for "
1513	>	+ (LONG_DELAY_MS/1000) + " sec");
1514	>	} catch (Throwable fail) {
1515	>	threadUnexpectedException(fail);
1516		}
1517		}
1518
#	Line 1063 | Line 1703 | public class JSR166TestCase extends Test
1703		public abstract class CheckedRecursiveAction extends RecursiveAction {
1704		protected abstract void realCompute() throws Throwable;
1705
1706	<	public final void compute() {
1706	>	@Override protected final void compute() {
1707		try {
1708		realCompute();
1709	<	} catch (Throwable t) {
1710	<	threadUnexpectedException(t);
1709	>	} catch (Throwable fail) {
1710	>	threadUnexpectedException(fail);
1711		}
1712		}
1713		}
#	Line 1078 | Line 1718 | public class JSR166TestCase extends Test
1718		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1719		protected abstract T realCompute() throws Throwable;
1720
1721	<	public final T compute() {
1721	>	@Override protected final T compute() {
1722		try {
1723		return realCompute();
1724	<	} catch (Throwable t) {
1725	<	threadUnexpectedException(t);
1724	>	} catch (Throwable fail) {
1725	>	threadUnexpectedException(fail);
1726		return null;
1727		}
1728		}
#	Line 1097 | Line 1737 | public class JSR166TestCase extends Test
1737		}
1738
1739		/**
1740	<	* A CyclicBarrier that fails with AssertionFailedErrors instead
1741	<	* of throwing checked exceptions.
1740	>	* A CyclicBarrier that uses timed await and fails with
1741	>	* AssertionFailedErrors instead of throwing checked exceptions.
1742		*/
1743		public class CheckedBarrier extends CyclicBarrier {
1744		public CheckedBarrier(int parties) { super(parties); }
1745
1746		public int await() {
1747		try {
1748	<	return super.await();
1749	<	} catch (Exception e) {
1748	>	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1749	>	} catch (TimeoutException timedOut) {
1750	>	throw new AssertionFailedError("timed out");
1751	>	} catch (Exception fail) {
1752		AssertionFailedError afe =
1753	<	new AssertionFailedError("Unexpected exception: " + e);
1754	<	afe.initCause(e);
1753	>	new AssertionFailedError("Unexpected exception: " + fail);
1754	>	afe.initCause(fail);
1755		throw afe;
1756		}
1757		}
#	Line 1137 | Line 1779 | public class JSR166TestCase extends Test
1779		q.remove();
1780		shouldThrow();
1781		} catch (NoSuchElementException success) {}
1782	<	} catch (InterruptedException ie) {
1141	<	threadUnexpectedException(ie);
1142	<	}
1782	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1783		}
1784
1785	<	@SuppressWarnings("unchecked")
1786	<	<T> T serialClone(T o) {
1785	>	void assertSerialEquals(Object x, Object y) {
1786	>	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1787	>	}
1788	>
1789	>	void assertNotSerialEquals(Object x, Object y) {
1790	>	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1791	>	}
1792	>
1793	>	byte[] serialBytes(Object o) {
1794		try {
1795		ByteArrayOutputStream bos = new ByteArrayOutputStream();
1796		ObjectOutputStream oos = new ObjectOutputStream(bos);
1797		oos.writeObject(o);
1798		oos.flush();
1799		oos.close();
1800	<	ByteArrayInputStream bin =
1801	<	new ByteArrayInputStream(bos.toByteArray());
1802	<	ObjectInputStream ois = new ObjectInputStream(bin);
1803	<	return (T) ois.readObject();
1804	<	} catch (Throwable t) {
1805	<	threadUnexpectedException(t);
1800	>	return bos.toByteArray();
1801	>	} catch (Throwable fail) {
1802	>	threadUnexpectedException(fail);
1803	>	return new byte[0];
1804	>	}
1805	>	}
1806	>
1807	>	@SuppressWarnings("unchecked")
1808	>	<T> T serialClone(T o) {
1809	>	try {
1810	>	ObjectInputStream ois = new ObjectInputStream
1811	>	(new ByteArrayInputStream(serialBytes(o)));
1812	>	T clone = (T) ois.readObject();
1813	>	assertSame(o.getClass(), clone.getClass());
1814	>	return clone;
1815	>	} catch (Throwable fail) {
1816	>	threadUnexpectedException(fail);
1817		return null;
1818		}
1819		}
1820	+
1821	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1822	+	Runnable... throwingActions) {
1823	+	for (Runnable throwingAction : throwingActions) {
1824	+	boolean threw = false;
1825	+	try { throwingAction.run(); }
1826	+	catch (Throwable t) {
1827	+	threw = true;
1828	+	if (!expectedExceptionClass.isInstance(t)) {
1829	+	AssertionFailedError afe =
1830	+	new AssertionFailedError
1831	+	("Expected " + expectedExceptionClass.getName() +
1832	+	", got " + t.getClass().getName());
1833	+	afe.initCause(t);
1834	+	threadUnexpectedException(afe);
1835	+	}
1836	+	}
1837	+	if (!threw)
1838	+	shouldThrow(expectedExceptionClass.getName());
1839	+	}
1840	+	}
1841	+
1842	+	public void assertIteratorExhausted(Iterator<?> it) {
1843	+	try {
1844	+	it.next();
1845	+	shouldThrow();
1846	+	} catch (NoSuchElementException success) {}
1847	+	assertFalse(it.hasNext());
1848	+	}
1849	+
1850	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1851	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1852	+	}
1853	+
1854	+	public Runnable runnableThrowing(final RuntimeException ex) {
1855	+	return new Runnable() { public void run() { throw ex; }};
1856	+	}
1857	+
1858	+	/** A reusable thread pool to be shared by tests. */
1859	+	static final ExecutorService cachedThreadPool =
1860	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1861	+	1000L, MILLISECONDS,
1862	+	new SynchronousQueue<Runnable>());
1863	+
1864		}

Diff Legend

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