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.243 by jsr166, Thu Apr 5 03:36:54 2018 UTC vs.
Revision 1.248 by jsr166, Sat Nov 24 21:14:51 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 451 | Line 459 | public class JSR166TestCase extends Test
459		public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
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
464		/**
465		* Collects all JSR166 unit tests as one suite.
#	Line 1290 | 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	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1309	>	try {
1310	>	if (waitingForGodot == null || waitingForGodot.call())
1311	>	return;
1312	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1313	>	break;
1314	>	case TERMINATED:
1315		fail("Unexpected thread termination");
1316	<	else if (startTime == 0L)
1316	>	}
1317	>
1318	>	if (startTime == 0L)
1319		startTime = System.nanoTime();
1320		else if (millisElapsedSince(startTime) > timeoutMillis) {
1321	<	threadAssertTrue(thread.isAlive());
1322	<	fail("timed out waiting for thread to enter wait state");
1321	>	assertTrue(thread.isAlive());
1322	>	if (waitingForGodot == null
1323	>	|| thread.getState() == Thread.State.RUNNABLE)
1324	>	fail("timed out waiting for thread to enter wait state");
1325	>	else
1326	>	fail("timed out waiting for condition, thread state="
1327	>	+ thread.getState());
1328		}
1329		Thread.yield();
1330		}
#	Line 1313 | Line 1332 | public class JSR166TestCase extends Test
1332
1333		/**
1334		* Spin-waits up to the specified number of milliseconds for the given
1335	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1317	<	* and additionally satisfy the given condition.
1335	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1336		*/
1337	<	void waitForThreadToEnterWaitState(
1338	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1321	<	long startTime = 0L;
1322	<	for (;;) {
1323	<	Thread.State s = thread.getState();
1324	<	if (s == Thread.State.BLOCKED ||
1325	<	s == Thread.State.WAITING ||
1326	<	s == Thread.State.TIMED_WAITING) {
1327	<	try {
1328	<	if (waitingForGodot.call())
1329	<	return;
1330	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1331	<	}
1332	<	else if (s == Thread.State.TERMINATED)
1333	<	fail("Unexpected thread termination");
1334	<	else if (startTime == 0L)
1335	<	startTime = System.nanoTime();
1336	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1337	<	threadAssertTrue(thread.isAlive());
1338	<	fail("timed out waiting for thread to enter wait state");
1339	<	}
1340	<	Thread.yield();
1341	<	}
1337	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1338	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1339		}
1340
1341		/**
#	Line 1346 | Line 1343 | public class JSR166TestCase extends Test
1343		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1344		*/
1345		void waitForThreadToEnterWaitState(Thread thread) {
1346	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1346	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1347		}
1348
1349		/**
#	Line 1354 | Line 1351 | public class JSR166TestCase extends Test
1351		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1352		* and additionally satisfy the given condition.
1353		*/
1354	<	void waitForThreadToEnterWaitState(
1355	<	Thread thread, Callable<Boolean> waitingForGodot) {
1354	>	void waitForThreadToEnterWaitState(Thread thread,
1355	>	Callable<Boolean> waitingForGodot) {
1356		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1357		}
1358
#	Line 1387 | Line 1384 | public class JSR166TestCase extends Test
1384		*/
1385		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1386		long startTime = System.nanoTime();
1387	+	T actual = null;
1388		try {
1389	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1389	>	actual = f.get(timeoutMillis, MILLISECONDS);
1390		} catch (Throwable fail) { threadUnexpectedException(fail); }
1391	+	assertEquals(expectedValue, actual);
1392		if (millisElapsedSince(startTime) > timeoutMillis/2)
1393		throw new AssertionError("timed get did not return promptly");
1394		}
#	Line 1461 | Line 1460 | public class JSR166TestCase extends Test
1460		public final void run() {
1461		try {
1462		realRun();
1464	–	threadShouldThrow(exceptionClass.getSimpleName());
1463		} catch (Throwable t) {
1464		if (! exceptionClass.isInstance(t))
1465		threadUnexpectedException(t);
1466	+	return;
1467		}
1468	+	threadShouldThrow(exceptionClass.getSimpleName());
1469		}
1470		}
1471
#	Line 1475 | Line 1475 | public class JSR166TestCase extends Test
1475		public final void run() {
1476		try {
1477		realRun();
1478	–	threadShouldThrow("InterruptedException");
1478		} catch (InterruptedException success) {
1479		threadAssertFalse(Thread.interrupted());
1480	+	return;
1481		} catch (Throwable fail) {
1482		threadUnexpectedException(fail);
1483		}
1484	+	threadShouldThrow("InterruptedException");
1485		}
1486		}
1487
#	Line 1492 | Line 1493 | public class JSR166TestCase extends Test
1493		return realCall();
1494		} catch (Throwable fail) {
1495		threadUnexpectedException(fail);
1495	–	return null;
1496	–	}
1497	–	}
1498	–	}
1499	–
1500	–	public abstract class CheckedInterruptedCallable<T>
1501	–	implements Callable<T> {
1502	–	protected abstract T realCall() throws Throwable;
1503	–
1504	–	public final T call() {
1505	–	try {
1506	–	T result = realCall();
1507	–	threadShouldThrow("InterruptedException");
1508	–	return result;
1509	–	} catch (InterruptedException success) {
1510	–	threadAssertFalse(Thread.interrupted());
1511	–	} catch (Throwable fail) {
1512	–	threadUnexpectedException(fail);
1496		}
1497	<	return null;
1497	>	throw new AssertionError("unreached");
1498		}
1499		}
1500
#	Line 1568 | Line 1551 | public class JSR166TestCase extends Test
1551		}
1552
1553		public void await(CountDownLatch latch, long timeoutMillis) {
1554	+	boolean timedOut = false;
1555		try {
1556	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1573	<	fail("timed out waiting for CountDownLatch for "
1574	<	+ (timeoutMillis/1000) + " sec");
1556	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1557		} catch (Throwable fail) {
1558		threadUnexpectedException(fail);
1559		}
1560	+	if (timedOut)
1561	+	fail("timed out waiting for CountDownLatch for "
1562	+	+ (timeoutMillis/1000) + " sec");
1563		}
1564
1565		public void await(CountDownLatch latch) {
#	Line 1582 | Line 1567 | public class JSR166TestCase extends Test
1567		}
1568
1569		public void await(Semaphore semaphore) {
1570	+	boolean timedOut = false;
1571		try {
1572	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1587	<	fail("timed out waiting for Semaphore for "
1588	<	+ (LONG_DELAY_MS/1000) + " sec");
1572	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1573		} catch (Throwable fail) {
1574		threadUnexpectedException(fail);
1575		}
1576	+	if (timedOut)
1577	+	fail("timed out waiting for Semaphore for "
1578	+	+ (LONG_DELAY_MS/1000) + " sec");
1579		}
1580
1581		public void await(CyclicBarrier barrier) {
#	Line 1685 | Line 1672 | public class JSR166TestCase extends Test
1672		return realCompute();
1673		} catch (Throwable fail) {
1674		threadUnexpectedException(fail);
1688	–	return null;
1675		}
1676	+	throw new AssertionError("unreached");
1677		}
1678		}
1679
#	Line 1774 | Line 1761 | public class JSR166TestCase extends Test
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();
1781	<	if (o == clone) assertImmutable(o);
1782	<	assertSame(o.getClass(), clone.getClass());
1783	<	return clone;
1768	>	clone = (T) ois.readObject();
1769		} catch (Throwable fail) {
1770		threadUnexpectedException(fail);
1786	–	return null;
1771		}
1772	+	if (o == clone) assertImmutable(o);
1773	+	else assertSame(o.getClass(), clone.getClass());
1774	+	return clone;
1775		}
1776
1777		/**
#	Line 1803 | 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

Diff Legend

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