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.237 by jsr166, Wed Aug 23 05:33:00 2017 UTC vs.
Revision 1.249 by jsr166, Sat Nov 24 21:41:20 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 445 | Line 454 | public class JSR166TestCase extends Test
454		}
455		}
456
457	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
458	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
459	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
460	<	public static boolean atLeastJava9() {
461	<	return JAVA_CLASS_VERSION >= 53.0
462	<	// As of 2015-09, java9 still uses 52.0 class file version
454	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
455	<	}
456	<	public static boolean atLeastJava10() {
457	<	return JAVA_CLASS_VERSION >= 54.0
458	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
459	<	}
457	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
458	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
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 607 | 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 624 | 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 740 | 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 761 | 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 =
766	<	new AssertionFailedError(t.toString());
767	<	afe.initCause(t);
768	<	throw afe;
769	<	}
767	>	else
768	>	throw new AssertionError(t.toString(), t);
769		}
770
771		if (Thread.interrupted())
#	Line 800 | 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 886 | 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 914 | 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 924 | 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 =
929	<	new AssertionFailedError("unexpected exception: " + t);
930	<	afe.initCause(t);
931	<	throw afe;
932	<	}
926	>	else
927	>	throw new AssertionError("unexpected exception: " + t, t);
928		}
929
930		/**
#	Line 1105 | 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 1291 | 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 =
1301	<	new AssertionFailedError("Unexpected InterruptedException");
1302	<	afe.initCause(fail);
1303	<	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	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1309	>	try {
1310	>	if (waitingForGodot == null || waitingForGodot.call())
1311	>	return;
1312	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1313	>	break;
1314	>	case TERMINATED:
1315		fail("Unexpected thread termination");
1316	<	else if (startTime == 0L)
1316	>	}
1317	>
1318	>	if (startTime == 0L)
1319		startTime = System.nanoTime();
1320		else if (millisElapsedSince(startTime) > timeoutMillis) {
1321	<	threadAssertTrue(thread.isAlive());
1322	<	fail("timed out waiting for thread to enter wait state");
1321	>	assertTrue(thread.isAlive());
1322	>	if (waitingForGodot == null
1323	>	|| thread.getState() == Thread.State.RUNNABLE)
1324	>	fail("timed out waiting for thread to enter wait state");
1325	>	else
1326	>	fail("timed out waiting for condition, thread state="
1327	>	+ thread.getState());
1328		}
1329		Thread.yield();
1330		}
#	Line 1330 | Line 1332 | public class JSR166TestCase extends Test
1332
1333		/**
1334		* Spin-waits up to the specified number of milliseconds for the given
1335	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1334	<	* and additionally satisfy the given condition.
1335	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1336		*/
1337	<	void waitForThreadToEnterWaitState(
1338	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1338	<	long startTime = 0L;
1339	<	for (;;) {
1340	<	Thread.State s = thread.getState();
1341	<	if (s == Thread.State.BLOCKED ||
1342	<	s == Thread.State.WAITING ||
1343	<	s == Thread.State.TIMED_WAITING) {
1344	<	try {
1345	<	if (waitingForGodot.call())
1346	<	return;
1347	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1348	<	}
1349	<	else if (s == Thread.State.TERMINATED)
1350	<	fail("Unexpected thread termination");
1351	<	else if (startTime == 0L)
1352	<	startTime = System.nanoTime();
1353	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1354	<	threadAssertTrue(thread.isAlive());
1355	<	fail("timed out waiting for thread to enter wait state");
1356	<	}
1357	<	Thread.yield();
1358	<	}
1337	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1338	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1339		}
1340
1341		/**
#	Line 1363 | Line 1343 | public class JSR166TestCase extends Test
1343		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1344		*/
1345		void waitForThreadToEnterWaitState(Thread thread) {
1346	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1346	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1347		}
1348
1349		/**
#	Line 1371 | Line 1351 | public class JSR166TestCase extends Test
1351		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1352		* and additionally satisfy the given condition.
1353		*/
1354	<	void waitForThreadToEnterWaitState(
1355	<	Thread thread, Callable<Boolean> waitingForGodot) {
1354	>	void waitForThreadToEnterWaitState(Thread thread,
1355	>	Callable<Boolean> waitingForGodot) {
1356		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1357		}
1358
#	Line 1391 | Line 1371 | public class JSR166TestCase extends Test
1371		//             r.run();
1372		//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1373		//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1374	<	//             throw new AssertionFailedError("did not return promptly");
1374	>	//             throw new AssertionError("did not return promptly");
1375		//     }
1376
1377		//     void assertTerminatesPromptly(Runnable r) {
#	Line 1404 | Line 1384 | public class JSR166TestCase extends Test
1384		*/
1385		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1386		long startTime = System.nanoTime();
1387	+	T actual = null;
1388		try {
1389	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1389	>	actual = f.get(timeoutMillis, MILLISECONDS);
1390		} catch (Throwable fail) { threadUnexpectedException(fail); }
1391	+	assertEquals(expectedValue, actual);
1392		if (millisElapsedSince(startTime) > timeoutMillis/2)
1393	<	throw new AssertionFailedError("timed get did not return promptly");
1393	>	throw new AssertionError("timed get did not return promptly");
1394		}
1395
1396		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1466 | Line 1448 | public class JSR166TestCase extends Test
1448		}
1449		}
1450
1469	–	public abstract class RunnableShouldThrow implements Runnable {
1470	–	protected abstract void realRun() throws Throwable;
1471	–
1472	–	final Class<?> exceptionClass;
1473	–
1474	–	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1475	–	this.exceptionClass = exceptionClass;
1476	–	}
1477	–
1478	–	public final void run() {
1479	–	try {
1480	–	realRun();
1481	–	threadShouldThrow(exceptionClass.getSimpleName());
1482	–	} catch (Throwable t) {
1483	–	if (! exceptionClass.isInstance(t))
1484	–	threadUnexpectedException(t);
1485	–	}
1486	–	}
1487	–	}
1488	–
1451		public abstract class ThreadShouldThrow extends Thread {
1452		protected abstract void realRun() throws Throwable;
1453
#	Line 1498 | Line 1460 | public class JSR166TestCase extends Test
1460		public final void run() {
1461		try {
1462		realRun();
1501	–	threadShouldThrow(exceptionClass.getSimpleName());
1463		} catch (Throwable t) {
1464		if (! exceptionClass.isInstance(t))
1465		threadUnexpectedException(t);
1466	+	return;
1467		}
1468	+	threadShouldThrow(exceptionClass.getSimpleName());
1469		}
1470		}
1471
#	Line 1512 | Line 1475 | public class JSR166TestCase extends Test
1475		public final void run() {
1476		try {
1477		realRun();
1515	–	threadShouldThrow("InterruptedException");
1478		} catch (InterruptedException success) {
1479		threadAssertFalse(Thread.interrupted());
1480	+	return;
1481		} catch (Throwable fail) {
1482		threadUnexpectedException(fail);
1483		}
1484	+	threadShouldThrow("InterruptedException");
1485		}
1486		}
1487
#	Line 1529 | Line 1493 | public class JSR166TestCase extends Test
1493		return realCall();
1494		} catch (Throwable fail) {
1495		threadUnexpectedException(fail);
1532	–	return null;
1496		}
1497	<	}
1535	<	}
1536	<
1537	<	public abstract class CheckedInterruptedCallable<T>
1538	<	implements Callable<T> {
1539	<	protected abstract T realCall() throws Throwable;
1540	<
1541	<	public final T call() {
1542	<	try {
1543	<	T result = realCall();
1544	<	threadShouldThrow("InterruptedException");
1545	<	return result;
1546	<	} catch (InterruptedException success) {
1547	<	threadAssertFalse(Thread.interrupted());
1548	<	} catch (Throwable fail) {
1549	<	threadUnexpectedException(fail);
1550	<	}
1551	<	return null;
1497	>	throw new AssertionError("unreached");
1498		}
1499		}
1500
#	Line 1605 | Line 1551 | public class JSR166TestCase extends Test
1551		}
1552
1553		public void await(CountDownLatch latch, long timeoutMillis) {
1554	+	boolean timedOut = false;
1555		try {
1556	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1610	<	fail("timed out waiting for CountDownLatch for "
1611	<	+ (timeoutMillis/1000) + " sec");
1556	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1557		} catch (Throwable fail) {
1558		threadUnexpectedException(fail);
1559		}
1560	+	if (timedOut)
1561	+	fail("timed out waiting for CountDownLatch for "
1562	+	+ (timeoutMillis/1000) + " sec");
1563		}
1564
1565		public void await(CountDownLatch latch) {
#	Line 1619 | Line 1567 | public class JSR166TestCase extends Test
1567		}
1568
1569		public void await(Semaphore semaphore) {
1570	+	boolean timedOut = false;
1571		try {
1572	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1624	<	fail("timed out waiting for Semaphore for "
1625	<	+ (LONG_DELAY_MS/1000) + " sec");
1572	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1573		} catch (Throwable fail) {
1574		threadUnexpectedException(fail);
1575		}
1576	+	if (timedOut)
1577	+	fail("timed out waiting for Semaphore for "
1578	+	+ (LONG_DELAY_MS/1000) + " sec");
1579		}
1580
1581		public void await(CyclicBarrier barrier) {
#	Line 1650 | Line 1600 | public class JSR166TestCase extends Test
1600		//         long startTime = System.nanoTime();
1601		//         while (!flag.get()) {
1602		//             if (millisElapsedSince(startTime) > timeoutMillis)
1603	<	//                 throw new AssertionFailedError("timed out");
1603	>	//                 throw new AssertionError("timed out");
1604		//             Thread.yield();
1605		//         }
1606		//     }
#	Line 1659 | Line 1609 | public class JSR166TestCase extends Test
1609		public String call() { throw new NullPointerException(); }
1610		}
1611
1662	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1663	–	protected void realRun() {
1664	–	try {
1665	–	delay(SMALL_DELAY_MS);
1666	–	} catch (InterruptedException ok) {}
1667	–	}
1668	–	}
1669	–
1612		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1613		return new CheckedRunnable() {
1614		protected void realRun() {
#	Line 1722 | Line 1664 | public class JSR166TestCase extends Test
1664		return realCompute();
1665		} catch (Throwable fail) {
1666		threadUnexpectedException(fail);
1725	–	return null;
1667		}
1668	+	throw new AssertionError("unreached");
1669		}
1670		}
1671
#	Line 1737 | Line 1679 | public class JSR166TestCase extends Test
1679
1680		/**
1681		* A CyclicBarrier that uses timed await and fails with
1682	<	* AssertionFailedErrors instead of throwing checked exceptions.
1682	>	* AssertionErrors instead of throwing checked exceptions.
1683		*/
1684		public static class CheckedBarrier extends CyclicBarrier {
1685		public CheckedBarrier(int parties) { super(parties); }
#	Line 1746 | Line 1688 | public class JSR166TestCase extends Test
1688		try {
1689		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1690		} catch (TimeoutException timedOut) {
1691	<	throw new AssertionFailedError("timed out");
1691	>	throw new AssertionError("timed out");
1692		} catch (Exception fail) {
1693	<	AssertionFailedError afe =
1752	<	new AssertionFailedError("Unexpected exception: " + fail);
1753	<	afe.initCause(fail);
1754	<	throw afe;
1693	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1694		}
1695		}
1696		}
#	Line 1814 | Line 1753 | public class JSR166TestCase extends Test
1753
1754		@SuppressWarnings("unchecked")
1755		<T> T serialClone(T o) {
1756	+	T clone = null;
1757		try {
1758		ObjectInputStream ois = new ObjectInputStream
1759		(new ByteArrayInputStream(serialBytes(o)));
1760	<	T clone = (T) ois.readObject();
1821	<	if (o == clone) assertImmutable(o);
1822	<	assertSame(o.getClass(), clone.getClass());
1823	<	return clone;
1760	>	clone = (T) ois.readObject();
1761		} catch (Throwable fail) {
1762		threadUnexpectedException(fail);
1826	–	return null;
1763		}
1764	+	if (o == clone) assertImmutable(o);
1765	+	else assertSame(o.getClass(), clone.getClass());
1766	+	return clone;
1767		}
1768
1769		/**
#	Line 1843 | Line 1782 | public class JSR166TestCase extends Test
1782		(new ByteArrayInputStream(bos.toByteArray()));
1783		T clone = (T) ois.readObject();
1784		if (o == clone) assertImmutable(o);
1785	<	assertSame(o.getClass(), clone.getClass());
1785	>	else assertSame(o.getClass(), clone.getClass());
1786		return clone;
1787		}
1788
#	Line 1874 | Line 1813 | public class JSR166TestCase extends Test
1813		try { throwingAction.run(); }
1814		catch (Throwable t) {
1815		threw = true;
1816	<	if (!expectedExceptionClass.isInstance(t)) {
1817	<	AssertionFailedError afe =
1818	<	new AssertionFailedError
1819	<	("Expected " + expectedExceptionClass.getName() +
1820	<	", got " + t.getClass().getName());
1882	<	afe.initCause(t);
1883	<	threadUnexpectedException(afe);
1884	<	}
1816	>	if (!expectedExceptionClass.isInstance(t))
1817	>	throw new AssertionError(
1818	>	"Expected " + expectedExceptionClass.getName() +
1819	>	", got " + t.getClass().getName(),
1820	>	t);
1821		}
1822		if (!threw)
1823		shouldThrow(expectedExceptionClass.getName());
#	Line 2097 | Line 2033 | public class JSR166TestCase extends Test
2033		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2034		assertEquals(savedQueueSize, p.getQueue().size());
2035		}
2036	+
2037	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2038	+	assertEquals(x, y);
2039	+	assertEquals(y, x);
2040	+	assertEquals(x.isEmpty(), y.isEmpty());
2041	+	assertEquals(x.size(), y.size());
2042	+	if (x instanceof List) {
2043	+	assertEquals(x.toString(), y.toString());
2044	+	}
2045	+	if (x instanceof List || x instanceof Set) {
2046	+	assertEquals(x.hashCode(), y.hashCode());
2047	+	}
2048	+	if (x instanceof List || x instanceof Deque) {
2049	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2050	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2051	+	y.toArray(new Object[0])));
2052	+	}
2053	+	}
2054	+
2055	+	/**
2056	+	* A weaker form of assertCollectionsEquals which does not insist
2057	+	* that the two collections satisfy Object#equals(Object), since
2058	+	* they may use identity semantics as Deques do.
2059	+	*/
2060	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2061	+	if (x instanceof List || x instanceof Set)
2062	+	assertCollectionsEquals(x, y);
2063	+	else {
2064	+	assertEquals(x.isEmpty(), y.isEmpty());
2065	+	assertEquals(x.size(), y.size());
2066	+	assertEquals(new HashSet(x), new HashSet(y));
2067	+	if (x instanceof Deque) {
2068	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2069	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2070	+	y.toArray(new Object[0])));
2071	+	}
2072	+	}
2073	+	}
2074		}

Diff Legend

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