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.139 by jsr166, Sun Sep 6 21:14:12 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;
19	<	import java.util.concurrent.*;
20	<	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.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 25 | Line 25 | import java.security.Permissions;
25		import java.security.Policy;
26		import java.security.ProtectionDomain;
27		import java.security.SecurityPermission;
28	+	import java.util.ArrayList;
29	+	import java.util.Arrays;
30	+	import java.util.Date;
31	+	import java.util.Enumeration;
32	+	import java.util.Iterator;
33	+	import java.util.List;
34	+	import java.util.NoSuchElementException;
35	+	import java.util.PropertyPermission;
36	+	import java.util.concurrent.BlockingQueue;
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.Future;
44	+	import java.util.concurrent.RecursiveAction;
45	+	import java.util.concurrent.RecursiveTask;
46	+	import java.util.concurrent.RejectedExecutionHandler;
47	+	import java.util.concurrent.Semaphore;
48	+	import java.util.concurrent.ThreadFactory;
49	+	import java.util.concurrent.ThreadPoolExecutor;
50	+	import java.util.concurrent.TimeoutException;
51	+	import java.util.concurrent.atomic.AtomicReference;
52	+	import java.util.regex.Pattern;
53	+
54	+	import junit.framework.AssertionFailedError;
55	+	import junit.framework.Test;
56	+	import junit.framework.TestCase;
57	+	import junit.framework.TestResult;
58	+	import junit.framework.TestSuite;
59
60		/**
61		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 67 | Line 98 | import java.security.SecurityPermission;
98		*
99		* </ol>
100		*
101	<	* <p> <b>Other notes</b>
101	>	* <p><b>Other notes</b>
102		* <ul>
103		*
104		* <li> Usually, there is one testcase method per JSR166 method
#	Line 107 | Line 138 | public class JSR166TestCase extends Test
138		Boolean.getBoolean("jsr166.expensiveTests");
139
140		/**
141	+	* If true, also run tests that are not part of the official tck
142	+	* because they test unspecified implementation details.
143	+	*/
144	+	protected static final boolean testImplementationDetails =
145	+	Boolean.getBoolean("jsr166.testImplementationDetails");
146	+
147	+	/**
148		* If true, report on stdout all "slow" tests, that is, ones that
149		* take more than profileThreshold milliseconds to execute.
150		*/
#	Line 120 | Line 158 | public class JSR166TestCase extends Test
158		private static final long profileThreshold =
159		Long.getLong("jsr166.profileThreshold", 100);
160
161	+	/**
162	+	* The number of repetitions per test (for tickling rare bugs).
163	+	*/
164	+	private static final int runsPerTest =
165	+	Integer.getInteger("jsr166.runsPerTest", 1);
166	+
167	+	/**
168	+	* The number of repetitions of the test suite (for finding leaks?).
169	+	*/
170	+	private static final int suiteRuns =
171	+	Integer.getInteger("jsr166.suiteRuns", 1);
172	+
173	+	public JSR166TestCase() { super(); }
174	+	public JSR166TestCase(String name) { super(name); }
175	+
176	+	/**
177	+	* A filter for tests to run, matching strings of the form
178	+	* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
179	+	* Usefully combined with jsr166.runsPerTest.
180	+	*/
181	+	private static final Pattern methodFilter = methodFilter();
182	+
183	+	private static Pattern methodFilter() {
184	+	String regex = System.getProperty("jsr166.methodFilter");
185	+	return (regex == null) ? null : Pattern.compile(regex);
186	+	}
187	+
188		protected void runTest() throws Throwable {
189	<	if (profileTests)
190	<	runTestProfiled();
191	<	else
192	<	super.runTest();
189	>	if (methodFilter == null
190	>	|| methodFilter.matcher(toString()).find()) {
191	>	for (int i = 0; i < runsPerTest; i++) {
192	>	if (profileTests)
193	>	runTestProfiled();
194	>	else
195	>	super.runTest();
196	>	}
197	>	}
198		}
199
200		protected void runTestProfiled() throws Throwable {
201	+	// Warmup run, notably to trigger all needed classloading.
202	+	super.runTest();
203		long t0 = System.nanoTime();
204		try {
205		super.runTest();
206		} finally {
207	<	long elapsedMillis =
136	<	(System.nanoTime() - t0) / (1000L * 1000L);
207	>	long elapsedMillis = millisElapsedSince(t0);
208		if (elapsedMillis >= profileThreshold)
209		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
210		}
211		}
212
213		/**
214	<	* Runs all JSR166 unit tests using junit.textui.TestRunner
214	>	* Runs all JSR166 unit tests using junit.textui.TestRunner.
215		*/
216		public static void main(String[] args) {
217	+	main(suite(), args);
218	+	}
219	+
220	+	/**
221	+	* Runs all unit tests in the given test suite.
222	+	* Actual behavior influenced by jsr166.* system properties.
223	+	*/
224	+	static void main(Test suite, String[] args) {
225		if (useSecurityManager) {
226		System.err.println("Setting a permissive security manager");
227		Policy.setPolicy(permissivePolicy());
228		System.setSecurityManager(new SecurityManager());
229		}
230	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
231	<
232	<	Test s = suite();
233	<	for (int i = 0; i < iters; ++i) {
155	<	junit.textui.TestRunner.run(s);
230	>	for (int i = 0; i < suiteRuns; i++) {
231	>	TestResult result = junit.textui.TestRunner.run(suite);
232	>	if (!result.wasSuccessful())
233	>	System.exit(1);
234		System.gc();
235		System.runFinalization();
236		}
159	–	System.exit(0);
237		}
238
239		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 172 | Line 249 | public class JSR166TestCase extends Test
249		return suite;
250		}
251
252	+	public static void addNamedTestClasses(TestSuite suite,
253	+	String... testClassNames) {
254	+	for (String testClassName : testClassNames) {
255	+	try {
256	+	Class<?> testClass = Class.forName(testClassName);
257	+	Method m = testClass.getDeclaredMethod("suite",
258	+	new Class<?>[0]);
259	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
260	+	} catch (Exception e) {
261	+	throw new Error("Missing test class", e);
262	+	}
263	+	}
264	+	}
265	+
266	+	public static final double JAVA_CLASS_VERSION;
267	+	public static final String JAVA_SPECIFICATION_VERSION;
268	+	static {
269	+	try {
270	+	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
271	+	new java.security.PrivilegedAction<Double>() {
272	+	public Double run() {
273	+	return Double.valueOf(System.getProperty("java.class.version"));}});
274	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
275	+	new java.security.PrivilegedAction<String>() {
276	+	public String run() {
277	+	return System.getProperty("java.specification.version");}});
278	+	} catch (Throwable t) {
279	+	throw new Error(t);
280	+	}
281	+	}
282	+
283	+	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
284	+	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
285	+	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
286	+	public static boolean atLeastJava9() {
287	+	return JAVA_CLASS_VERSION >= 53.0
288	+	// As of 2015-09, java9 still uses 52.0 class file version
289	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
290	+	}
291	+	public static boolean atLeastJava10() {
292	+	return JAVA_CLASS_VERSION >= 54.0
293	+	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
294	+	}
295	+
296		/**
297		* Collects all JSR166 unit tests as one suite.
298		*/
299		public static Test suite() {
300	<	return newTestSuite(
300	>	// Java7+ test classes
301	>	TestSuite suite = newTestSuite(
302		ForkJoinPoolTest.suite(),
303		ForkJoinTaskTest.suite(),
304		RecursiveActionTest.suite(),
#	Line 241 | Line 363 | public class JSR166TestCase extends Test
363		TreeSetTest.suite(),
364		TreeSubMapTest.suite(),
365		TreeSubSetTest.suite());
366	+
367	+	// Java8+ test classes
368	+	if (atLeastJava8()) {
369	+	String[] java8TestClassNames = {
370	+	"Atomic8Test",
371	+	"CompletableFutureTest",
372	+	"ConcurrentHashMap8Test",
373	+	"CountedCompleterTest",
374	+	"DoubleAccumulatorTest",
375	+	"DoubleAdderTest",
376	+	"ForkJoinPool8Test",
377	+	"ForkJoinTask8Test",
378	+	"LongAccumulatorTest",
379	+	"LongAdderTest",
380	+	"SplittableRandomTest",
381	+	"StampedLockTest",
382	+	"ThreadLocalRandom8Test",
383	+	};
384	+	addNamedTestClasses(suite, java8TestClassNames);
385	+	}
386	+
387	+	// Java9+ test classes
388	+	if (atLeastJava9()) {
389	+	String[] java9TestClassNames = {
390	+	// Currently empty
391	+	};
392	+	addNamedTestClasses(suite, java9TestClassNames);
393	+	}
394	+
395	+	return suite;
396	+	}
397	+
398	+	/** Returns list of junit-style test method names in given class. */
399	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
400	+	Method[] methods = testClass.getDeclaredMethods();
401	+	ArrayList<String> names = new ArrayList<String>(methods.length);
402	+	for (Method method : methods) {
403	+	if (method.getName().startsWith("test")
404	+	&& Modifier.isPublic(method.getModifiers())
405	+	// method.getParameterCount() requires jdk8+
406	+	&& method.getParameterTypes().length == 0) {
407	+	names.add(method.getName());
408	+	}
409	+	}
410	+	return names;
411	+	}
412	+
413	+	/**
414	+	* Returns junit-style testSuite for the given test class, but
415	+	* parameterized by passing extra data to each test.
416	+	*/
417	+	public static <ExtraData> Test parameterizedTestSuite
418	+	(Class<? extends JSR166TestCase> testClass,
419	+	Class<ExtraData> dataClass,
420	+	ExtraData data) {
421	+	try {
422	+	TestSuite suite = new TestSuite();
423	+	Constructor c =
424	+	testClass.getDeclaredConstructor(dataClass, String.class);
425	+	for (String methodName : testMethodNames(testClass))
426	+	suite.addTest((Test) c.newInstance(data, methodName));
427	+	return suite;
428	+	} catch (Exception e) {
429	+	throw new Error(e);
430	+	}
431		}
432
433	+	/**
434	+	* Returns junit-style testSuite for the jdk8 extension of the
435	+	* given test class, but parameterized by passing extra data to
436	+	* each test.  Uses reflection to allow compilation in jdk7.
437	+	*/
438	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
439	+	(Class<? extends JSR166TestCase> testClass,
440	+	Class<ExtraData> dataClass,
441	+	ExtraData data) {
442	+	if (atLeastJava8()) {
443	+	String name = testClass.getName();
444	+	String name8 = name.replaceAll("Test$", "8Test");
445	+	if (name.equals(name8)) throw new Error(name);
446	+	try {
447	+	return (Test)
448	+	Class.forName(name8)
449	+	.getMethod("testSuite", new Class[] { dataClass })
450	+	.invoke(null, data);
451	+	} catch (Exception e) {
452	+	throw new Error(e);
453	+	}
454	+	} else {
455	+	return new TestSuite();
456	+	}
457	+
458	+	}
459	+
460	+	// Delays for timing-dependent tests, in milliseconds.
461
462		public static long SHORT_DELAY_MS;
463		public static long SMALL_DELAY_MS;
464		public static long MEDIUM_DELAY_MS;
465		public static long LONG_DELAY_MS;
466
252	–
467		/**
468		* Returns the shortest timed delay. This could
469		* be reimplemented to use for example a Property.
#	Line 258 | Line 472 | public class JSR166TestCase extends Test
472		return 50;
473		}
474
261	–
475		/**
476		* Sets delays as multiples of SHORT_DELAY.
477		*/
#	Line 270 | Line 483 | public class JSR166TestCase extends Test
483		}
484
485		/**
486	+	* Returns a timeout in milliseconds to be used in tests that
487	+	* verify that operations block or time out.
488	+	*/
489	+	long timeoutMillis() {
490	+	return SHORT_DELAY_MS / 4;
491	+	}
492	+
493	+	/**
494	+	* Returns a new Date instance representing a time at least
495	+	* delayMillis milliseconds in the future.
496	+	*/
497	+	Date delayedDate(long delayMillis) {
498	+	// Add 1 because currentTimeMillis is known to round into the past.
499	+	return new Date(System.currentTimeMillis() + delayMillis + 1);
500	+	}
501	+
502	+	/**
503		* The first exception encountered if any threadAssertXXX method fails.
504		*/
505		private final AtomicReference<Throwable> threadFailure
#	Line 290 | Line 520 | public class JSR166TestCase extends Test
520		}
521
522		/**
523	+	* Extra checks that get done for all test cases.
524	+	*
525		* Triggers test case failure if any thread assertions have failed,
526		* by rethrowing, in the test harness thread, any exception recorded
527		* earlier by threadRecordFailure.
528	+	*
529	+	* Triggers test case failure if interrupt status is set in the main thread.
530		*/
531		public void tearDown() throws Exception {
532		Throwable t = threadFailure.getAndSet(null);
#	Line 310 | Line 544 | public class JSR166TestCase extends Test
544		throw afe;
545		}
546		}
547	+
548	+	if (Thread.interrupted())
549	+	throw new AssertionFailedError("interrupt status set in main thread");
550	+
551	+	checkForkJoinPoolThreadLeaks();
552	+	}
553	+
554	+	/**
555	+	* Finds missing try { ... } finally { joinPool(e); }
556	+	*/
557	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
558	+	Thread[] survivors = new Thread[5];
559	+	int count = Thread.enumerate(survivors);
560	+	for (int i = 0; i < count; i++) {
561	+	Thread thread = survivors[i];
562	+	String name = thread.getName();
563	+	if (name.startsWith("ForkJoinPool-")) {
564	+	// give thread some time to terminate
565	+	thread.join(LONG_DELAY_MS);
566	+	if (!thread.isAlive()) continue;
567	+	throw new AssertionFailedError
568	+	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
569	+	toString(), name));
570	+	}
571	+	}
572		}
573
574		/**
#	Line 390 | Line 649 | public class JSR166TestCase extends Test
649		public void threadAssertEquals(Object x, Object y) {
650		try {
651		assertEquals(x, y);
652	<	} catch (AssertionFailedError t) {
653	<	threadRecordFailure(t);
654	<	throw t;
655	<	} catch (Throwable t) {
656	<	threadUnexpectedException(t);
652	>	} catch (AssertionFailedError fail) {
653	>	threadRecordFailure(fail);
654	>	throw fail;
655	>	} catch (Throwable fail) {
656	>	threadUnexpectedException(fail);
657		}
658		}
659
#	Line 406 | Line 665 | public class JSR166TestCase extends Test
665		public void threadAssertSame(Object x, Object y) {
666		try {
667		assertSame(x, y);
668	<	} catch (AssertionFailedError t) {
669	<	threadRecordFailure(t);
670	<	throw t;
668	>	} catch (AssertionFailedError fail) {
669	>	threadRecordFailure(fail);
670	>	throw fail;
671		}
672		}
673
#	Line 441 | Line 700 | public class JSR166TestCase extends Test
700		else {
701		AssertionFailedError afe =
702		new AssertionFailedError("unexpected exception: " + t);
703	<	t.initCause(t);
703	>	afe.initCause(t);
704		throw afe;
705		}
706		}
707
708		/**
709	<	* Delays, via Thread.sleep for the given millisecond delay, but
709	>	* Delays, via Thread.sleep, for the given millisecond delay, but
710		* if the sleep is shorter than specified, may re-sleep or yield
711		* until time elapses.
712		*/
713	<	public static void delay(long ms) throws InterruptedException {
713	>	static void delay(long millis) throws InterruptedException {
714		long startTime = System.nanoTime();
715	<	long ns = ms * 1000 * 1000;
715	>	long ns = millis * 1000 * 1000;
716		for (;;) {
717	<	if (ms > 0L)
718	<	Thread.sleep(ms);
717	>	if (millis > 0L)
718	>	Thread.sleep(millis);
719		else // too short to sleep
720		Thread.yield();
721		long d = ns - (System.nanoTime() - startTime);
722		if (d > 0L)
723	<	ms = d / (1000 * 1000);
723	>	millis = d / (1000 * 1000);
724		else
725		break;
726		}
#	Line 470 | Line 729 | public class JSR166TestCase extends Test
729		/**
730		* Waits out termination of a thread pool or fails doing so.
731		*/
732	<	public void joinPool(ExecutorService exec) {
732	>	void joinPool(ExecutorService pool) {
733		try {
734	<	exec.shutdown();
735	<	assertTrue("ExecutorService did not terminate in a timely manner",
736	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
734	>	pool.shutdown();
735	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
736	>	fail("ExecutorService " + pool +
737	>	" did not terminate in a timely manner");
738		} catch (SecurityException ok) {
739		// Allowed in case test doesn't have privs
740	<	} catch (InterruptedException ie) {
740	>	} catch (InterruptedException fail) {
741		fail("Unexpected InterruptedException");
742		}
743		}
744
745	+	/** Like Runnable, but with the freedom to throw anything */
746	+	interface Thunk { public void run() throws Throwable; }
747	+
748		/**
749	<	* Checks that thread does not terminate within timeoutMillis
750	<	* milliseconds (that is, Thread.join times out).
749	>	* Runs all the given tasks in parallel, failing if any fail.
750	>	* Useful for running multiple variants of tests that are
751	>	* necessarily individually slow because they must block.
752		*/
753	<	public void assertThreadJoinTimesOut(Thread thread, long timeoutMillis) {
753	>	void testInParallel(Thunk ... thunks) {
754	>	ExecutorService pool = Executors.newCachedThreadPool();
755		try {
756	<	long startTime = System.nanoTime();
757	<	thread.join(timeoutMillis);
756	>	ArrayList<Future<?>> futures = new ArrayList<>(thunks.length);
757	>	for (final Thunk thunk : thunks)
758	>	futures.add(pool.submit(new CheckedRunnable() {
759	>	public void realRun() throws Throwable { thunk.run();}}));
760	>	for (Future<?> future : futures)
761	>	try {
762	>	assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
763	>	} catch (ExecutionException ex) {
764	>	threadUnexpectedException(ex.getCause());
765	>	} catch (Exception ex) {
766	>	threadUnexpectedException(ex);
767	>	}
768	>	} finally {
769	>	joinPool(pool);
770	>	}
771	>	}
772	>
773	>	/**
774	>	* A debugging tool to print all stack traces, as jstack does.
775	>	*/
776	>	static void printAllStackTraces() {
777	>	for (ThreadInfo info :
778	>	ManagementFactory.getThreadMXBean()
779	>	.dumpAllThreads(true, true))
780	>	System.err.print(info);
781	>	}
782	>
783	>	/**
784	>	* Checks that thread does not terminate within the default
785	>	* millisecond delay of {@code timeoutMillis()}.
786	>	*/
787	>	void assertThreadStaysAlive(Thread thread) {
788	>	assertThreadStaysAlive(thread, timeoutMillis());
789	>	}
790	>
791	>	/**
792	>	* Checks that thread does not terminate within the given millisecond delay.
793	>	*/
794	>	void assertThreadStaysAlive(Thread thread, long millis) {
795	>	try {
796	>	// No need to optimize the failing case via Thread.join.
797	>	delay(millis);
798		assertTrue(thread.isAlive());
799	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
495	<	} catch (InterruptedException ie) {
799	>	} catch (InterruptedException fail) {
800		fail("Unexpected InterruptedException");
801		}
802		}
803
804		/**
805	+	* Checks that the threads do not terminate within the default
806	+	* millisecond delay of {@code timeoutMillis()}.
807	+	*/
808	+	void assertThreadsStayAlive(Thread... threads) {
809	+	assertThreadsStayAlive(timeoutMillis(), threads);
810	+	}
811	+
812	+	/**
813	+	* Checks that the threads do not terminate within the given millisecond delay.
814	+	*/
815	+	void assertThreadsStayAlive(long millis, Thread... threads) {
816	+	try {
817	+	// No need to optimize the failing case via Thread.join.
818	+	delay(millis);
819	+	for (Thread thread : threads)
820	+	assertTrue(thread.isAlive());
821	+	} catch (InterruptedException fail) {
822	+	fail("Unexpected InterruptedException");
823	+	}
824	+	}
825	+
826	+	/**
827	+	* Checks that future.get times out, with the default timeout of
828	+	* {@code timeoutMillis()}.
829	+	*/
830	+	void assertFutureTimesOut(Future future) {
831	+	assertFutureTimesOut(future, timeoutMillis());
832	+	}
833	+
834	+	/**
835	+	* Checks that future.get times out, with the given millisecond timeout.
836	+	*/
837	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
838	+	long startTime = System.nanoTime();
839	+	try {
840	+	future.get(timeoutMillis, MILLISECONDS);
841	+	shouldThrow();
842	+	} catch (TimeoutException success) {
843	+	} catch (Exception fail) {
844	+	threadUnexpectedException(fail);
845	+	} finally { future.cancel(true); }
846	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
847	+	}
848	+
849	+	/**
850		* Fails with message "should throw exception".
851		*/
852		public void shouldThrow() {
#	Line 536 | Line 885 | public class JSR166TestCase extends Test
885		public static final Integer m6  = new Integer(-6);
886		public static final Integer m10 = new Integer(-10);
887
539	–
888		/**
889		* Runs Runnable r with a security policy that permits precisely
890		* the specified permissions.  If there is no current security
#	Line 548 | Line 896 | public class JSR166TestCase extends Test
896		SecurityManager sm = System.getSecurityManager();
897		if (sm == null) {
898		r.run();
899	+	}
900	+	runWithSecurityManagerWithPermissions(r, permissions);
901	+	}
902	+
903	+	/**
904	+	* Runs Runnable r with a security policy that permits precisely
905	+	* the specified permissions.  If there is no current security
906	+	* manager, a temporary one is set for the duration of the
907	+	* Runnable.  We require that any security manager permit
908	+	* getPolicy/setPolicy.
909	+	*/
910	+	public void runWithSecurityManagerWithPermissions(Runnable r,
911	+	Permission... permissions) {
912	+	SecurityManager sm = System.getSecurityManager();
913	+	if (sm == null) {
914		Policy savedPolicy = Policy.getPolicy();
915		try {
916		Policy.setPolicy(permissivePolicy());
917		System.setSecurityManager(new SecurityManager());
918	<	runWithPermissions(r, permissions);
918	>	runWithSecurityManagerWithPermissions(r, permissions);
919		} finally {
920		System.setSecurityManager(null);
921		Policy.setPolicy(savedPolicy);
#	Line 600 | Line 963 | public class JSR166TestCase extends Test
963		return perms.implies(p);
964		}
965		public void refresh() {}
966	+	public String toString() {
967	+	List<Permission> ps = new ArrayList<Permission>();
968	+	for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
969	+	ps.add(e.nextElement());
970	+	return "AdjustablePolicy with permissions " + ps;
971	+	}
972		}
973
974		/**
#	Line 628 | Line 997 | public class JSR166TestCase extends Test
997		void sleep(long millis) {
998		try {
999		delay(millis);
1000	<	} catch (InterruptedException ie) {
1000	>	} catch (InterruptedException fail) {
1001		AssertionFailedError afe =
1002		new AssertionFailedError("Unexpected InterruptedException");
1003	<	afe.initCause(ie);
1003	>	afe.initCause(fail);
1004		throw afe;
1005		}
1006		}
1007
1008		/**
1009	<	* 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
1009	>	* Spin-waits up to the specified number of milliseconds for the given
1010		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1011		*/
1012		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1013	<	long timeoutNanos = timeoutMillis * 1000L * 1000L;
655	<	long t0 = System.nanoTime();
1013	>	long startTime = System.nanoTime();
1014		for (;;) {
1015		Thread.State s = thread.getState();
1016		if (s == Thread.State.BLOCKED ||
#	Line 661 | Line 1019 | public class JSR166TestCase extends Test
1019		return;
1020		else if (s == Thread.State.TERMINATED)
1021		fail("Unexpected thread termination");
1022	<	else if (System.nanoTime() - t0 > timeoutNanos) {
1022	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1023		threadAssertTrue(thread.isAlive());
1024		return;
1025		}
#	Line 680 | Line 1038 | public class JSR166TestCase extends Test
1038		/**
1039		* Returns the number of milliseconds since time given by
1040		* startNanoTime, which must have been previously returned from a
1041	<	* call to {@link System.nanoTime()}.
1041	>	* call to {@link System#nanoTime()}.
1042		*/
1043	<	long millisElapsedSince(long startNanoTime) {
1043	>	static long millisElapsedSince(long startNanoTime) {
1044		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1045		}
1046
1047	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1048	+	//         long startTime = System.nanoTime();
1049	+	//         try {
1050	+	//             r.run();
1051	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1052	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1053	+	//             throw new AssertionFailedError("did not return promptly");
1054	+	//     }
1055	+
1056	+	//     void assertTerminatesPromptly(Runnable r) {
1057	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1058	+	//     }
1059	+
1060	+	/**
1061	+	* Checks that timed f.get() returns the expected value, and does not
1062	+	* wait for the timeout to elapse before returning.
1063	+	*/
1064	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1065	+	long startTime = System.nanoTime();
1066	+	try {
1067	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1068	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1069	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1070	+	throw new AssertionFailedError("timed get did not return promptly");
1071	+	}
1072	+
1073	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1074	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1075	+	}
1076	+
1077		/**
1078		* Returns a new started daemon Thread running the given runnable.
1079		*/
#	Line 704 | Line 1092 | public class JSR166TestCase extends Test
1092		void awaitTermination(Thread t, long timeoutMillis) {
1093		try {
1094		t.join(timeoutMillis);
1095	<	} catch (InterruptedException ie) {
1096	<	threadUnexpectedException(ie);
1095	>	} catch (InterruptedException fail) {
1096	>	threadUnexpectedException(fail);
1097		} finally {
1098	<	if (t.isAlive()) {
1098	>	if (t.getState() != Thread.State.TERMINATED) {
1099		t.interrupt();
1100		fail("Test timed out");
1101		}
#	Line 731 | Line 1119 | public class JSR166TestCase extends Test
1119		public final void run() {
1120		try {
1121		realRun();
1122	<	} catch (Throwable t) {
1123	<	threadUnexpectedException(t);
1122	>	} catch (Throwable fail) {
1123	>	threadUnexpectedException(fail);
1124		}
1125		}
1126		}
#	Line 785 | Line 1173 | public class JSR166TestCase extends Test
1173		realRun();
1174		threadShouldThrow("InterruptedException");
1175		} catch (InterruptedException success) {
1176	<	} catch (Throwable t) {
1177	<	threadUnexpectedException(t);
1176	>	threadAssertFalse(Thread.interrupted());
1177	>	} catch (Throwable fail) {
1178	>	threadUnexpectedException(fail);
1179		}
1180		}
1181		}
#	Line 797 | Line 1186 | public class JSR166TestCase extends Test
1186		public final T call() {
1187		try {
1188		return realCall();
1189	<	} catch (Throwable t) {
1190	<	threadUnexpectedException(t);
1189	>	} catch (Throwable fail) {
1190	>	threadUnexpectedException(fail);
1191		return null;
1192		}
1193		}
#	Line 814 | Line 1203 | public class JSR166TestCase extends Test
1203		threadShouldThrow("InterruptedException");
1204		return result;
1205		} catch (InterruptedException success) {
1206	<	} catch (Throwable t) {
1207	<	threadUnexpectedException(t);
1206	>	threadAssertFalse(Thread.interrupted());
1207	>	} catch (Throwable fail) {
1208	>	threadUnexpectedException(fail);
1209		}
1210		return null;
1211		}
#	Line 855 | Line 1245 | public class JSR166TestCase extends Test
1245		public void await(CountDownLatch latch) {
1246		try {
1247		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1248	<	} catch (Throwable t) {
1249	<	threadUnexpectedException(t);
1248	>	} catch (Throwable fail) {
1249	>	threadUnexpectedException(fail);
1250	>	}
1251	>	}
1252	>
1253	>	public void await(Semaphore semaphore) {
1254	>	try {
1255	>	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1256	>	} catch (Throwable fail) {
1257	>	threadUnexpectedException(fail);
1258		}
1259		}
1260
1261	+	//     /**
1262	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1263	+	//      */
1264	+	//     public void await(AtomicBoolean flag) {
1265	+	//         await(flag, LONG_DELAY_MS);
1266	+	//     }
1267	+
1268	+	//     /**
1269	+	//      * Spin-waits up to the specified timeout until flag becomes true.
1270	+	//      */
1271	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
1272	+	//         long startTime = System.nanoTime();
1273	+	//         while (!flag.get()) {
1274	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
1275	+	//                 throw new AssertionFailedError("timed out");
1276	+	//             Thread.yield();
1277	+	//         }
1278	+	//     }
1279	+
1280		public static class NPETask implements Callable<String> {
1281		public String call() { throw new NullPointerException(); }
1282		}
#	Line 1028 | Line 1445 | public class JSR166TestCase extends Test
1445		public abstract class CheckedRecursiveAction extends RecursiveAction {
1446		protected abstract void realCompute() throws Throwable;
1447
1448	<	public final void compute() {
1448	>	@Override protected final void compute() {
1449		try {
1450		realCompute();
1451	<	} catch (Throwable t) {
1452	<	threadUnexpectedException(t);
1451	>	} catch (Throwable fail) {
1452	>	threadUnexpectedException(fail);
1453		}
1454		}
1455		}
#	Line 1043 | Line 1460 | public class JSR166TestCase extends Test
1460		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1461		protected abstract T realCompute() throws Throwable;
1462
1463	<	public final T compute() {
1463	>	@Override protected final T compute() {
1464		try {
1465		return realCompute();
1466	<	} catch (Throwable t) {
1467	<	threadUnexpectedException(t);
1466	>	} catch (Throwable fail) {
1467	>	threadUnexpectedException(fail);
1468		return null;
1469		}
1470		}
#	Line 1062 | Line 1479 | public class JSR166TestCase extends Test
1479		}
1480
1481		/**
1482	<	* A CyclicBarrier that fails with AssertionFailedErrors instead
1483	<	* of throwing checked exceptions.
1482	>	* A CyclicBarrier that uses timed await and fails with
1483	>	* AssertionFailedErrors instead of throwing checked exceptions.
1484		*/
1485		public class CheckedBarrier extends CyclicBarrier {
1486		public CheckedBarrier(int parties) { super(parties); }
1487
1488		public int await() {
1489		try {
1490	<	return super.await();
1491	<	} catch (Exception e) {
1490	>	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1491	>	} catch (TimeoutException timedOut) {
1492	>	throw new AssertionFailedError("timed out");
1493	>	} catch (Exception fail) {
1494		AssertionFailedError afe =
1495	<	new AssertionFailedError("Unexpected exception: " + e);
1496	<	afe.initCause(e);
1495	>	new AssertionFailedError("Unexpected exception: " + fail);
1496	>	afe.initCause(fail);
1497		throw afe;
1498		}
1499		}
1500		}
1501
1502	<	public void checkEmpty(BlockingQueue q) {
1502	>	void checkEmpty(BlockingQueue q) {
1503		try {
1504		assertTrue(q.isEmpty());
1505		assertEquals(0, q.size());
#	Line 1102 | Line 1521 | public class JSR166TestCase extends Test
1521		q.remove();
1522		shouldThrow();
1523		} catch (NoSuchElementException success) {}
1524	<	} catch (InterruptedException ie) {
1106	<	threadUnexpectedException(ie);
1107	<	}
1524	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1525		}
1526
1527	<	@SuppressWarnings("unchecked")
1528	<	public <T> T serialClone(T o) {
1527	>	void assertSerialEquals(Object x, Object y) {
1528	>	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1529	>	}
1530	>
1531	>	void assertNotSerialEquals(Object x, Object y) {
1532	>	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1533	>	}
1534	>
1535	>	byte[] serialBytes(Object o) {
1536		try {
1537		ByteArrayOutputStream bos = new ByteArrayOutputStream();
1538		ObjectOutputStream oos = new ObjectOutputStream(bos);
1539		oos.writeObject(o);
1540		oos.flush();
1541		oos.close();
1542	<	ByteArrayInputStream bin =
1543	<	new ByteArrayInputStream(bos.toByteArray());
1544	<	ObjectInputStream ois = new ObjectInputStream(bin);
1545	<	return (T) ois.readObject();
1546	<	} catch (Throwable t) {
1547	<	threadUnexpectedException(t);
1542	>	return bos.toByteArray();
1543	>	} catch (Throwable fail) {
1544	>	threadUnexpectedException(fail);
1545	>	return new byte[0];
1546	>	}
1547	>	}
1548	>
1549	>	@SuppressWarnings("unchecked")
1550	>	<T> T serialClone(T o) {
1551	>	try {
1552	>	ObjectInputStream ois = new ObjectInputStream
1553	>	(new ByteArrayInputStream(serialBytes(o)));
1554	>	T clone = (T) ois.readObject();
1555	>	assertSame(o.getClass(), clone.getClass());
1556	>	return clone;
1557	>	} catch (Throwable fail) {
1558	>	threadUnexpectedException(fail);
1559		return null;
1560		}
1561		}
1562	+
1563	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1564	+	Runnable... throwingActions) {
1565	+	for (Runnable throwingAction : throwingActions) {
1566	+	boolean threw = false;
1567	+	try { throwingAction.run(); }
1568	+	catch (Throwable t) {
1569	+	threw = true;
1570	+	if (!expectedExceptionClass.isInstance(t)) {
1571	+	AssertionFailedError afe =
1572	+	new AssertionFailedError
1573	+	("Expected " + expectedExceptionClass.getName() +
1574	+	", got " + t.getClass().getName());
1575	+	afe.initCause(t);
1576	+	threadUnexpectedException(afe);
1577	+	}
1578	+	}
1579	+	if (!threw)
1580	+	shouldThrow(expectedExceptionClass.getName());
1581	+	}
1582	+	}
1583	+
1584	+	public void assertIteratorExhausted(Iterator<?> it) {
1585	+	try {
1586	+	it.next();
1587	+	shouldThrow();
1588	+	} catch (NoSuchElementException success) {}
1589	+	assertFalse(it.hasNext());
1590	+	}
1591		}

Diff Legend

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