ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/JSR166TestCase.java

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.116 by jsr166, Sun Jun 8 00:15:50 2014 UTC vs.
Revision 1.157 by jsr166, Sat Oct 3 22:20:05 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 116 | 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 136 | 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 147 | 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();
165	<	long t0 = System.nanoTime();
166	<	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.
177	–	* Optional command line arg provides the number of iterations to
178	–	* 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) {
190	<	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		}
194	–	System.exit(0);
266		}
267
268		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 242 | 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 332 | Line 408 | public class JSR166TestCase extends Test
408		"LongAdderTest",
409		"SplittableRandomTest",
410		"StampedLockTest",
411	+	"SubmissionPublisherTest",
412		"ThreadLocalRandom8Test",
413		};
414		addNamedTestClasses(suite, java8TestClassNames);
#	Line 340 | 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 348 | 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 382 | 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 402 | Line 541 | public class JSR166TestCase extends Test
541		* the same test have no effect.
542		*/
543		public void threadRecordFailure(Throwable t) {
544	+	dumpTestThreads();
545		threadFailure.compareAndSet(null, t);
546		}
547
#	Line 409 | Line 549 | public class JSR166TestCase extends Test
549		setDelays();
550		}
551
552	+	void tearDownFail(String format, Object... args) {
553	+	String msg = toString() + ": " + String.format(format, args);
554	+	System.err.println(msg);
555	+	dumpTestThreads();
556	+	throw new AssertionFailedError(msg);
557	+	}
558	+
559		/**
560		* Extra checks that get done for all test cases.
561		*
#	Line 436 | Line 583 | public class JSR166TestCase extends Test
583		}
584
585		if (Thread.interrupted())
586	<	throw new AssertionFailedError("interrupt status set in main thread");
586	>	tearDownFail("interrupt status set in main thread");
587
588		checkForkJoinPoolThreadLeaks();
589		}
590
591		/**
592	<	* Find missing try { ... } finally { joinPool(e); }
592	>	* Finds missing try { ... } finally { joinPool(e); }
593		*/
594		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
595	<	Thread[] survivors = new Thread[5];
595	>	Thread[] survivors = new Thread[7];
596		int count = Thread.enumerate(survivors);
597		for (int i = 0; i < count; i++) {
598		Thread thread = survivors[i];
#	Line 453 | Line 600 | public class JSR166TestCase extends Test
600		if (name.startsWith("ForkJoinPool-")) {
601		// give thread some time to terminate
602		thread.join(LONG_DELAY_MS);
603	<	if (!thread.isAlive()) continue;
604	<	thread.stop();
605	<	throw new AssertionFailedError
459	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
460	<	toString(), name));
603	>	if (thread.isAlive())
604	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
605	>	thread);
606		}
607		}
608	+
609	+	if (!ForkJoinPool.commonPool()
610	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
611	+	tearDownFail("ForkJoin common pool thread stuck");
612		}
613
614		/**
#	Line 472 | Line 621 | public class JSR166TestCase extends Test
621		fail(reason);
622		} catch (AssertionFailedError t) {
623		threadRecordFailure(t);
624	<	fail(reason);
624	>	throw t;
625		}
626		}
627
#	Line 540 | Line 689 | public class JSR166TestCase extends Test
689		public void threadAssertEquals(Object x, Object y) {
690		try {
691		assertEquals(x, y);
692	<	} catch (AssertionFailedError t) {
693	<	threadRecordFailure(t);
694	<	throw t;
695	<	} catch (Throwable t) {
696	<	threadUnexpectedException(t);
692	>	} catch (AssertionFailedError fail) {
693	>	threadRecordFailure(fail);
694	>	throw fail;
695	>	} catch (Throwable fail) {
696	>	threadUnexpectedException(fail);
697		}
698		}
699
#	Line 556 | Line 705 | public class JSR166TestCase extends Test
705		public void threadAssertSame(Object x, Object y) {
706		try {
707		assertSame(x, y);
708	<	} catch (AssertionFailedError t) {
709	<	threadRecordFailure(t);
710	<	throw t;
708	>	} catch (AssertionFailedError fail) {
709	>	threadRecordFailure(fail);
710	>	throw fail;
711		}
712		}
713
#	Line 618 | Line 767 | public class JSR166TestCase extends Test
767		}
768
769		/**
770	+	* Allows use of try-with-resources with per-test thread pools.
771	+	*/
772	+	static class PoolCloser<T extends ExecutorService>
773	+	implements AutoCloseable {
774	+	public final T pool;
775	+	public PoolCloser(T pool) { this.pool = pool; }
776	+	public void close() { joinPool(pool); }
777	+	}
778	+
779	+	/**
780		* Waits out termination of a thread pool or fails doing so.
781		*/
782	<	void joinPool(ExecutorService exec) {
782	>	static void joinPool(ExecutorService pool) {
783		try {
784	<	exec.shutdown();
785	<	assertTrue("ExecutorService did not terminate in a timely manner",
786	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
784	>	pool.shutdown();
785	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
786	>	fail("ExecutorService " + pool +
787	>	" did not terminate in a timely manner");
788		} catch (SecurityException ok) {
789		// Allowed in case test doesn't have privs
790	<	} catch (InterruptedException ie) {
790	>	} catch (InterruptedException fail) {
791		fail("Unexpected InterruptedException");
792		}
793		}
794
795	+	/** Like Runnable, but with the freedom to throw anything */
796	+	interface Action { public void run() throws Throwable; }
797	+
798		/**
799	<	* A debugging tool to print all stack traces, as jstack does.
799	>	* Runs all the given actions in parallel, failing if any fail.
800	>	* Useful for running multiple variants of tests that are
801	>	* necessarily individually slow because they must block.
802	>	*/
803	>	void testInParallel(Action ... actions) {
804	>	try (PoolCloser<ExecutorService> poolCloser
805	>	= new PoolCloser<>(Executors.newCachedThreadPool())) {
806	>	ExecutorService pool = poolCloser.pool;
807	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
808	>	for (final Action action : actions)
809	>	futures.add(pool.submit(new CheckedRunnable() {
810	>	public void realRun() throws Throwable { action.run();}}));
811	>	for (Future<?> future : futures)
812	>	try {
813	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
814	>	} catch (ExecutionException ex) {
815	>	threadUnexpectedException(ex.getCause());
816	>	} catch (Exception ex) {
817	>	threadUnexpectedException(ex);
818	>	}
819	>	}
820	>	}
821	>
822	>	/**
823	>	* A debugging tool to print stack traces of most threads, as jstack does.
824	>	* Uninteresting threads are filtered out.
825		*/
826	<	static void printAllStackTraces() {
827	<	for (ThreadInfo info :
828	<	ManagementFactory.getThreadMXBean()
829	<	.dumpAllThreads(true, true))
826	>	static void dumpTestThreads() {
827	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
828	>	System.err.println("------ stacktrace dump start ------");
829	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
830	>	String name = info.getThreadName();
831	>	if ("Signal Dispatcher".equals(name))
832	>	continue;
833	>	if ("Reference Handler".equals(name)
834	>	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
835	>	continue;
836	>	if ("Finalizer".equals(name)
837	>	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
838	>	continue;
839	>	if ("checkForWedgedTest".equals(name))
840	>	continue;
841		System.err.print(info);
842	+	}
843	+	System.err.println("------ stacktrace dump end ------");
844		}
845
846		/**
#	Line 658 | Line 859 | public class JSR166TestCase extends Test
859		// No need to optimize the failing case via Thread.join.
860		delay(millis);
861		assertTrue(thread.isAlive());
862	<	} catch (InterruptedException ie) {
862	>	} catch (InterruptedException fail) {
863		fail("Unexpected InterruptedException");
864		}
865		}
#	Line 680 | Line 881 | public class JSR166TestCase extends Test
881		delay(millis);
882		for (Thread thread : threads)
883		assertTrue(thread.isAlive());
884	<	} catch (InterruptedException ie) {
884	>	} catch (InterruptedException fail) {
885		fail("Unexpected InterruptedException");
886		}
887		}
#	Line 702 | Line 903 | public class JSR166TestCase extends Test
903		future.get(timeoutMillis, MILLISECONDS);
904		shouldThrow();
905		} catch (TimeoutException success) {
906	<	} catch (Exception e) {
907	<	threadUnexpectedException(e);
906	>	} catch (Exception fail) {
907	>	threadUnexpectedException(fail);
908		} finally { future.cancel(true); }
909		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
910		}
#	Line 859 | Line 1060 | public class JSR166TestCase extends Test
1060		void sleep(long millis) {
1061		try {
1062		delay(millis);
1063	<	} catch (InterruptedException ie) {
1063	>	} catch (InterruptedException fail) {
1064		AssertionFailedError afe =
1065		new AssertionFailedError("Unexpected InterruptedException");
1066	<	afe.initCause(ie);
1066	>	afe.initCause(fail);
1067		throw afe;
1068		}
1069		}
#	Line 900 | Line 1101 | public class JSR166TestCase extends Test
1101		/**
1102		* Returns the number of milliseconds since time given by
1103		* startNanoTime, which must have been previously returned from a
1104	<	* call to {@link System.nanoTime()}.
1104	>	* call to {@link System#nanoTime()}.
1105		*/
1106	<	long millisElapsedSince(long startNanoTime) {
1106	>	static long millisElapsedSince(long startNanoTime) {
1107		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1108		}
1109
1110	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1111	+	//         long startTime = System.nanoTime();
1112	+	//         try {
1113	+	//             r.run();
1114	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1115	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1116	+	//             throw new AssertionFailedError("did not return promptly");
1117	+	//     }
1118	+
1119	+	//     void assertTerminatesPromptly(Runnable r) {
1120	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1121	+	//     }
1122	+
1123	+	/**
1124	+	* Checks that timed f.get() returns the expected value, and does not
1125	+	* wait for the timeout to elapse before returning.
1126	+	*/
1127	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1128	+	long startTime = System.nanoTime();
1129	+	try {
1130	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1131	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1132	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1133	+	throw new AssertionFailedError("timed get did not return promptly");
1134	+	}
1135	+
1136	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1137	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1138	+	}
1139	+
1140		/**
1141		* Returns a new started daemon Thread running the given runnable.
1142		*/
#	Line 924 | Line 1155 | public class JSR166TestCase extends Test
1155		void awaitTermination(Thread t, long timeoutMillis) {
1156		try {
1157		t.join(timeoutMillis);
1158	<	} catch (InterruptedException ie) {
1159	<	threadUnexpectedException(ie);
1158	>	} catch (InterruptedException fail) {
1159	>	threadUnexpectedException(fail);
1160		} finally {
1161		if (t.getState() != Thread.State.TERMINATED) {
1162		t.interrupt();
#	Line 951 | Line 1182 | public class JSR166TestCase extends Test
1182		public final void run() {
1183		try {
1184		realRun();
1185	<	} catch (Throwable t) {
1186	<	threadUnexpectedException(t);
1185	>	} catch (Throwable fail) {
1186	>	threadUnexpectedException(fail);
1187		}
1188		}
1189		}
#	Line 1006 | Line 1237 | public class JSR166TestCase extends Test
1237		threadShouldThrow("InterruptedException");
1238		} catch (InterruptedException success) {
1239		threadAssertFalse(Thread.interrupted());
1240	<	} catch (Throwable t) {
1241	<	threadUnexpectedException(t);
1240	>	} catch (Throwable fail) {
1241	>	threadUnexpectedException(fail);
1242		}
1243		}
1244		}
#	Line 1018 | Line 1249 | public class JSR166TestCase extends Test
1249		public final T call() {
1250		try {
1251		return realCall();
1252	<	} catch (Throwable t) {
1253	<	threadUnexpectedException(t);
1252	>	} catch (Throwable fail) {
1253	>	threadUnexpectedException(fail);
1254		return null;
1255		}
1256		}
#	Line 1036 | Line 1267 | public class JSR166TestCase extends Test
1267		return result;
1268		} catch (InterruptedException success) {
1269		threadAssertFalse(Thread.interrupted());
1270	<	} catch (Throwable t) {
1271	<	threadUnexpectedException(t);
1270	>	} catch (Throwable fail) {
1271	>	threadUnexpectedException(fail);
1272		}
1273		return null;
1274		}
#	Line 1054 | Line 1285 | public class JSR166TestCase extends Test
1285		public static final String TEST_STRING = "a test string";
1286
1287		public static class StringTask implements Callable<String> {
1288	<	public String call() { return TEST_STRING; }
1288	>	final String value;
1289	>	public StringTask() { this(TEST_STRING); }
1290	>	public StringTask(String value) { this.value = value; }
1291	>	public String call() { return value; }
1292		}
1293
1294		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1067 | Line 1301 | public class JSR166TestCase extends Test
1301		}};
1302		}
1303
1304	+	public Runnable countDowner(final CountDownLatch latch) {
1305	+	return new CheckedRunnable() {
1306	+	public void realRun() throws InterruptedException {
1307	+	latch.countDown();
1308	+	}};
1309	+	}
1310	+
1311		public Runnable awaiter(final CountDownLatch latch) {
1312		return new CheckedRunnable() {
1313		public void realRun() throws InterruptedException {
#	Line 1077 | Line 1318 | public class JSR166TestCase extends Test
1318		public void await(CountDownLatch latch) {
1319		try {
1320		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1321	<	} catch (Throwable t) {
1322	<	threadUnexpectedException(t);
1321	>	} catch (Throwable fail) {
1322	>	threadUnexpectedException(fail);
1323		}
1324		}
1325
1326		public void await(Semaphore semaphore) {
1327		try {
1328		assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1329	<	} catch (Throwable t) {
1330	<	threadUnexpectedException(t);
1329	>	} catch (Throwable fail) {
1330	>	threadUnexpectedException(fail);
1331		}
1332		}
1333
#	Line 1280 | Line 1521 | public class JSR166TestCase extends Test
1521		@Override protected final void compute() {
1522		try {
1523		realCompute();
1524	<	} catch (Throwable t) {
1525	<	threadUnexpectedException(t);
1524	>	} catch (Throwable fail) {
1525	>	threadUnexpectedException(fail);
1526		}
1527		}
1528		}
#	Line 1295 | Line 1536 | public class JSR166TestCase extends Test
1536		@Override protected final T compute() {
1537		try {
1538		return realCompute();
1539	<	} catch (Throwable t) {
1540	<	threadUnexpectedException(t);
1539	>	} catch (Throwable fail) {
1540	>	threadUnexpectedException(fail);
1541		return null;
1542		}
1543		}
#	Line 1320 | Line 1561 | public class JSR166TestCase extends Test
1561		public int await() {
1562		try {
1563		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1564	<	} catch (TimeoutException e) {
1564	>	} catch (TimeoutException timedOut) {
1565		throw new AssertionFailedError("timed out");
1566	<	} catch (Exception e) {
1566	>	} catch (Exception fail) {
1567		AssertionFailedError afe =
1568	<	new AssertionFailedError("Unexpected exception: " + e);
1569	<	afe.initCause(e);
1568	>	new AssertionFailedError("Unexpected exception: " + fail);
1569	>	afe.initCause(fail);
1570		throw afe;
1571		}
1572		}
#	Line 1353 | Line 1594 | public class JSR166TestCase extends Test
1594		q.remove();
1595		shouldThrow();
1596		} catch (NoSuchElementException success) {}
1597	<	} catch (InterruptedException ie) {
1357	<	threadUnexpectedException(ie);
1358	<	}
1597	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1598		}
1599
1600		void assertSerialEquals(Object x, Object y) {
#	Line 1374 | Line 1613 | public class JSR166TestCase extends Test
1613		oos.flush();
1614		oos.close();
1615		return bos.toByteArray();
1616	<	} catch (Throwable t) {
1617	<	threadUnexpectedException(t);
1616	>	} catch (Throwable fail) {
1617	>	threadUnexpectedException(fail);
1618		return new byte[0];
1619		}
1620		}
#	Line 1388 | Line 1627 | public class JSR166TestCase extends Test
1627		T clone = (T) ois.readObject();
1628		assertSame(o.getClass(), clone.getClass());
1629		return clone;
1630	<	} catch (Throwable t) {
1631	<	threadUnexpectedException(t);
1630	>	} catch (Throwable fail) {
1631	>	threadUnexpectedException(fail);
1632		return null;
1633		}
1634		}
#	Line 1414 | Line 1653 | public class JSR166TestCase extends Test
1653		shouldThrow(expectedExceptionClass.getName());
1654		}
1655		}
1656	+
1657	+	public void assertIteratorExhausted(Iterator<?> it) {
1658	+	try {
1659	+	it.next();
1660	+	shouldThrow();
1661	+	} catch (NoSuchElementException success) {}
1662	+	assertFalse(it.hasNext());
1663	+	}
1664		}

Diff Legend

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