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.161 by jsr166, Sun Oct 4 03:49:33 2015 UTC vs.
Revision 1.230 by jsr166, Mon May 15 16:21:07 2017 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
2	>	* Written by Doug Lea and Martin Buchholz with assistance from
3	>	* members of JCP JSR-166 Expert Group and released to the public
4	>	* domain, as explained at
5		* http://creativecommons.org/publicdomain/zero/1.0/
6		* Other contributors include Andrew Wright, Jeffrey Hayes,
7		* Pat Fisher, Mike Judd.
8		*/
9
10	+	/*
11	+	* @test
12	+	* @summary JSR-166 tck tests, in a number of variations.
13	+	*          The first is the conformance testing variant,
14	+	*          while others also test implementation details.
15	+	* @build *
16	+	* @modules java.management
17	+	* @run junit/othervm/timeout=1000 JSR166TestCase
18	+	* @run junit/othervm/timeout=1000
19	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
21	+	*      -Djsr166.testImplementationDetails=true
22	+	*      JSR166TestCase
23	+	* @run junit/othervm/timeout=1000
24	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
26	+	*      -Djsr166.testImplementationDetails=true
27	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28	+	*      JSR166TestCase
29	+	* @run junit/othervm/timeout=1000
30	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
32	+	*      -Djsr166.testImplementationDetails=true
33	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34	+	*      -Djava.util.secureRandomSeed=true
35	+	*      JSR166TestCase
36	+	* @run junit/othervm/timeout=1000/policy=tck.policy
37	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
39	+	*      -Djsr166.testImplementationDetails=true
40	+	*      JSR166TestCase
41	+	*/
42	+
43		import static java.util.concurrent.TimeUnit.MILLISECONDS;
44		import static java.util.concurrent.TimeUnit.MINUTES;
45		import static java.util.concurrent.TimeUnit.NANOSECONDS;
#	Line 29 | Line 63 | import java.security.ProtectionDomain;
63		import java.security.SecurityPermission;
64		import java.util.ArrayList;
65		import java.util.Arrays;
66	+	import java.util.Collection;
67	+	import java.util.Collections;
68		import java.util.Date;
69		import java.util.Enumeration;
70		import java.util.Iterator;
#	Line 48 | Line 84 | import java.util.concurrent.RecursiveAct
84		import java.util.concurrent.RecursiveTask;
85		import java.util.concurrent.RejectedExecutionHandler;
86		import java.util.concurrent.Semaphore;
87	+	import java.util.concurrent.SynchronousQueue;
88		import java.util.concurrent.ThreadFactory;
89	+	import java.util.concurrent.ThreadLocalRandom;
90		import java.util.concurrent.ThreadPoolExecutor;
91		import java.util.concurrent.TimeoutException;
92	+	import java.util.concurrent.atomic.AtomicBoolean;
93		import java.util.concurrent.atomic.AtomicReference;
94		import java.util.regex.Pattern;
95
#	Line 109 | Line 148 | import junit.framework.TestSuite;
148		* methods as there are exceptions the method can throw. Sometimes
149		* there are multiple tests per JSR166 method when the different
150		* "normal" behaviors differ significantly. And sometimes testcases
151	<	* cover multiple methods when they cannot be tested in
113	<	* isolation.
151	>	* cover multiple methods when they cannot be tested in isolation.
152		*
153		* <li>The documentation style for testcases is to provide as javadoc
154		* a simple sentence or two describing the property that the testcase
#	Line 173 | Line 211 | public class JSR166TestCase extends Test
211		private static final int suiteRuns =
212		Integer.getInteger("jsr166.suiteRuns", 1);
213
214	+	/**
215	+	* Returns the value of the system property, or NaN if not defined.
216	+	*/
217	+	private static float systemPropertyValue(String name) {
218	+	String floatString = System.getProperty(name);
219	+	if (floatString == null)
220	+	return Float.NaN;
221	+	try {
222	+	return Float.parseFloat(floatString);
223	+	} catch (NumberFormatException ex) {
224	+	throw new IllegalArgumentException(
225	+	String.format("Bad float value in system property %s=%s",
226	+	name, floatString));
227	+	}
228	+	}
229	+
230	+	/**
231	+	* The scaling factor to apply to standard delays used in tests.
232	+	* May be initialized from any of:
233	+	* - the "jsr166.delay.factor" system property
234	+	* - the "test.timeout.factor" system property (as used by jtreg)
235	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
236	+	* - hard-coded fuzz factor when using a known slowpoke VM
237	+	*/
238	+	private static final float delayFactor = delayFactor();
239	+
240	+	private static float delayFactor() {
241	+	float x;
242	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
243	+	return x;
244	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
245	+	return x;
246	+	String prop = System.getProperty("java.vm.version");
247	+	if (prop != null && prop.matches(".*debug.*"))
248	+	return 4.0f; // How much slower is fastdebug than product?!
249	+	return 1.0f;
250	+	}
251	+
252		public JSR166TestCase() { super(); }
253		public JSR166TestCase(String name) { super(name); }
254
#	Line 188 | Line 264 | public class JSR166TestCase extends Test
264		return (regex == null) ? null : Pattern.compile(regex);
265		}
266
267	+	// Instrumentation to debug very rare, but very annoying hung test runs.
268		static volatile TestCase currentTestCase;
269	+	// static volatile int currentRun = 0;
270		static {
271		Runnable checkForWedgedTest = new Runnable() { public void run() {
272	<	// avoid spurious reports with enormous runsPerTest
273	<	final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
272	>	// Avoid spurious reports with enormous runsPerTest.
273	>	// A single test case run should never take more than 1 second.
274	>	// But let's cap it at the high end too ...
275	>	final int timeoutMinutes =
276	>	Math.min(15, Math.max(runsPerTest / 60, 1));
277		for (TestCase lastTestCase = currentTestCase;;) {
278		try { MINUTES.sleep(timeoutMinutes); }
279		catch (InterruptedException unexpected) { break; }
280		if (lastTestCase == currentTestCase) {
281	<	System.err.println
282	<	("Looks like we're stuck running test: "
283	<	+ lastTestCase);
281	>	System.err.printf(
282	>	"Looks like we're stuck running test: %s%n",
283	>	lastTestCase);
284	>	//                     System.err.printf(
285	>	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
286	>	//                         lastTestCase, currentRun, runsPerTest);
287	>	//                     System.err.println("availableProcessors=" +
288	>	//                         Runtime.getRuntime().availableProcessors());
289	>	//                     System.err.printf("cpu model = %s%n", cpuModel());
290		dumpTestThreads();
291	+	// one stack dump is probably enough; more would be spam
292	+	break;
293		}
294		lastTestCase = currentTestCase;
295		}}};
#	Line 209 | Line 298 | public class JSR166TestCase extends Test
298		thread.start();
299		}
300
301	+	//     public static String cpuModel() {
302	+	//         try {
303	+	//             java.util.regex.Matcher matcher
304	+	//               = Pattern.compile("model name\\s*: (.*)")
305	+	//                 .matcher(new String(
306	+	//                     java.nio.file.Files.readAllBytes(
307	+	//                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
308	+	//             matcher.find();
309	+	//             return matcher.group(1);
310	+	//         } catch (Exception ex) { return null; }
311	+	//     }
312	+
313		public void runBare() throws Throwable {
314		currentTestCase = this;
315		if (methodFilter == null
#	Line 218 | Line 319 | public class JSR166TestCase extends Test
319
320		protected void runTest() throws Throwable {
321		for (int i = 0; i < runsPerTest; i++) {
322	+	// currentRun = i;
323		if (profileTests)
324		runTestProfiled();
325		else
#	Line 246 | Line 348 | public class JSR166TestCase extends Test
348		main(suite(), args);
349		}
350
351	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
352	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
353	+	long runTime;
354	+	public void startTest(Test test) {}
355	+	protected void printHeader(long runTime) {
356	+	this.runTime = runTime; // defer printing for later
357	+	}
358	+	protected void printFooter(TestResult result) {
359	+	if (result.wasSuccessful()) {
360	+	getWriter().println("OK (" + result.runCount() + " tests)"
361	+	+ "  Time: " + elapsedTimeAsString(runTime));
362	+	} else {
363	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
364	+	super.printFooter(result);
365	+	}
366	+	}
367	+	}
368	+
369	+	/**
370	+	* Returns a TestRunner that doesn't bother with unnecessary
371	+	* fluff, like printing a "." for each test case.
372	+	*/
373	+	static junit.textui.TestRunner newPithyTestRunner() {
374	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
375	+	runner.setPrinter(new PithyResultPrinter(System.out));
376	+	return runner;
377	+	}
378	+
379		/**
380		* Runs all unit tests in the given test suite.
381		* Actual behavior influenced by jsr166.* system properties.
#	Line 257 | Line 387 | public class JSR166TestCase extends Test
387		System.setSecurityManager(new SecurityManager());
388		}
389		for (int i = 0; i < suiteRuns; i++) {
390	<	TestResult result = junit.textui.TestRunner.run(suite);
390	>	TestResult result = newPithyTestRunner().doRun(suite);
391		if (!result.wasSuccessful())
392		System.exit(1);
393		System.gc();
#	Line 341 | Line 471 | public class JSR166TestCase extends Test
471		AbstractQueuedLongSynchronizerTest.suite(),
472		ArrayBlockingQueueTest.suite(),
473		ArrayDequeTest.suite(),
474	+	ArrayListTest.suite(),
475		AtomicBooleanTest.suite(),
476		AtomicIntegerArrayTest.suite(),
477		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 363 | Line 494 | public class JSR166TestCase extends Test
494		CopyOnWriteArrayListTest.suite(),
495		CopyOnWriteArraySetTest.suite(),
496		CountDownLatchTest.suite(),
497	+	CountedCompleterTest.suite(),
498		CyclicBarrierTest.suite(),
499		DelayQueueTest.suite(),
500		EntryTest.suite(),
#	Line 391 | Line 523 | public class JSR166TestCase extends Test
523		TreeMapTest.suite(),
524		TreeSetTest.suite(),
525		TreeSubMapTest.suite(),
526	<	TreeSubSetTest.suite());
526	>	TreeSubSetTest.suite(),
527	>	VectorTest.suite());
528
529		// Java8+ test classes
530		if (atLeastJava8()) {
531		String[] java8TestClassNames = {
532	+	"ArrayDeque8Test",
533		"Atomic8Test",
534		"CompletableFutureTest",
535		"ConcurrentHashMap8Test",
536	<	"CountedCompleterTest",
536	>	"CountedCompleter8Test",
537		"DoubleAccumulatorTest",
538		"DoubleAdderTest",
539		"ForkJoinPool8Test",
540		"ForkJoinTask8Test",
541	+	"LinkedBlockingDeque8Test",
542	+	"LinkedBlockingQueue8Test",
543		"LongAccumulatorTest",
544		"LongAdderTest",
545		"SplittableRandomTest",
546		"StampedLockTest",
547		"SubmissionPublisherTest",
548		"ThreadLocalRandom8Test",
549	+	"TimeUnit8Test",
550		};
551		addNamedTestClasses(suite, java8TestClassNames);
552		}
#	Line 417 | Line 554 | public class JSR166TestCase extends Test
554		// Java9+ test classes
555		if (atLeastJava9()) {
556		String[] java9TestClassNames = {
557	<	// Currently empty, but expecting varhandle tests
557	>	"AtomicBoolean9Test",
558	>	"AtomicInteger9Test",
559	>	"AtomicIntegerArray9Test",
560	>	"AtomicLong9Test",
561	>	"AtomicLongArray9Test",
562	>	"AtomicReference9Test",
563	>	"AtomicReferenceArray9Test",
564	>	"ExecutorCompletionService9Test",
565	>	"ForkJoinPool9Test",
566		};
567		addNamedTestClasses(suite, java9TestClassNames);
568		}
#	Line 428 | Line 573 | public class JSR166TestCase extends Test
573		/** Returns list of junit-style test method names in given class. */
574		public static ArrayList<String> testMethodNames(Class<?> testClass) {
575		Method[] methods = testClass.getDeclaredMethods();
576	<	ArrayList<String> names = new ArrayList<String>(methods.length);
576	>	ArrayList<String> names = new ArrayList<>(methods.length);
577		for (Method method : methods) {
578		if (method.getName().startsWith("test")
579		&& Modifier.isPublic(method.getModifiers())
#	Line 494 | Line 639 | public class JSR166TestCase extends Test
639		public static long LONG_DELAY_MS;
640
641		/**
642	<	* Returns the shortest timed delay. This could
643	<	* be reimplemented to use for example a Property.
642	>	* Returns the shortest timed delay. This can be scaled up for
643	>	* slow machines using the jsr166.delay.factor system property,
644	>	* or via jtreg's -timeoutFactor: flag.
645	>	* http://openjdk.java.net/jtreg/command-help.html
646		*/
647		protected long getShortDelay() {
648	<	return 50;
648	>	return (long) (50 * delayFactor);
649		}
650
651		/**
#	Line 511 | Line 658 | public class JSR166TestCase extends Test
658		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
659		}
660
661	+	private static final long TIMEOUT_DELAY_MS
662	+	= (long) (12.0 * Math.cbrt(delayFactor));
663	+
664		/**
665	<	* Returns a timeout in milliseconds to be used in tests that
666	<	* verify that operations block or time out.
665	>	* Returns a timeout in milliseconds to be used in tests that verify
666	>	* that operations block or time out.  We want this to be longer
667	>	* than the OS scheduling quantum, but not too long, so don't scale
668	>	* linearly with delayFactor; we use "crazy" cube root instead.
669		*/
670	<	long timeoutMillis() {
671	<	return SHORT_DELAY_MS / 4;
670	>	static long timeoutMillis() {
671	>	return TIMEOUT_DELAY_MS;
672		}
673
674		/**
#	Line 532 | Line 684 | public class JSR166TestCase extends Test
684		* The first exception encountered if any threadAssertXXX method fails.
685		*/
686		private final AtomicReference<Throwable> threadFailure
687	<	= new AtomicReference<Throwable>(null);
687	>	= new AtomicReference<>(null);
688
689		/**
690		* Records an exception so that it can be rethrown later in the test
#	Line 590 | Line 742 | public class JSR166TestCase extends Test
742		}
743
744		/**
745	<	* Finds missing try { ... } finally { joinPool(e); }
745	>	* Finds missing PoolCleaners
746		*/
747		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
748		Thread[] survivors = new Thread[7];
#	Line 749 | Line 901 | public class JSR166TestCase extends Test
901		/**
902		* Delays, via Thread.sleep, for the given millisecond delay, but
903		* if the sleep is shorter than specified, may re-sleep or yield
904	<	* until time elapses.
904	>	* until time elapses.  Ensures that the given time, as measured
905	>	* by System.nanoTime(), has elapsed.
906		*/
907		static void delay(long millis) throws InterruptedException {
908	<	long startTime = System.nanoTime();
909	<	long ns = millis * 1000 * 1000;
910	<	for (;;) {
908	>	long nanos = millis * (1000 * 1000);
909	>	final long wakeupTime = System.nanoTime() + nanos;
910	>	do {
911		if (millis > 0L)
912		Thread.sleep(millis);
913		else // too short to sleep
914		Thread.yield();
915	<	long d = ns - (System.nanoTime() - startTime);
916	<	if (d > 0L)
917	<	millis = d / (1000 * 1000);
765	<	else
766	<	break;
767	<	}
915	>	nanos = wakeupTime - System.nanoTime();
916	>	millis = nanos / (1000 * 1000);
917	>	} while (nanos >= 0L);
918		}
919
920		/**
#	Line 776 | Line 926 | public class JSR166TestCase extends Test
926		public void close() { joinPool(pool); }
927		}
928
929	+	/**
930	+	* An extension of PoolCleaner that has an action to release the pool.
931	+	*/
932	+	class PoolCleanerWithReleaser extends PoolCleaner {
933	+	private final Runnable releaser;
934	+	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
935	+	super(pool);
936	+	this.releaser = releaser;
937	+	}
938	+	public void close() {
939	+	try {
940	+	releaser.run();
941	+	} finally {
942	+	super.close();
943	+	}
944	+	}
945	+	}
946	+
947		PoolCleaner cleaner(ExecutorService pool) {
948		return new PoolCleaner(pool);
949		}
950
951	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
952	+	return new PoolCleanerWithReleaser(pool, releaser);
953	+	}
954	+
955	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
956	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
957	+	}
958	+
959	+	Runnable releaser(final CountDownLatch latch) {
960	+	return new Runnable() { public void run() {
961	+	do { latch.countDown(); }
962	+	while (latch.getCount() > 0);
963	+	}};
964	+	}
965	+
966	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
967	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
968	+	}
969	+
970	+	Runnable releaser(final AtomicBoolean flag) {
971	+	return new Runnable() { public void run() { flag.set(true); }};
972	+	}
973	+
974		/**
975		* Waits out termination of a thread pool or fails doing so.
976		*/
#	Line 793 | Line 984 | public class JSR166TestCase extends Test
984		} finally {
985		// last resort, for the benefit of subsequent tests
986		pool.shutdownNow();
987	<	pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
987	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
988		}
989		}
990		} catch (SecurityException ok) {
#	Line 803 | Line 994 | public class JSR166TestCase extends Test
994		}
995		}
996
997	<	/** Like Runnable, but with the freedom to throw anything */
997	>	/**
998	>	* Like Runnable, but with the freedom to throw anything.
999	>	* junit folks had the same idea:
1000	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1001	>	*/
1002		interface Action { public void run() throws Throwable; }
1003
1004		/**
#	Line 834 | Line 1029 | public class JSR166TestCase extends Test
1029		* Uninteresting threads are filtered out.
1030		*/
1031		static void dumpTestThreads() {
1032	+	SecurityManager sm = System.getSecurityManager();
1033	+	if (sm != null) {
1034	+	try {
1035	+	System.setSecurityManager(null);
1036	+	} catch (SecurityException giveUp) {
1037	+	return;
1038	+	}
1039	+	}
1040	+
1041		ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1042		System.err.println("------ stacktrace dump start ------");
1043		for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1044	<	String name = info.getThreadName();
1044	>	final String name = info.getThreadName();
1045	>	String lockName;
1046		if ("Signal Dispatcher".equals(name))
1047		continue;
1048		if ("Reference Handler".equals(name)
1049	<	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1049	>	&& (lockName = info.getLockName()) != null
1050	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1051		continue;
1052		if ("Finalizer".equals(name)
1053	<	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1053	>	&& (lockName = info.getLockName()) != null
1054	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1055		continue;
1056		if ("checkForWedgedTest".equals(name))
1057		continue;
1058		System.err.print(info);
1059		}
1060		System.err.println("------ stacktrace dump end ------");
854	–	}
1061
1062	<	/**
857	<	* Checks that thread does not terminate within the default
858	<	* millisecond delay of {@code timeoutMillis()}.
859	<	*/
860	<	void assertThreadStaysAlive(Thread thread) {
861	<	assertThreadStaysAlive(thread, timeoutMillis());
1062	>	if (sm != null) System.setSecurityManager(sm);
1063		}
1064
1065		/**
1066	<	* Checks that thread does not terminate within the given millisecond delay.
1066	>	* Checks that thread eventually enters the expected blocked thread state.
1067		*/
1068	<	void assertThreadStaysAlive(Thread thread, long millis) {
1069	<	try {
1070	<	// No need to optimize the failing case via Thread.join.
1071	<	delay(millis);
1072	<	assertTrue(thread.isAlive());
1073	<	} catch (InterruptedException fail) {
1074	<	threadFail("Unexpected InterruptedException");
1068	>	void assertThreadBlocks(Thread thread, Thread.State expected) {
1069	>	// always sleep at least 1 ms, with high probability avoiding
1070	>	// transitory states
1071	>	for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1072	>	try { delay(1); }
1073	>	catch (InterruptedException fail) {
1074	>	fail("Unexpected InterruptedException");
1075	>	}
1076	>	Thread.State s = thread.getState();
1077	>	if (s == expected)
1078	>	return;
1079	>	else if (s == Thread.State.TERMINATED)
1080	>	fail("Unexpected thread termination");
1081		}
1082	+	fail("timed out waiting for thread to enter thread state " + expected);
1083		}
1084
1085		/**
1086	<	* Checks that the threads do not terminate within the default
1086	>	* Checks that thread does not terminate within the default
1087		* millisecond delay of {@code timeoutMillis()}.
1088	+	* TODO: REMOVEME
1089		*/
1090	<	void assertThreadsStayAlive(Thread... threads) {
1091	<	assertThreadsStayAlive(timeoutMillis(), threads);
1090	>	void assertThreadStaysAlive(Thread thread) {
1091	>	assertThreadStaysAlive(thread, timeoutMillis());
1092		}
1093
1094		/**
1095	<	* Checks that the threads do not terminate within the given millisecond delay.
1095	>	* Checks that thread does not terminate within the given millisecond delay.
1096	>	* TODO: REMOVEME
1097		*/
1098	<	void assertThreadsStayAlive(long millis, Thread... threads) {
1098	>	void assertThreadStaysAlive(Thread thread, long millis) {
1099		try {
1100		// No need to optimize the failing case via Thread.join.
1101		delay(millis);
1102	<	for (Thread thread : threads)
893	<	assertTrue(thread.isAlive());
1102	>	assertTrue(thread.isAlive());
1103		} catch (InterruptedException fail) {
1104		threadFail("Unexpected InterruptedException");
1105		}
#	Line 934 | Line 1143 | public class JSR166TestCase extends Test
1143		}
1144
1145		/**
1146	+	* The maximum number of consecutive spurious wakeups we should
1147	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1148	+	*/
1149	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1150	+
1151	+	/**
1152		* The number of elements to place in collections, arrays, etc.
1153		*/
1154		public static final int SIZE = 20;
#	Line 1037 | Line 1252 | public class JSR166TestCase extends Test
1252		}
1253		public void refresh() {}
1254		public String toString() {
1255	<	List<Permission> ps = new ArrayList<Permission>();
1255	>	List<Permission> ps = new ArrayList<>();
1256		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1257		ps.add(e.nextElement());
1258		return "AdjustablePolicy with permissions " + ps;
#	Line 1067 | Line 1282 | public class JSR166TestCase extends Test
1282		* Sleeps until the given time has elapsed.
1283		* Throws AssertionFailedError if interrupted.
1284		*/
1285	<	void sleep(long millis) {
1285	>	static void sleep(long millis) {
1286		try {
1287		delay(millis);
1288		} catch (InterruptedException fail) {
#	Line 1083 | Line 1298 | public class JSR166TestCase extends Test
1298		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1299		*/
1300		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1301	<	long startTime = System.nanoTime();
1301	>	long startTime = 0L;
1302		for (;;) {
1303		Thread.State s = thread.getState();
1304		if (s == Thread.State.BLOCKED ||
#	Line 1092 | Line 1307 | public class JSR166TestCase extends Test
1307		return;
1308		else if (s == Thread.State.TERMINATED)
1309		fail("Unexpected thread termination");
1310	+	else if (startTime == 0L)
1311	+	startTime = System.nanoTime();
1312		else if (millisElapsedSince(startTime) > timeoutMillis) {
1313		threadAssertTrue(thread.isAlive());
1314	<	return;
1314	>	fail("timed out waiting for thread to enter wait state");
1315	>	}
1316	>	Thread.yield();
1317	>	}
1318	>	}
1319	>
1320	>	/**
1321	>	* Spin-waits up to the specified number of milliseconds for the given
1322	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1323	>	* and additionally satisfy the given condition.
1324	>	*/
1325	>	void waitForThreadToEnterWaitState(
1326	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1327	>	long startTime = 0L;
1328	>	for (;;) {
1329	>	Thread.State s = thread.getState();
1330	>	if (s == Thread.State.BLOCKED ||
1331	>	s == Thread.State.WAITING ||
1332	>	s == Thread.State.TIMED_WAITING) {
1333	>	try {
1334	>	if (waitingForGodot.call())
1335	>	return;
1336	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1337	>	}
1338	>	else if (s == Thread.State.TERMINATED)
1339	>	fail("Unexpected thread termination");
1340	>	else if (startTime == 0L)
1341	>	startTime = System.nanoTime();
1342	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1343	>	threadAssertTrue(thread.isAlive());
1344	>	fail("timed out waiting for thread to enter wait state");
1345		}
1346		Thread.yield();
1347		}
1348		}
1349
1350		/**
1351	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1352	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1351	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1352	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1353		*/
1354		void waitForThreadToEnterWaitState(Thread thread) {
1355		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1356		}
1357
1358		/**
1359	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1360	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1361	+	* and additionally satisfy the given condition.
1362	+	*/
1363	+	void waitForThreadToEnterWaitState(
1364	+	Thread thread, Callable<Boolean> waitingForGodot) {
1365	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1366	+	}
1367	+
1368	+	/**
1369		* Returns the number of milliseconds since time given by
1370		* startNanoTime, which must have been previously returned from a
1371		* call to {@link System#nanoTime()}.
#	Line 1170 | Line 1427 | public class JSR166TestCase extends Test
1427		} finally {
1428		if (t.getState() != Thread.State.TERMINATED) {
1429		t.interrupt();
1430	<	fail("Test timed out");
1430	>	threadFail("timed out waiting for thread to terminate");
1431		}
1432		}
1433		}
#	Line 1319 | Line 1576 | public class JSR166TestCase extends Test
1576		}
1577
1578		class LatchAwaiter extends CheckedRunnable {
1579	<	final static int NEW = 0;
1580	<	final static int RUNNING = 1;
1581	<	final static int DONE = 2;
1579	>	static final int NEW = 0;
1580	>	static final int RUNNING = 1;
1581	>	static final int DONE = 2;
1582		final CountDownLatch latch;
1583		int state = NEW;
1584		LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
#	Line 1331 | Line 1588 | public class JSR166TestCase extends Test
1588		state = 2;
1589		}
1590		}
1591	<
1591	>
1592		public LatchAwaiter awaiter(CountDownLatch latch) {
1593		return new LatchAwaiter(latch);
1594		}
1595
1596	<	public void await(CountDownLatch latch) {
1596	>	public void await(CountDownLatch latch, long timeoutMillis) {
1597		try {
1598	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1598	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1599	>	fail("timed out waiting for CountDownLatch for "
1600	>	+ (timeoutMillis/1000) + " sec");
1601		} catch (Throwable fail) {
1602		threadUnexpectedException(fail);
1603		}
1604		}
1605
1606	+	public void await(CountDownLatch latch) {
1607	+	await(latch, LONG_DELAY_MS);
1608	+	}
1609	+
1610		public void await(Semaphore semaphore) {
1611		try {
1612	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1612	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1613	>	fail("timed out waiting for Semaphore for "
1614	>	+ (LONG_DELAY_MS/1000) + " sec");
1615	>	} catch (Throwable fail) {
1616	>	threadUnexpectedException(fail);
1617	>	}
1618	>	}
1619	>
1620	>	public void await(CyclicBarrier barrier) {
1621	>	try {
1622	>	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1623		} catch (Throwable fail) {
1624		threadUnexpectedException(fail);
1625		}
#	Line 1576 | Line 1849 | public class JSR166TestCase extends Test
1849		* A CyclicBarrier that uses timed await and fails with
1850		* AssertionFailedErrors instead of throwing checked exceptions.
1851		*/
1852	<	public class CheckedBarrier extends CyclicBarrier {
1852	>	public static class CheckedBarrier extends CyclicBarrier {
1853		public CheckedBarrier(int parties) { super(parties); }
1854
1855		public int await() {
#	Line 1640 | Line 1913 | public class JSR166TestCase extends Test
1913		}
1914		}
1915
1916	+	void assertImmutable(final Object o) {
1917	+	if (o instanceof Collection) {
1918	+	assertThrows(
1919	+	UnsupportedOperationException.class,
1920	+	new Runnable() { public void run() {
1921	+	((Collection) o).add(null);}});
1922	+	}
1923	+	}
1924	+
1925		@SuppressWarnings("unchecked")
1926		<T> T serialClone(T o) {
1927		try {
1928		ObjectInputStream ois = new ObjectInputStream
1929		(new ByteArrayInputStream(serialBytes(o)));
1930		T clone = (T) ois.readObject();
1931	+	if (o == clone) assertImmutable(o);
1932		assertSame(o.getClass(), clone.getClass());
1933		return clone;
1934		} catch (Throwable fail) {
#	Line 1654 | Line 1937 | public class JSR166TestCase extends Test
1937		}
1938		}
1939
1940	+	/**
1941	+	* A version of serialClone that leaves error handling (for
1942	+	* e.g. NotSerializableException) up to the caller.
1943	+	*/
1944	+	@SuppressWarnings("unchecked")
1945	+	<T> T serialClonePossiblyFailing(T o)
1946	+	throws ReflectiveOperationException, java.io.IOException {
1947	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1948	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1949	+	oos.writeObject(o);
1950	+	oos.flush();
1951	+	oos.close();
1952	+	ObjectInputStream ois = new ObjectInputStream
1953	+	(new ByteArrayInputStream(bos.toByteArray()));
1954	+	T clone = (T) ois.readObject();
1955	+	if (o == clone) assertImmutable(o);
1956	+	assertSame(o.getClass(), clone.getClass());
1957	+	return clone;
1958	+	}
1959	+
1960	+	/**
1961	+	* If o implements Cloneable and has a public clone method,
1962	+	* returns a clone of o, else null.
1963	+	*/
1964	+	@SuppressWarnings("unchecked")
1965	+	<T> T cloneableClone(T o) {
1966	+	if (!(o instanceof Cloneable)) return null;
1967	+	final T clone;
1968	+	try {
1969	+	clone = (T) o.getClass().getMethod("clone").invoke(o);
1970	+	} catch (NoSuchMethodException ok) {
1971	+	return null;
1972	+	} catch (ReflectiveOperationException unexpected) {
1973	+	throw new Error(unexpected);
1974	+	}
1975	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1976	+	assertSame(o.getClass(), clone.getClass());
1977	+	return clone;
1978	+	}
1979	+
1980		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1981		Runnable... throwingActions) {
1982		for (Runnable throwingAction : throwingActions) {
#	Line 1682 | Line 2005 | public class JSR166TestCase extends Test
2005		} catch (NoSuchElementException success) {}
2006		assertFalse(it.hasNext());
2007		}
2008	+
2009	+	public <T> Callable<T> callableThrowing(final Exception ex) {
2010	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
2011	+	}
2012	+
2013	+	public Runnable runnableThrowing(final RuntimeException ex) {
2014	+	return new Runnable() { public void run() { throw ex; }};
2015	+	}
2016	+
2017	+	/** A reusable thread pool to be shared by tests. */
2018	+	static final ExecutorService cachedThreadPool =
2019	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2020	+	1000L, MILLISECONDS,
2021	+	new SynchronousQueue<Runnable>());
2022	+
2023	+	static <T> void shuffle(T[] array) {
2024	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2025	+	}
2026		}

Diff Legend

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