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.129 by jsr166, Fri Feb 27 22:10:29 2015 UTC vs.
Revision 1.170 by jsr166, Thu Oct 8 22:39:57 2015 UTC

#	Line 7 | Line 7
7		*/
8
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;
#	Line 15 | Line 16 | 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 35 | Line 39 | import java.util.concurrent.BlockingQueu
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;
#	Line 50 | Line 57 | import java.util.regex.Pattern;
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		/**
#	Line 62 | Line 70 | import junit.framework.TestSuite;
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 84 | Line 92 | import junit.framework.TestSuite;
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 160 | 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 171 | Line 188 | public class JSR166TestCase extends Test
188		return (regex == null) ? null : Pattern.compile(regex);
189		}
190
191	<	protected void runTest() throws Throwable {
191	>	// Instrumentation to debug very rare, but very annoying hung test runs.
192	>	static volatile TestCase currentTestCase;
193	>	static volatile int currentRun = 0;
194	>	static {
195	>	Runnable checkForWedgedTest = new Runnable() { public void run() {
196	>	// avoid spurious reports with enormous runsPerTest
197	>	final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
198	>	for (TestCase lastTestCase = currentTestCase;;) {
199	>	try { MINUTES.sleep(timeoutMinutes); }
200	>	catch (InterruptedException unexpected) { break; }
201	>	if (lastTestCase == currentTestCase) {
202	>	System.err.printf(
203	>	"Looks like we're stuck running test: %s (%d/%d)%n",
204	>	lastTestCase, currentRun, runsPerTest);
205	>	System.err.println
206	>	("Looks like we're stuck running test: "
207	>	+ lastTestCase + " (" + currentRun + "/" + runsPerTest + ")");
208	>	System.err.println("availableProcessors=" +
209	>	Runtime.getRuntime().availableProcessors());
210	>	dumpTestThreads();
211	>	// one stack dump is probably enough; more would be spam
212	>	break;
213	>	}
214	>	lastTestCase = currentTestCase;
215	>	}}};
216	>	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
217	>	thread.setDaemon(true);
218	>	thread.start();
219	>	}
220	>
221	>	public void runBare() throws Throwable {
222	>	currentTestCase = this;
223		if (methodFilter == null
224	<	|| methodFilter.matcher(toString()).find()) {
225	<	for (int i = 0; i < runsPerTest; i++) {
226	<	if (profileTests)
227	<	runTestProfiled();
228	<	else
229	<	super.runTest();
230	<	}
224	>	|| methodFilter.matcher(toString()).find())
225	>	super.runBare();
226	>	}
227	>
228	>	protected void runTest() throws Throwable {
229	>	for (int i = 0; i < runsPerTest; i++) {
230	>	currentRun = i;
231	>	if (profileTests)
232	>	runTestProfiled();
233	>	else
234	>	super.runTest();
235		}
236		}
237
238		protected void runTestProfiled() throws Throwable {
239	<	// Warmup run, notably to trigger all needed classloading.
240	<	super.runTest();
189	<	long t0 = System.nanoTime();
190	<	try {
239	>	for (int i = 0; i < 2; i++) {
240	>	long startTime = System.nanoTime();
241		super.runTest();
242	<	} finally {
243	<	long elapsedMillis = millisElapsedSince(t0);
244	<	if (elapsedMillis >= profileThreshold)
242	>	long elapsedMillis = millisElapsedSince(startTime);
243	>	if (elapsedMillis < profileThreshold)
244	>	break;
245	>	// Never report first run of any test; treat it as a
246	>	// warmup run, notably to trigger all needed classloading,
247	>	if (i > 0)
248		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
249		}
250		}
251
252		/**
253		* Runs all JSR166 unit tests using junit.textui.TestRunner.
201	–	* Optional command line arg provides the number of iterations to
202	–	* repeat running the tests.
254		*/
255		public static void main(String[] args) {
256	+	main(suite(), args);
257	+	}
258	+
259	+	/**
260	+	* Runs all unit tests in the given test suite.
261	+	* Actual behavior influenced by jsr166.* system properties.
262	+	*/
263	+	static void main(Test suite, String[] args) {
264		if (useSecurityManager) {
265		System.err.println("Setting a permissive security manager");
266		Policy.setPolicy(permissivePolicy());
267		System.setSecurityManager(new SecurityManager());
268		}
269	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
270	<
271	<	Test s = suite();
272	<	for (int i = 0; i < iters; ++i) {
214	<	junit.textui.TestRunner.run(s);
269	>	for (int i = 0; i < suiteRuns; i++) {
270	>	TestResult result = junit.textui.TestRunner.run(suite);
271	>	if (!result.wasSuccessful())
272	>	System.exit(1);
273		System.gc();
274		System.runFinalization();
275		}
218	–	System.exit(0);
276		}
277
278		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 266 | Line 323 | public class JSR166TestCase extends Test
323		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
324		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
325		public static boolean atLeastJava9() {
326	<	// As of 2014-05, java9 still uses 52.0 class file version
327	<	return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
326	>	return JAVA_CLASS_VERSION >= 53.0
327	>	// As of 2015-09, java9 still uses 52.0 class file version
328	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
329	>	}
330	>	public static boolean atLeastJava10() {
331	>	return JAVA_CLASS_VERSION >= 54.0
332	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
333		}
334
335		/**
#	Line 356 | Line 418 | public class JSR166TestCase extends Test
418		"LongAdderTest",
419		"SplittableRandomTest",
420		"StampedLockTest",
421	+	"SubmissionPublisherTest",
422		"ThreadLocalRandom8Test",
423		};
424		addNamedTestClasses(suite, java8TestClassNames);
#	Line 364 | Line 427 | public class JSR166TestCase extends Test
427		// Java9+ test classes
428		if (atLeastJava9()) {
429		String[] java9TestClassNames = {
430	<	"ThreadPoolExecutor9Test",
430	>	// Currently empty, but expecting varhandle tests
431		};
432		addNamedTestClasses(suite, java9TestClassNames);
433		}
#	Line 372 | Line 435 | public class JSR166TestCase extends Test
435		return suite;
436		}
437
438	+	/** Returns list of junit-style test method names in given class. */
439	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
440	+	Method[] methods = testClass.getDeclaredMethods();
441	+	ArrayList<String> names = new ArrayList<String>(methods.length);
442	+	for (Method method : methods) {
443	+	if (method.getName().startsWith("test")
444	+	&& Modifier.isPublic(method.getModifiers())
445	+	// method.getParameterCount() requires jdk8+
446	+	&& method.getParameterTypes().length == 0) {
447	+	names.add(method.getName());
448	+	}
449	+	}
450	+	return names;
451	+	}
452	+
453	+	/**
454	+	* Returns junit-style testSuite for the given test class, but
455	+	* parameterized by passing extra data to each test.
456	+	*/
457	+	public static <ExtraData> Test parameterizedTestSuite
458	+	(Class<? extends JSR166TestCase> testClass,
459	+	Class<ExtraData> dataClass,
460	+	ExtraData data) {
461	+	try {
462	+	TestSuite suite = new TestSuite();
463	+	Constructor c =
464	+	testClass.getDeclaredConstructor(dataClass, String.class);
465	+	for (String methodName : testMethodNames(testClass))
466	+	suite.addTest((Test) c.newInstance(data, methodName));
467	+	return suite;
468	+	} catch (Exception e) {
469	+	throw new Error(e);
470	+	}
471	+	}
472	+
473	+	/**
474	+	* Returns junit-style testSuite for the jdk8 extension of the
475	+	* given test class, but parameterized by passing extra data to
476	+	* each test.  Uses reflection to allow compilation in jdk7.
477	+	*/
478	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
479	+	(Class<? extends JSR166TestCase> testClass,
480	+	Class<ExtraData> dataClass,
481	+	ExtraData data) {
482	+	if (atLeastJava8()) {
483	+	String name = testClass.getName();
484	+	String name8 = name.replaceAll("Test$", "8Test");
485	+	if (name.equals(name8)) throw new Error(name);
486	+	try {
487	+	return (Test)
488	+	Class.forName(name8)
489	+	.getMethod("testSuite", new Class[] { dataClass })
490	+	.invoke(null, data);
491	+	} catch (Exception e) {
492	+	throw new Error(e);
493	+	}
494	+	} else {
495	+	return new TestSuite();
496	+	}
497	+	}
498	+
499		// Delays for timing-dependent tests, in milliseconds.
500
501		public static long SHORT_DELAY_MS;
#	Line 406 | Line 530 | public class JSR166TestCase extends Test
530		}
531
532		/**
533	<	* Returns a new Date instance representing a time delayMillis
534	<	* milliseconds in the future.
533	>	* Returns a new Date instance representing a time at least
534	>	* delayMillis milliseconds in the future.
535		*/
536		Date delayedDate(long delayMillis) {
537	<	return new Date(System.currentTimeMillis() + delayMillis);
537	>	// Add 1 because currentTimeMillis is known to round into the past.
538	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
539		}
540
541		/**
#	Line 426 | Line 551 | public class JSR166TestCase extends Test
551		* the same test have no effect.
552		*/
553		public void threadRecordFailure(Throwable t) {
554	+	System.err.println(t);
555	+	dumpTestThreads();
556		threadFailure.compareAndSet(null, t);
557		}
558
#	Line 433 | Line 560 | public class JSR166TestCase extends Test
560		setDelays();
561		}
562
563	+	void tearDownFail(String format, Object... args) {
564	+	String msg = toString() + ": " + String.format(format, args);
565	+	System.err.println(msg);
566	+	dumpTestThreads();
567	+	throw new AssertionFailedError(msg);
568	+	}
569	+
570		/**
571		* Extra checks that get done for all test cases.
572		*
#	Line 460 | Line 594 | public class JSR166TestCase extends Test
594		}
595
596		if (Thread.interrupted())
597	<	throw new AssertionFailedError("interrupt status set in main thread");
597	>	tearDownFail("interrupt status set in main thread");
598
599		checkForkJoinPoolThreadLeaks();
600		}
601
602		/**
603	<	* Finds missing try { ... } finally { joinPool(e); }
603	>	* Finds missing PoolCleaners
604		*/
605		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
606	<	Thread[] survivors = new Thread[5];
606	>	Thread[] survivors = new Thread[7];
607		int count = Thread.enumerate(survivors);
608		for (int i = 0; i < count; i++) {
609		Thread thread = survivors[i];
#	Line 477 | Line 611 | public class JSR166TestCase extends Test
611		if (name.startsWith("ForkJoinPool-")) {
612		// give thread some time to terminate
613		thread.join(LONG_DELAY_MS);
614	<	if (!thread.isAlive()) continue;
615	<	thread.stop();
616	<	throw new AssertionFailedError
483	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
484	<	toString(), name));
614	>	if (thread.isAlive())
615	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
616	>	thread);
617		}
618		}
619	+
620	+	if (!ForkJoinPool.commonPool()
621	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
622	+	tearDownFail("ForkJoin common pool thread stuck");
623		}
624
625		/**
#	Line 496 | Line 632 | public class JSR166TestCase extends Test
632		fail(reason);
633		} catch (AssertionFailedError t) {
634		threadRecordFailure(t);
635	<	fail(reason);
635	>	throw t;
636		}
637		}
638
#	Line 623 | Line 759 | public class JSR166TestCase extends Test
759		/**
760		* Delays, via Thread.sleep, for the given millisecond delay, but
761		* if the sleep is shorter than specified, may re-sleep or yield
762	<	* until time elapses.
762	>	* until time elapses.  Ensures that the given time, as measured
763	>	* by System.nanoTime(), has elapsed.
764		*/
765		static void delay(long millis) throws InterruptedException {
766	<	long startTime = System.nanoTime();
767	<	long ns = millis * 1000 * 1000;
768	<	for (;;) {
766	>	long nanos = millis * (1000 * 1000);
767	>	final long wakeupTime = System.nanoTime() + nanos;
768	>	do {
769		if (millis > 0L)
770		Thread.sleep(millis);
771		else // too short to sleep
772		Thread.yield();
773	<	long d = ns - (System.nanoTime() - startTime);
774	<	if (d > 0L)
775	<	millis = d / (1000 * 1000);
776	<	else
777	<	break;
773	>	nanos = wakeupTime - System.nanoTime();
774	>	millis = nanos / (1000 * 1000);
775	>	} while (nanos >= 0L);
776	>	}
777	>
778	>	/**
779	>	* Allows use of try-with-resources with per-test thread pools.
780	>	*/
781	>	class PoolCleaner implements AutoCloseable {
782	>	private final ExecutorService pool;
783	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
784	>	public void close() { joinPool(pool); }
785	>	}
786	>
787	>	/**
788	>	* An extension of PoolCleaner that has an action to release the pool.
789	>	*/
790	>	class PoolCleanerWithReleaser extends PoolCleaner {
791	>	private final Runnable releaser;
792	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
793	>	super(pool);
794	>	this.releaser = releaser;
795	>	}
796	>	public void close() {
797	>	try {
798	>	releaser.run();
799	>	} finally {
800	>	super.close();
801	>	}
802		}
803		}
804
805	+	PoolCleaner cleaner(ExecutorService pool) {
806	+	return new PoolCleaner(pool);
807	+	}
808	+
809	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
810	+	return new PoolCleanerWithReleaser(pool, releaser);
811	+	}
812	+
813	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
814	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
815	+	}
816	+
817	+	Runnable releaser(final CountDownLatch latch) {
818	+	return new Runnable() { public void run() {
819	+	do { latch.countDown(); }
820	+	while (latch.getCount() > 0);
821	+	}};
822	+	}
823	+
824		/**
825		* Waits out termination of a thread pool or fails doing so.
826		*/
827	<	void joinPool(ExecutorService exec) {
827	>	void joinPool(ExecutorService pool) {
828		try {
829	<	exec.shutdown();
830	<	if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
831	<	fail("ExecutorService " + exec +
832	<	" did not terminate in a timely manner");
829	>	pool.shutdown();
830	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
831	>	try {
832	>	threadFail("ExecutorService " + pool +
833	>	" did not terminate in a timely manner");
834	>	} finally {
835	>	// last resort, for the benefit of subsequent tests
836	>	pool.shutdownNow();
837	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
838	>	}
839	>	}
840		} catch (SecurityException ok) {
841		// Allowed in case test doesn't have privs
842		} catch (InterruptedException fail) {
843	<	fail("Unexpected InterruptedException");
843	>	threadFail("Unexpected InterruptedException");
844		}
845		}
846
847	+	/** Like Runnable, but with the freedom to throw anything */
848	+	interface Action { public void run() throws Throwable; }
849	+
850		/**
851	<	* A debugging tool to print all stack traces, as jstack does.
851	>	* Runs all the given actions in parallel, failing if any fail.
852	>	* Useful for running multiple variants of tests that are
853	>	* necessarily individually slow because they must block.
854		*/
855	<	static void printAllStackTraces() {
856	<	for (ThreadInfo info :
857	<	ManagementFactory.getThreadMXBean()
858	<	.dumpAllThreads(true, true))
855	>	void testInParallel(Action ... actions) {
856	>	ExecutorService pool = Executors.newCachedThreadPool();
857	>	try (PoolCleaner cleaner = cleaner(pool)) {
858	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
859	>	for (final Action action : actions)
860	>	futures.add(pool.submit(new CheckedRunnable() {
861	>	public void realRun() throws Throwable { action.run();}}));
862	>	for (Future<?> future : futures)
863	>	try {
864	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
865	>	} catch (ExecutionException ex) {
866	>	threadUnexpectedException(ex.getCause());
867	>	} catch (Exception ex) {
868	>	threadUnexpectedException(ex);
869	>	}
870	>	}
871	>	}
872	>
873	>	/**
874	>	* A debugging tool to print stack traces of most threads, as jstack does.
875	>	* Uninteresting threads are filtered out.
876	>	*/
877	>	static void dumpTestThreads() {
878	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
879	>	System.err.println("------ stacktrace dump start ------");
880	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
881	>	String name = info.getThreadName();
882	>	if ("Signal Dispatcher".equals(name))
883	>	continue;
884	>	if ("Reference Handler".equals(name)
885	>	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
886	>	continue;
887	>	if ("Finalizer".equals(name)
888	>	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
889	>	continue;
890	>	if ("checkForWedgedTest".equals(name))
891	>	continue;
892		System.err.print(info);
893	+	}
894	+	System.err.println("------ stacktrace dump end ------");
895		}
896
897		/**
#	Line 684 | Line 911 | public class JSR166TestCase extends Test
911		delay(millis);
912		assertTrue(thread.isAlive());
913		} catch (InterruptedException fail) {
914	<	fail("Unexpected InterruptedException");
914	>	threadFail("Unexpected InterruptedException");
915		}
916		}
917
#	Line 706 | Line 933 | public class JSR166TestCase extends Test
933		for (Thread thread : threads)
934		assertTrue(thread.isAlive());
935		} catch (InterruptedException fail) {
936	<	fail("Unexpected InterruptedException");
936	>	threadFail("Unexpected InterruptedException");
937		}
938		}
939
#	Line 984 | Line 1211 | public class JSR166TestCase extends Test
1211		} finally {
1212		if (t.getState() != Thread.State.TERMINATED) {
1213		t.interrupt();
1214	<	fail("Test timed out");
1214	>	threadFail("Test timed out");
1215		}
1216		}
1217		}
#	Line 1109 | Line 1336 | public class JSR166TestCase extends Test
1336		public static final String TEST_STRING = "a test string";
1337
1338		public static class StringTask implements Callable<String> {
1339	<	public String call() { return TEST_STRING; }
1339	>	final String value;
1340	>	public StringTask() { this(TEST_STRING); }
1341	>	public StringTask(String value) { this.value = value; }
1342	>	public String call() { return value; }
1343		}
1344
1345		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1122 | Line 1352 | public class JSR166TestCase extends Test
1352		}};
1353		}
1354
1355	<	public Runnable awaiter(final CountDownLatch latch) {
1355	>	public Runnable countDowner(final CountDownLatch latch) {
1356		return new CheckedRunnable() {
1357		public void realRun() throws InterruptedException {
1358	<	await(latch);
1358	>	latch.countDown();
1359		}};
1360		}
1361
1362	+	class LatchAwaiter extends CheckedRunnable {
1363	+	static final int NEW = 0;
1364	+	static final int RUNNING = 1;
1365	+	static final int DONE = 2;
1366	+	final CountDownLatch latch;
1367	+	int state = NEW;
1368	+	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1369	+	public void realRun() throws InterruptedException {
1370	+	state = 1;
1371	+	await(latch);
1372	+	state = 2;
1373	+	}
1374	+	}
1375	+
1376	+	public LatchAwaiter awaiter(CountDownLatch latch) {
1377	+	return new LatchAwaiter(latch);
1378	+	}
1379	+
1380		public void await(CountDownLatch latch) {
1381		try {
1382		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));

Diff Legend

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