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.227 by jsr166, Sun May 14 03:12:05 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 1066 | Line 1094 | public class JSR166TestCase extends Test
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, avoiding transitional states
1098	<	// with high probability
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) {
#	Line 1085 | Line 1113 | public class JSR166TestCase extends Test
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 1092 | 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 1104 | Line 1134 | public class JSR166TestCase extends Test
1134		}
1135
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);
1143	+	}
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 {
1151	+	// No need to optimize the failing case via Thread.join.
1152	+	delay(millis);
1153	+	for (Thread thread : threads)
1154	+	assertTrue(thread.isAlive());
1155	+	} catch (InterruptedException fail) {
1156	+	threadFail("Unexpected InterruptedException");
1157	+	}
1158	+	}
1159	+
1160	+	/**
1161		* Checks that future.get times out, with the default timeout of
1162		* {@code timeoutMillis()}.
1163		*/
#	Line 1646 | Line 1700 | public class JSR166TestCase extends Test
1700		public String call() { throw new NullPointerException(); }
1701		}
1702
1649	–	public static class CallableOne implements Callable<Integer> {
1650	–	public Integer call() { return one; }
1651	–	}
1652	–
1653	–	public class ShortRunnable extends CheckedRunnable {
1654	–	protected void realRun() throws Throwable {
1655	–	delay(SHORT_DELAY_MS);
1656	–	}
1657	–	}
1658	–
1659	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1660	–	protected void realRun() throws InterruptedException {
1661	–	delay(SHORT_DELAY_MS);
1662	–	}
1663	–	}
1664	–
1665	–	public class SmallRunnable extends CheckedRunnable {
1666	–	protected void realRun() throws Throwable {
1667	–	delay(SMALL_DELAY_MS);
1668	–	}
1669	–	}
1670	–
1703		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1704		protected void realRun() {
1705		try {
#	Line 1676 | Line 1708 | public class JSR166TestCase extends Test
1708		}
1709		}
1710
1679	–	public class SmallCallable extends CheckedCallable {
1680	–	protected Object realCall() throws InterruptedException {
1681	–	delay(SMALL_DELAY_MS);
1682	–	return Boolean.TRUE;
1683	–	}
1684	–	}
1685	–
1686	–	public class MediumRunnable extends CheckedRunnable {
1687	–	protected void realRun() throws Throwable {
1688	–	delay(MEDIUM_DELAY_MS);
1689	–	}
1690	–	}
1691	–
1692	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1693	–	protected void realRun() throws InterruptedException {
1694	–	delay(MEDIUM_DELAY_MS);
1695	–	}
1696	–	}
1697	–
1711		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1712		return new CheckedRunnable() {
1713		protected void realRun() {
#	Line 1704 | Line 1717 | public class JSR166TestCase extends Test
1717		}};
1718		}
1719
1707	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1708	–	protected void realRun() {
1709	–	try {
1710	–	delay(MEDIUM_DELAY_MS);
1711	–	} catch (InterruptedException ok) {}
1712	–	}
1713	–	}
1714	–
1715	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1716	–	protected void realRun() {
1717	–	try {
1718	–	delay(LONG_DELAY_MS);
1719	–	} catch (InterruptedException ok) {}
1720	–	}
1721	–	}
1722	–
1720		/**
1721		* For use as ThreadFactory in constructors
1722		*/
#	Line 1733 | Line 1730 | public class JSR166TestCase extends Test
1730		boolean isDone();
1731		}
1732
1736	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1737	–	return new TrackedRunnable() {
1738	–	private volatile boolean done = false;
1739	–	public boolean isDone() { return done; }
1740	–	public void run() {
1741	–	try {
1742	–	delay(timeoutMillis);
1743	–	done = true;
1744	–	} catch (InterruptedException ok) {}
1745	–	}
1746	–	};
1747	–	}
1748	–
1749	–	public static class TrackedShortRunnable implements Runnable {
1750	–	public volatile boolean done = false;
1751	–	public void run() {
1752	–	try {
1753	–	delay(SHORT_DELAY_MS);
1754	–	done = true;
1755	–	} catch (InterruptedException ok) {}
1756	–	}
1757	–	}
1758	–
1759	–	public static class TrackedSmallRunnable implements Runnable {
1760	–	public volatile boolean done = false;
1761	–	public void run() {
1762	–	try {
1763	–	delay(SMALL_DELAY_MS);
1764	–	done = true;
1765	–	} catch (InterruptedException ok) {}
1766	–	}
1767	–	}
1768	–
1769	–	public static class TrackedMediumRunnable implements Runnable {
1770	–	public volatile boolean done = false;
1771	–	public void run() {
1772	–	try {
1773	–	delay(MEDIUM_DELAY_MS);
1774	–	done = true;
1775	–	} catch (InterruptedException ok) {}
1776	–	}
1777	–	}
1778	–
1779	–	public static class TrackedLongRunnable implements Runnable {
1780	–	public volatile boolean done = false;
1781	–	public void run() {
1782	–	try {
1783	–	delay(LONG_DELAY_MS);
1784	–	done = true;
1785	–	} catch (InterruptedException ok) {}
1786	–	}
1787	–	}
1788	–
1733		public static class TrackedNoOpRunnable implements Runnable {
1734		public volatile boolean done = false;
1735		public void run() {
#	Line 1793 | Line 1737 | public class JSR166TestCase extends Test
1737		}
1738		}
1739
1796	–	public static class TrackedCallable implements Callable {
1797	–	public volatile boolean done = false;
1798	–	public Object call() {
1799	–	try {
1800	–	delay(SMALL_DELAY_MS);
1801	–	done = true;
1802	–	} catch (InterruptedException ok) {}
1803	–	return Boolean.TRUE;
1804	–	}
1805	–	}
1806	–
1740		/**
1741		* Analog of CheckedRunnable for RecursiveAction
1742		*/
#	Line 1870 | 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 2018 | 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