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.246 by jsr166, Sun Jul 22 21:25:16 2018 UTC vs.
Revision 1.250 by jsr166, Sat Nov 24 21:48:19 2018 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 1291 | Line 1299 | public class JSR166TestCase extends Test
1299		/**
1300		* Spin-waits up to the specified number of milliseconds for the given
1301		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1302	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1303		*/
1304	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1305	<	long startTime = 0L;
1306	<	for (;;) {
1307	<	Thread.State s = thread.getState();
1308	<	if (s == Thread.State.BLOCKED ||
1309	<	s == Thread.State.WAITING ||
1310	<	s == Thread.State.TIMED_WAITING)
1311	<	return;
1312	<	else if (s == Thread.State.TERMINATED)
1304	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1305	>	Callable<Boolean> waitingForGodot) {
1306	>	for (long startTime = 0L;;) {
1307	>	switch (thread.getState()) {
1308	>	default: break;
1309	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1310	>	try {
1311	>	if (waitingForGodot == null || waitingForGodot.call())
1312	>	return;
1313	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1314	>	break;
1315	>	case TERMINATED:
1316		fail("Unexpected thread termination");
1317	<	else if (startTime == 0L)
1317	>	}
1318	>
1319	>	if (startTime == 0L)
1320		startTime = System.nanoTime();
1321		else if (millisElapsedSince(startTime) > timeoutMillis) {
1322	<	threadAssertTrue(thread.isAlive());
1323	<	fail("timed out waiting for thread to enter wait state");
1322	>	assertTrue(thread.isAlive());
1323	>	if (waitingForGodot == null
1324	>	|| thread.getState() == Thread.State.RUNNABLE)
1325	>	fail("timed out waiting for thread to enter wait state");
1326	>	else
1327	>	fail("timed out waiting for condition, thread state="
1328	>	+ thread.getState());
1329		}
1330		Thread.yield();
1331		}
#	Line 1314 | Line 1333 | public class JSR166TestCase extends Test
1333
1334		/**
1335		* Spin-waits up to the specified number of milliseconds for the given
1336	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1318	<	* and additionally satisfy the given condition.
1336	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1337		*/
1338	<	void waitForThreadToEnterWaitState(
1339	<	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	<	}
1338	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1339	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1340		}
1341
1342		/**
#	Line 1347 | Line 1344 | public class JSR166TestCase extends Test
1344		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1345		*/
1346		void waitForThreadToEnterWaitState(Thread thread) {
1347	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1347	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1348		}
1349
1350		/**
#	Line 1355 | Line 1352 | public class JSR166TestCase extends Test
1352		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1353		* and additionally satisfy the given condition.
1354		*/
1355	<	void waitForThreadToEnterWaitState(
1356	<	Thread thread, Callable<Boolean> waitingForGodot) {
1355	>	void waitForThreadToEnterWaitState(Thread thread,
1356	>	Callable<Boolean> waitingForGodot) {
1357		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1358		}
1359
#	Line 1464 | Line 1461 | public class JSR166TestCase extends Test
1461		public final void run() {
1462		try {
1463		realRun();
1467	–	threadShouldThrow(exceptionClass.getSimpleName());
1464		} catch (Throwable t) {
1465		if (! exceptionClass.isInstance(t))
1466		threadUnexpectedException(t);
1467	+	return;
1468		}
1469	+	threadShouldThrow(exceptionClass.getSimpleName());
1470		}
1471		}
1472
#	Line 1478 | Line 1476 | public class JSR166TestCase extends Test
1476		public final void run() {
1477		try {
1478		realRun();
1481	–	threadShouldThrow("InterruptedException");
1479		} catch (InterruptedException success) {
1480		threadAssertFalse(Thread.interrupted());
1481	+	return;
1482		} catch (Throwable fail) {
1483		threadUnexpectedException(fail);
1484		}
1485	+	threadShouldThrow("InterruptedException");
1486		}
1487		}
1488
#	Line 1495 | Line 1494 | public class JSR166TestCase extends Test
1494		return realCall();
1495		} catch (Throwable fail) {
1496		threadUnexpectedException(fail);
1498	–	return null;
1499	–	}
1500	–	}
1501	–	}
1502	–
1503	–	public abstract class CheckedInterruptedCallable<T>
1504	–	implements Callable<T> {
1505	–	protected abstract T realCall() throws Throwable;
1506	–
1507	–	public final T call() {
1508	–	try {
1509	–	T result = realCall();
1510	–	threadShouldThrow("InterruptedException");
1511	–	return result;
1512	–	} catch (InterruptedException success) {
1513	–	threadAssertFalse(Thread.interrupted());
1514	–	} catch (Throwable fail) {
1515	–	threadUnexpectedException(fail);
1497		}
1498	<	return null;
1498	>	throw new AssertionError("unreached");
1499		}
1500		}
1501
#	Line 1629 | Line 1610 | public class JSR166TestCase extends Test
1610		public String call() { throw new NullPointerException(); }
1611		}
1612
1632	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1633	–	protected void realRun() {
1634	–	try {
1635	–	delay(SMALL_DELAY_MS);
1636	–	} catch (InterruptedException ok) {}
1637	–	}
1638	–	}
1639	–
1613		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1614		return new CheckedRunnable() {
1615		protected void realRun() {
#	Line 1692 | Line 1665 | public class JSR166TestCase extends Test
1665		return realCompute();
1666		} catch (Throwable fail) {
1667		threadUnexpectedException(fail);
1695	–	return null;
1668		}
1669	+	throw new AssertionError("unreached");
1670		}
1671		}
1672
#	Line 1781 | Line 1754 | public class JSR166TestCase extends Test
1754
1755		@SuppressWarnings("unchecked")
1756		<T> T serialClone(T o) {
1757	+	T clone = null;
1758		try {
1759		ObjectInputStream ois = new ObjectInputStream
1760		(new ByteArrayInputStream(serialBytes(o)));
1761	<	T clone = (T) ois.readObject();
1788	<	if (o == clone) assertImmutable(o);
1789	<	assertSame(o.getClass(), clone.getClass());
1790	<	return clone;
1761	>	clone = (T) ois.readObject();
1762		} catch (Throwable fail) {
1763		threadUnexpectedException(fail);
1793	–	return null;
1764		}
1765	+	if (o == clone) assertImmutable(o);
1766	+	else assertSame(o.getClass(), clone.getClass());
1767	+	return clone;
1768		}
1769
1770		/**
#	Line 1810 | Line 1783 | public class JSR166TestCase extends Test
1783		(new ByteArrayInputStream(bos.toByteArray()));
1784		T clone = (T) ois.readObject();
1785		if (o == clone) assertImmutable(o);
1786	<	assertSame(o.getClass(), clone.getClass());
1786	>	else assertSame(o.getClass(), clone.getClass());
1787		return clone;
1788		}
1789

Diff Legend

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