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.158 by jsr166, Sat Oct 3 23:17:03 2015 UTC vs.
Revision 1.215 by jsr166, Sat Dec 10 18:11:05 2016 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.management
23	+	* @run junit/othervm/timeout=1000
24	+	*      -Djsr166.testImplementationDetails=true
25	+	*      JSR166TestCase
26	+	* @run junit/othervm/timeout=1000
27	+	*      -Djsr166.testImplementationDetails=true
28	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
29	+	*      JSR166TestCase
30	+	* @run junit/othervm/timeout=1000
31	+	*      -Djsr166.testImplementationDetails=true
32	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
33	+	*      -Djava.util.secureRandomSeed=true
34	+	*      JSR166TestCase
35	+	*/
36	+
37		import static java.util.concurrent.TimeUnit.MILLISECONDS;
38		import static java.util.concurrent.TimeUnit.MINUTES;
39		import static java.util.concurrent.TimeUnit.NANOSECONDS;
#	Line 20 | Line 48 | import java.lang.management.ThreadMXBean
48		import java.lang.reflect.Constructor;
49		import java.lang.reflect.Method;
50		import java.lang.reflect.Modifier;
51	+	import java.nio.file.Files;
52	+	import java.nio.file.Paths;
53		import java.security.CodeSource;
54		import java.security.Permission;
55		import java.security.PermissionCollection;
#	Line 29 | Line 59 | import java.security.ProtectionDomain;
59		import java.security.SecurityPermission;
60		import java.util.ArrayList;
61		import java.util.Arrays;
62	+	import java.util.Collection;
63	+	import java.util.Collections;
64		import java.util.Date;
65		import java.util.Enumeration;
66		import java.util.Iterator;
#	Line 48 | Line 80 | import java.util.concurrent.RecursiveAct
80		import java.util.concurrent.RecursiveTask;
81		import java.util.concurrent.RejectedExecutionHandler;
82		import java.util.concurrent.Semaphore;
83	+	import java.util.concurrent.SynchronousQueue;
84		import java.util.concurrent.ThreadFactory;
85	+	import java.util.concurrent.ThreadLocalRandom;
86		import java.util.concurrent.ThreadPoolExecutor;
87		import java.util.concurrent.TimeoutException;
88	+	import java.util.concurrent.atomic.AtomicBoolean;
89		import java.util.concurrent.atomic.AtomicReference;
90	+	import java.util.regex.Matcher;
91		import java.util.regex.Pattern;
92
93		import junit.framework.AssertionFailedError;
#	Line 109 | Line 145 | import junit.framework.TestSuite;
145		* methods as there are exceptions the method can throw. Sometimes
146		* there are multiple tests per JSR166 method when the different
147		* "normal" behaviors differ significantly. And sometimes testcases
148	<	* cover multiple methods when they cannot be tested in
113	<	* isolation.
148	>	* cover multiple methods when they cannot be tested in isolation.
149		*
150		* <li>The documentation style for testcases is to provide as javadoc
151		* a simple sentence or two describing the property that the testcase
#	Line 173 | Line 208 | public class JSR166TestCase extends Test
208		private static final int suiteRuns =
209		Integer.getInteger("jsr166.suiteRuns", 1);
210
211	+	/**
212	+	* Returns the value of the system property, or NaN if not defined.
213	+	*/
214	+	private static float systemPropertyValue(String name) {
215	+	String floatString = System.getProperty(name);
216	+	if (floatString == null)
217	+	return Float.NaN;
218	+	try {
219	+	return Float.parseFloat(floatString);
220	+	} catch (NumberFormatException ex) {
221	+	throw new IllegalArgumentException(
222	+	String.format("Bad float value in system property %s=%s",
223	+	name, floatString));
224	+	}
225	+	}
226	+
227	+	/**
228	+	* The scaling factor to apply to standard delays used in tests.
229	+	* May be initialized from any of:
230	+	* - the "jsr166.delay.factor" system property
231	+	* - the "test.timeout.factor" system property (as used by jtreg)
232	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
233	+	* - hard-coded fuzz factor when using a known slowpoke VM
234	+	*/
235	+	private static final float delayFactor = delayFactor();
236	+
237	+	private static float delayFactor() {
238	+	float x;
239	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
240	+	return x;
241	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
242	+	return x;
243	+	String prop = System.getProperty("java.vm.version");
244	+	if (prop != null && prop.matches(".*debug.*"))
245	+	return 4.0f; // How much slower is fastdebug than product?!
246	+	return 1.0f;
247	+	}
248	+
249		public JSR166TestCase() { super(); }
250		public JSR166TestCase(String name) { super(name); }
251
#	Line 188 | Line 261 | public class JSR166TestCase extends Test
261		return (regex == null) ? null : Pattern.compile(regex);
262		}
263
264	+	// Instrumentation to debug very rare, but very annoying hung test runs.
265		static volatile TestCase currentTestCase;
266	+	// static volatile int currentRun = 0;
267		static {
268		Runnable checkForWedgedTest = new Runnable() { public void run() {
269	<	// avoid spurious reports with enormous runsPerTest
270	<	final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
269	>	// Avoid spurious reports with enormous runsPerTest.
270	>	// A single test case run should never take more than 1 second.
271	>	// But let's cap it at the high end too ...
272	>	final int timeoutMinutes =
273	>	Math.min(15, Math.max(runsPerTest / 60, 1));
274		for (TestCase lastTestCase = currentTestCase;;) {
275		try { MINUTES.sleep(timeoutMinutes); }
276		catch (InterruptedException unexpected) { break; }
277		if (lastTestCase == currentTestCase) {
278	<	System.err.println
279	<	("Looks like we're stuck running test: "
280	<	+ lastTestCase);
278	>	System.err.printf(
279	>	"Looks like we're stuck running test: %s%n",
280	>	lastTestCase);
281	>	//                     System.err.printf(
282	>	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
283	>	//                         lastTestCase, currentRun, runsPerTest);
284	>	//                     System.err.println("availableProcessors=" +
285	>	//                         Runtime.getRuntime().availableProcessors());
286	>	//                     System.err.printf("cpu model = %s%n", cpuModel());
287		dumpTestThreads();
288	+	// one stack dump is probably enough; more would be spam
289	+	break;
290		}
291		lastTestCase = currentTestCase;
292		}}};
#	Line 209 | Line 295 | public class JSR166TestCase extends Test
295		thread.start();
296		}
297
298	+	//     public static String cpuModel() {
299	+	//         try {
300	+	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
301	+	//                 .matcher(new String(
302	+	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
303	+	//             matcher.find();
304	+	//             return matcher.group(1);
305	+	//         } catch (Exception ex) { return null; }
306	+	//     }
307	+
308		public void runBare() throws Throwable {
309		currentTestCase = this;
310		if (methodFilter == null
#	Line 218 | Line 314 | public class JSR166TestCase extends Test
314
315		protected void runTest() throws Throwable {
316		for (int i = 0; i < runsPerTest; i++) {
317	+	// currentRun = i;
318		if (profileTests)
319		runTestProfiled();
320		else
#	Line 246 | Line 343 | public class JSR166TestCase extends Test
343		main(suite(), args);
344		}
345
346	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
347	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
348	+	long runTime;
349	+	public void startTest(Test test) {}
350	+	protected void printHeader(long runTime) {
351	+	this.runTime = runTime; // defer printing for later
352	+	}
353	+	protected void printFooter(TestResult result) {
354	+	if (result.wasSuccessful()) {
355	+	getWriter().println("OK (" + result.runCount() + " tests)"
356	+	+ "  Time: " + elapsedTimeAsString(runTime));
357	+	} else {
358	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
359	+	super.printFooter(result);
360	+	}
361	+	}
362	+	}
363	+
364	+	/**
365	+	* Returns a TestRunner that doesn't bother with unnecessary
366	+	* fluff, like printing a "." for each test case.
367	+	*/
368	+	static junit.textui.TestRunner newPithyTestRunner() {
369	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
370	+	runner.setPrinter(new PithyResultPrinter(System.out));
371	+	return runner;
372	+	}
373	+
374		/**
375		* Runs all unit tests in the given test suite.
376		* Actual behavior influenced by jsr166.* system properties.
#	Line 257 | Line 382 | public class JSR166TestCase extends Test
382		System.setSecurityManager(new SecurityManager());
383		}
384		for (int i = 0; i < suiteRuns; i++) {
385	<	TestResult result = junit.textui.TestRunner.run(suite);
385	>	TestResult result = newPithyTestRunner().doRun(suite);
386		if (!result.wasSuccessful())
387		System.exit(1);
388		System.gc();
#	Line 341 | Line 466 | public class JSR166TestCase extends Test
466		AbstractQueuedLongSynchronizerTest.suite(),
467		ArrayBlockingQueueTest.suite(),
468		ArrayDequeTest.suite(),
469	+	ArrayListTest.suite(),
470		AtomicBooleanTest.suite(),
471		AtomicIntegerArrayTest.suite(),
472		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 363 | Line 489 | public class JSR166TestCase extends Test
489		CopyOnWriteArrayListTest.suite(),
490		CopyOnWriteArraySetTest.suite(),
491		CountDownLatchTest.suite(),
492	+	CountedCompleterTest.suite(),
493		CyclicBarrierTest.suite(),
494		DelayQueueTest.suite(),
495		EntryTest.suite(),
#	Line 391 | Line 518 | public class JSR166TestCase extends Test
518		TreeMapTest.suite(),
519		TreeSetTest.suite(),
520		TreeSubMapTest.suite(),
521	<	TreeSubSetTest.suite());
521	>	TreeSubSetTest.suite(),
522	>	VectorTest.suite());
523
524		// Java8+ test classes
525		if (atLeastJava8()) {
526		String[] java8TestClassNames = {
527	+	"ArrayDeque8Test",
528		"Atomic8Test",
529		"CompletableFutureTest",
530		"ConcurrentHashMap8Test",
531	<	"CountedCompleterTest",
531	>	"CountedCompleter8Test",
532		"DoubleAccumulatorTest",
533		"DoubleAdderTest",
534		"ForkJoinPool8Test",
535		"ForkJoinTask8Test",
536	+	"LinkedBlockingDeque8Test",
537	+	"LinkedBlockingQueue8Test",
538		"LongAccumulatorTest",
539		"LongAdderTest",
540		"SplittableRandomTest",
541		"StampedLockTest",
542		"SubmissionPublisherTest",
543		"ThreadLocalRandom8Test",
544	+	"TimeUnit8Test",
545		};
546		addNamedTestClasses(suite, java8TestClassNames);
547		}
#	Line 417 | Line 549 | public class JSR166TestCase extends Test
549		// Java9+ test classes
550		if (atLeastJava9()) {
551		String[] java9TestClassNames = {
552	<	// Currently empty, but expecting varhandle tests
552	>	"AtomicBoolean9Test",
553	>	"AtomicInteger9Test",
554	>	"AtomicIntegerArray9Test",
555	>	"AtomicLong9Test",
556	>	"AtomicLongArray9Test",
557	>	"AtomicReference9Test",
558	>	"AtomicReferenceArray9Test",
559	>	"ExecutorCompletionService9Test",
560		};
561		addNamedTestClasses(suite, java9TestClassNames);
562		}
#	Line 494 | Line 633 | public class JSR166TestCase extends Test
633		public static long LONG_DELAY_MS;
634
635		/**
636	<	* Returns the shortest timed delay. This could
637	<	* be reimplemented to use for example a Property.
636	>	* Returns the shortest timed delay. This can be scaled up for
637	>	* slow machines using the jsr166.delay.factor system property,
638	>	* or via jtreg's -timeoutFactor: flag.
639	>	* http://openjdk.java.net/jtreg/command-help.html
640		*/
641		protected long getShortDelay() {
642	<	return 50;
642	>	return (long) (50 * delayFactor);
643		}
644
645		/**
#	Line 590 | Line 731 | public class JSR166TestCase extends Test
731		}
732
733		/**
734	<	* Finds missing try { ... } finally { joinPool(e); }
734	>	* Finds missing PoolCleaners
735		*/
736		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
737		Thread[] survivors = new Thread[7];
#	Line 749 | Line 890 | public class JSR166TestCase extends Test
890		/**
891		* Delays, via Thread.sleep, for the given millisecond delay, but
892		* if the sleep is shorter than specified, may re-sleep or yield
893	<	* until time elapses.
893	>	* until time elapses.  Ensures that the given time, as measured
894	>	* by System.nanoTime(), has elapsed.
895		*/
896		static void delay(long millis) throws InterruptedException {
897	<	long startTime = System.nanoTime();
898	<	long ns = millis * 1000 * 1000;
899	<	for (;;) {
897	>	long nanos = millis * (1000 * 1000);
898	>	final long wakeupTime = System.nanoTime() + nanos;
899	>	do {
900		if (millis > 0L)
901		Thread.sleep(millis);
902		else // too short to sleep
903		Thread.yield();
904	<	long d = ns - (System.nanoTime() - startTime);
905	<	if (d > 0L)
906	<	millis = d / (1000 * 1000);
765	<	else
766	<	break;
767	<	}
904	>	nanos = wakeupTime - System.nanoTime();
905	>	millis = nanos / (1000 * 1000);
906	>	} while (nanos >= 0L);
907		}
908
909		/**
910		* Allows use of try-with-resources with per-test thread pools.
911		*/
912	<	class PoolCloser<T extends ExecutorService>
913	<	implements AutoCloseable {
914	<	public final T pool;
776	<	public PoolCloser(T pool) { this.pool = pool; }
912	>	class PoolCleaner implements AutoCloseable {
913	>	private final ExecutorService pool;
914	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
915		public void close() { joinPool(pool); }
916		}
917
918		/**
919	+	* An extension of PoolCleaner that has an action to release the pool.
920	+	*/
921	+	class PoolCleanerWithReleaser extends PoolCleaner {
922	+	private final Runnable releaser;
923	+	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
924	+	super(pool);
925	+	this.releaser = releaser;
926	+	}
927	+	public void close() {
928	+	try {
929	+	releaser.run();
930	+	} finally {
931	+	super.close();
932	+	}
933	+	}
934	+	}
935	+
936	+	PoolCleaner cleaner(ExecutorService pool) {
937	+	return new PoolCleaner(pool);
938	+	}
939	+
940	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
941	+	return new PoolCleanerWithReleaser(pool, releaser);
942	+	}
943	+
944	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
945	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
946	+	}
947	+
948	+	Runnable releaser(final CountDownLatch latch) {
949	+	return new Runnable() { public void run() {
950	+	do { latch.countDown(); }
951	+	while (latch.getCount() > 0);
952	+	}};
953	+	}
954	+
955	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
956	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
957	+	}
958	+
959	+	Runnable releaser(final AtomicBoolean flag) {
960	+	return new Runnable() { public void run() { flag.set(true); }};
961	+	}
962	+
963	+	/**
964		* Waits out termination of a thread pool or fails doing so.
965		*/
966		void joinPool(ExecutorService pool) {
#	Line 790 | Line 973 | public class JSR166TestCase extends Test
973		} finally {
974		// last resort, for the benefit of subsequent tests
975		pool.shutdownNow();
976	<	pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
976	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
977		}
978		}
979		} catch (SecurityException ok) {
#	Line 800 | Line 983 | public class JSR166TestCase extends Test
983		}
984		}
985
986	<	/** Like Runnable, but with the freedom to throw anything */
986	>	/**
987	>	* Like Runnable, but with the freedom to throw anything.
988	>	* junit folks had the same idea:
989	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
990	>	*/
991		interface Action { public void run() throws Throwable; }
992
993		/**
#	Line 809 | Line 996 | public class JSR166TestCase extends Test
996		* necessarily individually slow because they must block.
997		*/
998		void testInParallel(Action ... actions) {
999	<	try (PoolCloser<ExecutorService> poolCloser
1000	<	= new PoolCloser<>(Executors.newCachedThreadPool())) {
814	<	ExecutorService pool = poolCloser.pool;
999	>	ExecutorService pool = Executors.newCachedThreadPool();
1000	>	try (PoolCleaner cleaner = cleaner(pool)) {
1001		ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1002		for (final Action action : actions)
1003		futures.add(pool.submit(new CheckedRunnable() {
#	Line 832 | Line 1018 | public class JSR166TestCase extends Test
1018		* Uninteresting threads are filtered out.
1019		*/
1020		static void dumpTestThreads() {
1021	+	SecurityManager sm = System.getSecurityManager();
1022	+	if (sm != null) {
1023	+	try {
1024	+	System.setSecurityManager(null);
1025	+	} catch (SecurityException giveUp) {
1026	+	return;
1027	+	}
1028	+	}
1029	+
1030		ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1031		System.err.println("------ stacktrace dump start ------");
1032		for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1033	<	String name = info.getThreadName();
1033	>	final String name = info.getThreadName();
1034	>	String lockName;
1035		if ("Signal Dispatcher".equals(name))
1036		continue;
1037		if ("Reference Handler".equals(name)
1038	<	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1038	>	&& (lockName = info.getLockName()) != null
1039	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1040		continue;
1041		if ("Finalizer".equals(name)
1042	<	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1042	>	&& (lockName = info.getLockName()) != null
1043	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1044		continue;
1045		if ("checkForWedgedTest".equals(name))
1046		continue;
1047		System.err.print(info);
1048		}
1049		System.err.println("------ stacktrace dump end ------");
1050	+
1051	+	if (sm != null) System.setSecurityManager(sm);
1052		}
1053
1054		/**
#	Line 1065 | Line 1265 | public class JSR166TestCase extends Test
1265		* Sleeps until the given time has elapsed.
1266		* Throws AssertionFailedError if interrupted.
1267		*/
1268	<	void sleep(long millis) {
1268	>	static void sleep(long millis) {
1269		try {
1270		delay(millis);
1271		} catch (InterruptedException fail) {
#	Line 1081 | Line 1281 | public class JSR166TestCase extends Test
1281		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1282		*/
1283		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1284	<	long startTime = System.nanoTime();
1284	>	long startTime = 0L;
1285		for (;;) {
1286		Thread.State s = thread.getState();
1287		if (s == Thread.State.BLOCKED ||
#	Line 1090 | Line 1290 | public class JSR166TestCase extends Test
1290		return;
1291		else if (s == Thread.State.TERMINATED)
1292		fail("Unexpected thread termination");
1293	+	else if (startTime == 0L)
1294	+	startTime = System.nanoTime();
1295		else if (millisElapsedSince(startTime) > timeoutMillis) {
1296		threadAssertTrue(thread.isAlive());
1297		return;
#	Line 1168 | Line 1370 | public class JSR166TestCase extends Test
1370		} finally {
1371		if (t.getState() != Thread.State.TERMINATED) {
1372		t.interrupt();
1373	<	fail("Test timed out");
1373	>	threadFail("timed out waiting for thread to terminate");
1374		}
1375		}
1376		}
#	Line 1316 | Line 1518 | public class JSR166TestCase extends Test
1518		}};
1519		}
1520
1521	<	public Runnable awaiter(final CountDownLatch latch) {
1522	<	return new CheckedRunnable() {
1523	<	public void realRun() throws InterruptedException {
1524	<	await(latch);
1525	<	}};
1521	>	class LatchAwaiter extends CheckedRunnable {
1522	>	static final int NEW = 0;
1523	>	static final int RUNNING = 1;
1524	>	static final int DONE = 2;
1525	>	final CountDownLatch latch;
1526	>	int state = NEW;
1527	>	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1528	>	public void realRun() throws InterruptedException {
1529	>	state = 1;
1530	>	await(latch);
1531	>	state = 2;
1532	>	}
1533		}
1534
1535	<	public void await(CountDownLatch latch) {
1535	>	public LatchAwaiter awaiter(CountDownLatch latch) {
1536	>	return new LatchAwaiter(latch);
1537	>	}
1538	>
1539	>	public void await(CountDownLatch latch, long timeoutMillis) {
1540		try {
1541	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1541	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1542	>	fail("timed out waiting for CountDownLatch for "
1543	>	+ (timeoutMillis/1000) + " sec");
1544		} catch (Throwable fail) {
1545		threadUnexpectedException(fail);
1546		}
1547		}
1548
1549	+	public void await(CountDownLatch latch) {
1550	+	await(latch, LONG_DELAY_MS);
1551	+	}
1552	+
1553		public void await(Semaphore semaphore) {
1554		try {
1555	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1555	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1556	>	fail("timed out waiting for Semaphore for "
1557	>	+ (LONG_DELAY_MS/1000) + " sec");
1558		} catch (Throwable fail) {
1559		threadUnexpectedException(fail);
1560		}
#	Line 1563 | Line 1784 | public class JSR166TestCase extends Test
1784		* A CyclicBarrier that uses timed await and fails with
1785		* AssertionFailedErrors instead of throwing checked exceptions.
1786		*/
1787	<	public class CheckedBarrier extends CyclicBarrier {
1787	>	public static class CheckedBarrier extends CyclicBarrier {
1788		public CheckedBarrier(int parties) { super(parties); }
1789
1790		public int await() {
#	Line 1627 | Line 1848 | public class JSR166TestCase extends Test
1848		}
1849		}
1850
1851	+	void assertImmutable(final Object o) {
1852	+	if (o instanceof Collection) {
1853	+	assertThrows(
1854	+	UnsupportedOperationException.class,
1855	+	new Runnable() { public void run() {
1856	+	((Collection) o).add(null);}});
1857	+	}
1858	+	}
1859	+
1860		@SuppressWarnings("unchecked")
1861		<T> T serialClone(T o) {
1862		try {
1863		ObjectInputStream ois = new ObjectInputStream
1864		(new ByteArrayInputStream(serialBytes(o)));
1865		T clone = (T) ois.readObject();
1866	+	if (o == clone) assertImmutable(o);
1867		assertSame(o.getClass(), clone.getClass());
1868		return clone;
1869		} catch (Throwable fail) {
#	Line 1641 | Line 1872 | public class JSR166TestCase extends Test
1872		}
1873		}
1874
1875	+	/**
1876	+	* A version of serialClone that leaves error handling (for
1877	+	* e.g. NotSerializableException) up to the caller.
1878	+	*/
1879	+	@SuppressWarnings("unchecked")
1880	+	<T> T serialClonePossiblyFailing(T o)
1881	+	throws ReflectiveOperationException, java.io.IOException {
1882	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1883	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1884	+	oos.writeObject(o);
1885	+	oos.flush();
1886	+	oos.close();
1887	+	ObjectInputStream ois = new ObjectInputStream
1888	+	(new ByteArrayInputStream(bos.toByteArray()));
1889	+	T clone = (T) ois.readObject();
1890	+	if (o == clone) assertImmutable(o);
1891	+	assertSame(o.getClass(), clone.getClass());
1892	+	return clone;
1893	+	}
1894	+
1895	+	/**
1896	+	* If o implements Cloneable and has a public clone method,
1897	+	* returns a clone of o, else null.
1898	+	*/
1899	+	@SuppressWarnings("unchecked")
1900	+	<T> T cloneableClone(T o) {
1901	+	if (!(o instanceof Cloneable)) return null;
1902	+	final T clone;
1903	+	try {
1904	+	clone = (T) o.getClass().getMethod("clone").invoke(o);
1905	+	} catch (NoSuchMethodException ok) {
1906	+	return null;
1907	+	} catch (ReflectiveOperationException unexpected) {
1908	+	throw new Error(unexpected);
1909	+	}
1910	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1911	+	assertSame(o.getClass(), clone.getClass());
1912	+	return clone;
1913	+	}
1914	+
1915		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1916		Runnable... throwingActions) {
1917		for (Runnable throwingAction : throwingActions) {
#	Line 1669 | Line 1940 | public class JSR166TestCase extends Test
1940		} catch (NoSuchElementException success) {}
1941		assertFalse(it.hasNext());
1942		}
1943	+
1944	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1945	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1946	+	}
1947	+
1948	+	public Runnable runnableThrowing(final RuntimeException ex) {
1949	+	return new Runnable() { public void run() { throw ex; }};
1950	+	}
1951	+
1952	+	/** A reusable thread pool to be shared by tests. */
1953	+	static final ExecutorService cachedThreadPool =
1954	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1955	+	1000L, MILLISECONDS,
1956	+	new SynchronousQueue<Runnable>());
1957	+
1958	+	static <T> void shuffle(T[] array) {
1959	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1960	+	}
1961		}

Diff Legend

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