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.270 by jsr166, Sun Sep 29 20:18:35 2019 UTC

#	Line 49 | Line 49 | import java.io.ByteArrayOutputStream;
49		import java.io.ObjectInputStream;
50		import java.io.ObjectOutputStream;
51		import java.lang.management.ManagementFactory;
52	+	import java.lang.management.LockInfo;
53		import java.lang.management.ThreadInfo;
54		import java.lang.management.ThreadMXBean;
55		import java.lang.reflect.Constructor;
#	Line 66 | Line 67 | import java.util.Arrays;
67		import java.util.Collection;
68		import java.util.Collections;
69		import java.util.Date;
70	+	import java.util.Deque;
71		import java.util.Enumeration;
72	+	import java.util.HashSet;
73		import java.util.Iterator;
74		import java.util.List;
75		import java.util.NoSuchElementException;
76		import java.util.PropertyPermission;
77	+	import java.util.Set;
78		import java.util.concurrent.BlockingQueue;
79		import java.util.concurrent.Callable;
80		import java.util.concurrent.CountDownLatch;
#	Line 99 | Line 103 | import java.util.concurrent.atomic.Atomi
103		import java.util.concurrent.atomic.AtomicReference;
104		import java.util.regex.Pattern;
105
102	–	import junit.framework.AssertionFailedError;
106		import junit.framework.Test;
107		import junit.framework.TestCase;
108		import junit.framework.TestResult;
#	Line 115 | Line 118 | import junit.framework.TestSuite;
118		*
119		* <ol>
120		*
121	<	* <li>All assertions in code running in generated threads must use
122	<	* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
123	<	* #threadAssertEquals}, or {@link #threadAssertNull}, (not
124	<	* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
125	<	* particularly recommended) for other code to use these forms too.
126	<	* Only the most typically used JUnit assertion methods are defined
127	<	* this way, but enough to live with.
121	>	* <li>All code not running in the main test thread (manually spawned threads
122	>	* or the common fork join pool) must be checked for failure (and completion!).
123	>	* Mechanisms that can be used to ensure this are:
124	>	*   <ol>
125	>	*   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
126	>	*    that the task completed normally, which is checked before returning from
127	>	*    the test method in the main thread.
128	>	*   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
129	>	*    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
130	>	*    Only the most typically used JUnit assertion methods are defined
131	>	*    this way, but enough to live with.
132	>	*   <li>Recording failure explicitly using {@link #threadUnexpectedException}
133	>	*    or {@link #threadRecordFailure}.
134	>	*   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
135	>	*   </ol>
136		*
137		* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
138		* to invoke {@code super.setUp} and {@code super.tearDown} within
#	Line 233 | Line 244 | public class JSR166TestCase extends Test
244		}
245		}
246
247	+	private static final ThreadMXBean THREAD_MXBEAN
248	+	= ManagementFactory.getThreadMXBean();
249	+
250		/**
251		* The scaling factor to apply to standard delays used in tests.
252		* May be initialized from any of:
#	Line 274 | Line 288 | public class JSR166TestCase extends Test
288		static volatile TestCase currentTestCase;
289		// static volatile int currentRun = 0;
290		static {
291	<	Runnable checkForWedgedTest = new Runnable() { public void run() {
291	>	Runnable wedgedTestDetector = new Runnable() { public void run() {
292		// Avoid spurious reports with enormous runsPerTest.
293		// A single test case run should never take more than 1 second.
294		// But let's cap it at the high end too ...
295	<	final int timeoutMinutes =
296	<	Math.min(15, Math.max(runsPerTest / 60, 1));
295	>	final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
296	>	* Math.max((int) delayFactor, 1);
297	>	final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
298		for (TestCase lastTestCase = currentTestCase;;) {
299		try { MINUTES.sleep(timeoutMinutes); }
300		catch (InterruptedException unexpected) { break; }
#	Line 299 | Line 314 | public class JSR166TestCase extends Test
314		}
315		lastTestCase = currentTestCase;
316		}}};
317	<	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
317	>	Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
318		thread.setDaemon(true);
319		thread.start();
320		}
#	Line 343 | Line 358 | public class JSR166TestCase extends Test
358		// Never report first run of any test; treat it as a
359		// warmup run, notably to trigger all needed classloading,
360		if (i > 0)
361	<	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
361	>	System.out.printf("%s: %d%n", toString(), elapsedMillis);
362		}
363		}
364
#	Line 419 | Line 434 | public class JSR166TestCase extends Test
434		for (String testClassName : testClassNames) {
435		try {
436		Class<?> testClass = Class.forName(testClassName);
437	<	Method m = testClass.getDeclaredMethod("suite",
423	<	new Class<?>[0]);
437	>	Method m = testClass.getDeclaredMethod("suite");
438		suite.addTest(newTestSuite((Test)m.invoke(null)));
439	<	} catch (Exception e) {
440	<	throw new Error("Missing test class", e);
439	>	} catch (ReflectiveOperationException e) {
440	>	throw new AssertionError("Missing test class", e);
441		}
442		}
443		}
#	Line 445 | Line 459 | public class JSR166TestCase extends Test
459		}
460		}
461
462	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
463	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
464	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
465	<	public static boolean atLeastJava9() {
466	<	return JAVA_CLASS_VERSION >= 53.0
467	<	// As of 2015-09, java9 still uses 52.0 class file version
468	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
469	<	}
470	<	public static boolean atLeastJava10() {
471	<	return JAVA_CLASS_VERSION >= 54.0
472	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
473	<	}
462	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
463	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
464	>	public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
465	>	public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
466	>	public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
467	>	public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
468	>	public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
469	>	public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
470	>	public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
471	>	public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
472	>	public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
473	>	public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
474
475		/**
476		* Collects all JSR166 unit tests as one suite.
#	Line 508 | Line 522 | public class JSR166TestCase extends Test
522		ExecutorsTest.suite(),
523		ExecutorCompletionServiceTest.suite(),
524		FutureTaskTest.suite(),
525	+	HashtableTest.suite(),
526		LinkedBlockingDequeTest.suite(),
527		LinkedBlockingQueueTest.suite(),
528		LinkedListTest.suite(),
#	Line 544 | Line 559 | public class JSR166TestCase extends Test
559		"DoubleAdderTest",
560		"ForkJoinPool8Test",
561		"ForkJoinTask8Test",
562	+	"HashMapTest",
563		"LinkedBlockingDeque8Test",
564		"LinkedBlockingQueue8Test",
565	+	"LinkedHashMapTest",
566		"LongAccumulatorTest",
567		"LongAdderTest",
568		"SplittableRandomTest",
#	Line 606 | Line 623 | public class JSR166TestCase extends Test
623		for (String methodName : testMethodNames(testClass))
624		suite.addTest((Test) c.newInstance(data, methodName));
625		return suite;
626	<	} catch (Exception e) {
627	<	throw new Error(e);
626	>	} catch (ReflectiveOperationException e) {
627	>	throw new AssertionError(e);
628		}
629		}
630
#	Line 623 | Line 640 | public class JSR166TestCase extends Test
640		if (atLeastJava8()) {
641		String name = testClass.getName();
642		String name8 = name.replaceAll("Test$", "8Test");
643	<	if (name.equals(name8)) throw new Error(name);
643	>	if (name.equals(name8)) throw new AssertionError(name);
644		try {
645		return (Test)
646		Class.forName(name8)
647	<	.getMethod("testSuite", new Class[] { dataClass })
647	>	.getMethod("testSuite", dataClass)
648		.invoke(null, data);
649	<	} catch (Exception e) {
650	<	throw new Error(e);
649	>	} catch (ReflectiveOperationException e) {
650	>	throw new AssertionError(e);
651		}
652		} else {
653		return new TestSuite();
#	Line 644 | Line 661 | public class JSR166TestCase extends Test
661		public static long MEDIUM_DELAY_MS;
662		public static long LONG_DELAY_MS;
663
664	+	/**
665	+	* A delay significantly longer than LONG_DELAY_MS.
666	+	* Use this in a thread that is waited for via awaitTermination(Thread).
667	+	*/
668	+	public static long LONGER_DELAY_MS;
669	+
670		private static final long RANDOM_TIMEOUT;
671		private static final long RANDOM_EXPIRED_TIMEOUT;
672		private static final TimeUnit RANDOM_TIMEUNIT;
#	Line 672 | Line 695 | public class JSR166TestCase extends Test
695		static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
696
697		/**
698	+	* Returns a random boolean; a "coin flip".
699	+	*/
700	+	static boolean randomBoolean() {
701	+	return ThreadLocalRandom.current().nextBoolean();
702	+	}
703	+
704	+	/**
705	+	* Returns a random element from given choices.
706	+	*/
707	+	<T> T chooseRandomly(List<T> choices) {
708	+	return choices.get(ThreadLocalRandom.current().nextInt(choices.size()));
709	+	}
710	+
711	+	/**
712	+	* Returns a random element from given choices.
713	+	*/
714	+	<T> T chooseRandomly(T... choices) {
715	+	return choices[ThreadLocalRandom.current().nextInt(choices.length)];
716	+	}
717	+
718	+	/**
719		* Returns the shortest timed delay. This can be scaled up for
720		* slow machines using the jsr166.delay.factor system property,
721		* or via jtreg's -timeoutFactor: flag.
#	Line 689 | Line 733 | public class JSR166TestCase extends Test
733		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
734		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
735		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
736	+	LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
737		}
738
739		private static final long TIMEOUT_DELAY_MS
#	Line 727 | Line 772 | public class JSR166TestCase extends Test
772		*/
773		public void threadRecordFailure(Throwable t) {
774		System.err.println(t);
775	<	dumpTestThreads();
776	<	threadFailure.compareAndSet(null, t);
775	>	if (threadFailure.compareAndSet(null, t))
776	>	dumpTestThreads();
777		}
778
779		public void setUp() {
#	Line 739 | Line 784 | public class JSR166TestCase extends Test
784		String msg = toString() + ": " + String.format(format, args);
785		System.err.println(msg);
786		dumpTestThreads();
787	<	throw new AssertionFailedError(msg);
787	>	throw new AssertionError(msg);
788		}
789
790		/**
#	Line 760 | Line 805 | public class JSR166TestCase extends Test
805		throw (RuntimeException) t;
806		else if (t instanceof Exception)
807		throw (Exception) t;
808	<	else {
809	<	AssertionFailedError afe =
765	<	new AssertionFailedError(t.toString());
766	<	afe.initCause(t);
767	<	throw afe;
768	<	}
808	>	else
809	>	throw new AssertionError(t.toString(), t);
810		}
811
812		if (Thread.interrupted())
#	Line 799 | Line 840 | public class JSR166TestCase extends Test
840
841		/**
842		* Just like fail(reason), but additionally recording (using
843	<	* threadRecordFailure) any AssertionFailedError thrown, so that
844	<	* the current testcase will fail.
843	>	* threadRecordFailure) any AssertionError thrown, so that the
844	>	* current testcase will fail.
845		*/
846		public void threadFail(String reason) {
847		try {
848		fail(reason);
849	<	} catch (AssertionFailedError t) {
850	<	threadRecordFailure(t);
851	<	throw t;
849	>	} catch (AssertionError fail) {
850	>	threadRecordFailure(fail);
851	>	throw fail;
852		}
853		}
854
855		/**
856		* Just like assertTrue(b), but additionally recording (using
857	<	* threadRecordFailure) any AssertionFailedError thrown, so that
858	<	* the current testcase will fail.
857	>	* threadRecordFailure) any AssertionError thrown, so that the
858	>	* current testcase will fail.
859		*/
860		public void threadAssertTrue(boolean b) {
861		try {
862		assertTrue(b);
863	<	} catch (AssertionFailedError t) {
864	<	threadRecordFailure(t);
865	<	throw t;
863	>	} catch (AssertionError fail) {
864	>	threadRecordFailure(fail);
865	>	throw fail;
866		}
867		}
868
869		/**
870		* Just like assertFalse(b), but additionally recording (using
871	<	* threadRecordFailure) any AssertionFailedError thrown, so that
872	<	* the current testcase will fail.
871	>	* threadRecordFailure) any AssertionError thrown, so that the
872	>	* current testcase will fail.
873		*/
874		public void threadAssertFalse(boolean b) {
875		try {
876		assertFalse(b);
877	<	} catch (AssertionFailedError t) {
878	<	threadRecordFailure(t);
879	<	throw t;
877	>	} catch (AssertionError fail) {
878	>	threadRecordFailure(fail);
879	>	throw fail;
880		}
881		}
882
883		/**
884		* Just like assertNull(x), but additionally recording (using
885	<	* threadRecordFailure) any AssertionFailedError thrown, so that
886	<	* the current testcase will fail.
885	>	* threadRecordFailure) any AssertionError thrown, so that the
886	>	* current testcase will fail.
887		*/
888		public void threadAssertNull(Object x) {
889		try {
890		assertNull(x);
891	<	} catch (AssertionFailedError t) {
892	<	threadRecordFailure(t);
893	<	throw t;
891	>	} catch (AssertionError fail) {
892	>	threadRecordFailure(fail);
893	>	throw fail;
894		}
895		}
896
897		/**
898		* Just like assertEquals(x, y), but additionally recording (using
899	<	* threadRecordFailure) any AssertionFailedError thrown, so that
900	<	* the current testcase will fail.
899	>	* threadRecordFailure) any AssertionError thrown, so that the
900	>	* current testcase will fail.
901		*/
902		public void threadAssertEquals(long x, long y) {
903		try {
904		assertEquals(x, y);
905	<	} catch (AssertionFailedError t) {
906	<	threadRecordFailure(t);
907	<	throw t;
905	>	} catch (AssertionError fail) {
906	>	threadRecordFailure(fail);
907	>	throw fail;
908		}
909		}
910
911		/**
912		* Just like assertEquals(x, y), but additionally recording (using
913	<	* threadRecordFailure) any AssertionFailedError thrown, so that
914	<	* the current testcase will fail.
913	>	* threadRecordFailure) any AssertionError thrown, so that the
914	>	* current testcase will fail.
915		*/
916		public void threadAssertEquals(Object x, Object y) {
917		try {
918		assertEquals(x, y);
919	<	} catch (AssertionFailedError fail) {
919	>	} catch (AssertionError fail) {
920		threadRecordFailure(fail);
921		throw fail;
922		} catch (Throwable fail) {
#	Line 885 | Line 926 | public class JSR166TestCase extends Test
926
927		/**
928		* Just like assertSame(x, y), but additionally recording (using
929	<	* threadRecordFailure) any AssertionFailedError thrown, so that
930	<	* the current testcase will fail.
929	>	* threadRecordFailure) any AssertionError thrown, so that the
930	>	* current testcase will fail.
931		*/
932		public void threadAssertSame(Object x, Object y) {
933		try {
934		assertSame(x, y);
935	<	} catch (AssertionFailedError fail) {
935	>	} catch (AssertionError fail) {
936		threadRecordFailure(fail);
937		throw fail;
938		}
#	Line 913 | Line 954 | public class JSR166TestCase extends Test
954
955		/**
956		* Records the given exception using {@link #threadRecordFailure},
957	<	* then rethrows the exception, wrapping it in an
958	<	* AssertionFailedError if necessary.
957	>	* then rethrows the exception, wrapping it in an AssertionError
958	>	* if necessary.
959		*/
960		public void threadUnexpectedException(Throwable t) {
961		threadRecordFailure(t);
#	Line 923 | Line 964 | public class JSR166TestCase extends Test
964		throw (RuntimeException) t;
965		else if (t instanceof Error)
966		throw (Error) t;
967	<	else {
968	<	AssertionFailedError afe =
928	<	new AssertionFailedError("unexpected exception: " + t);
929	<	afe.initCause(t);
930	<	throw afe;
931	<	}
967	>	else
968	>	throw new AssertionError("unexpected exception: " + t, t);
969		}
970
971		/**
#	Line 1057 | Line 1094 | public class JSR166TestCase extends Test
1094		}
1095		}
1096
1097	+	/** Returns true if thread info might be useful in a thread dump. */
1098	+	static boolean threadOfInterest(ThreadInfo info) {
1099	+	final String name = info.getThreadName();
1100	+	String lockName;
1101	+	if (name == null)
1102	+	return true;
1103	+	if (name.equals("Signal Dispatcher")
1104	+	|| name.equals("WedgedTestDetector"))
1105	+	return false;
1106	+	if (name.equals("Reference Handler")) {
1107	+	// Reference Handler stacktrace changed in JDK-8156500
1108	+	StackTraceElement[] stackTrace; String methodName;
1109	+	if ((stackTrace = info.getStackTrace()) != null
1110	+	&& stackTrace.length > 0
1111	+	&& (methodName = stackTrace[0].getMethodName()) != null
1112	+	&& methodName.equals("waitForReferencePendingList"))
1113	+	return false;
1114	+	// jdk8 Reference Handler stacktrace
1115	+	if ((lockName = info.getLockName()) != null
1116	+	&& lockName.startsWith("java.lang.ref"))
1117	+	return false;
1118	+	}
1119	+	if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
1120	+	&& (lockName = info.getLockName()) != null
1121	+	&& lockName.startsWith("java.lang.ref"))
1122	+	return false;
1123	+	if (name.startsWith("ForkJoinPool.commonPool-worker")
1124	+	&& (lockName = info.getLockName()) != null
1125	+	&& lockName.startsWith("java.util.concurrent.ForkJoinPool"))
1126	+	return false;
1127	+	return true;
1128	+	}
1129	+
1130		/**
1131		* A debugging tool to print stack traces of most threads, as jstack does.
1132		* Uninteresting threads are filtered out.
#	Line 1071 | Line 1141 | public class JSR166TestCase extends Test
1141		}
1142		}
1143
1074	–	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1144		System.err.println("------ stacktrace dump start ------");
1145	<	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1146	<	final String name = info.getThreadName();
1147	<	String lockName;
1079	<	if ("Signal Dispatcher".equals(name))
1080	<	continue;
1081	<	if ("Reference Handler".equals(name)
1082	<	&& (lockName = info.getLockName()) != null
1083	<	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1084	<	continue;
1085	<	if ("Finalizer".equals(name)
1086	<	&& (lockName = info.getLockName()) != null
1087	<	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1088	<	continue;
1089	<	if ("checkForWedgedTest".equals(name))
1090	<	continue;
1091	<	System.err.print(info);
1092	<	}
1145	>	for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
1146	>	if (threadOfInterest(info))
1147	>	System.err.print(info);
1148		System.err.println("------ stacktrace dump end ------");
1149
1150		if (sm != null) System.setSecurityManager(sm);
#	Line 1104 | Line 1159 | public class JSR166TestCase extends Test
1159		for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1160		try { delay(1); }
1161		catch (InterruptedException fail) {
1162	<	fail("Unexpected InterruptedException");
1162	>	throw new AssertionError("Unexpected InterruptedException", fail);
1163		}
1164		Thread.State s = thread.getState();
1165		if (s == expected)
#	Line 1116 | Line 1171 | public class JSR166TestCase extends Test
1171		}
1172
1173		/**
1174	+	* Returns the thread's blocker's class name, if any, else null.
1175	+	*/
1176	+	String blockerClassName(Thread thread) {
1177	+	ThreadInfo threadInfo; LockInfo lockInfo;
1178	+	if ((threadInfo = THREAD_MXBEAN.getThreadInfo(thread.getId(), 0)) != null
1179	+	&& (lockInfo = threadInfo.getLockInfo()) != null)
1180	+	return lockInfo.getClassName();
1181	+	return null;
1182	+	}
1183	+
1184	+	/**
1185		* Checks that future.get times out, with the default timeout of
1186		* {@code timeoutMillis()}.
1187		*/
#	Line 1290 | Line 1356 | public class JSR166TestCase extends Test
1356
1357		/**
1358		* Sleeps until the given time has elapsed.
1359	<	* Throws AssertionFailedError if interrupted.
1359	>	* Throws AssertionError if interrupted.
1360		*/
1361		static void sleep(long millis) {
1362		try {
1363		delay(millis);
1364		} catch (InterruptedException fail) {
1365	<	AssertionFailedError afe =
1300	<	new AssertionFailedError("Unexpected InterruptedException");
1301	<	afe.initCause(fail);
1302	<	throw afe;
1365	>	throw new AssertionError("Unexpected InterruptedException", fail);
1366		}
1367		}
1368
1369		/**
1370		* Spin-waits up to the specified number of milliseconds for the given
1371		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1372	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1373		*/
1374	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1375	<	long startTime = 0L;
1376	<	for (;;) {
1377	<	Thread.State s = thread.getState();
1378	<	if (s == Thread.State.BLOCKED ||
1379	<	s == Thread.State.WAITING ||
1380	<	s == Thread.State.TIMED_WAITING)
1381	<	return;
1382	<	else if (s == Thread.State.TERMINATED)
1374	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1375	>	Callable<Boolean> waitingForGodot) {
1376	>	for (long startTime = 0L;;) {
1377	>	switch (thread.getState()) {
1378	>	default: break;
1379	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1380	>	try {
1381	>	if (waitingForGodot == null || waitingForGodot.call())
1382	>	return;
1383	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1384	>	break;
1385	>	case TERMINATED:
1386		fail("Unexpected thread termination");
1387	<	else if (startTime == 0L)
1387	>	}
1388	>
1389	>	if (startTime == 0L)
1390		startTime = System.nanoTime();
1391		else if (millisElapsedSince(startTime) > timeoutMillis) {
1392	<	threadAssertTrue(thread.isAlive());
1393	<	fail("timed out waiting for thread to enter wait state");
1392	>	assertTrue(thread.isAlive());
1393	>	if (waitingForGodot == null
1394	>	|| thread.getState() == Thread.State.RUNNABLE)
1395	>	fail("timed out waiting for thread to enter wait state");
1396	>	else
1397	>	fail("timed out waiting for condition, thread state="
1398	>	+ thread.getState());
1399		}
1400		Thread.yield();
1401		}
#	Line 1329 | Line 1403 | public class JSR166TestCase extends Test
1403
1404		/**
1405		* Spin-waits up to the specified number of milliseconds for the given
1406	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1333	<	* and additionally satisfy the given condition.
1406	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1407		*/
1408	<	void waitForThreadToEnterWaitState(
1409	<	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	<	}
1408	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1409	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1410		}
1411
1412		/**
#	Line 1362 | Line 1414 | public class JSR166TestCase extends Test
1414		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1415		*/
1416		void waitForThreadToEnterWaitState(Thread thread) {
1417	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1417	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1418		}
1419
1420		/**
#	Line 1370 | Line 1422 | public class JSR166TestCase extends Test
1422		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1423		* and additionally satisfy the given condition.
1424		*/
1425	<	void waitForThreadToEnterWaitState(
1426	<	Thread thread, Callable<Boolean> waitingForGodot) {
1425	>	void waitForThreadToEnterWaitState(Thread thread,
1426	>	Callable<Boolean> waitingForGodot) {
1427		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1428		}
1429
1430		/**
1431	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1432	+	* be interrupted.  Clears the interrupt status before returning.
1433	+	*/
1434	+	void awaitInterrupted() {
1435	+	for (long startTime = 0L; !Thread.interrupted(); ) {
1436	+	if (startTime == 0L)
1437	+	startTime = System.nanoTime();
1438	+	else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1439	+	fail("timed out waiting for thread interrupt");
1440	+	Thread.yield();
1441	+	}
1442	+	}
1443	+
1444	+	/**
1445		* Returns the number of milliseconds since time given by
1446		* startNanoTime, which must have been previously returned from a
1447		* call to {@link System#nanoTime()}.
#	Line 1384 | Line 1450 | public class JSR166TestCase extends Test
1450		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1451		}
1452
1387	–	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1388	–	//         long startTime = System.nanoTime();
1389	–	//         try {
1390	–	//             r.run();
1391	–	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1392	–	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1393	–	//             throw new AssertionFailedError("did not return promptly");
1394	–	//     }
1395	–
1396	–	//     void assertTerminatesPromptly(Runnable r) {
1397	–	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1398	–	//     }
1399	–
1453		/**
1454		* Checks that timed f.get() returns the expected value, and does not
1455		* wait for the timeout to elapse before returning.
1456		*/
1457		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1458		long startTime = System.nanoTime();
1459	+	T actual = null;
1460		try {
1461	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1461	>	actual = f.get(timeoutMillis, MILLISECONDS);
1462		} catch (Throwable fail) { threadUnexpectedException(fail); }
1463	+	assertEquals(expectedValue, actual);
1464		if (millisElapsedSince(startTime) > timeoutMillis/2)
1465	<	throw new AssertionFailedError("timed get did not return promptly");
1465	>	throw new AssertionError("timed get did not return promptly");
1466		}
1467
1468		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1425 | Line 1480 | public class JSR166TestCase extends Test
1480		}
1481
1482		/**
1483	+	* Returns a new started daemon Thread running the given action,
1484	+	* wrapped in a CheckedRunnable.
1485	+	*/
1486	+	Thread newStartedThread(Action action) {
1487	+	return newStartedThread(checkedRunnable(action));
1488	+	}
1489	+
1490	+	/**
1491		* Waits for the specified time (in milliseconds) for the thread
1492		* to terminate (using {@link Thread#join(long)}), else interrupts
1493		* the thread (in the hope that it may terminate later) and fails.
1494		*/
1495	<	void awaitTermination(Thread t, long timeoutMillis) {
1495	>	void awaitTermination(Thread thread, long timeoutMillis) {
1496		try {
1497	<	t.join(timeoutMillis);
1497	>	thread.join(timeoutMillis);
1498		} catch (InterruptedException fail) {
1499		threadUnexpectedException(fail);
1500	<	} finally {
1501	<	if (t.getState() != Thread.State.TERMINATED) {
1502	<	t.interrupt();
1503	<	threadFail("timed out waiting for thread to terminate");
1500	>	}
1501	>	if (thread.getState() != Thread.State.TERMINATED) {
1502	>	String detail = String.format(
1503	>	"timed out waiting for thread to terminate, thread=%s, state=%s" ,
1504	>	thread, thread.getState());
1505	>	try {
1506	>	threadFail(detail);
1507	>	} finally {
1508	>	// Interrupt thread __after__ having reported its stack trace
1509	>	thread.interrupt();
1510		}
1511		}
1512		}
#	Line 1465 | Line 1534 | public class JSR166TestCase extends Test
1534		}
1535		}
1536
1537	<	public abstract class RunnableShouldThrow implements Runnable {
1538	<	protected abstract void realRun() throws Throwable;
1539	<
1540	<	final Class<?> exceptionClass;
1541	<
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	<	}
1537	>	Runnable checkedRunnable(Action action) {
1538	>	return new CheckedRunnable() {
1539	>	public void realRun() throws Throwable {
1540	>	action.run();
1541	>	}};
1542		}
1543
1544		public abstract class ThreadShouldThrow extends Thread {
#	Line 1497 | Line 1553 | public class JSR166TestCase extends Test
1553		public final void run() {
1554		try {
1555		realRun();
1500	–	threadShouldThrow(exceptionClass.getSimpleName());
1556		} catch (Throwable t) {
1557		if (! exceptionClass.isInstance(t))
1558		threadUnexpectedException(t);
1559	+	return;
1560		}
1561	+	threadShouldThrow(exceptionClass.getSimpleName());
1562		}
1563		}
1564
#	Line 1511 | Line 1568 | public class JSR166TestCase extends Test
1568		public final void run() {
1569		try {
1570		realRun();
1514	–	threadShouldThrow("InterruptedException");
1571		} catch (InterruptedException success) {
1572		threadAssertFalse(Thread.interrupted());
1573	+	return;
1574		} catch (Throwable fail) {
1575		threadUnexpectedException(fail);
1576		}
1577	+	threadShouldThrow("InterruptedException");
1578		}
1579		}
1580
#	Line 1528 | Line 1586 | public class JSR166TestCase extends Test
1586		return realCall();
1587		} catch (Throwable fail) {
1588		threadUnexpectedException(fail);
1531	–	return null;
1589		}
1590	<	}
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);
1549	<	}
1550	<	return null;
1590	>	throw new AssertionError("unreached");
1591		}
1592		}
1593
#	Line 1604 | Line 1644 | public class JSR166TestCase extends Test
1644		}
1645
1646		public void await(CountDownLatch latch, long timeoutMillis) {
1647	+	boolean timedOut = false;
1648		try {
1649	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1609	<	fail("timed out waiting for CountDownLatch for "
1610	<	+ (timeoutMillis/1000) + " sec");
1649	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1650		} catch (Throwable fail) {
1651		threadUnexpectedException(fail);
1652		}
1653	+	if (timedOut)
1654	+	fail("timed out waiting for CountDownLatch for "
1655	+	+ (timeoutMillis/1000) + " sec");
1656		}
1657
1658		public void await(CountDownLatch latch) {
#	Line 1618 | Line 1660 | public class JSR166TestCase extends Test
1660		}
1661
1662		public void await(Semaphore semaphore) {
1663	+	boolean timedOut = false;
1664		try {
1665	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1623	<	fail("timed out waiting for Semaphore for "
1624	<	+ (LONG_DELAY_MS/1000) + " sec");
1665	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1666		} catch (Throwable fail) {
1667		threadUnexpectedException(fail);
1668		}
1669	+	if (timedOut)
1670	+	fail("timed out waiting for Semaphore for "
1671	+	+ (LONG_DELAY_MS/1000) + " sec");
1672		}
1673
1674		public void await(CyclicBarrier barrier) {
#	Line 1649 | Line 1693 | public class JSR166TestCase extends Test
1693		//         long startTime = System.nanoTime();
1694		//         while (!flag.get()) {
1695		//             if (millisElapsedSince(startTime) > timeoutMillis)
1696	<	//                 throw new AssertionFailedError("timed out");
1696	>	//                 throw new AssertionError("timed out");
1697		//             Thread.yield();
1698		//         }
1699		//     }
#	Line 1658 | Line 1702 | public class JSR166TestCase extends Test
1702		public String call() { throw new NullPointerException(); }
1703		}
1704
1661	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1662	–	protected void realRun() {
1663	–	try {
1664	–	delay(SMALL_DELAY_MS);
1665	–	} catch (InterruptedException ok) {}
1666	–	}
1667	–	}
1668	–
1705		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1706		return new CheckedRunnable() {
1707		protected void realRun() {
#	Line 1721 | Line 1757 | public class JSR166TestCase extends Test
1757		return realCompute();
1758		} catch (Throwable fail) {
1759		threadUnexpectedException(fail);
1724	–	return null;
1760		}
1761	+	throw new AssertionError("unreached");
1762		}
1763		}
1764
#	Line 1736 | Line 1772 | public class JSR166TestCase extends Test
1772
1773		/**
1774		* A CyclicBarrier that uses timed await and fails with
1775	<	* AssertionFailedErrors instead of throwing checked exceptions.
1775	>	* AssertionErrors instead of throwing checked exceptions.
1776		*/
1777		public static class CheckedBarrier extends CyclicBarrier {
1778		public CheckedBarrier(int parties) { super(parties); }
1779
1780		public int await() {
1781		try {
1782	<	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1782	>	return super.await(LONGER_DELAY_MS, MILLISECONDS);
1783		} catch (TimeoutException timedOut) {
1784	<	throw new AssertionFailedError("timed out");
1784	>	throw new AssertionError("timed out");
1785		} catch (Exception fail) {
1786	<	AssertionFailedError afe =
1751	<	new AssertionFailedError("Unexpected exception: " + fail);
1752	<	afe.initCause(fail);
1753	<	throw afe;
1786	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1787		}
1788		}
1789		}
#	Line 1802 | Line 1835 | public class JSR166TestCase extends Test
1835		}
1836		}
1837
1838	<	void assertImmutable(final Object o) {
1838	>	void assertImmutable(Object o) {
1839		if (o instanceof Collection) {
1840		assertThrows(
1841		UnsupportedOperationException.class,
1842	<	new Runnable() { public void run() {
1810	<	((Collection) o).add(null);}});
1842	>	() -> ((Collection) o).add(null));
1843		}
1844		}
1845
1846		@SuppressWarnings("unchecked")
1847		<T> T serialClone(T o) {
1848	+	T clone = null;
1849		try {
1850		ObjectInputStream ois = new ObjectInputStream
1851		(new ByteArrayInputStream(serialBytes(o)));
1852	<	T clone = (T) ois.readObject();
1820	<	if (o == clone) assertImmutable(o);
1821	<	assertSame(o.getClass(), clone.getClass());
1822	<	return clone;
1852	>	clone = (T) ois.readObject();
1853		} catch (Throwable fail) {
1854		threadUnexpectedException(fail);
1825	–	return null;
1855		}
1856	+	if (o == clone) assertImmutable(o);
1857	+	else assertSame(o.getClass(), clone.getClass());
1858	+	return clone;
1859		}
1860
1861		/**
#	Line 1842 | Line 1874 | public class JSR166TestCase extends Test
1874		(new ByteArrayInputStream(bos.toByteArray()));
1875		T clone = (T) ois.readObject();
1876		if (o == clone) assertImmutable(o);
1877	<	assertSame(o.getClass(), clone.getClass());
1877	>	else assertSame(o.getClass(), clone.getClass());
1878		return clone;
1879		}
1880
#	Line 1867 | Line 1899 | public class JSR166TestCase extends Test
1899		}
1900
1901		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1902	<	Runnable... throwingActions) {
1903	<	for (Runnable throwingAction : throwingActions) {
1902	>	Action... throwingActions) {
1903	>	for (Action throwingAction : throwingActions) {
1904		boolean threw = false;
1905		try { throwingAction.run(); }
1906		catch (Throwable t) {
1907		threw = true;
1908	<	if (!expectedExceptionClass.isInstance(t)) {
1909	<	AssertionFailedError afe =
1910	<	new AssertionFailedError
1911	<	("Expected " + expectedExceptionClass.getName() +
1912	<	", got " + t.getClass().getName());
1881	<	afe.initCause(t);
1882	<	threadUnexpectedException(afe);
1883	<	}
1908	>	if (!expectedExceptionClass.isInstance(t))
1909	>	throw new AssertionError(
1910	>	"Expected " + expectedExceptionClass.getName() +
1911	>	", got " + t.getClass().getName(),
1912	>	t);
1913		}
1914		if (!threw)
1915		shouldThrow(expectedExceptionClass.getName());
#	Line 1913 | Line 1942 | public class JSR166TestCase extends Test
1942		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1943		}
1944
1945	+	/**
1946	+	* Returns the same String as would be returned by {@link
1947	+	* Object#toString}, whether or not the given object's class
1948	+	* overrides toString().
1949	+	*
1950	+	* @see System#identityHashCode
1951	+	*/
1952	+	static String identityString(Object x) {
1953	+	return x.getClass().getName()
1954	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1955	+	}
1956	+
1957		// --- Shared assertions for Executor tests ---
1958
1959		/**
#	Line 2084 | Line 2125 | public class JSR166TestCase extends Test
2125		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2126		assertEquals(savedQueueSize, p.getQueue().size());
2127		}
2128	+
2129	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2130	+	assertEquals(x, y);
2131	+	assertEquals(y, x);
2132	+	assertEquals(x.isEmpty(), y.isEmpty());
2133	+	assertEquals(x.size(), y.size());
2134	+	if (x instanceof List) {
2135	+	assertEquals(x.toString(), y.toString());
2136	+	}
2137	+	if (x instanceof List || x instanceof Set) {
2138	+	assertEquals(x.hashCode(), y.hashCode());
2139	+	}
2140	+	if (x instanceof List || x instanceof Deque) {
2141	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2142	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2143	+	y.toArray(new Object[0])));
2144	+	}
2145	+	}
2146	+
2147	+	/**
2148	+	* A weaker form of assertCollectionsEquals which does not insist
2149	+	* that the two collections satisfy Object#equals(Object), since
2150	+	* they may use identity semantics as Deques do.
2151	+	*/
2152	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2153	+	if (x instanceof List || x instanceof Set)
2154	+	assertCollectionsEquals(x, y);
2155	+	else {
2156	+	assertEquals(x.isEmpty(), y.isEmpty());
2157	+	assertEquals(x.size(), y.size());
2158	+	assertEquals(new HashSet(x), new HashSet(y));
2159	+	if (x instanceof Deque) {
2160	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2161	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2162	+	y.toArray(new Object[0])));
2163	+	}
2164	+	}
2165	+	}
2166		}

Diff Legend

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