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.226 by jsr166, Sun May 14 00:37:42 2017 UTC vs.
Revision 1.232 by jsr166, Mon May 29 19:15:02 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 1106 | 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 1113 | 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 1668 | Line 1700 | public class JSR166TestCase extends Test
1700		public String call() { throw new NullPointerException(); }
1701		}
1702
1671	–	public static class CallableOne implements Callable<Integer> {
1672	–	public Integer call() { return one; }
1673	–	}
1674	–
1675	–	public class ShortRunnable extends CheckedRunnable {
1676	–	protected void realRun() throws Throwable {
1677	–	delay(SHORT_DELAY_MS);
1678	–	}
1679	–	}
1680	–
1681	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1682	–	protected void realRun() throws InterruptedException {
1683	–	delay(SHORT_DELAY_MS);
1684	–	}
1685	–	}
1686	–
1687	–	public class SmallRunnable extends CheckedRunnable {
1688	–	protected void realRun() throws Throwable {
1689	–	delay(SMALL_DELAY_MS);
1690	–	}
1691	–	}
1692	–
1703		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1704		protected void realRun() {
1705		try {
#	Line 1698 | Line 1708 | public class JSR166TestCase extends Test
1708		}
1709		}
1710
1701	–	public class SmallCallable extends CheckedCallable {
1702	–	protected Object realCall() throws InterruptedException {
1703	–	delay(SMALL_DELAY_MS);
1704	–	return Boolean.TRUE;
1705	–	}
1706	–	}
1707	–
1708	–	public class MediumRunnable extends CheckedRunnable {
1709	–	protected void realRun() throws Throwable {
1710	–	delay(MEDIUM_DELAY_MS);
1711	–	}
1712	–	}
1713	–
1714	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1715	–	protected void realRun() throws InterruptedException {
1716	–	delay(MEDIUM_DELAY_MS);
1717	–	}
1718	–	}
1719	–
1711		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1712		return new CheckedRunnable() {
1713		protected void realRun() {
#	Line 1726 | Line 1717 | public class JSR166TestCase extends Test
1717		}};
1718		}
1719
1729	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1730	–	protected void realRun() {
1731	–	try {
1732	–	delay(MEDIUM_DELAY_MS);
1733	–	} catch (InterruptedException ok) {}
1734	–	}
1735	–	}
1736	–
1737	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1738	–	protected void realRun() {
1739	–	try {
1740	–	delay(LONG_DELAY_MS);
1741	–	} catch (InterruptedException ok) {}
1742	–	}
1743	–	}
1744	–
1720		/**
1721		* For use as ThreadFactory in constructors
1722		*/
#	Line 1755 | Line 1730 | public class JSR166TestCase extends Test
1730		boolean isDone();
1731		}
1732
1758	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1759	–	return new TrackedRunnable() {
1760	–	private volatile boolean done = false;
1761	–	public boolean isDone() { return done; }
1762	–	public void run() {
1763	–	try {
1764	–	delay(timeoutMillis);
1765	–	done = true;
1766	–	} catch (InterruptedException ok) {}
1767	–	}
1768	–	};
1769	–	}
1770	–
1771	–	public static class TrackedShortRunnable implements Runnable {
1772	–	public volatile boolean done = false;
1773	–	public void run() {
1774	–	try {
1775	–	delay(SHORT_DELAY_MS);
1776	–	done = true;
1777	–	} catch (InterruptedException ok) {}
1778	–	}
1779	–	}
1780	–
1781	–	public static class TrackedSmallRunnable implements Runnable {
1782	–	public volatile boolean done = false;
1783	–	public void run() {
1784	–	try {
1785	–	delay(SMALL_DELAY_MS);
1786	–	done = true;
1787	–	} catch (InterruptedException ok) {}
1788	–	}
1789	–	}
1790	–
1791	–	public static class TrackedMediumRunnable implements Runnable {
1792	–	public volatile boolean done = false;
1793	–	public void run() {
1794	–	try {
1795	–	delay(MEDIUM_DELAY_MS);
1796	–	done = true;
1797	–	} catch (InterruptedException ok) {}
1798	–	}
1799	–	}
1800	–
1801	–	public static class TrackedLongRunnable implements Runnable {
1802	–	public volatile boolean done = false;
1803	–	public void run() {
1804	–	try {
1805	–	delay(LONG_DELAY_MS);
1806	–	done = true;
1807	–	} catch (InterruptedException ok) {}
1808	–	}
1809	–	}
1810	–
1733		public static class TrackedNoOpRunnable implements Runnable {
1734		public volatile boolean done = false;
1735		public void run() {
#	Line 1815 | Line 1737 | public class JSR166TestCase extends Test
1737		}
1738		}
1739
1818	–	public static class TrackedCallable implements Callable {
1819	–	public volatile boolean done = false;
1820	–	public Object call() {
1821	–	try {
1822	–	delay(SMALL_DELAY_MS);
1823	–	done = true;
1824	–	} catch (InterruptedException ok) {}
1825	–	return Boolean.TRUE;
1826	–	}
1827	–	}
1828	–
1740		/**
1741		* Analog of CheckedRunnable for RecursiveAction
1742		*/
#	Line 1892 | 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());

Diff Legend

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