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.270 by jsr166, Sun Sep 29 20:18:35 2019 UTC

#	Line 49 | Line 49 | import java.io.ByteArrayOutputStream;
49		import java.io.ObjectInputStream;
50		import java.io.ObjectOutputStream;
51		import java.lang.management.ManagementFactory;
52	+	import java.lang.management.LockInfo;
53		import java.lang.management.ThreadInfo;
54		import java.lang.management.ThreadMXBean;
55		import java.lang.reflect.Constructor;
#	Line 117 | Line 118 | import junit.framework.TestSuite;
118		*
119		* <ol>
120		*
121	<	* <li>All assertions in code running in generated threads must use
122	<	* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
123	<	* #threadAssertEquals}, or {@link #threadAssertNull}, (not
124	<	* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
125	<	* particularly recommended) for other code to use these forms too.
126	<	* Only the most typically used JUnit assertion methods are defined
127	<	* this way, but enough to live with.
121	>	* <li>All code not running in the main test thread (manually spawned threads
122	>	* or the common fork join pool) must be checked for failure (and completion!).
123	>	* Mechanisms that can be used to ensure this are:
124	>	*   <ol>
125	>	*   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
126	>	*    that the task completed normally, which is checked before returning from
127	>	*    the test method in the main thread.
128	>	*   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
129	>	*    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
130	>	*    Only the most typically used JUnit assertion methods are defined
131	>	*    this way, but enough to live with.
132	>	*   <li>Recording failure explicitly using {@link #threadUnexpectedException}
133	>	*    or {@link #threadRecordFailure}.
134	>	*   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
135	>	*   </ol>
136		*
137		* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
138		* to invoke {@code super.setUp} and {@code super.tearDown} within
#	Line 235 | Line 244 | public class JSR166TestCase extends Test
244		}
245		}
246
247	+	private static final ThreadMXBean THREAD_MXBEAN
248	+	= ManagementFactory.getThreadMXBean();
249	+
250		/**
251		* The scaling factor to apply to standard delays used in tests.
252		* May be initialized from any of:
#	Line 276 | Line 288 | public class JSR166TestCase extends Test
288		static volatile TestCase currentTestCase;
289		// static volatile int currentRun = 0;
290		static {
291	<	Runnable checkForWedgedTest = new Runnable() { public void run() {
291	>	Runnable wedgedTestDetector = new Runnable() { public void run() {
292		// Avoid spurious reports with enormous runsPerTest.
293		// A single test case run should never take more than 1 second.
294		// But let's cap it at the high end too ...
295	<	final int timeoutMinutes =
296	<	Math.min(15, Math.max(runsPerTest / 60, 1));
295	>	final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
296	>	* Math.max((int) delayFactor, 1);
297	>	final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
298		for (TestCase lastTestCase = currentTestCase;;) {
299		try { MINUTES.sleep(timeoutMinutes); }
300		catch (InterruptedException unexpected) { break; }
#	Line 301 | Line 314 | public class JSR166TestCase extends Test
314		}
315		lastTestCase = currentTestCase;
316		}}};
317	<	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
317	>	Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
318		thread.setDaemon(true);
319		thread.start();
320		}
#	Line 345 | Line 358 | public class JSR166TestCase extends Test
358		// Never report first run of any test; treat it as a
359		// warmup run, notably to trigger all needed classloading,
360		if (i > 0)
361	<	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
361	>	System.out.printf("%s: %d%n", toString(), elapsedMillis);
362		}
363		}
364
#	Line 451 | Line 464 | public class JSR166TestCase extends Test
464		public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
465		public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
466		public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
467	+	public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
468	+	public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
469	+	public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
470	+	public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
471	+	public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
472	+	public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
473	+	public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
474
475		/**
476		* Collects all JSR166 unit tests as one suite.
#	Line 502 | Line 522 | public class JSR166TestCase extends Test
522		ExecutorsTest.suite(),
523		ExecutorCompletionServiceTest.suite(),
524		FutureTaskTest.suite(),
525	+	HashtableTest.suite(),
526		LinkedBlockingDequeTest.suite(),
527		LinkedBlockingQueueTest.suite(),
528		LinkedListTest.suite(),
#	Line 541 | Line 562 | public class JSR166TestCase extends Test
562		"HashMapTest",
563		"LinkedBlockingDeque8Test",
564		"LinkedBlockingQueue8Test",
565	+	"LinkedHashMapTest",
566		"LongAccumulatorTest",
567		"LongAdderTest",
568		"SplittableRandomTest",
#	Line 639 | Line 661 | public class JSR166TestCase extends Test
661		public static long MEDIUM_DELAY_MS;
662		public static long LONG_DELAY_MS;
663
664	+	/**
665	+	* A delay significantly longer than LONG_DELAY_MS.
666	+	* Use this in a thread that is waited for via awaitTermination(Thread).
667	+	*/
668	+	public static long LONGER_DELAY_MS;
669	+
670		private static final long RANDOM_TIMEOUT;
671		private static final long RANDOM_EXPIRED_TIMEOUT;
672		private static final TimeUnit RANDOM_TIMEUNIT;
#	Line 667 | Line 695 | public class JSR166TestCase extends Test
695		static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
696
697		/**
698	+	* Returns a random boolean; a "coin flip".
699	+	*/
700	+	static boolean randomBoolean() {
701	+	return ThreadLocalRandom.current().nextBoolean();
702	+	}
703	+
704	+	/**
705	+	* Returns a random element from given choices.
706	+	*/
707	+	<T> T chooseRandomly(List<T> choices) {
708	+	return choices.get(ThreadLocalRandom.current().nextInt(choices.size()));
709	+	}
710	+
711	+	/**
712	+	* Returns a random element from given choices.
713	+	*/
714	+	<T> T chooseRandomly(T... choices) {
715	+	return choices[ThreadLocalRandom.current().nextInt(choices.length)];
716	+	}
717	+
718	+	/**
719		* Returns the shortest timed delay. This can be scaled up for
720		* slow machines using the jsr166.delay.factor system property,
721		* or via jtreg's -timeoutFactor: flag.
#	Line 684 | Line 733 | public class JSR166TestCase extends Test
733		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
734		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
735		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
736	+	LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
737		}
738
739		private static final long TIMEOUT_DELAY_MS
#	Line 722 | Line 772 | public class JSR166TestCase extends Test
772		*/
773		public void threadRecordFailure(Throwable t) {
774		System.err.println(t);
775	<	dumpTestThreads();
776	<	threadFailure.compareAndSet(null, t);
775	>	if (threadFailure.compareAndSet(null, t))
776	>	dumpTestThreads();
777		}
778
779		public void setUp() {
#	Line 1044 | Line 1094 | public class JSR166TestCase extends Test
1094		}
1095		}
1096
1097	+	/** Returns true if thread info might be useful in a thread dump. */
1098	+	static boolean threadOfInterest(ThreadInfo info) {
1099	+	final String name = info.getThreadName();
1100	+	String lockName;
1101	+	if (name == null)
1102	+	return true;
1103	+	if (name.equals("Signal Dispatcher")
1104	+	|| name.equals("WedgedTestDetector"))
1105	+	return false;
1106	+	if (name.equals("Reference Handler")) {
1107	+	// Reference Handler stacktrace changed in JDK-8156500
1108	+	StackTraceElement[] stackTrace; String methodName;
1109	+	if ((stackTrace = info.getStackTrace()) != null
1110	+	&& stackTrace.length > 0
1111	+	&& (methodName = stackTrace[0].getMethodName()) != null
1112	+	&& methodName.equals("waitForReferencePendingList"))
1113	+	return false;
1114	+	// jdk8 Reference Handler stacktrace
1115	+	if ((lockName = info.getLockName()) != null
1116	+	&& lockName.startsWith("java.lang.ref"))
1117	+	return false;
1118	+	}
1119	+	if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
1120	+	&& (lockName = info.getLockName()) != null
1121	+	&& lockName.startsWith("java.lang.ref"))
1122	+	return false;
1123	+	if (name.startsWith("ForkJoinPool.commonPool-worker")
1124	+	&& (lockName = info.getLockName()) != null
1125	+	&& lockName.startsWith("java.util.concurrent.ForkJoinPool"))
1126	+	return false;
1127	+	return true;
1128	+	}
1129	+
1130		/**
1131		* A debugging tool to print stack traces of most threads, as jstack does.
1132		* Uninteresting threads are filtered out.
#	Line 1058 | Line 1141 | public class JSR166TestCase extends Test
1141		}
1142		}
1143
1061	–	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1144		System.err.println("------ stacktrace dump start ------");
1145	<	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1146	<	final String name = info.getThreadName();
1147	<	String lockName;
1066	<	if ("Signal Dispatcher".equals(name))
1067	<	continue;
1068	<	if ("Reference Handler".equals(name)
1069	<	&& (lockName = info.getLockName()) != null
1070	<	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1071	<	continue;
1072	<	if ("Finalizer".equals(name)
1073	<	&& (lockName = info.getLockName()) != null
1074	<	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1075	<	continue;
1076	<	if ("checkForWedgedTest".equals(name))
1077	<	continue;
1078	<	System.err.print(info);
1079	<	}
1145	>	for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
1146	>	if (threadOfInterest(info))
1147	>	System.err.print(info);
1148		System.err.println("------ stacktrace dump end ------");
1149
1150		if (sm != null) System.setSecurityManager(sm);
#	Line 1103 | Line 1171 | public class JSR166TestCase extends Test
1171		}
1172
1173		/**
1174	+	* Returns the thread's blocker's class name, if any, else null.
1175	+	*/
1176	+	String blockerClassName(Thread thread) {
1177	+	ThreadInfo threadInfo; LockInfo lockInfo;
1178	+	if ((threadInfo = THREAD_MXBEAN.getThreadInfo(thread.getId(), 0)) != null
1179	+	&& (lockInfo = threadInfo.getLockInfo()) != null)
1180	+	return lockInfo.getClassName();
1181	+	return null;
1182	+	}
1183	+
1184	+	/**
1185		* Checks that future.get times out, with the default timeout of
1186		* {@code timeoutMillis()}.
1187		*/
#	Line 1290 | Line 1369 | public class JSR166TestCase extends Test
1369		/**
1370		* Spin-waits up to the specified number of milliseconds for the given
1371		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1372	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1373		*/
1374	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1375	<	long startTime = 0L;
1376	<	for (;;) {
1377	<	Thread.State s = thread.getState();
1378	<	if (s == Thread.State.BLOCKED ||
1379	<	s == Thread.State.WAITING ||
1380	<	s == Thread.State.TIMED_WAITING)
1381	<	return;
1382	<	else if (s == Thread.State.TERMINATED)
1374	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1375	>	Callable<Boolean> waitingForGodot) {
1376	>	for (long startTime = 0L;;) {
1377	>	switch (thread.getState()) {
1378	>	default: break;
1379	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1380	>	try {
1381	>	if (waitingForGodot == null || waitingForGodot.call())
1382	>	return;
1383	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1384	>	break;
1385	>	case TERMINATED:
1386		fail("Unexpected thread termination");
1387	<	else if (startTime == 0L)
1387	>	}
1388	>
1389	>	if (startTime == 0L)
1390		startTime = System.nanoTime();
1391		else if (millisElapsedSince(startTime) > timeoutMillis) {
1392	<	threadAssertTrue(thread.isAlive());
1393	<	fail("timed out waiting for thread to enter wait state");
1392	>	assertTrue(thread.isAlive());
1393	>	if (waitingForGodot == null
1394	>	|| thread.getState() == Thread.State.RUNNABLE)
1395	>	fail("timed out waiting for thread to enter wait state");
1396	>	else
1397	>	fail("timed out waiting for condition, thread state="
1398	>	+ thread.getState());
1399		}
1400		Thread.yield();
1401		}
#	Line 1313 | Line 1403 | public class JSR166TestCase extends Test
1403
1404		/**
1405		* Spin-waits up to the specified number of milliseconds for the given
1406	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1317	<	* and additionally satisfy the given condition.
1406	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1407		*/
1408	<	void waitForThreadToEnterWaitState(
1409	<	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	<	}
1408	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1409	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1410		}
1411
1412		/**
#	Line 1346 | Line 1414 | public class JSR166TestCase extends Test
1414		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1415		*/
1416		void waitForThreadToEnterWaitState(Thread thread) {
1417	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1417	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1418		}
1419
1420		/**
#	Line 1354 | Line 1422 | public class JSR166TestCase extends Test
1422		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1423		* and additionally satisfy the given condition.
1424		*/
1425	<	void waitForThreadToEnterWaitState(
1426	<	Thread thread, Callable<Boolean> waitingForGodot) {
1425	>	void waitForThreadToEnterWaitState(Thread thread,
1426	>	Callable<Boolean> waitingForGodot) {
1427		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1428		}
1429
1430		/**
1431	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1432	+	* be interrupted.  Clears the interrupt status before returning.
1433	+	*/
1434	+	void awaitInterrupted() {
1435	+	for (long startTime = 0L; !Thread.interrupted(); ) {
1436	+	if (startTime == 0L)
1437	+	startTime = System.nanoTime();
1438	+	else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1439	+	fail("timed out waiting for thread interrupt");
1440	+	Thread.yield();
1441	+	}
1442	+	}
1443	+
1444	+	/**
1445		* Returns the number of milliseconds since time given by
1446		* startNanoTime, which must have been previously returned from a
1447		* call to {@link System#nanoTime()}.
#	Line 1368 | Line 1450 | public class JSR166TestCase extends Test
1450		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1451		}
1452
1371	–	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1372	–	//         long startTime = System.nanoTime();
1373	–	//         try {
1374	–	//             r.run();
1375	–	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1376	–	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1377	–	//             throw new AssertionError("did not return promptly");
1378	–	//     }
1379	–
1380	–	//     void assertTerminatesPromptly(Runnable r) {
1381	–	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1382	–	//     }
1383	–
1453		/**
1454		* Checks that timed f.get() returns the expected value, and does not
1455		* wait for the timeout to elapse before returning.
1456		*/
1457		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1458		long startTime = System.nanoTime();
1459	+	T actual = null;
1460		try {
1461	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1461	>	actual = f.get(timeoutMillis, MILLISECONDS);
1462		} catch (Throwable fail) { threadUnexpectedException(fail); }
1463	+	assertEquals(expectedValue, actual);
1464		if (millisElapsedSince(startTime) > timeoutMillis/2)
1465		throw new AssertionError("timed get did not return promptly");
1466		}
#	Line 1409 | Line 1480 | public class JSR166TestCase extends Test
1480		}
1481
1482		/**
1483	+	* Returns a new started daemon Thread running the given action,
1484	+	* wrapped in a CheckedRunnable.
1485	+	*/
1486	+	Thread newStartedThread(Action action) {
1487	+	return newStartedThread(checkedRunnable(action));
1488	+	}
1489	+
1490	+	/**
1491		* Waits for the specified time (in milliseconds) for the thread
1492		* to terminate (using {@link Thread#join(long)}), else interrupts
1493		* the thread (in the hope that it may terminate later) and fails.
1494		*/
1495	<	void awaitTermination(Thread t, long timeoutMillis) {
1495	>	void awaitTermination(Thread thread, long timeoutMillis) {
1496		try {
1497	<	t.join(timeoutMillis);
1497	>	thread.join(timeoutMillis);
1498		} catch (InterruptedException fail) {
1499		threadUnexpectedException(fail);
1500	<	} finally {
1501	<	if (t.getState() != Thread.State.TERMINATED) {
1502	<	t.interrupt();
1503	<	threadFail("timed out waiting for thread to terminate");
1500	>	}
1501	>	if (thread.getState() != Thread.State.TERMINATED) {
1502	>	String detail = String.format(
1503	>	"timed out waiting for thread to terminate, thread=%s, state=%s" ,
1504	>	thread, thread.getState());
1505	>	try {
1506	>	threadFail(detail);
1507	>	} finally {
1508	>	// Interrupt thread __after__ having reported its stack trace
1509	>	thread.interrupt();
1510		}
1511		}
1512		}
#	Line 1449 | Line 1534 | public class JSR166TestCase extends Test
1534		}
1535		}
1536
1537	+	Runnable checkedRunnable(Action action) {
1538	+	return new CheckedRunnable() {
1539	+	public void realRun() throws Throwable {
1540	+	action.run();
1541	+	}};
1542	+	}
1543	+
1544		public abstract class ThreadShouldThrow extends Thread {
1545		protected abstract void realRun() throws Throwable;
1546
#	Line 1461 | Line 1553 | public class JSR166TestCase extends Test
1553		public final void run() {
1554		try {
1555		realRun();
1464	–	threadShouldThrow(exceptionClass.getSimpleName());
1556		} catch (Throwable t) {
1557		if (! exceptionClass.isInstance(t))
1558		threadUnexpectedException(t);
1559	+	return;
1560		}
1561	+	threadShouldThrow(exceptionClass.getSimpleName());
1562		}
1563		}
1564
#	Line 1475 | Line 1568 | public class JSR166TestCase extends Test
1568		public final void run() {
1569		try {
1570		realRun();
1478	–	threadShouldThrow("InterruptedException");
1571		} catch (InterruptedException success) {
1572		threadAssertFalse(Thread.interrupted());
1573	+	return;
1574		} catch (Throwable fail) {
1575		threadUnexpectedException(fail);
1576		}
1577	+	threadShouldThrow("InterruptedException");
1578		}
1579		}
1580
#	Line 1492 | Line 1586 | public class JSR166TestCase extends Test
1586		return realCall();
1587		} catch (Throwable fail) {
1588		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);
1589		}
1590	<	return null;
1590	>	throw new AssertionError("unreached");
1591		}
1592		}
1593
#	Line 1568 | Line 1644 | public class JSR166TestCase extends Test
1644		}
1645
1646		public void await(CountDownLatch latch, long timeoutMillis) {
1647	+	boolean timedOut = false;
1648		try {
1649	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1573	<	fail("timed out waiting for CountDownLatch for "
1574	<	+ (timeoutMillis/1000) + " sec");
1649	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1650		} catch (Throwable fail) {
1651		threadUnexpectedException(fail);
1652		}
1653	+	if (timedOut)
1654	+	fail("timed out waiting for CountDownLatch for "
1655	+	+ (timeoutMillis/1000) + " sec");
1656		}
1657
1658		public void await(CountDownLatch latch) {
#	Line 1582 | Line 1660 | public class JSR166TestCase extends Test
1660		}
1661
1662		public void await(Semaphore semaphore) {
1663	+	boolean timedOut = false;
1664		try {
1665	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1587	<	fail("timed out waiting for Semaphore for "
1588	<	+ (LONG_DELAY_MS/1000) + " sec");
1665	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1666		} catch (Throwable fail) {
1667		threadUnexpectedException(fail);
1668		}
1669	+	if (timedOut)
1670	+	fail("timed out waiting for Semaphore for "
1671	+	+ (LONG_DELAY_MS/1000) + " sec");
1672		}
1673
1674		public void await(CyclicBarrier barrier) {
#	Line 1622 | Line 1702 | public class JSR166TestCase extends Test
1702		public String call() { throw new NullPointerException(); }
1703		}
1704
1625	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1626	–	protected void realRun() {
1627	–	try {
1628	–	delay(SMALL_DELAY_MS);
1629	–	} catch (InterruptedException ok) {}
1630	–	}
1631	–	}
1632	–
1705		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1706		return new CheckedRunnable() {
1707		protected void realRun() {
#	Line 1685 | Line 1757 | public class JSR166TestCase extends Test
1757		return realCompute();
1758		} catch (Throwable fail) {
1759		threadUnexpectedException(fail);
1688	–	return null;
1760		}
1761	+	throw new AssertionError("unreached");
1762		}
1763		}
1764
#	Line 1707 | Line 1779 | public class JSR166TestCase extends Test
1779
1780		public int await() {
1781		try {
1782	<	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1782	>	return super.await(LONGER_DELAY_MS, MILLISECONDS);
1783		} catch (TimeoutException timedOut) {
1784		throw new AssertionError("timed out");
1785		} catch (Exception fail) {
#	Line 1763 | Line 1835 | public class JSR166TestCase extends Test
1835		}
1836		}
1837
1838	<	void assertImmutable(final Object o) {
1838	>	void assertImmutable(Object o) {
1839		if (o instanceof Collection) {
1840		assertThrows(
1841		UnsupportedOperationException.class,
1842	<	new Runnable() { public void run() {
1771	<	((Collection) o).add(null);}});
1842	>	() -> ((Collection) o).add(null));
1843		}
1844		}
1845
1846		@SuppressWarnings("unchecked")
1847		<T> T serialClone(T o) {
1848	+	T clone = null;
1849		try {
1850		ObjectInputStream ois = new ObjectInputStream
1851		(new ByteArrayInputStream(serialBytes(o)));
1852	<	T clone = (T) ois.readObject();
1781	<	if (o == clone) assertImmutable(o);
1782	<	assertSame(o.getClass(), clone.getClass());
1783	<	return clone;
1852	>	clone = (T) ois.readObject();
1853		} catch (Throwable fail) {
1854		threadUnexpectedException(fail);
1786	–	return null;
1855		}
1856	+	if (o == clone) assertImmutable(o);
1857	+	else assertSame(o.getClass(), clone.getClass());
1858	+	return clone;
1859		}
1860
1861		/**
#	Line 1803 | Line 1874 | public class JSR166TestCase extends Test
1874		(new ByteArrayInputStream(bos.toByteArray()));
1875		T clone = (T) ois.readObject();
1876		if (o == clone) assertImmutable(o);
1877	<	assertSame(o.getClass(), clone.getClass());
1877	>	else assertSame(o.getClass(), clone.getClass());
1878		return clone;
1879		}
1880
#	Line 1828 | Line 1899 | public class JSR166TestCase extends Test
1899		}
1900
1901		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1902	<	Runnable... throwingActions) {
1903	<	for (Runnable throwingAction : throwingActions) {
1902	>	Action... throwingActions) {
1903	>	for (Action throwingAction : throwingActions) {
1904		boolean threw = false;
1905		try { throwingAction.run(); }
1906		catch (Throwable t) {

Diff Legend

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