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.235 by jsr166, Sat Jul 22 18:23:59 2017 UTC vs.
Revision 1.256 by jsr166, Sun Aug 11 22:29:26 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 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 278 | Line 288 | public class JSR166TestCase extends Test
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 419 | 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",
423	<	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 445 | Line 455 | public class JSR166TestCase extends Test
455		}
456		}
457
458	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
459	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
460	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
461	<	public static boolean atLeastJava9() {
462	<	return JAVA_CLASS_VERSION >= 53.0
463	<	// As of 2015-09, java9 still uses 52.0 class file version
464	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
465	<	}
466	<	public static boolean atLeastJava10() {
467	<	return JAVA_CLASS_VERSION >= 54.0
468	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
469	<	}
458	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
459	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
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 508 | 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 544 | Line 555 | public class JSR166TestCase extends Test
555		"DoubleAdderTest",
556		"ForkJoinPool8Test",
557		"ForkJoinTask8Test",
558	+	"HashMapTest",
559		"LinkedBlockingDeque8Test",
560		"LinkedBlockingQueue8Test",
561	+	"LinkedHashMapTest",
562		"LongAccumulatorTest",
563		"LongAdderTest",
564		"SplittableRandomTest",
#	Line 606 | 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 623 | 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 672 | Line 685 | public class JSR166TestCase extends Test
685		static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
686
687		/**
688	+	* Returns a random boolean; a "coin flip".
689	+	*/
690	+	static boolean randomBoolean() {
691	+	return ThreadLocalRandom.current().nextBoolean();
692	+	}
693	+
694	+	/**
695		* Returns the shortest timed delay. This can be scaled up for
696		* slow machines using the jsr166.delay.factor system property,
697		* or via jtreg's -timeoutFactor: flag.
#	Line 739 | Line 759 | public class JSR166TestCase extends Test
759		String msg = toString() + ": " + String.format(format, args);
760		System.err.println(msg);
761		dumpTestThreads();
762	<	throw new AssertionFailedError(msg);
762	>	throw new AssertionError(msg);
763		}
764
765		/**
#	Line 760 | Line 780 | public class JSR166TestCase extends Test
780		throw (RuntimeException) t;
781		else if (t instanceof Exception)
782		throw (Exception) t;
783	<	else {
784	<	AssertionFailedError afe =
765	<	new AssertionFailedError(t.toString());
766	<	afe.initCause(t);
767	<	throw afe;
768	<	}
783	>	else
784	>	throw new AssertionError(t.toString(), t);
785		}
786
787		if (Thread.interrupted())
#	Line 799 | Line 815 | public class JSR166TestCase extends Test
815
816		/**
817		* Just like fail(reason), but additionally recording (using
818	<	* threadRecordFailure) any AssertionFailedError thrown, so that
819	<	* the current testcase will fail.
818	>	* threadRecordFailure) any AssertionError thrown, so that the
819	>	* current testcase will fail.
820		*/
821		public void threadFail(String reason) {
822		try {
823		fail(reason);
824	<	} catch (AssertionFailedError t) {
825	<	threadRecordFailure(t);
826	<	throw t;
824	>	} catch (AssertionError fail) {
825	>	threadRecordFailure(fail);
826	>	throw fail;
827		}
828		}
829
830		/**
831		* Just like assertTrue(b), but additionally recording (using
832	<	* threadRecordFailure) any AssertionFailedError thrown, so that
833	<	* the current testcase will fail.
832	>	* threadRecordFailure) any AssertionError thrown, so that the
833	>	* current testcase will fail.
834		*/
835		public void threadAssertTrue(boolean b) {
836		try {
837		assertTrue(b);
838	<	} catch (AssertionFailedError t) {
839	<	threadRecordFailure(t);
840	<	throw t;
838	>	} catch (AssertionError fail) {
839	>	threadRecordFailure(fail);
840	>	throw fail;
841		}
842		}
843
844		/**
845		* Just like assertFalse(b), but additionally recording (using
846	<	* threadRecordFailure) any AssertionFailedError thrown, so that
847	<	* the current testcase will fail.
846	>	* threadRecordFailure) any AssertionError thrown, so that the
847	>	* current testcase will fail.
848		*/
849		public void threadAssertFalse(boolean b) {
850		try {
851		assertFalse(b);
852	<	} catch (AssertionFailedError t) {
853	<	threadRecordFailure(t);
854	<	throw t;
852	>	} catch (AssertionError fail) {
853	>	threadRecordFailure(fail);
854	>	throw fail;
855		}
856		}
857
858		/**
859		* Just like assertNull(x), but additionally recording (using
860	<	* threadRecordFailure) any AssertionFailedError thrown, so that
861	<	* the current testcase will fail.
860	>	* threadRecordFailure) any AssertionError thrown, so that the
861	>	* current testcase will fail.
862		*/
863		public void threadAssertNull(Object x) {
864		try {
865		assertNull(x);
866	<	} catch (AssertionFailedError t) {
867	<	threadRecordFailure(t);
868	<	throw t;
866	>	} catch (AssertionError fail) {
867	>	threadRecordFailure(fail);
868	>	throw fail;
869		}
870		}
871
872		/**
873		* Just like assertEquals(x, y), but additionally recording (using
874	<	* threadRecordFailure) any AssertionFailedError thrown, so that
875	<	* the current testcase will fail.
874	>	* threadRecordFailure) any AssertionError thrown, so that the
875	>	* current testcase will fail.
876		*/
877		public void threadAssertEquals(long x, long y) {
878		try {
879		assertEquals(x, y);
880	<	} catch (AssertionFailedError t) {
881	<	threadRecordFailure(t);
882	<	throw t;
880	>	} catch (AssertionError fail) {
881	>	threadRecordFailure(fail);
882	>	throw fail;
883		}
884		}
885
886		/**
887		* Just like assertEquals(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 threadAssertEquals(Object x, Object y) {
892		try {
893		assertEquals(x, y);
894	<	} catch (AssertionFailedError fail) {
894	>	} catch (AssertionError fail) {
895		threadRecordFailure(fail);
896		throw fail;
897		} catch (Throwable fail) {
#	Line 885 | Line 901 | public class JSR166TestCase extends Test
901
902		/**
903		* Just like assertSame(x, y), but additionally recording (using
904	<	* threadRecordFailure) any AssertionFailedError thrown, so that
905	<	* the current testcase will fail.
904	>	* threadRecordFailure) any AssertionError thrown, so that the
905	>	* current testcase will fail.
906		*/
907		public void threadAssertSame(Object x, Object y) {
908		try {
909		assertSame(x, y);
910	<	} catch (AssertionFailedError fail) {
910	>	} catch (AssertionError fail) {
911		threadRecordFailure(fail);
912		throw fail;
913		}
#	Line 913 | Line 929 | public class JSR166TestCase extends Test
929
930		/**
931		* Records the given exception using {@link #threadRecordFailure},
932	<	* then rethrows the exception, wrapping it in an
933	<	* AssertionFailedError if necessary.
932	>	* then rethrows the exception, wrapping it in an AssertionError
933	>	* if necessary.
934		*/
935		public void threadUnexpectedException(Throwable t) {
936		threadRecordFailure(t);
#	Line 923 | Line 939 | public class JSR166TestCase extends Test
939		throw (RuntimeException) t;
940		else if (t instanceof Error)
941		throw (Error) t;
942	<	else {
943	<	AssertionFailedError afe =
928	<	new AssertionFailedError("unexpected exception: " + t);
929	<	afe.initCause(t);
930	<	throw afe;
931	<	}
942	>	else
943	>	throw new AssertionError("unexpected exception: " + t, t);
944		}
945
946		/**
#	Line 1104 | Line 1116 | public class JSR166TestCase extends Test
1116		for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1117		try { delay(1); }
1118		catch (InterruptedException fail) {
1119	<	fail("Unexpected InterruptedException");
1119	>	throw new AssertionError("Unexpected InterruptedException", fail);
1120		}
1121		Thread.State s = thread.getState();
1122		if (s == expected)
#	Line 1290 | Line 1302 | public class JSR166TestCase extends Test
1302
1303		/**
1304		* Sleeps until the given time has elapsed.
1305	<	* Throws AssertionFailedError if interrupted.
1305	>	* Throws AssertionError if interrupted.
1306		*/
1307		static void sleep(long millis) {
1308		try {
1309		delay(millis);
1310		} catch (InterruptedException fail) {
1311	<	AssertionFailedError afe =
1300	<	new AssertionFailedError("Unexpected InterruptedException");
1301	<	afe.initCause(fail);
1302	<	throw afe;
1311	>	throw new AssertionError("Unexpected InterruptedException", fail);
1312		}
1313		}
1314
1315		/**
1316		* Spin-waits up to the specified number of milliseconds for the given
1317		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1318	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1319		*/
1320	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
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	<	return;
1328	<	else if (s == Thread.State.TERMINATED)
1320	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1321	>	Callable<Boolean> waitingForGodot) {
1322	>	for (long startTime = 0L;;) {
1323	>	switch (thread.getState()) {
1324	>	default: break;
1325	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1326	>	try {
1327	>	if (waitingForGodot == null || waitingForGodot.call())
1328	>	return;
1329	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1330	>	break;
1331	>	case TERMINATED:
1332		fail("Unexpected thread termination");
1333	<	else if (startTime == 0L)
1333	>	}
1334	>
1335	>	if (startTime == 0L)
1336		startTime = System.nanoTime();
1337		else if (millisElapsedSince(startTime) > timeoutMillis) {
1338	<	threadAssertTrue(thread.isAlive());
1339	<	fail("timed out waiting for thread to enter wait state");
1338	>	assertTrue(thread.isAlive());
1339	>	if (waitingForGodot == null
1340	>	|| thread.getState() == Thread.State.RUNNABLE)
1341	>	fail("timed out waiting for thread to enter wait state");
1342	>	else
1343	>	fail("timed out waiting for condition, thread state="
1344	>	+ thread.getState());
1345		}
1346		Thread.yield();
1347		}
#	Line 1329 | Line 1349 | public class JSR166TestCase extends Test
1349
1350		/**
1351		* Spin-waits up to the specified number of milliseconds for the given
1352	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1333	<	* and additionally satisfy the given condition.
1352	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1353		*/
1354	<	void waitForThreadToEnterWaitState(
1355	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1337	<	long startTime = 0L;
1338	<	for (;;) {
1339	<	Thread.State s = thread.getState();
1340	<	if (s == Thread.State.BLOCKED ||
1341	<	s == Thread.State.WAITING ||
1342	<	s == Thread.State.TIMED_WAITING) {
1343	<	try {
1344	<	if (waitingForGodot.call())
1345	<	return;
1346	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1347	<	}
1348	<	else if (s == Thread.State.TERMINATED)
1349	<	fail("Unexpected thread termination");
1350	<	else if (startTime == 0L)
1351	<	startTime = System.nanoTime();
1352	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1353	<	threadAssertTrue(thread.isAlive());
1354	<	fail("timed out waiting for thread to enter wait state");
1355	<	}
1356	<	Thread.yield();
1357	<	}
1354	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1355	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1356		}
1357
1358		/**
#	Line 1362 | Line 1360 | public class JSR166TestCase extends Test
1360		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1361		*/
1362		void waitForThreadToEnterWaitState(Thread thread) {
1363	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1363	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1364		}
1365
1366		/**
#	Line 1370 | Line 1368 | public class JSR166TestCase extends Test
1368		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1369		* and additionally satisfy the given condition.
1370		*/
1371	<	void waitForThreadToEnterWaitState(
1372	<	Thread thread, Callable<Boolean> waitingForGodot) {
1371	>	void waitForThreadToEnterWaitState(Thread thread,
1372	>	Callable<Boolean> waitingForGodot) {
1373		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1374		}
1375
#	Line 1390 | Line 1388 | public class JSR166TestCase extends Test
1388		//             r.run();
1389		//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1390		//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1391	<	//             throw new AssertionFailedError("did not return promptly");
1391	>	//             throw new AssertionError("did not return promptly");
1392		//     }
1393
1394		//     void assertTerminatesPromptly(Runnable r) {
#	Line 1403 | Line 1401 | public class JSR166TestCase extends Test
1401		*/
1402		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1403		long startTime = System.nanoTime();
1404	+	T actual = null;
1405		try {
1406	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1406	>	actual = f.get(timeoutMillis, MILLISECONDS);
1407		} catch (Throwable fail) { threadUnexpectedException(fail); }
1408	+	assertEquals(expectedValue, actual);
1409		if (millisElapsedSince(startTime) > timeoutMillis/2)
1410	<	throw new AssertionFailedError("timed get did not return promptly");
1410	>	throw new AssertionError("timed get did not return promptly");
1411		}
1412
1413		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1465 | Line 1465 | public class JSR166TestCase extends Test
1465		}
1466		}
1467
1468	–	public abstract class RunnableShouldThrow implements Runnable {
1469	–	protected abstract void realRun() throws Throwable;
1470	–
1471	–	final Class<?> exceptionClass;
1472	–
1473	–	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1474	–	this.exceptionClass = exceptionClass;
1475	–	}
1476	–
1477	–	public final void run() {
1478	–	try {
1479	–	realRun();
1480	–	threadShouldThrow(exceptionClass.getSimpleName());
1481	–	} catch (Throwable t) {
1482	–	if (! exceptionClass.isInstance(t))
1483	–	threadUnexpectedException(t);
1484	–	}
1485	–	}
1486	–	}
1487	–
1468		public abstract class ThreadShouldThrow extends Thread {
1469		protected abstract void realRun() throws Throwable;
1470
#	Line 1497 | Line 1477 | public class JSR166TestCase extends Test
1477		public final void run() {
1478		try {
1479		realRun();
1500	–	threadShouldThrow(exceptionClass.getSimpleName());
1480		} catch (Throwable t) {
1481		if (! exceptionClass.isInstance(t))
1482		threadUnexpectedException(t);
1483	+	return;
1484		}
1485	+	threadShouldThrow(exceptionClass.getSimpleName());
1486		}
1487		}
1488
#	Line 1511 | Line 1492 | public class JSR166TestCase extends Test
1492		public final void run() {
1493		try {
1494		realRun();
1514	–	threadShouldThrow("InterruptedException");
1495		} catch (InterruptedException success) {
1496		threadAssertFalse(Thread.interrupted());
1497	+	return;
1498		} catch (Throwable fail) {
1499		threadUnexpectedException(fail);
1500		}
1501	+	threadShouldThrow("InterruptedException");
1502		}
1503		}
1504
#	Line 1528 | Line 1510 | public class JSR166TestCase extends Test
1510		return realCall();
1511		} catch (Throwable fail) {
1512		threadUnexpectedException(fail);
1531	–	return null;
1532	–	}
1533	–	}
1534	–	}
1535	–
1536	–	public abstract class CheckedInterruptedCallable<T>
1537	–	implements Callable<T> {
1538	–	protected abstract T realCall() throws Throwable;
1539	–
1540	–	public final T call() {
1541	–	try {
1542	–	T result = realCall();
1543	–	threadShouldThrow("InterruptedException");
1544	–	return result;
1545	–	} catch (InterruptedException success) {
1546	–	threadAssertFalse(Thread.interrupted());
1547	–	} catch (Throwable fail) {
1548	–	threadUnexpectedException(fail);
1513		}
1514	<	return null;
1514	>	throw new AssertionError("unreached");
1515		}
1516		}
1517
#	Line 1604 | Line 1568 | public class JSR166TestCase extends Test
1568		}
1569
1570		public void await(CountDownLatch latch, long timeoutMillis) {
1571	+	boolean timedOut = false;
1572		try {
1573	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1609	<	fail("timed out waiting for CountDownLatch for "
1610	<	+ (timeoutMillis/1000) + " sec");
1573	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1574		} catch (Throwable fail) {
1575		threadUnexpectedException(fail);
1576		}
1577	+	if (timedOut)
1578	+	fail("timed out waiting for CountDownLatch for "
1579	+	+ (timeoutMillis/1000) + " sec");
1580		}
1581
1582		public void await(CountDownLatch latch) {
#	Line 1618 | Line 1584 | public class JSR166TestCase extends Test
1584		}
1585
1586		public void await(Semaphore semaphore) {
1587	+	boolean timedOut = false;
1588		try {
1589	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1623	<	fail("timed out waiting for Semaphore for "
1624	<	+ (LONG_DELAY_MS/1000) + " sec");
1589	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1590		} catch (Throwable fail) {
1591		threadUnexpectedException(fail);
1592		}
1593	+	if (timedOut)
1594	+	fail("timed out waiting for Semaphore for "
1595	+	+ (LONG_DELAY_MS/1000) + " sec");
1596		}
1597
1598		public void await(CyclicBarrier barrier) {
#	Line 1649 | Line 1617 | public class JSR166TestCase extends Test
1617		//         long startTime = System.nanoTime();
1618		//         while (!flag.get()) {
1619		//             if (millisElapsedSince(startTime) > timeoutMillis)
1620	<	//                 throw new AssertionFailedError("timed out");
1620	>	//                 throw new AssertionError("timed out");
1621		//             Thread.yield();
1622		//         }
1623		//     }
#	Line 1658 | Line 1626 | public class JSR166TestCase extends Test
1626		public String call() { throw new NullPointerException(); }
1627		}
1628
1661	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1662	–	protected void realRun() {
1663	–	try {
1664	–	delay(SMALL_DELAY_MS);
1665	–	} catch (InterruptedException ok) {}
1666	–	}
1667	–	}
1668	–
1629		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1630		return new CheckedRunnable() {
1631		protected void realRun() {
#	Line 1721 | Line 1681 | public class JSR166TestCase extends Test
1681		return realCompute();
1682		} catch (Throwable fail) {
1683		threadUnexpectedException(fail);
1724	–	return null;
1684		}
1685	+	throw new AssertionError("unreached");
1686		}
1687		}
1688
#	Line 1736 | Line 1696 | public class JSR166TestCase extends Test
1696
1697		/**
1698		* A CyclicBarrier that uses timed await and fails with
1699	<	* AssertionFailedErrors instead of throwing checked exceptions.
1699	>	* AssertionErrors instead of throwing checked exceptions.
1700		*/
1701		public static class CheckedBarrier extends CyclicBarrier {
1702		public CheckedBarrier(int parties) { super(parties); }
#	Line 1745 | Line 1705 | public class JSR166TestCase extends Test
1705		try {
1706		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1707		} catch (TimeoutException timedOut) {
1708	<	throw new AssertionFailedError("timed out");
1708	>	throw new AssertionError("timed out");
1709		} catch (Exception fail) {
1710	<	AssertionFailedError afe =
1751	<	new AssertionFailedError("Unexpected exception: " + fail);
1752	<	afe.initCause(fail);
1753	<	throw afe;
1710	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1711		}
1712		}
1713		}
#	Line 1802 | Line 1759 | public class JSR166TestCase extends Test
1759		}
1760		}
1761
1762	<	void assertImmutable(final Object o) {
1762	>	void assertImmutable(Object o) {
1763		if (o instanceof Collection) {
1764		assertThrows(
1765		UnsupportedOperationException.class,
1766	<	new Runnable() { public void run() {
1810	<	((Collection) o).add(null);}});
1766	>	() -> ((Collection) o).add(null));
1767		}
1768		}
1769
1770		@SuppressWarnings("unchecked")
1771		<T> T serialClone(T o) {
1772	+	T clone = null;
1773		try {
1774		ObjectInputStream ois = new ObjectInputStream
1775		(new ByteArrayInputStream(serialBytes(o)));
1776	<	T clone = (T) ois.readObject();
1820	<	if (o == clone) assertImmutable(o);
1821	<	assertSame(o.getClass(), clone.getClass());
1822	<	return clone;
1776	>	clone = (T) ois.readObject();
1777		} catch (Throwable fail) {
1778		threadUnexpectedException(fail);
1825	–	return null;
1779		}
1780	+	if (o == clone) assertImmutable(o);
1781	+	else assertSame(o.getClass(), clone.getClass());
1782	+	return clone;
1783		}
1784
1785		/**
#	Line 1842 | Line 1798 | public class JSR166TestCase extends Test
1798		(new ByteArrayInputStream(bos.toByteArray()));
1799		T clone = (T) ois.readObject();
1800		if (o == clone) assertImmutable(o);
1801	<	assertSame(o.getClass(), clone.getClass());
1801	>	else assertSame(o.getClass(), clone.getClass());
1802		return clone;
1803		}
1804
#	Line 1867 | Line 1823 | public class JSR166TestCase extends Test
1823		}
1824
1825		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1826	<	Runnable... throwingActions) {
1827	<	for (Runnable throwingAction : throwingActions) {
1826	>	Action... throwingActions) {
1827	>	for (Action throwingAction : throwingActions) {
1828		boolean threw = false;
1829		try { throwingAction.run(); }
1830		catch (Throwable t) {
1831		threw = true;
1832	<	if (!expectedExceptionClass.isInstance(t)) {
1833	<	AssertionFailedError afe =
1834	<	new AssertionFailedError
1835	<	("Expected " + expectedExceptionClass.getName() +
1836	<	", got " + t.getClass().getName());
1881	<	afe.initCause(t);
1882	<	threadUnexpectedException(afe);
1883	<	}
1832	>	if (!expectedExceptionClass.isInstance(t))
1833	>	throw new AssertionError(
1834	>	"Expected " + expectedExceptionClass.getName() +
1835	>	", got " + t.getClass().getName(),
1836	>	t);
1837		}
1838		if (!threw)
1839		shouldThrow(expectedExceptionClass.getName());
#	Line 1913 | Line 1866 | public class JSR166TestCase extends Test
1866		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1867		}
1868
1869	+	/**
1870	+	* Returns the same String as would be returned by {@link
1871	+	* Object#toString}, whether or not the given object's class
1872	+	* overrides toString().
1873	+	*
1874	+	* @see System#identityHashCode
1875	+	*/
1876	+	static String identityString(Object x) {
1877	+	return x.getClass().getName()
1878	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1879	+	}
1880	+
1881		// --- Shared assertions for Executor tests ---
1882
1883		/**
#	Line 2084 | Line 2049 | public class JSR166TestCase extends Test
2049		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2050		assertEquals(savedQueueSize, p.getQueue().size());
2051		}
2052	+
2053	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2054	+	assertEquals(x, y);
2055	+	assertEquals(y, x);
2056	+	assertEquals(x.isEmpty(), y.isEmpty());
2057	+	assertEquals(x.size(), y.size());
2058	+	if (x instanceof List) {
2059	+	assertEquals(x.toString(), y.toString());
2060	+	}
2061	+	if (x instanceof List || x instanceof Set) {
2062	+	assertEquals(x.hashCode(), y.hashCode());
2063	+	}
2064	+	if (x instanceof List || x instanceof Deque) {
2065	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2066	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2067	+	y.toArray(new Object[0])));
2068	+	}
2069	+	}
2070	+
2071	+	/**
2072	+	* A weaker form of assertCollectionsEquals which does not insist
2073	+	* that the two collections satisfy Object#equals(Object), since
2074	+	* they may use identity semantics as Deques do.
2075	+	*/
2076	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2077	+	if (x instanceof List || x instanceof Set)
2078	+	assertCollectionsEquals(x, y);
2079	+	else {
2080	+	assertEquals(x.isEmpty(), y.isEmpty());
2081	+	assertEquals(x.size(), y.size());
2082	+	assertEquals(new HashSet(x), new HashSet(y));
2083	+	if (x instanceof Deque) {
2084	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2085	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2086	+	y.toArray(new Object[0])));
2087	+	}
2088	+	}
2089	+	}
2090		}

Diff Legend

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