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.251 by jsr166, Wed Dec 12 16:59:55 2018 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
464		/**
465		* Collects all JSR166 unit tests as one suite.
#	Line 539 | Line 550 | public class JSR166TestCase extends Test
550		"HashMapTest",
551		"LinkedBlockingDeque8Test",
552		"LinkedBlockingQueue8Test",
553	+	"LinkedHashMapTest",
554		"LongAccumulatorTest",
555		"LongAdderTest",
556		"SplittableRandomTest",
#	Line 599 | Line 611 | public class JSR166TestCase extends Test
611		for (String methodName : testMethodNames(testClass))
612		suite.addTest((Test) c.newInstance(data, methodName));
613		return suite;
614	<	} catch (Exception e) {
615	<	throw new Error(e);
614	>	} catch (ReflectiveOperationException e) {
615	>	throw new AssertionError(e);
616		}
617		}
618
#	Line 616 | Line 628 | public class JSR166TestCase extends Test
628		if (atLeastJava8()) {
629		String name = testClass.getName();
630		String name8 = name.replaceAll("Test$", "8Test");
631	<	if (name.equals(name8)) throw new Error(name);
631	>	if (name.equals(name8)) throw new AssertionError(name);
632		try {
633		return (Test)
634		Class.forName(name8)
635	<	.getMethod("testSuite", new Class[] { dataClass })
635	>	.getMethod("testSuite", dataClass)
636		.invoke(null, data);
637	<	} catch (Exception e) {
638	<	throw new Error(e);
637	>	} catch (ReflectiveOperationException e) {
638	>	throw new AssertionError(e);
639		}
640		} else {
641		return new TestSuite();
#	Line 1089 | Line 1101 | public class JSR166TestCase extends Test
1101		for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1102		try { delay(1); }
1103		catch (InterruptedException fail) {
1104	<	fail("Unexpected InterruptedException");
1104	>	throw new AssertionError("Unexpected InterruptedException", fail);
1105		}
1106		Thread.State s = thread.getState();
1107		if (s == expected)
#	Line 1288 | Line 1300 | public class JSR166TestCase extends Test
1300		/**
1301		* Spin-waits up to the specified number of milliseconds for the given
1302		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1303	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1304		*/
1305	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1306	<	long startTime = 0L;
1307	<	for (;;) {
1308	<	Thread.State s = thread.getState();
1309	<	if (s == Thread.State.BLOCKED ||
1310	<	s == Thread.State.WAITING ||
1311	<	s == Thread.State.TIMED_WAITING)
1312	<	return;
1313	<	else if (s == Thread.State.TERMINATED)
1305	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1306	>	Callable<Boolean> waitingForGodot) {
1307	>	for (long startTime = 0L;;) {
1308	>	switch (thread.getState()) {
1309	>	default: break;
1310	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1311	>	try {
1312	>	if (waitingForGodot == null || waitingForGodot.call())
1313	>	return;
1314	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1315	>	break;
1316	>	case TERMINATED:
1317		fail("Unexpected thread termination");
1318	<	else if (startTime == 0L)
1318	>	}
1319	>
1320	>	if (startTime == 0L)
1321		startTime = System.nanoTime();
1322		else if (millisElapsedSince(startTime) > timeoutMillis) {
1323	<	threadAssertTrue(thread.isAlive());
1324	<	fail("timed out waiting for thread to enter wait state");
1323	>	assertTrue(thread.isAlive());
1324	>	if (waitingForGodot == null
1325	>	|| thread.getState() == Thread.State.RUNNABLE)
1326	>	fail("timed out waiting for thread to enter wait state");
1327	>	else
1328	>	fail("timed out waiting for condition, thread state="
1329	>	+ thread.getState());
1330		}
1331		Thread.yield();
1332		}
#	Line 1311 | Line 1334 | public class JSR166TestCase extends Test
1334
1335		/**
1336		* Spin-waits up to the specified number of milliseconds for the given
1337	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1315	<	* and additionally satisfy the given condition.
1337	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1338		*/
1339	<	void waitForThreadToEnterWaitState(
1340	<	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	<	}
1339	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1340	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1341		}
1342
1343		/**
#	Line 1344 | Line 1345 | public class JSR166TestCase extends Test
1345		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1346		*/
1347		void waitForThreadToEnterWaitState(Thread thread) {
1348	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1348	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1349		}
1350
1351		/**
#	Line 1352 | Line 1353 | public class JSR166TestCase extends Test
1353		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1354		* and additionally satisfy the given condition.
1355		*/
1356	<	void waitForThreadToEnterWaitState(
1357	<	Thread thread, Callable<Boolean> waitingForGodot) {
1356	>	void waitForThreadToEnterWaitState(Thread thread,
1357	>	Callable<Boolean> waitingForGodot) {
1358		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1359		}
1360
#	Line 1385 | Line 1386 | public class JSR166TestCase extends Test
1386		*/
1387		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1388		long startTime = System.nanoTime();
1389	+	T actual = null;
1390		try {
1391	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1391	>	actual = f.get(timeoutMillis, MILLISECONDS);
1392		} catch (Throwable fail) { threadUnexpectedException(fail); }
1393	+	assertEquals(expectedValue, actual);
1394		if (millisElapsedSince(startTime) > timeoutMillis/2)
1395		throw new AssertionError("timed get did not return promptly");
1396		}
#	Line 1447 | Line 1450 | public class JSR166TestCase extends Test
1450		}
1451		}
1452
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	–
1453		public abstract class ThreadShouldThrow extends Thread {
1454		protected abstract void realRun() throws Throwable;
1455
#	Line 1479 | Line 1462 | public class JSR166TestCase extends Test
1462		public final void run() {
1463		try {
1464		realRun();
1482	–	threadShouldThrow(exceptionClass.getSimpleName());
1465		} catch (Throwable t) {
1466		if (! exceptionClass.isInstance(t))
1467		threadUnexpectedException(t);
1468	+	return;
1469		}
1470	+	threadShouldThrow(exceptionClass.getSimpleName());
1471		}
1472		}
1473
#	Line 1493 | Line 1477 | public class JSR166TestCase extends Test
1477		public final void run() {
1478		try {
1479		realRun();
1496	–	threadShouldThrow("InterruptedException");
1480		} catch (InterruptedException success) {
1481		threadAssertFalse(Thread.interrupted());
1482	+	return;
1483		} catch (Throwable fail) {
1484		threadUnexpectedException(fail);
1485		}
1486	+	threadShouldThrow("InterruptedException");
1487		}
1488		}
1489
#	Line 1510 | Line 1495 | public class JSR166TestCase extends Test
1495		return realCall();
1496		} catch (Throwable fail) {
1497		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);
1498		}
1499	<	return null;
1499	>	throw new AssertionError("unreached");
1500		}
1501		}
1502
#	Line 1586 | Line 1553 | public class JSR166TestCase extends Test
1553		}
1554
1555		public void await(CountDownLatch latch, long timeoutMillis) {
1556	+	boolean timedOut = false;
1557		try {
1558	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1591	<	fail("timed out waiting for CountDownLatch for "
1592	<	+ (timeoutMillis/1000) + " sec");
1558	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1559		} catch (Throwable fail) {
1560		threadUnexpectedException(fail);
1561		}
1562	+	if (timedOut)
1563	+	fail("timed out waiting for CountDownLatch for "
1564	+	+ (timeoutMillis/1000) + " sec");
1565		}
1566
1567		public void await(CountDownLatch latch) {
#	Line 1600 | Line 1569 | public class JSR166TestCase extends Test
1569		}
1570
1571		public void await(Semaphore semaphore) {
1572	+	boolean timedOut = false;
1573		try {
1574	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1605	<	fail("timed out waiting for Semaphore for "
1606	<	+ (LONG_DELAY_MS/1000) + " sec");
1574	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1575		} catch (Throwable fail) {
1576		threadUnexpectedException(fail);
1577		}
1578	+	if (timedOut)
1579	+	fail("timed out waiting for Semaphore for "
1580	+	+ (LONG_DELAY_MS/1000) + " sec");
1581		}
1582
1583		public void await(CyclicBarrier barrier) {
#	Line 1640 | Line 1611 | public class JSR166TestCase extends Test
1611		public String call() { throw new NullPointerException(); }
1612		}
1613
1643	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1644	–	protected void realRun() {
1645	–	try {
1646	–	delay(SMALL_DELAY_MS);
1647	–	} catch (InterruptedException ok) {}
1648	–	}
1649	–	}
1650	–
1614		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1615		return new CheckedRunnable() {
1616		protected void realRun() {
#	Line 1703 | Line 1666 | public class JSR166TestCase extends Test
1666		return realCompute();
1667		} catch (Throwable fail) {
1668		threadUnexpectedException(fail);
1706	–	return null;
1669		}
1670	+	throw new AssertionError("unreached");
1671		}
1672		}
1673
#	Line 1792 | Line 1755 | public class JSR166TestCase extends Test
1755
1756		@SuppressWarnings("unchecked")
1757		<T> T serialClone(T o) {
1758	+	T clone = null;
1759		try {
1760		ObjectInputStream ois = new ObjectInputStream
1761		(new ByteArrayInputStream(serialBytes(o)));
1762	<	T clone = (T) ois.readObject();
1799	<	if (o == clone) assertImmutable(o);
1800	<	assertSame(o.getClass(), clone.getClass());
1801	<	return clone;
1762	>	clone = (T) ois.readObject();
1763		} catch (Throwable fail) {
1764		threadUnexpectedException(fail);
1804	–	return null;
1765		}
1766	+	if (o == clone) assertImmutable(o);
1767	+	else assertSame(o.getClass(), clone.getClass());
1768	+	return clone;
1769		}
1770
1771		/**
#	Line 1821 | Line 1784 | public class JSR166TestCase extends Test
1784		(new ByteArrayInputStream(bos.toByteArray()));
1785		T clone = (T) ois.readObject();
1786		if (o == clone) assertImmutable(o);
1787	<	assertSame(o.getClass(), clone.getClass());
1787	>	else assertSame(o.getClass(), clone.getClass());
1788		return clone;
1789		}
1790
#	Line 2072 | Line 2035 | public class JSR166TestCase extends Test
2035		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2036		assertEquals(savedQueueSize, p.getQueue().size());
2037		}
2038	+
2039	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2040	+	assertEquals(x, y);
2041	+	assertEquals(y, x);
2042	+	assertEquals(x.isEmpty(), y.isEmpty());
2043	+	assertEquals(x.size(), y.size());
2044	+	if (x instanceof List) {
2045	+	assertEquals(x.toString(), y.toString());
2046	+	}
2047	+	if (x instanceof List || x instanceof Set) {
2048	+	assertEquals(x.hashCode(), y.hashCode());
2049	+	}
2050	+	if (x instanceof List || x instanceof Deque) {
2051	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2052	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2053	+	y.toArray(new Object[0])));
2054	+	}
2055	+	}
2056	+
2057	+	/**
2058	+	* A weaker form of assertCollectionsEquals which does not insist
2059	+	* that the two collections satisfy Object#equals(Object), since
2060	+	* they may use identity semantics as Deques do.
2061	+	*/
2062	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2063	+	if (x instanceof List || x instanceof Set)
2064	+	assertCollectionsEquals(x, y);
2065	+	else {
2066	+	assertEquals(x.isEmpty(), y.isEmpty());
2067	+	assertEquals(x.size(), y.size());
2068	+	assertEquals(new HashSet(x), new HashSet(y));
2069	+	if (x instanceof Deque) {
2070	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2071	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2072	+	y.toArray(new Object[0])));
2073	+	}
2074	+	}
2075	+	}
2076		}

Diff Legend

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