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.79 by jsr166, Mon May 9 20:00:19 2011 UTC vs.
Revision 1.130 by jsr166, Tue Apr 21 05:00:23 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>	import static java.util.concurrent.TimeUnit.NANOSECONDS;
11	>
12		import java.io.ByteArrayInputStream;
13		import java.io.ByteArrayOutputStream;
14		import java.io.ObjectInputStream;
15		import java.io.ObjectOutputStream;
16	<	import java.util.Arrays;
17	<	import java.util.NoSuchElementException;
18	<	import java.util.PropertyPermission;
17	<	import java.util.concurrent.*;
18	<	import java.util.concurrent.atomic.AtomicReference;
19	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
20	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
16	>	import java.lang.management.ManagementFactory;
17	>	import java.lang.management.ThreadInfo;
18	>	import java.lang.reflect.Method;
19		import java.security.CodeSource;
20		import java.security.Permission;
21		import java.security.PermissionCollection;
#	Line 25 | Line 23 | import java.security.Permissions;
23		import java.security.Policy;
24		import java.security.ProtectionDomain;
25		import java.security.SecurityPermission;
26	+	import java.util.ArrayList;
27	+	import java.util.Arrays;
28	+	import java.util.Date;
29	+	import java.util.Enumeration;
30	+	import java.util.Iterator;
31	+	import java.util.List;
32	+	import java.util.NoSuchElementException;
33	+	import java.util.PropertyPermission;
34	+	import java.util.concurrent.BlockingQueue;
35	+	import java.util.concurrent.Callable;
36	+	import java.util.concurrent.CountDownLatch;
37	+	import java.util.concurrent.CyclicBarrier;
38	+	import java.util.concurrent.ExecutorService;
39	+	import java.util.concurrent.Future;
40	+	import java.util.concurrent.RecursiveAction;
41	+	import java.util.concurrent.RecursiveTask;
42	+	import java.util.concurrent.RejectedExecutionHandler;
43	+	import java.util.concurrent.Semaphore;
44	+	import java.util.concurrent.ThreadFactory;
45	+	import java.util.concurrent.ThreadPoolExecutor;
46	+	import java.util.concurrent.TimeoutException;
47	+	import java.util.concurrent.atomic.AtomicReference;
48	+	import java.util.regex.Pattern;
49	+
50	+	import junit.framework.AssertionFailedError;
51	+	import junit.framework.Test;
52	+	import junit.framework.TestCase;
53	+	import junit.framework.TestSuite;
54
55		/**
56		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 67 | Line 93 | import java.security.SecurityPermission;
93		*
94		* </ol>
95		*
96	<	* <p> <b>Other notes</b>
96	>	* <p><b>Other notes</b>
97		* <ul>
98		*
99		* <li> Usually, there is one testcase method per JSR166 method
#	Line 107 | Line 133 | public class JSR166TestCase extends Test
133		Boolean.getBoolean("jsr166.expensiveTests");
134
135		/**
136	+	* If true, also run tests that are not part of the official tck
137	+	* because they test unspecified implementation details.
138	+	*/
139	+	protected static final boolean testImplementationDetails =
140	+	Boolean.getBoolean("jsr166.testImplementationDetails");
141	+
142	+	/**
143		* If true, report on stdout all "slow" tests, that is, ones that
144		* take more than profileThreshold milliseconds to execute.
145		*/
#	Line 120 | Line 153 | public class JSR166TestCase extends Test
153		private static final long profileThreshold =
154		Long.getLong("jsr166.profileThreshold", 100);
155
156	+	/**
157	+	* The number of repetitions per test (for tickling rare bugs).
158	+	*/
159	+	private static final int runsPerTest =
160	+	Integer.getInteger("jsr166.runsPerTest", 1);
161	+
162	+	/**
163	+	* A filter for tests to run, matching strings of the form
164	+	* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
165	+	* Usefully combined with jsr166.runsPerTest.
166	+	*/
167	+	private static final Pattern methodFilter = methodFilter();
168	+
169	+	private static Pattern methodFilter() {
170	+	String regex = System.getProperty("jsr166.methodFilter");
171	+	return (regex == null) ? null : Pattern.compile(regex);
172	+	}
173	+
174		protected void runTest() throws Throwable {
175	<	if (profileTests)
176	<	runTestProfiled();
177	<	else
178	<	super.runTest();
175	>	if (methodFilter == null
176	>	|| methodFilter.matcher(toString()).find()) {
177	>	for (int i = 0; i < runsPerTest; i++) {
178	>	if (profileTests)
179	>	runTestProfiled();
180	>	else
181	>	super.runTest();
182	>	}
183	>	}
184		}
185
186		protected void runTestProfiled() throws Throwable {
187	+	// Warmup run, notably to trigger all needed classloading.
188	+	super.runTest();
189		long t0 = System.nanoTime();
190		try {
191		super.runTest();
192		} finally {
193	<	long elapsedMillis =
136	<	(System.nanoTime() - t0) / (1000L * 1000L);
193	>	long elapsedMillis = millisElapsedSince(t0);
194		if (elapsedMillis >= profileThreshold)
195		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
196		}
197		}
198
199		/**
200	<	* Runs all JSR166 unit tests using junit.textui.TestRunner
200	>	* 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.
203		*/
204		public static void main(String[] args) {
205		if (useSecurityManager) {
#	Line 172 | Line 231 | public class JSR166TestCase extends Test
231		return suite;
232		}
233
234	+	public static void addNamedTestClasses(TestSuite suite,
235	+	String... testClassNames) {
236	+	for (String testClassName : testClassNames) {
237	+	try {
238	+	Class<?> testClass = Class.forName(testClassName);
239	+	Method m = testClass.getDeclaredMethod("suite",
240	+	new Class<?>[0]);
241	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
242	+	} catch (Exception e) {
243	+	throw new Error("Missing test class", e);
244	+	}
245	+	}
246	+	}
247	+
248	+	public static final double JAVA_CLASS_VERSION;
249	+	public static final String JAVA_SPECIFICATION_VERSION;
250	+	static {
251	+	try {
252	+	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
253	+	new java.security.PrivilegedAction<Double>() {
254	+	public Double run() {
255	+	return Double.valueOf(System.getProperty("java.class.version"));}});
256	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
257	+	new java.security.PrivilegedAction<String>() {
258	+	public String run() {
259	+	return System.getProperty("java.specification.version");}});
260	+	} catch (Throwable t) {
261	+	throw new Error(t);
262	+	}
263	+	}
264	+
265	+	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
266	+	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
267	+	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
268	+	public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; }
269	+
270		/**
271		* Collects all JSR166 unit tests as one suite.
272		*/
273		public static Test suite() {
274	<	return newTestSuite(
274	>	// Java7+ test classes
275	>	TestSuite suite = newTestSuite(
276		ForkJoinPoolTest.suite(),
277		ForkJoinTaskTest.suite(),
278		RecursiveActionTest.suite(),
#	Line 241 | Line 337 | public class JSR166TestCase extends Test
337		TreeSetTest.suite(),
338		TreeSubMapTest.suite(),
339		TreeSubSetTest.suite());
340	+
341	+	// Java8+ test classes
342	+	if (atLeastJava8()) {
343	+	String[] java8TestClassNames = {
344	+	"Atomic8Test",
345	+	"CompletableFutureTest",
346	+	"ConcurrentHashMap8Test",
347	+	"CountedCompleterTest",
348	+	"DoubleAccumulatorTest",
349	+	"DoubleAdderTest",
350	+	"ForkJoinPool8Test",
351	+	"ForkJoinTask8Test",
352	+	"LongAccumulatorTest",
353	+	"LongAdderTest",
354	+	"SplittableRandomTest",
355	+	"StampedLockTest",
356	+	"ThreadLocalRandom8Test",
357	+	};
358	+	addNamedTestClasses(suite, java8TestClassNames);
359	+	}
360	+
361	+	// Java9+ test classes
362	+	if (atLeastJava9()) {
363	+	String[] java9TestClassNames = {
364	+	"ThreadPoolExecutor9Test",
365	+	};
366	+	addNamedTestClasses(suite, java9TestClassNames);
367	+	}
368	+
369	+	return suite;
370		}
371
372	+	// Delays for timing-dependent tests, in milliseconds.
373
374		public static long SHORT_DELAY_MS;
375		public static long SMALL_DELAY_MS;
376		public static long MEDIUM_DELAY_MS;
377		public static long LONG_DELAY_MS;
378
252	–
379		/**
380		* Returns the shortest timed delay. This could
381		* be reimplemented to use for example a Property.
#	Line 258 | Line 384 | public class JSR166TestCase extends Test
384		return 50;
385		}
386
261	–
387		/**
388		* Sets delays as multiples of SHORT_DELAY.
389		*/
#	Line 270 | Line 395 | public class JSR166TestCase extends Test
395		}
396
397		/**
398	+	* Returns a timeout in milliseconds to be used in tests that
399	+	* verify that operations block or time out.
400	+	*/
401	+	long timeoutMillis() {
402	+	return SHORT_DELAY_MS / 4;
403	+	}
404	+
405	+	/**
406	+	* Returns a new Date instance representing a time delayMillis
407	+	* milliseconds in the future.
408	+	*/
409	+	Date delayedDate(long delayMillis) {
410	+	return new Date(System.currentTimeMillis() + delayMillis);
411	+	}
412	+
413	+	/**
414		* The first exception encountered if any threadAssertXXX method fails.
415		*/
416		private final AtomicReference<Throwable> threadFailure
#	Line 290 | Line 431 | public class JSR166TestCase extends Test
431		}
432
433		/**
434	+	* Extra checks that get done for all test cases.
435	+	*
436		* Triggers test case failure if any thread assertions have failed,
437		* by rethrowing, in the test harness thread, any exception recorded
438		* earlier by threadRecordFailure.
439	+	*
440	+	* Triggers test case failure if interrupt status is set in the main thread.
441		*/
442		public void tearDown() throws Exception {
443		Throwable t = threadFailure.getAndSet(null);
#	Line 310 | Line 455 | public class JSR166TestCase extends Test
455		throw afe;
456		}
457		}
458	+
459	+	if (Thread.interrupted())
460	+	throw new AssertionFailedError("interrupt status set in main thread");
461	+
462	+	checkForkJoinPoolThreadLeaks();
463	+	}
464	+
465	+	/**
466	+	* Finds missing try { ... } finally { joinPool(e); }
467	+	*/
468	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
469	+	Thread[] survivors = new Thread[5];
470	+	int count = Thread.enumerate(survivors);
471	+	for (int i = 0; i < count; i++) {
472	+	Thread thread = survivors[i];
473	+	String name = thread.getName();
474	+	if (name.startsWith("ForkJoinPool-")) {
475	+	// give thread some time to terminate
476	+	thread.join(LONG_DELAY_MS);
477	+	if (!thread.isAlive()) continue;
478	+	thread.stop();
479	+	throw new AssertionFailedError
480	+	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
481	+	toString(), name));
482	+	}
483	+	}
484		}
485
486		/**
#	Line 390 | Line 561 | public class JSR166TestCase extends Test
561		public void threadAssertEquals(Object x, Object y) {
562		try {
563		assertEquals(x, y);
564	<	} catch (AssertionFailedError t) {
565	<	threadRecordFailure(t);
566	<	throw t;
567	<	} catch (Throwable t) {
568	<	threadUnexpectedException(t);
564	>	} catch (AssertionFailedError fail) {
565	>	threadRecordFailure(fail);
566	>	throw fail;
567	>	} catch (Throwable fail) {
568	>	threadUnexpectedException(fail);
569		}
570		}
571
#	Line 406 | Line 577 | public class JSR166TestCase extends Test
577		public void threadAssertSame(Object x, Object y) {
578		try {
579		assertSame(x, y);
580	<	} catch (AssertionFailedError t) {
581	<	threadRecordFailure(t);
582	<	throw t;
580	>	} catch (AssertionFailedError fail) {
581	>	threadRecordFailure(fail);
582	>	throw fail;
583		}
584		}
585
#	Line 441 | Line 612 | public class JSR166TestCase extends Test
612		else {
613		AssertionFailedError afe =
614		new AssertionFailedError("unexpected exception: " + t);
615	<	t.initCause(t);
615	>	afe.initCause(t);
616		throw afe;
617		}
618		}
619
620		/**
621	<	* Delays, via Thread.sleep for the given millisecond delay, but
621	>	* Delays, via Thread.sleep, for the given millisecond delay, but
622		* if the sleep is shorter than specified, may re-sleep or yield
623		* until time elapses.
624		*/
625	<	public static void delay(long ms) throws InterruptedException {
625	>	static void delay(long millis) throws InterruptedException {
626		long startTime = System.nanoTime();
627	<	long ns = ms * 1000 * 1000;
627	>	long ns = millis * 1000 * 1000;
628		for (;;) {
629	<	if (ms > 0L)
630	<	Thread.sleep(ms);
629	>	if (millis > 0L)
630	>	Thread.sleep(millis);
631		else // too short to sleep
632		Thread.yield();
633		long d = ns - (System.nanoTime() - startTime);
634		if (d > 0L)
635	<	ms = d / (1000 * 1000);
635	>	millis = d / (1000 * 1000);
636		else
637		break;
638		}
#	Line 470 | Line 641 | public class JSR166TestCase extends Test
641		/**
642		* Waits out termination of a thread pool or fails doing so.
643		*/
644	<	public void joinPool(ExecutorService exec) {
644	>	void joinPool(ExecutorService exec) {
645		try {
646		exec.shutdown();
647	<	assertTrue("ExecutorService did not terminate in a timely manner",
648	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
647	>	if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
648	>	fail("ExecutorService " + exec +
649	>	" did not terminate in a timely manner");
650		} catch (SecurityException ok) {
651		// Allowed in case test doesn't have privs
652	<	} catch (InterruptedException ie) {
652	>	} catch (InterruptedException fail) {
653		fail("Unexpected InterruptedException");
654		}
655		}
656
657		/**
658	<	* Checks that thread does not terminate within timeoutMillis
487	<	* milliseconds (that is, Thread.join times out).
658	>	* A debugging tool to print all stack traces, as jstack does.
659		*/
660	<	public void assertThreadJoinTimesOut(Thread thread, long timeoutMillis) {
660	>	static void printAllStackTraces() {
661	>	for (ThreadInfo info :
662	>	ManagementFactory.getThreadMXBean()
663	>	.dumpAllThreads(true, true))
664	>	System.err.print(info);
665	>	}
666	>
667	>	/**
668	>	* Checks that thread does not terminate within the default
669	>	* millisecond delay of {@code timeoutMillis()}.
670	>	*/
671	>	void assertThreadStaysAlive(Thread thread) {
672	>	assertThreadStaysAlive(thread, timeoutMillis());
673	>	}
674	>
675	>	/**
676	>	* Checks that thread does not terminate within the given millisecond delay.
677	>	*/
678	>	void assertThreadStaysAlive(Thread thread, long millis) {
679		try {
680	<	long startTime = System.nanoTime();
681	<	thread.join(timeoutMillis);
680	>	// No need to optimize the failing case via Thread.join.
681	>	delay(millis);
682		assertTrue(thread.isAlive());
683	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
684	<	} catch (InterruptedException ie) {
683	>	} catch (InterruptedException fail) {
684	>	fail("Unexpected InterruptedException");
685	>	}
686	>	}
687	>
688	>	/**
689	>	* Checks that the threads do not terminate within the default
690	>	* millisecond delay of {@code timeoutMillis()}.
691	>	*/
692	>	void assertThreadsStayAlive(Thread... threads) {
693	>	assertThreadsStayAlive(timeoutMillis(), threads);
694	>	}
695	>
696	>	/**
697	>	* Checks that the threads do not terminate within the given millisecond delay.
698	>	*/
699	>	void assertThreadsStayAlive(long millis, Thread... threads) {
700	>	try {
701	>	// No need to optimize the failing case via Thread.join.
702	>	delay(millis);
703	>	for (Thread thread : threads)
704	>	assertTrue(thread.isAlive());
705	>	} catch (InterruptedException fail) {
706		fail("Unexpected InterruptedException");
707		}
708		}
709
710		/**
711	+	* Checks that future.get times out, with the default timeout of
712	+	* {@code timeoutMillis()}.
713	+	*/
714	+	void assertFutureTimesOut(Future future) {
715	+	assertFutureTimesOut(future, timeoutMillis());
716	+	}
717	+
718	+	/**
719	+	* Checks that future.get times out, with the given millisecond timeout.
720	+	*/
721	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
722	+	long startTime = System.nanoTime();
723	+	try {
724	+	future.get(timeoutMillis, MILLISECONDS);
725	+	shouldThrow();
726	+	} catch (TimeoutException success) {
727	+	} catch (Exception fail) {
728	+	threadUnexpectedException(fail);
729	+	} finally { future.cancel(true); }
730	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
731	+	}
732	+
733	+	/**
734		* Fails with message "should throw exception".
735		*/
736		public void shouldThrow() {
#	Line 536 | Line 769 | public class JSR166TestCase extends Test
769		public static final Integer m6  = new Integer(-6);
770		public static final Integer m10 = new Integer(-10);
771
539	–
772		/**
773		* Runs Runnable r with a security policy that permits precisely
774		* the specified permissions.  If there is no current security
#	Line 548 | Line 780 | public class JSR166TestCase extends Test
780		SecurityManager sm = System.getSecurityManager();
781		if (sm == null) {
782		r.run();
783	+	}
784	+	runWithSecurityManagerWithPermissions(r, permissions);
785	+	}
786	+
787	+	/**
788	+	* Runs Runnable r with a security policy that permits precisely
789	+	* the specified permissions.  If there is no current security
790	+	* manager, a temporary one is set for the duration of the
791	+	* Runnable.  We require that any security manager permit
792	+	* getPolicy/setPolicy.
793	+	*/
794	+	public void runWithSecurityManagerWithPermissions(Runnable r,
795	+	Permission... permissions) {
796	+	SecurityManager sm = System.getSecurityManager();
797	+	if (sm == null) {
798		Policy savedPolicy = Policy.getPolicy();
799		try {
800		Policy.setPolicy(permissivePolicy());
801		System.setSecurityManager(new SecurityManager());
802	<	runWithPermissions(r, permissions);
802	>	runWithSecurityManagerWithPermissions(r, permissions);
803		} finally {
804		System.setSecurityManager(null);
805		Policy.setPolicy(savedPolicy);
#	Line 600 | Line 847 | public class JSR166TestCase extends Test
847		return perms.implies(p);
848		}
849		public void refresh() {}
850	+	public String toString() {
851	+	List<Permission> ps = new ArrayList<Permission>();
852	+	for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
853	+	ps.add(e.nextElement());
854	+	return "AdjustablePolicy with permissions " + ps;
855	+	}
856		}
857
858		/**
#	Line 628 | Line 881 | public class JSR166TestCase extends Test
881		void sleep(long millis) {
882		try {
883		delay(millis);
884	<	} catch (InterruptedException ie) {
884	>	} catch (InterruptedException fail) {
885		AssertionFailedError afe =
886		new AssertionFailedError("Unexpected InterruptedException");
887	<	afe.initCause(ie);
887	>	afe.initCause(fail);
888		throw afe;
889		}
890		}
891
892		/**
893	<	* Sleeps until the timeout has elapsed, or interrupted.
641	<	* Does <em>NOT</em> throw InterruptedException.
642	<	*/
643	<	void sleepTillInterrupted(long timeoutMillis) {
644	<	try {
645	<	Thread.sleep(timeoutMillis);
646	<	} catch (InterruptedException wakeup) {}
647	<	}
648	<
649	<	/**
650	<	* Waits up to the specified number of milliseconds for the given
893	>	* Spin-waits up to the specified number of milliseconds for the given
894		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
895		*/
896		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
897	<	long timeoutNanos = timeoutMillis * 1000L * 1000L;
655	<	long t0 = System.nanoTime();
897	>	long startTime = System.nanoTime();
898		for (;;) {
899		Thread.State s = thread.getState();
900		if (s == Thread.State.BLOCKED ||
#	Line 661 | Line 903 | public class JSR166TestCase extends Test
903		return;
904		else if (s == Thread.State.TERMINATED)
905		fail("Unexpected thread termination");
906	<	else if (System.nanoTime() - t0 > timeoutNanos) {
906	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
907		threadAssertTrue(thread.isAlive());
908		return;
909		}
#	Line 680 | Line 922 | public class JSR166TestCase extends Test
922		/**
923		* Returns the number of milliseconds since time given by
924		* startNanoTime, which must have been previously returned from a
925	<	* call to {@link System.nanoTime()}.
925	>	* call to {@link System#nanoTime()}.
926		*/
927	<	long millisElapsedSince(long startNanoTime) {
927	>	static long millisElapsedSince(long startNanoTime) {
928		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
929		}
930
931	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
932	+	//         long startTime = System.nanoTime();
933	+	//         try {
934	+	//             r.run();
935	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
936	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
937	+	//             throw new AssertionFailedError("did not return promptly");
938	+	//     }
939	+
940	+	//     void assertTerminatesPromptly(Runnable r) {
941	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
942	+	//     }
943	+
944	+	/**
945	+	* Checks that timed f.get() returns the expected value, and does not
946	+	* wait for the timeout to elapse before returning.
947	+	*/
948	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
949	+	long startTime = System.nanoTime();
950	+	try {
951	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
952	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
953	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
954	+	throw new AssertionFailedError("timed get did not return promptly");
955	+	}
956	+
957	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
958	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
959	+	}
960	+
961		/**
962		* Returns a new started daemon Thread running the given runnable.
963		*/
#	Line 704 | Line 976 | public class JSR166TestCase extends Test
976		void awaitTermination(Thread t, long timeoutMillis) {
977		try {
978		t.join(timeoutMillis);
979	<	} catch (InterruptedException ie) {
980	<	threadUnexpectedException(ie);
979	>	} catch (InterruptedException fail) {
980	>	threadUnexpectedException(fail);
981		} finally {
982	<	if (t.isAlive()) {
982	>	if (t.getState() != Thread.State.TERMINATED) {
983		t.interrupt();
984		fail("Test timed out");
985		}
#	Line 731 | Line 1003 | public class JSR166TestCase extends Test
1003		public final void run() {
1004		try {
1005		realRun();
1006	<	} catch (Throwable t) {
1007	<	threadUnexpectedException(t);
1006	>	} catch (Throwable fail) {
1007	>	threadUnexpectedException(fail);
1008		}
1009		}
1010		}
#	Line 785 | Line 1057 | public class JSR166TestCase extends Test
1057		realRun();
1058		threadShouldThrow("InterruptedException");
1059		} catch (InterruptedException success) {
1060	<	} catch (Throwable t) {
1061	<	threadUnexpectedException(t);
1060	>	threadAssertFalse(Thread.interrupted());
1061	>	} catch (Throwable fail) {
1062	>	threadUnexpectedException(fail);
1063		}
1064		}
1065		}
#	Line 797 | Line 1070 | public class JSR166TestCase extends Test
1070		public final T call() {
1071		try {
1072		return realCall();
1073	<	} catch (Throwable t) {
1074	<	threadUnexpectedException(t);
1073	>	} catch (Throwable fail) {
1074	>	threadUnexpectedException(fail);
1075		return null;
1076		}
1077		}
#	Line 814 | Line 1087 | public class JSR166TestCase extends Test
1087		threadShouldThrow("InterruptedException");
1088		return result;
1089		} catch (InterruptedException success) {
1090	<	} catch (Throwable t) {
1091	<	threadUnexpectedException(t);
1090	>	threadAssertFalse(Thread.interrupted());
1091	>	} catch (Throwable fail) {
1092	>	threadUnexpectedException(fail);
1093		}
1094		return null;
1095		}
#	Line 855 | Line 1129 | public class JSR166TestCase extends Test
1129		public void await(CountDownLatch latch) {
1130		try {
1131		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1132	<	} catch (Throwable t) {
1133	<	threadUnexpectedException(t);
1132	>	} catch (Throwable fail) {
1133	>	threadUnexpectedException(fail);
1134	>	}
1135	>	}
1136	>
1137	>	public void await(Semaphore semaphore) {
1138	>	try {
1139	>	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1140	>	} catch (Throwable fail) {
1141	>	threadUnexpectedException(fail);
1142		}
1143		}
1144
1145	+	//     /**
1146	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1147	+	//      */
1148	+	//     public void await(AtomicBoolean flag) {
1149	+	//         await(flag, LONG_DELAY_MS);
1150	+	//     }
1151	+
1152	+	//     /**
1153	+	//      * Spin-waits up to the specified timeout until flag becomes true.
1154	+	//      */
1155	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
1156	+	//         long startTime = System.nanoTime();
1157	+	//         while (!flag.get()) {
1158	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
1159	+	//                 throw new AssertionFailedError("timed out");
1160	+	//             Thread.yield();
1161	+	//         }
1162	+	//     }
1163	+
1164		public static class NPETask implements Callable<String> {
1165		public String call() { throw new NullPointerException(); }
1166		}
#	Line 1028 | Line 1329 | public class JSR166TestCase extends Test
1329		public abstract class CheckedRecursiveAction extends RecursiveAction {
1330		protected abstract void realCompute() throws Throwable;
1331
1332	<	public final void compute() {
1332	>	@Override protected final void compute() {
1333		try {
1334		realCompute();
1335	<	} catch (Throwable t) {
1336	<	threadUnexpectedException(t);
1335	>	} catch (Throwable fail) {
1336	>	threadUnexpectedException(fail);
1337		}
1338		}
1339		}
#	Line 1043 | Line 1344 | public class JSR166TestCase extends Test
1344		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1345		protected abstract T realCompute() throws Throwable;
1346
1347	<	public final T compute() {
1347	>	@Override protected final T compute() {
1348		try {
1349		return realCompute();
1350	<	} catch (Throwable t) {
1351	<	threadUnexpectedException(t);
1350	>	} catch (Throwable fail) {
1351	>	threadUnexpectedException(fail);
1352		return null;
1353		}
1354		}
#	Line 1062 | Line 1363 | public class JSR166TestCase extends Test
1363		}
1364
1365		/**
1366	<	* A CyclicBarrier that fails with AssertionFailedErrors instead
1367	<	* of throwing checked exceptions.
1366	>	* A CyclicBarrier that uses timed await and fails with
1367	>	* AssertionFailedErrors instead of throwing checked exceptions.
1368		*/
1369		public class CheckedBarrier extends CyclicBarrier {
1370		public CheckedBarrier(int parties) { super(parties); }
1371
1372		public int await() {
1373		try {
1374	<	return super.await();
1375	<	} catch (Exception e) {
1374	>	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1375	>	} catch (TimeoutException timedOut) {
1376	>	throw new AssertionFailedError("timed out");
1377	>	} catch (Exception fail) {
1378		AssertionFailedError afe =
1379	<	new AssertionFailedError("Unexpected exception: " + e);
1380	<	afe.initCause(e);
1379	>	new AssertionFailedError("Unexpected exception: " + fail);
1380	>	afe.initCause(fail);
1381		throw afe;
1382		}
1383		}
1384		}
1385
1386	<	public void checkEmpty(BlockingQueue q) {
1386	>	void checkEmpty(BlockingQueue q) {
1387		try {
1388		assertTrue(q.isEmpty());
1389		assertEquals(0, q.size());
#	Line 1102 | Line 1405 | public class JSR166TestCase extends Test
1405		q.remove();
1406		shouldThrow();
1407		} catch (NoSuchElementException success) {}
1408	<	} catch (InterruptedException ie) {
1106	<	threadUnexpectedException(ie);
1107	<	}
1408	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1409		}
1410
1411	<	@SuppressWarnings("unchecked")
1412	<	public <T> T serialClone(T o) {
1411	>	void assertSerialEquals(Object x, Object y) {
1412	>	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1413	>	}
1414	>
1415	>	void assertNotSerialEquals(Object x, Object y) {
1416	>	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1417	>	}
1418	>
1419	>	byte[] serialBytes(Object o) {
1420		try {
1421		ByteArrayOutputStream bos = new ByteArrayOutputStream();
1422		ObjectOutputStream oos = new ObjectOutputStream(bos);
1423		oos.writeObject(o);
1424		oos.flush();
1425		oos.close();
1426	<	ByteArrayInputStream bin =
1427	<	new ByteArrayInputStream(bos.toByteArray());
1428	<	ObjectInputStream ois = new ObjectInputStream(bin);
1429	<	return (T) ois.readObject();
1430	<	} catch (Throwable t) {
1431	<	threadUnexpectedException(t);
1426	>	return bos.toByteArray();
1427	>	} catch (Throwable fail) {
1428	>	threadUnexpectedException(fail);
1429	>	return new byte[0];
1430	>	}
1431	>	}
1432	>
1433	>	@SuppressWarnings("unchecked")
1434	>	<T> T serialClone(T o) {
1435	>	try {
1436	>	ObjectInputStream ois = new ObjectInputStream
1437	>	(new ByteArrayInputStream(serialBytes(o)));
1438	>	T clone = (T) ois.readObject();
1439	>	assertSame(o.getClass(), clone.getClass());
1440	>	return clone;
1441	>	} catch (Throwable fail) {
1442	>	threadUnexpectedException(fail);
1443		return null;
1444		}
1445		}
1446	+
1447	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1448	+	Runnable... throwingActions) {
1449	+	for (Runnable throwingAction : throwingActions) {
1450	+	boolean threw = false;
1451	+	try { throwingAction.run(); }
1452	+	catch (Throwable t) {
1453	+	threw = true;
1454	+	if (!expectedExceptionClass.isInstance(t)) {
1455	+	AssertionFailedError afe =
1456	+	new AssertionFailedError
1457	+	("Expected " + expectedExceptionClass.getName() +
1458	+	", got " + t.getClass().getName());
1459	+	afe.initCause(t);
1460	+	threadUnexpectedException(afe);
1461	+	}
1462	+	}
1463	+	if (!threw)
1464	+	shouldThrow(expectedExceptionClass.getName());
1465	+	}
1466	+	}
1467	+
1468	+	public void assertIteratorExhausted(Iterator<?> it) {
1469	+	try {
1470	+	it.next();
1471	+	shouldThrow();
1472	+	} catch (NoSuchElementException success) {}
1473	+	assertFalse(it.hasNext());
1474	+	}
1475		}

Diff Legend

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