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.75 by jsr166, Tue May 3 06:08:49 2011 UTC vs.
Revision 1.114 by jsr166, Tue Sep 17 06:38:36 2013 UTC

#	Line 7 | Line 7
7		*/
8
9		import junit.framework.*;
10	+	import java.io.ByteArrayInputStream;
11	+	import java.io.ByteArrayOutputStream;
12	+	import java.io.ObjectInputStream;
13	+	import java.io.ObjectOutputStream;
14	+	import java.lang.management.ManagementFactory;
15	+	import java.lang.management.ThreadInfo;
16	+	import java.lang.reflect.Method;
17	+	import java.util.ArrayList;
18		import java.util.Arrays;
19	+	import java.util.Date;
20	+	import java.util.Enumeration;
21	+	import java.util.List;
22		import java.util.NoSuchElementException;
23		import java.util.PropertyPermission;
24		import java.util.concurrent.*;
25	+	import java.util.concurrent.atomic.AtomicBoolean;
26		import java.util.concurrent.atomic.AtomicReference;
27		import static java.util.concurrent.TimeUnit.MILLISECONDS;
28		import static java.util.concurrent.TimeUnit.NANOSECONDS;
29	+	import java.util.regex.Pattern;
30		import java.security.CodeSource;
31		import java.security.Permission;
32		import java.security.PermissionCollection;
#	Line 63 | Line 76 | import java.security.SecurityPermission;
76		*
77		* </ol>
78		*
79	<	* <p> <b>Other notes</b>
79	>	* <p><b>Other notes</b>
80		* <ul>
81		*
82		* <li> Usually, there is one testcase method per JSR166 method
#	Line 116 | Line 129 | public class JSR166TestCase extends Test
129		private static final long profileThreshold =
130		Long.getLong("jsr166.profileThreshold", 100);
131
132	+	/**
133	+	* The number of repetitions per test (for tickling rare bugs).
134	+	*/
135	+	private static final int runsPerTest =
136	+	Integer.getInteger("jsr166.runsPerTest", 1);
137	+
138	+	/**
139	+	* A filter for tests to run, matching strings of the form
140	+	* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
141	+	* Usefully combined with jsr166.runsPerTest.
142	+	*/
143	+	private static final Pattern methodFilter = methodFilter();
144	+
145	+	private static Pattern methodFilter() {
146	+	String regex = System.getProperty("jsr166.methodFilter");
147	+	return (regex == null) ? null : Pattern.compile(regex);
148	+	}
149	+
150		protected void runTest() throws Throwable {
151	<	if (profileTests)
152	<	runTestProfiled();
153	<	else
154	<	super.runTest();
151	>	if (methodFilter == null
152	>	|| methodFilter.matcher(toString()).find()) {
153	>	for (int i = 0; i < runsPerTest; i++) {
154	>	if (profileTests)
155	>	runTestProfiled();
156	>	else
157	>	super.runTest();
158	>	}
159	>	}
160		}
161
162		protected void runTestProfiled() throws Throwable {
#	Line 136 | Line 172 | public class JSR166TestCase extends Test
172		}
173
174		/**
175	<	* Runs all JSR166 unit tests using junit.textui.TestRunner
175	>	* Runs all JSR166 unit tests using junit.textui.TestRunner.
176	>	* Optional command line arg provides the number of iterations to
177	>	* repeat running the tests.
178		*/
179		public static void main(String[] args) {
180		if (useSecurityManager) {
#	Line 168 | Line 206 | public class JSR166TestCase extends Test
206		return suite;
207		}
208
209	+	public static void addNamedTestClasses(TestSuite suite,
210	+	String... testClassNames) {
211	+	for (String testClassName : testClassNames) {
212	+	try {
213	+	Class<?> testClass = Class.forName(testClassName);
214	+	Method m = testClass.getDeclaredMethod("suite",
215	+	new Class<?>[0]);
216	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
217	+	} catch (Exception e) {
218	+	throw new Error("Missing test class", e);
219	+	}
220	+	}
221	+	}
222	+
223	+	public static final double JAVA_CLASS_VERSION;
224	+	static {
225	+	try {
226	+	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
227	+	new java.security.PrivilegedAction<Double>() {
228	+	public Double run() {
229	+	return Double.valueOf(System.getProperty("java.class.version"));}});
230	+	} catch (Throwable t) {
231	+	throw new Error(t);
232	+	}
233	+	}
234	+
235	+	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
236	+	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
237	+	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
238	+
239		/**
240		* Collects all JSR166 unit tests as one suite.
241		*/
242		public static Test suite() {
243	<	return newTestSuite(
243	>	// Java7+ test classes
244	>	TestSuite suite = newTestSuite(
245		ForkJoinPoolTest.suite(),
246		ForkJoinTaskTest.suite(),
247		RecursiveActionTest.suite(),
#	Line 237 | Line 306 | public class JSR166TestCase extends Test
306		TreeSetTest.suite(),
307		TreeSubMapTest.suite(),
308		TreeSubSetTest.suite());
309	+
310	+	// Java8+ test classes
311	+	if (atLeastJava8()) {
312	+	String[] java8TestClassNames = {
313	+	"Atomic8Test",
314	+	"CompletableFutureTest",
315	+	"ConcurrentHashMap8Test",
316	+	"CountedCompleterTest",
317	+	"DoubleAccumulatorTest",
318	+	"DoubleAdderTest",
319	+	"ForkJoinPool8Test",
320	+	"ForkJoinTask8Test",
321	+	"LongAccumulatorTest",
322	+	"LongAdderTest",
323	+	"SplittableRandomTest",
324	+	"StampedLockTest",
325	+	"ThreadLocalRandom8Test",
326	+	};
327	+	addNamedTestClasses(suite, java8TestClassNames);
328	+	}
329	+
330	+	return suite;
331		}
332
333	+	// Delays for timing-dependent tests, in milliseconds.
334
335		public static long SHORT_DELAY_MS;
336		public static long SMALL_DELAY_MS;
337		public static long MEDIUM_DELAY_MS;
338		public static long LONG_DELAY_MS;
339
248	–
340		/**
341		* Returns the shortest timed delay. This could
342		* be reimplemented to use for example a Property.
#	Line 254 | Line 345 | public class JSR166TestCase extends Test
345		return 50;
346		}
347
257	–
348		/**
349		* Sets delays as multiples of SHORT_DELAY.
350		*/
#	Line 266 | Line 356 | public class JSR166TestCase extends Test
356		}
357
358		/**
359	+	* Returns a timeout in milliseconds to be used in tests that
360	+	* verify that operations block or time out.
361	+	*/
362	+	long timeoutMillis() {
363	+	return SHORT_DELAY_MS / 4;
364	+	}
365	+
366	+	/**
367	+	* Returns a new Date instance representing a time delayMillis
368	+	* milliseconds in the future.
369	+	*/
370	+	Date delayedDate(long delayMillis) {
371	+	return new Date(System.currentTimeMillis() + delayMillis);
372	+	}
373	+
374	+	/**
375		* The first exception encountered if any threadAssertXXX method fails.
376		*/
377		private final AtomicReference<Throwable> threadFailure
#	Line 286 | Line 392 | public class JSR166TestCase extends Test
392		}
393
394		/**
395	+	* Extra checks that get done for all test cases.
396	+	*
397		* Triggers test case failure if any thread assertions have failed,
398		* by rethrowing, in the test harness thread, any exception recorded
399		* earlier by threadRecordFailure.
400	+	*
401	+	* Triggers test case failure if interrupt status is set in the main thread.
402		*/
403		public void tearDown() throws Exception {
404		Throwable t = threadFailure.getAndSet(null);
#	Line 306 | Line 416 | public class JSR166TestCase extends Test
416		throw afe;
417		}
418		}
419	+
420	+	if (Thread.interrupted())
421	+	throw new AssertionFailedError("interrupt status set in main thread");
422	+
423	+	checkForkJoinPoolThreadLeaks();
424	+	}
425	+
426	+	/**
427	+	* Find missing try { ... } finally { joinPool(e); }
428	+	*/
429	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
430	+	Thread[] survivors = new Thread[5];
431	+	int count = Thread.enumerate(survivors);
432	+	for (int i = 0; i < count; i++) {
433	+	Thread thread = survivors[i];
434	+	String name = thread.getName();
435	+	if (name.startsWith("ForkJoinPool-")) {
436	+	// give thread some time to terminate
437	+	thread.join(LONG_DELAY_MS);
438	+	if (!thread.isAlive()) continue;
439	+	thread.stop();
440	+	throw new AssertionFailedError
441	+	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
442	+	toString(), name));
443	+	}
444	+	}
445		}
446
447		/**
#	Line 437 | Line 573 | public class JSR166TestCase extends Test
573		else {
574		AssertionFailedError afe =
575		new AssertionFailedError("unexpected exception: " + t);
576	<	t.initCause(t);
576	>	afe.initCause(t);
577		throw afe;
578		}
579		}
580
581		/**
582	+	* Delays, via Thread.sleep, for the given millisecond delay, but
583	+	* if the sleep is shorter than specified, may re-sleep or yield
584	+	* until time elapses.
585	+	*/
586	+	static void delay(long millis) throws InterruptedException {
587	+	long startTime = System.nanoTime();
588	+	long ns = millis * 1000 * 1000;
589	+	for (;;) {
590	+	if (millis > 0L)
591	+	Thread.sleep(millis);
592	+	else // too short to sleep
593	+	Thread.yield();
594	+	long d = ns - (System.nanoTime() - startTime);
595	+	if (d > 0L)
596	+	millis = d / (1000 * 1000);
597	+	else
598	+	break;
599	+	}
600	+	}
601	+
602	+	/**
603		* Waits out termination of a thread pool or fails doing so.
604		*/
605	<	public void joinPool(ExecutorService exec) {
605	>	void joinPool(ExecutorService exec) {
606		try {
607		exec.shutdown();
608		assertTrue("ExecutorService did not terminate in a timely manner",
#	Line 457 | Line 614 | public class JSR166TestCase extends Test
614		}
615		}
616
617	+	/**
618	+	* A debugging tool to print all stack traces, as jstack does.
619	+	*/
620	+	static void printAllStackTraces() {
621	+	for (ThreadInfo info :
622	+	ManagementFactory.getThreadMXBean()
623	+	.dumpAllThreads(true, true))
624	+	System.err.print(info);
625	+	}
626	+
627	+	/**
628	+	* Checks that thread does not terminate within the default
629	+	* millisecond delay of {@code timeoutMillis()}.
630	+	*/
631	+	void assertThreadStaysAlive(Thread thread) {
632	+	assertThreadStaysAlive(thread, timeoutMillis());
633	+	}
634	+
635	+	/**
636	+	* Checks that thread does not terminate within the given millisecond delay.
637	+	*/
638	+	void assertThreadStaysAlive(Thread thread, long millis) {
639	+	try {
640	+	// No need to optimize the failing case via Thread.join.
641	+	delay(millis);
642	+	assertTrue(thread.isAlive());
643	+	} catch (InterruptedException ie) {
644	+	fail("Unexpected InterruptedException");
645	+	}
646	+	}
647	+
648	+	/**
649	+	* Checks that the threads do not terminate within the default
650	+	* millisecond delay of {@code timeoutMillis()}.
651	+	*/
652	+	void assertThreadsStayAlive(Thread... threads) {
653	+	assertThreadsStayAlive(timeoutMillis(), threads);
654	+	}
655	+
656	+	/**
657	+	* Checks that the threads do not terminate within the given millisecond delay.
658	+	*/
659	+	void assertThreadsStayAlive(long millis, Thread... threads) {
660	+	try {
661	+	// No need to optimize the failing case via Thread.join.
662	+	delay(millis);
663	+	for (Thread thread : threads)
664	+	assertTrue(thread.isAlive());
665	+	} catch (InterruptedException ie) {
666	+	fail("Unexpected InterruptedException");
667	+	}
668	+	}
669	+
670	+	/**
671	+	* Checks that future.get times out, with the default timeout of
672	+	* {@code timeoutMillis()}.
673	+	*/
674	+	void assertFutureTimesOut(Future future) {
675	+	assertFutureTimesOut(future, timeoutMillis());
676	+	}
677	+
678	+	/**
679	+	* Checks that future.get times out, with the given millisecond timeout.
680	+	*/
681	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
682	+	long startTime = System.nanoTime();
683	+	try {
684	+	future.get(timeoutMillis, MILLISECONDS);
685	+	shouldThrow();
686	+	} catch (TimeoutException success) {
687	+	} catch (Exception e) {
688	+	threadUnexpectedException(e);
689	+	} finally { future.cancel(true); }
690	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
691	+	}
692
693		/**
694		* Fails with message "should throw exception".
#	Line 497 | Line 729 | public class JSR166TestCase extends Test
729		public static final Integer m6  = new Integer(-6);
730		public static final Integer m10 = new Integer(-10);
731
500	–
732		/**
733		* Runs Runnable r with a security policy that permits precisely
734		* the specified permissions.  If there is no current security
#	Line 509 | Line 740 | public class JSR166TestCase extends Test
740		SecurityManager sm = System.getSecurityManager();
741		if (sm == null) {
742		r.run();
743	+	}
744	+	runWithSecurityManagerWithPermissions(r, permissions);
745	+	}
746	+
747	+	/**
748	+	* Runs Runnable r with a security policy that permits precisely
749	+	* the specified permissions.  If there is no current security
750	+	* manager, a temporary one is set for the duration of the
751	+	* Runnable.  We require that any security manager permit
752	+	* getPolicy/setPolicy.
753	+	*/
754	+	public void runWithSecurityManagerWithPermissions(Runnable r,
755	+	Permission... permissions) {
756	+	SecurityManager sm = System.getSecurityManager();
757	+	if (sm == null) {
758		Policy savedPolicy = Policy.getPolicy();
759		try {
760		Policy.setPolicy(permissivePolicy());
761		System.setSecurityManager(new SecurityManager());
762	<	runWithPermissions(r, permissions);
762	>	runWithSecurityManagerWithPermissions(r, permissions);
763		} finally {
764		System.setSecurityManager(null);
765		Policy.setPolicy(savedPolicy);
#	Line 561 | Line 807 | public class JSR166TestCase extends Test
807		return perms.implies(p);
808		}
809		public void refresh() {}
810	+	public String toString() {
811	+	List<Permission> ps = new ArrayList<Permission>();
812	+	for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
813	+	ps.add(e.nextElement());
814	+	return "AdjustablePolicy with permissions " + ps;
815	+	}
816		}
817
818		/**
#	Line 588 | Line 840 | public class JSR166TestCase extends Test
840		*/
841		void sleep(long millis) {
842		try {
843	<	Thread.sleep(millis);
843	>	delay(millis);
844		} catch (InterruptedException ie) {
845		AssertionFailedError afe =
846		new AssertionFailedError("Unexpected InterruptedException");
#	Line 598 | Line 850 | public class JSR166TestCase extends Test
850		}
851
852		/**
853	<	* Sleeps until the timeout has elapsed, or interrupted.
602	<	* Does <em>NOT</em> throw InterruptedException.
603	<	*/
604	<	void sleepTillInterrupted(long timeoutMillis) {
605	<	try {
606	<	Thread.sleep(timeoutMillis);
607	<	} catch (InterruptedException wakeup) {}
608	<	}
609	<
610	<	/**
611	<	* Waits up to the specified number of milliseconds for the given
853	>	* Spin-waits up to the specified number of milliseconds for the given
854		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
855		*/
856		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
857	<	long timeoutNanos = timeoutMillis * 1000L * 1000L;
616	<	long t0 = System.nanoTime();
857	>	long startTime = System.nanoTime();
858		for (;;) {
859		Thread.State s = thread.getState();
860		if (s == Thread.State.BLOCKED ||
#	Line 622 | Line 863 | public class JSR166TestCase extends Test
863		return;
864		else if (s == Thread.State.TERMINATED)
865		fail("Unexpected thread termination");
866	<	else if (System.nanoTime() - t0 > timeoutNanos) {
866	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
867		threadAssertTrue(thread.isAlive());
868		return;
869		}
#	Line 668 | Line 909 | public class JSR166TestCase extends Test
909		} catch (InterruptedException ie) {
910		threadUnexpectedException(ie);
911		} finally {
912	<	if (t.isAlive()) {
912	>	if (t.getState() != Thread.State.TERMINATED) {
913		t.interrupt();
914		fail("Test timed out");
915		}
#	Line 746 | Line 987 | public class JSR166TestCase extends Test
987		realRun();
988		threadShouldThrow("InterruptedException");
989		} catch (InterruptedException success) {
990	+	threadAssertFalse(Thread.interrupted());
991		} catch (Throwable t) {
992		threadUnexpectedException(t);
993		}
#	Line 775 | Line 1017 | public class JSR166TestCase extends Test
1017		threadShouldThrow("InterruptedException");
1018		return result;
1019		} catch (InterruptedException success) {
1020	+	threadAssertFalse(Thread.interrupted());
1021		} catch (Throwable t) {
1022		threadUnexpectedException(t);
1023		}
#	Line 809 | Line 1052 | public class JSR166TestCase extends Test
1052		public Runnable awaiter(final CountDownLatch latch) {
1053		return new CheckedRunnable() {
1054		public void realRun() throws InterruptedException {
1055	<	latch.await();
1055	>	await(latch);
1056		}};
1057		}
1058
1059	+	public void await(CountDownLatch latch) {
1060	+	try {
1061	+	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1062	+	} catch (Throwable t) {
1063	+	threadUnexpectedException(t);
1064	+	}
1065	+	}
1066	+
1067	+	public void await(Semaphore semaphore) {
1068	+	try {
1069	+	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1070	+	} catch (Throwable t) {
1071	+	threadUnexpectedException(t);
1072	+	}
1073	+	}
1074	+
1075	+	//     /**
1076	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1077	+	//      */
1078	+	//     public void await(AtomicBoolean flag) {
1079	+	//         await(flag, LONG_DELAY_MS);
1080	+	//     }
1081	+
1082	+	//     /**
1083	+	//      * Spin-waits up to the specified timeout until flag becomes true.
1084	+	//      */
1085	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
1086	+	//         long startTime = System.nanoTime();
1087	+	//         while (!flag.get()) {
1088	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
1089	+	//                 throw new AssertionFailedError("timed out");
1090	+	//             Thread.yield();
1091	+	//         }
1092	+	//     }
1093	+
1094		public static class NPETask implements Callable<String> {
1095		public String call() { throw new NullPointerException(); }
1096		}
#	Line 823 | Line 1101 | public class JSR166TestCase extends Test
1101
1102		public class ShortRunnable extends CheckedRunnable {
1103		protected void realRun() throws Throwable {
1104	<	Thread.sleep(SHORT_DELAY_MS);
1104	>	delay(SHORT_DELAY_MS);
1105		}
1106		}
1107
1108		public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1109		protected void realRun() throws InterruptedException {
1110	<	Thread.sleep(SHORT_DELAY_MS);
1110	>	delay(SHORT_DELAY_MS);
1111		}
1112		}
1113
1114		public class SmallRunnable extends CheckedRunnable {
1115		protected void realRun() throws Throwable {
1116	<	Thread.sleep(SMALL_DELAY_MS);
1116	>	delay(SMALL_DELAY_MS);
1117		}
1118		}
1119
1120		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1121		protected void realRun() {
1122		try {
1123	<	Thread.sleep(SMALL_DELAY_MS);
1123	>	delay(SMALL_DELAY_MS);
1124		} catch (InterruptedException ok) {}
1125		}
1126		}
1127
1128		public class SmallCallable extends CheckedCallable {
1129		protected Object realCall() throws InterruptedException {
1130	<	Thread.sleep(SMALL_DELAY_MS);
1130	>	delay(SMALL_DELAY_MS);
1131		return Boolean.TRUE;
1132		}
1133		}
1134
1135		public class MediumRunnable extends CheckedRunnable {
1136		protected void realRun() throws Throwable {
1137	<	Thread.sleep(MEDIUM_DELAY_MS);
1137	>	delay(MEDIUM_DELAY_MS);
1138		}
1139		}
1140
1141		public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1142		protected void realRun() throws InterruptedException {
1143	<	Thread.sleep(MEDIUM_DELAY_MS);
1143	>	delay(MEDIUM_DELAY_MS);
1144		}
1145		}
1146
#	Line 870 | Line 1148 | public class JSR166TestCase extends Test
1148		return new CheckedRunnable() {
1149		protected void realRun() {
1150		try {
1151	<	Thread.sleep(timeoutMillis);
1151	>	delay(timeoutMillis);
1152		} catch (InterruptedException ok) {}
1153		}};
1154		}
#	Line 878 | Line 1156 | public class JSR166TestCase extends Test
1156		public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1157		protected void realRun() {
1158		try {
1159	<	Thread.sleep(MEDIUM_DELAY_MS);
1159	>	delay(MEDIUM_DELAY_MS);
1160		} catch (InterruptedException ok) {}
1161		}
1162		}
#	Line 886 | Line 1164 | public class JSR166TestCase extends Test
1164		public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1165		protected void realRun() {
1166		try {
1167	<	Thread.sleep(LONG_DELAY_MS);
1167	>	delay(LONG_DELAY_MS);
1168		} catch (InterruptedException ok) {}
1169		}
1170		}
#	Line 910 | Line 1188 | public class JSR166TestCase extends Test
1188		public boolean isDone() { return done; }
1189		public void run() {
1190		try {
1191	<	Thread.sleep(timeoutMillis);
1191	>	delay(timeoutMillis);
1192		done = true;
1193		} catch (InterruptedException ok) {}
1194		}
#	Line 921 | Line 1199 | public class JSR166TestCase extends Test
1199		public volatile boolean done = false;
1200		public void run() {
1201		try {
1202	<	Thread.sleep(SHORT_DELAY_MS);
1202	>	delay(SHORT_DELAY_MS);
1203		done = true;
1204		} catch (InterruptedException ok) {}
1205		}
#	Line 931 | Line 1209 | public class JSR166TestCase extends Test
1209		public volatile boolean done = false;
1210		public void run() {
1211		try {
1212	<	Thread.sleep(SMALL_DELAY_MS);
1212	>	delay(SMALL_DELAY_MS);
1213		done = true;
1214		} catch (InterruptedException ok) {}
1215		}
#	Line 941 | Line 1219 | public class JSR166TestCase extends Test
1219		public volatile boolean done = false;
1220		public void run() {
1221		try {
1222	<	Thread.sleep(MEDIUM_DELAY_MS);
1222	>	delay(MEDIUM_DELAY_MS);
1223		done = true;
1224		} catch (InterruptedException ok) {}
1225		}
#	Line 951 | Line 1229 | public class JSR166TestCase extends Test
1229		public volatile boolean done = false;
1230		public void run() {
1231		try {
1232	<	Thread.sleep(LONG_DELAY_MS);
1232	>	delay(LONG_DELAY_MS);
1233		done = true;
1234		} catch (InterruptedException ok) {}
1235		}
#	Line 968 | Line 1246 | public class JSR166TestCase extends Test
1246		public volatile boolean done = false;
1247		public Object call() {
1248		try {
1249	<	Thread.sleep(SMALL_DELAY_MS);
1249	>	delay(SMALL_DELAY_MS);
1250		done = true;
1251		} catch (InterruptedException ok) {}
1252		return Boolean.TRUE;
#	Line 981 | Line 1259 | public class JSR166TestCase extends Test
1259		public abstract class CheckedRecursiveAction extends RecursiveAction {
1260		protected abstract void realCompute() throws Throwable;
1261
1262	<	public final void compute() {
1262	>	@Override protected final void compute() {
1263		try {
1264		realCompute();
1265		} catch (Throwable t) {
#	Line 996 | Line 1274 | public class JSR166TestCase extends Test
1274		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1275		protected abstract T realCompute() throws Throwable;
1276
1277	<	public final T compute() {
1277	>	@Override protected final T compute() {
1278		try {
1279		return realCompute();
1280		} catch (Throwable t) {
#	Line 1015 | Line 1293 | public class JSR166TestCase extends Test
1293		}
1294
1295		/**
1296	<	* A CyclicBarrier that fails with AssertionFailedErrors instead
1297	<	* of throwing checked exceptions.
1296	>	* A CyclicBarrier that uses timed await and fails with
1297	>	* AssertionFailedErrors instead of throwing checked exceptions.
1298		*/
1299		public class CheckedBarrier extends CyclicBarrier {
1300		public CheckedBarrier(int parties) { super(parties); }
1301
1302		public int await() {
1303		try {
1304	<	return super.await();
1304	>	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1305	>	} catch (TimeoutException e) {
1306	>	throw new AssertionFailedError("timed out");
1307		} catch (Exception e) {
1308		AssertionFailedError afe =
1309		new AssertionFailedError("Unexpected exception: " + e);
#	Line 1033 | Line 1313 | public class JSR166TestCase extends Test
1313		}
1314		}
1315
1316	<	public void checkEmpty(BlockingQueue q) {
1316	>	void checkEmpty(BlockingQueue q) {
1317		try {
1318		assertTrue(q.isEmpty());
1319		assertEquals(0, q.size());
#	Line 1060 | Line 1340 | public class JSR166TestCase extends Test
1340		}
1341		}
1342
1343	+	void assertSerialEquals(Object x, Object y) {
1344	+	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1345	+	}
1346	+
1347	+	void assertNotSerialEquals(Object x, Object y) {
1348	+	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1349	+	}
1350	+
1351	+	byte[] serialBytes(Object o) {
1352	+	try {
1353	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1354	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1355	+	oos.writeObject(o);
1356	+	oos.flush();
1357	+	oos.close();
1358	+	return bos.toByteArray();
1359	+	} catch (Throwable t) {
1360	+	threadUnexpectedException(t);
1361	+	return new byte[0];
1362	+	}
1363	+	}
1364	+
1365	+	@SuppressWarnings("unchecked")
1366	+	<T> T serialClone(T o) {
1367	+	try {
1368	+	ObjectInputStream ois = new ObjectInputStream
1369	+	(new ByteArrayInputStream(serialBytes(o)));
1370	+	T clone = (T) ois.readObject();
1371	+	assertSame(o.getClass(), clone.getClass());
1372	+	return clone;
1373	+	} catch (Throwable t) {
1374	+	threadUnexpectedException(t);
1375	+	return null;
1376	+	}
1377	+	}
1378	+
1379	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1380	+	Runnable... throwingActions) {
1381	+	for (Runnable throwingAction : throwingActions) {
1382	+	boolean threw = false;
1383	+	try { throwingAction.run(); }
1384	+	catch (Throwable t) {
1385	+	threw = true;
1386	+	if (!expectedExceptionClass.isInstance(t)) {
1387	+	AssertionFailedError afe =
1388	+	new AssertionFailedError
1389	+	("Expected " + expectedExceptionClass.getName() +
1390	+	", got " + t.getClass().getName());
1391	+	afe.initCause(t);
1392	+	threadUnexpectedException(afe);
1393	+	}
1394	+	}
1395	+	if (!threw)
1396	+	shouldThrow(expectedExceptionClass.getName());
1397	+	}
1398	+	}
1399		}

Diff Legend

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