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.234 by jsr166, Mon Jul 17 22:27:31 2017 UTC vs.
Revision 1.260 by jsr166, Thu Sep 5 17:27:07 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 a random element from given choices.
696	+	*/
697	+	<T> T chooseRandomly(T... choices) {
698	+	return choices[ThreadLocalRandom.current().nextInt(choices.length)];
699	+	}
700	+
701	+	/**
702		* Returns the shortest timed delay. This can be scaled up for
703		* slow machines using the jsr166.delay.factor system property,
704		* or via jtreg's -timeoutFactor: flag.
#	Line 727 | Line 754 | public class JSR166TestCase extends Test
754		*/
755		public void threadRecordFailure(Throwable t) {
756		System.err.println(t);
757	<	dumpTestThreads();
758	<	threadFailure.compareAndSet(null, t);
757	>	if (threadFailure.compareAndSet(null, t))
758	>	dumpTestThreads();
759		}
760
761		public void setUp() {
#	Line 739 | Line 766 | public class JSR166TestCase extends Test
766		String msg = toString() + ": " + String.format(format, args);
767		System.err.println(msg);
768		dumpTestThreads();
769	<	throw new AssertionFailedError(msg);
769	>	throw new AssertionError(msg);
770		}
771
772		/**
#	Line 760 | Line 787 | public class JSR166TestCase extends Test
787		throw (RuntimeException) t;
788		else if (t instanceof Exception)
789		throw (Exception) t;
790	<	else {
791	<	AssertionFailedError afe =
765	<	new AssertionFailedError(t.toString());
766	<	afe.initCause(t);
767	<	throw afe;
768	<	}
790	>	else
791	>	throw new AssertionError(t.toString(), t);
792		}
793
794		if (Thread.interrupted())
#	Line 799 | Line 822 | public class JSR166TestCase extends Test
822
823		/**
824		* Just like fail(reason), but additionally recording (using
825	<	* threadRecordFailure) any AssertionFailedError thrown, so that
826	<	* the current testcase will fail.
825	>	* threadRecordFailure) any AssertionError thrown, so that the
826	>	* current testcase will fail.
827		*/
828		public void threadFail(String reason) {
829		try {
830		fail(reason);
831	<	} catch (AssertionFailedError t) {
832	<	threadRecordFailure(t);
833	<	throw t;
831	>	} catch (AssertionError fail) {
832	>	threadRecordFailure(fail);
833	>	throw fail;
834		}
835		}
836
837		/**
838		* Just like assertTrue(b), but additionally recording (using
839	<	* threadRecordFailure) any AssertionFailedError thrown, so that
840	<	* the current testcase will fail.
839	>	* threadRecordFailure) any AssertionError thrown, so that the
840	>	* current testcase will fail.
841		*/
842		public void threadAssertTrue(boolean b) {
843		try {
844		assertTrue(b);
845	<	} catch (AssertionFailedError t) {
846	<	threadRecordFailure(t);
847	<	throw t;
845	>	} catch (AssertionError fail) {
846	>	threadRecordFailure(fail);
847	>	throw fail;
848		}
849		}
850
851		/**
852		* Just like assertFalse(b), but additionally recording (using
853	<	* threadRecordFailure) any AssertionFailedError thrown, so that
854	<	* the current testcase will fail.
853	>	* threadRecordFailure) any AssertionError thrown, so that the
854	>	* current testcase will fail.
855		*/
856		public void threadAssertFalse(boolean b) {
857		try {
858		assertFalse(b);
859	<	} catch (AssertionFailedError t) {
860	<	threadRecordFailure(t);
861	<	throw t;
859	>	} catch (AssertionError fail) {
860	>	threadRecordFailure(fail);
861	>	throw fail;
862		}
863		}
864
865		/**
866		* Just like assertNull(x), but additionally recording (using
867	<	* threadRecordFailure) any AssertionFailedError thrown, so that
868	<	* the current testcase will fail.
867	>	* threadRecordFailure) any AssertionError thrown, so that the
868	>	* current testcase will fail.
869		*/
870		public void threadAssertNull(Object x) {
871		try {
872		assertNull(x);
873	<	} catch (AssertionFailedError t) {
874	<	threadRecordFailure(t);
875	<	throw t;
873	>	} catch (AssertionError fail) {
874	>	threadRecordFailure(fail);
875	>	throw fail;
876		}
877		}
878
879		/**
880		* Just like assertEquals(x, y), but additionally recording (using
881	<	* threadRecordFailure) any AssertionFailedError thrown, so that
882	<	* the current testcase will fail.
881	>	* threadRecordFailure) any AssertionError thrown, so that the
882	>	* current testcase will fail.
883		*/
884		public void threadAssertEquals(long x, long y) {
885		try {
886		assertEquals(x, y);
887	<	} catch (AssertionFailedError t) {
888	<	threadRecordFailure(t);
889	<	throw t;
887	>	} catch (AssertionError fail) {
888	>	threadRecordFailure(fail);
889	>	throw fail;
890		}
891		}
892
893		/**
894		* Just like assertEquals(x, y), but additionally recording (using
895	<	* threadRecordFailure) any AssertionFailedError thrown, so that
896	<	* the current testcase will fail.
895	>	* threadRecordFailure) any AssertionError thrown, so that the
896	>	* current testcase will fail.
897		*/
898		public void threadAssertEquals(Object x, Object y) {
899		try {
900		assertEquals(x, y);
901	<	} catch (AssertionFailedError fail) {
901	>	} catch (AssertionError fail) {
902		threadRecordFailure(fail);
903		throw fail;
904		} catch (Throwable fail) {
#	Line 885 | Line 908 | public class JSR166TestCase extends Test
908
909		/**
910		* Just like assertSame(x, y), but additionally recording (using
911	<	* threadRecordFailure) any AssertionFailedError thrown, so that
912	<	* the current testcase will fail.
911	>	* threadRecordFailure) any AssertionError thrown, so that the
912	>	* current testcase will fail.
913		*/
914		public void threadAssertSame(Object x, Object y) {
915		try {
916		assertSame(x, y);
917	<	} catch (AssertionFailedError fail) {
917	>	} catch (AssertionError fail) {
918		threadRecordFailure(fail);
919		throw fail;
920		}
#	Line 913 | Line 936 | public class JSR166TestCase extends Test
936
937		/**
938		* Records the given exception using {@link #threadRecordFailure},
939	<	* then rethrows the exception, wrapping it in an
940	<	* AssertionFailedError if necessary.
939	>	* then rethrows the exception, wrapping it in an AssertionError
940	>	* if necessary.
941		*/
942		public void threadUnexpectedException(Throwable t) {
943		threadRecordFailure(t);
#	Line 923 | Line 946 | public class JSR166TestCase extends Test
946		throw (RuntimeException) t;
947		else if (t instanceof Error)
948		throw (Error) t;
949	<	else {
950	<	AssertionFailedError afe =
928	<	new AssertionFailedError("unexpected exception: " + t);
929	<	afe.initCause(t);
930	<	throw afe;
931	<	}
949	>	else
950	>	throw new AssertionError("unexpected exception: " + t, t);
951		}
952
953		/**
#	Line 1104 | Line 1123 | public class JSR166TestCase extends Test
1123		for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1124		try { delay(1); }
1125		catch (InterruptedException fail) {
1126	<	fail("Unexpected InterruptedException");
1126	>	throw new AssertionError("Unexpected InterruptedException", fail);
1127		}
1128		Thread.State s = thread.getState();
1129		if (s == expected)
#	Line 1116 | Line 1135 | public class JSR166TestCase extends Test
1135		}
1136
1137		/**
1119	–	* Checks that thread does not terminate within the default
1120	–	* millisecond delay of {@code timeoutMillis()}.
1121	–	* TODO: REMOVEME
1122	–	*/
1123	–	void assertThreadStaysAlive(Thread thread) {
1124	–	assertThreadStaysAlive(thread, timeoutMillis());
1125	–	}
1126	–
1127	–	/**
1128	–	* Checks that thread does not terminate within the given millisecond delay.
1129	–	* TODO: REMOVEME
1130	–	*/
1131	–	void assertThreadStaysAlive(Thread thread, long millis) {
1132	–	try {
1133	–	// No need to optimize the failing case via Thread.join.
1134	–	delay(millis);
1135	–	assertTrue(thread.isAlive());
1136	–	} catch (InterruptedException fail) {
1137	–	threadFail("Unexpected InterruptedException");
1138	–	}
1139	–	}
1140	–
1141	–	/**
1142	–	* Checks that the threads do not terminate within the default
1143	–	* millisecond delay of {@code timeoutMillis()}.
1144	–	* TODO: REMOVEME
1145	–	*/
1146	–	void assertThreadsStayAlive(Thread... threads) {
1147	–	assertThreadsStayAlive(timeoutMillis(), threads);
1148	–	}
1149	–
1150	–	/**
1151	–	* Checks that the threads do not terminate within the given millisecond delay.
1152	–	* TODO: REMOVEME
1153	–	*/
1154	–	void assertThreadsStayAlive(long millis, Thread... threads) {
1155	–	try {
1156	–	// No need to optimize the failing case via Thread.join.
1157	–	delay(millis);
1158	–	for (Thread thread : threads)
1159	–	assertTrue(thread.isAlive());
1160	–	} catch (InterruptedException fail) {
1161	–	threadFail("Unexpected InterruptedException");
1162	–	}
1163	–	}
1164	–
1165	–	/**
1138		* Checks that future.get times out, with the default timeout of
1139		* {@code timeoutMillis()}.
1140		*/
#	Line 1337 | Line 1309 | public class JSR166TestCase extends Test
1309
1310		/**
1311		* Sleeps until the given time has elapsed.
1312	<	* Throws AssertionFailedError if interrupted.
1312	>	* Throws AssertionError if interrupted.
1313		*/
1314		static void sleep(long millis) {
1315		try {
1316		delay(millis);
1317		} catch (InterruptedException fail) {
1318	<	AssertionFailedError afe =
1347	<	new AssertionFailedError("Unexpected InterruptedException");
1348	<	afe.initCause(fail);
1349	<	throw afe;
1318	>	throw new AssertionError("Unexpected InterruptedException", fail);
1319		}
1320		}
1321
1322		/**
1323		* Spin-waits up to the specified number of milliseconds for the given
1324		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1325	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1326		*/
1327	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1328	<	long startTime = 0L;
1329	<	for (;;) {
1330	<	Thread.State s = thread.getState();
1331	<	if (s == Thread.State.BLOCKED ||
1332	<	s == Thread.State.WAITING ||
1333	<	s == Thread.State.TIMED_WAITING)
1334	<	return;
1335	<	else if (s == Thread.State.TERMINATED)
1327	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1328	>	Callable<Boolean> waitingForGodot) {
1329	>	for (long startTime = 0L;;) {
1330	>	switch (thread.getState()) {
1331	>	default: break;
1332	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1333	>	try {
1334	>	if (waitingForGodot == null || waitingForGodot.call())
1335	>	return;
1336	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1337	>	break;
1338	>	case TERMINATED:
1339		fail("Unexpected thread termination");
1340	<	else if (startTime == 0L)
1340	>	}
1341	>
1342	>	if (startTime == 0L)
1343		startTime = System.nanoTime();
1344		else if (millisElapsedSince(startTime) > timeoutMillis) {
1345	<	threadAssertTrue(thread.isAlive());
1346	<	fail("timed out waiting for thread to enter wait state");
1345	>	assertTrue(thread.isAlive());
1346	>	if (waitingForGodot == null
1347	>	|| thread.getState() == Thread.State.RUNNABLE)
1348	>	fail("timed out waiting for thread to enter wait state");
1349	>	else
1350	>	fail("timed out waiting for condition, thread state="
1351	>	+ thread.getState());
1352		}
1353		Thread.yield();
1354		}
#	Line 1376 | Line 1356 | public class JSR166TestCase extends Test
1356
1357		/**
1358		* Spin-waits up to the specified number of milliseconds for the given
1359	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1380	<	* and additionally satisfy the given condition.
1359	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1360		*/
1361	<	void waitForThreadToEnterWaitState(
1362	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1384	<	long startTime = 0L;
1385	<	for (;;) {
1386	<	Thread.State s = thread.getState();
1387	<	if (s == Thread.State.BLOCKED ||
1388	<	s == Thread.State.WAITING ||
1389	<	s == Thread.State.TIMED_WAITING) {
1390	<	try {
1391	<	if (waitingForGodot.call())
1392	<	return;
1393	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1394	<	}
1395	<	else if (s == Thread.State.TERMINATED)
1396	<	fail("Unexpected thread termination");
1397	<	else if (startTime == 0L)
1398	<	startTime = System.nanoTime();
1399	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1400	<	threadAssertTrue(thread.isAlive());
1401	<	fail("timed out waiting for thread to enter wait state");
1402	<	}
1403	<	Thread.yield();
1404	<	}
1361	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1362	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1363		}
1364
1365		/**
#	Line 1409 | Line 1367 | public class JSR166TestCase extends Test
1367		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1368		*/
1369		void waitForThreadToEnterWaitState(Thread thread) {
1370	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1370	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1371		}
1372
1373		/**
#	Line 1417 | Line 1375 | public class JSR166TestCase extends Test
1375		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1376		* and additionally satisfy the given condition.
1377		*/
1378	<	void waitForThreadToEnterWaitState(
1379	<	Thread thread, Callable<Boolean> waitingForGodot) {
1378	>	void waitForThreadToEnterWaitState(Thread thread,
1379	>	Callable<Boolean> waitingForGodot) {
1380		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1381		}
1382
1383		/**
1384	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1385	+	* be interrupted.  Clears the interrupt status before returning.
1386	+	*/
1387	+	void awaitInterrupted() {
1388	+	for (long startTime = 0L; !Thread.interrupted(); ) {
1389	+	if (startTime == 0L)
1390	+	startTime = System.nanoTime();
1391	+	else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1392	+	fail("timed out waiting for thread interrupt");
1393	+	Thread.yield();
1394	+	}
1395	+	}
1396	+
1397	+	/**
1398		* Returns the number of milliseconds since time given by
1399		* startNanoTime, which must have been previously returned from a
1400		* call to {@link System#nanoTime()}.
#	Line 1437 | Line 1409 | public class JSR166TestCase extends Test
1409		//             r.run();
1410		//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1411		//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1412	<	//             throw new AssertionFailedError("did not return promptly");
1412	>	//             throw new AssertionError("did not return promptly");
1413		//     }
1414
1415		//     void assertTerminatesPromptly(Runnable r) {
#	Line 1450 | Line 1422 | public class JSR166TestCase extends Test
1422		*/
1423		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1424		long startTime = System.nanoTime();
1425	+	T actual = null;
1426		try {
1427	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1427	>	actual = f.get(timeoutMillis, MILLISECONDS);
1428		} catch (Throwable fail) { threadUnexpectedException(fail); }
1429	+	assertEquals(expectedValue, actual);
1430		if (millisElapsedSince(startTime) > timeoutMillis/2)
1431	<	throw new AssertionFailedError("timed get did not return promptly");
1431	>	throw new AssertionError("timed get did not return promptly");
1432		}
1433
1434		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1481 | Line 1455 | public class JSR166TestCase extends Test
1455		t.join(timeoutMillis);
1456		} catch (InterruptedException fail) {
1457		threadUnexpectedException(fail);
1458	<	} finally {
1459	<	if (t.getState() != Thread.State.TERMINATED) {
1460	<	t.interrupt();
1461	<	threadFail("timed out waiting for thread to terminate");
1462	<	}
1458	>	}
1459	>	Thread.State state;
1460	>	if ((state = t.getState()) != Thread.State.TERMINATED) {
1461	>	t.interrupt();
1462	>	threadFail("timed out waiting for thread to terminate; "
1463	>	+ "state=" + state);
1464		}
1465		}
1466
#	Line 1512 | Line 1487 | public class JSR166TestCase extends Test
1487		}
1488		}
1489
1515	–	public abstract class RunnableShouldThrow implements Runnable {
1516	–	protected abstract void realRun() throws Throwable;
1517	–
1518	–	final Class<?> exceptionClass;
1519	–
1520	–	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1521	–	this.exceptionClass = exceptionClass;
1522	–	}
1523	–
1524	–	public final void run() {
1525	–	try {
1526	–	realRun();
1527	–	threadShouldThrow(exceptionClass.getSimpleName());
1528	–	} catch (Throwable t) {
1529	–	if (! exceptionClass.isInstance(t))
1530	–	threadUnexpectedException(t);
1531	–	}
1532	–	}
1533	–	}
1534	–
1490		public abstract class ThreadShouldThrow extends Thread {
1491		protected abstract void realRun() throws Throwable;
1492
#	Line 1544 | Line 1499 | public class JSR166TestCase extends Test
1499		public final void run() {
1500		try {
1501		realRun();
1547	–	threadShouldThrow(exceptionClass.getSimpleName());
1502		} catch (Throwable t) {
1503		if (! exceptionClass.isInstance(t))
1504		threadUnexpectedException(t);
1505	+	return;
1506		}
1507	+	threadShouldThrow(exceptionClass.getSimpleName());
1508		}
1509		}
1510
#	Line 1558 | Line 1514 | public class JSR166TestCase extends Test
1514		public final void run() {
1515		try {
1516		realRun();
1561	–	threadShouldThrow("InterruptedException");
1517		} catch (InterruptedException success) {
1518		threadAssertFalse(Thread.interrupted());
1519	+	return;
1520		} catch (Throwable fail) {
1521		threadUnexpectedException(fail);
1522		}
1523	+	threadShouldThrow("InterruptedException");
1524		}
1525		}
1526
#	Line 1575 | Line 1532 | public class JSR166TestCase extends Test
1532		return realCall();
1533		} catch (Throwable fail) {
1534		threadUnexpectedException(fail);
1578	–	return null;
1579	–	}
1580	–	}
1581	–	}
1582	–
1583	–	public abstract class CheckedInterruptedCallable<T>
1584	–	implements Callable<T> {
1585	–	protected abstract T realCall() throws Throwable;
1586	–
1587	–	public final T call() {
1588	–	try {
1589	–	T result = realCall();
1590	–	threadShouldThrow("InterruptedException");
1591	–	return result;
1592	–	} catch (InterruptedException success) {
1593	–	threadAssertFalse(Thread.interrupted());
1594	–	} catch (Throwable fail) {
1595	–	threadUnexpectedException(fail);
1535		}
1536	<	return null;
1536	>	throw new AssertionError("unreached");
1537		}
1538		}
1539
#	Line 1651 | Line 1590 | public class JSR166TestCase extends Test
1590		}
1591
1592		public void await(CountDownLatch latch, long timeoutMillis) {
1593	+	boolean timedOut = false;
1594		try {
1595	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1656	<	fail("timed out waiting for CountDownLatch for "
1657	<	+ (timeoutMillis/1000) + " sec");
1595	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1596		} catch (Throwable fail) {
1597		threadUnexpectedException(fail);
1598		}
1599	+	if (timedOut)
1600	+	fail("timed out waiting for CountDownLatch for "
1601	+	+ (timeoutMillis/1000) + " sec");
1602		}
1603
1604		public void await(CountDownLatch latch) {
#	Line 1665 | Line 1606 | public class JSR166TestCase extends Test
1606		}
1607
1608		public void await(Semaphore semaphore) {
1609	+	boolean timedOut = false;
1610		try {
1611	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1670	<	fail("timed out waiting for Semaphore for "
1671	<	+ (LONG_DELAY_MS/1000) + " sec");
1611	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1612		} catch (Throwable fail) {
1613		threadUnexpectedException(fail);
1614		}
1615	+	if (timedOut)
1616	+	fail("timed out waiting for Semaphore for "
1617	+	+ (LONG_DELAY_MS/1000) + " sec");
1618		}
1619
1620		public void await(CyclicBarrier barrier) {
#	Line 1696 | Line 1639 | public class JSR166TestCase extends Test
1639		//         long startTime = System.nanoTime();
1640		//         while (!flag.get()) {
1641		//             if (millisElapsedSince(startTime) > timeoutMillis)
1642	<	//                 throw new AssertionFailedError("timed out");
1642	>	//                 throw new AssertionError("timed out");
1643		//             Thread.yield();
1644		//         }
1645		//     }
#	Line 1705 | Line 1648 | public class JSR166TestCase extends Test
1648		public String call() { throw new NullPointerException(); }
1649		}
1650
1708	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1709	–	protected void realRun() {
1710	–	try {
1711	–	delay(SMALL_DELAY_MS);
1712	–	} catch (InterruptedException ok) {}
1713	–	}
1714	–	}
1715	–
1651		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1652		return new CheckedRunnable() {
1653		protected void realRun() {
#	Line 1768 | Line 1703 | public class JSR166TestCase extends Test
1703		return realCompute();
1704		} catch (Throwable fail) {
1705		threadUnexpectedException(fail);
1771	–	return null;
1706		}
1707	+	throw new AssertionError("unreached");
1708		}
1709		}
1710
#	Line 1783 | Line 1718 | public class JSR166TestCase extends Test
1718
1719		/**
1720		* A CyclicBarrier that uses timed await and fails with
1721	<	* AssertionFailedErrors instead of throwing checked exceptions.
1721	>	* AssertionErrors instead of throwing checked exceptions.
1722		*/
1723		public static class CheckedBarrier extends CyclicBarrier {
1724		public CheckedBarrier(int parties) { super(parties); }
#	Line 1792 | Line 1727 | public class JSR166TestCase extends Test
1727		try {
1728		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1729		} catch (TimeoutException timedOut) {
1730	<	throw new AssertionFailedError("timed out");
1730	>	throw new AssertionError("timed out");
1731		} catch (Exception fail) {
1732	<	AssertionFailedError afe =
1798	<	new AssertionFailedError("Unexpected exception: " + fail);
1799	<	afe.initCause(fail);
1800	<	throw afe;
1732	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1733		}
1734		}
1735		}
#	Line 1849 | Line 1781 | public class JSR166TestCase extends Test
1781		}
1782		}
1783
1784	<	void assertImmutable(final Object o) {
1784	>	void assertImmutable(Object o) {
1785		if (o instanceof Collection) {
1786		assertThrows(
1787		UnsupportedOperationException.class,
1788	<	new Runnable() { public void run() {
1857	<	((Collection) o).add(null);}});
1788	>	() -> ((Collection) o).add(null));
1789		}
1790		}
1791
1792		@SuppressWarnings("unchecked")
1793		<T> T serialClone(T o) {
1794	+	T clone = null;
1795		try {
1796		ObjectInputStream ois = new ObjectInputStream
1797		(new ByteArrayInputStream(serialBytes(o)));
1798	<	T clone = (T) ois.readObject();
1867	<	if (o == clone) assertImmutable(o);
1868	<	assertSame(o.getClass(), clone.getClass());
1869	<	return clone;
1798	>	clone = (T) ois.readObject();
1799		} catch (Throwable fail) {
1800		threadUnexpectedException(fail);
1872	–	return null;
1801		}
1802	+	if (o == clone) assertImmutable(o);
1803	+	else assertSame(o.getClass(), clone.getClass());
1804	+	return clone;
1805		}
1806
1807		/**
#	Line 1889 | Line 1820 | public class JSR166TestCase extends Test
1820		(new ByteArrayInputStream(bos.toByteArray()));
1821		T clone = (T) ois.readObject();
1822		if (o == clone) assertImmutable(o);
1823	<	assertSame(o.getClass(), clone.getClass());
1823	>	else assertSame(o.getClass(), clone.getClass());
1824		return clone;
1825		}
1826
#	Line 1914 | Line 1845 | public class JSR166TestCase extends Test
1845		}
1846
1847		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1848	<	Runnable... throwingActions) {
1849	<	for (Runnable throwingAction : throwingActions) {
1848	>	Action... throwingActions) {
1849	>	for (Action throwingAction : throwingActions) {
1850		boolean threw = false;
1851		try { throwingAction.run(); }
1852		catch (Throwable t) {
1853		threw = true;
1854	<	if (!expectedExceptionClass.isInstance(t)) {
1855	<	AssertionFailedError afe =
1856	<	new AssertionFailedError
1857	<	("Expected " + expectedExceptionClass.getName() +
1858	<	", got " + t.getClass().getName());
1928	<	afe.initCause(t);
1929	<	threadUnexpectedException(afe);
1930	<	}
1854	>	if (!expectedExceptionClass.isInstance(t))
1855	>	throw new AssertionError(
1856	>	"Expected " + expectedExceptionClass.getName() +
1857	>	", got " + t.getClass().getName(),
1858	>	t);
1859		}
1860		if (!threw)
1861		shouldThrow(expectedExceptionClass.getName());
#	Line 1960 | Line 1888 | public class JSR166TestCase extends Test
1888		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1889		}
1890
1891	+	/**
1892	+	* Returns the same String as would be returned by {@link
1893	+	* Object#toString}, whether or not the given object's class
1894	+	* overrides toString().
1895	+	*
1896	+	* @see System#identityHashCode
1897	+	*/
1898	+	static String identityString(Object x) {
1899	+	return x.getClass().getName()
1900	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1901	+	}
1902	+
1903		// --- Shared assertions for Executor tests ---
1904
1905		/**
#	Line 2131 | Line 2071 | public class JSR166TestCase extends Test
2071		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2072		assertEquals(savedQueueSize, p.getQueue().size());
2073		}
2074	+
2075	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2076	+	assertEquals(x, y);
2077	+	assertEquals(y, x);
2078	+	assertEquals(x.isEmpty(), y.isEmpty());
2079	+	assertEquals(x.size(), y.size());
2080	+	if (x instanceof List) {
2081	+	assertEquals(x.toString(), y.toString());
2082	+	}
2083	+	if (x instanceof List || x instanceof Set) {
2084	+	assertEquals(x.hashCode(), y.hashCode());
2085	+	}
2086	+	if (x instanceof List || x instanceof Deque) {
2087	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2088	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2089	+	y.toArray(new Object[0])));
2090	+	}
2091	+	}
2092	+
2093	+	/**
2094	+	* A weaker form of assertCollectionsEquals which does not insist
2095	+	* that the two collections satisfy Object#equals(Object), since
2096	+	* they may use identity semantics as Deques do.
2097	+	*/
2098	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2099	+	if (x instanceof List || x instanceof Set)
2100	+	assertCollectionsEquals(x, y);
2101	+	else {
2102	+	assertEquals(x.isEmpty(), y.isEmpty());
2103	+	assertEquals(x.size(), y.size());
2104	+	assertEquals(new HashSet(x), new HashSet(y));
2105	+	if (x instanceof Deque) {
2106	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2107	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2108	+	y.toArray(new Object[0])));
2109	+	}
2110	+	}
2111	+	}
2112		}

Diff Legend

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