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.70 by jsr166, Sun Nov 21 19:04:45 2010 UTC vs.
Revision 1.166 by jsr166, Mon Oct 5 21:39:39 2015 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
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.PropertyPermission;
11	–	import java.util.concurrent.*;
12	–	import java.util.concurrent.atomic.AtomicReference;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	+	import static java.util.concurrent.TimeUnit.MINUTES;
11		import static java.util.concurrent.TimeUnit.NANOSECONDS;
12	+
13	+	import java.io.ByteArrayInputStream;
14	+	import java.io.ByteArrayOutputStream;
15	+	import java.io.ObjectInputStream;
16	+	import java.io.ObjectOutputStream;
17	+	import java.lang.management.ManagementFactory;
18	+	import java.lang.management.ThreadInfo;
19	+	import java.lang.management.ThreadMXBean;
20	+	import java.lang.reflect.Constructor;
21	+	import java.lang.reflect.Method;
22	+	import java.lang.reflect.Modifier;
23		import java.security.CodeSource;
24		import java.security.Permission;
25		import java.security.PermissionCollection;
#	Line 19 | Line 27 | import java.security.Permissions;
27		import java.security.Policy;
28		import java.security.ProtectionDomain;
29		import java.security.SecurityPermission;
30	+	import java.util.ArrayList;
31	+	import java.util.Arrays;
32	+	import java.util.Date;
33	+	import java.util.Enumeration;
34	+	import java.util.Iterator;
35	+	import java.util.List;
36	+	import java.util.NoSuchElementException;
37	+	import java.util.PropertyPermission;
38	+	import java.util.concurrent.BlockingQueue;
39	+	import java.util.concurrent.Callable;
40	+	import java.util.concurrent.CountDownLatch;
41	+	import java.util.concurrent.CyclicBarrier;
42	+	import java.util.concurrent.ExecutionException;
43	+	import java.util.concurrent.Executors;
44	+	import java.util.concurrent.ExecutorService;
45	+	import java.util.concurrent.ForkJoinPool;
46	+	import java.util.concurrent.Future;
47	+	import java.util.concurrent.RecursiveAction;
48	+	import java.util.concurrent.RecursiveTask;
49	+	import java.util.concurrent.RejectedExecutionHandler;
50	+	import java.util.concurrent.Semaphore;
51	+	import java.util.concurrent.ThreadFactory;
52	+	import java.util.concurrent.ThreadPoolExecutor;
53	+	import java.util.concurrent.TimeoutException;
54	+	import java.util.concurrent.atomic.AtomicReference;
55	+	import java.util.regex.Pattern;
56	+
57	+	import junit.framework.AssertionFailedError;
58	+	import junit.framework.Test;
59	+	import junit.framework.TestCase;
60	+	import junit.framework.TestResult;
61	+	import junit.framework.TestSuite;
62
63		/**
64		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 30 | Line 70 | import java.security.SecurityPermission;
70		*
71		* <ol>
72		*
73	<	* <li> All assertions in code running in generated threads must use
73	>	* <li>All assertions in code running in generated threads must use
74		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
75		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
76		* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
77		* particularly recommended) for other code to use these forms too.
78		* Only the most typically used JUnit assertion methods are defined
79	<	* this way, but enough to live with.</li>
79	>	* this way, but enough to live with.
80		*
81	<	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
81	>	* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
82		* to invoke {@code super.setUp} and {@code super.tearDown} within
83		* them. These methods are used to clear and check for thread
84	<	* assertion failures.</li>
84	>	* assertion failures.
85		*
86		* <li>All delays and timeouts must use one of the constants {@code
87		* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
#	Line 52 | Line 92 | import java.security.SecurityPermission;
92		* is always discriminable as larger than SHORT and smaller than
93		* MEDIUM.  And so on. These constants are set to conservative values,
94		* but even so, if there is ever any doubt, they can all be increased
95	<	* in one spot to rerun tests on slower platforms.</li>
95	>	* in one spot to rerun tests on slower platforms.
96		*
97	<	* <li> All threads generated must be joined inside each test case
97	>	* <li>All threads generated must be joined inside each test case
98		* method (or {@code fail} to do so) before returning from the
99		* method. The {@code joinPool} method can be used to do this when
100	<	* using Executors.</li>
100	>	* using Executors.
101		*
102		* </ol>
103		*
104	<	* <p> <b>Other notes</b>
104	>	* <p><b>Other notes</b>
105		* <ul>
106		*
107	<	* <li> Usually, there is one testcase method per JSR166 method
107	>	* <li>Usually, there is one testcase method per JSR166 method
108		* covering "normal" operation, and then as many exception-testing
109		* methods as there are exceptions the method can throw. Sometimes
110		* there are multiple tests per JSR166 method when the different
111		* "normal" behaviors differ significantly. And sometimes testcases
112		* cover multiple methods when they cannot be tested in
113	<	* isolation.</li>
113	>	* isolation.
114		*
115	<	* <li> The documentation style for testcases is to provide as javadoc
115	>	* <li>The documentation style for testcases is to provide as javadoc
116		* a simple sentence or two describing the property that the testcase
117		* method purports to test. The javadocs do not say anything about how
118	<	* the property is tested. To find out, read the code.</li>
118	>	* the property is tested. To find out, read the code.
119		*
120	<	* <li> These tests are "conformance tests", and do not attempt to
120	>	* <li>These tests are "conformance tests", and do not attempt to
121		* test throughput, latency, scalability or other performance factors
122		* (see the separate "jtreg" tests for a set intended to check these
123		* for the most central aspects of functionality.) So, most tests use
124		* the smallest sensible numbers of threads, collection sizes, etc
125	<	* needed to check basic conformance.</li>
125	>	* needed to check basic conformance.
126		*
127		* <li>The test classes currently do not declare inclusion in
128		* any particular package to simplify things for people integrating
129	<	* them in TCK test suites.</li>
129	>	* them in TCK test suites.
130		*
131	<	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
132	<	* runs all JSR166 unit tests.</li>
131	>	* <li>As a convenience, the {@code main} of this class (JSR166TestCase)
132	>	* runs all JSR166 unit tests.
133		*
134		* </ul>
135		*/
#	Line 101 | Line 141 | public class JSR166TestCase extends Test
141		Boolean.getBoolean("jsr166.expensiveTests");
142
143		/**
144	+	* If true, also run tests that are not part of the official tck
145	+	* because they test unspecified implementation details.
146	+	*/
147	+	protected static final boolean testImplementationDetails =
148	+	Boolean.getBoolean("jsr166.testImplementationDetails");
149	+
150	+	/**
151		* If true, report on stdout all "slow" tests, that is, ones that
152		* take more than profileThreshold milliseconds to execute.
153		*/
#	Line 114 | Line 161 | public class JSR166TestCase extends Test
161		private static final long profileThreshold =
162		Long.getLong("jsr166.profileThreshold", 100);
163
164	+	/**
165	+	* The number of repetitions per test (for tickling rare bugs).
166	+	*/
167	+	private static final int runsPerTest =
168	+	Integer.getInteger("jsr166.runsPerTest", 1);
169	+
170	+	/**
171	+	* The number of repetitions of the test suite (for finding leaks?).
172	+	*/
173	+	private static final int suiteRuns =
174	+	Integer.getInteger("jsr166.suiteRuns", 1);
175	+
176	+	public JSR166TestCase() { super(); }
177	+	public JSR166TestCase(String name) { super(name); }
178	+
179	+	/**
180	+	* A filter for tests to run, matching strings of the form
181	+	* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
182	+	* Usefully combined with jsr166.runsPerTest.
183	+	*/
184	+	private static final Pattern methodFilter = methodFilter();
185	+
186	+	private static Pattern methodFilter() {
187	+	String regex = System.getProperty("jsr166.methodFilter");
188	+	return (regex == null) ? null : Pattern.compile(regex);
189	+	}
190	+
191	+	static volatile TestCase currentTestCase;
192	+	static {
193	+	Runnable checkForWedgedTest = new Runnable() { public void run() {
194	+	// avoid spurious reports with enormous runsPerTest
195	+	final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
196	+	for (TestCase lastTestCase = currentTestCase;;) {
197	+	try { MINUTES.sleep(timeoutMinutes); }
198	+	catch (InterruptedException unexpected) { break; }
199	+	if (lastTestCase == currentTestCase) {
200	+	System.err.println
201	+	("Looks like we're stuck running test: "
202	+	+ lastTestCase);
203	+	dumpTestThreads();
204	+	// one stack dump is probably enough; more would be spam
205	+	break;
206	+	}
207	+	lastTestCase = currentTestCase;
208	+	}}};
209	+	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
210	+	thread.setDaemon(true);
211	+	thread.start();
212	+	}
213	+
214	+	public void runBare() throws Throwable {
215	+	currentTestCase = this;
216	+	if (methodFilter == null
217	+	|| methodFilter.matcher(toString()).find())
218	+	super.runBare();
219	+	}
220	+
221		protected void runTest() throws Throwable {
222	<	if (profileTests)
223	<	runTestProfiled();
224	<	else
225	<	super.runTest();
222	>	for (int i = 0; i < runsPerTest; i++) {
223	>	if (profileTests)
224	>	runTestProfiled();
225	>	else
226	>	super.runTest();
227	>	}
228		}
229
230		protected void runTestProfiled() throws Throwable {
231	<	long t0 = System.nanoTime();
232	<	try {
231	>	for (int i = 0; i < 2; i++) {
232	>	long startTime = System.nanoTime();
233		super.runTest();
234	<	} finally {
235	<	long elapsedMillis =
236	<	(System.nanoTime() - t0) / (1000L * 1000L);
237	<	if (elapsedMillis >= profileThreshold)
234	>	long elapsedMillis = millisElapsedSince(startTime);
235	>	if (elapsedMillis < profileThreshold)
236	>	break;
237	>	// Never report first run of any test; treat it as a
238	>	// warmup run, notably to trigger all needed classloading,
239	>	if (i > 0)
240		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
241		}
242		}
243
244		/**
245	<	* Runs all JSR166 unit tests using junit.textui.TestRunner
245	>	* Runs all JSR166 unit tests using junit.textui.TestRunner.
246		*/
247		public static void main(String[] args) {
248	+	main(suite(), args);
249	+	}
250	+
251	+	/**
252	+	* Runs all unit tests in the given test suite.
253	+	* Actual behavior influenced by jsr166.* system properties.
254	+	*/
255	+	static void main(Test suite, String[] args) {
256		if (useSecurityManager) {
257		System.err.println("Setting a permissive security manager");
258		Policy.setPolicy(permissivePolicy());
259		System.setSecurityManager(new SecurityManager());
260		}
261	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
262	<
263	<	Test s = suite();
264	<	for (int i = 0; i < iters; ++i) {
149	<	junit.textui.TestRunner.run(s);
261	>	for (int i = 0; i < suiteRuns; i++) {
262	>	TestResult result = junit.textui.TestRunner.run(suite);
263	>	if (!result.wasSuccessful())
264	>	System.exit(1);
265		System.gc();
266		System.runFinalization();
267		}
153	–	System.exit(0);
268		}
269
270		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 166 | Line 280 | public class JSR166TestCase extends Test
280		return suite;
281		}
282
283	+	public static void addNamedTestClasses(TestSuite suite,
284	+	String... testClassNames) {
285	+	for (String testClassName : testClassNames) {
286	+	try {
287	+	Class<?> testClass = Class.forName(testClassName);
288	+	Method m = testClass.getDeclaredMethod("suite",
289	+	new Class<?>[0]);
290	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
291	+	} catch (Exception e) {
292	+	throw new Error("Missing test class", e);
293	+	}
294	+	}
295	+	}
296	+
297	+	public static final double JAVA_CLASS_VERSION;
298	+	public static final String JAVA_SPECIFICATION_VERSION;
299	+	static {
300	+	try {
301	+	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
302	+	new java.security.PrivilegedAction<Double>() {
303	+	public Double run() {
304	+	return Double.valueOf(System.getProperty("java.class.version"));}});
305	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
306	+	new java.security.PrivilegedAction<String>() {
307	+	public String run() {
308	+	return System.getProperty("java.specification.version");}});
309	+	} catch (Throwable t) {
310	+	throw new Error(t);
311	+	}
312	+	}
313	+
314	+	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
315	+	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
316	+	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
317	+	public static boolean atLeastJava9() {
318	+	return JAVA_CLASS_VERSION >= 53.0
319	+	// As of 2015-09, java9 still uses 52.0 class file version
320	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
321	+	}
322	+	public static boolean atLeastJava10() {
323	+	return JAVA_CLASS_VERSION >= 54.0
324	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
325	+	}
326	+
327		/**
328		* Collects all JSR166 unit tests as one suite.
329		*/
330		public static Test suite() {
331	<	return newTestSuite(
331	>	// Java7+ test classes
332	>	TestSuite suite = newTestSuite(
333		ForkJoinPoolTest.suite(),
334		ForkJoinTaskTest.suite(),
335		RecursiveActionTest.suite(),
#	Line 235 | Line 394 | public class JSR166TestCase extends Test
394		TreeSetTest.suite(),
395		TreeSubMapTest.suite(),
396		TreeSubSetTest.suite());
397	+
398	+	// Java8+ test classes
399	+	if (atLeastJava8()) {
400	+	String[] java8TestClassNames = {
401	+	"Atomic8Test",
402	+	"CompletableFutureTest",
403	+	"ConcurrentHashMap8Test",
404	+	"CountedCompleterTest",
405	+	"DoubleAccumulatorTest",
406	+	"DoubleAdderTest",
407	+	"ForkJoinPool8Test",
408	+	"ForkJoinTask8Test",
409	+	"LongAccumulatorTest",
410	+	"LongAdderTest",
411	+	"SplittableRandomTest",
412	+	"StampedLockTest",
413	+	"SubmissionPublisherTest",
414	+	"ThreadLocalRandom8Test",
415	+	};
416	+	addNamedTestClasses(suite, java8TestClassNames);
417	+	}
418	+
419	+	// Java9+ test classes
420	+	if (atLeastJava9()) {
421	+	String[] java9TestClassNames = {
422	+	// Currently empty, but expecting varhandle tests
423	+	};
424	+	addNamedTestClasses(suite, java9TestClassNames);
425	+	}
426	+
427	+	return suite;
428	+	}
429	+
430	+	/** Returns list of junit-style test method names in given class. */
431	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
432	+	Method[] methods = testClass.getDeclaredMethods();
433	+	ArrayList<String> names = new ArrayList<String>(methods.length);
434	+	for (Method method : methods) {
435	+	if (method.getName().startsWith("test")
436	+	&& Modifier.isPublic(method.getModifiers())
437	+	// method.getParameterCount() requires jdk8+
438	+	&& method.getParameterTypes().length == 0) {
439	+	names.add(method.getName());
440	+	}
441	+	}
442	+	return names;
443	+	}
444	+
445	+	/**
446	+	* Returns junit-style testSuite for the given test class, but
447	+	* parameterized by passing extra data to each test.
448	+	*/
449	+	public static <ExtraData> Test parameterizedTestSuite
450	+	(Class<? extends JSR166TestCase> testClass,
451	+	Class<ExtraData> dataClass,
452	+	ExtraData data) {
453	+	try {
454	+	TestSuite suite = new TestSuite();
455	+	Constructor c =
456	+	testClass.getDeclaredConstructor(dataClass, String.class);
457	+	for (String methodName : testMethodNames(testClass))
458	+	suite.addTest((Test) c.newInstance(data, methodName));
459	+	return suite;
460	+	} catch (Exception e) {
461	+	throw new Error(e);
462	+	}
463		}
464
465	+	/**
466	+	* Returns junit-style testSuite for the jdk8 extension of the
467	+	* given test class, but parameterized by passing extra data to
468	+	* each test.  Uses reflection to allow compilation in jdk7.
469	+	*/
470	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
471	+	(Class<? extends JSR166TestCase> testClass,
472	+	Class<ExtraData> dataClass,
473	+	ExtraData data) {
474	+	if (atLeastJava8()) {
475	+	String name = testClass.getName();
476	+	String name8 = name.replaceAll("Test$", "8Test");
477	+	if (name.equals(name8)) throw new Error(name);
478	+	try {
479	+	return (Test)
480	+	Class.forName(name8)
481	+	.getMethod("testSuite", new Class[] { dataClass })
482	+	.invoke(null, data);
483	+	} catch (Exception e) {
484	+	throw new Error(e);
485	+	}
486	+	} else {
487	+	return new TestSuite();
488	+	}
489	+	}
490	+
491	+	// Delays for timing-dependent tests, in milliseconds.
492
493		public static long SHORT_DELAY_MS;
494		public static long SMALL_DELAY_MS;
495		public static long MEDIUM_DELAY_MS;
496		public static long LONG_DELAY_MS;
497
246	–
498		/**
499		* Returns the shortest timed delay. This could
500		* be reimplemented to use for example a Property.
#	Line 252 | Line 503 | public class JSR166TestCase extends Test
503		return 50;
504		}
505
255	–
506		/**
507		* Sets delays as multiples of SHORT_DELAY.
508		*/
#	Line 260 | Line 510 | public class JSR166TestCase extends Test
510		SHORT_DELAY_MS = getShortDelay();
511		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
512		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
513	<	LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
513	>	LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
514	>	}
515	>
516	>	/**
517	>	* Returns a timeout in milliseconds to be used in tests that
518	>	* verify that operations block or time out.
519	>	*/
520	>	long timeoutMillis() {
521	>	return SHORT_DELAY_MS / 4;
522	>	}
523	>
524	>	/**
525	>	* Returns a new Date instance representing a time at least
526	>	* delayMillis milliseconds in the future.
527	>	*/
528	>	Date delayedDate(long delayMillis) {
529	>	// Add 1 because currentTimeMillis is known to round into the past.
530	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
531		}
532
533		/**
#	Line 276 | Line 543 | public class JSR166TestCase extends Test
543		* the same test have no effect.
544		*/
545		public void threadRecordFailure(Throwable t) {
546	+	System.err.println(t);
547	+	dumpTestThreads();
548		threadFailure.compareAndSet(null, t);
549		}
550
#	Line 283 | Line 552 | public class JSR166TestCase extends Test
552		setDelays();
553		}
554
555	+	void tearDownFail(String format, Object... args) {
556	+	String msg = toString() + ": " + String.format(format, args);
557	+	System.err.println(msg);
558	+	dumpTestThreads();
559	+	throw new AssertionFailedError(msg);
560	+	}
561	+
562		/**
563	+	* Extra checks that get done for all test cases.
564	+	*
565		* Triggers test case failure if any thread assertions have failed,
566		* by rethrowing, in the test harness thread, any exception recorded
567		* earlier by threadRecordFailure.
568	+	*
569	+	* Triggers test case failure if interrupt status is set in the main thread.
570		*/
571		public void tearDown() throws Exception {
572		Throwable t = threadFailure.getAndSet(null);
#	Line 304 | Line 584 | public class JSR166TestCase extends Test
584		throw afe;
585		}
586		}
587	+
588	+	if (Thread.interrupted())
589	+	tearDownFail("interrupt status set in main thread");
590	+
591	+	checkForkJoinPoolThreadLeaks();
592	+	}
593	+
594	+	/**
595	+	* Finds missing PoolCleaners
596	+	*/
597	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
598	+	Thread[] survivors = new Thread[7];
599	+	int count = Thread.enumerate(survivors);
600	+	for (int i = 0; i < count; i++) {
601	+	Thread thread = survivors[i];
602	+	String name = thread.getName();
603	+	if (name.startsWith("ForkJoinPool-")) {
604	+	// give thread some time to terminate
605	+	thread.join(LONG_DELAY_MS);
606	+	if (thread.isAlive())
607	+	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
608	+	thread);
609	+	}
610	+	}
611	+
612	+	if (!ForkJoinPool.commonPool()
613	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
614	+	tearDownFail("ForkJoin common pool thread stuck");
615		}
616
617		/**
#	Line 316 | Line 624 | public class JSR166TestCase extends Test
624		fail(reason);
625		} catch (AssertionFailedError t) {
626		threadRecordFailure(t);
627	<	fail(reason);
627	>	throw t;
628		}
629		}
630
#	Line 384 | Line 692 | public class JSR166TestCase extends Test
692		public void threadAssertEquals(Object x, Object y) {
693		try {
694		assertEquals(x, y);
695	<	} catch (AssertionFailedError t) {
696	<	threadRecordFailure(t);
697	<	throw t;
698	<	} catch (Throwable t) {
699	<	threadUnexpectedException(t);
695	>	} catch (AssertionFailedError fail) {
696	>	threadRecordFailure(fail);
697	>	throw fail;
698	>	} catch (Throwable fail) {
699	>	threadUnexpectedException(fail);
700		}
701		}
702
#	Line 400 | Line 708 | public class JSR166TestCase extends Test
708		public void threadAssertSame(Object x, Object y) {
709		try {
710		assertSame(x, y);
711	<	} catch (AssertionFailedError t) {
712	<	threadRecordFailure(t);
713	<	throw t;
711	>	} catch (AssertionFailedError fail) {
712	>	threadRecordFailure(fail);
713	>	throw fail;
714		}
715		}
716
#	Line 435 | Line 743 | public class JSR166TestCase extends Test
743		else {
744		AssertionFailedError afe =
745		new AssertionFailedError("unexpected exception: " + t);
746	<	t.initCause(t);
746	>	afe.initCause(t);
747		throw afe;
748		}
749		}
750
751		/**
752	+	* Delays, via Thread.sleep, for the given millisecond delay, but
753	+	* if the sleep is shorter than specified, may re-sleep or yield
754	+	* until time elapses.  Ensures that the given time, as measured
755	+	* by System.nanoTime(), has elapsed.
756	+	*/
757	+	static void delay(long millis) throws InterruptedException {
758	+	long nanos = millis * (1000 * 1000);
759	+	final long wakeupTime = System.nanoTime() + nanos;
760	+	do {
761	+	if (millis > 0L)
762	+	Thread.sleep(millis);
763	+	else // too short to sleep
764	+	Thread.yield();
765	+	nanos = wakeupTime - System.nanoTime();
766	+	millis = nanos / (1000 * 1000);
767	+	} while (nanos >= 0L);
768	+	}
769	+
770	+	/**
771	+	* Allows use of try-with-resources with per-test thread pools.
772	+	*/
773	+	class PoolCleaner implements AutoCloseable {
774	+	private final ExecutorService pool;
775	+	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
776	+	public void close() { joinPool(pool); }
777	+	}
778	+
779	+	/**
780	+	* An extension of PoolCleaner that has an action to release the pool.
781	+	*/
782	+	class PoolCleanerWithReleaser extends PoolCleaner {
783	+	private final Runnable releaser;
784	+	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
785	+	super(pool);
786	+	this.releaser = releaser;
787	+	}
788	+	public void close() {
789	+	try {
790	+	releaser.run();
791	+	} finally {
792	+	super.close();
793	+	}
794	+	}
795	+	}
796	+
797	+	PoolCleaner cleaner(ExecutorService pool) {
798	+	return new PoolCleaner(pool);
799	+	}
800	+
801	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
802	+	return new PoolCleanerWithReleaser(pool, releaser);
803	+	}
804	+
805	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
806	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
807	+	}
808	+
809	+	Runnable releaser(final CountDownLatch latch) {
810	+	return new Runnable() { public void run() {
811	+	do { latch.countDown(); }
812	+	while (latch.getCount() > 0);
813	+	}};
814	+	}
815	+
816	+	/**
817		* Waits out termination of a thread pool or fails doing so.
818		*/
819	<	public void joinPool(ExecutorService exec) {
819	>	void joinPool(ExecutorService pool) {
820		try {
821	<	exec.shutdown();
822	<	assertTrue("ExecutorService did not terminate in a timely manner",
823	<	exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
821	>	pool.shutdown();
822	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
823	>	try {
824	>	threadFail("ExecutorService " + pool +
825	>	" did not terminate in a timely manner");
826	>	} finally {
827	>	// last resort, for the benefit of subsequent tests
828	>	pool.shutdownNow();
829	>	pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
830	>	}
831	>	}
832		} catch (SecurityException ok) {
833		// Allowed in case test doesn't have privs
834	<	} catch (InterruptedException ie) {
835	<	fail("Unexpected InterruptedException");
834	>	} catch (InterruptedException fail) {
835	>	threadFail("Unexpected InterruptedException");
836		}
837		}
838
839	+	/** Like Runnable, but with the freedom to throw anything */
840	+	interface Action { public void run() throws Throwable; }
841	+
842	+	/**
843	+	* Runs all the given actions in parallel, failing if any fail.
844	+	* Useful for running multiple variants of tests that are
845	+	* necessarily individually slow because they must block.
846	+	*/
847	+	void testInParallel(Action ... actions) {
848	+	ExecutorService pool = Executors.newCachedThreadPool();
849	+	try (PoolCleaner cleaner = cleaner(pool)) {
850	+	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
851	+	for (final Action action : actions)
852	+	futures.add(pool.submit(new CheckedRunnable() {
853	+	public void realRun() throws Throwable { action.run();}}));
854	+	for (Future<?> future : futures)
855	+	try {
856	+	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
857	+	} catch (ExecutionException ex) {
858	+	threadUnexpectedException(ex.getCause());
859	+	} catch (Exception ex) {
860	+	threadUnexpectedException(ex);
861	+	}
862	+	}
863	+	}
864	+
865	+	/**
866	+	* A debugging tool to print stack traces of most threads, as jstack does.
867	+	* Uninteresting threads are filtered out.
868	+	*/
869	+	static void dumpTestThreads() {
870	+	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
871	+	System.err.println("------ stacktrace dump start ------");
872	+	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
873	+	String name = info.getThreadName();
874	+	if ("Signal Dispatcher".equals(name))
875	+	continue;
876	+	if ("Reference Handler".equals(name)
877	+	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
878	+	continue;
879	+	if ("Finalizer".equals(name)
880	+	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
881	+	continue;
882	+	if ("checkForWedgedTest".equals(name))
883	+	continue;
884	+	System.err.print(info);
885	+	}
886	+	System.err.println("------ stacktrace dump end ------");
887	+	}
888	+
889	+	/**
890	+	* Checks that thread does not terminate within the default
891	+	* millisecond delay of {@code timeoutMillis()}.
892	+	*/
893	+	void assertThreadStaysAlive(Thread thread) {
894	+	assertThreadStaysAlive(thread, timeoutMillis());
895	+	}
896	+
897	+	/**
898	+	* Checks that thread does not terminate within the given millisecond delay.
899	+	*/
900	+	void assertThreadStaysAlive(Thread thread, long millis) {
901	+	try {
902	+	// No need to optimize the failing case via Thread.join.
903	+	delay(millis);
904	+	assertTrue(thread.isAlive());
905	+	} catch (InterruptedException fail) {
906	+	threadFail("Unexpected InterruptedException");
907	+	}
908	+	}
909	+
910	+	/**
911	+	* Checks that the threads do not terminate within the default
912	+	* millisecond delay of {@code timeoutMillis()}.
913	+	*/
914	+	void assertThreadsStayAlive(Thread... threads) {
915	+	assertThreadsStayAlive(timeoutMillis(), threads);
916	+	}
917	+
918	+	/**
919	+	* Checks that the threads do not terminate within the given millisecond delay.
920	+	*/
921	+	void assertThreadsStayAlive(long millis, Thread... threads) {
922	+	try {
923	+	// No need to optimize the failing case via Thread.join.
924	+	delay(millis);
925	+	for (Thread thread : threads)
926	+	assertTrue(thread.isAlive());
927	+	} catch (InterruptedException fail) {
928	+	threadFail("Unexpected InterruptedException");
929	+	}
930	+	}
931	+
932	+	/**
933	+	* Checks that future.get times out, with the default timeout of
934	+	* {@code timeoutMillis()}.
935	+	*/
936	+	void assertFutureTimesOut(Future future) {
937	+	assertFutureTimesOut(future, timeoutMillis());
938	+	}
939	+
940	+	/**
941	+	* Checks that future.get times out, with the given millisecond timeout.
942	+	*/
943	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
944	+	long startTime = System.nanoTime();
945	+	try {
946	+	future.get(timeoutMillis, MILLISECONDS);
947	+	shouldThrow();
948	+	} catch (TimeoutException success) {
949	+	} catch (Exception fail) {
950	+	threadUnexpectedException(fail);
951	+	} finally { future.cancel(true); }
952	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
953	+	}
954
955		/**
956		* Fails with message "should throw exception".
#	Line 495 | Line 991 | public class JSR166TestCase extends Test
991		public static final Integer m6  = new Integer(-6);
992		public static final Integer m10 = new Integer(-10);
993
498	–
994		/**
995		* Runs Runnable r with a security policy that permits precisely
996		* the specified permissions.  If there is no current security
#	Line 507 | Line 1002 | public class JSR166TestCase extends Test
1002		SecurityManager sm = System.getSecurityManager();
1003		if (sm == null) {
1004		r.run();
1005	+	}
1006	+	runWithSecurityManagerWithPermissions(r, permissions);
1007	+	}
1008	+
1009	+	/**
1010	+	* Runs Runnable r with a security policy that permits precisely
1011	+	* the specified permissions.  If there is no current security
1012	+	* manager, a temporary one is set for the duration of the
1013	+	* Runnable.  We require that any security manager permit
1014	+	* getPolicy/setPolicy.
1015	+	*/
1016	+	public void runWithSecurityManagerWithPermissions(Runnable r,
1017	+	Permission... permissions) {
1018	+	SecurityManager sm = System.getSecurityManager();
1019	+	if (sm == null) {
1020		Policy savedPolicy = Policy.getPolicy();
1021		try {
1022		Policy.setPolicy(permissivePolicy());
1023		System.setSecurityManager(new SecurityManager());
1024	<	runWithPermissions(r, permissions);
1024	>	runWithSecurityManagerWithPermissions(r, permissions);
1025		} finally {
1026		System.setSecurityManager(null);
1027		Policy.setPolicy(savedPolicy);
#	Line 559 | Line 1069 | public class JSR166TestCase extends Test
1069		return perms.implies(p);
1070		}
1071		public void refresh() {}
1072	+	public String toString() {
1073	+	List<Permission> ps = new ArrayList<Permission>();
1074	+	for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1075	+	ps.add(e.nextElement());
1076	+	return "AdjustablePolicy with permissions " + ps;
1077	+	}
1078		}
1079
1080		/**
#	Line 586 | Line 1102 | public class JSR166TestCase extends Test
1102		*/
1103		void sleep(long millis) {
1104		try {
1105	<	Thread.sleep(millis);
1106	<	} catch (InterruptedException ie) {
1105	>	delay(millis);
1106	>	} catch (InterruptedException fail) {
1107		AssertionFailedError afe =
1108		new AssertionFailedError("Unexpected InterruptedException");
1109	<	afe.initCause(ie);
1109	>	afe.initCause(fail);
1110		throw afe;
1111		}
1112		}
1113
1114		/**
1115	<	* Sleeps until the timeout has elapsed, or interrupted.
600	<	* Does <em>NOT</em> throw InterruptedException.
601	<	*/
602	<	void sleepTillInterrupted(long timeoutMillis) {
603	<	try {
604	<	Thread.sleep(timeoutMillis);
605	<	} catch (InterruptedException wakeup) {}
606	<	}
607	<
608	<	/**
609	<	* Waits up to the specified number of milliseconds for the given
1115	>	* Spin-waits up to the specified number of milliseconds for the given
1116		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1117		*/
1118		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1119	<	long timeoutNanos = timeoutMillis * 1000L * 1000L;
614	<	long t0 = System.nanoTime();
1119	>	long startTime = System.nanoTime();
1120		for (;;) {
1121		Thread.State s = thread.getState();
1122		if (s == Thread.State.BLOCKED ||
#	Line 620 | Line 1125 | public class JSR166TestCase extends Test
1125		return;
1126		else if (s == Thread.State.TERMINATED)
1127		fail("Unexpected thread termination");
1128	<	else if (System.nanoTime() - t0 > timeoutNanos) {
1128	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1129		threadAssertTrue(thread.isAlive());
1130		return;
1131		}
#	Line 629 | Line 1134 | public class JSR166TestCase extends Test
1134		}
1135
1136		/**
1137	+	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1138	+	* state: BLOCKED, WAITING, or TIMED_WAITING.
1139	+	*/
1140	+	void waitForThreadToEnterWaitState(Thread thread) {
1141	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1142	+	}
1143	+
1144	+	/**
1145		* Returns the number of milliseconds since time given by
1146		* startNanoTime, which must have been previously returned from a
1147	<	* call to {@link System.nanoTime()}.
1147	>	* call to {@link System#nanoTime()}.
1148		*/
1149	<	long millisElapsedSince(long startNanoTime) {
1149	>	static long millisElapsedSince(long startNanoTime) {
1150		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1151		}
1152
1153	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1154	+	//         long startTime = System.nanoTime();
1155	+	//         try {
1156	+	//             r.run();
1157	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1158	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1159	+	//             throw new AssertionFailedError("did not return promptly");
1160	+	//     }
1161	+
1162	+	//     void assertTerminatesPromptly(Runnable r) {
1163	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1164	+	//     }
1165	+
1166	+	/**
1167	+	* Checks that timed f.get() returns the expected value, and does not
1168	+	* wait for the timeout to elapse before returning.
1169	+	*/
1170	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1171	+	long startTime = System.nanoTime();
1172	+	try {
1173	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1174	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1175	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1176	+	throw new AssertionFailedError("timed get did not return promptly");
1177	+	}
1178	+
1179	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1180	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1181	+	}
1182	+
1183		/**
1184		* Returns a new started daemon Thread running the given runnable.
1185		*/
#	Line 655 | Line 1198 | public class JSR166TestCase extends Test
1198		void awaitTermination(Thread t, long timeoutMillis) {
1199		try {
1200		t.join(timeoutMillis);
1201	<	} catch (InterruptedException ie) {
1202	<	threadUnexpectedException(ie);
1201	>	} catch (InterruptedException fail) {
1202	>	threadUnexpectedException(fail);
1203		} finally {
1204	<	if (t.isAlive()) {
1204	>	if (t.getState() != Thread.State.TERMINATED) {
1205		t.interrupt();
1206		fail("Test timed out");
1207		}
1208		}
1209		}
1210
1211	+	/**
1212	+	* Waits for LONG_DELAY_MS milliseconds for the thread to
1213	+	* terminate (using {@link Thread#join(long)}), else interrupts
1214	+	* the thread (in the hope that it may terminate later) and fails.
1215	+	*/
1216	+	void awaitTermination(Thread t) {
1217	+	awaitTermination(t, LONG_DELAY_MS);
1218	+	}
1219	+
1220		// Some convenient Runnable classes
1221
1222		public abstract class CheckedRunnable implements Runnable {
#	Line 673 | Line 1225 | public class JSR166TestCase extends Test
1225		public final void run() {
1226		try {
1227		realRun();
1228	<	} catch (Throwable t) {
1229	<	threadUnexpectedException(t);
1228	>	} catch (Throwable fail) {
1229	>	threadUnexpectedException(fail);
1230		}
1231		}
1232		}
#	Line 727 | Line 1279 | public class JSR166TestCase extends Test
1279		realRun();
1280		threadShouldThrow("InterruptedException");
1281		} catch (InterruptedException success) {
1282	<	} catch (Throwable t) {
1283	<	threadUnexpectedException(t);
1282	>	threadAssertFalse(Thread.interrupted());
1283	>	} catch (Throwable fail) {
1284	>	threadUnexpectedException(fail);
1285		}
1286		}
1287		}
#	Line 739 | Line 1292 | public class JSR166TestCase extends Test
1292		public final T call() {
1293		try {
1294		return realCall();
1295	<	} catch (Throwable t) {
1296	<	threadUnexpectedException(t);
1295	>	} catch (Throwable fail) {
1296	>	threadUnexpectedException(fail);
1297		return null;
1298		}
1299		}
#	Line 756 | Line 1309 | public class JSR166TestCase extends Test
1309		threadShouldThrow("InterruptedException");
1310		return result;
1311		} catch (InterruptedException success) {
1312	<	} catch (Throwable t) {
1313	<	threadUnexpectedException(t);
1312	>	threadAssertFalse(Thread.interrupted());
1313	>	} catch (Throwable fail) {
1314	>	threadUnexpectedException(fail);
1315		}
1316		return null;
1317		}
#	Line 774 | Line 1328 | public class JSR166TestCase extends Test
1328		public static final String TEST_STRING = "a test string";
1329
1330		public static class StringTask implements Callable<String> {
1331	<	public String call() { return TEST_STRING; }
1331	>	final String value;
1332	>	public StringTask() { this(TEST_STRING); }
1333	>	public StringTask(String value) { this.value = value; }
1334	>	public String call() { return value; }
1335		}
1336
1337		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 787 | Line 1344 | public class JSR166TestCase extends Test
1344		}};
1345		}
1346
1347	+	public Runnable countDowner(final CountDownLatch latch) {
1348	+	return new CheckedRunnable() {
1349	+	public void realRun() throws InterruptedException {
1350	+	latch.countDown();
1351	+	}};
1352	+	}
1353	+
1354	+	class LatchAwaiter extends CheckedRunnable {
1355	+	static final int NEW = 0;
1356	+	static final int RUNNING = 1;
1357	+	static final int DONE = 2;
1358	+	final CountDownLatch latch;
1359	+	int state = NEW;
1360	+	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1361	+	public void realRun() throws InterruptedException {
1362	+	state = 1;
1363	+	await(latch);
1364	+	state = 2;
1365	+	}
1366	+	}
1367	+
1368	+	public LatchAwaiter awaiter(CountDownLatch latch) {
1369	+	return new LatchAwaiter(latch);
1370	+	}
1371	+
1372	+	public void await(CountDownLatch latch) {
1373	+	try {
1374	+	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1375	+	} catch (Throwable fail) {
1376	+	threadUnexpectedException(fail);
1377	+	}
1378	+	}
1379	+
1380	+	public void await(Semaphore semaphore) {
1381	+	try {
1382	+	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1383	+	} catch (Throwable fail) {
1384	+	threadUnexpectedException(fail);
1385	+	}
1386	+	}
1387	+
1388	+	//     /**
1389	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1390	+	//      */
1391	+	//     public void await(AtomicBoolean flag) {
1392	+	//         await(flag, LONG_DELAY_MS);
1393	+	//     }
1394	+
1395	+	//     /**
1396	+	//      * Spin-waits up to the specified timeout until flag becomes true.
1397	+	//      */
1398	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
1399	+	//         long startTime = System.nanoTime();
1400	+	//         while (!flag.get()) {
1401	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
1402	+	//                 throw new AssertionFailedError("timed out");
1403	+	//             Thread.yield();
1404	+	//         }
1405	+	//     }
1406	+
1407		public static class NPETask implements Callable<String> {
1408		public String call() { throw new NullPointerException(); }
1409		}
#	Line 797 | Line 1414 | public class JSR166TestCase extends Test
1414
1415		public class ShortRunnable extends CheckedRunnable {
1416		protected void realRun() throws Throwable {
1417	<	Thread.sleep(SHORT_DELAY_MS);
1417	>	delay(SHORT_DELAY_MS);
1418		}
1419		}
1420
1421		public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1422		protected void realRun() throws InterruptedException {
1423	<	Thread.sleep(SHORT_DELAY_MS);
1423	>	delay(SHORT_DELAY_MS);
1424		}
1425		}
1426
1427		public class SmallRunnable extends CheckedRunnable {
1428		protected void realRun() throws Throwable {
1429	<	Thread.sleep(SMALL_DELAY_MS);
1429	>	delay(SMALL_DELAY_MS);
1430		}
1431		}
1432
1433		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1434		protected void realRun() {
1435		try {
1436	<	Thread.sleep(SMALL_DELAY_MS);
1436	>	delay(SMALL_DELAY_MS);
1437		} catch (InterruptedException ok) {}
1438		}
1439		}
1440
1441		public class SmallCallable extends CheckedCallable {
1442		protected Object realCall() throws InterruptedException {
1443	<	Thread.sleep(SMALL_DELAY_MS);
1443	>	delay(SMALL_DELAY_MS);
1444		return Boolean.TRUE;
1445		}
1446		}
1447
1448		public class MediumRunnable extends CheckedRunnable {
1449		protected void realRun() throws Throwable {
1450	<	Thread.sleep(MEDIUM_DELAY_MS);
1450	>	delay(MEDIUM_DELAY_MS);
1451		}
1452		}
1453
1454		public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1455		protected void realRun() throws InterruptedException {
1456	<	Thread.sleep(MEDIUM_DELAY_MS);
1456	>	delay(MEDIUM_DELAY_MS);
1457		}
1458		}
1459
#	Line 844 | Line 1461 | public class JSR166TestCase extends Test
1461		return new CheckedRunnable() {
1462		protected void realRun() {
1463		try {
1464	<	Thread.sleep(timeoutMillis);
1464	>	delay(timeoutMillis);
1465		} catch (InterruptedException ok) {}
1466		}};
1467		}
#	Line 852 | Line 1469 | public class JSR166TestCase extends Test
1469		public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1470		protected void realRun() {
1471		try {
1472	<	Thread.sleep(MEDIUM_DELAY_MS);
1472	>	delay(MEDIUM_DELAY_MS);
1473		} catch (InterruptedException ok) {}
1474		}
1475		}
#	Line 860 | Line 1477 | public class JSR166TestCase extends Test
1477		public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1478		protected void realRun() {
1479		try {
1480	<	Thread.sleep(LONG_DELAY_MS);
1480	>	delay(LONG_DELAY_MS);
1481		} catch (InterruptedException ok) {}
1482		}
1483		}
#	Line 884 | Line 1501 | public class JSR166TestCase extends Test
1501		public boolean isDone() { return done; }
1502		public void run() {
1503		try {
1504	<	Thread.sleep(timeoutMillis);
1504	>	delay(timeoutMillis);
1505		done = true;
1506		} catch (InterruptedException ok) {}
1507		}
#	Line 895 | Line 1512 | public class JSR166TestCase extends Test
1512		public volatile boolean done = false;
1513		public void run() {
1514		try {
1515	<	Thread.sleep(SHORT_DELAY_MS);
1515	>	delay(SHORT_DELAY_MS);
1516		done = true;
1517		} catch (InterruptedException ok) {}
1518		}
#	Line 905 | Line 1522 | public class JSR166TestCase extends Test
1522		public volatile boolean done = false;
1523		public void run() {
1524		try {
1525	<	Thread.sleep(SMALL_DELAY_MS);
1525	>	delay(SMALL_DELAY_MS);
1526		done = true;
1527		} catch (InterruptedException ok) {}
1528		}
#	Line 915 | Line 1532 | public class JSR166TestCase extends Test
1532		public volatile boolean done = false;
1533		public void run() {
1534		try {
1535	<	Thread.sleep(MEDIUM_DELAY_MS);
1535	>	delay(MEDIUM_DELAY_MS);
1536		done = true;
1537		} catch (InterruptedException ok) {}
1538		}
#	Line 925 | Line 1542 | public class JSR166TestCase extends Test
1542		public volatile boolean done = false;
1543		public void run() {
1544		try {
1545	<	Thread.sleep(LONG_DELAY_MS);
1545	>	delay(LONG_DELAY_MS);
1546		done = true;
1547		} catch (InterruptedException ok) {}
1548		}
#	Line 942 | Line 1559 | public class JSR166TestCase extends Test
1559		public volatile boolean done = false;
1560		public Object call() {
1561		try {
1562	<	Thread.sleep(SMALL_DELAY_MS);
1562	>	delay(SMALL_DELAY_MS);
1563		done = true;
1564		} catch (InterruptedException ok) {}
1565		return Boolean.TRUE;
#	Line 955 | Line 1572 | public class JSR166TestCase extends Test
1572		public abstract class CheckedRecursiveAction extends RecursiveAction {
1573		protected abstract void realCompute() throws Throwable;
1574
1575	<	public final void compute() {
1575	>	@Override protected final void compute() {
1576		try {
1577		realCompute();
1578	<	} catch (Throwable t) {
1579	<	threadUnexpectedException(t);
1578	>	} catch (Throwable fail) {
1579	>	threadUnexpectedException(fail);
1580		}
1581		}
1582		}
#	Line 970 | Line 1587 | public class JSR166TestCase extends Test
1587		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1588		protected abstract T realCompute() throws Throwable;
1589
1590	<	public final T compute() {
1590	>	@Override protected final T compute() {
1591		try {
1592		return realCompute();
1593	<	} catch (Throwable t) {
1594	<	threadUnexpectedException(t);
1593	>	} catch (Throwable fail) {
1594	>	threadUnexpectedException(fail);
1595		return null;
1596		}
1597		}
#	Line 989 | Line 1606 | public class JSR166TestCase extends Test
1606		}
1607
1608		/**
1609	<	* A CyclicBarrier that fails with AssertionFailedErrors instead
1610	<	* of throwing checked exceptions.
1609	>	* A CyclicBarrier that uses timed await and fails with
1610	>	* AssertionFailedErrors instead of throwing checked exceptions.
1611		*/
1612		public class CheckedBarrier extends CyclicBarrier {
1613		public CheckedBarrier(int parties) { super(parties); }
1614
1615		public int await() {
1616		try {
1617	<	return super.await();
1618	<	} catch (Exception e) {
1617	>	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1618	>	} catch (TimeoutException timedOut) {
1619	>	throw new AssertionFailedError("timed out");
1620	>	} catch (Exception fail) {
1621		AssertionFailedError afe =
1622	<	new AssertionFailedError("Unexpected exception: " + e);
1623	<	afe.initCause(e);
1622	>	new AssertionFailedError("Unexpected exception: " + fail);
1623	>	afe.initCause(fail);
1624		throw afe;
1625		}
1626		}
1627		}
1628
1629	+	void checkEmpty(BlockingQueue q) {
1630	+	try {
1631	+	assertTrue(q.isEmpty());
1632	+	assertEquals(0, q.size());
1633	+	assertNull(q.peek());
1634	+	assertNull(q.poll());
1635	+	assertNull(q.poll(0, MILLISECONDS));
1636	+	assertEquals(q.toString(), "[]");
1637	+	assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1638	+	assertFalse(q.iterator().hasNext());
1639	+	try {
1640	+	q.element();
1641	+	shouldThrow();
1642	+	} catch (NoSuchElementException success) {}
1643	+	try {
1644	+	q.iterator().next();
1645	+	shouldThrow();
1646	+	} catch (NoSuchElementException success) {}
1647	+	try {
1648	+	q.remove();
1649	+	shouldThrow();
1650	+	} catch (NoSuchElementException success) {}
1651	+	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1652	+	}
1653	+
1654	+	void assertSerialEquals(Object x, Object y) {
1655	+	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1656	+	}
1657	+
1658	+	void assertNotSerialEquals(Object x, Object y) {
1659	+	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1660	+	}
1661	+
1662	+	byte[] serialBytes(Object o) {
1663	+	try {
1664	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1665	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1666	+	oos.writeObject(o);
1667	+	oos.flush();
1668	+	oos.close();
1669	+	return bos.toByteArray();
1670	+	} catch (Throwable fail) {
1671	+	threadUnexpectedException(fail);
1672	+	return new byte[0];
1673	+	}
1674	+	}
1675	+
1676	+	@SuppressWarnings("unchecked")
1677	+	<T> T serialClone(T o) {
1678	+	try {
1679	+	ObjectInputStream ois = new ObjectInputStream
1680	+	(new ByteArrayInputStream(serialBytes(o)));
1681	+	T clone = (T) ois.readObject();
1682	+	assertSame(o.getClass(), clone.getClass());
1683	+	return clone;
1684	+	} catch (Throwable fail) {
1685	+	threadUnexpectedException(fail);
1686	+	return null;
1687	+	}
1688	+	}
1689	+
1690	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1691	+	Runnable... throwingActions) {
1692	+	for (Runnable throwingAction : throwingActions) {
1693	+	boolean threw = false;
1694	+	try { throwingAction.run(); }
1695	+	catch (Throwable t) {
1696	+	threw = true;
1697	+	if (!expectedExceptionClass.isInstance(t)) {
1698	+	AssertionFailedError afe =
1699	+	new AssertionFailedError
1700	+	("Expected " + expectedExceptionClass.getName() +
1701	+	", got " + t.getClass().getName());
1702	+	afe.initCause(t);
1703	+	threadUnexpectedException(afe);
1704	+	}
1705	+	}
1706	+	if (!threw)
1707	+	shouldThrow(expectedExceptionClass.getName());
1708	+	}
1709	+	}
1710	+
1711	+	public void assertIteratorExhausted(Iterator<?> it) {
1712	+	try {
1713	+	it.next();
1714	+	shouldThrow();
1715	+	} catch (NoSuchElementException success) {}
1716	+	assertFalse(it.hasNext());
1717	+	}
1718		}

Diff Legend

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