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.157 by jsr166, Sat Oct 3 22:20:05 2015 UTC vs.
Revision 1.204 by jsr166, Sat Oct 15 18:51:12 2016 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	+	/*
10	+	* @test
11	+	* @summary JSR-166 tck tests
12	+	* @modules java.management
13	+	* @build *
14	+	* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
15	+	* @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -Djsr166.testImplementationDetails=true JSR166TestCase
16	+	* @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -Djava.util.secureRandomSeed=true JSR166TestCase
17	+	*/
18	+
19		import static java.util.concurrent.TimeUnit.MILLISECONDS;
20		import static java.util.concurrent.TimeUnit.MINUTES;
21		import static java.util.concurrent.TimeUnit.NANOSECONDS;
#	Line 20 | Line 30 | import java.lang.management.ThreadMXBean
30		import java.lang.reflect.Constructor;
31		import java.lang.reflect.Method;
32		import java.lang.reflect.Modifier;
33	+	import java.nio.file.Files;
34	+	import java.nio.file.Paths;
35		import java.security.CodeSource;
36		import java.security.Permission;
37		import java.security.PermissionCollection;
#	Line 29 | Line 41 | import java.security.ProtectionDomain;
41		import java.security.SecurityPermission;
42		import java.util.ArrayList;
43		import java.util.Arrays;
44	+	import java.util.Collections;
45		import java.util.Date;
46		import java.util.Enumeration;
47		import java.util.Iterator;
#	Line 48 | Line 61 | import java.util.concurrent.RecursiveAct
61		import java.util.concurrent.RecursiveTask;
62		import java.util.concurrent.RejectedExecutionHandler;
63		import java.util.concurrent.Semaphore;
64	+	import java.util.concurrent.SynchronousQueue;
65		import java.util.concurrent.ThreadFactory;
66	+	import java.util.concurrent.ThreadLocalRandom;
67		import java.util.concurrent.ThreadPoolExecutor;
68		import java.util.concurrent.TimeoutException;
69	+	import java.util.concurrent.atomic.AtomicBoolean;
70		import java.util.concurrent.atomic.AtomicReference;
71	+	import java.util.regex.Matcher;
72		import java.util.regex.Pattern;
73
74		import junit.framework.AssertionFailedError;
#	Line 109 | Line 126 | import junit.framework.TestSuite;
126		* methods as there are exceptions the method can throw. Sometimes
127		* there are multiple tests per JSR166 method when the different
128		* "normal" behaviors differ significantly. And sometimes testcases
129	<	* cover multiple methods when they cannot be tested in
113	<	* isolation.
129	>	* cover multiple methods when they cannot be tested in isolation.
130		*
131		* <li>The documentation style for testcases is to provide as javadoc
132		* a simple sentence or two describing the property that the testcase
#	Line 173 | Line 189 | public class JSR166TestCase extends Test
189		private static final int suiteRuns =
190		Integer.getInteger("jsr166.suiteRuns", 1);
191
192	+	/**
193	+	* Returns the value of the system property, or NaN if not defined.
194	+	*/
195	+	private static float systemPropertyValue(String name) {
196	+	String floatString = System.getProperty(name);
197	+	if (floatString == null)
198	+	return Float.NaN;
199	+	try {
200	+	return Float.parseFloat(floatString);
201	+	} catch (NumberFormatException ex) {
202	+	throw new IllegalArgumentException(
203	+	String.format("Bad float value in system property %s=%s",
204	+	name, floatString));
205	+	}
206	+	}
207	+
208	+	/**
209	+	* The scaling factor to apply to standard delays used in tests.
210	+	* May be initialized from any of:
211	+	* - the "jsr166.delay.factor" system property
212	+	* - the "test.timeout.factor" system property (as used by jtreg)
213	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
214	+	* - hard-coded fuzz factor when using a known slowpoke VM
215	+	*/
216	+	private static final float delayFactor = delayFactor();
217	+
218	+	private static float delayFactor() {
219	+	float x;
220	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
221	+	return x;
222	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
223	+	return x;
224	+	String prop = System.getProperty("java.vm.version");
225	+	if (prop != null && prop.matches(".*debug.*"))
226	+	return 4.0f; // How much slower is fastdebug than product?!
227	+	return 1.0f;
228	+	}
229	+
230		public JSR166TestCase() { super(); }
231		public JSR166TestCase(String name) { super(name); }
232
#	Line 188 | Line 242 | public class JSR166TestCase extends Test
242		return (regex == null) ? null : Pattern.compile(regex);
243		}
244
245	+	// Instrumentation to debug very rare, but very annoying hung test runs.
246		static volatile TestCase currentTestCase;
247	+	// static volatile int currentRun = 0;
248		static {
249		Runnable checkForWedgedTest = new Runnable() { public void run() {
250	<	// avoid spurious reports with enormous runsPerTest
251	<	final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
250	>	// Avoid spurious reports with enormous runsPerTest.
251	>	// A single test case run should never take more than 1 second.
252	>	// But let's cap it at the high end too ...
253	>	final int timeoutMinutes =
254	>	Math.min(15, Math.max(runsPerTest / 60, 1));
255		for (TestCase lastTestCase = currentTestCase;;) {
256		try { MINUTES.sleep(timeoutMinutes); }
257		catch (InterruptedException unexpected) { break; }
258		if (lastTestCase == currentTestCase) {
259	<	System.err.println
260	<	("Looks like we're stuck running test: "
261	<	+ lastTestCase);
259	>	System.err.printf(
260	>	"Looks like we're stuck running test: %s%n",
261	>	lastTestCase);
262	>	//                     System.err.printf(
263	>	//                         "Looks like we're stuck running test: %s (%d/%d)%n",
264	>	//                         lastTestCase, currentRun, runsPerTest);
265	>	//                     System.err.println("availableProcessors=" +
266	>	//                         Runtime.getRuntime().availableProcessors());
267	>	//                     System.err.printf("cpu model = %s%n", cpuModel());
268		dumpTestThreads();
269	+	// one stack dump is probably enough; more would be spam
270	+	break;
271		}
272		lastTestCase = currentTestCase;
273		}}};
#	Line 209 | Line 276 | public class JSR166TestCase extends Test
276		thread.start();
277		}
278
279	+	//     public static String cpuModel() {
280	+	//         try {
281	+	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
282	+	//                 .matcher(new String(
283	+	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
284	+	//             matcher.find();
285	+	//             return matcher.group(1);
286	+	//         } catch (Exception ex) { return null; }
287	+	//     }
288	+
289		public void runBare() throws Throwable {
290		currentTestCase = this;
291		if (methodFilter == null
#	Line 218 | Line 295 | public class JSR166TestCase extends Test
295
296		protected void runTest() throws Throwable {
297		for (int i = 0; i < runsPerTest; i++) {
298	+	// currentRun = i;
299		if (profileTests)
300		runTestProfiled();
301		else
#	Line 246 | Line 324 | public class JSR166TestCase extends Test
324		main(suite(), args);
325		}
326
327	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
328	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
329	+	long runTime;
330	+	public void startTest(Test test) {}
331	+	protected void printHeader(long runTime) {
332	+	this.runTime = runTime; // defer printing for later
333	+	}
334	+	protected void printFooter(TestResult result) {
335	+	if (result.wasSuccessful()) {
336	+	getWriter().println("OK (" + result.runCount() + " tests)"
337	+	+ "  Time: " + elapsedTimeAsString(runTime));
338	+	} else {
339	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
340	+	super.printFooter(result);
341	+	}
342	+	}
343	+	}
344	+
345	+	/**
346	+	* Returns a TestRunner that doesn't bother with unnecessary
347	+	* fluff, like printing a "." for each test case.
348	+	*/
349	+	static junit.textui.TestRunner newPithyTestRunner() {
350	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
351	+	runner.setPrinter(new PithyResultPrinter(System.out));
352	+	return runner;
353	+	}
354	+
355		/**
356		* Runs all unit tests in the given test suite.
357		* Actual behavior influenced by jsr166.* system properties.
#	Line 257 | Line 363 | public class JSR166TestCase extends Test
363		System.setSecurityManager(new SecurityManager());
364		}
365		for (int i = 0; i < suiteRuns; i++) {
366	<	TestResult result = junit.textui.TestRunner.run(suite);
366	>	TestResult result = newPithyTestRunner().doRun(suite);
367		if (!result.wasSuccessful())
368		System.exit(1);
369		System.gc();
#	Line 363 | Line 469 | public class JSR166TestCase extends Test
469		CopyOnWriteArrayListTest.suite(),
470		CopyOnWriteArraySetTest.suite(),
471		CountDownLatchTest.suite(),
472	+	CountedCompleterTest.suite(),
473		CyclicBarrierTest.suite(),
474		DelayQueueTest.suite(),
475		EntryTest.suite(),
#	Line 399 | Line 506 | public class JSR166TestCase extends Test
506		"Atomic8Test",
507		"CompletableFutureTest",
508		"ConcurrentHashMap8Test",
509	<	"CountedCompleterTest",
509	>	"CountedCompleter8Test",
510		"DoubleAccumulatorTest",
511		"DoubleAdderTest",
512		"ForkJoinPool8Test",
#	Line 410 | Line 517 | public class JSR166TestCase extends Test
517		"StampedLockTest",
518		"SubmissionPublisherTest",
519		"ThreadLocalRandom8Test",
520	+	"TimeUnit8Test",
521		};
522		addNamedTestClasses(suite, java8TestClassNames);
523		}
#	Line 417 | Line 525 | public class JSR166TestCase extends Test
525		// Java9+ test classes
526		if (atLeastJava9()) {
527		String[] java9TestClassNames = {
528	<	// Currently empty, but expecting varhandle tests
528	>	"AtomicBoolean9Test",
529	>	"AtomicInteger9Test",
530	>	"AtomicIntegerArray9Test",
531	>	"AtomicLong9Test",
532	>	"AtomicLongArray9Test",
533	>	"AtomicReference9Test",
534	>	"AtomicReferenceArray9Test",
535	>	"ExecutorCompletionService9Test",
536		};
537		addNamedTestClasses(suite, java9TestClassNames);
538		}
#	Line 494 | Line 609 | public class JSR166TestCase extends Test
609		public static long LONG_DELAY_MS;
610
611		/**
612	<	* Returns the shortest timed delay. This could
613	<	* be reimplemented to use for example a Property.
612	>	* Returns the shortest timed delay. This can be scaled up for
613	>	* slow machines using the jsr166.delay.factor system property,
614	>	* or via jtreg's -timeoutFactor: flag.
615	>	* http://openjdk.java.net/jtreg/command-help.html
616		*/
617		protected long getShortDelay() {
618	<	return 50;
618	>	return (long) (50 * delayFactor);
619		}
620
621		/**
#	Line 541 | Line 658 | public class JSR166TestCase extends Test
658		* the same test have no effect.
659		*/
660		public void threadRecordFailure(Throwable t) {
661	+	System.err.println(t);
662		dumpTestThreads();
663		threadFailure.compareAndSet(null, t);
664		}
#	Line 589 | Line 707 | public class JSR166TestCase extends Test
707		}
708
709		/**
710	<	* Finds missing try { ... } finally { joinPool(e); }
710	>	* Finds missing PoolCleaners
711		*/
712		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
713		Thread[] survivors = new Thread[7];
#	Line 748 | Line 866 | public class JSR166TestCase extends Test
866		/**
867		* Delays, via Thread.sleep, for the given millisecond delay, but
868		* if the sleep is shorter than specified, may re-sleep or yield
869	<	* until time elapses.
869	>	* until time elapses.  Ensures that the given time, as measured
870	>	* by System.nanoTime(), has elapsed.
871		*/
872		static void delay(long millis) throws InterruptedException {
873	<	long startTime = System.nanoTime();
874	<	long ns = millis * 1000 * 1000;
875	<	for (;;) {
873	>	long nanos = millis * (1000 * 1000);
874	>	final long wakeupTime = System.nanoTime() + nanos;
875	>	do {
876		if (millis > 0L)
877		Thread.sleep(millis);
878		else // too short to sleep
879		Thread.yield();
880	<	long d = ns - (System.nanoTime() - startTime);
881	<	if (d > 0L)
882	<	millis = d / (1000 * 1000);
764	<	else
765	<	break;
766	<	}
880	>	nanos = wakeupTime - System.nanoTime();
881	>	millis = nanos / (1000 * 1000);
882	>	} while (nanos >= 0L);
883		}
884
885		/**
886		* Allows use of try-with-resources with per-test thread pools.
887		*/
888	<	static class PoolCloser<T extends ExecutorService>
889	<	implements AutoCloseable {
890	<	public final T pool;
775	<	public PoolCloser(T pool) { this.pool = pool; }
888	>	class PoolCleaner implements AutoCloseable {
889	>	private final ExecutorService pool;
890	>	public PoolCleaner(ExecutorService pool) { this.pool = pool; }
891		public void close() { joinPool(pool); }
892		}
893
894		/**
895	+	* An extension of PoolCleaner that has an action to release the pool.
896	+	*/
897	+	class PoolCleanerWithReleaser extends PoolCleaner {
898	+	private final Runnable releaser;
899	+	public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
900	+	super(pool);
901	+	this.releaser = releaser;
902	+	}
903	+	public void close() {
904	+	try {
905	+	releaser.run();
906	+	} finally {
907	+	super.close();
908	+	}
909	+	}
910	+	}
911	+
912	+	PoolCleaner cleaner(ExecutorService pool) {
913	+	return new PoolCleaner(pool);
914	+	}
915	+
916	+	PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
917	+	return new PoolCleanerWithReleaser(pool, releaser);
918	+	}
919	+
920	+	PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
921	+	return new PoolCleanerWithReleaser(pool, releaser(latch));
922	+	}
923	+
924	+	Runnable releaser(final CountDownLatch latch) {
925	+	return new Runnable() { public void run() {
926	+	do { latch.countDown(); }
927	+	while (latch.getCount() > 0);
928	+	}};
929	+	}
930	+
931	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
932	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
933	+	}
934	+
935	+	Runnable releaser(final AtomicBoolean flag) {
936	+	return new Runnable() { public void run() { flag.set(true); }};
937	+	}
938	+
939	+	/**
940		* Waits out termination of a thread pool or fails doing so.
941		*/
942	<	static void joinPool(ExecutorService pool) {
942	>	void joinPool(ExecutorService pool) {
943		try {
944		pool.shutdown();
945	<	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
946	<	fail("ExecutorService " + pool +
947	<	" did not terminate in a timely manner");
945	>	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
946	>	try {
947	>	threadFail("ExecutorService " + pool +
948	>	" did not terminate in a timely manner");
949	>	} finally {
950	>	// last resort, for the benefit of subsequent tests
951	>	pool.shutdownNow();
952	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
953	>	}
954	>	}
955		} catch (SecurityException ok) {
956		// Allowed in case test doesn't have privs
957		} catch (InterruptedException fail) {
958	<	fail("Unexpected InterruptedException");
958	>	threadFail("Unexpected InterruptedException");
959		}
960		}
961
962	<	/** Like Runnable, but with the freedom to throw anything */
962	>	/**
963	>	* Like Runnable, but with the freedom to throw anything.
964	>	* junit folks had the same idea:
965	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
966	>	*/
967		interface Action { public void run() throws Throwable; }
968
969		/**
#	Line 801 | Line 972 | public class JSR166TestCase extends Test
972		* necessarily individually slow because they must block.
973		*/
974		void testInParallel(Action ... actions) {
975	<	try (PoolCloser<ExecutorService> poolCloser
976	<	= new PoolCloser<>(Executors.newCachedThreadPool())) {
806	<	ExecutorService pool = poolCloser.pool;
975	>	ExecutorService pool = Executors.newCachedThreadPool();
976	>	try (PoolCleaner cleaner = cleaner(pool)) {
977		ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
978		for (final Action action : actions)
979		futures.add(pool.submit(new CheckedRunnable() {
#	Line 824 | Line 994 | public class JSR166TestCase extends Test
994		* Uninteresting threads are filtered out.
995		*/
996		static void dumpTestThreads() {
997	+	SecurityManager sm = System.getSecurityManager();
998	+	if (sm != null) {
999	+	try {
1000	+	System.setSecurityManager(null);
1001	+	} catch (SecurityException giveUp) {
1002	+	return;
1003	+	}
1004	+	}
1005	+
1006		ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1007		System.err.println("------ stacktrace dump start ------");
1008		for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1009	<	String name = info.getThreadName();
1009	>	final String name = info.getThreadName();
1010	>	String lockName;
1011		if ("Signal Dispatcher".equals(name))
1012		continue;
1013		if ("Reference Handler".equals(name)
1014	<	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1014	>	&& (lockName = info.getLockName()) != null
1015	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1016		continue;
1017		if ("Finalizer".equals(name)
1018	<	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1018	>	&& (lockName = info.getLockName()) != null
1019	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1020		continue;
1021		if ("checkForWedgedTest".equals(name))
1022		continue;
1023		System.err.print(info);
1024		}
1025		System.err.println("------ stacktrace dump end ------");
1026	+
1027	+	if (sm != null) System.setSecurityManager(sm);
1028		}
1029
1030		/**
#	Line 860 | Line 1044 | public class JSR166TestCase extends Test
1044		delay(millis);
1045		assertTrue(thread.isAlive());
1046		} catch (InterruptedException fail) {
1047	<	fail("Unexpected InterruptedException");
1047	>	threadFail("Unexpected InterruptedException");
1048		}
1049		}
1050
#	Line 882 | Line 1066 | public class JSR166TestCase extends Test
1066		for (Thread thread : threads)
1067		assertTrue(thread.isAlive());
1068		} catch (InterruptedException fail) {
1069	<	fail("Unexpected InterruptedException");
1069	>	threadFail("Unexpected InterruptedException");
1070		}
1071		}
1072
#	Line 1057 | Line 1241 | public class JSR166TestCase extends Test
1241		* Sleeps until the given time has elapsed.
1242		* Throws AssertionFailedError if interrupted.
1243		*/
1244	<	void sleep(long millis) {
1244	>	static void sleep(long millis) {
1245		try {
1246		delay(millis);
1247		} catch (InterruptedException fail) {
#	Line 1073 | Line 1257 | public class JSR166TestCase extends Test
1257		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1258		*/
1259		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1260	<	long startTime = System.nanoTime();
1260	>	long startTime = 0L;
1261		for (;;) {
1262		Thread.State s = thread.getState();
1263		if (s == Thread.State.BLOCKED ||
#	Line 1082 | Line 1266 | public class JSR166TestCase extends Test
1266		return;
1267		else if (s == Thread.State.TERMINATED)
1268		fail("Unexpected thread termination");
1269	+	else if (startTime == 0L)
1270	+	startTime = System.nanoTime();
1271		else if (millisElapsedSince(startTime) > timeoutMillis) {
1272		threadAssertTrue(thread.isAlive());
1273		return;
#	Line 1160 | Line 1346 | public class JSR166TestCase extends Test
1346		} finally {
1347		if (t.getState() != Thread.State.TERMINATED) {
1348		t.interrupt();
1349	<	fail("Test timed out");
1349	>	threadFail("timed out waiting for thread to terminate");
1350		}
1351		}
1352		}
#	Line 1308 | Line 1494 | public class JSR166TestCase extends Test
1494		}};
1495		}
1496
1497	<	public Runnable awaiter(final CountDownLatch latch) {
1498	<	return new CheckedRunnable() {
1499	<	public void realRun() throws InterruptedException {
1500	<	await(latch);
1501	<	}};
1497	>	class LatchAwaiter extends CheckedRunnable {
1498	>	static final int NEW = 0;
1499	>	static final int RUNNING = 1;
1500	>	static final int DONE = 2;
1501	>	final CountDownLatch latch;
1502	>	int state = NEW;
1503	>	LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1504	>	public void realRun() throws InterruptedException {
1505	>	state = 1;
1506	>	await(latch);
1507	>	state = 2;
1508	>	}
1509		}
1510
1511	<	public void await(CountDownLatch latch) {
1511	>	public LatchAwaiter awaiter(CountDownLatch latch) {
1512	>	return new LatchAwaiter(latch);
1513	>	}
1514	>
1515	>	public void await(CountDownLatch latch, long timeoutMillis) {
1516		try {
1517	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1517	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1518	>	fail("timed out waiting for CountDownLatch for "
1519	>	+ (timeoutMillis/1000) + " sec");
1520		} catch (Throwable fail) {
1521		threadUnexpectedException(fail);
1522		}
1523		}
1524
1525	+	public void await(CountDownLatch latch) {
1526	+	await(latch, LONG_DELAY_MS);
1527	+	}
1528	+
1529		public void await(Semaphore semaphore) {
1530		try {
1531	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1531	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1532	>	fail("timed out waiting for Semaphore for "
1533	>	+ (LONG_DELAY_MS/1000) + " sec");
1534		} catch (Throwable fail) {
1535		threadUnexpectedException(fail);
1536		}
#	Line 1555 | Line 1760 | public class JSR166TestCase extends Test
1760		* A CyclicBarrier that uses timed await and fails with
1761		* AssertionFailedErrors instead of throwing checked exceptions.
1762		*/
1763	<	public class CheckedBarrier extends CyclicBarrier {
1763	>	public static class CheckedBarrier extends CyclicBarrier {
1764		public CheckedBarrier(int parties) { super(parties); }
1765
1766		public int await() {
#	Line 1661 | Line 1866 | public class JSR166TestCase extends Test
1866		} catch (NoSuchElementException success) {}
1867		assertFalse(it.hasNext());
1868		}
1869	+
1870	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1871	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1872	+	}
1873	+
1874	+	public Runnable runnableThrowing(final RuntimeException ex) {
1875	+	return new Runnable() { public void run() { throw ex; }};
1876	+	}
1877	+
1878	+	/** A reusable thread pool to be shared by tests. */
1879	+	static final ExecutorService cachedThreadPool =
1880	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1881	+	1000L, MILLISECONDS,
1882	+	new SynchronousQueue<Runnable>());
1883	+
1884	+	static <T> void shuffle(T[] array) {
1885	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1886	+	}
1887		}

Diff Legend

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