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.94 by jsr166, Mon Jan 21 19:32:19 2013 UTC vs.
Revision 1.106 by jsr166, Mon Apr 1 20:06:26 2013 UTC

#	Line 11 | Line 11 | import java.io.ByteArrayInputStream;
11		import java.io.ByteArrayOutputStream;
12		import java.io.ObjectInputStream;
13		import java.io.ObjectOutputStream;
14	+	import java.lang.management.ManagementFactory;
15	+	import java.lang.management.ThreadInfo;
16	+	import java.lang.reflect.Method;
17		import java.util.ArrayList;
18		import java.util.Arrays;
19		import java.util.Date;
#	Line 179 | Line 182 | public class JSR166TestCase extends Test
182		return suite;
183		}
184
185	+	public static void addNamedTestClasses(TestSuite suite,
186	+	String... testClassNames) {
187	+	for (String testClassName : testClassNames) {
188	+	try {
189	+	Class<?> testClass = Class.forName(testClassName);
190	+	Method m = testClass.getDeclaredMethod("suite",
191	+	new Class<?>[0]);
192	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
193	+	} catch (Exception e) {
194	+	throw new Error("Missing test class", e);
195	+	}
196	+	}
197	+	}
198	+
199	+	public static final double JAVA_CLASS_VERSION;
200	+	static {
201	+	try {
202	+	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
203	+	new java.security.PrivilegedAction<Double>() {
204	+	public Double run() {
205	+	return Double.valueOf(System.getProperty("java.class.version"));}});
206	+	} catch (Throwable t) {
207	+	throw new Error(t);
208	+	}
209	+	}
210	+
211	+	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
212	+	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
213	+	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
214	+
215		/**
216		* Collects all JSR166 unit tests as one suite.
217		*/
218		public static Test suite() {
219	<	return newTestSuite(
219	>	// Java7+ test classes
220	>	TestSuite suite = newTestSuite(
221		ForkJoinPoolTest.suite(),
222		ForkJoinTaskTest.suite(),
223		RecursiveActionTest.suite(),
#	Line 248 | Line 282 | public class JSR166TestCase extends Test
282		TreeSetTest.suite(),
283		TreeSubMapTest.suite(),
284		TreeSubSetTest.suite());
285	+
286	+	// Java8+ test classes
287	+	if (atLeastJava8()) {
288	+	String[] java8TestClassNames = {
289	+	"CompletableFutureTest",
290	+	"ConcurrentHashMap8Test",
291	+	"CountedCompleterTest",
292	+	"DoubleAccumulatorTest",
293	+	"DoubleAdderTest",
294	+	"ForkJoinPool8Test",
295	+	"LongAccumulatorTest",
296	+	"LongAdderTest",
297	+	"StampedLockTest",
298	+	};
299	+	addNamedTestClasses(suite, java8TestClassNames);
300	+	}
301	+
302	+	return suite;
303		}
304
305
#	Line 339 | Line 391 | public class JSR166TestCase extends Test
391
392		if (Thread.interrupted())
393		throw new AssertionFailedError("interrupt status set in main thread");
394	+
395	+	checkForkJoinPoolThreadLeaks();
396	+	}
397	+
398	+	/**
399	+	* Find missing try { ... } finally { joinPool(e); }
400	+	*/
401	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
402	+	Thread[] survivors = new Thread[5];
403	+	int count = Thread.enumerate(survivors);
404	+	for (int i = 0; i < count; i++) {
405	+	Thread thread = survivors[i];
406	+	String name = thread.getName();
407	+	if (name.startsWith("ForkJoinPool-")) {
408	+	// give thread some time to terminate
409	+	thread.join(LONG_DELAY_MS);
410	+	if (!thread.isAlive()) continue;
411	+	thread.stop();
412	+	throw new AssertionFailedError
413	+	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
414	+	toString(), name));
415	+	}
416	+	}
417		}
418
419		/**
#	Line 512 | Line 587 | public class JSR166TestCase extends Test
587		}
588
589		/**
590	+	* A debugging tool to print all stack traces, as jstack does.
591	+	*/
592	+	static void printAllStackTraces() {
593	+	for (ThreadInfo info :
594	+	ManagementFactory.getThreadMXBean()
595	+	.dumpAllThreads(true, true))
596	+	System.err.print(info);
597	+	}
598	+
599	+	/**
600		* Checks that thread does not terminate within the default
601		* millisecond delay of {@code timeoutMillis()}.
602		*/
#	Line 1263 | Line 1348 | public class JSR166TestCase extends Test
1348		return null;
1349		}
1350		}
1351	+
1352	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1353	+	Runnable... throwingActions) {
1354	+	for (Runnable throwingAction : throwingActions) {
1355	+	boolean threw = false;
1356	+	try { throwingAction.run(); }
1357	+	catch (Throwable t) {
1358	+	threw = true;
1359	+	if (!expectedExceptionClass.isInstance(t)) {
1360	+	AssertionFailedError afe =
1361	+	new AssertionFailedError
1362	+	("Expected " + expectedExceptionClass.getName() +
1363	+	", got " + t.getClass().getName());
1364	+	afe.initCause(t);
1365	+	threadUnexpectedException(afe);
1366	+	}
1367	+	}
1368	+	if (!threw)
1369	+	shouldThrow(expectedExceptionClass.getName());
1370	+	}
1371	+	}
1372		}

Diff Legend

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