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.236 by jsr166, Wed Aug 16 17:18:34 2017 UTC vs.
Revision 1.274 by dl, Tue Mar 22 16:26:19 2022 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.Queue;
78	+	import java.util.Set;
79		import java.util.concurrent.BlockingQueue;
80		import java.util.concurrent.Callable;
81		import java.util.concurrent.CountDownLatch;
#	Line 99 | Line 104 | import java.util.concurrent.atomic.Atomi
104		import java.util.concurrent.atomic.AtomicReference;
105		import java.util.regex.Pattern;
106
102	–	import junit.framework.AssertionFailedError;
107		import junit.framework.Test;
108		import junit.framework.TestCase;
109		import junit.framework.TestResult;
#	Line 115 | Line 119 | import junit.framework.TestSuite;
119		*
120		* <ol>
121		*
122	<	* <li>All assertions in code running in generated threads must use
123	<	* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
124	<	* #threadAssertEquals}, or {@link #threadAssertNull}, (not
125	<	* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
126	<	* particularly recommended) for other code to use these forms too.
127	<	* Only the most typically used JUnit assertion methods are defined
128	<	* this way, but enough to live with.
122	>	* <li>All code not running in the main test thread (manually spawned threads
123	>	* or the common fork join pool) must be checked for failure (and completion!).
124	>	* Mechanisms that can be used to ensure this are:
125	>	*   <ol>
126	>	*   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
127	>	*    that the task completed normally, which is checked before returning from
128	>	*    the test method in the main thread.
129	>	*   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
130	>	*    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
131	>	*    Only the most typically used JUnit assertion methods are defined
132	>	*    this way, but enough to live with.
133	>	*   <li>Recording failure explicitly using {@link #threadUnexpectedException}
134	>	*    or {@link #threadRecordFailure}.
135	>	*   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
136	>	*   </ol>
137		*
138		* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
139		* to invoke {@code super.setUp} and {@code super.tearDown} within
#	Line 139 | Line 151 | import junit.framework.TestSuite;
151		* but even so, if there is ever any doubt, they can all be increased
152		* in one spot to rerun tests on slower platforms.
153		*
154	+	* Class Item is used for elements of collections and related
155	+	* purposes. Many tests rely on their keys being equal to ints. To
156	+	* check these, methods mustEqual, mustContain, etc adapt the JUnit
157	+	* assert methods to intercept ints.
158	+	*
159		* <li>All threads generated must be joined inside each test case
160		* method (or {@code fail} to do so) before returning from the
161		* method. The {@code joinPool} method can be used to do this when
#	Line 178 | Line 195 | import junit.framework.TestSuite;
195		* </ul>
196		*/
197		public class JSR166TestCase extends TestCase {
198	+	// No longer run with custom securityManagers
199		private static final boolean useSecurityManager =
200	<	Boolean.getBoolean("jsr166.useSecurityManager");
200	>	Boolean.getBoolean("jsr166.useSecurityManager");
201
202		protected static final boolean expensiveTests =
203		Boolean.getBoolean("jsr166.expensiveTests");
#	Line 233 | Line 251 | public class JSR166TestCase extends Test
251		}
252		}
253
254	+	private static final ThreadMXBean THREAD_MXBEAN
255	+	= ManagementFactory.getThreadMXBean();
256	+
257		/**
258		* The scaling factor to apply to standard delays used in tests.
259		* May be initialized from any of:
#	Line 274 | Line 295 | public class JSR166TestCase extends Test
295		static volatile TestCase currentTestCase;
296		// static volatile int currentRun = 0;
297		static {
298	<	Runnable checkForWedgedTest = new Runnable() { public void run() {
298	>	Runnable wedgedTestDetector = new Runnable() { public void run() {
299		// Avoid spurious reports with enormous runsPerTest.
300		// A single test case run should never take more than 1 second.
301		// But let's cap it at the high end too ...
302	<	final int timeoutMinutes =
303	<	Math.min(15, Math.max(runsPerTest / 60, 1));
302	>	final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
303	>	* Math.max((int) delayFactor, 1);
304	>	final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
305		for (TestCase lastTestCase = currentTestCase;;) {
306		try { MINUTES.sleep(timeoutMinutes); }
307		catch (InterruptedException unexpected) { break; }
#	Line 299 | Line 321 | public class JSR166TestCase extends Test
321		}
322		lastTestCase = currentTestCase;
323		}}};
324	<	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
324	>	Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
325		thread.setDaemon(true);
326		thread.start();
327		}
#	Line 343 | Line 365 | public class JSR166TestCase extends Test
365		// Never report first run of any test; treat it as a
366		// warmup run, notably to trigger all needed classloading,
367		if (i > 0)
368	<	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
368	>	System.out.printf("%s: %d%n", toString(), elapsedMillis);
369		}
370		}
371
#	Line 386 | Line 408 | public class JSR166TestCase extends Test
408		* Runs all unit tests in the given test suite.
409		* Actual behavior influenced by jsr166.* system properties.
410		*/
411	+	@SuppressWarnings("removal")
412		static void main(Test suite, String[] args) {
413		if (useSecurityManager) {
414		System.err.println("Setting a permissive security manager");
#	Line 419 | Line 442 | public class JSR166TestCase extends Test
442		for (String testClassName : testClassNames) {
443		try {
444		Class<?> testClass = Class.forName(testClassName);
445	<	Method m = testClass.getDeclaredMethod("suite",
423	<	new Class<?>[0]);
445	>	Method m = testClass.getDeclaredMethod("suite");
446		suite.addTest(newTestSuite((Test)m.invoke(null)));
447	<	} catch (Exception e) {
448	<	throw new Error("Missing test class", e);
447	>	} catch (ReflectiveOperationException e) {
448	>	throw new AssertionError("Missing test class", e);
449		}
450		}
451		}
#	Line 432 | Line 454 | public class JSR166TestCase extends Test
454		public static final String JAVA_SPECIFICATION_VERSION;
455		static {
456		try {
457	<	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
457	>	@SuppressWarnings("removal") double jcv =
458	>	java.security.AccessController.doPrivileged(
459		new java.security.PrivilegedAction<Double>() {
460		public Double run() {
461		return Double.valueOf(System.getProperty("java.class.version"));}});
462	<	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
462	>	JAVA_CLASS_VERSION = jcv;
463	>	@SuppressWarnings("removal") String jsv =
464	>	java.security.AccessController.doPrivileged(
465		new java.security.PrivilegedAction<String>() {
466		public String run() {
467		return System.getProperty("java.specification.version");}});
468	+	JAVA_SPECIFICATION_VERSION = jsv;
469		} catch (Throwable t) {
470		throw new Error(t);
471		}
472		}
473
474	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
475	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
476	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
477	<	public static boolean atLeastJava9() {
478	<	return JAVA_CLASS_VERSION >= 53.0
479	<	// As of 2015-09, java9 still uses 52.0 class file version
480	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
481	<	}
482	<	public static boolean atLeastJava10() {
483	<	return JAVA_CLASS_VERSION >= 54.0
484	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
485	<	}
474	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
475	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
476	>	public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
477	>	public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
478	>	public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
479	>	public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
480	>	public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
481	>	public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
482	>	public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
483	>	public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
484	>	public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
485	>	public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
486
487		/**
488		* Collects all JSR166 unit tests as one suite.
#	Line 508 | Line 534 | public class JSR166TestCase extends Test
534		ExecutorsTest.suite(),
535		ExecutorCompletionServiceTest.suite(),
536		FutureTaskTest.suite(),
537	+	HashtableTest.suite(),
538		LinkedBlockingDequeTest.suite(),
539		LinkedBlockingQueueTest.suite(),
540		LinkedListTest.suite(),
#	Line 544 | Line 571 | public class JSR166TestCase extends Test
571		"DoubleAdderTest",
572		"ForkJoinPool8Test",
573		"ForkJoinTask8Test",
574	+	"HashMapTest",
575		"LinkedBlockingDeque8Test",
576		"LinkedBlockingQueue8Test",
577	+	"LinkedHashMapTest",
578		"LongAccumulatorTest",
579		"LongAdderTest",
580		"SplittableRandomTest",
#	Line 573 | Line 602 | public class JSR166TestCase extends Test
602		addNamedTestClasses(suite, java9TestClassNames);
603		}
604
605	+	if (atLeastJava17()) {
606	+	String[] java17TestClassNames = {
607	+	"ForkJoinPool19Test",
608	+	};
609	+	addNamedTestClasses(suite, java17TestClassNames);
610	+	}
611		return suite;
612		}
613
#	Line 606 | Line 641 | public class JSR166TestCase extends Test
641		for (String methodName : testMethodNames(testClass))
642		suite.addTest((Test) c.newInstance(data, methodName));
643		return suite;
644	<	} catch (Exception e) {
645	<	throw new Error(e);
644	>	} catch (ReflectiveOperationException e) {
645	>	throw new AssertionError(e);
646		}
647		}
648
#	Line 623 | Line 658 | public class JSR166TestCase extends Test
658		if (atLeastJava8()) {
659		String name = testClass.getName();
660		String name8 = name.replaceAll("Test$", "8Test");
661	<	if (name.equals(name8)) throw new Error(name);
661	>	if (name.equals(name8)) throw new AssertionError(name);
662		try {
663		return (Test)
664		Class.forName(name8)
665	<	.getMethod("testSuite", new Class[] { dataClass })
665	>	.getMethod("testSuite", dataClass)
666		.invoke(null, data);
667	<	} catch (Exception e) {
668	<	throw new Error(e);
667	>	} catch (ReflectiveOperationException e) {
668	>	throw new AssertionError(e);
669		}
670		} else {
671		return new TestSuite();
#	Line 644 | Line 679 | public class JSR166TestCase extends Test
679		public static long MEDIUM_DELAY_MS;
680		public static long LONG_DELAY_MS;
681
682	+	/**
683	+	* A delay significantly longer than LONG_DELAY_MS.
684	+	* Use this in a thread that is waited for via awaitTermination(Thread).
685	+	*/
686	+	public static long LONGER_DELAY_MS;
687	+
688		private static final long RANDOM_TIMEOUT;
689		private static final long RANDOM_EXPIRED_TIMEOUT;
690		private static final TimeUnit RANDOM_TIMEUNIT;
#	Line 672 | Line 713 | public class JSR166TestCase extends Test
713		static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
714
715		/**
716	+	* Returns a random boolean; a "coin flip".
717	+	*/
718	+	static boolean randomBoolean() {
719	+	return ThreadLocalRandom.current().nextBoolean();
720	+	}
721	+
722	+	/**
723	+	* Returns a random element from given choices.
724	+	*/
725	+	<T> T chooseRandomly(List<T> choices) {
726	+	return choices.get(ThreadLocalRandom.current().nextInt(choices.size()));
727	+	}
728	+
729	+	/**
730	+	* Returns a random element from given choices.
731	+	*/
732	+	@SuppressWarnings("unchecked")
733	+	<T> T chooseRandomly(T... choices) {
734	+	return choices[ThreadLocalRandom.current().nextInt(choices.length)];
735	+	}
736	+
737	+	/**
738		* Returns the shortest timed delay. This can be scaled up for
739		* slow machines using the jsr166.delay.factor system property,
740		* or via jtreg's -timeoutFactor: flag.
#	Line 689 | Line 752 | public class JSR166TestCase extends Test
752		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
753		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
754		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
755	+	LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
756		}
757
758		private static final long TIMEOUT_DELAY_MS
#	Line 727 | Line 791 | public class JSR166TestCase extends Test
791		*/
792		public void threadRecordFailure(Throwable t) {
793		System.err.println(t);
794	<	dumpTestThreads();
795	<	threadFailure.compareAndSet(null, t);
794	>	if (threadFailure.compareAndSet(null, t))
795	>	dumpTestThreads();
796		}
797
798		public void setUp() {
#	Line 739 | Line 803 | public class JSR166TestCase extends Test
803		String msg = toString() + ": " + String.format(format, args);
804		System.err.println(msg);
805		dumpTestThreads();
806	<	throw new AssertionFailedError(msg);
806	>	throw new AssertionError(msg);
807		}
808
809		/**
#	Line 760 | Line 824 | public class JSR166TestCase extends Test
824		throw (RuntimeException) t;
825		else if (t instanceof Exception)
826		throw (Exception) t;
827	<	else {
828	<	AssertionFailedError afe =
765	<	new AssertionFailedError(t.toString());
766	<	afe.initCause(t);
767	<	throw afe;
768	<	}
827	>	else
828	>	throw new AssertionError(t.toString(), t);
829		}
830
831		if (Thread.interrupted())
#	Line 799 | Line 859 | public class JSR166TestCase extends Test
859
860		/**
861		* Just like fail(reason), but additionally recording (using
862	<	* threadRecordFailure) any AssertionFailedError thrown, so that
863	<	* the current testcase will fail.
862	>	* threadRecordFailure) any AssertionError thrown, so that the
863	>	* current testcase will fail.
864		*/
865		public void threadFail(String reason) {
866		try {
867		fail(reason);
868	<	} catch (AssertionFailedError t) {
869	<	threadRecordFailure(t);
870	<	throw t;
868	>	} catch (AssertionError fail) {
869	>	threadRecordFailure(fail);
870	>	throw fail;
871		}
872		}
873
874		/**
875		* Just like assertTrue(b), but additionally recording (using
876	<	* threadRecordFailure) any AssertionFailedError thrown, so that
877	<	* the current testcase will fail.
876	>	* threadRecordFailure) any AssertionError thrown, so that the
877	>	* current testcase will fail.
878		*/
879		public void threadAssertTrue(boolean b) {
880		try {
881		assertTrue(b);
882	<	} catch (AssertionFailedError t) {
883	<	threadRecordFailure(t);
884	<	throw t;
882	>	} catch (AssertionError fail) {
883	>	threadRecordFailure(fail);
884	>	throw fail;
885		}
886		}
887
888		/**
889		* Just like assertFalse(b), but additionally recording (using
890	<	* threadRecordFailure) any AssertionFailedError thrown, so that
891	<	* the current testcase will fail.
890	>	* threadRecordFailure) any AssertionError thrown, so that the
891	>	* current testcase will fail.
892		*/
893		public void threadAssertFalse(boolean b) {
894		try {
895		assertFalse(b);
896	<	} catch (AssertionFailedError t) {
897	<	threadRecordFailure(t);
898	<	throw t;
896	>	} catch (AssertionError fail) {
897	>	threadRecordFailure(fail);
898	>	throw fail;
899		}
900		}
901
902		/**
903		* Just like assertNull(x), 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 threadAssertNull(Object x) {
908		try {
909		assertNull(x);
910	<	} catch (AssertionFailedError t) {
911	<	threadRecordFailure(t);
912	<	throw t;
910	>	} catch (AssertionError fail) {
911	>	threadRecordFailure(fail);
912	>	throw fail;
913		}
914		}
915
916		/**
917		* Just like assertEquals(x, y), but additionally recording (using
918	<	* threadRecordFailure) any AssertionFailedError thrown, so that
919	<	* the current testcase will fail.
918	>	* threadRecordFailure) any AssertionError thrown, so that the
919	>	* current testcase will fail.
920		*/
921		public void threadAssertEquals(long x, long y) {
922		try {
923		assertEquals(x, y);
924	<	} catch (AssertionFailedError t) {
925	<	threadRecordFailure(t);
926	<	throw t;
924	>	} catch (AssertionError fail) {
925	>	threadRecordFailure(fail);
926	>	throw fail;
927		}
928		}
929
930		/**
931		* Just like assertEquals(x, y), but additionally recording (using
932	<	* threadRecordFailure) any AssertionFailedError thrown, so that
933	<	* the current testcase will fail.
932	>	* threadRecordFailure) any AssertionError thrown, so that the
933	>	* current testcase will fail.
934		*/
935		public void threadAssertEquals(Object x, Object y) {
936		try {
937		assertEquals(x, y);
938	<	} catch (AssertionFailedError fail) {
938	>	} catch (AssertionError fail) {
939		threadRecordFailure(fail);
940		throw fail;
941		} catch (Throwable fail) {
#	Line 885 | Line 945 | public class JSR166TestCase extends Test
945
946		/**
947		* Just like assertSame(x, y), but additionally recording (using
948	<	* threadRecordFailure) any AssertionFailedError thrown, so that
949	<	* the current testcase will fail.
948	>	* threadRecordFailure) any AssertionError thrown, so that the
949	>	* current testcase will fail.
950		*/
951		public void threadAssertSame(Object x, Object y) {
952		try {
953		assertSame(x, y);
954	<	} catch (AssertionFailedError fail) {
954	>	} catch (AssertionError fail) {
955		threadRecordFailure(fail);
956		throw fail;
957		}
#	Line 913 | Line 973 | public class JSR166TestCase extends Test
973
974		/**
975		* Records the given exception using {@link #threadRecordFailure},
976	<	* then rethrows the exception, wrapping it in an
977	<	* AssertionFailedError if necessary.
976	>	* then rethrows the exception, wrapping it in an AssertionError
977	>	* if necessary.
978		*/
979		public void threadUnexpectedException(Throwable t) {
980		threadRecordFailure(t);
#	Line 923 | Line 983 | public class JSR166TestCase extends Test
983		throw (RuntimeException) t;
984		else if (t instanceof Error)
985		throw (Error) t;
986	<	else {
987	<	AssertionFailedError afe =
928	<	new AssertionFailedError("unexpected exception: " + t);
929	<	afe.initCause(t);
930	<	throw afe;
931	<	}
986	>	else
987	>	throw new AssertionError("unexpected exception: " + t, t);
988		}
989
990		/**
#	Line 1010 | Line 1066 | public class JSR166TestCase extends Test
1066		void joinPool(ExecutorService pool) {
1067		try {
1068		pool.shutdown();
1069	<	if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1069	>	if (!pool.awaitTermination(20 * LONG_DELAY_MS, MILLISECONDS)) {
1070		try {
1071		threadFail("ExecutorService " + pool +
1072		" did not terminate in a timely manner");
#	Line 1057 | Line 1113 | public class JSR166TestCase extends Test
1113		}
1114		}
1115
1116	+	/** Returns true if thread info might be useful in a thread dump. */
1117	+	static boolean threadOfInterest(ThreadInfo info) {
1118	+	final String name = info.getThreadName();
1119	+	String lockName;
1120	+	if (name == null)
1121	+	return true;
1122	+	if (name.equals("Signal Dispatcher")
1123	+	|| name.equals("WedgedTestDetector"))
1124	+	return false;
1125	+	if (name.equals("Reference Handler")) {
1126	+	// Reference Handler stacktrace changed in JDK-8156500
1127	+	StackTraceElement[] stackTrace; String methodName;
1128	+	if ((stackTrace = info.getStackTrace()) != null
1129	+	&& stackTrace.length > 0
1130	+	&& (methodName = stackTrace[0].getMethodName()) != null
1131	+	&& methodName.equals("waitForReferencePendingList"))
1132	+	return false;
1133	+	// jdk8 Reference Handler stacktrace
1134	+	if ((lockName = info.getLockName()) != null
1135	+	&& lockName.startsWith("java.lang.ref"))
1136	+	return false;
1137	+	}
1138	+	if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
1139	+	&& (lockName = info.getLockName()) != null
1140	+	&& lockName.startsWith("java.lang.ref"))
1141	+	return false;
1142	+	if (name.startsWith("ForkJoinPool.commonPool-worker")
1143	+	&& (lockName = info.getLockName()) != null
1144	+	&& lockName.startsWith("java.util.concurrent.ForkJoinPool"))
1145	+	return false;
1146	+	return true;
1147	+	}
1148	+
1149		/**
1150		* A debugging tool to print stack traces of most threads, as jstack does.
1151		* Uninteresting threads are filtered out.
1152		*/
1153	+	@SuppressWarnings("removal")
1154		static void dumpTestThreads() {
1155		SecurityManager sm = System.getSecurityManager();
1156		if (sm != null) {
#	Line 1071 | Line 1161 | public class JSR166TestCase extends Test
1161		}
1162		}
1163
1074	–	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1164		System.err.println("------ stacktrace dump start ------");
1165	<	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1166	<	final String name = info.getThreadName();
1167	<	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	<	}
1165	>	for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
1166	>	if (threadOfInterest(info))
1167	>	System.err.print(info);
1168		System.err.println("------ stacktrace dump end ------");
1169
1170		if (sm != null) System.setSecurityManager(sm);
#	Line 1104 | Line 1179 | public class JSR166TestCase extends Test
1179		for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1180		try { delay(1); }
1181		catch (InterruptedException fail) {
1182	<	fail("Unexpected InterruptedException");
1182	>	throw new AssertionError("Unexpected InterruptedException", fail);
1183		}
1184		Thread.State s = thread.getState();
1185		if (s == expected)
#	Line 1116 | Line 1191 | public class JSR166TestCase extends Test
1191		}
1192
1193		/**
1194	+	* Returns the thread's blocker's class name, if any, else null.
1195	+	*/
1196	+	String blockerClassName(Thread thread) {
1197	+	ThreadInfo threadInfo; LockInfo lockInfo;
1198	+	if ((threadInfo = THREAD_MXBEAN.getThreadInfo(thread.getId(), 0)) != null
1199	+	&& (lockInfo = threadInfo.getLockInfo()) != null)
1200	+	return lockInfo.getClassName();
1201	+	return null;
1202	+	}
1203	+
1204	+	/**
1205		* Checks that future.get times out, with the default timeout of
1206		* {@code timeoutMillis()}.
1207		*/
1208	<	void assertFutureTimesOut(Future future) {
1208	>	void assertFutureTimesOut(Future<?> future) {
1209		assertFutureTimesOut(future, timeoutMillis());
1210		}
1211
1212		/**
1213		* Checks that future.get times out, with the given millisecond timeout.
1214		*/
1215	<	void assertFutureTimesOut(Future future, long timeoutMillis) {
1215	>	void assertFutureTimesOut(Future<?> future, long timeoutMillis) {
1216		long startTime = System.nanoTime();
1217		try {
1218		future.get(timeoutMillis, MILLISECONDS);
#	Line 1134 | Line 1220 | public class JSR166TestCase extends Test
1220		} catch (TimeoutException success) {
1221		} catch (Exception fail) {
1222		threadUnexpectedException(fail);
1223	<	} finally { future.cancel(true); }
1223	>	}
1224		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1225	+	assertFalse(future.isDone());
1226		}
1227
1228		/**
#	Line 1160 | Line 1247 | public class JSR166TestCase extends Test
1247
1248		/**
1249		* The number of elements to place in collections, arrays, etc.
1250	+	* Must be at least ten;
1251		*/
1252	<	public static final int SIZE = 20;
1252	>	public static final int SIZE = 32;
1253
1254	<	// Some convenient Integer constants
1255	<
1256	<	public static final Integer zero  = new Integer(0);
1257	<	public static final Integer one   = new Integer(1);
1258	<	public static final Integer two   = new Integer(2);
1259	<	public static final Integer three = new Integer(3);
1260	<	public static final Integer four  = new Integer(4);
1261	<	public static final Integer five  = new Integer(5);
1262	<	public static final Integer six   = new Integer(6);
1263	<	public static final Integer seven = new Integer(7);
1264	<	public static final Integer eight = new Integer(8);
1265	<	public static final Integer nine  = new Integer(9);
1266	<	public static final Integer m1  = new Integer(-1);
1267	<	public static final Integer m2  = new Integer(-2);
1268	<	public static final Integer m3  = new Integer(-3);
1269	<	public static final Integer m4  = new Integer(-4);
1270	<	public static final Integer m5  = new Integer(-5);
1271	<	public static final Integer m6  = new Integer(-6);
1272	<	public static final Integer m10 = new Integer(-10);
1254	>	static Item[] seqItems(int size) {
1255	>	Item[] s = new Item[size];
1256	>	for (int i = 0; i < size; ++i)
1257	>	s[i] = new Item(i);
1258	>	return s;
1259	>	}
1260	>	static Item[] negativeSeqItems(int size) {
1261	>	Item[] s = new Item[size];
1262	>	for (int i = 0; i < size; ++i)
1263	>	s[i] = new Item(-i);
1264	>	return s;
1265	>	}
1266	>
1267	>	// Many tests rely on defaultItems all being sequential nonnegative
1268	>	public static final Item[] defaultItems = seqItems(SIZE);
1269	>
1270	>	static Item itemFor(int i) { // check cache for defaultItems
1271	>	Item[] items = defaultItems;
1272	>	return (i >= 0 && i < items.length) ? items[i] : new Item(i);
1273	>	}
1274	>
1275	>	public static final Item zero  = defaultItems[0];
1276	>	public static final Item one   = defaultItems[1];
1277	>	public static final Item two   = defaultItems[2];
1278	>	public static final Item three = defaultItems[3];
1279	>	public static final Item four  = defaultItems[4];
1280	>	public static final Item five  = defaultItems[5];
1281	>	public static final Item six   = defaultItems[6];
1282	>	public static final Item seven = defaultItems[7];
1283	>	public static final Item eight = defaultItems[8];
1284	>	public static final Item nine  = defaultItems[9];
1285	>	public static final Item ten   = defaultItems[10];
1286	>
1287	>	public static final Item[] negativeItems = negativeSeqItems(SIZE);
1288	>
1289	>	public static final Item minusOne   = negativeItems[1];
1290	>	public static final Item minusTwo   = negativeItems[2];
1291	>	public static final Item minusThree = negativeItems[3];
1292	>	public static final Item minusFour  = negativeItems[4];
1293	>	public static final Item minusFive  = negativeItems[5];
1294	>	public static final Item minusSix   = negativeItems[6];
1295	>	public static final Item minusSeven = negativeItems[7];
1296	>	public static final Item minusEight = negativeItems[8];
1297	>	public static final Item minusNone  = negativeItems[9];
1298	>	public static final Item minusTen   = negativeItems[10];
1299	>
1300	>	// elements expected to be missing
1301	>	public static final Item fortytwo = new Item(42);
1302	>	public static final Item eightysix = new Item(86);
1303	>	public static final Item ninetynine = new Item(99);
1304	>
1305	>	// Interop across Item, int
1306	>
1307	>	static void mustEqual(Item x, Item y) {
1308	>	if (x != y)
1309	>	assertEquals(x.value, y.value);
1310	>	}
1311	>	static void mustEqual(Item x, int y) {
1312	>	assertEquals(x.value, y);
1313	>	}
1314	>	static void mustEqual(int x, Item y) {
1315	>	assertEquals(x, y.value);
1316	>	}
1317	>	static void mustEqual(int x, int y) {
1318	>	assertEquals(x, y);
1319	>	}
1320	>	static void mustEqual(Object x, Object y) {
1321	>	if (x != y)
1322	>	assertEquals(x, y);
1323	>	}
1324	>	static void mustEqual(int x, Object y) {
1325	>	if (y instanceof Item)
1326	>	assertEquals(x, ((Item)y).value);
1327	>	else fail();
1328	>	}
1329	>	static void mustEqual(Object x, int y) {
1330	>	if (x instanceof Item)
1331	>	assertEquals(((Item)x).value, y);
1332	>	else fail();
1333	>	}
1334	>	static void mustEqual(boolean x, boolean y) {
1335	>	assertEquals(x, y);
1336	>	}
1337	>	static void mustEqual(long x, long y) {
1338	>	assertEquals(x, y);
1339	>	}
1340	>	static void mustEqual(double x, double y) {
1341	>	assertEquals(x, y);
1342	>	}
1343	>	static void mustContain(Collection<Item> c, int i) {
1344	>	assertTrue(c.contains(itemFor(i)));
1345	>	}
1346	>	static void mustContain(Collection<Item> c, Item i) {
1347	>	assertTrue(c.contains(i));
1348	>	}
1349	>	static void mustNotContain(Collection<Item> c, int i) {
1350	>	assertFalse(c.contains(itemFor(i)));
1351	>	}
1352	>	static void mustNotContain(Collection<Item> c, Item i) {
1353	>	assertFalse(c.contains(i));
1354	>	}
1355	>	static void mustRemove(Collection<Item> c, int i) {
1356	>	assertTrue(c.remove(itemFor(i)));
1357	>	}
1358	>	static void mustRemove(Collection<Item> c, Item i) {
1359	>	assertTrue(c.remove(i));
1360	>	}
1361	>	static void mustNotRemove(Collection<Item> c, int i) {
1362	>	assertFalse(c.remove(itemFor(i)));
1363	>	}
1364	>	static void mustNotRemove(Collection<Item> c, Item i) {
1365	>	assertFalse(c.remove(i));
1366	>	}
1367	>	static void mustAdd(Collection<Item> c, int i) {
1368	>	assertTrue(c.add(itemFor(i)));
1369	>	}
1370	>	static void mustAdd(Collection<Item> c, Item i) {
1371	>	assertTrue(c.add(i));
1372	>	}
1373	>	static void mustOffer(Queue<Item> c, int i) {
1374	>	assertTrue(c.offer(itemFor(i)));
1375	>	}
1376	>	static void mustOffer(Queue<Item> c, Item i) {
1377	>	assertTrue(c.offer(i));
1378	>	}
1379
1380		/**
1381		* Runs Runnable r with a security policy that permits precisely
#	Line 1190 | Line 1384 | public class JSR166TestCase extends Test
1384		* security manager.  We require that any security manager permit
1385		* getPolicy/setPolicy.
1386		*/
1387	+	@SuppressWarnings("removal")
1388		public void runWithPermissions(Runnable r, Permission... permissions) {
1389		SecurityManager sm = System.getSecurityManager();
1390		if (sm == null) {
#	Line 1205 | Line 1400 | public class JSR166TestCase extends Test
1400		* Runnable.  We require that any security manager permit
1401		* getPolicy/setPolicy.
1402		*/
1403	+	@SuppressWarnings("removal")
1404		public void runWithSecurityManagerWithPermissions(Runnable r,
1405		Permission... permissions) {
1406	+	if (!useSecurityManager) return;
1407		SecurityManager sm = System.getSecurityManager();
1408		if (sm == null) {
1409		Policy savedPolicy = Policy.getPolicy();
#	Line 1243 | Line 1440 | public class JSR166TestCase extends Test
1440		* A security policy where new permissions can be dynamically added
1441		* or all cleared.
1442		*/
1443	+	@SuppressWarnings("removal")
1444		public static class AdjustablePolicy extends java.security.Policy {
1445		Permissions perms = new Permissions();
1446		AdjustablePolicy(Permission... permissions) {
#	Line 1272 | Line 1470 | public class JSR166TestCase extends Test
1470		/**
1471		* Returns a policy containing all the permissions we ever need.
1472		*/
1473	+	@SuppressWarnings("removal")
1474		public static Policy permissivePolicy() {
1475		return new AdjustablePolicy
1476		// Permissions j.u.c. needs directly
#	Line 1290 | Line 1489 | public class JSR166TestCase extends Test
1489
1490		/**
1491		* Sleeps until the given time has elapsed.
1492	<	* Throws AssertionFailedError if interrupted.
1492	>	* Throws AssertionError if interrupted.
1493		*/
1494		static void sleep(long millis) {
1495		try {
1496		delay(millis);
1497		} catch (InterruptedException fail) {
1498	<	AssertionFailedError afe =
1300	<	new AssertionFailedError("Unexpected InterruptedException");
1301	<	afe.initCause(fail);
1302	<	throw afe;
1498	>	throw new AssertionError("Unexpected InterruptedException", fail);
1499		}
1500		}
1501
1502		/**
1503		* Spin-waits up to the specified number of milliseconds for the given
1504		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1505	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1506		*/
1507	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1508	<	long startTime = 0L;
1509	<	for (;;) {
1510	<	Thread.State s = thread.getState();
1511	<	if (s == Thread.State.BLOCKED ||
1512	<	s == Thread.State.WAITING ||
1513	<	s == Thread.State.TIMED_WAITING)
1514	<	return;
1515	<	else if (s == Thread.State.TERMINATED)
1507	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1508	>	Callable<Boolean> waitingForGodot) {
1509	>	for (long startTime = 0L;;) {
1510	>	switch (thread.getState()) {
1511	>	default: break;
1512	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1513	>	try {
1514	>	if (waitingForGodot == null || waitingForGodot.call())
1515	>	return;
1516	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1517	>	break;
1518	>	case TERMINATED:
1519		fail("Unexpected thread termination");
1520	<	else if (startTime == 0L)
1520	>	}
1521	>
1522	>	if (startTime == 0L)
1523		startTime = System.nanoTime();
1524		else if (millisElapsedSince(startTime) > timeoutMillis) {
1525	<	threadAssertTrue(thread.isAlive());
1526	<	fail("timed out waiting for thread to enter wait state");
1525	>	assertTrue(thread.isAlive());
1526	>	if (waitingForGodot == null
1527	>	|| thread.getState() == Thread.State.RUNNABLE)
1528	>	fail("timed out waiting for thread to enter wait state");
1529	>	else
1530	>	fail("timed out waiting for condition, thread state="
1531	>	+ thread.getState());
1532		}
1533		Thread.yield();
1534		}
#	Line 1329 | Line 1536 | public class JSR166TestCase extends Test
1536
1537		/**
1538		* Spin-waits up to the specified number of milliseconds for the given
1539	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1333	<	* and additionally satisfy the given condition.
1539	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1540		*/
1541	<	void waitForThreadToEnterWaitState(
1542	<	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	<	}
1541	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1542	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1543		}
1544
1545		/**
#	Line 1362 | Line 1547 | public class JSR166TestCase extends Test
1547		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1548		*/
1549		void waitForThreadToEnterWaitState(Thread thread) {
1550	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1550	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1551		}
1552
1553		/**
#	Line 1370 | Line 1555 | public class JSR166TestCase extends Test
1555		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1556		* and additionally satisfy the given condition.
1557		*/
1558	<	void waitForThreadToEnterWaitState(
1559	<	Thread thread, Callable<Boolean> waitingForGodot) {
1558	>	void waitForThreadToEnterWaitState(Thread thread,
1559	>	Callable<Boolean> waitingForGodot) {
1560		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1561		}
1562
1563		/**
1564	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1565	+	* be interrupted.  Clears the interrupt status before returning.
1566	+	*/
1567	+	void awaitInterrupted() {
1568	+	for (long startTime = 0L; !Thread.interrupted(); ) {
1569	+	if (startTime == 0L)
1570	+	startTime = System.nanoTime();
1571	+	else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1572	+	fail("timed out waiting for thread interrupt");
1573	+	Thread.yield();
1574	+	}
1575	+	}
1576	+
1577	+	/**
1578		* Returns the number of milliseconds since time given by
1579		* startNanoTime, which must have been previously returned from a
1580		* call to {@link System#nanoTime()}.
#	Line 1384 | Line 1583 | public class JSR166TestCase extends Test
1583		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1584		}
1585
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	–
1586		/**
1587		* Checks that timed f.get() returns the expected value, and does not
1588		* wait for the timeout to elapse before returning.
1589		*/
1590		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1591		long startTime = System.nanoTime();
1592	+	T actual = null;
1593		try {
1594	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1594	>	actual = f.get(timeoutMillis, MILLISECONDS);
1595		} catch (Throwable fail) { threadUnexpectedException(fail); }
1596	+	assertEquals(expectedValue, actual);
1597		if (millisElapsedSince(startTime) > timeoutMillis/2)
1598	<	throw new AssertionFailedError("timed get did not return promptly");
1598	>	throw new AssertionError("timed get did not return promptly");
1599		}
1600
1601		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1425 | Line 1613 | public class JSR166TestCase extends Test
1613		}
1614
1615		/**
1616	+	* Returns a new started daemon Thread running the given action,
1617	+	* wrapped in a CheckedRunnable.
1618	+	*/
1619	+	Thread newStartedThread(Action action) {
1620	+	return newStartedThread(checkedRunnable(action));
1621	+	}
1622	+
1623	+	/**
1624		* Waits for the specified time (in milliseconds) for the thread
1625		* to terminate (using {@link Thread#join(long)}), else interrupts
1626		* the thread (in the hope that it may terminate later) and fails.
1627		*/
1628	<	void awaitTermination(Thread t, long timeoutMillis) {
1628	>	void awaitTermination(Thread thread, long timeoutMillis) {
1629		try {
1630	<	t.join(timeoutMillis);
1630	>	thread.join(timeoutMillis);
1631		} catch (InterruptedException fail) {
1632		threadUnexpectedException(fail);
1633	<	} finally {
1634	<	if (t.getState() != Thread.State.TERMINATED) {
1635	<	t.interrupt();
1636	<	threadFail("timed out waiting for thread to terminate");
1633	>	}
1634	>	if (thread.getState() != Thread.State.TERMINATED) {
1635	>	String detail = String.format(
1636	>	"timed out waiting for thread to terminate, thread=%s, state=%s" ,
1637	>	thread, thread.getState());
1638	>	try {
1639	>	threadFail(detail);
1640	>	} finally {
1641	>	// Interrupt thread __after__ having reported its stack trace
1642	>	thread.interrupt();
1643		}
1644		}
1645		}
#	Line 1465 | Line 1667 | public class JSR166TestCase extends Test
1667		}
1668		}
1669
1670	<	public abstract class RunnableShouldThrow implements Runnable {
1671	<	protected abstract void realRun() throws Throwable;
1672	<
1673	<	final Class<?> exceptionClass;
1674	<
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	<	}
1670	>	Runnable checkedRunnable(Action action) {
1671	>	return new CheckedRunnable() {
1672	>	public void realRun() throws Throwable {
1673	>	action.run();
1674	>	}};
1675		}
1676
1677		public abstract class ThreadShouldThrow extends Thread {
#	Line 1497 | Line 1686 | public class JSR166TestCase extends Test
1686		public final void run() {
1687		try {
1688		realRun();
1500	–	threadShouldThrow(exceptionClass.getSimpleName());
1689		} catch (Throwable t) {
1690		if (! exceptionClass.isInstance(t))
1691		threadUnexpectedException(t);
1692	+	return;
1693		}
1694	+	threadShouldThrow(exceptionClass.getSimpleName());
1695		}
1696		}
1697
#	Line 1511 | Line 1701 | public class JSR166TestCase extends Test
1701		public final void run() {
1702		try {
1703		realRun();
1514	–	threadShouldThrow("InterruptedException");
1704		} catch (InterruptedException success) {
1705		threadAssertFalse(Thread.interrupted());
1706	+	return;
1707		} catch (Throwable fail) {
1708		threadUnexpectedException(fail);
1709		}
1710	+	threadShouldThrow("InterruptedException");
1711		}
1712		}
1713
#	Line 1528 | Line 1719 | public class JSR166TestCase extends Test
1719		return realCall();
1720		} catch (Throwable fail) {
1721		threadUnexpectedException(fail);
1531	–	return null;
1722		}
1723	<	}
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;
1723	>	throw new AssertionError("unreached");
1724		}
1725		}
1726
#	Line 1555 | Line 1728 | public class JSR166TestCase extends Test
1728		public void run() {}
1729		}
1730
1731	<	public static class NoOpCallable implements Callable {
1731	>	public static class NoOpCallable implements Callable<Object> {
1732		public Object call() { return Boolean.TRUE; }
1733		}
1734
#	Line 1604 | Line 1777 | public class JSR166TestCase extends Test
1777		}
1778
1779		public void await(CountDownLatch latch, long timeoutMillis) {
1780	+	boolean timedOut = false;
1781		try {
1782	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1609	<	fail("timed out waiting for CountDownLatch for "
1610	<	+ (timeoutMillis/1000) + " sec");
1782	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1783		} catch (Throwable fail) {
1784		threadUnexpectedException(fail);
1785		}
1786	+	if (timedOut)
1787	+	fail("timed out waiting for CountDownLatch for "
1788	+	+ (timeoutMillis/1000) + " sec");
1789		}
1790
1791		public void await(CountDownLatch latch) {
#	Line 1618 | Line 1793 | public class JSR166TestCase extends Test
1793		}
1794
1795		public void await(Semaphore semaphore) {
1796	+	boolean timedOut = false;
1797		try {
1798	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1623	<	fail("timed out waiting for Semaphore for "
1624	<	+ (LONG_DELAY_MS/1000) + " sec");
1798	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1799		} catch (Throwable fail) {
1800		threadUnexpectedException(fail);
1801		}
1802	+	if (timedOut)
1803	+	fail("timed out waiting for Semaphore for "
1804	+	+ (LONG_DELAY_MS/1000) + " sec");
1805		}
1806
1807		public void await(CyclicBarrier barrier) {
#	Line 1649 | Line 1826 | public class JSR166TestCase extends Test
1826		//         long startTime = System.nanoTime();
1827		//         while (!flag.get()) {
1828		//             if (millisElapsedSince(startTime) > timeoutMillis)
1829	<	//                 throw new AssertionFailedError("timed out");
1829	>	//                 throw new AssertionError("timed out");
1830		//             Thread.yield();
1831		//         }
1832		//     }
#	Line 1658 | Line 1835 | public class JSR166TestCase extends Test
1835		public String call() { throw new NullPointerException(); }
1836		}
1837
1661	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1662	–	protected void realRun() {
1663	–	try {
1664	–	delay(SMALL_DELAY_MS);
1665	–	} catch (InterruptedException ok) {}
1666	–	}
1667	–	}
1668	–
1838		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1839		return new CheckedRunnable() {
1840		protected void realRun() {
#	Line 1721 | Line 1890 | public class JSR166TestCase extends Test
1890		return realCompute();
1891		} catch (Throwable fail) {
1892		threadUnexpectedException(fail);
1724	–	return null;
1893		}
1894	+	throw new AssertionError("unreached");
1895		}
1896		}
1897
#	Line 1736 | Line 1905 | public class JSR166TestCase extends Test
1905
1906		/**
1907		* A CyclicBarrier that uses timed await and fails with
1908	<	* AssertionFailedErrors instead of throwing checked exceptions.
1908	>	* AssertionErrors instead of throwing checked exceptions.
1909		*/
1910		public static class CheckedBarrier extends CyclicBarrier {
1911		public CheckedBarrier(int parties) { super(parties); }
1912
1913		public int await() {
1914		try {
1915	<	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1915	>	return super.await(LONGER_DELAY_MS, MILLISECONDS);
1916		} catch (TimeoutException timedOut) {
1917	<	throw new AssertionFailedError("timed out");
1917	>	throw new AssertionError("timed out");
1918		} catch (Exception fail) {
1919	<	AssertionFailedError afe =
1751	<	new AssertionFailedError("Unexpected exception: " + fail);
1752	<	afe.initCause(fail);
1753	<	throw afe;
1919	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1920		}
1921		}
1922		}
1923
1924	<	void checkEmpty(BlockingQueue q) {
1924	>	void checkEmpty(BlockingQueue<?> q) {
1925		try {
1926		assertTrue(q.isEmpty());
1927		assertEquals(0, q.size());
#	Line 1802 | Line 1968 | public class JSR166TestCase extends Test
1968		}
1969		}
1970
1971	<	void assertImmutable(final Object o) {
1971	>	@SuppressWarnings("unchecked")
1972	>	void assertImmutable(Object o) {
1973		if (o instanceof Collection) {
1974		assertThrows(
1975		UnsupportedOperationException.class,
1976	<	new Runnable() { public void run() {
1810	<	((Collection) o).add(null);}});
1976	>	() -> ((Collection) o).add(null));
1977		}
1978		}
1979
1980		@SuppressWarnings("unchecked")
1981		<T> T serialClone(T o) {
1982	+	T clone = null;
1983		try {
1984		ObjectInputStream ois = new ObjectInputStream
1985		(new ByteArrayInputStream(serialBytes(o)));
1986	<	T clone = (T) ois.readObject();
1820	<	if (o == clone) assertImmutable(o);
1821	<	assertSame(o.getClass(), clone.getClass());
1822	<	return clone;
1986	>	clone = (T) ois.readObject();
1987		} catch (Throwable fail) {
1988		threadUnexpectedException(fail);
1825	–	return null;
1989		}
1990	+	if (o == clone) assertImmutable(o);
1991	+	else assertSame(o.getClass(), clone.getClass());
1992	+	return clone;
1993		}
1994
1995		/**
#	Line 1842 | Line 2008 | public class JSR166TestCase extends Test
2008		(new ByteArrayInputStream(bos.toByteArray()));
2009		T clone = (T) ois.readObject();
2010		if (o == clone) assertImmutable(o);
2011	<	assertSame(o.getClass(), clone.getClass());
2011	>	else assertSame(o.getClass(), clone.getClass());
2012		return clone;
2013		}
2014
#	Line 1867 | Line 2033 | public class JSR166TestCase extends Test
2033		}
2034
2035		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
2036	<	Runnable... throwingActions) {
2037	<	for (Runnable throwingAction : throwingActions) {
2036	>	Action... throwingActions) {
2037	>	for (Action throwingAction : throwingActions) {
2038		boolean threw = false;
2039		try { throwingAction.run(); }
2040		catch (Throwable t) {
2041		threw = true;
2042	<	if (!expectedExceptionClass.isInstance(t)) {
2043	<	AssertionFailedError afe =
2044	<	new AssertionFailedError
2045	<	("Expected " + expectedExceptionClass.getName() +
2046	<	", got " + t.getClass().getName());
1881	<	afe.initCause(t);
1882	<	threadUnexpectedException(afe);
1883	<	}
2042	>	if (!expectedExceptionClass.isInstance(t))
2043	>	throw new AssertionError(
2044	>	"Expected " + expectedExceptionClass.getName() +
2045	>	", got " + t.getClass().getName(),
2046	>	t);
2047		}
2048		if (!threw)
2049		shouldThrow(expectedExceptionClass.getName());
#	Line 1955 | Line 2118 | public class JSR166TestCase extends Test
2118		shouldThrow();
2119		} catch (NullPointerException success) {}
2120		try {
2121	<	es.submit((Callable) null);
2121	>	es.submit((Callable<?>) null);
2122		shouldThrow();
2123		} catch (NullPointerException success) {}
2124
#	Line 1967 | Line 2130 | public class JSR166TestCase extends Test
2130		shouldThrow();
2131		} catch (NullPointerException success) {}
2132		try {
2133	<	ses.schedule((Callable) null,
2133	>	ses.schedule((Callable<?>) null,
2134		randomTimeout(), randomTimeUnit());
2135		shouldThrow();
2136		} catch (NullPointerException success) {}
#	Line 2096 | Line 2259 | public class JSR166TestCase extends Test
2259		assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2260		assertEquals(savedQueueSize, p.getQueue().size());
2261		}
2262	+
2263	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2264	+	assertEquals(x, y);
2265	+	assertEquals(y, x);
2266	+	assertEquals(x.isEmpty(), y.isEmpty());
2267	+	assertEquals(x.size(), y.size());
2268	+	if (x instanceof List) {
2269	+	assertEquals(x.toString(), y.toString());
2270	+	}
2271	+	if (x instanceof List || x instanceof Set) {
2272	+	assertEquals(x.hashCode(), y.hashCode());
2273	+	}
2274	+	if (x instanceof List || x instanceof Deque) {
2275	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2276	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2277	+	y.toArray(new Object[0])));
2278	+	}
2279	+	}
2280	+
2281	+	/**
2282	+	* A weaker form of assertCollectionsEquals which does not insist
2283	+	* that the two collections satisfy Object#equals(Object), since
2284	+	* they may use identity semantics as Deques do.
2285	+	*/
2286	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2287	+	if (x instanceof List || x instanceof Set)
2288	+	assertCollectionsEquals(x, y);
2289	+	else {
2290	+	assertEquals(x.isEmpty(), y.isEmpty());
2291	+	assertEquals(x.size(), y.size());
2292	+	assertEquals(new HashSet<Object>(x), new HashSet<Object>(y));
2293	+	if (x instanceof Deque) {
2294	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2295	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2296	+	y.toArray(new Object[0])));
2297	+	}
2298	+	}
2299	+	}
2300		}

Diff Legend

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