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.240 by jsr166, Tue Jan 23 22:56:37 2018 UTC vs.
Revision 1.265 by jsr166, Sat Sep 7 15:03:44 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 273 | Line 284 | public class JSR166TestCase extends Test
284		static volatile TestCase currentTestCase;
285		// static volatile int currentRun = 0;
286		static {
287	<	Runnable checkForWedgedTest = new Runnable() { public void run() {
287	>	Runnable wedgedTestDetector = new Runnable() { public void run() {
288		// Avoid spurious reports with enormous runsPerTest.
289		// A single test case run should never take more than 1 second.
290		// But let's cap it at the high end too ...
291	<	final int timeoutMinutes =
292	<	Math.min(15, Math.max(runsPerTest / 60, 1));
291	>	final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
292	>	* Math.max((int) delayFactor, 1);
293	>	final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
294		for (TestCase lastTestCase = currentTestCase;;) {
295		try { MINUTES.sleep(timeoutMinutes); }
296		catch (InterruptedException unexpected) { break; }
#	Line 298 | Line 310 | public class JSR166TestCase extends Test
310		}
311		lastTestCase = currentTestCase;
312		}}};
313	<	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
313	>	Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
314		thread.setDaemon(true);
315		thread.start();
316		}
#	Line 418 | Line 430 | public class JSR166TestCase extends Test
430		for (String testClassName : testClassNames) {
431		try {
432		Class<?> testClass = Class.forName(testClassName);
433	<	Method m = testClass.getDeclaredMethod("suite",
422	<	new Class<?>[0]);
433	>	Method m = testClass.getDeclaredMethod("suite");
434		suite.addTest(newTestSuite((Test)m.invoke(null)));
435	<	} catch (Exception e) {
436	<	throw new Error("Missing test class", e);
435	>	} catch (ReflectiveOperationException e) {
436	>	throw new AssertionError("Missing test class", e);
437		}
438		}
439		}
#	Line 449 | Line 460 | public class JSR166TestCase extends Test
460		public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
461		public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
462		public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
463	+	public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
464	+	public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
465	+	public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
466	+	public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
467	+	public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
468	+	public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
469	+	public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
470
471		/**
472		* Collects all JSR166 unit tests as one suite.
#	Line 500 | Line 518 | public class JSR166TestCase extends Test
518		ExecutorsTest.suite(),
519		ExecutorCompletionServiceTest.suite(),
520		FutureTaskTest.suite(),
521	+	HashtableTest.suite(),
522		LinkedBlockingDequeTest.suite(),
523		LinkedBlockingQueueTest.suite(),
524		LinkedListTest.suite(),
#	Line 539 | Line 558 | public class JSR166TestCase extends Test
558		"HashMapTest",
559		"LinkedBlockingDeque8Test",
560		"LinkedBlockingQueue8Test",
561	+	"LinkedHashMapTest",
562		"LongAccumulatorTest",
563		"LongAdderTest",
564		"SplittableRandomTest",
#	Line 599 | Line 619 | public class JSR166TestCase extends Test
619		for (String methodName : testMethodNames(testClass))
620		suite.addTest((Test) c.newInstance(data, methodName));
621		return suite;
622	<	} catch (Exception e) {
623	<	throw new Error(e);
622	>	} catch (ReflectiveOperationException e) {
623	>	throw new AssertionError(e);
624		}
625		}
626
#	Line 616 | Line 636 | public class JSR166TestCase extends Test
636		if (atLeastJava8()) {
637		String name = testClass.getName();
638		String name8 = name.replaceAll("Test$", "8Test");
639	<	if (name.equals(name8)) throw new Error(name);
639	>	if (name.equals(name8)) throw new AssertionError(name);
640		try {
641		return (Test)
642		Class.forName(name8)
643	<	.getMethod("testSuite", new Class[] { dataClass })
643	>	.getMethod("testSuite", dataClass)
644		.invoke(null, data);
645	<	} catch (Exception e) {
646	<	throw new Error(e);
645	>	} catch (ReflectiveOperationException e) {
646	>	throw new AssertionError(e);
647		}
648		} else {
649		return new TestSuite();
#	Line 637 | Line 657 | public class JSR166TestCase extends Test
657		public static long MEDIUM_DELAY_MS;
658		public static long LONG_DELAY_MS;
659
660	+	/**
661	+	* A delay significantly longer than LONG_DELAY_MS.
662	+	* Use this in a thread that is waited for via awaitTermination(Thread).
663	+	*/
664	+	public static long LONGER_DELAY_MS;
665	+
666		private static final long RANDOM_TIMEOUT;
667		private static final long RANDOM_EXPIRED_TIMEOUT;
668		private static final TimeUnit RANDOM_TIMEUNIT;
#	Line 665 | Line 691 | public class JSR166TestCase extends Test
691		static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
692
693		/**
694	+	* Returns a random boolean; a "coin flip".
695	+	*/
696	+	static boolean randomBoolean() {
697	+	return ThreadLocalRandom.current().nextBoolean();
698	+	}
699	+
700	+	/**
701	+	* Returns a random element from given choices.
702	+	*/
703	+	<T> T chooseRandomly(T... choices) {
704	+	return choices[ThreadLocalRandom.current().nextInt(choices.length)];
705	+	}
706	+
707	+	/**
708		* Returns the shortest timed delay. This can be scaled up for
709		* slow machines using the jsr166.delay.factor system property,
710		* or via jtreg's -timeoutFactor: flag.
#	Line 682 | Line 722 | public class JSR166TestCase extends Test
722		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
723		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
724		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
725	+	LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
726		}
727
728		private static final long TIMEOUT_DELAY_MS
#	Line 720 | Line 761 | public class JSR166TestCase extends Test
761		*/
762		public void threadRecordFailure(Throwable t) {
763		System.err.println(t);
764	<	dumpTestThreads();
765	<	threadFailure.compareAndSet(null, t);
764	>	if (threadFailure.compareAndSet(null, t))
765	>	dumpTestThreads();
766		}
767
768		public void setUp() {
#	Line 1065 | Line 1106 | public class JSR166TestCase extends Test
1106		continue;
1107		if ("Reference Handler".equals(name)
1108		&& (lockName = info.getLockName()) != null
1109	<	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1109	>	&& lockName.startsWith("java.lang.ref"))
1110		continue;
1111	<	if ("Finalizer".equals(name)
1111	>	if (("Finalizer".equals(name) || "Common-Cleaner".equals(name))
1112		&& (lockName = info.getLockName()) != null
1113	<	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1113	>	&& lockName.startsWith("java.lang.ref"))
1114		continue;
1115	<	if ("checkForWedgedTest".equals(name))
1115	>	if ("WedgedTestDetector".equals(name))
1116		continue;
1117		System.err.print(info);
1118		}
#	Line 1288 | Line 1329 | public class JSR166TestCase extends Test
1329		/**
1330		* Spin-waits up to the specified number of milliseconds for the given
1331		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1332	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1333		*/
1334	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1335	<	long startTime = 0L;
1336	<	for (;;) {
1337	<	Thread.State s = thread.getState();
1338	<	if (s == Thread.State.BLOCKED ||
1339	<	s == Thread.State.WAITING ||
1340	<	s == Thread.State.TIMED_WAITING)
1341	<	return;
1342	<	else if (s == Thread.State.TERMINATED)
1334	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1335	>	Callable<Boolean> waitingForGodot) {
1336	>	for (long startTime = 0L;;) {
1337	>	switch (thread.getState()) {
1338	>	default: break;
1339	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1340	>	try {
1341	>	if (waitingForGodot == null || waitingForGodot.call())
1342	>	return;
1343	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1344	>	break;
1345	>	case TERMINATED:
1346		fail("Unexpected thread termination");
1347	<	else if (startTime == 0L)
1347	>	}
1348	>
1349	>	if (startTime == 0L)
1350		startTime = System.nanoTime();
1351		else if (millisElapsedSince(startTime) > timeoutMillis) {
1352	<	threadAssertTrue(thread.isAlive());
1353	<	fail("timed out waiting for thread to enter wait state");
1352	>	assertTrue(thread.isAlive());
1353	>	if (waitingForGodot == null
1354	>	|| thread.getState() == Thread.State.RUNNABLE)
1355	>	fail("timed out waiting for thread to enter wait state");
1356	>	else
1357	>	fail("timed out waiting for condition, thread state="
1358	>	+ thread.getState());
1359		}
1360		Thread.yield();
1361		}
#	Line 1311 | Line 1363 | public class JSR166TestCase extends Test
1363
1364		/**
1365		* Spin-waits up to the specified number of milliseconds for the given
1366	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1315	<	* and additionally satisfy the given condition.
1366	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1367		*/
1368	<	void waitForThreadToEnterWaitState(
1369	<	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	<	}
1368	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1369	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1370		}
1371
1372		/**
#	Line 1344 | Line 1374 | public class JSR166TestCase extends Test
1374		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1375		*/
1376		void waitForThreadToEnterWaitState(Thread thread) {
1377	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1377	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1378		}
1379
1380		/**
#	Line 1352 | Line 1382 | public class JSR166TestCase extends Test
1382		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1383		* and additionally satisfy the given condition.
1384		*/
1385	<	void waitForThreadToEnterWaitState(
1386	<	Thread thread, Callable<Boolean> waitingForGodot) {
1385	>	void waitForThreadToEnterWaitState(Thread thread,
1386	>	Callable<Boolean> waitingForGodot) {
1387		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1388		}
1389
1390		/**
1391	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1392	+	* be interrupted.  Clears the interrupt status before returning.
1393	+	*/
1394	+	void awaitInterrupted() {
1395	+	for (long startTime = 0L; !Thread.interrupted(); ) {
1396	+	if (startTime == 0L)
1397	+	startTime = System.nanoTime();
1398	+	else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1399	+	fail("timed out waiting for thread interrupt");
1400	+	Thread.yield();
1401	+	}
1402	+	}
1403	+
1404	+	/**
1405		* Returns the number of milliseconds since time given by
1406		* startNanoTime, which must have been previously returned from a
1407		* call to {@link System#nanoTime()}.
#	Line 1366 | Line 1410 | public class JSR166TestCase extends Test
1410		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1411		}
1412
1369	–	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1370	–	//         long startTime = System.nanoTime();
1371	–	//         try {
1372	–	//             r.run();
1373	–	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1374	–	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1375	–	//             throw new AssertionError("did not return promptly");
1376	–	//     }
1377	–
1378	–	//     void assertTerminatesPromptly(Runnable r) {
1379	–	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1380	–	//     }
1381	–
1413		/**
1414		* Checks that timed f.get() returns the expected value, and does not
1415		* wait for the timeout to elapse before returning.
1416		*/
1417		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1418		long startTime = System.nanoTime();
1419	+	T actual = null;
1420		try {
1421	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1421	>	actual = f.get(timeoutMillis, MILLISECONDS);
1422		} catch (Throwable fail) { threadUnexpectedException(fail); }
1423	+	assertEquals(expectedValue, actual);
1424		if (millisElapsedSince(startTime) > timeoutMillis/2)
1425		throw new AssertionError("timed get did not return promptly");
1426		}
#	Line 1411 | Line 1444 | public class JSR166TestCase extends Test
1444		* to terminate (using {@link Thread#join(long)}), else interrupts
1445		* the thread (in the hope that it may terminate later) and fails.
1446		*/
1447	<	void awaitTermination(Thread t, long timeoutMillis) {
1447	>	void awaitTermination(Thread thread, long timeoutMillis) {
1448		try {
1449	<	t.join(timeoutMillis);
1449	>	thread.join(timeoutMillis);
1450		} catch (InterruptedException fail) {
1451		threadUnexpectedException(fail);
1452	<	} finally {
1453	<	if (t.getState() != Thread.State.TERMINATED) {
1454	<	t.interrupt();
1455	<	threadFail("timed out waiting for thread to terminate");
1452	>	}
1453	>	if (thread.getState() != Thread.State.TERMINATED) {
1454	>	String detail = String.format(
1455	>	"timed out waiting for thread to terminate, thread=%s, state=%s" ,
1456	>	thread, thread.getState());
1457	>	try {
1458	>	threadFail(detail);
1459	>	} finally {
1460	>	// Interrupt thread __after__ having reported its stack trace
1461	>	thread.interrupt();
1462		}
1463		}
1464		}
#	Line 1447 | Line 1486 | public class JSR166TestCase extends Test
1486		}
1487		}
1488
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	–
1489		public abstract class ThreadShouldThrow extends Thread {
1490		protected abstract void realRun() throws Throwable;
1491
#	Line 1479 | Line 1498 | public class JSR166TestCase extends Test
1498		public final void run() {
1499		try {
1500		realRun();
1482	–	threadShouldThrow(exceptionClass.getSimpleName());
1501		} catch (Throwable t) {
1502		if (! exceptionClass.isInstance(t))
1503		threadUnexpectedException(t);
1504	+	return;
1505		}
1506	+	threadShouldThrow(exceptionClass.getSimpleName());
1507		}
1508		}
1509
#	Line 1493 | Line 1513 | public class JSR166TestCase extends Test
1513		public final void run() {
1514		try {
1515		realRun();
1496	–	threadShouldThrow("InterruptedException");
1516		} catch (InterruptedException success) {
1517		threadAssertFalse(Thread.interrupted());
1518	+	return;
1519		} catch (Throwable fail) {
1520		threadUnexpectedException(fail);
1521		}
1522	+	threadShouldThrow("InterruptedException");
1523		}
1524		}
1525
#	Line 1510 | Line 1531 | public class JSR166TestCase extends Test
1531		return realCall();
1532		} catch (Throwable fail) {
1533		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);
1534		}
1535	<	return null;
1535	>	throw new AssertionError("unreached");
1536		}
1537		}
1538
#	Line 1586 | Line 1589 | public class JSR166TestCase extends Test
1589		}
1590
1591		public void await(CountDownLatch latch, long timeoutMillis) {
1592	+	boolean timedOut = false;
1593		try {
1594	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1591	<	fail("timed out waiting for CountDownLatch for "
1592	<	+ (timeoutMillis/1000) + " sec");
1594	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1595		} catch (Throwable fail) {
1596		threadUnexpectedException(fail);
1597		}
1598	+	if (timedOut)
1599	+	fail("timed out waiting for CountDownLatch for "
1600	+	+ (timeoutMillis/1000) + " sec");
1601		}
1602
1603		public void await(CountDownLatch latch) {
#	Line 1600 | Line 1605 | public class JSR166TestCase extends Test
1605		}
1606
1607		public void await(Semaphore semaphore) {
1608	+	boolean timedOut = false;
1609		try {
1610	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1605	<	fail("timed out waiting for Semaphore for "
1606	<	+ (LONG_DELAY_MS/1000) + " sec");
1610	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1611		} catch (Throwable fail) {
1612		threadUnexpectedException(fail);
1613		}
1614	+	if (timedOut)
1615	+	fail("timed out waiting for Semaphore for "
1616	+	+ (LONG_DELAY_MS/1000) + " sec");
1617		}
1618
1619		public void await(CyclicBarrier barrier) {
#	Line 1640 | Line 1647 | public class JSR166TestCase extends Test
1647		public String call() { throw new NullPointerException(); }
1648		}
1649
1643	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1644	–	protected void realRun() {
1645	–	try {
1646	–	delay(SMALL_DELAY_MS);
1647	–	} catch (InterruptedException ok) {}
1648	–	}
1649	–	}
1650	–
1650		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1651		return new CheckedRunnable() {
1652		protected void realRun() {
#	Line 1703 | Line 1702 | public class JSR166TestCase extends Test
1702		return realCompute();
1703		} catch (Throwable fail) {
1704		threadUnexpectedException(fail);
1706	–	return null;
1705		}
1706	+	throw new AssertionError("unreached");
1707		}
1708		}
1709
#	Line 1781 | Line 1780 | public class JSR166TestCase extends Test
1780		}
1781		}
1782
1783	<	void assertImmutable(final Object o) {
1783	>	void assertImmutable(Object o) {
1784		if (o instanceof Collection) {
1785		assertThrows(
1786		UnsupportedOperationException.class,
1787	<	new Runnable() { public void run() {
1789	<	((Collection) o).add(null);}});
1787	>	() -> ((Collection) o).add(null));
1788		}
1789		}
1790
1791		@SuppressWarnings("unchecked")
1792		<T> T serialClone(T o) {
1793	+	T clone = null;
1794		try {
1795		ObjectInputStream ois = new ObjectInputStream
1796		(new ByteArrayInputStream(serialBytes(o)));
1797	<	T clone = (T) ois.readObject();
1799	<	if (o == clone) assertImmutable(o);
1800	<	assertSame(o.getClass(), clone.getClass());
1801	<	return clone;
1797	>	clone = (T) ois.readObject();
1798		} catch (Throwable fail) {
1799		threadUnexpectedException(fail);
1804	–	return null;
1800		}
1801	+	if (o == clone) assertImmutable(o);
1802	+	else assertSame(o.getClass(), clone.getClass());
1803	+	return clone;
1804		}
1805
1806		/**
#	Line 1821 | Line 1819 | public class JSR166TestCase extends Test
1819		(new ByteArrayInputStream(bos.toByteArray()));
1820		T clone = (T) ois.readObject();
1821		if (o == clone) assertImmutable(o);
1822	<	assertSame(o.getClass(), clone.getClass());
1822	>	else assertSame(o.getClass(), clone.getClass());
1823		return clone;
1824		}
1825
#	Line 1846 | Line 1844 | public class JSR166TestCase extends Test
1844		}
1845
1846		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1847	<	Runnable... throwingActions) {
1848	<	for (Runnable throwingAction : throwingActions) {
1847	>	Action... throwingActions) {
1848	>	for (Action throwingAction : throwingActions) {
1849		boolean threw = false;
1850		try { throwingAction.run(); }
1851		catch (Throwable t) {
#	Line 2072 | Line 2070 | public class JSR166TestCase extends Test
2070		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2071		assertEquals(savedQueueSize, p.getQueue().size());
2072		}
2073	+
2074	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2075	+	assertEquals(x, y);
2076	+	assertEquals(y, x);
2077	+	assertEquals(x.isEmpty(), y.isEmpty());
2078	+	assertEquals(x.size(), y.size());
2079	+	if (x instanceof List) {
2080	+	assertEquals(x.toString(), y.toString());
2081	+	}
2082	+	if (x instanceof List || x instanceof Set) {
2083	+	assertEquals(x.hashCode(), y.hashCode());
2084	+	}
2085	+	if (x instanceof List || x instanceof Deque) {
2086	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2087	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2088	+	y.toArray(new Object[0])));
2089	+	}
2090	+	}
2091	+
2092	+	/**
2093	+	* A weaker form of assertCollectionsEquals which does not insist
2094	+	* that the two collections satisfy Object#equals(Object), since
2095	+	* they may use identity semantics as Deques do.
2096	+	*/
2097	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2098	+	if (x instanceof List || x instanceof Set)
2099	+	assertCollectionsEquals(x, y);
2100	+	else {
2101	+	assertEquals(x.isEmpty(), y.isEmpty());
2102	+	assertEquals(x.size(), y.size());
2103	+	assertEquals(new HashSet(x), new HashSet(y));
2104	+	if (x instanceof Deque) {
2105	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2106	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2107	+	y.toArray(new Object[0])));
2108	+	}
2109	+	}
2110	+	}
2111		}

Diff Legend

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