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.234 by jsr166, Mon Jul 17 22:27:31 2017 UTC vs.
Revision 1.237 by jsr166, Wed Aug 23 05:33:00 2017 UTC

#	Line 544 | Line 544 | public class JSR166TestCase extends Test
544		"DoubleAdderTest",
545		"ForkJoinPool8Test",
546		"ForkJoinTask8Test",
547	+	"HashMapTest",
548		"LinkedBlockingDeque8Test",
549		"LinkedBlockingQueue8Test",
550		"LongAccumulatorTest",
#	Line 1116 | Line 1117 | public class JSR166TestCase extends Test
1117		}
1118
1119		/**
1119	–	* Checks that thread does not terminate within the default
1120	–	* millisecond delay of {@code timeoutMillis()}.
1121	–	* TODO: REMOVEME
1122	–	*/
1123	–	void assertThreadStaysAlive(Thread thread) {
1124	–	assertThreadStaysAlive(thread, timeoutMillis());
1125	–	}
1126	–
1127	–	/**
1128	–	* Checks that thread does not terminate within the given millisecond delay.
1129	–	* TODO: REMOVEME
1130	–	*/
1131	–	void assertThreadStaysAlive(Thread thread, long millis) {
1132	–	try {
1133	–	// No need to optimize the failing case via Thread.join.
1134	–	delay(millis);
1135	–	assertTrue(thread.isAlive());
1136	–	} catch (InterruptedException fail) {
1137	–	threadFail("Unexpected InterruptedException");
1138	–	}
1139	–	}
1140	–
1141	–	/**
1142	–	* Checks that the threads do not terminate within the default
1143	–	* millisecond delay of {@code timeoutMillis()}.
1144	–	* TODO: REMOVEME
1145	–	*/
1146	–	void assertThreadsStayAlive(Thread... threads) {
1147	–	assertThreadsStayAlive(timeoutMillis(), threads);
1148	–	}
1149	–
1150	–	/**
1151	–	* Checks that the threads do not terminate within the given millisecond delay.
1152	–	* TODO: REMOVEME
1153	–	*/
1154	–	void assertThreadsStayAlive(long millis, Thread... threads) {
1155	–	try {
1156	–	// No need to optimize the failing case via Thread.join.
1157	–	delay(millis);
1158	–	for (Thread thread : threads)
1159	–	assertTrue(thread.isAlive());
1160	–	} catch (InterruptedException fail) {
1161	–	threadFail("Unexpected InterruptedException");
1162	–	}
1163	–	}
1164	–
1165	–	/**
1120		* Checks that future.get times out, with the default timeout of
1121		* {@code timeoutMillis()}.
1122		*/
#	Line 1960 | Line 1914 | public class JSR166TestCase extends Test
1914		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1915		}
1916
1917	+	/**
1918	+	* Returns the same String as would be returned by {@link
1919	+	* Object#toString}, whether or not the given object's class
1920	+	* overrides toString().
1921	+	*
1922	+	* @see System#identityHashCode
1923	+	*/
1924	+	static String identityString(Object x) {
1925	+	return x.getClass().getName()
1926	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1927	+	}
1928	+
1929		// --- Shared assertions for Executor tests ---
1930
1931		/**

Diff Legend

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