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.218 by jsr166, Sun Jan 29 20:19:00 2017 UTC vs.
Revision 1.241 by jsr166, Sun Jan 28 16:20:42 2018 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 (conformance testing mode)
12	>	* @summary JSR-166 tck tests, in a number of variations.
13	>	*          The first is the conformance testing variant,
14	>	*          while others also test implementation details.
15		* @build *
16		* @modules java.management
17		* @run junit/othervm/timeout=1000 JSR166TestCase
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
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		*/
#	Line 52 | 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;
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 76 | Line 76 | import java.util.concurrent.Callable;
76		import java.util.concurrent.CountDownLatch;
77		import java.util.concurrent.CyclicBarrier;
78		import java.util.concurrent.ExecutionException;
79	+	import java.util.concurrent.Executor;
80		import java.util.concurrent.Executors;
81		import java.util.concurrent.ExecutorService;
82		import java.util.concurrent.ForkJoinPool;
83		import java.util.concurrent.Future;
84	+	import java.util.concurrent.FutureTask;
85		import java.util.concurrent.RecursiveAction;
86		import java.util.concurrent.RecursiveTask;
87	+	import java.util.concurrent.RejectedExecutionException;
88		import java.util.concurrent.RejectedExecutionHandler;
89		import java.util.concurrent.Semaphore;
90	+	import java.util.concurrent.ScheduledExecutorService;
91	+	import java.util.concurrent.ScheduledFuture;
92		import java.util.concurrent.SynchronousQueue;
93		import java.util.concurrent.ThreadFactory;
94		import java.util.concurrent.ThreadLocalRandom;
95		import java.util.concurrent.ThreadPoolExecutor;
96	+	import java.util.concurrent.TimeUnit;
97		import java.util.concurrent.TimeoutException;
98		import java.util.concurrent.atomic.AtomicBoolean;
99		import java.util.concurrent.atomic.AtomicReference;
94	–	import java.util.regex.Matcher;
100		import java.util.regex.Pattern;
101
97	–	import junit.framework.AssertionFailedError;
102		import junit.framework.Test;
103		import junit.framework.TestCase;
104		import junit.framework.TestResult;
#	Line 301 | Line 305 | public class JSR166TestCase extends Test
305
306		//     public static String cpuModel() {
307		//         try {
308	<	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
308	>	//             java.util.regex.Matcher matcher
309	>	//               = Pattern.compile("model name\\s*: (.*)")
310		//                 .matcher(new String(
311	<	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
311	>	//                     java.nio.file.Files.readAllBytes(
312	>	//                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
313		//             matcher.find();
314		//             return matcher.group(1);
315		//         } catch (Exception ex) { return null; }
#	Line 412 | Line 418 | public class JSR166TestCase extends Test
418		for (String testClassName : testClassNames) {
419		try {
420		Class<?> testClass = Class.forName(testClassName);
421	<	Method m = testClass.getDeclaredMethod("suite",
416	<	new Class<?>[0]);
421	>	Method m = testClass.getDeclaredMethod("suite");
422		suite.addTest(newTestSuite((Test)m.invoke(null)));
423	<	} catch (Exception e) {
424	<	throw new Error("Missing test class", e);
423	>	} catch (ReflectiveOperationException e) {
424	>	throw new AssertionError("Missing test class", e);
425		}
426		}
427		}
#	Line 438 | Line 443 | public class JSR166TestCase extends Test
443		}
444		}
445
446	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
447	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
448	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
449	<	public static boolean atLeastJava9() {
450	<	return JAVA_CLASS_VERSION >= 53.0
446	<	// As of 2015-09, java9 still uses 52.0 class file version
447	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
448	<	}
449	<	public static boolean atLeastJava10() {
450	<	return JAVA_CLASS_VERSION >= 54.0
451	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
452	<	}
446	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
447	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
448	>	public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
449	>	public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
450	>	public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
451
452		/**
453		* Collects all JSR166 unit tests as one suite.
#	Line 537 | Line 535 | public class JSR166TestCase extends Test
535		"DoubleAdderTest",
536		"ForkJoinPool8Test",
537		"ForkJoinTask8Test",
538	+	"HashMapTest",
539		"LinkedBlockingDeque8Test",
540		"LinkedBlockingQueue8Test",
541		"LongAccumulatorTest",
#	Line 599 | Line 598 | public class JSR166TestCase extends Test
598		for (String methodName : testMethodNames(testClass))
599		suite.addTest((Test) c.newInstance(data, methodName));
600		return suite;
601	<	} catch (Exception e) {
602	<	throw new Error(e);
601	>	} catch (ReflectiveOperationException e) {
602	>	throw new AssertionError(e);
603		}
604		}
605
#	Line 616 | Line 615 | public class JSR166TestCase extends Test
615		if (atLeastJava8()) {
616		String name = testClass.getName();
617		String name8 = name.replaceAll("Test$", "8Test");
618	<	if (name.equals(name8)) throw new Error(name);
618	>	if (name.equals(name8)) throw new AssertionError(name);
619		try {
620		return (Test)
621		Class.forName(name8)
622	<	.getMethod("testSuite", new Class[] { dataClass })
622	>	.getMethod("testSuite", dataClass)
623		.invoke(null, data);
624	<	} catch (Exception e) {
625	<	throw new Error(e);
624	>	} catch (ReflectiveOperationException e) {
625	>	throw new AssertionError(e);
626		}
627		} else {
628		return new TestSuite();
#	Line 637 | Line 636 | public class JSR166TestCase extends Test
636		public static long MEDIUM_DELAY_MS;
637		public static long LONG_DELAY_MS;
638
639	+	private static final long RANDOM_TIMEOUT;
640	+	private static final long RANDOM_EXPIRED_TIMEOUT;
641	+	private static final TimeUnit RANDOM_TIMEUNIT;
642	+	static {
643	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
644	+	long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
645	+	RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
646	+	RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
647	+	TimeUnit[] timeUnits = TimeUnit.values();
648	+	RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
649	+	}
650	+
651	+	/**
652	+	* Returns a timeout for use when any value at all will do.
653	+	*/
654	+	static long randomTimeout() { return RANDOM_TIMEOUT; }
655	+
656	+	/**
657	+	* Returns a timeout that means "no waiting", i.e. not positive.
658	+	*/
659	+	static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
660	+
661	+	/**
662	+	* Returns a random non-null TimeUnit.
663	+	*/
664	+	static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
665	+
666		/**
667		* Returns the shortest timed delay. This can be scaled up for
668		* slow machines using the jsr166.delay.factor system property,
#	Line 657 | Line 683 | public class JSR166TestCase extends Test
683		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
684		}
685
686	+	private static final long TIMEOUT_DELAY_MS
687	+	= (long) (12.0 * Math.cbrt(delayFactor));
688	+
689		/**
690	<	* Returns a timeout in milliseconds to be used in tests that
691	<	* verify that operations block or time out.
690	>	* Returns a timeout in milliseconds to be used in tests that verify
691	>	* that operations block or time out.  We want this to be longer
692	>	* than the OS scheduling quantum, but not too long, so don't scale
693	>	* linearly with delayFactor; we use "crazy" cube root instead.
694		*/
695	<	long timeoutMillis() {
696	<	return SHORT_DELAY_MS / 4;
695	>	static long timeoutMillis() {
696	>	return TIMEOUT_DELAY_MS;
697		}
698
699		/**
#	Line 700 | Line 731 | public class JSR166TestCase extends Test
731		String msg = toString() + ": " + String.format(format, args);
732		System.err.println(msg);
733		dumpTestThreads();
734	<	throw new AssertionFailedError(msg);
734	>	throw new AssertionError(msg);
735		}
736
737		/**
#	Line 721 | Line 752 | public class JSR166TestCase extends Test
752		throw (RuntimeException) t;
753		else if (t instanceof Exception)
754		throw (Exception) t;
755	<	else {
756	<	AssertionFailedError afe =
726	<	new AssertionFailedError(t.toString());
727	<	afe.initCause(t);
728	<	throw afe;
729	<	}
755	>	else
756	>	throw new AssertionError(t.toString(), t);
757		}
758
759		if (Thread.interrupted())
#	Line 760 | Line 787 | public class JSR166TestCase extends Test
787
788		/**
789		* Just like fail(reason), but additionally recording (using
790	<	* threadRecordFailure) any AssertionFailedError thrown, so that
791	<	* the current testcase will fail.
790	>	* threadRecordFailure) any AssertionError thrown, so that the
791	>	* current testcase will fail.
792		*/
793		public void threadFail(String reason) {
794		try {
795		fail(reason);
796	<	} catch (AssertionFailedError t) {
797	<	threadRecordFailure(t);
798	<	throw t;
796	>	} catch (AssertionError fail) {
797	>	threadRecordFailure(fail);
798	>	throw fail;
799		}
800		}
801
802		/**
803		* Just like assertTrue(b), but additionally recording (using
804	<	* threadRecordFailure) any AssertionFailedError thrown, so that
805	<	* the current testcase will fail.
804	>	* threadRecordFailure) any AssertionError thrown, so that the
805	>	* current testcase will fail.
806		*/
807		public void threadAssertTrue(boolean b) {
808		try {
809		assertTrue(b);
810	<	} catch (AssertionFailedError t) {
811	<	threadRecordFailure(t);
812	<	throw t;
810	>	} catch (AssertionError fail) {
811	>	threadRecordFailure(fail);
812	>	throw fail;
813		}
814		}
815
816		/**
817		* Just like assertFalse(b), but additionally recording (using
818	<	* threadRecordFailure) any AssertionFailedError thrown, so that
819	<	* the current testcase will fail.
818	>	* threadRecordFailure) any AssertionError thrown, so that the
819	>	* current testcase will fail.
820		*/
821		public void threadAssertFalse(boolean b) {
822		try {
823		assertFalse(b);
824	<	} catch (AssertionFailedError t) {
825	<	threadRecordFailure(t);
826	<	throw t;
824	>	} catch (AssertionError fail) {
825	>	threadRecordFailure(fail);
826	>	throw fail;
827		}
828		}
829
830		/**
831		* Just like assertNull(x), but additionally recording (using
832	<	* threadRecordFailure) any AssertionFailedError thrown, so that
833	<	* the current testcase will fail.
832	>	* threadRecordFailure) any AssertionError thrown, so that the
833	>	* current testcase will fail.
834		*/
835		public void threadAssertNull(Object x) {
836		try {
837		assertNull(x);
838	<	} catch (AssertionFailedError t) {
839	<	threadRecordFailure(t);
840	<	throw t;
838	>	} catch (AssertionError fail) {
839	>	threadRecordFailure(fail);
840	>	throw fail;
841		}
842		}
843
844		/**
845		* Just like assertEquals(x, y), but additionally recording (using
846	<	* threadRecordFailure) any AssertionFailedError thrown, so that
847	<	* the current testcase will fail.
846	>	* threadRecordFailure) any AssertionError thrown, so that the
847	>	* current testcase will fail.
848		*/
849		public void threadAssertEquals(long x, long y) {
850		try {
851		assertEquals(x, y);
852	<	} catch (AssertionFailedError t) {
853	<	threadRecordFailure(t);
854	<	throw t;
852	>	} catch (AssertionError fail) {
853	>	threadRecordFailure(fail);
854	>	throw fail;
855		}
856		}
857
858		/**
859		* Just like assertEquals(x, y), but additionally recording (using
860	<	* threadRecordFailure) any AssertionFailedError thrown, so that
861	<	* the current testcase will fail.
860	>	* threadRecordFailure) any AssertionError thrown, so that the
861	>	* current testcase will fail.
862		*/
863		public void threadAssertEquals(Object x, Object y) {
864		try {
865		assertEquals(x, y);
866	<	} catch (AssertionFailedError fail) {
866	>	} catch (AssertionError fail) {
867		threadRecordFailure(fail);
868		throw fail;
869		} catch (Throwable fail) {
#	Line 846 | Line 873 | public class JSR166TestCase extends Test
873
874		/**
875		* Just like assertSame(x, y), but additionally recording (using
876	<	* threadRecordFailure) any AssertionFailedError thrown, so that
877	<	* the current testcase will fail.
876	>	* threadRecordFailure) any AssertionError thrown, so that the
877	>	* current testcase will fail.
878		*/
879		public void threadAssertSame(Object x, Object y) {
880		try {
881		assertSame(x, y);
882	<	} catch (AssertionFailedError fail) {
882	>	} catch (AssertionError fail) {
883		threadRecordFailure(fail);
884		throw fail;
885		}
#	Line 874 | Line 901 | public class JSR166TestCase extends Test
901
902		/**
903		* Records the given exception using {@link #threadRecordFailure},
904	<	* then rethrows the exception, wrapping it in an
905	<	* AssertionFailedError if necessary.
904	>	* then rethrows the exception, wrapping it in an AssertionError
905	>	* if necessary.
906		*/
907		public void threadUnexpectedException(Throwable t) {
908		threadRecordFailure(t);
#	Line 884 | Line 911 | public class JSR166TestCase extends Test
911		throw (RuntimeException) t;
912		else if (t instanceof Error)
913		throw (Error) t;
914	<	else {
915	<	AssertionFailedError afe =
889	<	new AssertionFailedError("unexpected exception: " + t);
890	<	afe.initCause(t);
891	<	throw afe;
892	<	}
914	>	else
915	>	throw new AssertionError("unexpected exception: " + t, t);
916		}
917
918		/**
#	Line 1057 | Line 1080 | public class JSR166TestCase extends Test
1080		}
1081
1082		/**
1083	<	* Checks that thread does not terminate within the default
1061	<	* millisecond delay of {@code timeoutMillis()}.
1083	>	* Checks that thread eventually enters the expected blocked thread state.
1084		*/
1085	<	void assertThreadStaysAlive(Thread thread) {
1086	<	assertThreadStaysAlive(thread, timeoutMillis());
1087	<	}
1088	<
1089	<	/**
1090	<	* Checks that thread does not terminate within the given millisecond delay.
1091	<	*/
1092	<	void assertThreadStaysAlive(Thread thread, long millis) {
1093	<	try {
1094	<	// No need to optimize the failing case via Thread.join.
1095	<	delay(millis);
1096	<	assertTrue(thread.isAlive());
1097	<	} catch (InterruptedException fail) {
1076	<	threadFail("Unexpected InterruptedException");
1077	<	}
1078	<	}
1079	<
1080	<	/**
1081	<	* Checks that the threads do not terminate within the default
1082	<	* millisecond delay of {@code timeoutMillis()}.
1083	<	*/
1084	<	void assertThreadsStayAlive(Thread... threads) {
1085	<	assertThreadsStayAlive(timeoutMillis(), threads);
1086	<	}
1087	<
1088	<	/**
1089	<	* Checks that the threads do not terminate within the given millisecond delay.
1090	<	*/
1091	<	void assertThreadsStayAlive(long millis, Thread... threads) {
1092	<	try {
1093	<	// No need to optimize the failing case via Thread.join.
1094	<	delay(millis);
1095	<	for (Thread thread : threads)
1096	<	assertTrue(thread.isAlive());
1097	<	} catch (InterruptedException fail) {
1098	<	threadFail("Unexpected InterruptedException");
1085	>	void assertThreadBlocks(Thread thread, Thread.State expected) {
1086	>	// always sleep at least 1 ms, with high probability avoiding
1087	>	// transitory states
1088	>	for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1089	>	try { delay(1); }
1090	>	catch (InterruptedException fail) {
1091	>	throw new AssertionError("Unexpected InterruptedException", fail);
1092	>	}
1093	>	Thread.State s = thread.getState();
1094	>	if (s == expected)
1095	>	return;
1096	>	else if (s == Thread.State.TERMINATED)
1097	>	fail("Unexpected thread termination");
1098		}
1099	+	fail("timed out waiting for thread to enter thread state " + expected);
1100		}
1101
1102		/**
#	Line 1137 | Line 1137 | public class JSR166TestCase extends Test
1137		}
1138
1139		/**
1140	+	* The maximum number of consecutive spurious wakeups we should
1141	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1142	+	*/
1143	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1144	+
1145	+	/**
1146		* The number of elements to place in collections, arrays, etc.
1147		*/
1148		public static final int SIZE = 20;
#	Line 1268 | Line 1274 | public class JSR166TestCase extends Test
1274
1275		/**
1276		* Sleeps until the given time has elapsed.
1277	<	* Throws AssertionFailedError if interrupted.
1277	>	* Throws AssertionError if interrupted.
1278		*/
1279		static void sleep(long millis) {
1280		try {
1281		delay(millis);
1282		} catch (InterruptedException fail) {
1283	<	AssertionFailedError afe =
1278	<	new AssertionFailedError("Unexpected InterruptedException");
1279	<	afe.initCause(fail);
1280	<	throw afe;
1283	>	throw new AssertionError("Unexpected InterruptedException", fail);
1284		}
1285		}
1286
#	Line 1299 | Line 1302 | public class JSR166TestCase extends Test
1302		startTime = System.nanoTime();
1303		else if (millisElapsedSince(startTime) > timeoutMillis) {
1304		threadAssertTrue(thread.isAlive());
1305	<	return;
1305	>	fail("timed out waiting for thread to enter wait state");
1306	>	}
1307	>	Thread.yield();
1308	>	}
1309	>	}
1310	>
1311	>	/**
1312	>	* Spin-waits up to the specified number of milliseconds for the given
1313	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1314	>	* and additionally satisfy the given condition.
1315	>	*/
1316	>	void waitForThreadToEnterWaitState(
1317	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1318	>	long startTime = 0L;
1319	>	for (;;) {
1320	>	Thread.State s = thread.getState();
1321	>	if (s == Thread.State.BLOCKED ||
1322	>	s == Thread.State.WAITING ||
1323	>	s == Thread.State.TIMED_WAITING) {
1324	>	try {
1325	>	if (waitingForGodot.call())
1326	>	return;
1327	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1328	>	}
1329	>	else if (s == Thread.State.TERMINATED)
1330	>	fail("Unexpected thread termination");
1331	>	else if (startTime == 0L)
1332	>	startTime = System.nanoTime();
1333	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1334	>	threadAssertTrue(thread.isAlive());
1335	>	fail("timed out waiting for thread to enter wait state");
1336		}
1337		Thread.yield();
1338		}
1339		}
1340
1341		/**
1342	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1343	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1342	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1343	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1344		*/
1345		void waitForThreadToEnterWaitState(Thread thread) {
1346		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1347		}
1348
1349		/**
1350	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1351	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1352	+	* and additionally satisfy the given condition.
1353	+	*/
1354	+	void waitForThreadToEnterWaitState(
1355	+	Thread thread, Callable<Boolean> waitingForGodot) {
1356	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1357	+	}
1358	+
1359	+	/**
1360		* Returns the number of milliseconds since time given by
1361		* startNanoTime, which must have been previously returned from a
1362		* call to {@link System#nanoTime()}.
#	Line 1328 | Line 1371 | public class JSR166TestCase extends Test
1371		//             r.run();
1372		//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1373		//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1374	<	//             throw new AssertionFailedError("did not return promptly");
1374	>	//             throw new AssertionError("did not return promptly");
1375		//     }
1376
1377		//     void assertTerminatesPromptly(Runnable r) {
#	Line 1345 | Line 1388 | public class JSR166TestCase extends Test
1388		assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1389		} catch (Throwable fail) { threadUnexpectedException(fail); }
1390		if (millisElapsedSince(startTime) > timeoutMillis/2)
1391	<	throw new AssertionFailedError("timed get did not return promptly");
1391	>	throw new AssertionError("timed get did not return promptly");
1392		}
1393
1394		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1565 | Line 1608 | public class JSR166TestCase extends Test
1608		}
1609		}
1610
1611	+	public void await(CyclicBarrier barrier) {
1612	+	try {
1613	+	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1614	+	} catch (Throwable fail) {
1615	+	threadUnexpectedException(fail);
1616	+	}
1617	+	}
1618	+
1619		//     /**
1620		//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1621		//      */
#	Line 1579 | Line 1630 | public class JSR166TestCase extends Test
1630		//         long startTime = System.nanoTime();
1631		//         while (!flag.get()) {
1632		//             if (millisElapsedSince(startTime) > timeoutMillis)
1633	<	//                 throw new AssertionFailedError("timed out");
1633	>	//                 throw new AssertionError("timed out");
1634		//             Thread.yield();
1635		//         }
1636		//     }
#	Line 1588 | Line 1639 | public class JSR166TestCase extends Test
1639		public String call() { throw new NullPointerException(); }
1640		}
1641
1591	–	public static class CallableOne implements Callable<Integer> {
1592	–	public Integer call() { return one; }
1593	–	}
1594	–
1595	–	public class ShortRunnable extends CheckedRunnable {
1596	–	protected void realRun() throws Throwable {
1597	–	delay(SHORT_DELAY_MS);
1598	–	}
1599	–	}
1600	–
1601	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1602	–	protected void realRun() throws InterruptedException {
1603	–	delay(SHORT_DELAY_MS);
1604	–	}
1605	–	}
1606	–
1607	–	public class SmallRunnable extends CheckedRunnable {
1608	–	protected void realRun() throws Throwable {
1609	–	delay(SMALL_DELAY_MS);
1610	–	}
1611	–	}
1612	–
1642		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1643		protected void realRun() {
1644		try {
#	Line 1618 | Line 1647 | public class JSR166TestCase extends Test
1647		}
1648		}
1649
1621	–	public class SmallCallable extends CheckedCallable {
1622	–	protected Object realCall() throws InterruptedException {
1623	–	delay(SMALL_DELAY_MS);
1624	–	return Boolean.TRUE;
1625	–	}
1626	–	}
1627	–
1628	–	public class MediumRunnable extends CheckedRunnable {
1629	–	protected void realRun() throws Throwable {
1630	–	delay(MEDIUM_DELAY_MS);
1631	–	}
1632	–	}
1633	–
1634	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1635	–	protected void realRun() throws InterruptedException {
1636	–	delay(MEDIUM_DELAY_MS);
1637	–	}
1638	–	}
1639	–
1650		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1651		return new CheckedRunnable() {
1652		protected void realRun() {
#	Line 1646 | Line 1656 | public class JSR166TestCase extends Test
1656		}};
1657		}
1658
1649	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1650	–	protected void realRun() {
1651	–	try {
1652	–	delay(MEDIUM_DELAY_MS);
1653	–	} catch (InterruptedException ok) {}
1654	–	}
1655	–	}
1656	–
1657	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1658	–	protected void realRun() {
1659	–	try {
1660	–	delay(LONG_DELAY_MS);
1661	–	} catch (InterruptedException ok) {}
1662	–	}
1663	–	}
1664	–
1659		/**
1660		* For use as ThreadFactory in constructors
1661		*/
#	Line 1675 | Line 1669 | public class JSR166TestCase extends Test
1669		boolean isDone();
1670		}
1671
1678	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1679	–	return new TrackedRunnable() {
1680	–	private volatile boolean done = false;
1681	–	public boolean isDone() { return done; }
1682	–	public void run() {
1683	–	try {
1684	–	delay(timeoutMillis);
1685	–	done = true;
1686	–	} catch (InterruptedException ok) {}
1687	–	}
1688	–	};
1689	–	}
1690	–
1691	–	public static class TrackedShortRunnable implements Runnable {
1692	–	public volatile boolean done = false;
1693	–	public void run() {
1694	–	try {
1695	–	delay(SHORT_DELAY_MS);
1696	–	done = true;
1697	–	} catch (InterruptedException ok) {}
1698	–	}
1699	–	}
1700	–
1701	–	public static class TrackedSmallRunnable implements Runnable {
1702	–	public volatile boolean done = false;
1703	–	public void run() {
1704	–	try {
1705	–	delay(SMALL_DELAY_MS);
1706	–	done = true;
1707	–	} catch (InterruptedException ok) {}
1708	–	}
1709	–	}
1710	–
1711	–	public static class TrackedMediumRunnable implements Runnable {
1712	–	public volatile boolean done = false;
1713	–	public void run() {
1714	–	try {
1715	–	delay(MEDIUM_DELAY_MS);
1716	–	done = true;
1717	–	} catch (InterruptedException ok) {}
1718	–	}
1719	–	}
1720	–
1721	–	public static class TrackedLongRunnable implements Runnable {
1722	–	public volatile boolean done = false;
1723	–	public void run() {
1724	–	try {
1725	–	delay(LONG_DELAY_MS);
1726	–	done = true;
1727	–	} catch (InterruptedException ok) {}
1728	–	}
1729	–	}
1730	–
1672		public static class TrackedNoOpRunnable implements Runnable {
1673		public volatile boolean done = false;
1674		public void run() {
#	Line 1735 | Line 1676 | public class JSR166TestCase extends Test
1676		}
1677		}
1678
1738	–	public static class TrackedCallable implements Callable {
1739	–	public volatile boolean done = false;
1740	–	public Object call() {
1741	–	try {
1742	–	delay(SMALL_DELAY_MS);
1743	–	done = true;
1744	–	} catch (InterruptedException ok) {}
1745	–	return Boolean.TRUE;
1746	–	}
1747	–	}
1748	–
1679		/**
1680		* Analog of CheckedRunnable for RecursiveAction
1681		*/
#	Line 1787 | Line 1717 | public class JSR166TestCase extends Test
1717
1718		/**
1719		* A CyclicBarrier that uses timed await and fails with
1720	<	* AssertionFailedErrors instead of throwing checked exceptions.
1720	>	* AssertionErrors instead of throwing checked exceptions.
1721		*/
1722		public static class CheckedBarrier extends CyclicBarrier {
1723		public CheckedBarrier(int parties) { super(parties); }
#	Line 1796 | Line 1726 | public class JSR166TestCase extends Test
1726		try {
1727		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1728		} catch (TimeoutException timedOut) {
1729	<	throw new AssertionFailedError("timed out");
1729	>	throw new AssertionError("timed out");
1730		} catch (Exception fail) {
1731	<	AssertionFailedError afe =
1802	<	new AssertionFailedError("Unexpected exception: " + fail);
1803	<	afe.initCause(fail);
1804	<	throw afe;
1731	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1732		}
1733		}
1734		}
#	Line 1812 | Line 1739 | public class JSR166TestCase extends Test
1739		assertEquals(0, q.size());
1740		assertNull(q.peek());
1741		assertNull(q.poll());
1742	<	assertNull(q.poll(0, MILLISECONDS));
1742	>	assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1743		assertEquals(q.toString(), "[]");
1744		assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1745		assertFalse(q.iterator().hasNext());
#	Line 1924 | Line 1851 | public class JSR166TestCase extends Test
1851		try { throwingAction.run(); }
1852		catch (Throwable t) {
1853		threw = true;
1854	<	if (!expectedExceptionClass.isInstance(t)) {
1855	<	AssertionFailedError afe =
1856	<	new AssertionFailedError
1857	<	("Expected " + expectedExceptionClass.getName() +
1858	<	", got " + t.getClass().getName());
1932	<	afe.initCause(t);
1933	<	threadUnexpectedException(afe);
1934	<	}
1854	>	if (!expectedExceptionClass.isInstance(t))
1855	>	throw new AssertionError(
1856	>	"Expected " + expectedExceptionClass.getName() +
1857	>	", got " + t.getClass().getName(),
1858	>	t);
1859		}
1860		if (!threw)
1861		shouldThrow(expectedExceptionClass.getName());
#	Line 1963 | Line 1887 | public class JSR166TestCase extends Test
1887		static <T> void shuffle(T[] array) {
1888		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1889		}
1890	+
1891	+	/**
1892	+	* Returns the same String as would be returned by {@link
1893	+	* Object#toString}, whether or not the given object's class
1894	+	* overrides toString().
1895	+	*
1896	+	* @see System#identityHashCode
1897	+	*/
1898	+	static String identityString(Object x) {
1899	+	return x.getClass().getName()
1900	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1901	+	}
1902	+
1903	+	// --- Shared assertions for Executor tests ---
1904	+
1905	+	/**
1906	+	* Returns maximum number of tasks that can be submitted to given
1907	+	* pool (with bounded queue) before saturation (when submission
1908	+	* throws RejectedExecutionException).
1909	+	*/
1910	+	static final int saturatedSize(ThreadPoolExecutor pool) {
1911	+	BlockingQueue<Runnable> q = pool.getQueue();
1912	+	return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1913	+	}
1914	+
1915	+	@SuppressWarnings("FutureReturnValueIgnored")
1916	+	void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1917	+	try {
1918	+	e.execute((Runnable) null);
1919	+	shouldThrow();
1920	+	} catch (NullPointerException success) {}
1921	+
1922	+	if (! (e instanceof ExecutorService)) return;
1923	+	ExecutorService es = (ExecutorService) e;
1924	+	try {
1925	+	es.submit((Runnable) null);
1926	+	shouldThrow();
1927	+	} catch (NullPointerException success) {}
1928	+	try {
1929	+	es.submit((Runnable) null, Boolean.TRUE);
1930	+	shouldThrow();
1931	+	} catch (NullPointerException success) {}
1932	+	try {
1933	+	es.submit((Callable) null);
1934	+	shouldThrow();
1935	+	} catch (NullPointerException success) {}
1936	+
1937	+	if (! (e instanceof ScheduledExecutorService)) return;
1938	+	ScheduledExecutorService ses = (ScheduledExecutorService) e;
1939	+	try {
1940	+	ses.schedule((Runnable) null,
1941	+	randomTimeout(), randomTimeUnit());
1942	+	shouldThrow();
1943	+	} catch (NullPointerException success) {}
1944	+	try {
1945	+	ses.schedule((Callable) null,
1946	+	randomTimeout(), randomTimeUnit());
1947	+	shouldThrow();
1948	+	} catch (NullPointerException success) {}
1949	+	try {
1950	+	ses.scheduleAtFixedRate((Runnable) null,
1951	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1952	+	shouldThrow();
1953	+	} catch (NullPointerException success) {}
1954	+	try {
1955	+	ses.scheduleWithFixedDelay((Runnable) null,
1956	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1957	+	shouldThrow();
1958	+	} catch (NullPointerException success) {}
1959	+	}
1960	+
1961	+	void setRejectedExecutionHandler(
1962	+	ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1963	+	p.setRejectedExecutionHandler(handler);
1964	+	assertSame(handler, p.getRejectedExecutionHandler());
1965	+	}
1966	+
1967	+	void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1968	+	final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1969	+	final long savedTaskCount = p.getTaskCount();
1970	+	final long savedCompletedTaskCount = p.getCompletedTaskCount();
1971	+	final int savedQueueSize = p.getQueue().size();
1972	+	final boolean stock = (p.getClass().getClassLoader() == null);
1973	+
1974	+	Runnable r = () -> {};
1975	+	Callable<Boolean> c = () -> Boolean.TRUE;
1976	+
1977	+	class Recorder implements RejectedExecutionHandler {
1978	+	public volatile Runnable r = null;
1979	+	public volatile ThreadPoolExecutor p = null;
1980	+	public void reset() { r = null; p = null; }
1981	+	public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1982	+	assertNull(this.r);
1983	+	assertNull(this.p);
1984	+	this.r = r;
1985	+	this.p = p;
1986	+	}
1987	+	}
1988	+
1989	+	// check custom handler is invoked exactly once per task
1990	+	Recorder recorder = new Recorder();
1991	+	setRejectedExecutionHandler(p, recorder);
1992	+	for (int i = 2; i--> 0; ) {
1993	+	recorder.reset();
1994	+	p.execute(r);
1995	+	if (stock && p.getClass() == ThreadPoolExecutor.class)
1996	+	assertSame(r, recorder.r);
1997	+	assertSame(p, recorder.p);
1998	+
1999	+	recorder.reset();
2000	+	assertFalse(p.submit(r).isDone());
2001	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2002	+	assertSame(p, recorder.p);
2003	+
2004	+	recorder.reset();
2005	+	assertFalse(p.submit(r, Boolean.TRUE).isDone());
2006	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2007	+	assertSame(p, recorder.p);
2008	+
2009	+	recorder.reset();
2010	+	assertFalse(p.submit(c).isDone());
2011	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2012	+	assertSame(p, recorder.p);
2013	+
2014	+	if (p instanceof ScheduledExecutorService) {
2015	+	ScheduledExecutorService s = (ScheduledExecutorService) p;
2016	+	ScheduledFuture<?> future;
2017	+
2018	+	recorder.reset();
2019	+	future = s.schedule(r, randomTimeout(), randomTimeUnit());
2020	+	assertFalse(future.isDone());
2021	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2022	+	assertSame(p, recorder.p);
2023	+
2024	+	recorder.reset();
2025	+	future = s.schedule(c, randomTimeout(), randomTimeUnit());
2026	+	assertFalse(future.isDone());
2027	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2028	+	assertSame(p, recorder.p);
2029	+
2030	+	recorder.reset();
2031	+	future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2032	+	assertFalse(future.isDone());
2033	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2034	+	assertSame(p, recorder.p);
2035	+
2036	+	recorder.reset();
2037	+	future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2038	+	assertFalse(future.isDone());
2039	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2040	+	assertSame(p, recorder.p);
2041	+	}
2042	+	}
2043	+
2044	+	// Checking our custom handler above should be sufficient, but
2045	+	// we add some integration tests of standard handlers.
2046	+	final AtomicReference<Thread> thread = new AtomicReference<>();
2047	+	final Runnable setThread = () -> thread.set(Thread.currentThread());
2048	+
2049	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2050	+	try {
2051	+	p.execute(setThread);
2052	+	shouldThrow();
2053	+	} catch (RejectedExecutionException success) {}
2054	+	assertNull(thread.get());
2055	+
2056	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2057	+	p.execute(setThread);
2058	+	assertNull(thread.get());
2059	+
2060	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2061	+	p.execute(setThread);
2062	+	if (p.isShutdown())
2063	+	assertNull(thread.get());
2064	+	else
2065	+	assertSame(Thread.currentThread(), thread.get());
2066	+
2067	+	setRejectedExecutionHandler(p, savedHandler);
2068	+
2069	+	// check that pool was not perturbed by handlers
2070	+	assertEquals(savedTaskCount, p.getTaskCount());
2071	+	assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2072	+	assertEquals(savedQueueSize, p.getQueue().size());
2073	+	}
2074		}

Diff Legend

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