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.182 by jsr166, Sun Jan 17 00:07:51 2016 UTC vs.
Revision 1.207 by jsr166, Thu Nov 3 20:41:32 2016 UTC

#	Line 9 | Line 9
9		/*
10		* @test
11		* @summary JSR-166 tck tests
12	+	* @modules java.management
13		* @build *
14	<	* @run junit/othervm/timeout=1000 JSR166TestCase
14	>	* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
15	>	* @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -Djsr166.testImplementationDetails=true JSR166TestCase
16	>	* @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -Djava.util.secureRandomSeed=true JSR166TestCase
17		*/
18
19		import static java.util.concurrent.TimeUnit.MILLISECONDS;
#	Line 38 | Line 41 | import java.security.ProtectionDomain;
41		import java.security.SecurityPermission;
42		import java.util.ArrayList;
43		import java.util.Arrays;
44	+	import java.util.Collections;
45		import java.util.Date;
46		import java.util.Enumeration;
47		import java.util.Iterator;
#	Line 57 | Line 61 | import java.util.concurrent.RecursiveAct
61		import java.util.concurrent.RecursiveTask;
62		import java.util.concurrent.RejectedExecutionHandler;
63		import java.util.concurrent.Semaphore;
64	+	import java.util.concurrent.SynchronousQueue;
65		import java.util.concurrent.ThreadFactory;
66	+	import java.util.concurrent.ThreadLocalRandom;
67		import java.util.concurrent.ThreadPoolExecutor;
68		import java.util.concurrent.TimeoutException;
69	+	import java.util.concurrent.atomic.AtomicBoolean;
70		import java.util.concurrent.atomic.AtomicReference;
71		import java.util.regex.Matcher;
72		import java.util.regex.Pattern;
#	Line 183 | Line 190 | public class JSR166TestCase extends Test
190		Integer.getInteger("jsr166.suiteRuns", 1);
191
192		/**
193	<	* The scaling factor to apply to standard delays used in tests.
193	>	* Returns the value of the system property, or NaN if not defined.
194		*/
195	<	private static final int delayFactor =
196	<	Integer.getInteger("jsr166.delay.factor", 1);
195	>	private static float systemPropertyValue(String name) {
196	>	String floatString = System.getProperty(name);
197	>	if (floatString == null)
198	>	return Float.NaN;
199	>	try {
200	>	return Float.parseFloat(floatString);
201	>	} catch (NumberFormatException ex) {
202	>	throw new IllegalArgumentException(
203	>	String.format("Bad float value in system property %s=%s",
204	>	name, floatString));
205	>	}
206	>	}
207	>
208	>	/**
209	>	* The scaling factor to apply to standard delays used in tests.
210	>	* May be initialized from any of:
211	>	* - the "jsr166.delay.factor" system property
212	>	* - the "test.timeout.factor" system property (as used by jtreg)
213	>	*   See: http://openjdk.java.net/jtreg/tag-spec.html
214	>	* - hard-coded fuzz factor when using a known slowpoke VM
215	>	*/
216	>	private static final float delayFactor = delayFactor();
217	>
218	>	private static float delayFactor() {
219	>	float x;
220	>	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
221	>	return x;
222	>	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
223	>	return x;
224	>	String prop = System.getProperty("java.vm.version");
225	>	if (prop != null && prop.matches(".*debug.*"))
226	>	return 4.0f; // How much slower is fastdebug than product?!
227	>	return 1.0f;
228	>	}
229
230		public JSR166TestCase() { super(); }
231		public JSR166TestCase(String name) { super(name); }
#	Line 408 | Line 447 | public class JSR166TestCase extends Test
447		AbstractQueuedLongSynchronizerTest.suite(),
448		ArrayBlockingQueueTest.suite(),
449		ArrayDequeTest.suite(),
450	+	ArrayListTest.suite(),
451		AtomicBooleanTest.suite(),
452		AtomicIntegerArrayTest.suite(),
453		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 430 | Line 470 | public class JSR166TestCase extends Test
470		CopyOnWriteArrayListTest.suite(),
471		CopyOnWriteArraySetTest.suite(),
472		CountDownLatchTest.suite(),
473	+	CountedCompleterTest.suite(),
474		CyclicBarrierTest.suite(),
475		DelayQueueTest.suite(),
476		EntryTest.suite(),
#	Line 458 | Line 499 | public class JSR166TestCase extends Test
499		TreeMapTest.suite(),
500		TreeSetTest.suite(),
501		TreeSubMapTest.suite(),
502	<	TreeSubSetTest.suite());
502	>	TreeSubSetTest.suite(),
503	>	VectorTest.suite());
504
505		// Java8+ test classes
506		if (atLeastJava8()) {
507		String[] java8TestClassNames = {
508	+	"ArrayDeque8Test",
509		"Atomic8Test",
510		"CompletableFutureTest",
511		"ConcurrentHashMap8Test",
512	<	"CountedCompleterTest",
512	>	"CountedCompleter8Test",
513		"DoubleAccumulatorTest",
514		"DoubleAdderTest",
515		"ForkJoinPool8Test",
#	Line 477 | Line 520 | public class JSR166TestCase extends Test
520		"StampedLockTest",
521		"SubmissionPublisherTest",
522		"ThreadLocalRandom8Test",
523	+	"TimeUnit8Test",
524		};
525		addNamedTestClasses(suite, java8TestClassNames);
526		}
#	Line 484 | Line 528 | public class JSR166TestCase extends Test
528		// Java9+ test classes
529		if (atLeastJava9()) {
530		String[] java9TestClassNames = {
531	<	// Currently empty, but expecting varhandle tests
531	>	"AtomicBoolean9Test",
532	>	"AtomicInteger9Test",
533	>	"AtomicIntegerArray9Test",
534	>	"AtomicLong9Test",
535	>	"AtomicLongArray9Test",
536	>	"AtomicReference9Test",
537	>	"AtomicReferenceArray9Test",
538	>	"ExecutorCompletionService9Test",
539		};
540		addNamedTestClasses(suite, java9TestClassNames);
541		}
#	Line 562 | Line 613 | public class JSR166TestCase extends Test
613
614		/**
615		* Returns the shortest timed delay. This can be scaled up for
616	<	* slow machines using the jsr166.delay.factor system property.
616	>	* slow machines using the jsr166.delay.factor system property,
617	>	* or via jtreg's -timeoutFactor: flag.
618	>	* http://openjdk.java.net/jtreg/command-help.html
619		*/
620		protected long getShortDelay() {
621	<	return 50 * delayFactor;
621	>	return (long) (50 * delayFactor);
622		}
623
624		/**
#	Line 878 | Line 931 | public class JSR166TestCase extends Test
931		}};
932		}
933
934	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
935	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
936	+	}
937	+
938	+	Runnable releaser(final AtomicBoolean flag) {
939	+	return new Runnable() { public void run() { flag.set(true); }};
940	+	}
941	+
942		/**
943		* Waits out termination of a thread pool or fails doing so.
944		*/
#	Line 901 | Line 962 | public class JSR166TestCase extends Test
962		}
963		}
964
965	<	/** Like Runnable, but with the freedom to throw anything */
965	>	/**
966	>	* Like Runnable, but with the freedom to throw anything.
967	>	* junit folks had the same idea:
968	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
969	>	*/
970		interface Action { public void run() throws Throwable; }
971
972		/**
#	Line 932 | Line 997 | public class JSR166TestCase extends Test
997		* Uninteresting threads are filtered out.
998		*/
999		static void dumpTestThreads() {
1000	+	SecurityManager sm = System.getSecurityManager();
1001	+	if (sm != null) {
1002	+	try {
1003	+	System.setSecurityManager(null);
1004	+	} catch (SecurityException giveUp) {
1005	+	return;
1006	+	}
1007	+	}
1008	+
1009		ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1010		System.err.println("------ stacktrace dump start ------");
1011		for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1012	<	String name = info.getThreadName();
1012	>	final String name = info.getThreadName();
1013	>	String lockName;
1014		if ("Signal Dispatcher".equals(name))
1015		continue;
1016		if ("Reference Handler".equals(name)
1017	<	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1017	>	&& (lockName = info.getLockName()) != null
1018	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1019		continue;
1020		if ("Finalizer".equals(name)
1021	<	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1021	>	&& (lockName = info.getLockName()) != null
1022	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1023		continue;
1024		if ("checkForWedgedTest".equals(name))
1025		continue;
1026		System.err.print(info);
1027		}
1028		System.err.println("------ stacktrace dump end ------");
1029	+
1030	+	if (sm != null) System.setSecurityManager(sm);
1031		}
1032
1033		/**
#	Line 1165 | Line 1244 | public class JSR166TestCase extends Test
1244		* Sleeps until the given time has elapsed.
1245		* Throws AssertionFailedError if interrupted.
1246		*/
1247	<	void sleep(long millis) {
1247	>	static void sleep(long millis) {
1248		try {
1249		delay(millis);
1250		} catch (InterruptedException fail) {
#	Line 1181 | Line 1260 | public class JSR166TestCase extends Test
1260		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1261		*/
1262		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1263	<	long startTime = System.nanoTime();
1263	>	long startTime = 0L;
1264		for (;;) {
1265		Thread.State s = thread.getState();
1266		if (s == Thread.State.BLOCKED ||
#	Line 1190 | Line 1269 | public class JSR166TestCase extends Test
1269		return;
1270		else if (s == Thread.State.TERMINATED)
1271		fail("Unexpected thread termination");
1272	+	else if (startTime == 0L)
1273	+	startTime = System.nanoTime();
1274		else if (millisElapsedSince(startTime) > timeoutMillis) {
1275		threadAssertTrue(thread.isAlive());
1276		return;
#	Line 1434 | Line 1515 | public class JSR166TestCase extends Test
1515		return new LatchAwaiter(latch);
1516		}
1517
1518	<	public void await(CountDownLatch latch) {
1518	>	public void await(CountDownLatch latch, long timeoutMillis) {
1519		try {
1520	<	if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1520	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1521		fail("timed out waiting for CountDownLatch for "
1522	<	+ (LONG_DELAY_MS/1000) + " sec");
1522	>	+ (timeoutMillis/1000) + " sec");
1523		} catch (Throwable fail) {
1524		threadUnexpectedException(fail);
1525		}
1526		}
1527
1528	+	public void await(CountDownLatch latch) {
1529	+	await(latch, LONG_DELAY_MS);
1530	+	}
1531	+
1532		public void await(Semaphore semaphore) {
1533		try {
1534		if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
#	Line 1678 | Line 1763 | public class JSR166TestCase extends Test
1763		* A CyclicBarrier that uses timed await and fails with
1764		* AssertionFailedErrors instead of throwing checked exceptions.
1765		*/
1766	<	public class CheckedBarrier extends CyclicBarrier {
1766	>	public static class CheckedBarrier extends CyclicBarrier {
1767		public CheckedBarrier(int parties) { super(parties); }
1768
1769		public int await() {
#	Line 1784 | Line 1869 | public class JSR166TestCase extends Test
1869		} catch (NoSuchElementException success) {}
1870		assertFalse(it.hasNext());
1871		}
1872	+
1873	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1874	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1875	+	}
1876	+
1877	+	public Runnable runnableThrowing(final RuntimeException ex) {
1878	+	return new Runnable() { public void run() { throw ex; }};
1879	+	}
1880	+
1881	+	/** A reusable thread pool to be shared by tests. */
1882	+	static final ExecutorService cachedThreadPool =
1883	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1884	+	1000L, MILLISECONDS,
1885	+	new SynchronousQueue<Runnable>());
1886	+
1887	+	static <T> void shuffle(T[] array) {
1888	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1889	+	}
1890		}

Diff Legend

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