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.239 by jsr166, Tue Jan 23 20:44:11 2018 UTC vs.
Revision 1.253 by jsr166, Fri Feb 22 19:27:47 2019 UTC

#	Line 66 | Line 66 | import java.util.Arrays;
66		import java.util.Collection;
67		import java.util.Collections;
68		import java.util.Date;
69	+	import java.util.Deque;
70		import java.util.Enumeration;
71	+	import java.util.HashSet;
72		import java.util.Iterator;
73		import java.util.List;
74		import java.util.NoSuchElementException;
75		import java.util.PropertyPermission;
76	+	import java.util.Set;
77		import java.util.concurrent.BlockingQueue;
78		import java.util.concurrent.Callable;
79		import java.util.concurrent.CountDownLatch;
#	Line 114 | 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 418 | Line 429 | public class JSR166TestCase extends Test
429		for (String testClassName : testClassNames) {
430		try {
431		Class<?> testClass = Class.forName(testClassName);
432	<	Method m = testClass.getDeclaredMethod("suite",
422	<	new Class<?>[0]);
432	>	Method m = testClass.getDeclaredMethod("suite");
433		suite.addTest(newTestSuite((Test)m.invoke(null)));
434	<	} catch (Exception e) {
435	<	throw new Error("Missing test class", e);
434	>	} catch (ReflectiveOperationException e) {
435	>	throw new AssertionError("Missing test class", e);
436		}
437		}
438		}
#	Line 449 | 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	+	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 539 | Line 556 | public class JSR166TestCase extends Test
556		"HashMapTest",
557		"LinkedBlockingDeque8Test",
558		"LinkedBlockingQueue8Test",
559	+	"LinkedHashMapTest",
560		"LongAccumulatorTest",
561		"LongAdderTest",
562		"SplittableRandomTest",
#	Line 599 | Line 617 | public class JSR166TestCase extends Test
617		for (String methodName : testMethodNames(testClass))
618		suite.addTest((Test) c.newInstance(data, methodName));
619		return suite;
620	<	} catch (Exception e) {
621	<	throw new Error(e);
620	>	} catch (ReflectiveOperationException e) {
621	>	throw new AssertionError(e);
622		}
623		}
624
#	Line 616 | Line 634 | public class JSR166TestCase extends Test
634		if (atLeastJava8()) {
635		String name = testClass.getName();
636		String name8 = name.replaceAll("Test$", "8Test");
637	<	if (name.equals(name8)) throw new Error(name);
637	>	if (name.equals(name8)) throw new AssertionError(name);
638		try {
639		return (Test)
640		Class.forName(name8)
641	<	.getMethod("testSuite", new Class[] { dataClass })
641	>	.getMethod("testSuite", dataClass)
642		.invoke(null, data);
643	<	} catch (Exception e) {
644	<	throw new Error(e);
643	>	} catch (ReflectiveOperationException e) {
644	>	throw new AssertionError(e);
645		}
646		} else {
647		return new TestSuite();
#	Line 1089 | Line 1107 | public class JSR166TestCase extends Test
1107		for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1108		try { delay(1); }
1109		catch (InterruptedException fail) {
1110	<	fail("Unexpected InterruptedException");
1110	>	throw new AssertionError("Unexpected InterruptedException", fail);
1111		}
1112		Thread.State s = thread.getState();
1113		if (s == expected)
#	Line 1288 | Line 1306 | public class JSR166TestCase extends Test
1306		/**
1307		* Spin-waits up to the specified number of milliseconds for the given
1308		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1309	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1310		*/
1311	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1312	<	long startTime = 0L;
1313	<	for (;;) {
1314	<	Thread.State s = thread.getState();
1315	<	if (s == Thread.State.BLOCKED ||
1316	<	s == Thread.State.WAITING ||
1317	<	s == Thread.State.TIMED_WAITING)
1318	<	return;
1319	<	else if (s == Thread.State.TERMINATED)
1311	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1312	>	Callable<Boolean> waitingForGodot) {
1313	>	for (long startTime = 0L;;) {
1314	>	switch (thread.getState()) {
1315	>	default: break;
1316	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1317	>	try {
1318	>	if (waitingForGodot == null || waitingForGodot.call())
1319	>	return;
1320	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1321	>	break;
1322	>	case TERMINATED:
1323		fail("Unexpected thread termination");
1324	<	else if (startTime == 0L)
1324	>	}
1325	>
1326	>	if (startTime == 0L)
1327		startTime = System.nanoTime();
1328		else if (millisElapsedSince(startTime) > timeoutMillis) {
1329	<	threadAssertTrue(thread.isAlive());
1330	<	fail("timed out waiting for thread to enter wait state");
1329	>	assertTrue(thread.isAlive());
1330	>	if (waitingForGodot == null
1331	>	|| thread.getState() == Thread.State.RUNNABLE)
1332	>	fail("timed out waiting for thread to enter wait state");
1333	>	else
1334	>	fail("timed out waiting for condition, thread state="
1335	>	+ thread.getState());
1336		}
1337		Thread.yield();
1338		}
#	Line 1311 | Line 1340 | public class JSR166TestCase extends Test
1340
1341		/**
1342		* Spin-waits up to the specified number of milliseconds for the given
1343	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1315	<	* and additionally satisfy the given condition.
1343	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1344		*/
1345	<	void waitForThreadToEnterWaitState(
1346	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1319	<	long startTime = 0L;
1320	<	for (;;) {
1321	<	Thread.State s = thread.getState();
1322	<	if (s == Thread.State.BLOCKED ||
1323	<	s == Thread.State.WAITING ||
1324	<	s == Thread.State.TIMED_WAITING) {
1325	<	try {
1326	<	if (waitingForGodot.call())
1327	<	return;
1328	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1329	<	}
1330	<	else if (s == Thread.State.TERMINATED)
1331	<	fail("Unexpected thread termination");
1332	<	else if (startTime == 0L)
1333	<	startTime = System.nanoTime();
1334	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1335	<	threadAssertTrue(thread.isAlive());
1336	<	fail("timed out waiting for thread to enter wait state");
1337	<	}
1338	<	Thread.yield();
1339	<	}
1345	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1346	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1347		}
1348
1349		/**
#	Line 1344 | Line 1351 | public class JSR166TestCase extends Test
1351		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1352		*/
1353		void waitForThreadToEnterWaitState(Thread thread) {
1354	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1354	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1355		}
1356
1357		/**
#	Line 1352 | Line 1359 | public class JSR166TestCase extends Test
1359		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1360		* and additionally satisfy the given condition.
1361		*/
1362	<	void waitForThreadToEnterWaitState(
1363	<	Thread thread, Callable<Boolean> waitingForGodot) {
1362	>	void waitForThreadToEnterWaitState(Thread thread,
1363	>	Callable<Boolean> waitingForGodot) {
1364		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1365		}
1366
#	Line 1385 | Line 1392 | public class JSR166TestCase extends Test
1392		*/
1393		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1394		long startTime = System.nanoTime();
1395	+	T actual = null;
1396		try {
1397	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1397	>	actual = f.get(timeoutMillis, MILLISECONDS);
1398		} catch (Throwable fail) { threadUnexpectedException(fail); }
1399	+	assertEquals(expectedValue, actual);
1400		if (millisElapsedSince(startTime) > timeoutMillis/2)
1401		throw new AssertionError("timed get did not return promptly");
1402		}
#	Line 1447 | Line 1456 | public class JSR166TestCase extends Test
1456		}
1457		}
1458
1450	–	public abstract class RunnableShouldThrow implements Runnable {
1451	–	protected abstract void realRun() throws Throwable;
1452	–
1453	–	final Class<?> exceptionClass;
1454	–
1455	–	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1456	–	this.exceptionClass = exceptionClass;
1457	–	}
1458	–
1459	–	public final void run() {
1460	–	try {
1461	–	realRun();
1462	–	threadShouldThrow(exceptionClass.getSimpleName());
1463	–	} catch (Throwable t) {
1464	–	if (! exceptionClass.isInstance(t))
1465	–	threadUnexpectedException(t);
1466	–	}
1467	–	}
1468	–	}
1469	–
1459		public abstract class ThreadShouldThrow extends Thread {
1460		protected abstract void realRun() throws Throwable;
1461
#	Line 1479 | Line 1468 | public class JSR166TestCase extends Test
1468		public final void run() {
1469		try {
1470		realRun();
1482	–	threadShouldThrow(exceptionClass.getSimpleName());
1471		} catch (Throwable t) {
1472		if (! exceptionClass.isInstance(t))
1473		threadUnexpectedException(t);
1474	+	return;
1475		}
1476	+	threadShouldThrow(exceptionClass.getSimpleName());
1477		}
1478		}
1479
#	Line 1493 | Line 1483 | public class JSR166TestCase extends Test
1483		public final void run() {
1484		try {
1485		realRun();
1496	–	threadShouldThrow("InterruptedException");
1486		} catch (InterruptedException success) {
1487		threadAssertFalse(Thread.interrupted());
1488	+	return;
1489		} catch (Throwable fail) {
1490		threadUnexpectedException(fail);
1491		}
1492	+	threadShouldThrow("InterruptedException");
1493		}
1494		}
1495
#	Line 1510 | Line 1501 | public class JSR166TestCase extends Test
1501		return realCall();
1502		} catch (Throwable fail) {
1503		threadUnexpectedException(fail);
1513	–	return null;
1514	–	}
1515	–	}
1516	–	}
1517	–
1518	–	public abstract class CheckedInterruptedCallable<T>
1519	–	implements Callable<T> {
1520	–	protected abstract T realCall() throws Throwable;
1521	–
1522	–	public final T call() {
1523	–	try {
1524	–	T result = realCall();
1525	–	threadShouldThrow("InterruptedException");
1526	–	return result;
1527	–	} catch (InterruptedException success) {
1528	–	threadAssertFalse(Thread.interrupted());
1529	–	} catch (Throwable fail) {
1530	–	threadUnexpectedException(fail);
1504		}
1505	<	return null;
1505	>	throw new AssertionError("unreached");
1506		}
1507		}
1508
#	Line 1586 | Line 1559 | public class JSR166TestCase extends Test
1559		}
1560
1561		public void await(CountDownLatch latch, long timeoutMillis) {
1562	+	boolean timedOut = false;
1563		try {
1564	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1591	<	fail("timed out waiting for CountDownLatch for "
1592	<	+ (timeoutMillis/1000) + " sec");
1564	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1565		} catch (Throwable fail) {
1566		threadUnexpectedException(fail);
1567		}
1568	+	if (timedOut)
1569	+	fail("timed out waiting for CountDownLatch for "
1570	+	+ (timeoutMillis/1000) + " sec");
1571		}
1572
1573		public void await(CountDownLatch latch) {
#	Line 1600 | Line 1575 | public class JSR166TestCase extends Test
1575		}
1576
1577		public void await(Semaphore semaphore) {
1578	+	boolean timedOut = false;
1579		try {
1580	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1605	<	fail("timed out waiting for Semaphore for "
1606	<	+ (LONG_DELAY_MS/1000) + " sec");
1580	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1581		} catch (Throwable fail) {
1582		threadUnexpectedException(fail);
1583		}
1584	+	if (timedOut)
1585	+	fail("timed out waiting for Semaphore for "
1586	+	+ (LONG_DELAY_MS/1000) + " sec");
1587		}
1588
1589		public void await(CyclicBarrier barrier) {
#	Line 1640 | Line 1617 | public class JSR166TestCase extends Test
1617		public String call() { throw new NullPointerException(); }
1618		}
1619
1643	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1644	–	protected void realRun() {
1645	–	try {
1646	–	delay(SMALL_DELAY_MS);
1647	–	} catch (InterruptedException ok) {}
1648	–	}
1649	–	}
1650	–
1620		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1621		return new CheckedRunnable() {
1622		protected void realRun() {
#	Line 1703 | Line 1672 | public class JSR166TestCase extends Test
1672		return realCompute();
1673		} catch (Throwable fail) {
1674		threadUnexpectedException(fail);
1706	–	return null;
1675		}
1676	+	throw new AssertionError("unreached");
1677		}
1678		}
1679
#	Line 1781 | Line 1750 | public class JSR166TestCase extends Test
1750		}
1751		}
1752
1753	<	void assertImmutable(final Object o) {
1753	>	void assertImmutable(Object o) {
1754		if (o instanceof Collection) {
1755		assertThrows(
1756		UnsupportedOperationException.class,
1757	<	new Runnable() { public void run() {
1789	<	((Collection) o).add(null);}});
1757	>	() -> ((Collection) o).add(null));
1758		}
1759		}
1760
1761		@SuppressWarnings("unchecked")
1762		<T> T serialClone(T o) {
1763	+	T clone = null;
1764		try {
1765		ObjectInputStream ois = new ObjectInputStream
1766		(new ByteArrayInputStream(serialBytes(o)));
1767	<	T clone = (T) ois.readObject();
1799	<	if (o == clone) assertImmutable(o);
1800	<	assertSame(o.getClass(), clone.getClass());
1801	<	return clone;
1767	>	clone = (T) ois.readObject();
1768		} catch (Throwable fail) {
1769		threadUnexpectedException(fail);
1804	–	return null;
1770		}
1771	+	if (o == clone) assertImmutable(o);
1772	+	else assertSame(o.getClass(), clone.getClass());
1773	+	return clone;
1774		}
1775
1776		/**
#	Line 1821 | Line 1789 | public class JSR166TestCase extends Test
1789		(new ByteArrayInputStream(bos.toByteArray()));
1790		T clone = (T) ois.readObject();
1791		if (o == clone) assertImmutable(o);
1792	<	assertSame(o.getClass(), clone.getClass());
1792	>	else assertSame(o.getClass(), clone.getClass());
1793		return clone;
1794		}
1795
#	Line 1846 | Line 1814 | public class JSR166TestCase extends Test
1814		}
1815
1816		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1817	<	Runnable... throwingActions) {
1818	<	for (Runnable throwingAction : throwingActions) {
1817	>	Action... throwingActions) {
1818	>	for (Action throwingAction : throwingActions) {
1819		boolean threw = false;
1820		try { throwingAction.run(); }
1821		catch (Throwable t) {
#	Line 2072 | Line 2040 | public class JSR166TestCase extends Test
2040		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2041		assertEquals(savedQueueSize, p.getQueue().size());
2042		}
2043	+
2044	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2045	+	assertEquals(x, y);
2046	+	assertEquals(y, x);
2047	+	assertEquals(x.isEmpty(), y.isEmpty());
2048	+	assertEquals(x.size(), y.size());
2049	+	if (x instanceof List) {
2050	+	assertEquals(x.toString(), y.toString());
2051	+	}
2052	+	if (x instanceof List || x instanceof Set) {
2053	+	assertEquals(x.hashCode(), y.hashCode());
2054	+	}
2055	+	if (x instanceof List || x instanceof Deque) {
2056	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2057	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2058	+	y.toArray(new Object[0])));
2059	+	}
2060	+	}
2061	+
2062	+	/**
2063	+	* A weaker form of assertCollectionsEquals which does not insist
2064	+	* that the two collections satisfy Object#equals(Object), since
2065	+	* they may use identity semantics as Deques do.
2066	+	*/
2067	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2068	+	if (x instanceof List || x instanceof Set)
2069	+	assertCollectionsEquals(x, y);
2070	+	else {
2071	+	assertEquals(x.isEmpty(), y.isEmpty());
2072	+	assertEquals(x.size(), y.size());
2073	+	assertEquals(new HashSet(x), new HashSet(y));
2074	+	if (x instanceof Deque) {
2075	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2076	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2077	+	y.toArray(new Object[0])));
2078	+	}
2079	+	}
2080	+	}
2081		}

Diff Legend

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