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.119 by jsr166, Mon Jun 16 20:13:54 2014 UTC vs.
Revision 1.159 by jsr166, Sun Oct 4 00:30:50 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
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;
26	+	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.*;
39	<	import java.util.concurrent.atomic.AtomicBoolean;
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;
27	–	import static java.util.concurrent.TimeUnit.MILLISECONDS;
28	–	import static java.util.concurrent.TimeUnit.NANOSECONDS;
55		import java.util.regex.Pattern;
56	<	import java.security.CodeSource;
57	<	import java.security.Permission;
58	<	import java.security.PermissionCollection;
59	<	import java.security.Permissions;
60	<	import java.security.Policy;
61	<	import java.security.ProtectionDomain;
36	<	import java.security.SecurityPermission;
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 45 | 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 67 | 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>
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 143 | Line 168 | public class JSR166TestCase extends Test
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.
#	Line 154 | Line 188 | public class JSR166TestCase extends Test
188		return (regex == null) ? null : Pattern.compile(regex);
189		}
190
191	<	protected void runTest() throws Throwable {
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	>	}
205	>	lastTestCase = currentTestCase;
206	>	}}};
207	>	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
208	>	thread.setDaemon(true);
209	>	thread.start();
210	>	}
211	>
212	>	public void runBare() throws Throwable {
213	>	currentTestCase = this;
214		if (methodFilter == null
215	<	|| methodFilter.matcher(toString()).find()) {
216	<	for (int i = 0; i < runsPerTest; i++) {
217	<	if (profileTests)
218	<	runTestProfiled();
219	<	else
220	<	super.runTest();
221	<	}
215	>	|| methodFilter.matcher(toString()).find())
216	>	super.runBare();
217	>	}
218	>
219	>	protected void runTest() throws Throwable {
220	>	for (int i = 0; i < runsPerTest; i++) {
221	>	if (profileTests)
222	>	runTestProfiled();
223	>	else
224	>	super.runTest();
225		}
226		}
227
228		protected void runTestProfiled() throws Throwable {
229	<	// Warmup run, notably to trigger all needed classloading.
230	<	super.runTest();
172	<	long t0 = System.nanoTime();
173	<	try {
229	>	for (int i = 0; i < 2; i++) {
230	>	long startTime = System.nanoTime();
231		super.runTest();
232	<	} finally {
233	<	long elapsedMillis = millisElapsedSince(t0);
234	<	if (elapsedMillis >= profileThreshold)
232	>	long elapsedMillis = millisElapsedSince(startTime);
233	>	if (elapsedMillis < profileThreshold)
234	>	break;
235	>	// Never report first run of any test; treat it as a
236	>	// warmup run, notably to trigger all needed classloading,
237	>	if (i > 0)
238		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
239		}
240		}
241
242		/**
243		* Runs all JSR166 unit tests using junit.textui.TestRunner.
184	–	* Optional command line arg provides the number of iterations to
185	–	* repeat running the tests.
244		*/
245		public static void main(String[] args) {
246	+	main(suite(), args);
247	+	}
248	+
249	+	/**
250	+	* Runs all unit tests in the given test suite.
251	+	* Actual behavior influenced by jsr166.* system properties.
252	+	*/
253	+	static void main(Test suite, String[] args) {
254		if (useSecurityManager) {
255		System.err.println("Setting a permissive security manager");
256		Policy.setPolicy(permissivePolicy());
257		System.setSecurityManager(new SecurityManager());
258		}
259	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
260	<
261	<	Test s = suite();
262	<	for (int i = 0; i < iters; ++i) {
197	<	junit.textui.TestRunner.run(s);
259	>	for (int i = 0; i < suiteRuns; i++) {
260	>	TestResult result = junit.textui.TestRunner.run(suite);
261	>	if (!result.wasSuccessful())
262	>	System.exit(1);
263		System.gc();
264		System.runFinalization();
265		}
201	–	System.exit(0);
266		}
267
268		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 249 | Line 313 | public class JSR166TestCase extends Test
313		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
314		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
315		public static boolean atLeastJava9() {
316	<	// As of 2014-05, java9 still uses 52.0 class file version
317	<	return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
316	>	return JAVA_CLASS_VERSION >= 53.0
317	>	// As of 2015-09, java9 still uses 52.0 class file version
318	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
319	>	}
320	>	public static boolean atLeastJava10() {
321	>	return JAVA_CLASS_VERSION >= 54.0
322	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
323		}
324
325		/**
#	Line 339 | Line 408 | public class JSR166TestCase extends Test
408		"LongAdderTest",
409		"SplittableRandomTest",
410		"StampedLockTest",
411	+	"SubmissionPublisherTest",
412		"ThreadLocalRandom8Test",
413		};
414		addNamedTestClasses(suite, java8TestClassNames);
#	Line 347 | Line 417 | public class JSR166TestCase extends Test
417		// Java9+ test classes
418		if (atLeastJava9()) {
419		String[] java9TestClassNames = {
420	<	"ThreadPoolExecutor9Test",
420	>	// Currently empty, but expecting varhandle tests
421		};
422		addNamedTestClasses(suite, java9TestClassNames);
423		}
#	Line 355 | Line 425 | public class JSR166TestCase extends Test
425		return suite;
426		}
427
428	+	/** Returns list of junit-style test method names in given class. */
429	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
430	+	Method[] methods = testClass.getDeclaredMethods();
431	+	ArrayList<String> names = new ArrayList<String>(methods.length);
432	+	for (Method method : methods) {
433	+	if (method.getName().startsWith("test")
434	+	&& Modifier.isPublic(method.getModifiers())
435	+	// method.getParameterCount() requires jdk8+
436	+	&& method.getParameterTypes().length == 0) {
437	+	names.add(method.getName());
438	+	}
439	+	}
440	+	return names;
441	+	}
442	+
443	+	/**
444	+	* Returns junit-style testSuite for the given test class, but
445	+	* parameterized by passing extra data to each test.
446	+	*/
447	+	public static <ExtraData> Test parameterizedTestSuite
448	+	(Class<? extends JSR166TestCase> testClass,
449	+	Class<ExtraData> dataClass,
450	+	ExtraData data) {
451	+	try {
452	+	TestSuite suite = new TestSuite();
453	+	Constructor c =
454	+	testClass.getDeclaredConstructor(dataClass, String.class);
455	+	for (String methodName : testMethodNames(testClass))
456	+	suite.addTest((Test) c.newInstance(data, methodName));
457	+	return suite;
458	+	} catch (Exception e) {
459	+	throw new Error(e);
460	+	}
461	+	}
462	+
463	+	/**
464	+	* Returns junit-style testSuite for the jdk8 extension of the
465	+	* given test class, but parameterized by passing extra data to
466	+	* each test.  Uses reflection to allow compilation in jdk7.
467	+	*/
468	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
469	+	(Class<? extends JSR166TestCase> testClass,
470	+	Class<ExtraData> dataClass,
471	+	ExtraData data) {
472	+	if (atLeastJava8()) {
473	+	String name = testClass.getName();
474	+	String name8 = name.replaceAll("Test$", "8Test");
475	+	if (name.equals(name8)) throw new Error(name);
476	+	try {
477	+	return (Test)
478	+	Class.forName(name8)
479	+	.getMethod("testSuite", new Class[] { dataClass })
480	+	.invoke(null, data);
481	+	} catch (Exception e) {
482	+	throw new Error(e);
483	+	}
484	+	} else {
485	+	return new TestSuite();
486	+	}
487	+	}
488	+
489		// Delays for timing-dependent tests, in milliseconds.
490
491		public static long SHORT_DELAY_MS;
#	Line 389 | Line 520 | public class JSR166TestCase extends Test
520		}
521
522		/**
523	<	* Returns a new Date instance representing a time delayMillis
524	<	* milliseconds in the future.
523	>	* Returns a new Date instance representing a time at least
524	>	* delayMillis milliseconds in the future.
525		*/
526		Date delayedDate(long delayMillis) {
527	<	return new Date(System.currentTimeMillis() + delayMillis);
527	>	// Add 1 because currentTimeMillis is known to round into the past.
528	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
529		}
530
531		/**
#	Line 409 | Line 541 | public class JSR166TestCase extends Test
541		* the same test have no effect.
542		*/
543		public void threadRecordFailure(Throwable t) {
544	+	System.err.println(t);
545	+	dumpTestThreads();
546		threadFailure.compareAndSet(null, t);
547		}
548
#	Line 416 | Line 550 | public class JSR166TestCase extends Test
550		setDelays();
551		}
552
553	+	void tearDownFail(String format, Object... args) {
554	+	String msg = toString() + ": " + String.format(format, args);
555	+	System.err.println(msg);
556	+	dumpTestThreads();
557	+	throw new AssertionFailedError(msg);
558	+	}
559	+
560		/**
561		* Extra checks that get done for all test cases.
562		*
#	Line 443 | Line 584 | public class JSR166TestCase extends Test
584		}
585
586		if (Thread.interrupted())
587	<	throw new AssertionFailedError("interrupt status set in main thread");
587	>	tearDownFail("interrupt status set in main thread");
588
589		checkForkJoinPoolThreadLeaks();
590		}
591
592		/**
593	<	* Find missing try { ... } finally { joinPool(e); }
593	>	* Finds missing try { ... } finally { joinPool(e); }
594		*/
595		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
596	<	Thread[] survivors = new Thread[5];
596	>	Thread[] survivors = new Thread[7];
597		int count = Thread.enumerate(survivors);
598		for (int i = 0; i < count; i++) {
599		Thread thread = survivors[i];
#	Line 460 | Line 601 | public class JSR166TestCase extends Test
601		if (name.startsWith("ForkJoinPool-")) {
602		// give thread some time to terminate
603		thread.join(LONG_DELAY_MS);
604	<	if (!thread.isAlive()) continue;
605	<	thread.stop();
606	<	throw new AssertionFailedError
466	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
467	<	toString(), name));
604	>	if (thread.isAlive())
605	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
606	>	thread);
607		}
608		}
609	+
610	+	if (!ForkJoinPool.commonPool()
611	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
612	+	tearDownFail("ForkJoin common pool thread stuck");
613		}
614
615		/**
#	Line 479 | Line 622 | public class JSR166TestCase extends Test
622		fail(reason);
623		} catch (AssertionFailedError t) {
624		threadRecordFailure(t);
625	<	fail(reason);
625	>	throw t;
626		}
627		}
628
#	Line 547 | Line 690 | public class JSR166TestCase extends Test
690		public void threadAssertEquals(Object x, Object y) {
691		try {
692		assertEquals(x, y);
693	<	} catch (AssertionFailedError t) {
694	<	threadRecordFailure(t);
695	<	throw t;
696	<	} catch (Throwable t) {
697	<	threadUnexpectedException(t);
693	>	} catch (AssertionFailedError fail) {
694	>	threadRecordFailure(fail);
695	>	throw fail;
696	>	} catch (Throwable fail) {
697	>	threadUnexpectedException(fail);
698		}
699		}
700
#	Line 563 | Line 706 | public class JSR166TestCase extends Test
706		public void threadAssertSame(Object x, Object y) {
707		try {
708		assertSame(x, y);
709	<	} catch (AssertionFailedError t) {
710	<	threadRecordFailure(t);
711	<	throw t;
709	>	} catch (AssertionFailedError fail) {
710	>	threadRecordFailure(fail);
711	>	throw fail;
712		}
713		}
714
#	Line 625 | Line 768 | public class JSR166TestCase extends Test
768		}
769
770		/**
771	+	* Allows use of try-with-resources with per-test thread pools.
772	+	*/
773	+	class PoolCleaner<T extends ExecutorService>
774	+	implements AutoCloseable {
775	+	public final T pool;
776	+	public PoolCleaner(T pool) { this.pool = pool; }
777	+	public void close() { joinPool(pool); }
778	+	}
779	+
780	+	<T extends ExecutorService> PoolCleaner<T> cleaner(T pool) {
781	+	return new PoolCleaner<T>(pool);
782	+	}
783	+
784	+	/**
785		* Waits out termination of a thread pool or fails doing so.
786		*/
787	<	void joinPool(ExecutorService exec) {
787	>	void joinPool(ExecutorService pool) {
788		try {
789	<	exec.shutdown();
790	<	assertTrue("ExecutorService did not terminate in a timely manner",
791	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
789	>	pool.shutdown();
790	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
791	>	try {
792	>	threadFail("ExecutorService " + pool +
793	>	" did not terminate in a timely manner");
794	>	} finally {
795	>	// last resort, for the benefit of subsequent tests
796	>	pool.shutdownNow();
797	>	pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
798	>	}
799	>	}
800		} catch (SecurityException ok) {
801		// Allowed in case test doesn't have privs
802	<	} catch (InterruptedException ie) {
803	<	fail("Unexpected InterruptedException");
802	>	} catch (InterruptedException fail) {
803	>	threadFail("Unexpected InterruptedException");
804	>	}
805	>	}
806	>
807	>	/** Like Runnable, but with the freedom to throw anything */
808	>	interface Action { public void run() throws Throwable; }
809	>
810	>	/**
811	>	* Runs all the given actions in parallel, failing if any fail.
812	>	* Useful for running multiple variants of tests that are
813	>	* necessarily individually slow because they must block.
814	>	*/
815	>	void testInParallel(Action ... actions) {
816	>	try (PoolCleaner<ExecutorService> cleaner
817	>	= cleaner(Executors.newCachedThreadPool())) {
818	>	ExecutorService pool = cleaner.pool;
819	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
820	>	for (final Action action : actions)
821	>	futures.add(pool.submit(new CheckedRunnable() {
822	>	public void realRun() throws Throwable { action.run();}}));
823	>	for (Future<?> future : futures)
824	>	try {
825	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
826	>	} catch (ExecutionException ex) {
827	>	threadUnexpectedException(ex.getCause());
828	>	} catch (Exception ex) {
829	>	threadUnexpectedException(ex);
830	>	}
831		}
832		}
833
834		/**
835	<	* A debugging tool to print all stack traces, as jstack does.
835	>	* A debugging tool to print stack traces of most threads, as jstack does.
836	>	* Uninteresting threads are filtered out.
837		*/
838	<	static void printAllStackTraces() {
839	<	for (ThreadInfo info :
840	<	ManagementFactory.getThreadMXBean()
841	<	.dumpAllThreads(true, true))
838	>	static void dumpTestThreads() {
839	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
840	>	System.err.println("------ stacktrace dump start ------");
841	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
842	>	String name = info.getThreadName();
843	>	if ("Signal Dispatcher".equals(name))
844	>	continue;
845	>	if ("Reference Handler".equals(name)
846	>	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
847	>	continue;
848	>	if ("Finalizer".equals(name)
849	>	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
850	>	continue;
851	>	if ("checkForWedgedTest".equals(name))
852	>	continue;
853		System.err.print(info);
854	+	}
855	+	System.err.println("------ stacktrace dump end ------");
856		}
857
858		/**
#	Line 665 | Line 871 | public class JSR166TestCase extends Test
871		// No need to optimize the failing case via Thread.join.
872		delay(millis);
873		assertTrue(thread.isAlive());
874	<	} catch (InterruptedException ie) {
875	<	fail("Unexpected InterruptedException");
874	>	} catch (InterruptedException fail) {
875	>	threadFail("Unexpected InterruptedException");
876		}
877		}
878
#	Line 687 | Line 893 | public class JSR166TestCase extends Test
893		delay(millis);
894		for (Thread thread : threads)
895		assertTrue(thread.isAlive());
896	<	} catch (InterruptedException ie) {
897	<	fail("Unexpected InterruptedException");
896	>	} catch (InterruptedException fail) {
897	>	threadFail("Unexpected InterruptedException");
898		}
899		}
900
#	Line 709 | Line 915 | public class JSR166TestCase extends Test
915		future.get(timeoutMillis, MILLISECONDS);
916		shouldThrow();
917		} catch (TimeoutException success) {
918	<	} catch (Exception e) {
919	<	threadUnexpectedException(e);
918	>	} catch (Exception fail) {
919	>	threadUnexpectedException(fail);
920		} finally { future.cancel(true); }
921		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
922		}
#	Line 866 | Line 1072 | public class JSR166TestCase extends Test
1072		void sleep(long millis) {
1073		try {
1074		delay(millis);
1075	<	} catch (InterruptedException ie) {
1075	>	} catch (InterruptedException fail) {
1076		AssertionFailedError afe =
1077		new AssertionFailedError("Unexpected InterruptedException");
1078	<	afe.initCause(ie);
1078	>	afe.initCause(fail);
1079		throw afe;
1080		}
1081		}
#	Line 907 | Line 1113 | public class JSR166TestCase extends Test
1113		/**
1114		* Returns the number of milliseconds since time given by
1115		* startNanoTime, which must have been previously returned from a
1116	<	* call to {@link System.nanoTime()}.
1116	>	* call to {@link System#nanoTime()}.
1117		*/
1118		static long millisElapsedSince(long startNanoTime) {
1119		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1120		}
1121
1122	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1123	+	//         long startTime = System.nanoTime();
1124	+	//         try {
1125	+	//             r.run();
1126	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1127	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1128	+	//             throw new AssertionFailedError("did not return promptly");
1129	+	//     }
1130	+
1131	+	//     void assertTerminatesPromptly(Runnable r) {
1132	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1133	+	//     }
1134	+
1135	+	/**
1136	+	* Checks that timed f.get() returns the expected value, and does not
1137	+	* wait for the timeout to elapse before returning.
1138	+	*/
1139	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1140	+	long startTime = System.nanoTime();
1141	+	try {
1142	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1143	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1144	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1145	+	throw new AssertionFailedError("timed get did not return promptly");
1146	+	}
1147	+
1148	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1149	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1150	+	}
1151	+
1152		/**
1153		* Returns a new started daemon Thread running the given runnable.
1154		*/
#	Line 931 | Line 1167 | public class JSR166TestCase extends Test
1167		void awaitTermination(Thread t, long timeoutMillis) {
1168		try {
1169		t.join(timeoutMillis);
1170	<	} catch (InterruptedException ie) {
1171	<	threadUnexpectedException(ie);
1170	>	} catch (InterruptedException fail) {
1171	>	threadUnexpectedException(fail);
1172		} finally {
1173		if (t.getState() != Thread.State.TERMINATED) {
1174		t.interrupt();
#	Line 958 | Line 1194 | public class JSR166TestCase extends Test
1194		public final void run() {
1195		try {
1196		realRun();
1197	<	} catch (Throwable t) {
1198	<	threadUnexpectedException(t);
1197	>	} catch (Throwable fail) {
1198	>	threadUnexpectedException(fail);
1199		}
1200		}
1201		}
#	Line 1013 | Line 1249 | public class JSR166TestCase extends Test
1249		threadShouldThrow("InterruptedException");
1250		} catch (InterruptedException success) {
1251		threadAssertFalse(Thread.interrupted());
1252	<	} catch (Throwable t) {
1253	<	threadUnexpectedException(t);
1252	>	} catch (Throwable fail) {
1253	>	threadUnexpectedException(fail);
1254		}
1255		}
1256		}
#	Line 1025 | Line 1261 | public class JSR166TestCase extends Test
1261		public final T call() {
1262		try {
1263		return realCall();
1264	<	} catch (Throwable t) {
1265	<	threadUnexpectedException(t);
1264	>	} catch (Throwable fail) {
1265	>	threadUnexpectedException(fail);
1266		return null;
1267		}
1268		}
#	Line 1043 | Line 1279 | public class JSR166TestCase extends Test
1279		return result;
1280		} catch (InterruptedException success) {
1281		threadAssertFalse(Thread.interrupted());
1282	<	} catch (Throwable t) {
1283	<	threadUnexpectedException(t);
1282	>	} catch (Throwable fail) {
1283	>	threadUnexpectedException(fail);
1284		}
1285		return null;
1286		}
#	Line 1061 | Line 1297 | public class JSR166TestCase extends Test
1297		public static final String TEST_STRING = "a test string";
1298
1299		public static class StringTask implements Callable<String> {
1300	<	public String call() { return TEST_STRING; }
1300	>	final String value;
1301	>	public StringTask() { this(TEST_STRING); }
1302	>	public StringTask(String value) { this.value = value; }
1303	>	public String call() { return value; }
1304		}
1305
1306		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1074 | Line 1313 | public class JSR166TestCase extends Test
1313		}};
1314		}
1315
1316	+	public Runnable countDowner(final CountDownLatch latch) {
1317	+	return new CheckedRunnable() {
1318	+	public void realRun() throws InterruptedException {
1319	+	latch.countDown();
1320	+	}};
1321	+	}
1322	+
1323		public Runnable awaiter(final CountDownLatch latch) {
1324		return new CheckedRunnable() {
1325		public void realRun() throws InterruptedException {
#	Line 1084 | Line 1330 | public class JSR166TestCase extends Test
1330		public void await(CountDownLatch latch) {
1331		try {
1332		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1333	<	} catch (Throwable t) {
1334	<	threadUnexpectedException(t);
1333	>	} catch (Throwable fail) {
1334	>	threadUnexpectedException(fail);
1335		}
1336		}
1337
1338		public void await(Semaphore semaphore) {
1339		try {
1340		assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1341	<	} catch (Throwable t) {
1342	<	threadUnexpectedException(t);
1341	>	} catch (Throwable fail) {
1342	>	threadUnexpectedException(fail);
1343		}
1344		}
1345
#	Line 1287 | Line 1533 | public class JSR166TestCase extends Test
1533		@Override protected final void compute() {
1534		try {
1535		realCompute();
1536	<	} catch (Throwable t) {
1537	<	threadUnexpectedException(t);
1536	>	} catch (Throwable fail) {
1537	>	threadUnexpectedException(fail);
1538		}
1539		}
1540		}
#	Line 1302 | Line 1548 | public class JSR166TestCase extends Test
1548		@Override protected final T compute() {
1549		try {
1550		return realCompute();
1551	<	} catch (Throwable t) {
1552	<	threadUnexpectedException(t);
1551	>	} catch (Throwable fail) {
1552	>	threadUnexpectedException(fail);
1553		return null;
1554		}
1555		}
#	Line 1327 | Line 1573 | public class JSR166TestCase extends Test
1573		public int await() {
1574		try {
1575		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1576	<	} catch (TimeoutException e) {
1576	>	} catch (TimeoutException timedOut) {
1577		throw new AssertionFailedError("timed out");
1578	<	} catch (Exception e) {
1578	>	} catch (Exception fail) {
1579		AssertionFailedError afe =
1580	<	new AssertionFailedError("Unexpected exception: " + e);
1581	<	afe.initCause(e);
1580	>	new AssertionFailedError("Unexpected exception: " + fail);
1581	>	afe.initCause(fail);
1582		throw afe;
1583		}
1584		}
#	Line 1360 | Line 1606 | public class JSR166TestCase extends Test
1606		q.remove();
1607		shouldThrow();
1608		} catch (NoSuchElementException success) {}
1609	<	} catch (InterruptedException ie) {
1364	<	threadUnexpectedException(ie);
1365	<	}
1609	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1610		}
1611
1612		void assertSerialEquals(Object x, Object y) {
#	Line 1381 | Line 1625 | public class JSR166TestCase extends Test
1625		oos.flush();
1626		oos.close();
1627		return bos.toByteArray();
1628	<	} catch (Throwable t) {
1629	<	threadUnexpectedException(t);
1628	>	} catch (Throwable fail) {
1629	>	threadUnexpectedException(fail);
1630		return new byte[0];
1631		}
1632		}
#	Line 1395 | Line 1639 | public class JSR166TestCase extends Test
1639		T clone = (T) ois.readObject();
1640		assertSame(o.getClass(), clone.getClass());
1641		return clone;
1642	<	} catch (Throwable t) {
1643	<	threadUnexpectedException(t);
1642	>	} catch (Throwable fail) {
1643	>	threadUnexpectedException(fail);
1644		return null;
1645		}
1646		}
#	Line 1421 | Line 1665 | public class JSR166TestCase extends Test
1665		shouldThrow(expectedExceptionClass.getName());
1666		}
1667		}
1668	+
1669	+	public void assertIteratorExhausted(Iterator<?> it) {
1670	+	try {
1671	+	it.next();
1672	+	shouldThrow();
1673	+	} catch (NoSuchElementException success) {}
1674	+	assertFalse(it.hasNext());
1675	+	}
1676		}

Diff Legend

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