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.244 by jsr166, Tue Apr 10 18:09:58 2018 UTC vs.
Revision 1.254 by jsr166, Wed Apr 24 17:36:09 2019 UTC

#	Line 117 | Line 117 | import junit.framework.TestSuite;
117		*
118		* <ol>
119		*
120	<	* <li>All assertions in code running in generated threads must use
121	<	* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
122	<	* #threadAssertEquals}, or {@link #threadAssertNull}, (not
123	<	* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
124	<	* particularly recommended) for other code to use these forms too.
125	<	* Only the most typically used JUnit assertion methods are defined
126	<	* this way, but enough to live with.
120	>	* <li>All code not running in the main test thread (manually spawned threads
121	>	* or the common fork join pool) must be checked for failure (and completion!).
122	>	* Mechanisms that can be used to ensure this are:
123	>	*   <ol>
124	>	*   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
125	>	*    that the task completed normally, which is checked before returning from
126	>	*    the test method in the main thread.
127	>	*   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
128	>	*    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
129	>	*    Only the most typically used JUnit assertion methods are defined
130	>	*    this way, but enough to live with.
131	>	*   <li>Recording failure explicitly using {@link #threadUnexpectedException}
132	>	*    or {@link #threadRecordFailure}.
133	>	*   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
134	>	*   </ol>
135		*
136		* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
137		* to invoke {@code super.setUp} and {@code super.tearDown} within
#	Line 452 | Line 460 | public class JSR166TestCase extends Test
460		public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
461		public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
462		public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
463	+	public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
464	+	public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
465	+	public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
466	+	public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
467	+	public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
468	+	public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
469
470		/**
471		* Collects all JSR166 unit tests as one suite.
#	Line 503 | Line 517 | public class JSR166TestCase extends Test
517		ExecutorsTest.suite(),
518		ExecutorCompletionServiceTest.suite(),
519		FutureTaskTest.suite(),
520	+	HashtableTest.suite(),
521		LinkedBlockingDequeTest.suite(),
522		LinkedBlockingQueueTest.suite(),
523		LinkedListTest.suite(),
#	Line 542 | Line 557 | public class JSR166TestCase extends Test
557		"HashMapTest",
558		"LinkedBlockingDeque8Test",
559		"LinkedBlockingQueue8Test",
560	+	"LinkedHashMapTest",
561		"LongAccumulatorTest",
562		"LongAdderTest",
563		"SplittableRandomTest",
#	Line 1291 | Line 1307 | public class JSR166TestCase extends Test
1307		/**
1308		* Spin-waits up to the specified number of milliseconds for the given
1309		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1310	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1311		*/
1312	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1313	<	long startTime = 0L;
1314	<	for (;;) {
1315	<	Thread.State s = thread.getState();
1316	<	if (s == Thread.State.BLOCKED ||
1317	<	s == Thread.State.WAITING ||
1318	<	s == Thread.State.TIMED_WAITING)
1319	<	return;
1320	<	else if (s == Thread.State.TERMINATED)
1312	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1313	>	Callable<Boolean> waitingForGodot) {
1314	>	for (long startTime = 0L;;) {
1315	>	switch (thread.getState()) {
1316	>	default: break;
1317	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1318	>	try {
1319	>	if (waitingForGodot == null || waitingForGodot.call())
1320	>	return;
1321	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1322	>	break;
1323	>	case TERMINATED:
1324		fail("Unexpected thread termination");
1325	<	else if (startTime == 0L)
1325	>	}
1326	>
1327	>	if (startTime == 0L)
1328		startTime = System.nanoTime();
1329		else if (millisElapsedSince(startTime) > timeoutMillis) {
1330	<	threadAssertTrue(thread.isAlive());
1331	<	fail("timed out waiting for thread to enter wait state");
1330	>	assertTrue(thread.isAlive());
1331	>	if (waitingForGodot == null
1332	>	|| thread.getState() == Thread.State.RUNNABLE)
1333	>	fail("timed out waiting for thread to enter wait state");
1334	>	else
1335	>	fail("timed out waiting for condition, thread state="
1336	>	+ thread.getState());
1337		}
1338		Thread.yield();
1339		}
#	Line 1314 | Line 1341 | public class JSR166TestCase extends Test
1341
1342		/**
1343		* Spin-waits up to the specified number of milliseconds for the given
1344	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1318	<	* and additionally satisfy the given condition.
1344	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1345		*/
1346	<	void waitForThreadToEnterWaitState(
1347	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1322	<	long startTime = 0L;
1323	<	for (;;) {
1324	<	Thread.State s = thread.getState();
1325	<	if (s == Thread.State.BLOCKED ||
1326	<	s == Thread.State.WAITING ||
1327	<	s == Thread.State.TIMED_WAITING) {
1328	<	try {
1329	<	if (waitingForGodot.call())
1330	<	return;
1331	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1332	<	}
1333	<	else if (s == Thread.State.TERMINATED)
1334	<	fail("Unexpected thread termination");
1335	<	else if (startTime == 0L)
1336	<	startTime = System.nanoTime();
1337	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1338	<	threadAssertTrue(thread.isAlive());
1339	<	fail("timed out waiting for thread to enter wait state");
1340	<	}
1341	<	Thread.yield();
1342	<	}
1346	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1347	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1348		}
1349
1350		/**
#	Line 1347 | Line 1352 | public class JSR166TestCase extends Test
1352		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1353		*/
1354		void waitForThreadToEnterWaitState(Thread thread) {
1355	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1355	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1356		}
1357
1358		/**
#	Line 1355 | Line 1360 | public class JSR166TestCase extends Test
1360		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1361		* and additionally satisfy the given condition.
1362		*/
1363	<	void waitForThreadToEnterWaitState(
1364	<	Thread thread, Callable<Boolean> waitingForGodot) {
1363	>	void waitForThreadToEnterWaitState(Thread thread,
1364	>	Callable<Boolean> waitingForGodot) {
1365		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1366		}
1367
#	Line 1388 | Line 1393 | public class JSR166TestCase extends Test
1393		*/
1394		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1395		long startTime = System.nanoTime();
1396	+	T actual = null;
1397		try {
1398	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1398	>	actual = f.get(timeoutMillis, MILLISECONDS);
1399		} catch (Throwable fail) { threadUnexpectedException(fail); }
1400	+	assertEquals(expectedValue, actual);
1401		if (millisElapsedSince(startTime) > timeoutMillis/2)
1402		throw new AssertionError("timed get did not return promptly");
1403		}
#	Line 1462 | Line 1469 | public class JSR166TestCase extends Test
1469		public final void run() {
1470		try {
1471		realRun();
1465	–	threadShouldThrow(exceptionClass.getSimpleName());
1472		} catch (Throwable t) {
1473		if (! exceptionClass.isInstance(t))
1474		threadUnexpectedException(t);
1475	+	return;
1476		}
1477	+	threadShouldThrow(exceptionClass.getSimpleName());
1478		}
1479		}
1480
#	Line 1476 | Line 1484 | public class JSR166TestCase extends Test
1484		public final void run() {
1485		try {
1486		realRun();
1479	–	threadShouldThrow("InterruptedException");
1487		} catch (InterruptedException success) {
1488		threadAssertFalse(Thread.interrupted());
1489	+	return;
1490		} catch (Throwable fail) {
1491		threadUnexpectedException(fail);
1492		}
1493	+	threadShouldThrow("InterruptedException");
1494		}
1495		}
1496
#	Line 1493 | Line 1502 | public class JSR166TestCase extends Test
1502		return realCall();
1503		} catch (Throwable fail) {
1504		threadUnexpectedException(fail);
1496	–	return null;
1497	–	}
1498	–	}
1499	–	}
1500	–
1501	–	public abstract class CheckedInterruptedCallable<T>
1502	–	implements Callable<T> {
1503	–	protected abstract T realCall() throws Throwable;
1504	–
1505	–	public final T call() {
1506	–	try {
1507	–	T result = realCall();
1508	–	threadShouldThrow("InterruptedException");
1509	–	return result;
1510	–	} catch (InterruptedException success) {
1511	–	threadAssertFalse(Thread.interrupted());
1512	–	} catch (Throwable fail) {
1513	–	threadUnexpectedException(fail);
1505		}
1506	<	return null;
1506	>	throw new AssertionError("unreached");
1507		}
1508		}
1509
#	Line 1569 | Line 1560 | public class JSR166TestCase extends Test
1560		}
1561
1562		public void await(CountDownLatch latch, long timeoutMillis) {
1563	+	boolean timedOut = false;
1564		try {
1565	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1574	<	fail("timed out waiting for CountDownLatch for "
1575	<	+ (timeoutMillis/1000) + " sec");
1565	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1566		} catch (Throwable fail) {
1567		threadUnexpectedException(fail);
1568		}
1569	+	if (timedOut)
1570	+	fail("timed out waiting for CountDownLatch for "
1571	+	+ (timeoutMillis/1000) + " sec");
1572		}
1573
1574		public void await(CountDownLatch latch) {
#	Line 1583 | Line 1576 | public class JSR166TestCase extends Test
1576		}
1577
1578		public void await(Semaphore semaphore) {
1579	+	boolean timedOut = false;
1580		try {
1581	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1588	<	fail("timed out waiting for Semaphore for "
1589	<	+ (LONG_DELAY_MS/1000) + " sec");
1581	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1582		} catch (Throwable fail) {
1583		threadUnexpectedException(fail);
1584		}
1585	+	if (timedOut)
1586	+	fail("timed out waiting for Semaphore for "
1587	+	+ (LONG_DELAY_MS/1000) + " sec");
1588		}
1589
1590		public void await(CyclicBarrier barrier) {
#	Line 1623 | Line 1618 | public class JSR166TestCase extends Test
1618		public String call() { throw new NullPointerException(); }
1619		}
1620
1626	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1627	–	protected void realRun() {
1628	–	try {
1629	–	delay(SMALL_DELAY_MS);
1630	–	} catch (InterruptedException ok) {}
1631	–	}
1632	–	}
1633	–
1621		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1622		return new CheckedRunnable() {
1623		protected void realRun() {
#	Line 1686 | Line 1673 | public class JSR166TestCase extends Test
1673		return realCompute();
1674		} catch (Throwable fail) {
1675		threadUnexpectedException(fail);
1689	–	return null;
1676		}
1677	+	throw new AssertionError("unreached");
1678		}
1679		}
1680
#	Line 1764 | Line 1751 | public class JSR166TestCase extends Test
1751		}
1752		}
1753
1754	<	void assertImmutable(final Object o) {
1754	>	void assertImmutable(Object o) {
1755		if (o instanceof Collection) {
1756		assertThrows(
1757		UnsupportedOperationException.class,
1758	<	new Runnable() { public void run() {
1772	<	((Collection) o).add(null);}});
1758	>	() -> ((Collection) o).add(null));
1759		}
1760		}
1761
1762		@SuppressWarnings("unchecked")
1763		<T> T serialClone(T o) {
1764	+	T clone = null;
1765		try {
1766		ObjectInputStream ois = new ObjectInputStream
1767		(new ByteArrayInputStream(serialBytes(o)));
1768	<	T clone = (T) ois.readObject();
1782	<	if (o == clone) assertImmutable(o);
1783	<	assertSame(o.getClass(), clone.getClass());
1784	<	return clone;
1768	>	clone = (T) ois.readObject();
1769		} catch (Throwable fail) {
1770		threadUnexpectedException(fail);
1787	–	return null;
1771		}
1772	+	if (o == clone) assertImmutable(o);
1773	+	else assertSame(o.getClass(), clone.getClass());
1774	+	return clone;
1775		}
1776
1777		/**
#	Line 1804 | Line 1790 | public class JSR166TestCase extends Test
1790		(new ByteArrayInputStream(bos.toByteArray()));
1791		T clone = (T) ois.readObject();
1792		if (o == clone) assertImmutable(o);
1793	<	assertSame(o.getClass(), clone.getClass());
1793	>	else assertSame(o.getClass(), clone.getClass());
1794		return clone;
1795		}
1796
#	Line 1829 | Line 1815 | public class JSR166TestCase extends Test
1815		}
1816
1817		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1818	<	Runnable... throwingActions) {
1819	<	for (Runnable throwingAction : throwingActions) {
1818	>	Action... throwingActions) {
1819	>	for (Action throwingAction : throwingActions) {
1820		boolean threw = false;
1821		try { throwingAction.run(); }
1822		catch (Throwable t) {

Diff Legend

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