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.219 by jsr166, Sat Feb 18 16:37:49 2017 UTC vs.
Revision 1.229 by jsr166, Sun May 14 03:15:37 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 (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 91 | Line 91 | import java.util.concurrent.ThreadPoolEx
91		import java.util.concurrent.TimeoutException;
92		import java.util.concurrent.atomic.AtomicBoolean;
93		import java.util.concurrent.atomic.AtomicReference;
94	–	import java.util.regex.Matcher;
94		import java.util.regex.Pattern;
95
96		import junit.framework.AssertionFailedError;
#	Line 301 | 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 657 | 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 1057 | Line 1063 | public class JSR166TestCase extends Test
1063		}
1064
1065		/**
1066	<	* Checks that thread does not terminate within the default
1061	<	* millisecond delay of {@code timeoutMillis()}.
1066	>	* Checks that thread eventually enters the expected blocked thread state.
1067		*/
1068	<	void assertThreadStaysAlive(Thread thread) {
1069	<	assertThreadStaysAlive(thread, timeoutMillis());
1070	<	}
1071	<
1072	<	/**
1073	<	* Checks that thread does not terminate within the given millisecond delay.
1074	<	*/
1075	<	void assertThreadStaysAlive(Thread thread, long millis) {
1076	<	try {
1077	<	// No need to optimize the failing case via Thread.join.
1078	<	delay(millis);
1079	<	assertTrue(thread.isAlive());
1080	<	} 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");
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		/**
#	Line 1137 | Line 1120 | public class JSR166TestCase extends Test
1120		}
1121
1122		/**
1123	+	* The maximum number of consecutive spurious wakeups we should
1124	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1125	+	*/
1126	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1127	+
1128	+	/**
1129		* The number of elements to place in collections, arrays, etc.
1130		*/
1131		public static final int SIZE = 20;
#	Line 1603 | Line 1592 | public class JSR166TestCase extends Test
1592		} catch (Throwable fail) {
1593		threadUnexpectedException(fail);
1594		}
1595	+	}
1596	+
1597	+	public void await(CyclicBarrier barrier) {
1598	+	try {
1599	+	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1600	+	} catch (Throwable fail) {
1601	+	threadUnexpectedException(fail);
1602	+	}
1603		}
1604
1605		//     /**

Diff Legend

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