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.126 by jsr166, Sat Jan 17 22:55:06 2015 UTC vs.
Revision 1.149 by jsr166, Sat Oct 3 16:57:25 2015 UTC

#	Line 15 | Line 15 | import java.io.ObjectInputStream;
15		import java.io.ObjectOutputStream;
16		import java.lang.management.ManagementFactory;
17		import java.lang.management.ThreadInfo;
18	+	import java.lang.reflect.Constructor;
19		import java.lang.reflect.Method;
20	+	import java.lang.reflect.Modifier;
21		import java.security.CodeSource;
22		import java.security.Permission;
23		import java.security.PermissionCollection;
#	Line 35 | Line 37 | import java.util.concurrent.BlockingQueu
37		import java.util.concurrent.Callable;
38		import java.util.concurrent.CountDownLatch;
39		import java.util.concurrent.CyclicBarrier;
40	+	import java.util.concurrent.ExecutionException;
41	+	import java.util.concurrent.Executors;
42		import java.util.concurrent.ExecutorService;
43	+	import java.util.concurrent.ForkJoinPool;
44		import java.util.concurrent.Future;
45		import java.util.concurrent.RecursiveAction;
46		import java.util.concurrent.RecursiveTask;
#	Line 50 | Line 55 | import java.util.regex.Pattern;
55		import junit.framework.AssertionFailedError;
56		import junit.framework.Test;
57		import junit.framework.TestCase;
58	+	import junit.framework.TestResult;
59		import junit.framework.TestSuite;
60
61		/**
#	Line 62 | Line 68 | import junit.framework.TestSuite;
68		*
69		* <ol>
70		*
71	<	* <li> All assertions in code running in generated threads must use
71	>	* <li>All assertions in code running in generated threads must use
72		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
73		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
74		* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
75		* particularly recommended) for other code to use these forms too.
76		* Only the most typically used JUnit assertion methods are defined
77	<	* this way, but enough to live with.</li>
77	>	* this way, but enough to live with.
78		*
79	<	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
79	>	* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
80		* to invoke {@code super.setUp} and {@code super.tearDown} within
81		* them. These methods are used to clear and check for thread
82	<	* assertion failures.</li>
82	>	* assertion failures.
83		*
84		* <li>All delays and timeouts must use one of the constants {@code
85		* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
#	Line 84 | Line 90 | import junit.framework.TestSuite;
90		* is always discriminable as larger than SHORT and smaller than
91		* MEDIUM.  And so on. These constants are set to conservative values,
92		* but even so, if there is ever any doubt, they can all be increased
93	<	* in one spot to rerun tests on slower platforms.</li>
93	>	* in one spot to rerun tests on slower platforms.
94		*
95	<	* <li> All threads generated must be joined inside each test case
95	>	* <li>All threads generated must be joined inside each test case
96		* method (or {@code fail} to do so) before returning from the
97		* method. The {@code joinPool} method can be used to do this when
98	<	* using Executors.</li>
98	>	* using Executors.
99		*
100		* </ol>
101		*
102		* <p><b>Other notes</b>
103		* <ul>
104		*
105	<	* <li> Usually, there is one testcase method per JSR166 method
105	>	* <li>Usually, there is one testcase method per JSR166 method
106		* covering "normal" operation, and then as many exception-testing
107		* methods as there are exceptions the method can throw. Sometimes
108		* there are multiple tests per JSR166 method when the different
109		* "normal" behaviors differ significantly. And sometimes testcases
110		* cover multiple methods when they cannot be tested in
111	<	* isolation.</li>
111	>	* isolation.
112		*
113	<	* <li> The documentation style for testcases is to provide as javadoc
113	>	* <li>The documentation style for testcases is to provide as javadoc
114		* a simple sentence or two describing the property that the testcase
115		* method purports to test. The javadocs do not say anything about how
116	<	* the property is tested. To find out, read the code.</li>
116	>	* the property is tested. To find out, read the code.
117		*
118	<	* <li> These tests are "conformance tests", and do not attempt to
118	>	* <li>These tests are "conformance tests", and do not attempt to
119		* test throughput, latency, scalability or other performance factors
120		* (see the separate "jtreg" tests for a set intended to check these
121		* for the most central aspects of functionality.) So, most tests use
122		* the smallest sensible numbers of threads, collection sizes, etc
123	<	* needed to check basic conformance.</li>
123	>	* needed to check basic conformance.
124		*
125		* <li>The test classes currently do not declare inclusion in
126		* any particular package to simplify things for people integrating
127	<	* them in TCK test suites.</li>
127	>	* them in TCK test suites.
128		*
129	<	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
130	<	* runs all JSR166 unit tests.</li>
129	>	* <li>As a convenience, the {@code main} of this class (JSR166TestCase)
130	>	* runs all JSR166 unit tests.
131		*
132		* </ul>
133		*/
#	Line 160 | Line 166 | public class JSR166TestCase extends Test
166		Integer.getInteger("jsr166.runsPerTest", 1);
167
168		/**
169	+	* The number of repetitions of the test suite (for finding leaks?).
170	+	*/
171	+	private static final int suiteRuns =
172	+	Integer.getInteger("jsr166.suiteRuns", 1);
173	+
174	+	public JSR166TestCase() { super(); }
175	+	public JSR166TestCase(String name) { super(name); }
176	+
177	+	/**
178		* A filter for tests to run, matching strings of the form
179		* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
180		* Usefully combined with jsr166.runsPerTest.
#	Line 171 | Line 186 | public class JSR166TestCase extends Test
186		return (regex == null) ? null : Pattern.compile(regex);
187		}
188
189	<	protected void runTest() throws Throwable {
189	>	public void runBare() throws Throwable {
190		if (methodFilter == null
191	<	|| methodFilter.matcher(toString()).find()) {
192	<	for (int i = 0; i < runsPerTest; i++) {
193	<	if (profileTests)
194	<	runTestProfiled();
195	<	else
196	<	super.runTest();
197	<	}
191	>	|| methodFilter.matcher(toString()).find())
192	>	super.runBare();
193	>	}
194	>
195	>	protected void runTest() throws Throwable {
196	>	for (int i = 0; i < runsPerTest; i++) {
197	>	if (profileTests)
198	>	runTestProfiled();
199	>	else
200	>	super.runTest();
201		}
202		}
203
204		protected void runTestProfiled() throws Throwable {
205	<	// Warmup run, notably to trigger all needed classloading.
206	<	super.runTest();
189	<	long t0 = System.nanoTime();
190	<	try {
205	>	for (int i = 0; i < 2; i++) {
206	>	long startTime = System.nanoTime();
207		super.runTest();
208	<	} finally {
209	<	long elapsedMillis = millisElapsedSince(t0);
210	<	if (elapsedMillis >= profileThreshold)
208	>	long elapsedMillis = millisElapsedSince(startTime);
209	>	if (elapsedMillis < profileThreshold)
210	>	break;
211	>	// Never report first run of any test; treat it as a
212	>	// warmup run, notably to trigger all needed classloading,
213	>	if (i > 0)
214		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
215		}
216		}
217
218		/**
219		* 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.
220		*/
221		public static void main(String[] args) {
222	+	main(suite(), args);
223	+	}
224	+
225	+	/**
226	+	* Runs all unit tests in the given test suite.
227	+	* Actual behavior influenced by jsr166.* system properties.
228	+	*/
229	+	static void main(Test suite, String[] args) {
230		if (useSecurityManager) {
231		System.err.println("Setting a permissive security manager");
232		Policy.setPolicy(permissivePolicy());
233		System.setSecurityManager(new SecurityManager());
234		}
235	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
236	<
237	<	Test s = suite();
238	<	for (int i = 0; i < iters; ++i) {
214	<	junit.textui.TestRunner.run(s);
235	>	for (int i = 0; i < suiteRuns; i++) {
236	>	TestResult result = junit.textui.TestRunner.run(suite);
237	>	if (!result.wasSuccessful())
238	>	System.exit(1);
239		System.gc();
240		System.runFinalization();
241		}
218	–	System.exit(0);
242		}
243
244		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 266 | Line 289 | public class JSR166TestCase extends Test
289		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
290		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
291		public static boolean atLeastJava9() {
292	<	// As of 2014-05, java9 still uses 52.0 class file version
293	<	return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
292	>	return JAVA_CLASS_VERSION >= 53.0
293	>	// As of 2015-09, java9 still uses 52.0 class file version
294	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
295	>	}
296	>	public static boolean atLeastJava10() {
297	>	return JAVA_CLASS_VERSION >= 54.0
298	>	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
299		}
300
301		/**
#	Line 356 | Line 384 | public class JSR166TestCase extends Test
384		"LongAdderTest",
385		"SplittableRandomTest",
386		"StampedLockTest",
387	+	"SubmissionPublisherTest",
388		"ThreadLocalRandom8Test",
389		};
390		addNamedTestClasses(suite, java8TestClassNames);
#	Line 364 | Line 393 | public class JSR166TestCase extends Test
393		// Java9+ test classes
394		if (atLeastJava9()) {
395		String[] java9TestClassNames = {
396	<	"ThreadPoolExecutor9Test",
396	>	// Currently empty, but expecting varhandle tests
397		};
398		addNamedTestClasses(suite, java9TestClassNames);
399		}
#	Line 372 | Line 401 | public class JSR166TestCase extends Test
401		return suite;
402		}
403
404	+	/** Returns list of junit-style test method names in given class. */
405	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
406	+	Method[] methods = testClass.getDeclaredMethods();
407	+	ArrayList<String> names = new ArrayList<String>(methods.length);
408	+	for (Method method : methods) {
409	+	if (method.getName().startsWith("test")
410	+	&& Modifier.isPublic(method.getModifiers())
411	+	// method.getParameterCount() requires jdk8+
412	+	&& method.getParameterTypes().length == 0) {
413	+	names.add(method.getName());
414	+	}
415	+	}
416	+	return names;
417	+	}
418	+
419	+	/**
420	+	* Returns junit-style testSuite for the given test class, but
421	+	* parameterized by passing extra data to each test.
422	+	*/
423	+	public static <ExtraData> Test parameterizedTestSuite
424	+	(Class<? extends JSR166TestCase> testClass,
425	+	Class<ExtraData> dataClass,
426	+	ExtraData data) {
427	+	try {
428	+	TestSuite suite = new TestSuite();
429	+	Constructor c =
430	+	testClass.getDeclaredConstructor(dataClass, String.class);
431	+	for (String methodName : testMethodNames(testClass))
432	+	suite.addTest((Test) c.newInstance(data, methodName));
433	+	return suite;
434	+	} catch (Exception e) {
435	+	throw new Error(e);
436	+	}
437	+	}
438	+
439	+	/**
440	+	* Returns junit-style testSuite for the jdk8 extension of the
441	+	* given test class, but parameterized by passing extra data to
442	+	* each test.  Uses reflection to allow compilation in jdk7.
443	+	*/
444	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
445	+	(Class<? extends JSR166TestCase> testClass,
446	+	Class<ExtraData> dataClass,
447	+	ExtraData data) {
448	+	if (atLeastJava8()) {
449	+	String name = testClass.getName();
450	+	String name8 = name.replaceAll("Test$", "8Test");
451	+	if (name.equals(name8)) throw new Error(name);
452	+	try {
453	+	return (Test)
454	+	Class.forName(name8)
455	+	.getMethod("testSuite", new Class[] { dataClass })
456	+	.invoke(null, data);
457	+	} catch (Exception e) {
458	+	throw new Error(e);
459	+	}
460	+	} else {
461	+	return new TestSuite();
462	+	}
463	+
464	+	}
465	+
466		// Delays for timing-dependent tests, in milliseconds.
467
468		public static long SHORT_DELAY_MS;
#	Line 406 | Line 497 | public class JSR166TestCase extends Test
497		}
498
499		/**
500	<	* Returns a new Date instance representing a time delayMillis
501	<	* milliseconds in the future.
500	>	* Returns a new Date instance representing a time at least
501	>	* delayMillis milliseconds in the future.
502		*/
503		Date delayedDate(long delayMillis) {
504	<	return new Date(System.currentTimeMillis() + delayMillis);
504	>	// Add 1 because currentTimeMillis is known to round into the past.
505	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
506		}
507
508		/**
#	Line 433 | Line 525 | public class JSR166TestCase extends Test
525		setDelays();
526		}
527
528	+	void tearDownFail(String format, Object... args) {
529	+	String msg = toString() + ": " + String.format(format, args);
530	+	System.err.println(msg);
531	+	printAllStackTraces();
532	+	throw new AssertionFailedError(msg);
533	+	}
534	+
535		/**
536		* Extra checks that get done for all test cases.
537		*
#	Line 460 | Line 559 | public class JSR166TestCase extends Test
559		}
560
561		if (Thread.interrupted())
562	<	throw new AssertionFailedError("interrupt status set in main thread");
562	>	tearDownFail("interrupt status set in main thread");
563
564		checkForkJoinPoolThreadLeaks();
565		}
#	Line 469 | Line 568 | public class JSR166TestCase extends Test
568		* Finds missing try { ... } finally { joinPool(e); }
569		*/
570		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
571	<	Thread[] survivors = new Thread[5];
571	>	Thread[] survivors = new Thread[7];
572		int count = Thread.enumerate(survivors);
573		for (int i = 0; i < count; i++) {
574		Thread thread = survivors[i];
#	Line 477 | Line 576 | public class JSR166TestCase extends Test
576		if (name.startsWith("ForkJoinPool-")) {
577		// give thread some time to terminate
578		thread.join(LONG_DELAY_MS);
579	<	if (!thread.isAlive()) continue;
580	<	thread.stop();
581	<	throw new AssertionFailedError
483	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
484	<	toString(), name));
579	>	if (thread.isAlive())
580	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
581	>	thread);
582		}
583		}
584	+
585	+	if (!ForkJoinPool.commonPool()
586	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
587	+	tearDownFail("ForkJoin common pool thread stuck");
588		}
589
590		/**
#	Line 564 | Line 665 | public class JSR166TestCase extends Test
665		public void threadAssertEquals(Object x, Object y) {
666		try {
667		assertEquals(x, y);
668	<	} catch (AssertionFailedError t) {
669	<	threadRecordFailure(t);
670	<	throw t;
671	<	} catch (Throwable t) {
672	<	threadUnexpectedException(t);
668	>	} catch (AssertionFailedError fail) {
669	>	threadRecordFailure(fail);
670	>	throw fail;
671	>	} catch (Throwable fail) {
672	>	threadUnexpectedException(fail);
673		}
674		}
675
#	Line 580 | Line 681 | public class JSR166TestCase extends Test
681		public void threadAssertSame(Object x, Object y) {
682		try {
683		assertSame(x, y);
684	<	} catch (AssertionFailedError t) {
685	<	threadRecordFailure(t);
686	<	throw t;
684	>	} catch (AssertionFailedError fail) {
685	>	threadRecordFailure(fail);
686	>	throw fail;
687		}
688		}
689
#	Line 642 | Line 743 | public class JSR166TestCase extends Test
743		}
744
745		/**
746	+	* Allows use of try-with-resources with per-test thread pools.
747	+	*/
748	+	static class PoolCloser<T extends ExecutorService>
749	+	implements AutoCloseable {
750	+	public final T pool;
751	+	public PoolCloser(T pool) { this.pool = pool; }
752	+	public void close() { joinPool(pool); }
753	+	}
754	+
755	+	/**
756		* Waits out termination of a thread pool or fails doing so.
757		*/
758	<	void joinPool(ExecutorService exec) {
758	>	static void joinPool(ExecutorService pool) {
759		try {
760	<	exec.shutdown();
761	<	if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
762	<	fail("ExecutorService " + exec +
760	>	pool.shutdown();
761	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
762	>	fail("ExecutorService " + pool +
763		" did not terminate in a timely manner");
764		} catch (SecurityException ok) {
765		// Allowed in case test doesn't have privs
766	<	} catch (InterruptedException ie) {
766	>	} catch (InterruptedException fail) {
767		fail("Unexpected InterruptedException");
768		}
769		}
770
771	+	/** Like Runnable, but with the freedom to throw anything */
772	+	interface Action { public void run() throws Throwable; }
773	+
774	+	/**
775	+	* Runs all the given actions in parallel, failing if any fail.
776	+	* Useful for running multiple variants of tests that are
777	+	* necessarily individually slow because they must block.
778	+	*/
779	+	void testInParallel(Action ... actions) {
780	+	ExecutorService pool = Executors.newCachedThreadPool();
781	+	try {
782	+	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
783	+	for (final Action action : actions)
784	+	futures.add(pool.submit(new CheckedRunnable() {
785	+	public void realRun() throws Throwable { action.run();}}));
786	+	for (Future<?> future : futures)
787	+	try {
788	+	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
789	+	} catch (ExecutionException ex) {
790	+	threadUnexpectedException(ex.getCause());
791	+	} catch (Exception ex) {
792	+	threadUnexpectedException(ex);
793	+	}
794	+	} finally {
795	+	joinPool(pool);
796	+	}
797	+	}
798	+
799		/**
800		* A debugging tool to print all stack traces, as jstack does.
801		*/
#	Line 683 | Line 822 | public class JSR166TestCase extends Test
822		// No need to optimize the failing case via Thread.join.
823		delay(millis);
824		assertTrue(thread.isAlive());
825	<	} catch (InterruptedException ie) {
825	>	} catch (InterruptedException fail) {
826		fail("Unexpected InterruptedException");
827		}
828		}
#	Line 705 | Line 844 | public class JSR166TestCase extends Test
844		delay(millis);
845		for (Thread thread : threads)
846		assertTrue(thread.isAlive());
847	<	} catch (InterruptedException ie) {
847	>	} catch (InterruptedException fail) {
848		fail("Unexpected InterruptedException");
849		}
850		}
#	Line 727 | Line 866 | public class JSR166TestCase extends Test
866		future.get(timeoutMillis, MILLISECONDS);
867		shouldThrow();
868		} catch (TimeoutException success) {
869	<	} catch (Exception e) {
870	<	threadUnexpectedException(e);
869	>	} catch (Exception fail) {
870	>	threadUnexpectedException(fail);
871		} finally { future.cancel(true); }
872		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
873		}
#	Line 884 | Line 1023 | public class JSR166TestCase extends Test
1023		void sleep(long millis) {
1024		try {
1025		delay(millis);
1026	<	} catch (InterruptedException ie) {
1026	>	} catch (InterruptedException fail) {
1027		AssertionFailedError afe =
1028		new AssertionFailedError("Unexpected InterruptedException");
1029	<	afe.initCause(ie);
1029	>	afe.initCause(fail);
1030		throw afe;
1031		}
1032		}
#	Line 979 | Line 1118 | public class JSR166TestCase extends Test
1118		void awaitTermination(Thread t, long timeoutMillis) {
1119		try {
1120		t.join(timeoutMillis);
1121	<	} catch (InterruptedException ie) {
1122	<	threadUnexpectedException(ie);
1121	>	} catch (InterruptedException fail) {
1122	>	threadUnexpectedException(fail);
1123		} finally {
1124		if (t.getState() != Thread.State.TERMINATED) {
1125		t.interrupt();
#	Line 1006 | Line 1145 | public class JSR166TestCase extends Test
1145		public final void run() {
1146		try {
1147		realRun();
1148	<	} catch (Throwable t) {
1149	<	threadUnexpectedException(t);
1148	>	} catch (Throwable fail) {
1149	>	threadUnexpectedException(fail);
1150		}
1151		}
1152		}
#	Line 1061 | Line 1200 | public class JSR166TestCase extends Test
1200		threadShouldThrow("InterruptedException");
1201		} catch (InterruptedException success) {
1202		threadAssertFalse(Thread.interrupted());
1203	<	} catch (Throwable t) {
1204	<	threadUnexpectedException(t);
1203	>	} catch (Throwable fail) {
1204	>	threadUnexpectedException(fail);
1205		}
1206		}
1207		}
#	Line 1073 | Line 1212 | public class JSR166TestCase extends Test
1212		public final T call() {
1213		try {
1214		return realCall();
1215	<	} catch (Throwable t) {
1216	<	threadUnexpectedException(t);
1215	>	} catch (Throwable fail) {
1216	>	threadUnexpectedException(fail);
1217		return null;
1218		}
1219		}
#	Line 1091 | Line 1230 | public class JSR166TestCase extends Test
1230		return result;
1231		} catch (InterruptedException success) {
1232		threadAssertFalse(Thread.interrupted());
1233	<	} catch (Throwable t) {
1234	<	threadUnexpectedException(t);
1233	>	} catch (Throwable fail) {
1234	>	threadUnexpectedException(fail);
1235		}
1236		return null;
1237		}
#	Line 1109 | Line 1248 | public class JSR166TestCase extends Test
1248		public static final String TEST_STRING = "a test string";
1249
1250		public static class StringTask implements Callable<String> {
1251	<	public String call() { return TEST_STRING; }
1251	>	final String value;
1252	>	public StringTask() { this(TEST_STRING); }
1253	>	public StringTask(String value) { this.value = value; }
1254	>	public String call() { return value; }
1255		}
1256
1257		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
#	Line 1122 | Line 1264 | public class JSR166TestCase extends Test
1264		}};
1265		}
1266
1267	+	public Runnable countDowner(final CountDownLatch latch) {
1268	+	return new CheckedRunnable() {
1269	+	public void realRun() throws InterruptedException {
1270	+	latch.countDown();
1271	+	}};
1272	+	}
1273	+
1274		public Runnable awaiter(final CountDownLatch latch) {
1275		return new CheckedRunnable() {
1276		public void realRun() throws InterruptedException {
#	Line 1132 | Line 1281 | public class JSR166TestCase extends Test
1281		public void await(CountDownLatch latch) {
1282		try {
1283		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1284	<	} catch (Throwable t) {
1285	<	threadUnexpectedException(t);
1284	>	} catch (Throwable fail) {
1285	>	threadUnexpectedException(fail);
1286		}
1287		}
1288
1289		public void await(Semaphore semaphore) {
1290		try {
1291		assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1292	<	} catch (Throwable t) {
1293	<	threadUnexpectedException(t);
1292	>	} catch (Throwable fail) {
1293	>	threadUnexpectedException(fail);
1294		}
1295		}
1296
#	Line 1335 | Line 1484 | public class JSR166TestCase extends Test
1484		@Override protected final void compute() {
1485		try {
1486		realCompute();
1487	<	} catch (Throwable t) {
1488	<	threadUnexpectedException(t);
1487	>	} catch (Throwable fail) {
1488	>	threadUnexpectedException(fail);
1489		}
1490		}
1491		}
#	Line 1350 | Line 1499 | public class JSR166TestCase extends Test
1499		@Override protected final T compute() {
1500		try {
1501		return realCompute();
1502	<	} catch (Throwable t) {
1503	<	threadUnexpectedException(t);
1502	>	} catch (Throwable fail) {
1503	>	threadUnexpectedException(fail);
1504		return null;
1505		}
1506		}
#	Line 1375 | Line 1524 | public class JSR166TestCase extends Test
1524		public int await() {
1525		try {
1526		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1527	<	} catch (TimeoutException e) {
1527	>	} catch (TimeoutException timedOut) {
1528		throw new AssertionFailedError("timed out");
1529	<	} catch (Exception e) {
1529	>	} catch (Exception fail) {
1530		AssertionFailedError afe =
1531	<	new AssertionFailedError("Unexpected exception: " + e);
1532	<	afe.initCause(e);
1531	>	new AssertionFailedError("Unexpected exception: " + fail);
1532	>	afe.initCause(fail);
1533		throw afe;
1534		}
1535		}
#	Line 1408 | Line 1557 | public class JSR166TestCase extends Test
1557		q.remove();
1558		shouldThrow();
1559		} catch (NoSuchElementException success) {}
1560	<	} catch (InterruptedException ie) {
1412	<	threadUnexpectedException(ie);
1413	<	}
1560	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1561		}
1562
1563		void assertSerialEquals(Object x, Object y) {
#	Line 1429 | Line 1576 | public class JSR166TestCase extends Test
1576		oos.flush();
1577		oos.close();
1578		return bos.toByteArray();
1579	<	} catch (Throwable t) {
1580	<	threadUnexpectedException(t);
1579	>	} catch (Throwable fail) {
1580	>	threadUnexpectedException(fail);
1581		return new byte[0];
1582		}
1583		}
#	Line 1443 | Line 1590 | public class JSR166TestCase extends Test
1590		T clone = (T) ois.readObject();
1591		assertSame(o.getClass(), clone.getClass());
1592		return clone;
1593	<	} catch (Throwable t) {
1594	<	threadUnexpectedException(t);
1593	>	} catch (Throwable fail) {
1594	>	threadUnexpectedException(fail);
1595		return null;
1596		}
1597		}
#	Line 1476 | Line 1623 | public class JSR166TestCase extends Test
1623		shouldThrow();
1624		} catch (NoSuchElementException success) {}
1625		assertFalse(it.hasNext());
1626	<	}
1626	>	}
1627		}

Diff Legend

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