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.144 by jsr166, Mon Sep 14 03:14:01 2015 UTC vs.
Revision 1.219 by jsr166, Sat Feb 18 16:37:49 2017 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	+	/*
10	+	* @test
11	+	* @summary JSR-166 tck tests (conformance testing mode)
12	+	* @build *
13	+	* @modules java.management
14	+	* @run junit/othervm/timeout=1000 JSR166TestCase
15	+	*/
16	+
17	+	/*
18	+	* @test
19	+	* @summary JSR-166 tck tests (whitebox tests allowed)
20	+	* @build *
21	+	* @modules java.base/java.util.concurrent:open
22	+	*          java.base/java.lang:open
23	+	*          java.management
24	+	* @run junit/othervm/timeout=1000
25	+	*      -Djsr166.testImplementationDetails=true
26	+	*      JSR166TestCase
27	+	* @run junit/othervm/timeout=1000
28	+	*      -Djsr166.testImplementationDetails=true
29	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
30	+	*      JSR166TestCase
31	+	* @run junit/othervm/timeout=1000
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	+	*      -Djsr166.testImplementationDetails=true
38	+	*      JSR166TestCase
39	+	*/
40	+
41		import static java.util.concurrent.TimeUnit.MILLISECONDS;
42	+	import static java.util.concurrent.TimeUnit.MINUTES;
43		import static java.util.concurrent.TimeUnit.NANOSECONDS;
44
45		import java.io.ByteArrayInputStream;
#	Line 15 | Line 48 | import java.io.ObjectInputStream;
48		import java.io.ObjectOutputStream;
49		import java.lang.management.ManagementFactory;
50		import java.lang.management.ThreadInfo;
51	+	import java.lang.management.ThreadMXBean;
52		import java.lang.reflect.Constructor;
53		import java.lang.reflect.Method;
54		import java.lang.reflect.Modifier;
55	+	import java.nio.file.Files;
56	+	import java.nio.file.Paths;
57		import java.security.CodeSource;
58		import java.security.Permission;
59		import java.security.PermissionCollection;
#	Line 27 | 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 40 | Line 78 | import java.util.concurrent.CyclicBarrie
78		import java.util.concurrent.ExecutionException;
79		import java.util.concurrent.Executors;
80		import java.util.concurrent.ExecutorService;
81	+	import java.util.concurrent.ForkJoinPool;
82		import java.util.concurrent.Future;
83		import java.util.concurrent.RecursiveAction;
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.Matcher;
95		import java.util.regex.Pattern;
96
97		import junit.framework.AssertionFailedError;
#	Line 106 | Line 149 | import junit.framework.TestSuite;
149		* methods as there are exceptions the method can throw. Sometimes
150		* there are multiple tests per JSR166 method when the different
151		* "normal" behaviors differ significantly. And sometimes testcases
152	<	* cover multiple methods when they cannot be tested in
110	<	* isolation.
152	>	* cover multiple methods when they cannot be tested in isolation.
153		*
154		* <li>The documentation style for testcases is to provide as javadoc
155		* a simple sentence or two describing the property that the testcase
#	Line 170 | Line 212 | public class JSR166TestCase extends Test
212		private static final int suiteRuns =
213		Integer.getInteger("jsr166.suiteRuns", 1);
214
215	+	/**
216	+	* Returns the value of the system property, or NaN if not defined.
217	+	*/
218	+	private static float systemPropertyValue(String name) {
219	+	String floatString = System.getProperty(name);
220	+	if (floatString == null)
221	+	return Float.NaN;
222	+	try {
223	+	return Float.parseFloat(floatString);
224	+	} catch (NumberFormatException ex) {
225	+	throw new IllegalArgumentException(
226	+	String.format("Bad float value in system property %s=%s",
227	+	name, floatString));
228	+	}
229	+	}
230	+
231	+	/**
232	+	* The scaling factor to apply to standard delays used in tests.
233	+	* May be initialized from any of:
234	+	* - the "jsr166.delay.factor" system property
235	+	* - the "test.timeout.factor" system property (as used by jtreg)
236	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
237	+	* - hard-coded fuzz factor when using a known slowpoke VM
238	+	*/
239	+	private static final float delayFactor = delayFactor();
240	+
241	+	private static float delayFactor() {
242	+	float x;
243	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
244	+	return x;
245	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
246	+	return x;
247	+	String prop = System.getProperty("java.vm.version");
248	+	if (prop != null && prop.matches(".*debug.*"))
249	+	return 4.0f; // How much slower is fastdebug than product?!
250	+	return 1.0f;
251	+	}
252	+
253		public JSR166TestCase() { super(); }
254		public JSR166TestCase(String name) { super(name); }
255
#	Line 185 | Line 265 | public class JSR166TestCase extends Test
265		return (regex == null) ? null : Pattern.compile(regex);
266		}
267
268	<	protected void runTest() throws Throwable {
268	>	// Instrumentation to debug very rare, but very annoying hung test runs.
269	>	static volatile TestCase currentTestCase;
270	>	// static volatile int currentRun = 0;
271	>	static {
272	>	Runnable checkForWedgedTest = new Runnable() { public void run() {
273	>	// Avoid spurious reports with enormous runsPerTest.
274	>	// A single test case run should never take more than 1 second.
275	>	// But let's cap it at the high end too ...
276	>	final int timeoutMinutes =
277	>	Math.min(15, Math.max(runsPerTest / 60, 1));
278	>	for (TestCase lastTestCase = currentTestCase;;) {
279	>	try { MINUTES.sleep(timeoutMinutes); }
280	>	catch (InterruptedException unexpected) { break; }
281	>	if (lastTestCase == currentTestCase) {
282	>	System.err.printf(
283	>	"Looks like we're stuck running test: %s%n",
284	>	lastTestCase);
285	>	//                     System.err.printf(
286	>	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
287	>	//                         lastTestCase, currentRun, runsPerTest);
288	>	//                     System.err.println("availableProcessors=" +
289	>	//                         Runtime.getRuntime().availableProcessors());
290	>	//                     System.err.printf("cpu model = %s%n", cpuModel());
291	>	dumpTestThreads();
292	>	// one stack dump is probably enough; more would be spam
293	>	break;
294	>	}
295	>	lastTestCase = currentTestCase;
296	>	}}};
297	>	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
298	>	thread.setDaemon(true);
299	>	thread.start();
300	>	}
301	>
302	>	//     public static String cpuModel() {
303	>	//         try {
304	>	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
305	>	//                 .matcher(new String(
306	>	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
307	>	//             matcher.find();
308	>	//             return matcher.group(1);
309	>	//         } catch (Exception ex) { return null; }
310	>	//     }
311	>
312	>	public void runBare() throws Throwable {
313	>	currentTestCase = this;
314		if (methodFilter == null
315	<	|| methodFilter.matcher(toString()).find()) {
316	<	for (int i = 0; i < runsPerTest; i++) {
317	<	if (profileTests)
318	<	runTestProfiled();
319	<	else
320	<	super.runTest();
321	<	}
315	>	|| methodFilter.matcher(toString()).find())
316	>	super.runBare();
317	>	}
318	>
319	>	protected void runTest() throws Throwable {
320	>	for (int i = 0; i < runsPerTest; i++) {
321	>	// currentRun = i;
322	>	if (profileTests)
323	>	runTestProfiled();
324	>	else
325	>	super.runTest();
326		}
327		}
328
329		protected void runTestProfiled() throws Throwable {
330	<	// Warmup run, notably to trigger all needed classloading.
331	<	super.runTest();
203	<	long t0 = System.nanoTime();
204	<	try {
330	>	for (int i = 0; i < 2; i++) {
331	>	long startTime = System.nanoTime();
332		super.runTest();
333	<	} finally {
334	<	long elapsedMillis = millisElapsedSince(t0);
335	<	if (elapsedMillis >= profileThreshold)
333	>	long elapsedMillis = millisElapsedSince(startTime);
334	>	if (elapsedMillis < profileThreshold)
335	>	break;
336	>	// Never report first run of any test; treat it as a
337	>	// warmup run, notably to trigger all needed classloading,
338	>	if (i > 0)
339		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
340		}
341		}
#	Line 217 | Line 347 | public class JSR166TestCase extends Test
347		main(suite(), args);
348		}
349
350	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
351	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
352	+	long runTime;
353	+	public void startTest(Test test) {}
354	+	protected void printHeader(long runTime) {
355	+	this.runTime = runTime; // defer printing for later
356	+	}
357	+	protected void printFooter(TestResult result) {
358	+	if (result.wasSuccessful()) {
359	+	getWriter().println("OK (" + result.runCount() + " tests)"
360	+	+ "  Time: " + elapsedTimeAsString(runTime));
361	+	} else {
362	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
363	+	super.printFooter(result);
364	+	}
365	+	}
366	+	}
367	+
368	+	/**
369	+	* Returns a TestRunner that doesn't bother with unnecessary
370	+	* fluff, like printing a "." for each test case.
371	+	*/
372	+	static junit.textui.TestRunner newPithyTestRunner() {
373	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
374	+	runner.setPrinter(new PithyResultPrinter(System.out));
375	+	return runner;
376	+	}
377	+
378		/**
379		* Runs all unit tests in the given test suite.
380		* Actual behavior influenced by jsr166.* system properties.
#	Line 228 | Line 386 | public class JSR166TestCase extends Test
386		System.setSecurityManager(new SecurityManager());
387		}
388		for (int i = 0; i < suiteRuns; i++) {
389	<	TestResult result = junit.textui.TestRunner.run(suite);
389	>	TestResult result = newPithyTestRunner().doRun(suite);
390		if (!result.wasSuccessful())
391		System.exit(1);
392		System.gc();
#	Line 312 | Line 470 | public class JSR166TestCase extends Test
470		AbstractQueuedLongSynchronizerTest.suite(),
471		ArrayBlockingQueueTest.suite(),
472		ArrayDequeTest.suite(),
473	+	ArrayListTest.suite(),
474		AtomicBooleanTest.suite(),
475		AtomicIntegerArrayTest.suite(),
476		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 334 | Line 493 | public class JSR166TestCase extends Test
493		CopyOnWriteArrayListTest.suite(),
494		CopyOnWriteArraySetTest.suite(),
495		CountDownLatchTest.suite(),
496	+	CountedCompleterTest.suite(),
497		CyclicBarrierTest.suite(),
498		DelayQueueTest.suite(),
499		EntryTest.suite(),
#	Line 362 | Line 522 | public class JSR166TestCase extends Test
522		TreeMapTest.suite(),
523		TreeSetTest.suite(),
524		TreeSubMapTest.suite(),
525	<	TreeSubSetTest.suite());
525	>	TreeSubSetTest.suite(),
526	>	VectorTest.suite());
527
528		// Java8+ test classes
529		if (atLeastJava8()) {
530		String[] java8TestClassNames = {
531	+	"ArrayDeque8Test",
532		"Atomic8Test",
533		"CompletableFutureTest",
534		"ConcurrentHashMap8Test",
535	<	"CountedCompleterTest",
535	>	"CountedCompleter8Test",
536		"DoubleAccumulatorTest",
537		"DoubleAdderTest",
538		"ForkJoinPool8Test",
539		"ForkJoinTask8Test",
540	+	"LinkedBlockingDeque8Test",
541	+	"LinkedBlockingQueue8Test",
542		"LongAccumulatorTest",
543		"LongAdderTest",
544		"SplittableRandomTest",
545		"StampedLockTest",
546		"SubmissionPublisherTest",
547		"ThreadLocalRandom8Test",
548	+	"TimeUnit8Test",
549		};
550		addNamedTestClasses(suite, java8TestClassNames);
551		}
#	Line 388 | Line 553 | public class JSR166TestCase extends Test
553		// Java9+ test classes
554		if (atLeastJava9()) {
555		String[] java9TestClassNames = {
556	<	// Currently empty, but expecting varhandle tests
556	>	"AtomicBoolean9Test",
557	>	"AtomicInteger9Test",
558	>	"AtomicIntegerArray9Test",
559	>	"AtomicLong9Test",
560	>	"AtomicLongArray9Test",
561	>	"AtomicReference9Test",
562	>	"AtomicReferenceArray9Test",
563	>	"ExecutorCompletionService9Test",
564	>	"ForkJoinPool9Test",
565		};
566		addNamedTestClasses(suite, java9TestClassNames);
567		}
#	Line 399 | Line 572 | public class JSR166TestCase extends Test
572		/** Returns list of junit-style test method names in given class. */
573		public static ArrayList<String> testMethodNames(Class<?> testClass) {
574		Method[] methods = testClass.getDeclaredMethods();
575	<	ArrayList<String> names = new ArrayList<String>(methods.length);
575	>	ArrayList<String> names = new ArrayList<>(methods.length);
576		for (Method method : methods) {
577		if (method.getName().startsWith("test")
578		&& Modifier.isPublic(method.getModifiers())
#	Line 455 | Line 628 | public class JSR166TestCase extends Test
628		} else {
629		return new TestSuite();
630		}
458	–
631		}
632
633		// Delays for timing-dependent tests, in milliseconds.
#	Line 466 | Line 638 | public class JSR166TestCase extends Test
638		public static long LONG_DELAY_MS;
639
640		/**
641	<	* Returns the shortest timed delay. This could
642	<	* be reimplemented to use for example a Property.
641	>	* Returns the shortest timed delay. This can be scaled up for
642	>	* slow machines using the jsr166.delay.factor system property,
643	>	* or via jtreg's -timeoutFactor: flag.
644	>	* http://openjdk.java.net/jtreg/command-help.html
645		*/
646		protected long getShortDelay() {
647	<	return 50;
647	>	return (long) (50 * delayFactor);
648		}
649
650		/**
#	Line 504 | Line 678 | public class JSR166TestCase extends Test
678		* The first exception encountered if any threadAssertXXX method fails.
679		*/
680		private final AtomicReference<Throwable> threadFailure
681	<	= new AtomicReference<Throwable>(null);
681	>	= new AtomicReference<>(null);
682
683		/**
684		* Records an exception so that it can be rethrown later in the test
#	Line 513 | Line 687 | public class JSR166TestCase extends Test
687		* the same test have no effect.
688		*/
689		public void threadRecordFailure(Throwable t) {
690	+	System.err.println(t);
691	+	dumpTestThreads();
692		threadFailure.compareAndSet(null, t);
693		}
694
#	Line 520 | Line 696 | public class JSR166TestCase extends Test
696		setDelays();
697		}
698
699	+	void tearDownFail(String format, Object... args) {
700	+	String msg = toString() + ": " + String.format(format, args);
701	+	System.err.println(msg);
702	+	dumpTestThreads();
703	+	throw new AssertionFailedError(msg);
704	+	}
705	+
706		/**
707		* Extra checks that get done for all test cases.
708		*
#	Line 547 | Line 730 | public class JSR166TestCase extends Test
730		}
731
732		if (Thread.interrupted())
733	<	throw new AssertionFailedError("interrupt status set in main thread");
733	>	tearDownFail("interrupt status set in main thread");
734
735		checkForkJoinPoolThreadLeaks();
736		}
737
738		/**
739	<	* Finds missing try { ... } finally { joinPool(e); }
739	>	* Finds missing PoolCleaners
740		*/
741		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
742	<	Thread[] survivors = new Thread[5];
742	>	Thread[] survivors = new Thread[7];
743		int count = Thread.enumerate(survivors);
744		for (int i = 0; i < count; i++) {
745		Thread thread = survivors[i];
#	Line 564 | Line 747 | public class JSR166TestCase extends Test
747		if (name.startsWith("ForkJoinPool-")) {
748		// give thread some time to terminate
749		thread.join(LONG_DELAY_MS);
750	<	if (!thread.isAlive()) continue;
751	<	throw new AssertionFailedError
752	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
570	<	toString(), name));
750	>	if (thread.isAlive())
751	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
752	>	thread);
753		}
754		}
755	+
756	+	if (!ForkJoinPool.commonPool()
757	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
758	+	tearDownFail("ForkJoin common pool thread stuck");
759		}
760
761		/**
#	Line 582 | Line 768 | public class JSR166TestCase extends Test
768		fail(reason);
769		} catch (AssertionFailedError t) {
770		threadRecordFailure(t);
771	<	fail(reason);
771	>	throw t;
772		}
773		}
774
#	Line 709 | Line 895 | public class JSR166TestCase extends Test
895		/**
896		* Delays, via Thread.sleep, for the given millisecond delay, but
897		* if the sleep is shorter than specified, may re-sleep or yield
898	<	* until time elapses.
898	>	* until time elapses.  Ensures that the given time, as measured
899	>	* by System.nanoTime(), has elapsed.
900		*/
901		static void delay(long millis) throws InterruptedException {
902	<	long startTime = System.nanoTime();
903	<	long ns = millis * 1000 * 1000;
904	<	for (;;) {
902	>	long nanos = millis * (1000 * 1000);
903	>	final long wakeupTime = System.nanoTime() + nanos;
904	>	do {
905		if (millis > 0L)
906		Thread.sleep(millis);
907		else // too short to sleep
908		Thread.yield();
909	<	long d = ns - (System.nanoTime() - startTime);
910	<	if (d > 0L)
911	<	millis = d / (1000 * 1000);
912	<	else
913	<	break;
909	>	nanos = wakeupTime - System.nanoTime();
910	>	millis = nanos / (1000 * 1000);
911	>	} while (nanos >= 0L);
912	>	}
913	>
914	>	/**
915	>	* Allows use of try-with-resources with per-test thread pools.
916	>	*/
917	>	class PoolCleaner implements AutoCloseable {
918	>	private final ExecutorService pool;
919	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
920	>	public void close() { joinPool(pool); }
921	>	}
922	>
923	>	/**
924	>	* An extension of PoolCleaner that has an action to release the pool.
925	>	*/
926	>	class PoolCleanerWithReleaser extends PoolCleaner {
927	>	private final Runnable releaser;
928	>	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
929	>	super(pool);
930	>	this.releaser = releaser;
931	>	}
932	>	public void close() {
933	>	try {
934	>	releaser.run();
935	>	} finally {
936	>	super.close();
937	>	}
938		}
939		}
940
941	+	PoolCleaner cleaner(ExecutorService pool) {
942	+	return new PoolCleaner(pool);
943	+	}
944	+
945	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
946	+	return new PoolCleanerWithReleaser(pool, releaser);
947	+	}
948	+
949	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
950	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
951	+	}
952	+
953	+	Runnable releaser(final CountDownLatch latch) {
954	+	return new Runnable() { public void run() {
955	+	do { latch.countDown(); }
956	+	while (latch.getCount() > 0);
957	+	}};
958	+	}
959	+
960	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
961	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
962	+	}
963	+
964	+	Runnable releaser(final AtomicBoolean flag) {
965	+	return new Runnable() { public void run() { flag.set(true); }};
966	+	}
967	+
968		/**
969		* Waits out termination of a thread pool or fails doing so.
970		*/
971		void joinPool(ExecutorService pool) {
972		try {
973		pool.shutdown();
974	<	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
975	<	fail("ExecutorService " + pool +
976	<	" did not terminate in a timely manner");
974	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
975	>	try {
976	>	threadFail("ExecutorService " + pool +
977	>	" did not terminate in a timely manner");
978	>	} finally {
979	>	// last resort, for the benefit of subsequent tests
980	>	pool.shutdownNow();
981	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
982	>	}
983	>	}
984		} catch (SecurityException ok) {
985		// Allowed in case test doesn't have privs
986		} catch (InterruptedException fail) {
987	<	fail("Unexpected InterruptedException");
987	>	threadFail("Unexpected InterruptedException");
988		}
989		}
990
991	<	/** Like Runnable, but with the freedom to throw anything */
991	>	/**
992	>	* Like Runnable, but with the freedom to throw anything.
993	>	* junit folks had the same idea:
994	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
995	>	*/
996		interface Action { public void run() throws Throwable; }
997
998		/**
#	Line 753 | Line 1002 | public class JSR166TestCase extends Test
1002		*/
1003		void testInParallel(Action ... actions) {
1004		ExecutorService pool = Executors.newCachedThreadPool();
1005	<	try {
1005	>	try (PoolCleaner cleaner = cleaner(pool)) {
1006		ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1007		for (final Action action : actions)
1008		futures.add(pool.submit(new CheckedRunnable() {
#	Line 766 | Line 1015 | public class JSR166TestCase extends Test
1015		} catch (Exception ex) {
1016		threadUnexpectedException(ex);
1017		}
769	–	} finally {
770	–	joinPool(pool);
1018		}
1019		}
1020
1021		/**
1022	<	* A debugging tool to print all stack traces, as jstack does.
1022	>	* A debugging tool to print stack traces of most threads, as jstack does.
1023	>	* Uninteresting threads are filtered out.
1024		*/
1025	<	static void printAllStackTraces() {
1026	<	for (ThreadInfo info :
1027	<	ManagementFactory.getThreadMXBean()
1028	<	.dumpAllThreads(true, true))
1025	>	static void dumpTestThreads() {
1026	>	SecurityManager sm = System.getSecurityManager();
1027	>	if (sm != null) {
1028	>	try {
1029	>	System.setSecurityManager(null);
1030	>	} catch (SecurityException giveUp) {
1031	>	return;
1032	>	}
1033	>	}
1034	>
1035	>	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1036	>	System.err.println("------ stacktrace dump start ------");
1037	>	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1038	>	final String name = info.getThreadName();
1039	>	String lockName;
1040	>	if ("Signal Dispatcher".equals(name))
1041	>	continue;
1042	>	if ("Reference Handler".equals(name)
1043	>	&& (lockName = info.getLockName()) != null
1044	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1045	>	continue;
1046	>	if ("Finalizer".equals(name)
1047	>	&& (lockName = info.getLockName()) != null
1048	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1049	>	continue;
1050	>	if ("checkForWedgedTest".equals(name))
1051	>	continue;
1052		System.err.print(info);
1053	+	}
1054	+	System.err.println("------ stacktrace dump end ------");
1055	+
1056	+	if (sm != null) System.setSecurityManager(sm);
1057		}
1058
1059		/**
#	Line 798 | Line 1073 | public class JSR166TestCase extends Test
1073		delay(millis);
1074		assertTrue(thread.isAlive());
1075		} catch (InterruptedException fail) {
1076	<	fail("Unexpected InterruptedException");
1076	>	threadFail("Unexpected InterruptedException");
1077		}
1078		}
1079
#	Line 820 | Line 1095 | public class JSR166TestCase extends Test
1095		for (Thread thread : threads)
1096		assertTrue(thread.isAlive());
1097		} catch (InterruptedException fail) {
1098	<	fail("Unexpected InterruptedException");
1098	>	threadFail("Unexpected InterruptedException");
1099		}
1100		}
1101
#	Line 965 | Line 1240 | public class JSR166TestCase extends Test
1240		}
1241		public void refresh() {}
1242		public String toString() {
1243	<	List<Permission> ps = new ArrayList<Permission>();
1243	>	List<Permission> ps = new ArrayList<>();
1244		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1245		ps.add(e.nextElement());
1246		return "AdjustablePolicy with permissions " + ps;
#	Line 995 | Line 1270 | public class JSR166TestCase extends Test
1270		* Sleeps until the given time has elapsed.
1271		* Throws AssertionFailedError if interrupted.
1272		*/
1273	<	void sleep(long millis) {
1273	>	static void sleep(long millis) {
1274		try {
1275		delay(millis);
1276		} catch (InterruptedException fail) {
#	Line 1011 | Line 1286 | public class JSR166TestCase extends Test
1286		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1287		*/
1288		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1289	<	long startTime = System.nanoTime();
1289	>	long startTime = 0L;
1290		for (;;) {
1291		Thread.State s = thread.getState();
1292		if (s == Thread.State.BLOCKED ||
#	Line 1020 | Line 1295 | public class JSR166TestCase extends Test
1295		return;
1296		else if (s == Thread.State.TERMINATED)
1297		fail("Unexpected thread termination");
1298	+	else if (startTime == 0L)
1299	+	startTime = System.nanoTime();
1300		else if (millisElapsedSince(startTime) > timeoutMillis) {
1301		threadAssertTrue(thread.isAlive());
1302	<	return;
1302	>	fail("timed out waiting for thread to enter wait state");
1303	>	}
1304	>	Thread.yield();
1305	>	}
1306	>	}
1307	>
1308	>	/**
1309	>	* Spin-waits up to the specified number of milliseconds for the given
1310	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1311	>	* and additionally satisfy the given condition.
1312	>	*/
1313	>	void waitForThreadToEnterWaitState(
1314	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1315	>	long startTime = 0L;
1316	>	for (;;) {
1317	>	Thread.State s = thread.getState();
1318	>	if (s == Thread.State.BLOCKED ||
1319	>	s == Thread.State.WAITING ||
1320	>	s == Thread.State.TIMED_WAITING) {
1321	>	try {
1322	>	if (waitingForGodot.call())
1323	>	return;
1324	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1325	>	}
1326	>	else if (s == Thread.State.TERMINATED)
1327	>	fail("Unexpected thread termination");
1328	>	else if (startTime == 0L)
1329	>	startTime = System.nanoTime();
1330	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1331	>	threadAssertTrue(thread.isAlive());
1332	>	fail("timed out waiting for thread to enter wait state");
1333		}
1334		Thread.yield();
1335		}
1336		}
1337
1338		/**
1339	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1340	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1339	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1340	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1341		*/
1342		void waitForThreadToEnterWaitState(Thread thread) {
1343		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1344		}
1345
1346		/**
1347	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1348	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1349	+	* and additionally satisfy the given condition.
1350	+	*/
1351	+	void waitForThreadToEnterWaitState(
1352	+	Thread thread, Callable<Boolean> waitingForGodot) {
1353	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1354	+	}
1355	+
1356	+	/**
1357		* Returns the number of milliseconds since time given by
1358		* startNanoTime, which must have been previously returned from a
1359		* call to {@link System#nanoTime()}.
#	Line 1098 | Line 1415 | public class JSR166TestCase extends Test
1415		} finally {
1416		if (t.getState() != Thread.State.TERMINATED) {
1417		t.interrupt();
1418	<	fail("Test timed out");
1418	>	threadFail("timed out waiting for thread to terminate");
1419		}
1420		}
1421		}
#	Line 1239 | Line 1556 | public class JSR166TestCase extends Test
1556		}};
1557		}
1558
1559	<	public Runnable awaiter(final CountDownLatch latch) {
1559	>	public Runnable countDowner(final CountDownLatch latch) {
1560		return new CheckedRunnable() {
1561		public void realRun() throws InterruptedException {
1562	<	await(latch);
1562	>	latch.countDown();
1563		}};
1564		}
1565
1566	<	public void await(CountDownLatch latch) {
1566	>	class LatchAwaiter extends CheckedRunnable {
1567	>	static final int NEW = 0;
1568	>	static final int RUNNING = 1;
1569	>	static final int DONE = 2;
1570	>	final CountDownLatch latch;
1571	>	int state = NEW;
1572	>	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1573	>	public void realRun() throws InterruptedException {
1574	>	state = 1;
1575	>	await(latch);
1576	>	state = 2;
1577	>	}
1578	>	}
1579	>
1580	>	public LatchAwaiter awaiter(CountDownLatch latch) {
1581	>	return new LatchAwaiter(latch);
1582	>	}
1583	>
1584	>	public void await(CountDownLatch latch, long timeoutMillis) {
1585		try {
1586	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1586	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1587	>	fail("timed out waiting for CountDownLatch for "
1588	>	+ (timeoutMillis/1000) + " sec");
1589		} catch (Throwable fail) {
1590		threadUnexpectedException(fail);
1591		}
1592		}
1593
1594	+	public void await(CountDownLatch latch) {
1595	+	await(latch, LONG_DELAY_MS);
1596	+	}
1597	+
1598		public void await(Semaphore semaphore) {
1599		try {
1600	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1600	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1601	>	fail("timed out waiting for Semaphore for "
1602	>	+ (LONG_DELAY_MS/1000) + " sec");
1603		} catch (Throwable fail) {
1604		threadUnexpectedException(fail);
1605		}
#	Line 1486 | Line 1829 | public class JSR166TestCase extends Test
1829		* A CyclicBarrier that uses timed await and fails with
1830		* AssertionFailedErrors instead of throwing checked exceptions.
1831		*/
1832	<	public class CheckedBarrier extends CyclicBarrier {
1832	>	public static class CheckedBarrier extends CyclicBarrier {
1833		public CheckedBarrier(int parties) { super(parties); }
1834
1835		public int await() {
#	Line 1550 | Line 1893 | public class JSR166TestCase extends Test
1893		}
1894		}
1895
1896	+	void assertImmutable(final Object o) {
1897	+	if (o instanceof Collection) {
1898	+	assertThrows(
1899	+	UnsupportedOperationException.class,
1900	+	new Runnable() { public void run() {
1901	+	((Collection) o).add(null);}});
1902	+	}
1903	+	}
1904	+
1905		@SuppressWarnings("unchecked")
1906		<T> T serialClone(T o) {
1907		try {
1908		ObjectInputStream ois = new ObjectInputStream
1909		(new ByteArrayInputStream(serialBytes(o)));
1910		T clone = (T) ois.readObject();
1911	+	if (o == clone) assertImmutable(o);
1912		assertSame(o.getClass(), clone.getClass());
1913		return clone;
1914		} catch (Throwable fail) {
#	Line 1564 | Line 1917 | public class JSR166TestCase extends Test
1917		}
1918		}
1919
1920	+	/**
1921	+	* A version of serialClone that leaves error handling (for
1922	+	* e.g. NotSerializableException) up to the caller.
1923	+	*/
1924	+	@SuppressWarnings("unchecked")
1925	+	<T> T serialClonePossiblyFailing(T o)
1926	+	throws ReflectiveOperationException, java.io.IOException {
1927	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1928	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1929	+	oos.writeObject(o);
1930	+	oos.flush();
1931	+	oos.close();
1932	+	ObjectInputStream ois = new ObjectInputStream
1933	+	(new ByteArrayInputStream(bos.toByteArray()));
1934	+	T clone = (T) ois.readObject();
1935	+	if (o == clone) assertImmutable(o);
1936	+	assertSame(o.getClass(), clone.getClass());
1937	+	return clone;
1938	+	}
1939	+
1940	+	/**
1941	+	* If o implements Cloneable and has a public clone method,
1942	+	* returns a clone of o, else null.
1943	+	*/
1944	+	@SuppressWarnings("unchecked")
1945	+	<T> T cloneableClone(T o) {
1946	+	if (!(o instanceof Cloneable)) return null;
1947	+	final T clone;
1948	+	try {
1949	+	clone = (T) o.getClass().getMethod("clone").invoke(o);
1950	+	} catch (NoSuchMethodException ok) {
1951	+	return null;
1952	+	} catch (ReflectiveOperationException unexpected) {
1953	+	throw new Error(unexpected);
1954	+	}
1955	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1956	+	assertSame(o.getClass(), clone.getClass());
1957	+	return clone;
1958	+	}
1959	+
1960		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1961		Runnable... throwingActions) {
1962		for (Runnable throwingAction : throwingActions) {
#	Line 1592 | Line 1985 | public class JSR166TestCase extends Test
1985		} catch (NoSuchElementException success) {}
1986		assertFalse(it.hasNext());
1987		}
1988	+
1989	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1990	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1991	+	}
1992	+
1993	+	public Runnable runnableThrowing(final RuntimeException ex) {
1994	+	return new Runnable() { public void run() { throw ex; }};
1995	+	}
1996	+
1997	+	/** A reusable thread pool to be shared by tests. */
1998	+	static final ExecutorService cachedThreadPool =
1999	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2000	+	1000L, MILLISECONDS,
2001	+	new SynchronousQueue<Runnable>());
2002	+
2003	+	static <T> void shuffle(T[] array) {
2004	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2005	+	}
2006		}

Diff Legend

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