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.222 by jsr166, Fri May 12 18:12:51 2017 UTC vs.
Revision 1.233 by jsr166, Sat Jul 15 23:15:21 2017 UTC

#	Line 88 | Line 88 | import java.util.concurrent.SynchronousQ
88		import java.util.concurrent.ThreadFactory;
89		import java.util.concurrent.ThreadLocalRandom;
90		import java.util.concurrent.ThreadPoolExecutor;
91	+	import java.util.concurrent.TimeUnit;
92		import java.util.concurrent.TimeoutException;
93		import java.util.concurrent.atomic.AtomicBoolean;
94		import java.util.concurrent.atomic.AtomicReference;
#	Line 638 | Line 639 | public class JSR166TestCase extends Test
639		public static long MEDIUM_DELAY_MS;
640		public static long LONG_DELAY_MS;
641
642	+	private static final long RANDOM_TIMEOUT;
643	+	private static final long RANDOM_EXPIRED_TIMEOUT;
644	+	private static final TimeUnit RANDOM_TIMEUNIT;
645	+	static {
646	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
647	+	long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
648	+	RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
649	+	RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
650	+	TimeUnit[] timeUnits = TimeUnit.values();
651	+	RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
652	+	}
653	+
654	+	/**
655	+	* Returns a timeout for use when any value at all will do.
656	+	*/
657	+	static long randomTimeout() { return RANDOM_TIMEOUT; }
658	+
659	+	/**
660	+	* Returns a timeout that means "no waiting", i.e. not positive.
661	+	*/
662	+	static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
663	+
664	+	/**
665	+	* Returns a random non-null TimeUnit.
666	+	*/
667	+	static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
668	+
669		/**
670		* Returns the shortest timed delay. This can be scaled up for
671		* slow machines using the jsr166.delay.factor system property,
#	Line 658 | Line 686 | public class JSR166TestCase extends Test
686		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
687		}
688
689	+	private static final long TIMEOUT_DELAY_MS
690	+	= (long) (12.0 * Math.cbrt(delayFactor));
691	+
692		/**
693	<	* Returns a timeout in milliseconds to be used in tests that
694	<	* verify that operations block or time out.
693	>	* Returns a timeout in milliseconds to be used in tests that verify
694	>	* that operations block or time out.  We want this to be longer
695	>	* than the OS scheduling quantum, but not too long, so don't scale
696	>	* linearly with delayFactor; we use "crazy" cube root instead.
697		*/
698	<	long timeoutMillis() {
699	<	return SHORT_DELAY_MS / 4;
698	>	static long timeoutMillis() {
699	>	return TIMEOUT_DELAY_MS;
700		}
701
702		/**
#	Line 1058 | Line 1091 | public class JSR166TestCase extends Test
1091		}
1092
1093		/**
1094	+	* Checks that thread eventually enters the expected blocked thread state.
1095	+	*/
1096	+	void assertThreadBlocks(Thread thread, Thread.State expected) {
1097	+	// always sleep at least 1 ms, with high probability avoiding
1098	+	// transitory states
1099	+	for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1100	+	try { delay(1); }
1101	+	catch (InterruptedException fail) {
1102	+	fail("Unexpected InterruptedException");
1103	+	}
1104	+	Thread.State s = thread.getState();
1105	+	if (s == expected)
1106	+	return;
1107	+	else if (s == Thread.State.TERMINATED)
1108	+	fail("Unexpected thread termination");
1109	+	}
1110	+	fail("timed out waiting for thread to enter thread state " + expected);
1111	+	}
1112	+
1113	+	/**
1114		* Checks that thread does not terminate within the default
1115		* millisecond delay of {@code timeoutMillis()}.
1116	+	* TODO: REMOVEME
1117		*/
1118		void assertThreadStaysAlive(Thread thread) {
1119		assertThreadStaysAlive(thread, timeoutMillis());
#	Line 1067 | Line 1121 | public class JSR166TestCase extends Test
1121
1122		/**
1123		* Checks that thread does not terminate within the given millisecond delay.
1124	+	* TODO: REMOVEME
1125		*/
1126		void assertThreadStaysAlive(Thread thread, long millis) {
1127		try {
#	Line 1081 | Line 1136 | public class JSR166TestCase extends Test
1136		/**
1137		* Checks that the threads do not terminate within the default
1138		* millisecond delay of {@code timeoutMillis()}.
1139	+	* TODO: REMOVEME
1140		*/
1141		void assertThreadsStayAlive(Thread... threads) {
1142		assertThreadsStayAlive(timeoutMillis(), threads);
#	Line 1088 | Line 1144 | public class JSR166TestCase extends Test
1144
1145		/**
1146		* Checks that the threads do not terminate within the given millisecond delay.
1147	+	* TODO: REMOVEME
1148		*/
1149		void assertThreadsStayAlive(long millis, Thread... threads) {
1150		try {
#	Line 1612 | Line 1669 | public class JSR166TestCase extends Test
1669		}
1670		}
1671
1672	+	public void await(CyclicBarrier barrier) {
1673	+	try {
1674	+	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1675	+	} catch (Throwable fail) {
1676	+	threadUnexpectedException(fail);
1677	+	}
1678	+	}
1679	+
1680		//     /**
1681		//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1682		//      */
#	Line 1635 | Line 1700 | public class JSR166TestCase extends Test
1700		public String call() { throw new NullPointerException(); }
1701		}
1702
1638	–	public static class CallableOne implements Callable<Integer> {
1639	–	public Integer call() { return one; }
1640	–	}
1641	–
1642	–	public class ShortRunnable extends CheckedRunnable {
1643	–	protected void realRun() throws Throwable {
1644	–	delay(SHORT_DELAY_MS);
1645	–	}
1646	–	}
1647	–
1648	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1649	–	protected void realRun() throws InterruptedException {
1650	–	delay(SHORT_DELAY_MS);
1651	–	}
1652	–	}
1653	–
1654	–	public class SmallRunnable extends CheckedRunnable {
1655	–	protected void realRun() throws Throwable {
1656	–	delay(SMALL_DELAY_MS);
1657	–	}
1658	–	}
1659	–
1703		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1704		protected void realRun() {
1705		try {
#	Line 1665 | Line 1708 | public class JSR166TestCase extends Test
1708		}
1709		}
1710
1668	–	public class SmallCallable extends CheckedCallable {
1669	–	protected Object realCall() throws InterruptedException {
1670	–	delay(SMALL_DELAY_MS);
1671	–	return Boolean.TRUE;
1672	–	}
1673	–	}
1674	–
1675	–	public class MediumRunnable extends CheckedRunnable {
1676	–	protected void realRun() throws Throwable {
1677	–	delay(MEDIUM_DELAY_MS);
1678	–	}
1679	–	}
1680	–
1681	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1682	–	protected void realRun() throws InterruptedException {
1683	–	delay(MEDIUM_DELAY_MS);
1684	–	}
1685	–	}
1686	–
1711		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1712		return new CheckedRunnable() {
1713		protected void realRun() {
#	Line 1693 | Line 1717 | public class JSR166TestCase extends Test
1717		}};
1718		}
1719
1696	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1697	–	protected void realRun() {
1698	–	try {
1699	–	delay(MEDIUM_DELAY_MS);
1700	–	} catch (InterruptedException ok) {}
1701	–	}
1702	–	}
1703	–
1704	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1705	–	protected void realRun() {
1706	–	try {
1707	–	delay(LONG_DELAY_MS);
1708	–	} catch (InterruptedException ok) {}
1709	–	}
1710	–	}
1711	–
1720		/**
1721		* For use as ThreadFactory in constructors
1722		*/
#	Line 1722 | Line 1730 | public class JSR166TestCase extends Test
1730		boolean isDone();
1731		}
1732
1725	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1726	–	return new TrackedRunnable() {
1727	–	private volatile boolean done = false;
1728	–	public boolean isDone() { return done; }
1729	–	public void run() {
1730	–	try {
1731	–	delay(timeoutMillis);
1732	–	done = true;
1733	–	} catch (InterruptedException ok) {}
1734	–	}
1735	–	};
1736	–	}
1737	–
1738	–	public static class TrackedShortRunnable implements Runnable {
1739	–	public volatile boolean done = false;
1740	–	public void run() {
1741	–	try {
1742	–	delay(SHORT_DELAY_MS);
1743	–	done = true;
1744	–	} catch (InterruptedException ok) {}
1745	–	}
1746	–	}
1747	–
1748	–	public static class TrackedSmallRunnable implements Runnable {
1749	–	public volatile boolean done = false;
1750	–	public void run() {
1751	–	try {
1752	–	delay(SMALL_DELAY_MS);
1753	–	done = true;
1754	–	} catch (InterruptedException ok) {}
1755	–	}
1756	–	}
1757	–
1758	–	public static class TrackedMediumRunnable implements Runnable {
1759	–	public volatile boolean done = false;
1760	–	public void run() {
1761	–	try {
1762	–	delay(MEDIUM_DELAY_MS);
1763	–	done = true;
1764	–	} catch (InterruptedException ok) {}
1765	–	}
1766	–	}
1767	–
1768	–	public static class TrackedLongRunnable implements Runnable {
1769	–	public volatile boolean done = false;
1770	–	public void run() {
1771	–	try {
1772	–	delay(LONG_DELAY_MS);
1773	–	done = true;
1774	–	} catch (InterruptedException ok) {}
1775	–	}
1776	–	}
1777	–
1733		public static class TrackedNoOpRunnable implements Runnable {
1734		public volatile boolean done = false;
1735		public void run() {
#	Line 1782 | Line 1737 | public class JSR166TestCase extends Test
1737		}
1738		}
1739
1785	–	public static class TrackedCallable implements Callable {
1786	–	public volatile boolean done = false;
1787	–	public Object call() {
1788	–	try {
1789	–	delay(SMALL_DELAY_MS);
1790	–	done = true;
1791	–	} catch (InterruptedException ok) {}
1792	–	return Boolean.TRUE;
1793	–	}
1794	–	}
1795	–
1740		/**
1741		* Analog of CheckedRunnable for RecursiveAction
1742		*/
#	Line 1859 | Line 1803 | public class JSR166TestCase extends Test
1803		assertEquals(0, q.size());
1804		assertNull(q.peek());
1805		assertNull(q.poll());
1806	<	assertNull(q.poll(0, MILLISECONDS));
1806	>	assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1807		assertEquals(q.toString(), "[]");
1808		assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1809		assertFalse(q.iterator().hasNext());
#	Line 2007 | Line 1951 | public class JSR166TestCase extends Test
1951		1000L, MILLISECONDS,
1952		new SynchronousQueue<Runnable>());
1953
1954	+	/**
1955	+	* Returns maximum number of tasks that can be submitted to given
1956	+	* pool (with bounded queue) before saturation (when submission
1957	+	* throws RejectedExecutionException).
1958	+	*/
1959	+	static final int saturatedSize(ThreadPoolExecutor pool) {
1960	+	BlockingQueue<Runnable> q = pool.getQueue();
1961	+	return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1962	+	}
1963	+
1964		static <T> void shuffle(T[] array) {
1965		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1966		}

Diff Legend

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