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.69 by dl, Fri Nov 19 00:20:12 2010 UTC vs.
Revision 1.111 by dl, Sun Jul 21 22:24:18 2013 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
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;
#	Line 61 | Line 75 | import java.security.SecurityPermission;
75		*
76		* </ol>
77		*
78	<	* <p> <b>Other notes</b>
78	>	* <p><b>Other notes</b>
79		* <ul>
80		*
81		* <li> Usually, there is one testcase method per JSR166 method
#	Line 114 | Line 128 | public class JSR166TestCase extends Test
128		private static final long profileThreshold =
129		Long.getLong("jsr166.profileThreshold", 100);
130
131	+	/**
132	+	* The number of repetitions per test (for tickling rare bugs).
133	+	*/
134	+	private static final int runsPerTest =
135	+	Integer.getInteger("jsr166.runsPerTest", 1);
136	+
137		protected void runTest() throws Throwable {
138	<	if (profileTests)
139	<	runTestProfiled();
140	<	else
141	<	super.runTest();
138	>	for (int i = 0; i < runsPerTest; i++) {
139	>	if (profileTests)
140	>	runTestProfiled();
141	>	else
142	>	super.runTest();
143	>	}
144		}
145
146		protected void runTestProfiled() throws Throwable {
#	Line 134 | Line 156 | public class JSR166TestCase extends Test
156		}
157
158		/**
159	<	* Runs all JSR166 unit tests using junit.textui.TestRunner
159	>	* Runs all JSR166 unit tests using junit.textui.TestRunner.
160	>	* Optional command line arg provides the number of iterations to
161	>	* repeat running the tests.
162		*/
163		public static void main(String[] args) {
164		if (useSecurityManager) {
#	Line 166 | Line 190 | public class JSR166TestCase extends Test
190		return suite;
191		}
192
193	+	public static void addNamedTestClasses(TestSuite suite,
194	+	String... testClassNames) {
195	+	for (String testClassName : testClassNames) {
196	+	try {
197	+	Class<?> testClass = Class.forName(testClassName);
198	+	Method m = testClass.getDeclaredMethod("suite",
199	+	new Class<?>[0]);
200	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
201	+	} catch (Exception e) {
202	+	throw new Error("Missing test class", e);
203	+	}
204	+	}
205	+	}
206	+
207	+	public static final double JAVA_CLASS_VERSION;
208	+	static {
209	+	try {
210	+	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
211	+	new java.security.PrivilegedAction<Double>() {
212	+	public Double run() {
213	+	return Double.valueOf(System.getProperty("java.class.version"));}});
214	+	} catch (Throwable t) {
215	+	throw new Error(t);
216	+	}
217	+	}
218	+
219	+	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
220	+	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
221	+	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
222	+
223		/**
224		* Collects all JSR166 unit tests as one suite.
225		*/
226		public static Test suite() {
227	<	return newTestSuite(
227	>	// Java7+ test classes
228	>	TestSuite suite = newTestSuite(
229		ForkJoinPoolTest.suite(),
230		ForkJoinTaskTest.suite(),
231		RecursiveActionTest.suite(),
#	Line 235 | Line 290 | public class JSR166TestCase extends Test
290		TreeSetTest.suite(),
291		TreeSubMapTest.suite(),
292		TreeSubSetTest.suite());
293	+
294	+	// Java8+ test classes
295	+	if (atLeastJava8()) {
296	+	String[] java8TestClassNames = {
297	+	"CompletableFutureTest",
298	+	"ConcurrentHashMap8Test",
299	+	"CountedCompleterTest",
300	+	"DoubleAccumulatorTest",
301	+	"DoubleAdderTest",
302	+	"ForkJoinPool8Test",
303	+	"ForkJoinTask8Test",
304	+	"LongAccumulatorTest",
305	+	"LongAdderTest",
306	+	"SplittableRandomTest",
307	+	"StampedLockTest",
308	+	};
309	+	addNamedTestClasses(suite, java8TestClassNames);
310	+	}
311	+
312	+	return suite;
313		}
314
315	+	// Delays for timing-dependent tests, in milliseconds.
316
317		public static long SHORT_DELAY_MS;
318		public static long SMALL_DELAY_MS;
319		public static long MEDIUM_DELAY_MS;
320		public static long LONG_DELAY_MS;
321
246	–
322		/**
323		* Returns the shortest timed delay. This could
324		* be reimplemented to use for example a Property.
#	Line 252 | Line 327 | public class JSR166TestCase extends Test
327		return 50;
328		}
329
255	–
330		/**
331		* Sets delays as multiples of SHORT_DELAY.
332		*/
#	Line 260 | Line 334 | public class JSR166TestCase extends Test
334		SHORT_DELAY_MS = getShortDelay();
335		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
336		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
337	<	LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
337	>	LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
338	>	}
339	>
340	>	/**
341	>	* Returns a timeout in milliseconds to be used in tests that
342	>	* verify that operations block or time out.
343	>	*/
344	>	long timeoutMillis() {
345	>	return SHORT_DELAY_MS / 4;
346	>	}
347	>
348	>	/**
349	>	* Returns a new Date instance representing a time delayMillis
350	>	* milliseconds in the future.
351	>	*/
352	>	Date delayedDate(long delayMillis) {
353	>	return new Date(System.currentTimeMillis() + delayMillis);
354		}
355
356		/**
#	Line 284 | Line 374 | public class JSR166TestCase extends Test
374		}
375
376		/**
377	+	* Extra checks that get done for all test cases.
378	+	*
379		* Triggers test case failure if any thread assertions have failed,
380		* by rethrowing, in the test harness thread, any exception recorded
381		* earlier by threadRecordFailure.
382	+	*
383	+	* Triggers test case failure if interrupt status is set in the main thread.
384		*/
385		public void tearDown() throws Exception {
386	<	Throwable t = threadFailure.getAndSet(null);
386	>	Throwable t = threadFailure.getAndSet(null);
387		if (t != null) {
388		if (t instanceof Error)
389		throw (Error) t;
#	Line 304 | Line 398 | public class JSR166TestCase extends Test
398		throw afe;
399		}
400		}
401	+
402	+	if (Thread.interrupted())
403	+	throw new AssertionFailedError("interrupt status set in main thread");
404	+
405	+	checkForkJoinPoolThreadLeaks();
406	+	}
407	+
408	+	/**
409	+	* Find missing try { ... } finally { joinPool(e); }
410	+	*/
411	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
412	+	Thread[] survivors = new Thread[5];
413	+	int count = Thread.enumerate(survivors);
414	+	for (int i = 0; i < count; i++) {
415	+	Thread thread = survivors[i];
416	+	String name = thread.getName();
417	+	if (name.startsWith("ForkJoinPool-")) {
418	+	// give thread some time to terminate
419	+	thread.join(LONG_DELAY_MS);
420	+	if (!thread.isAlive()) continue;
421	+	thread.stop();
422	+	throw new AssertionFailedError
423	+	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
424	+	toString(), name));
425	+	}
426	+	}
427		}
428
429		/**
#	Line 435 | Line 555 | public class JSR166TestCase extends Test
555		else {
556		AssertionFailedError afe =
557		new AssertionFailedError("unexpected exception: " + t);
558	<	t.initCause(t);
558	>	afe.initCause(t);
559		throw afe;
560		}
561		}
562
563		/**
564	+	* Delays, via Thread.sleep, for the given millisecond delay, but
565	+	* if the sleep is shorter than specified, may re-sleep or yield
566	+	* until time elapses.
567	+	*/
568	+	static void delay(long millis) throws InterruptedException {
569	+	long startTime = System.nanoTime();
570	+	long ns = millis * 1000 * 1000;
571	+	for (;;) {
572	+	if (millis > 0L)
573	+	Thread.sleep(millis);
574	+	else // too short to sleep
575	+	Thread.yield();
576	+	long d = ns - (System.nanoTime() - startTime);
577	+	if (d > 0L)
578	+	millis = d / (1000 * 1000);
579	+	else
580	+	break;
581	+	}
582	+	}
583	+
584	+	/**
585		* Waits out termination of a thread pool or fails doing so.
586		*/
587	<	public void joinPool(ExecutorService exec) {
587	>	void joinPool(ExecutorService exec) {
588		try {
589		exec.shutdown();
590		assertTrue("ExecutorService did not terminate in a timely manner",
591	<	exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
591	>	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
592		} catch (SecurityException ok) {
593		// Allowed in case test doesn't have privs
594		} catch (InterruptedException ie) {
#	Line 455 | Line 596 | public class JSR166TestCase extends Test
596		}
597		}
598
599	+	/**
600	+	* A debugging tool to print all stack traces, as jstack does.
601	+	*/
602	+	static void printAllStackTraces() {
603	+	for (ThreadInfo info :
604	+	ManagementFactory.getThreadMXBean()
605	+	.dumpAllThreads(true, true))
606	+	System.err.print(info);
607	+	}
608	+
609	+	/**
610	+	* Checks that thread does not terminate within the default
611	+	* millisecond delay of {@code timeoutMillis()}.
612	+	*/
613	+	void assertThreadStaysAlive(Thread thread) {
614	+	assertThreadStaysAlive(thread, timeoutMillis());
615	+	}
616	+
617	+	/**
618	+	* Checks that thread does not terminate within the given millisecond delay.
619	+	*/
620	+	void assertThreadStaysAlive(Thread thread, long millis) {
621	+	try {
622	+	// No need to optimize the failing case via Thread.join.
623	+	delay(millis);
624	+	assertTrue(thread.isAlive());
625	+	} catch (InterruptedException ie) {
626	+	fail("Unexpected InterruptedException");
627	+	}
628	+	}
629	+
630	+	/**
631	+	* Checks that the threads do not terminate within the default
632	+	* millisecond delay of {@code timeoutMillis()}.
633	+	*/
634	+	void assertThreadsStayAlive(Thread... threads) {
635	+	assertThreadsStayAlive(timeoutMillis(), threads);
636	+	}
637	+
638	+	/**
639	+	* Checks that the threads do not terminate within the given millisecond delay.
640	+	*/
641	+	void assertThreadsStayAlive(long millis, Thread... threads) {
642	+	try {
643	+	// No need to optimize the failing case via Thread.join.
644	+	delay(millis);
645	+	for (Thread thread : threads)
646	+	assertTrue(thread.isAlive());
647	+	} catch (InterruptedException ie) {
648	+	fail("Unexpected InterruptedException");
649	+	}
650	+	}
651	+
652	+	/**
653	+	* Checks that future.get times out, with the default timeout of
654	+	* {@code timeoutMillis()}.
655	+	*/
656	+	void assertFutureTimesOut(Future future) {
657	+	assertFutureTimesOut(future, timeoutMillis());
658	+	}
659	+
660	+	/**
661	+	* Checks that future.get times out, with the given millisecond timeout.
662	+	*/
663	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
664	+	long startTime = System.nanoTime();
665	+	try {
666	+	future.get(timeoutMillis, MILLISECONDS);
667	+	shouldThrow();
668	+	} catch (TimeoutException success) {
669	+	} catch (Exception e) {
670	+	threadUnexpectedException(e);
671	+	} finally { future.cancel(true); }
672	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
673	+	}
674
675		/**
676		* Fails with message "should throw exception".
#	Line 495 | Line 711 | public class JSR166TestCase extends Test
711		public static final Integer m6  = new Integer(-6);
712		public static final Integer m10 = new Integer(-10);
713
498	–
714		/**
715		* Runs Runnable r with a security policy that permits precisely
716		* the specified permissions.  If there is no current security
#	Line 507 | Line 722 | public class JSR166TestCase extends Test
722		SecurityManager sm = System.getSecurityManager();
723		if (sm == null) {
724		r.run();
725	+	}
726	+	runWithSecurityManagerWithPermissions(r, permissions);
727	+	}
728	+
729	+	/**
730	+	* Runs Runnable r with a security policy that permits precisely
731	+	* the specified permissions.  If there is no current security
732	+	* manager, a temporary one is set for the duration of the
733	+	* Runnable.  We require that any security manager permit
734	+	* getPolicy/setPolicy.
735	+	*/
736	+	public void runWithSecurityManagerWithPermissions(Runnable r,
737	+	Permission... permissions) {
738	+	SecurityManager sm = System.getSecurityManager();
739	+	if (sm == null) {
740		Policy savedPolicy = Policy.getPolicy();
741		try {
742		Policy.setPolicy(permissivePolicy());
743		System.setSecurityManager(new SecurityManager());
744	<	runWithPermissions(r, permissions);
744	>	runWithSecurityManagerWithPermissions(r, permissions);
745		} finally {
746		System.setSecurityManager(null);
747		Policy.setPolicy(savedPolicy);
#	Line 559 | Line 789 | public class JSR166TestCase extends Test
789		return perms.implies(p);
790		}
791		public void refresh() {}
792	+	public String toString() {
793	+	List<Permission> ps = new ArrayList<Permission>();
794	+	for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
795	+	ps.add(e.nextElement());
796	+	return "AdjustablePolicy with permissions " + ps;
797	+	}
798		}
799
800		/**
#	Line 586 | Line 822 | public class JSR166TestCase extends Test
822		*/
823		void sleep(long millis) {
824		try {
825	<	Thread.sleep(millis);
825	>	delay(millis);
826		} catch (InterruptedException ie) {
827		AssertionFailedError afe =
828		new AssertionFailedError("Unexpected InterruptedException");
#	Line 596 | Line 832 | public class JSR166TestCase extends Test
832		}
833
834		/**
835	<	* Sleeps until the timeout has elapsed, or interrupted.
600	<	* Does <em>NOT</em> throw InterruptedException.
601	<	*/
602	<	void sleepTillInterrupted(long timeoutMillis) {
603	<	try {
604	<	Thread.sleep(timeoutMillis);
605	<	} catch (InterruptedException wakeup) {}
606	<	}
607	<
608	<	/**
609	<	* Waits up to the specified number of milliseconds for the given
835	>	* Spin-waits up to the specified number of milliseconds for the given
836		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
837		*/
838		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
839	<	long timeoutNanos = timeoutMillis * 1000L * 1000L;
614	<	long t0 = System.nanoTime();
839	>	long startTime = System.nanoTime();
840		for (;;) {
841		Thread.State s = thread.getState();
842		if (s == Thread.State.BLOCKED ||
#	Line 620 | Line 845 | public class JSR166TestCase extends Test
845		return;
846		else if (s == Thread.State.TERMINATED)
847		fail("Unexpected thread termination");
848	<	else if (System.nanoTime() - t0 > timeoutNanos) {
848	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
849		threadAssertTrue(thread.isAlive());
850		return;
851		}
#	Line 629 | Line 854 | public class JSR166TestCase extends Test
854		}
855
856		/**
857	+	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
858	+	* state: BLOCKED, WAITING, or TIMED_WAITING.
859	+	*/
860	+	void waitForThreadToEnterWaitState(Thread thread) {
861	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
862	+	}
863	+
864	+	/**
865		* Returns the number of milliseconds since time given by
866		* startNanoTime, which must have been previously returned from a
867		* call to {@link System.nanoTime()}.
#	Line 658 | Line 891 | public class JSR166TestCase extends Test
891		} catch (InterruptedException ie) {
892		threadUnexpectedException(ie);
893		} finally {
894	<	if (t.isAlive()) {
894	>	if (t.getState() != Thread.State.TERMINATED) {
895		t.interrupt();
896		fail("Test timed out");
897		}
898		}
899		}
900
901	+	/**
902	+	* Waits for LONG_DELAY_MS milliseconds for the thread to
903	+	* terminate (using {@link Thread#join(long)}), else interrupts
904	+	* the thread (in the hope that it may terminate later) and fails.
905	+	*/
906	+	void awaitTermination(Thread t) {
907	+	awaitTermination(t, LONG_DELAY_MS);
908	+	}
909	+
910		// Some convenient Runnable classes
911
912		public abstract class CheckedRunnable implements Runnable {
#	Line 727 | Line 969 | public class JSR166TestCase extends Test
969		realRun();
970		threadShouldThrow("InterruptedException");
971		} catch (InterruptedException success) {
972	+	threadAssertFalse(Thread.interrupted());
973		} catch (Throwable t) {
974		threadUnexpectedException(t);
975		}
#	Line 756 | Line 999 | public class JSR166TestCase extends Test
999		threadShouldThrow("InterruptedException");
1000		return result;
1001		} catch (InterruptedException success) {
1002	+	threadAssertFalse(Thread.interrupted());
1003		} catch (Throwable t) {
1004		threadUnexpectedException(t);
1005		}
#	Line 787 | Line 1031 | public class JSR166TestCase extends Test
1031		}};
1032		}
1033
1034	+	public Runnable awaiter(final CountDownLatch latch) {
1035	+	return new CheckedRunnable() {
1036	+	public void realRun() throws InterruptedException {
1037	+	await(latch);
1038	+	}};
1039	+	}
1040	+
1041	+	public void await(CountDownLatch latch) {
1042	+	try {
1043	+	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1044	+	} catch (Throwable t) {
1045	+	threadUnexpectedException(t);
1046	+	}
1047	+	}
1048	+
1049	+	public void await(Semaphore semaphore) {
1050	+	try {
1051	+	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1052	+	} catch (Throwable t) {
1053	+	threadUnexpectedException(t);
1054	+	}
1055	+	}
1056	+
1057	+	//     /**
1058	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1059	+	//      */
1060	+	//     public void await(AtomicBoolean flag) {
1061	+	//         await(flag, LONG_DELAY_MS);
1062	+	//     }
1063	+
1064	+	//     /**
1065	+	//      * Spin-waits up to the specified timeout until flag becomes true.
1066	+	//      */
1067	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
1068	+	//         long startTime = System.nanoTime();
1069	+	//         while (!flag.get()) {
1070	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
1071	+	//                 throw new AssertionFailedError("timed out");
1072	+	//             Thread.yield();
1073	+	//         }
1074	+	//     }
1075	+
1076		public static class NPETask implements Callable<String> {
1077		public String call() { throw new NullPointerException(); }
1078		}
#	Line 797 | Line 1083 | public class JSR166TestCase extends Test
1083
1084		public class ShortRunnable extends CheckedRunnable {
1085		protected void realRun() throws Throwable {
1086	<	Thread.sleep(SHORT_DELAY_MS);
1086	>	delay(SHORT_DELAY_MS);
1087		}
1088		}
1089
1090		public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1091		protected void realRun() throws InterruptedException {
1092	<	Thread.sleep(SHORT_DELAY_MS);
1092	>	delay(SHORT_DELAY_MS);
1093		}
1094		}
1095
1096		public class SmallRunnable extends CheckedRunnable {
1097		protected void realRun() throws Throwable {
1098	<	Thread.sleep(SMALL_DELAY_MS);
1098	>	delay(SMALL_DELAY_MS);
1099		}
1100		}
1101
1102		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1103		protected void realRun() {
1104		try {
1105	<	Thread.sleep(SMALL_DELAY_MS);
1105	>	delay(SMALL_DELAY_MS);
1106		} catch (InterruptedException ok) {}
1107		}
1108		}
1109
1110		public class SmallCallable extends CheckedCallable {
1111		protected Object realCall() throws InterruptedException {
1112	<	Thread.sleep(SMALL_DELAY_MS);
1112	>	delay(SMALL_DELAY_MS);
1113		return Boolean.TRUE;
1114		}
1115		}
1116
1117		public class MediumRunnable extends CheckedRunnable {
1118		protected void realRun() throws Throwable {
1119	<	Thread.sleep(MEDIUM_DELAY_MS);
1119	>	delay(MEDIUM_DELAY_MS);
1120		}
1121		}
1122
1123		public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1124		protected void realRun() throws InterruptedException {
1125	<	Thread.sleep(MEDIUM_DELAY_MS);
1125	>	delay(MEDIUM_DELAY_MS);
1126		}
1127		}
1128
#	Line 844 | Line 1130 | public class JSR166TestCase extends Test
1130		return new CheckedRunnable() {
1131		protected void realRun() {
1132		try {
1133	<	Thread.sleep(timeoutMillis);
1133	>	delay(timeoutMillis);
1134		} catch (InterruptedException ok) {}
1135		}};
1136		}
#	Line 852 | Line 1138 | public class JSR166TestCase extends Test
1138		public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1139		protected void realRun() {
1140		try {
1141	<	Thread.sleep(MEDIUM_DELAY_MS);
1141	>	delay(MEDIUM_DELAY_MS);
1142		} catch (InterruptedException ok) {}
1143		}
1144		}
#	Line 860 | Line 1146 | public class JSR166TestCase extends Test
1146		public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1147		protected void realRun() {
1148		try {
1149	<	Thread.sleep(LONG_DELAY_MS);
1149	>	delay(LONG_DELAY_MS);
1150		} catch (InterruptedException ok) {}
1151		}
1152		}
#	Line 884 | Line 1170 | public class JSR166TestCase extends Test
1170		public boolean isDone() { return done; }
1171		public void run() {
1172		try {
1173	<	Thread.sleep(timeoutMillis);
1173	>	delay(timeoutMillis);
1174		done = true;
1175		} catch (InterruptedException ok) {}
1176		}
#	Line 895 | Line 1181 | public class JSR166TestCase extends Test
1181		public volatile boolean done = false;
1182		public void run() {
1183		try {
1184	<	Thread.sleep(SHORT_DELAY_MS);
1184	>	delay(SHORT_DELAY_MS);
1185		done = true;
1186		} catch (InterruptedException ok) {}
1187		}
#	Line 905 | Line 1191 | public class JSR166TestCase extends Test
1191		public volatile boolean done = false;
1192		public void run() {
1193		try {
1194	<	Thread.sleep(SMALL_DELAY_MS);
1194	>	delay(SMALL_DELAY_MS);
1195		done = true;
1196		} catch (InterruptedException ok) {}
1197		}
#	Line 915 | Line 1201 | public class JSR166TestCase extends Test
1201		public volatile boolean done = false;
1202		public void run() {
1203		try {
1204	<	Thread.sleep(MEDIUM_DELAY_MS);
1204	>	delay(MEDIUM_DELAY_MS);
1205		done = true;
1206		} catch (InterruptedException ok) {}
1207		}
#	Line 925 | Line 1211 | public class JSR166TestCase extends Test
1211		public volatile boolean done = false;
1212		public void run() {
1213		try {
1214	<	Thread.sleep(LONG_DELAY_MS);
1214	>	delay(LONG_DELAY_MS);
1215		done = true;
1216		} catch (InterruptedException ok) {}
1217		}
#	Line 942 | Line 1228 | public class JSR166TestCase extends Test
1228		public volatile boolean done = false;
1229		public Object call() {
1230		try {
1231	<	Thread.sleep(SMALL_DELAY_MS);
1231	>	delay(SMALL_DELAY_MS);
1232		done = true;
1233		} catch (InterruptedException ok) {}
1234		return Boolean.TRUE;
#	Line 955 | Line 1241 | public class JSR166TestCase extends Test
1241		public abstract class CheckedRecursiveAction extends RecursiveAction {
1242		protected abstract void realCompute() throws Throwable;
1243
1244	<	public final void compute() {
1244	>	@Override protected final void compute() {
1245		try {
1246		realCompute();
1247		} catch (Throwable t) {
#	Line 970 | Line 1256 | public class JSR166TestCase extends Test
1256		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1257		protected abstract T realCompute() throws Throwable;
1258
1259	<	public final T compute() {
1259	>	@Override protected final T compute() {
1260		try {
1261		return realCompute();
1262		} catch (Throwable t) {
#	Line 989 | Line 1275 | public class JSR166TestCase extends Test
1275		}
1276
1277		/**
1278	<	* A CyclicBarrier that fails with AssertionFailedErrors instead
1279	<	* of throwing checked exceptions.
1278	>	* A CyclicBarrier that uses timed await and fails with
1279	>	* AssertionFailedErrors instead of throwing checked exceptions.
1280		*/
1281		public class CheckedBarrier extends CyclicBarrier {
1282		public CheckedBarrier(int parties) { super(parties); }
1283
1284		public int await() {
1285		try {
1286	<	return super.await();
1286	>	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1287	>	} catch (TimeoutException e) {
1288	>	throw new AssertionFailedError("timed out");
1289		} catch (Exception e) {
1290		AssertionFailedError afe =
1291		new AssertionFailedError("Unexpected exception: " + e);
#	Line 1007 | Line 1295 | public class JSR166TestCase extends Test
1295		}
1296		}
1297
1298	+	void checkEmpty(BlockingQueue q) {
1299	+	try {
1300	+	assertTrue(q.isEmpty());
1301	+	assertEquals(0, q.size());
1302	+	assertNull(q.peek());
1303	+	assertNull(q.poll());
1304	+	assertNull(q.poll(0, MILLISECONDS));
1305	+	assertEquals(q.toString(), "[]");
1306	+	assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1307	+	assertFalse(q.iterator().hasNext());
1308	+	try {
1309	+	q.element();
1310	+	shouldThrow();
1311	+	} catch (NoSuchElementException success) {}
1312	+	try {
1313	+	q.iterator().next();
1314	+	shouldThrow();
1315	+	} catch (NoSuchElementException success) {}
1316	+	try {
1317	+	q.remove();
1318	+	shouldThrow();
1319	+	} catch (NoSuchElementException success) {}
1320	+	} catch (InterruptedException ie) {
1321	+	threadUnexpectedException(ie);
1322	+	}
1323	+	}
1324	+
1325	+	void assertSerialEquals(Object x, Object y) {
1326	+	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1327	+	}
1328	+
1329	+	void assertNotSerialEquals(Object x, Object y) {
1330	+	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1331	+	}
1332	+
1333	+	byte[] serialBytes(Object o) {
1334	+	try {
1335	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1336	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1337	+	oos.writeObject(o);
1338	+	oos.flush();
1339	+	oos.close();
1340	+	return bos.toByteArray();
1341	+	} catch (Throwable t) {
1342	+	threadUnexpectedException(t);
1343	+	return new byte[0];
1344	+	}
1345	+	}
1346	+
1347	+	@SuppressWarnings("unchecked")
1348	+	<T> T serialClone(T o) {
1349	+	try {
1350	+	ObjectInputStream ois = new ObjectInputStream
1351	+	(new ByteArrayInputStream(serialBytes(o)));
1352	+	T clone = (T) ois.readObject();
1353	+	assertSame(o.getClass(), clone.getClass());
1354	+	return clone;
1355	+	} catch (Throwable t) {
1356	+	threadUnexpectedException(t);
1357	+	return null;
1358	+	}
1359	+	}
1360	+
1361	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1362	+	Runnable... throwingActions) {
1363	+	for (Runnable throwingAction : throwingActions) {
1364	+	boolean threw = false;
1365	+	try { throwingAction.run(); }
1366	+	catch (Throwable t) {
1367	+	threw = true;
1368	+	if (!expectedExceptionClass.isInstance(t)) {
1369	+	AssertionFailedError afe =
1370	+	new AssertionFailedError
1371	+	("Expected " + expectedExceptionClass.getName() +
1372	+	", got " + t.getClass().getName());
1373	+	afe.initCause(t);
1374	+	threadUnexpectedException(afe);
1375	+	}
1376	+	}
1377	+	if (!threw)
1378	+	shouldThrow(expectedExceptionClass.getName());
1379	+	}
1380	+	}
1381		}

Diff Legend

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