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.139 by jsr166, Sun Sep 6 21:14:12 2015 UTC vs.
Revision 1.146 by jsr166, Fri Sep 25 23:32:15 2015 UTC

#	Line 40 | Line 40 | import java.util.concurrent.CyclicBarrie
40		import java.util.concurrent.ExecutionException;
41		import java.util.concurrent.Executors;
42		import java.util.concurrent.ExecutorService;
43	+	import java.util.concurrent.ForkJoinPool;
44		import java.util.concurrent.Future;
45		import java.util.concurrent.RecursiveAction;
46		import java.util.concurrent.RecursiveTask;
#	Line 67 | Line 68 | import junit.framework.TestSuite;
68		*
69		* <ol>
70		*
71	<	* <li> All assertions in code running in generated threads must use
71	>	* <li>All assertions in code running in generated threads must use
72		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
73		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
74		* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
75		* particularly recommended) for other code to use these forms too.
76		* Only the most typically used JUnit assertion methods are defined
77	<	* this way, but enough to live with.</li>
77	>	* this way, but enough to live with.
78		*
79	<	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
79	>	* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
80		* to invoke {@code super.setUp} and {@code super.tearDown} within
81		* them. These methods are used to clear and check for thread
82	<	* assertion failures.</li>
82	>	* assertion failures.
83		*
84		* <li>All delays and timeouts must use one of the constants {@code
85		* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
#	Line 89 | Line 90 | import junit.framework.TestSuite;
90		* is always discriminable as larger than SHORT and smaller than
91		* MEDIUM.  And so on. These constants are set to conservative values,
92		* but even so, if there is ever any doubt, they can all be increased
93	<	* in one spot to rerun tests on slower platforms.</li>
93	>	* in one spot to rerun tests on slower platforms.
94		*
95	<	* <li> All threads generated must be joined inside each test case
95	>	* <li>All threads generated must be joined inside each test case
96		* method (or {@code fail} to do so) before returning from the
97		* method. The {@code joinPool} method can be used to do this when
98	<	* using Executors.</li>
98	>	* using Executors.
99		*
100		* </ol>
101		*
102		* <p><b>Other notes</b>
103		* <ul>
104		*
105	<	* <li> Usually, there is one testcase method per JSR166 method
105	>	* <li>Usually, there is one testcase method per JSR166 method
106		* covering "normal" operation, and then as many exception-testing
107		* methods as there are exceptions the method can throw. Sometimes
108		* there are multiple tests per JSR166 method when the different
109		* "normal" behaviors differ significantly. And sometimes testcases
110		* cover multiple methods when they cannot be tested in
111	<	* isolation.</li>
111	>	* isolation.
112		*
113	<	* <li> The documentation style for testcases is to provide as javadoc
113	>	* <li>The documentation style for testcases is to provide as javadoc
114		* a simple sentence or two describing the property that the testcase
115		* method purports to test. The javadocs do not say anything about how
116	<	* the property is tested. To find out, read the code.</li>
116	>	* the property is tested. To find out, read the code.
117		*
118	<	* <li> These tests are "conformance tests", and do not attempt to
118	>	* <li>These tests are "conformance tests", and do not attempt to
119		* test throughput, latency, scalability or other performance factors
120		* (see the separate "jtreg" tests for a set intended to check these
121		* for the most central aspects of functionality.) So, most tests use
122		* the smallest sensible numbers of threads, collection sizes, etc
123	<	* needed to check basic conformance.</li>
123	>	* needed to check basic conformance.
124		*
125		* <li>The test classes currently do not declare inclusion in
126		* any particular package to simplify things for people integrating
127	<	* them in TCK test suites.</li>
127	>	* them in TCK test suites.
128		*
129	<	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
130	<	* runs all JSR166 unit tests.</li>
129	>	* <li>As a convenience, the {@code main} of this class (JSR166TestCase)
130	>	* runs all JSR166 unit tests.
131		*
132		* </ul>
133		*/
#	Line 198 | Line 199 | public class JSR166TestCase extends Test
199		}
200
201		protected void runTestProfiled() throws Throwable {
202	<	// Warmup run, notably to trigger all needed classloading.
203	<	super.runTest();
203	<	long t0 = System.nanoTime();
204	<	try {
202	>	for (int i = 0; i < 2; i++) {
203	>	long startTime = System.nanoTime();
204		super.runTest();
205	<	} finally {
206	<	long elapsedMillis = millisElapsedSince(t0);
207	<	if (elapsedMillis >= profileThreshold)
205	>	long elapsedMillis = millisElapsedSince(startTime);
206	>	if (elapsedMillis < profileThreshold)
207	>	break;
208	>	// Never report first run of any test; treat it as a
209	>	// warmup run, notably to trigger all needed classloading,
210	>	if (i > 0)
211		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
212		}
213		}
#	Line 379 | Line 381 | public class JSR166TestCase extends Test
381		"LongAdderTest",
382		"SplittableRandomTest",
383		"StampedLockTest",
384	+	"SubmissionPublisherTest",
385		"ThreadLocalRandom8Test",
386		};
387		addNamedTestClasses(suite, java8TestClassNames);
#	Line 387 | Line 390 | public class JSR166TestCase extends Test
390		// Java9+ test classes
391		if (atLeastJava9()) {
392		String[] java9TestClassNames = {
393	<	// Currently empty
393	>	// Currently empty, but expecting varhandle tests
394		};
395		addNamedTestClasses(suite, java9TestClassNames);
396		}
#	Line 519 | Line 522 | public class JSR166TestCase extends Test
522		setDelays();
523		}
524
525	+	void tearDownFail(String format, Object... args) {
526	+	String msg = toString() + ": " + String.format(format, args);
527	+	System.err.println(msg);
528	+	printAllStackTraces();
529	+	throw new AssertionFailedError(msg);
530	+	}
531	+
532		/**
533		* Extra checks that get done for all test cases.
534		*
#	Line 546 | Line 556 | public class JSR166TestCase extends Test
556		}
557
558		if (Thread.interrupted())
559	<	throw new AssertionFailedError("interrupt status set in main thread");
559	>	tearDownFail("interrupt status set in main thread");
560
561		checkForkJoinPoolThreadLeaks();
562		}
#	Line 555 | Line 565 | public class JSR166TestCase extends Test
565		* Finds missing try { ... } finally { joinPool(e); }
566		*/
567		void checkForkJoinPoolThreadLeaks() throws InterruptedException {
568	<	Thread[] survivors = new Thread[5];
568	>	Thread[] survivors = new Thread[7];
569		int count = Thread.enumerate(survivors);
570		for (int i = 0; i < count; i++) {
571		Thread thread = survivors[i];
#	Line 563 | Line 573 | public class JSR166TestCase extends Test
573		if (name.startsWith("ForkJoinPool-")) {
574		// give thread some time to terminate
575		thread.join(LONG_DELAY_MS);
576	<	if (!thread.isAlive()) continue;
577	<	throw new AssertionFailedError
578	<	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
569	<	toString(), name));
576	>	if (thread.isAlive())
577	>	tearDownFail("Found leaked ForkJoinPool thread thread=%s",
578	>	thread);
579		}
580		}
581	+
582	+	if (!ForkJoinPool.commonPool()
583	+	.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
584	+	tearDownFail("ForkJoin common pool thread stuck");
585		}
586
587		/**
#	Line 743 | Line 756 | public class JSR166TestCase extends Test
756		}
757
758		/** Like Runnable, but with the freedom to throw anything */
759	<	interface Thunk { public void run() throws Throwable; }
759	>	interface Action { public void run() throws Throwable; }
760
761		/**
762	<	* Runs all the given tasks in parallel, failing if any fail.
762	>	* Runs all the given actions in parallel, failing if any fail.
763		* Useful for running multiple variants of tests that are
764		* necessarily individually slow because they must block.
765		*/
766	<	void testInParallel(Thunk ... thunks) {
766	>	void testInParallel(Action ... actions) {
767		ExecutorService pool = Executors.newCachedThreadPool();
768		try {
769	<	ArrayList<Future<?>> futures = new ArrayList<>(thunks.length);
770	<	for (final Thunk thunk : thunks)
769	>	ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
770	>	for (final Action action : actions)
771		futures.add(pool.submit(new CheckedRunnable() {
772	<	public void realRun() throws Throwable { thunk.run();}}));
772	>	public void realRun() throws Throwable { action.run();}}));
773		for (Future<?> future : futures)
774		try {
775		assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
#	Line 1222 | Line 1235 | public class JSR166TestCase extends Test
1235		public static final String TEST_STRING = "a test string";
1236
1237		public static class StringTask implements Callable<String> {
1238	<	public String call() { return TEST_STRING; }
1238	>	final String value;
1239	>	public StringTask() { this(TEST_STRING); }
1240	>	public StringTask(String value) { this.value = value; }
1241	>	public String call() { return value; }
1242		}
1243
1244		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {

Diff Legend

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