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.184 by jsr166, Wed Feb 10 00:05:20 2016 UTC vs.
Revision 1.228 by jsr166, Sun May 14 03:14:25 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.
#	Line 8 | Line 9
9
10		/*
11		* @test
12	<	* @summary JSR-166 tck tests
13	<	* @modules java.management
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	<	* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
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;
#	Line 28 | Line 54 | import java.lang.management.ThreadMXBean
54		import java.lang.reflect.Constructor;
55		import java.lang.reflect.Method;
56		import java.lang.reflect.Modifier;
31	–	import java.nio.file.Files;
32	–	import java.nio.file.Paths;
57		import java.security.CodeSource;
58		import java.security.Permission;
59		import java.security.PermissionCollection;
#	Line 39 | 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 58 | 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;
65	–	import java.util.regex.Matcher;
94		import java.util.regex.Pattern;
95
96		import junit.framework.AssertionFailedError;
#	Line 184 | Line 212 | public class JSR166TestCase extends Test
212		Integer.getInteger("jsr166.suiteRuns", 1);
213
214		/**
215	<	* The scaling factor to apply to standard delays used in tests.
215	>	* Returns the value of the system property, or NaN if not defined.
216		*/
217	<	private static final int delayFactor =
218	<	Integer.getInteger("jsr166.delay.factor", 1);
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); }
#	Line 240 | Line 300 | public class JSR166TestCase extends Test
300
301		//     public static String cpuModel() {
302		//         try {
303	<	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
303	>	//             java.util.regex.Matcher matcher
304	>	//               = Pattern.compile("model name\\s*: (.*)")
305		//                 .matcher(new String(
306	<	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
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; }
#	Line 409 | 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 431 | 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 459 | 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 485 | 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 496 | 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 563 | Line 640 | public class JSR166TestCase extends Test
640
641		/**
642		* Returns the shortest timed delay. This can be scaled up for
643	<	* slow machines using the jsr166.delay.factor system property.
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 * delayFactor;
648	>	return (long) (50 * delayFactor);
649		}
650
651		/**
#	Line 579 | 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 600 | 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 879 | Line 963 | public class JSR166TestCase extends Test
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 902 | 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 933 | 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 ------");
953	–	}
1061
1062	<	/**
956	<	* Checks that thread does not terminate within the default
957	<	* millisecond delay of {@code timeoutMillis()}.
958	<	*/
959	<	void assertThreadStaysAlive(Thread thread) {
960	<	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		*/
1089	<	void assertThreadsStayAlive(Thread... threads) {
1090	<	assertThreadsStayAlive(timeoutMillis(), threads);
1089	>	void assertThreadStaysAlive(Thread thread) {
1090	>	assertThreadStaysAlive(thread, timeoutMillis());
1091		}
1092
1093		/**
1094	<	* Checks that the threads do not terminate within the given millisecond delay.
1094	>	* Checks that thread does not terminate within the given millisecond delay.
1095		*/
1096	<	void assertThreadsStayAlive(long millis, Thread... threads) {
1096	>	void assertThreadStaysAlive(Thread thread, long millis) {
1097		try {
1098		// No need to optimize the failing case via Thread.join.
1099		delay(millis);
1100	<	for (Thread thread : threads)
992	<	assertTrue(thread.isAlive());
1100	>	assertTrue(thread.isAlive());
1101		} catch (InterruptedException fail) {
1102		threadFail("Unexpected InterruptedException");
1103		}
#	Line 1033 | Line 1141 | public class JSR166TestCase extends Test
1141		}
1142
1143		/**
1144	+	* The maximum number of consecutive spurious wakeups we should
1145	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1146	+	*/
1147	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1148	+
1149	+	/**
1150		* The number of elements to place in collections, arrays, etc.
1151		*/
1152		public static final int SIZE = 20;
#	Line 1136 | Line 1250 | public class JSR166TestCase extends Test
1250		}
1251		public void refresh() {}
1252		public String toString() {
1253	<	List<Permission> ps = new ArrayList<Permission>();
1253	>	List<Permission> ps = new ArrayList<>();
1254		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1255		ps.add(e.nextElement());
1256		return "AdjustablePolicy with permissions " + ps;
#	Line 1166 | Line 1280 | public class JSR166TestCase extends Test
1280		* Sleeps until the given time has elapsed.
1281		* Throws AssertionFailedError if interrupted.
1282		*/
1283	<	void sleep(long millis) {
1283	>	static void sleep(long millis) {
1284		try {
1285		delay(millis);
1286		} catch (InterruptedException fail) {
#	Line 1182 | Line 1296 | public class JSR166TestCase extends Test
1296		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1297		*/
1298		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1299	<	long startTime = System.nanoTime();
1299	>	long startTime = 0L;
1300		for (;;) {
1301		Thread.State s = thread.getState();
1302		if (s == Thread.State.BLOCKED ||
#	Line 1191 | Line 1305 | public class JSR166TestCase extends Test
1305		return;
1306		else if (s == Thread.State.TERMINATED)
1307		fail("Unexpected thread termination");
1308	+	else if (startTime == 0L)
1309	+	startTime = System.nanoTime();
1310		else if (millisElapsedSince(startTime) > timeoutMillis) {
1311		threadAssertTrue(thread.isAlive());
1312	<	return;
1312	>	fail("timed out waiting for thread to enter wait state");
1313		}
1314		Thread.yield();
1315		}
1316		}
1317
1318		/**
1319	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1320	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1319	>	* Spin-waits up to the specified number of milliseconds for the given
1320	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1321	>	* and additionally satisfy the given condition.
1322	>	*/
1323	>	void waitForThreadToEnterWaitState(
1324	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1325	>	long startTime = 0L;
1326	>	for (;;) {
1327	>	Thread.State s = thread.getState();
1328	>	if (s == Thread.State.BLOCKED ||
1329	>	s == Thread.State.WAITING ||
1330	>	s == Thread.State.TIMED_WAITING) {
1331	>	try {
1332	>	if (waitingForGodot.call())
1333	>	return;
1334	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1335	>	}
1336	>	else if (s == Thread.State.TERMINATED)
1337	>	fail("Unexpected thread termination");
1338	>	else if (startTime == 0L)
1339	>	startTime = System.nanoTime();
1340	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1341	>	threadAssertTrue(thread.isAlive());
1342	>	fail("timed out waiting for thread to enter wait state");
1343	>	}
1344	>	Thread.yield();
1345	>	}
1346	>	}
1347	>
1348	>	/**
1349	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1350	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1351		*/
1352		void waitForThreadToEnterWaitState(Thread thread) {
1353		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1354		}
1355
1356		/**
1357	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1358	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1359	+	* and additionally satisfy the given condition.
1360	+	*/
1361	+	void waitForThreadToEnterWaitState(
1362	+	Thread thread, Callable<Boolean> waitingForGodot) {
1363	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1364	+	}
1365	+
1366	+	/**
1367		* Returns the number of milliseconds since time given by
1368		* startNanoTime, which must have been previously returned from a
1369		* call to {@link System#nanoTime()}.
#	Line 1435 | Line 1591 | public class JSR166TestCase extends Test
1591		return new LatchAwaiter(latch);
1592		}
1593
1594	<	public void await(CountDownLatch latch) {
1594	>	public void await(CountDownLatch latch, long timeoutMillis) {
1595		try {
1596	<	if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1596	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1597		fail("timed out waiting for CountDownLatch for "
1598	<	+ (LONG_DELAY_MS/1000) + " sec");
1598	>	+ (timeoutMillis/1000) + " sec");
1599		} catch (Throwable fail) {
1600		threadUnexpectedException(fail);
1601		}
1602		}
1603
1604	+	public void await(CountDownLatch latch) {
1605	+	await(latch, LONG_DELAY_MS);
1606	+	}
1607	+
1608		public void await(Semaphore semaphore) {
1609		try {
1610		if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
#	Line 1455 | Line 1615 | public class JSR166TestCase extends Test
1615		}
1616		}
1617
1618	+	public void await(CyclicBarrier barrier) {
1619	+	try {
1620	+	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1621	+	} catch (Throwable fail) {
1622	+	threadUnexpectedException(fail);
1623	+	}
1624	+	}
1625	+
1626		//     /**
1627		//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1628		//      */
#	Line 1679 | Line 1847 | public class JSR166TestCase extends Test
1847		* A CyclicBarrier that uses timed await and fails with
1848		* AssertionFailedErrors instead of throwing checked exceptions.
1849		*/
1850	<	public class CheckedBarrier extends CyclicBarrier {
1850	>	public static class CheckedBarrier extends CyclicBarrier {
1851		public CheckedBarrier(int parties) { super(parties); }
1852
1853		public int await() {
#	Line 1743 | Line 1911 | public class JSR166TestCase extends Test
1911		}
1912		}
1913
1914	+	void assertImmutable(final Object o) {
1915	+	if (o instanceof Collection) {
1916	+	assertThrows(
1917	+	UnsupportedOperationException.class,
1918	+	new Runnable() { public void run() {
1919	+	((Collection) o).add(null);}});
1920	+	}
1921	+	}
1922	+
1923		@SuppressWarnings("unchecked")
1924		<T> T serialClone(T o) {
1925		try {
1926		ObjectInputStream ois = new ObjectInputStream
1927		(new ByteArrayInputStream(serialBytes(o)));
1928		T clone = (T) ois.readObject();
1929	+	if (o == clone) assertImmutable(o);
1930		assertSame(o.getClass(), clone.getClass());
1931		return clone;
1932		} catch (Throwable fail) {
#	Line 1757 | Line 1935 | public class JSR166TestCase extends Test
1935		}
1936		}
1937
1938	+	/**
1939	+	* A version of serialClone that leaves error handling (for
1940	+	* e.g. NotSerializableException) up to the caller.
1941	+	*/
1942	+	@SuppressWarnings("unchecked")
1943	+	<T> T serialClonePossiblyFailing(T o)
1944	+	throws ReflectiveOperationException, java.io.IOException {
1945	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1946	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1947	+	oos.writeObject(o);
1948	+	oos.flush();
1949	+	oos.close();
1950	+	ObjectInputStream ois = new ObjectInputStream
1951	+	(new ByteArrayInputStream(bos.toByteArray()));
1952	+	T clone = (T) ois.readObject();
1953	+	if (o == clone) assertImmutable(o);
1954	+	assertSame(o.getClass(), clone.getClass());
1955	+	return clone;
1956	+	}
1957	+
1958	+	/**
1959	+	* If o implements Cloneable and has a public clone method,
1960	+	* returns a clone of o, else null.
1961	+	*/
1962	+	@SuppressWarnings("unchecked")
1963	+	<T> T cloneableClone(T o) {
1964	+	if (!(o instanceof Cloneable)) return null;
1965	+	final T clone;
1966	+	try {
1967	+	clone = (T) o.getClass().getMethod("clone").invoke(o);
1968	+	} catch (NoSuchMethodException ok) {
1969	+	return null;
1970	+	} catch (ReflectiveOperationException unexpected) {
1971	+	throw new Error(unexpected);
1972	+	}
1973	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1974	+	assertSame(o.getClass(), clone.getClass());
1975	+	return clone;
1976	+	}
1977	+
1978		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1979		Runnable... throwingActions) {
1980		for (Runnable throwingAction : throwingActions) {
#	Line 1785 | Line 2003 | public class JSR166TestCase extends Test
2003		} catch (NoSuchElementException success) {}
2004		assertFalse(it.hasNext());
2005		}
2006	+
2007	+	public <T> Callable<T> callableThrowing(final Exception ex) {
2008	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
2009	+	}
2010	+
2011	+	public Runnable runnableThrowing(final RuntimeException ex) {
2012	+	return new Runnable() { public void run() { throw ex; }};
2013	+	}
2014	+
2015	+	/** A reusable thread pool to be shared by tests. */
2016	+	static final ExecutorService cachedThreadPool =
2017	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2018	+	1000L, MILLISECONDS,
2019	+	new SynchronousQueue<Runnable>());
2020	+
2021	+	static <T> void shuffle(T[] array) {
2022	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2023	+	}
2024		}

Diff Legend

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