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.238 by jsr166, Mon Dec 11 00:27:08 2017 UTC vs.
Revision 1.250 by jsr166, Sat Nov 24 21:48:19 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 99 | Line 102 | import java.util.concurrent.atomic.Atomi
102		import java.util.concurrent.atomic.AtomicReference;
103		import java.util.regex.Pattern;
104
102	–	import junit.framework.AssertionFailedError;
105		import junit.framework.Test;
106		import junit.framework.TestCase;
107		import junit.framework.TestResult;
#	Line 115 | 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 419 | 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",
423	<	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 450 | 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 600 | Line 610 | public class JSR166TestCase extends Test
610		for (String methodName : testMethodNames(testClass))
611		suite.addTest((Test) c.newInstance(data, methodName));
612		return suite;
613	<	} catch (Exception e) {
614	<	throw new Error(e);
613	>	} catch (ReflectiveOperationException e) {
614	>	throw new AssertionError(e);
615		}
616		}
617
#	Line 617 | Line 627 | public class JSR166TestCase extends Test
627		if (atLeastJava8()) {
628		String name = testClass.getName();
629		String name8 = name.replaceAll("Test$", "8Test");
630	<	if (name.equals(name8)) throw new Error(name);
630	>	if (name.equals(name8)) throw new AssertionError(name);
631		try {
632		return (Test)
633		Class.forName(name8)
634	<	.getMethod("testSuite", new Class[] { dataClass })
634	>	.getMethod("testSuite", dataClass)
635		.invoke(null, data);
636	<	} catch (Exception e) {
637	<	throw new Error(e);
636	>	} catch (ReflectiveOperationException e) {
637	>	throw new AssertionError(e);
638		}
639		} else {
640		return new TestSuite();
#	Line 733 | Line 743 | public class JSR166TestCase extends Test
743		String msg = toString() + ": " + String.format(format, args);
744		System.err.println(msg);
745		dumpTestThreads();
746	<	throw new AssertionFailedError(msg);
746	>	throw new AssertionError(msg);
747		}
748
749		/**
#	Line 754 | Line 764 | public class JSR166TestCase extends Test
764		throw (RuntimeException) t;
765		else if (t instanceof Exception)
766		throw (Exception) t;
767	<	else {
768	<	AssertionFailedError afe =
759	<	new AssertionFailedError(t.toString());
760	<	afe.initCause(t);
761	<	throw afe;
762	<	}
767	>	else
768	>	throw new AssertionError(t.toString(), t);
769		}
770
771		if (Thread.interrupted())
#	Line 793 | Line 799 | public class JSR166TestCase extends Test
799
800		/**
801		* Just like fail(reason), but additionally recording (using
802	<	* threadRecordFailure) any AssertionFailedError thrown, so that
803	<	* the current testcase will fail.
802	>	* threadRecordFailure) any AssertionError thrown, so that the
803	>	* current testcase will fail.
804		*/
805		public void threadFail(String reason) {
806		try {
807		fail(reason);
808	<	} catch (AssertionFailedError t) {
809	<	threadRecordFailure(t);
810	<	throw t;
808	>	} catch (AssertionError fail) {
809	>	threadRecordFailure(fail);
810	>	throw fail;
811		}
812		}
813
814		/**
815		* Just like assertTrue(b), but additionally recording (using
816	<	* threadRecordFailure) any AssertionFailedError thrown, so that
817	<	* the current testcase will fail.
816	>	* threadRecordFailure) any AssertionError thrown, so that the
817	>	* current testcase will fail.
818		*/
819		public void threadAssertTrue(boolean b) {
820		try {
821		assertTrue(b);
822	<	} catch (AssertionFailedError t) {
823	<	threadRecordFailure(t);
824	<	throw t;
822	>	} catch (AssertionError fail) {
823	>	threadRecordFailure(fail);
824	>	throw fail;
825		}
826		}
827
828		/**
829		* Just like assertFalse(b), but additionally recording (using
830	<	* threadRecordFailure) any AssertionFailedError thrown, so that
831	<	* the current testcase will fail.
830	>	* threadRecordFailure) any AssertionError thrown, so that the
831	>	* current testcase will fail.
832		*/
833		public void threadAssertFalse(boolean b) {
834		try {
835		assertFalse(b);
836	<	} catch (AssertionFailedError t) {
837	<	threadRecordFailure(t);
838	<	throw t;
836	>	} catch (AssertionError fail) {
837	>	threadRecordFailure(fail);
838	>	throw fail;
839		}
840		}
841
842		/**
843		* Just like assertNull(x), but additionally recording (using
844	<	* threadRecordFailure) any AssertionFailedError thrown, so that
845	<	* the current testcase will fail.
844	>	* threadRecordFailure) any AssertionError thrown, so that the
845	>	* current testcase will fail.
846		*/
847		public void threadAssertNull(Object x) {
848		try {
849		assertNull(x);
850	<	} catch (AssertionFailedError t) {
851	<	threadRecordFailure(t);
852	<	throw t;
850	>	} catch (AssertionError fail) {
851	>	threadRecordFailure(fail);
852	>	throw fail;
853		}
854		}
855
856		/**
857		* Just like assertEquals(x, y), but additionally recording (using
858	<	* threadRecordFailure) any AssertionFailedError thrown, so that
859	<	* the current testcase will fail.
858	>	* threadRecordFailure) any AssertionError thrown, so that the
859	>	* current testcase will fail.
860		*/
861		public void threadAssertEquals(long x, long y) {
862		try {
863		assertEquals(x, y);
864	<	} catch (AssertionFailedError t) {
865	<	threadRecordFailure(t);
866	<	throw t;
864	>	} catch (AssertionError fail) {
865	>	threadRecordFailure(fail);
866	>	throw fail;
867		}
868		}
869
870		/**
871		* Just like assertEquals(x, y), but additionally recording (using
872	<	* threadRecordFailure) any AssertionFailedError thrown, so that
873	<	* the current testcase will fail.
872	>	* threadRecordFailure) any AssertionError thrown, so that the
873	>	* current testcase will fail.
874		*/
875		public void threadAssertEquals(Object x, Object y) {
876		try {
877		assertEquals(x, y);
878	<	} catch (AssertionFailedError fail) {
878	>	} catch (AssertionError fail) {
879		threadRecordFailure(fail);
880		throw fail;
881		} catch (Throwable fail) {
#	Line 879 | Line 885 | public class JSR166TestCase extends Test
885
886		/**
887		* Just like assertSame(x, y), but additionally recording (using
888	<	* threadRecordFailure) any AssertionFailedError thrown, so that
889	<	* the current testcase will fail.
888	>	* threadRecordFailure) any AssertionError thrown, so that the
889	>	* current testcase will fail.
890		*/
891		public void threadAssertSame(Object x, Object y) {
892		try {
893		assertSame(x, y);
894	<	} catch (AssertionFailedError fail) {
894	>	} catch (AssertionError fail) {
895		threadRecordFailure(fail);
896		throw fail;
897		}
#	Line 907 | Line 913 | public class JSR166TestCase extends Test
913
914		/**
915		* Records the given exception using {@link #threadRecordFailure},
916	<	* then rethrows the exception, wrapping it in an
917	<	* AssertionFailedError if necessary.
916	>	* then rethrows the exception, wrapping it in an AssertionError
917	>	* if necessary.
918		*/
919		public void threadUnexpectedException(Throwable t) {
920		threadRecordFailure(t);
#	Line 917 | Line 923 | public class JSR166TestCase extends Test
923		throw (RuntimeException) t;
924		else if (t instanceof Error)
925		throw (Error) t;
926	<	else {
927	<	AssertionFailedError afe =
922	<	new AssertionFailedError("unexpected exception: " + t);
923	<	afe.initCause(t);
924	<	throw afe;
925	<	}
926	>	else
927	>	throw new AssertionError("unexpected exception: " + t, t);
928		}
929
930		/**
#	Line 1098 | Line 1100 | public class JSR166TestCase extends Test
1100		for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1101		try { delay(1); }
1102		catch (InterruptedException fail) {
1103	<	fail("Unexpected InterruptedException");
1103	>	throw new AssertionError("Unexpected InterruptedException", fail);
1104		}
1105		Thread.State s = thread.getState();
1106		if (s == expected)
#	Line 1284 | Line 1286 | public class JSR166TestCase extends Test
1286
1287		/**
1288		* Sleeps until the given time has elapsed.
1289	<	* Throws AssertionFailedError if interrupted.
1289	>	* Throws AssertionError if interrupted.
1290		*/
1291		static void sleep(long millis) {
1292		try {
1293		delay(millis);
1294		} catch (InterruptedException fail) {
1295	<	AssertionFailedError afe =
1294	<	new AssertionFailedError("Unexpected InterruptedException");
1295	<	afe.initCause(fail);
1296	<	throw afe;
1295	>	throw new AssertionError("Unexpected InterruptedException", fail);
1296		}
1297		}
1298
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	>	default: break;
1309	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1310	>	try {
1311	>	if (waitingForGodot == null || waitingForGodot.call())
1312	>	return;
1313	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1314	>	break;
1315	>	case TERMINATED:
1316		fail("Unexpected thread termination");
1317	<	else if (startTime == 0L)
1317	>	}
1318	>
1319	>	if (startTime == 0L)
1320		startTime = System.nanoTime();
1321		else if (millisElapsedSince(startTime) > timeoutMillis) {
1322	<	threadAssertTrue(thread.isAlive());
1323	<	fail("timed out waiting for thread to enter wait state");
1322	>	assertTrue(thread.isAlive());
1323	>	if (waitingForGodot == null
1324	>	|| thread.getState() == Thread.State.RUNNABLE)
1325	>	fail("timed out waiting for thread to enter wait state");
1326	>	else
1327	>	fail("timed out waiting for condition, thread state="
1328	>	+ thread.getState());
1329		}
1330		Thread.yield();
1331		}
#	Line 1323 | Line 1333 | public class JSR166TestCase extends Test
1333
1334		/**
1335		* Spin-waits up to the specified number of milliseconds for the given
1336	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1327	<	* and additionally satisfy the given condition.
1336	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1337		*/
1338	<	void waitForThreadToEnterWaitState(
1339	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1331	<	long startTime = 0L;
1332	<	for (;;) {
1333	<	Thread.State s = thread.getState();
1334	<	if (s == Thread.State.BLOCKED ||
1335	<	s == Thread.State.WAITING ||
1336	<	s == Thread.State.TIMED_WAITING) {
1337	<	try {
1338	<	if (waitingForGodot.call())
1339	<	return;
1340	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1341	<	}
1342	<	else if (s == Thread.State.TERMINATED)
1343	<	fail("Unexpected thread termination");
1344	<	else if (startTime == 0L)
1345	<	startTime = System.nanoTime();
1346	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1347	<	threadAssertTrue(thread.isAlive());
1348	<	fail("timed out waiting for thread to enter wait state");
1349	<	}
1350	<	Thread.yield();
1351	<	}
1338	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1339	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1340		}
1341
1342		/**
#	Line 1356 | Line 1344 | public class JSR166TestCase extends Test
1344		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1345		*/
1346		void waitForThreadToEnterWaitState(Thread thread) {
1347	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1347	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1348		}
1349
1350		/**
#	Line 1364 | Line 1352 | public class JSR166TestCase extends Test
1352		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1353		* and additionally satisfy the given condition.
1354		*/
1355	<	void waitForThreadToEnterWaitState(
1356	<	Thread thread, Callable<Boolean> waitingForGodot) {
1355	>	void waitForThreadToEnterWaitState(Thread thread,
1356	>	Callable<Boolean> waitingForGodot) {
1357		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1358		}
1359
#	Line 1384 | Line 1372 | public class JSR166TestCase extends Test
1372		//             r.run();
1373		//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1374		//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1375	<	//             throw new AssertionFailedError("did not return promptly");
1375	>	//             throw new AssertionError("did not return promptly");
1376		//     }
1377
1378		//     void assertTerminatesPromptly(Runnable r) {
#	Line 1397 | Line 1385 | public class JSR166TestCase extends Test
1385		*/
1386		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1387		long startTime = System.nanoTime();
1388	+	T actual = null;
1389		try {
1390	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1390	>	actual = f.get(timeoutMillis, MILLISECONDS);
1391		} catch (Throwable fail) { threadUnexpectedException(fail); }
1392	+	assertEquals(expectedValue, actual);
1393		if (millisElapsedSince(startTime) > timeoutMillis/2)
1394	<	throw new AssertionFailedError("timed get did not return promptly");
1394	>	throw new AssertionError("timed get did not return promptly");
1395		}
1396
1397		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1459 | Line 1449 | public class JSR166TestCase extends Test
1449		}
1450		}
1451
1462	–	public abstract class RunnableShouldThrow implements Runnable {
1463	–	protected abstract void realRun() throws Throwable;
1464	–
1465	–	final Class<?> exceptionClass;
1466	–
1467	–	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1468	–	this.exceptionClass = exceptionClass;
1469	–	}
1470	–
1471	–	public final void run() {
1472	–	try {
1473	–	realRun();
1474	–	threadShouldThrow(exceptionClass.getSimpleName());
1475	–	} catch (Throwable t) {
1476	–	if (! exceptionClass.isInstance(t))
1477	–	threadUnexpectedException(t);
1478	–	}
1479	–	}
1480	–	}
1481	–
1452		public abstract class ThreadShouldThrow extends Thread {
1453		protected abstract void realRun() throws Throwable;
1454
#	Line 1491 | Line 1461 | public class JSR166TestCase extends Test
1461		public final void run() {
1462		try {
1463		realRun();
1494	–	threadShouldThrow(exceptionClass.getSimpleName());
1464		} catch (Throwable t) {
1465		if (! exceptionClass.isInstance(t))
1466		threadUnexpectedException(t);
1467	+	return;
1468		}
1469	+	threadShouldThrow(exceptionClass.getSimpleName());
1470		}
1471		}
1472
#	Line 1505 | Line 1476 | public class JSR166TestCase extends Test
1476		public final void run() {
1477		try {
1478		realRun();
1508	–	threadShouldThrow("InterruptedException");
1479		} catch (InterruptedException success) {
1480		threadAssertFalse(Thread.interrupted());
1481	+	return;
1482		} catch (Throwable fail) {
1483		threadUnexpectedException(fail);
1484		}
1485	+	threadShouldThrow("InterruptedException");
1486		}
1487		}
1488
#	Line 1522 | Line 1494 | public class JSR166TestCase extends Test
1494		return realCall();
1495		} catch (Throwable fail) {
1496		threadUnexpectedException(fail);
1525	–	return null;
1526	–	}
1527	–	}
1528	–	}
1529	–
1530	–	public abstract class CheckedInterruptedCallable<T>
1531	–	implements Callable<T> {
1532	–	protected abstract T realCall() throws Throwable;
1533	–
1534	–	public final T call() {
1535	–	try {
1536	–	T result = realCall();
1537	–	threadShouldThrow("InterruptedException");
1538	–	return result;
1539	–	} catch (InterruptedException success) {
1540	–	threadAssertFalse(Thread.interrupted());
1541	–	} catch (Throwable fail) {
1542	–	threadUnexpectedException(fail);
1497		}
1498	<	return null;
1498	>	throw new AssertionError("unreached");
1499		}
1500		}
1501
#	Line 1598 | Line 1552 | public class JSR166TestCase extends Test
1552		}
1553
1554		public void await(CountDownLatch latch, long timeoutMillis) {
1555	+	boolean timedOut = false;
1556		try {
1557	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1603	<	fail("timed out waiting for CountDownLatch for "
1604	<	+ (timeoutMillis/1000) + " sec");
1557	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1558		} catch (Throwable fail) {
1559		threadUnexpectedException(fail);
1560		}
1561	+	if (timedOut)
1562	+	fail("timed out waiting for CountDownLatch for "
1563	+	+ (timeoutMillis/1000) + " sec");
1564		}
1565
1566		public void await(CountDownLatch latch) {
#	Line 1612 | Line 1568 | public class JSR166TestCase extends Test
1568		}
1569
1570		public void await(Semaphore semaphore) {
1571	+	boolean timedOut = false;
1572		try {
1573	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1617	<	fail("timed out waiting for Semaphore for "
1618	<	+ (LONG_DELAY_MS/1000) + " sec");
1573	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1574		} catch (Throwable fail) {
1575		threadUnexpectedException(fail);
1576		}
1577	+	if (timedOut)
1578	+	fail("timed out waiting for Semaphore for "
1579	+	+ (LONG_DELAY_MS/1000) + " sec");
1580		}
1581
1582		public void await(CyclicBarrier barrier) {
#	Line 1643 | Line 1601 | public class JSR166TestCase extends Test
1601		//         long startTime = System.nanoTime();
1602		//         while (!flag.get()) {
1603		//             if (millisElapsedSince(startTime) > timeoutMillis)
1604	<	//                 throw new AssertionFailedError("timed out");
1604	>	//                 throw new AssertionError("timed out");
1605		//             Thread.yield();
1606		//         }
1607		//     }
#	Line 1652 | Line 1610 | public class JSR166TestCase extends Test
1610		public String call() { throw new NullPointerException(); }
1611		}
1612
1655	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1656	–	protected void realRun() {
1657	–	try {
1658	–	delay(SMALL_DELAY_MS);
1659	–	} catch (InterruptedException ok) {}
1660	–	}
1661	–	}
1662	–
1613		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1614		return new CheckedRunnable() {
1615		protected void realRun() {
#	Line 1715 | Line 1665 | public class JSR166TestCase extends Test
1665		return realCompute();
1666		} catch (Throwable fail) {
1667		threadUnexpectedException(fail);
1718	–	return null;
1668		}
1669	+	throw new AssertionError("unreached");
1670		}
1671		}
1672
#	Line 1730 | Line 1680 | public class JSR166TestCase extends Test
1680
1681		/**
1682		* A CyclicBarrier that uses timed await and fails with
1683	<	* AssertionFailedErrors instead of throwing checked exceptions.
1683	>	* AssertionErrors instead of throwing checked exceptions.
1684		*/
1685		public static class CheckedBarrier extends CyclicBarrier {
1686		public CheckedBarrier(int parties) { super(parties); }
#	Line 1739 | Line 1689 | public class JSR166TestCase extends Test
1689		try {
1690		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1691		} catch (TimeoutException timedOut) {
1692	<	throw new AssertionFailedError("timed out");
1692	>	throw new AssertionError("timed out");
1693		} catch (Exception fail) {
1694	<	AssertionFailedError afe =
1745	<	new AssertionFailedError("Unexpected exception: " + fail);
1746	<	afe.initCause(fail);
1747	<	throw afe;
1694	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1695		}
1696		}
1697		}
#	Line 1807 | Line 1754 | public class JSR166TestCase extends Test
1754
1755		@SuppressWarnings("unchecked")
1756		<T> T serialClone(T o) {
1757	+	T clone = null;
1758		try {
1759		ObjectInputStream ois = new ObjectInputStream
1760		(new ByteArrayInputStream(serialBytes(o)));
1761	<	T clone = (T) ois.readObject();
1814	<	if (o == clone) assertImmutable(o);
1815	<	assertSame(o.getClass(), clone.getClass());
1816	<	return clone;
1761	>	clone = (T) ois.readObject();
1762		} catch (Throwable fail) {
1763		threadUnexpectedException(fail);
1819	–	return null;
1764		}
1765	+	if (o == clone) assertImmutable(o);
1766	+	else assertSame(o.getClass(), clone.getClass());
1767	+	return clone;
1768		}
1769
1770		/**
#	Line 1836 | Line 1783 | public class JSR166TestCase extends Test
1783		(new ByteArrayInputStream(bos.toByteArray()));
1784		T clone = (T) ois.readObject();
1785		if (o == clone) assertImmutable(o);
1786	<	assertSame(o.getClass(), clone.getClass());
1786	>	else assertSame(o.getClass(), clone.getClass());
1787		return clone;
1788		}
1789
#	Line 1867 | Line 1814 | public class JSR166TestCase extends Test
1814		try { throwingAction.run(); }
1815		catch (Throwable t) {
1816		threw = true;
1817	<	if (!expectedExceptionClass.isInstance(t)) {
1818	<	AssertionFailedError afe =
1819	<	new AssertionFailedError
1820	<	("Expected " + expectedExceptionClass.getName() +
1821	<	", got " + t.getClass().getName());
1875	<	afe.initCause(t);
1876	<	threadUnexpectedException(afe);
1877	<	}
1817	>	if (!expectedExceptionClass.isInstance(t))
1818	>	throw new AssertionError(
1819	>	"Expected " + expectedExceptionClass.getName() +
1820	>	", got " + t.getClass().getName(),
1821	>	t);
1822		}
1823		if (!threw)
1824		shouldThrow(expectedExceptionClass.getName());
#	Line 2090 | Line 2034 | public class JSR166TestCase extends Test
2034		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2035		assertEquals(savedQueueSize, p.getQueue().size());
2036		}
2037	+
2038	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2039	+	assertEquals(x, y);
2040	+	assertEquals(y, x);
2041	+	assertEquals(x.isEmpty(), y.isEmpty());
2042	+	assertEquals(x.size(), y.size());
2043	+	if (x instanceof List) {
2044	+	assertEquals(x.toString(), y.toString());
2045	+	}
2046	+	if (x instanceof List || x instanceof Set) {
2047	+	assertEquals(x.hashCode(), y.hashCode());
2048	+	}
2049	+	if (x instanceof List || x instanceof Deque) {
2050	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2051	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2052	+	y.toArray(new Object[0])));
2053	+	}
2054	+	}
2055	+
2056	+	/**
2057	+	* A weaker form of assertCollectionsEquals which does not insist
2058	+	* that the two collections satisfy Object#equals(Object), since
2059	+	* they may use identity semantics as Deques do.
2060	+	*/
2061	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2062	+	if (x instanceof List || x instanceof Set)
2063	+	assertCollectionsEquals(x, y);
2064	+	else {
2065	+	assertEquals(x.isEmpty(), y.isEmpty());
2066	+	assertEquals(x.size(), y.size());
2067	+	assertEquals(new HashSet(x), new HashSet(y));
2068	+	if (x instanceof Deque) {
2069	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2070	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2071	+	y.toArray(new Object[0])));
2072	+	}
2073	+	}
2074	+	}
2075		}

Diff Legend

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