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.221 by jsr166, Tue Mar 14 00:54:27 2017 UTC vs.
Revision 1.251 by jsr166, Wed Dec 12 16:59:55 2018 UTC

#	Line 66 | Line 66 | import java.util.Arrays;
66		import java.util.Collection;
67		import java.util.Collections;
68		import java.util.Date;
69	+	import java.util.Deque;
70		import java.util.Enumeration;
71	+	import java.util.HashSet;
72		import java.util.Iterator;
73		import java.util.List;
74		import java.util.NoSuchElementException;
75		import java.util.PropertyPermission;
76	+	import java.util.Set;
77		import java.util.concurrent.BlockingQueue;
78		import java.util.concurrent.Callable;
79		import java.util.concurrent.CountDownLatch;
80		import java.util.concurrent.CyclicBarrier;
81		import java.util.concurrent.ExecutionException;
82	+	import java.util.concurrent.Executor;
83		import java.util.concurrent.Executors;
84		import java.util.concurrent.ExecutorService;
85		import java.util.concurrent.ForkJoinPool;
86		import java.util.concurrent.Future;
87	+	import java.util.concurrent.FutureTask;
88		import java.util.concurrent.RecursiveAction;
89		import java.util.concurrent.RecursiveTask;
90	+	import java.util.concurrent.RejectedExecutionException;
91		import java.util.concurrent.RejectedExecutionHandler;
92		import java.util.concurrent.Semaphore;
93	+	import java.util.concurrent.ScheduledExecutorService;
94	+	import java.util.concurrent.ScheduledFuture;
95		import java.util.concurrent.SynchronousQueue;
96		import java.util.concurrent.ThreadFactory;
97		import java.util.concurrent.ThreadLocalRandom;
98		import java.util.concurrent.ThreadPoolExecutor;
99	+	import java.util.concurrent.TimeUnit;
100		import java.util.concurrent.TimeoutException;
101		import java.util.concurrent.atomic.AtomicBoolean;
102		import java.util.concurrent.atomic.AtomicReference;
103		import java.util.regex.Pattern;
104
96	–	import junit.framework.AssertionFailedError;
105		import junit.framework.Test;
106		import junit.framework.TestCase;
107		import junit.framework.TestResult;
#	Line 109 | 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 413 | Line 429 | public class JSR166TestCase extends Test
429		for (String testClassName : testClassNames) {
430		try {
431		Class<?> testClass = Class.forName(testClassName);
432	<	Method m = testClass.getDeclaredMethod("suite",
417	<	new Class<?>[0]);
432	>	Method m = testClass.getDeclaredMethod("suite");
433		suite.addTest(newTestSuite((Test)m.invoke(null)));
434	<	} catch (Exception e) {
435	<	throw new Error("Missing test class", e);
434	>	} catch (ReflectiveOperationException e) {
435	>	throw new AssertionError("Missing test class", e);
436		}
437		}
438		}
#	Line 439 | Line 454 | public class JSR166TestCase extends Test
454		}
455		}
456
457	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
458	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
459	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
460	<	public static boolean atLeastJava9() {
461	<	return JAVA_CLASS_VERSION >= 53.0
462	<	// As of 2015-09, java9 still uses 52.0 class file version
448	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
449	<	}
450	<	public static boolean atLeastJava10() {
451	<	return JAVA_CLASS_VERSION >= 54.0
452	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
453	<	}
457	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
458	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
459	>	public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
460	>	public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
461	>	public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
462	>	public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
463
464		/**
465		* Collects all JSR166 unit tests as one suite.
#	Line 538 | Line 547 | public class JSR166TestCase extends Test
547		"DoubleAdderTest",
548		"ForkJoinPool8Test",
549		"ForkJoinTask8Test",
550	+	"HashMapTest",
551		"LinkedBlockingDeque8Test",
552		"LinkedBlockingQueue8Test",
553	+	"LinkedHashMapTest",
554		"LongAccumulatorTest",
555		"LongAdderTest",
556		"SplittableRandomTest",
#	Line 600 | Line 611 | public class JSR166TestCase extends Test
611		for (String methodName : testMethodNames(testClass))
612		suite.addTest((Test) c.newInstance(data, methodName));
613		return suite;
614	<	} catch (Exception e) {
615	<	throw new Error(e);
614	>	} catch (ReflectiveOperationException e) {
615	>	throw new AssertionError(e);
616		}
617		}
618
#	Line 617 | Line 628 | public class JSR166TestCase extends Test
628		if (atLeastJava8()) {
629		String name = testClass.getName();
630		String name8 = name.replaceAll("Test$", "8Test");
631	<	if (name.equals(name8)) throw new Error(name);
631	>	if (name.equals(name8)) throw new AssertionError(name);
632		try {
633		return (Test)
634		Class.forName(name8)
635	<	.getMethod("testSuite", new Class[] { dataClass })
635	>	.getMethod("testSuite", dataClass)
636		.invoke(null, data);
637	<	} catch (Exception e) {
638	<	throw new Error(e);
637	>	} catch (ReflectiveOperationException e) {
638	>	throw new AssertionError(e);
639		}
640		} else {
641		return new TestSuite();
#	Line 638 | Line 649 | public class JSR166TestCase extends Test
649		public static long MEDIUM_DELAY_MS;
650		public static long LONG_DELAY_MS;
651
652	+	private static final long RANDOM_TIMEOUT;
653	+	private static final long RANDOM_EXPIRED_TIMEOUT;
654	+	private static final TimeUnit RANDOM_TIMEUNIT;
655	+	static {
656	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
657	+	long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
658	+	RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
659	+	RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
660	+	TimeUnit[] timeUnits = TimeUnit.values();
661	+	RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
662	+	}
663	+
664	+	/**
665	+	* Returns a timeout for use when any value at all will do.
666	+	*/
667	+	static long randomTimeout() { return RANDOM_TIMEOUT; }
668	+
669	+	/**
670	+	* Returns a timeout that means "no waiting", i.e. not positive.
671	+	*/
672	+	static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
673	+
674	+	/**
675	+	* Returns a random non-null TimeUnit.
676	+	*/
677	+	static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
678	+
679		/**
680		* Returns the shortest timed delay. This can be scaled up for
681		* slow machines using the jsr166.delay.factor system property,
#	Line 658 | Line 696 | public class JSR166TestCase extends Test
696		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
697		}
698
699	+	private static final long TIMEOUT_DELAY_MS
700	+	= (long) (12.0 * Math.cbrt(delayFactor));
701	+
702		/**
703	<	* Returns a timeout in milliseconds to be used in tests that
704	<	* verify that operations block or time out.
703	>	* Returns a timeout in milliseconds to be used in tests that verify
704	>	* that operations block or time out.  We want this to be longer
705	>	* than the OS scheduling quantum, but not too long, so don't scale
706	>	* linearly with delayFactor; we use "crazy" cube root instead.
707		*/
708	<	long timeoutMillis() {
709	<	return SHORT_DELAY_MS / 4;
708	>	static long timeoutMillis() {
709	>	return TIMEOUT_DELAY_MS;
710		}
711
712		/**
#	Line 701 | Line 744 | public class JSR166TestCase extends Test
744		String msg = toString() + ": " + String.format(format, args);
745		System.err.println(msg);
746		dumpTestThreads();
747	<	throw new AssertionFailedError(msg);
747	>	throw new AssertionError(msg);
748		}
749
750		/**
#	Line 722 | Line 765 | public class JSR166TestCase extends Test
765		throw (RuntimeException) t;
766		else if (t instanceof Exception)
767		throw (Exception) t;
768	<	else {
769	<	AssertionFailedError afe =
727	<	new AssertionFailedError(t.toString());
728	<	afe.initCause(t);
729	<	throw afe;
730	<	}
768	>	else
769	>	throw new AssertionError(t.toString(), t);
770		}
771
772		if (Thread.interrupted())
#	Line 761 | Line 800 | public class JSR166TestCase extends Test
800
801		/**
802		* Just like fail(reason), but additionally recording (using
803	<	* threadRecordFailure) any AssertionFailedError thrown, so that
804	<	* the current testcase will fail.
803	>	* threadRecordFailure) any AssertionError thrown, so that the
804	>	* current testcase will fail.
805		*/
806		public void threadFail(String reason) {
807		try {
808		fail(reason);
809	<	} catch (AssertionFailedError t) {
810	<	threadRecordFailure(t);
811	<	throw t;
809	>	} catch (AssertionError fail) {
810	>	threadRecordFailure(fail);
811	>	throw fail;
812		}
813		}
814
815		/**
816		* Just like assertTrue(b), but additionally recording (using
817	<	* threadRecordFailure) any AssertionFailedError thrown, so that
818	<	* the current testcase will fail.
817	>	* threadRecordFailure) any AssertionError thrown, so that the
818	>	* current testcase will fail.
819		*/
820		public void threadAssertTrue(boolean b) {
821		try {
822		assertTrue(b);
823	<	} catch (AssertionFailedError t) {
824	<	threadRecordFailure(t);
825	<	throw t;
823	>	} catch (AssertionError fail) {
824	>	threadRecordFailure(fail);
825	>	throw fail;
826		}
827		}
828
829		/**
830		* Just like assertFalse(b), but additionally recording (using
831	<	* threadRecordFailure) any AssertionFailedError thrown, so that
832	<	* the current testcase will fail.
831	>	* threadRecordFailure) any AssertionError thrown, so that the
832	>	* current testcase will fail.
833		*/
834		public void threadAssertFalse(boolean b) {
835		try {
836		assertFalse(b);
837	<	} catch (AssertionFailedError t) {
838	<	threadRecordFailure(t);
839	<	throw t;
837	>	} catch (AssertionError fail) {
838	>	threadRecordFailure(fail);
839	>	throw fail;
840		}
841		}
842
843		/**
844		* Just like assertNull(x), but additionally recording (using
845	<	* threadRecordFailure) any AssertionFailedError thrown, so that
846	<	* the current testcase will fail.
845	>	* threadRecordFailure) any AssertionError thrown, so that the
846	>	* current testcase will fail.
847		*/
848		public void threadAssertNull(Object x) {
849		try {
850		assertNull(x);
851	<	} catch (AssertionFailedError t) {
852	<	threadRecordFailure(t);
853	<	throw t;
851	>	} catch (AssertionError fail) {
852	>	threadRecordFailure(fail);
853	>	throw fail;
854		}
855		}
856
857		/**
858		* Just like assertEquals(x, y), but additionally recording (using
859	<	* threadRecordFailure) any AssertionFailedError thrown, so that
860	<	* the current testcase will fail.
859	>	* threadRecordFailure) any AssertionError thrown, so that the
860	>	* current testcase will fail.
861		*/
862		public void threadAssertEquals(long x, long y) {
863		try {
864		assertEquals(x, y);
865	<	} catch (AssertionFailedError t) {
866	<	threadRecordFailure(t);
867	<	throw t;
865	>	} catch (AssertionError fail) {
866	>	threadRecordFailure(fail);
867	>	throw fail;
868		}
869		}
870
871		/**
872		* Just like assertEquals(x, y), but additionally recording (using
873	<	* threadRecordFailure) any AssertionFailedError thrown, so that
874	<	* the current testcase will fail.
873	>	* threadRecordFailure) any AssertionError thrown, so that the
874	>	* current testcase will fail.
875		*/
876		public void threadAssertEquals(Object x, Object y) {
877		try {
878		assertEquals(x, y);
879	<	} catch (AssertionFailedError fail) {
879	>	} catch (AssertionError fail) {
880		threadRecordFailure(fail);
881		throw fail;
882		} catch (Throwable fail) {
#	Line 847 | Line 886 | public class JSR166TestCase extends Test
886
887		/**
888		* Just like assertSame(x, y), but additionally recording (using
889	<	* threadRecordFailure) any AssertionFailedError thrown, so that
890	<	* the current testcase will fail.
889	>	* threadRecordFailure) any AssertionError thrown, so that the
890	>	* current testcase will fail.
891		*/
892		public void threadAssertSame(Object x, Object y) {
893		try {
894		assertSame(x, y);
895	<	} catch (AssertionFailedError fail) {
895	>	} catch (AssertionError fail) {
896		threadRecordFailure(fail);
897		throw fail;
898		}
#	Line 875 | Line 914 | public class JSR166TestCase extends Test
914
915		/**
916		* Records the given exception using {@link #threadRecordFailure},
917	<	* then rethrows the exception, wrapping it in an
918	<	* AssertionFailedError if necessary.
917	>	* then rethrows the exception, wrapping it in an AssertionError
918	>	* if necessary.
919		*/
920		public void threadUnexpectedException(Throwable t) {
921		threadRecordFailure(t);
#	Line 885 | Line 924 | public class JSR166TestCase extends Test
924		throw (RuntimeException) t;
925		else if (t instanceof Error)
926		throw (Error) t;
927	<	else {
928	<	AssertionFailedError afe =
890	<	new AssertionFailedError("unexpected exception: " + t);
891	<	afe.initCause(t);
892	<	throw afe;
893	<	}
927	>	else
928	>	throw new AssertionError("unexpected exception: " + t, t);
929		}
930
931		/**
#	Line 1058 | Line 1093 | public class JSR166TestCase extends Test
1093		}
1094
1095		/**
1096	<	* Checks that thread does not terminate within the default
1062	<	* millisecond delay of {@code timeoutMillis()}.
1096	>	* Checks that thread eventually enters the expected blocked thread state.
1097		*/
1098	<	void assertThreadStaysAlive(Thread thread) {
1099	<	assertThreadStaysAlive(thread, timeoutMillis());
1100	<	}
1101	<
1102	<	/**
1103	<	* Checks that thread does not terminate within the given millisecond delay.
1104	<	*/
1105	<	void assertThreadStaysAlive(Thread thread, long millis) {
1106	<	try {
1107	<	// No need to optimize the failing case via Thread.join.
1108	<	delay(millis);
1109	<	assertTrue(thread.isAlive());
1110	<	} catch (InterruptedException fail) {
1077	<	threadFail("Unexpected InterruptedException");
1078	<	}
1079	<	}
1080	<
1081	<	/**
1082	<	* Checks that the threads do not terminate within the default
1083	<	* millisecond delay of {@code timeoutMillis()}.
1084	<	*/
1085	<	void assertThreadsStayAlive(Thread... threads) {
1086	<	assertThreadsStayAlive(timeoutMillis(), threads);
1087	<	}
1088	<
1089	<	/**
1090	<	* Checks that the threads do not terminate within the given millisecond delay.
1091	<	*/
1092	<	void assertThreadsStayAlive(long millis, Thread... threads) {
1093	<	try {
1094	<	// No need to optimize the failing case via Thread.join.
1095	<	delay(millis);
1096	<	for (Thread thread : threads)
1097	<	assertTrue(thread.isAlive());
1098	<	} catch (InterruptedException fail) {
1099	<	threadFail("Unexpected InterruptedException");
1098	>	void assertThreadBlocks(Thread thread, Thread.State expected) {
1099	>	// always sleep at least 1 ms, with high probability avoiding
1100	>	// transitory states
1101	>	for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1102	>	try { delay(1); }
1103	>	catch (InterruptedException fail) {
1104	>	throw new AssertionError("Unexpected InterruptedException", fail);
1105	>	}
1106	>	Thread.State s = thread.getState();
1107	>	if (s == expected)
1108	>	return;
1109	>	else if (s == Thread.State.TERMINATED)
1110	>	fail("Unexpected thread termination");
1111		}
1112	+	fail("timed out waiting for thread to enter thread state " + expected);
1113		}
1114
1115		/**
#	Line 1138 | Line 1150 | public class JSR166TestCase extends Test
1150		}
1151
1152		/**
1153	+	* The maximum number of consecutive spurious wakeups we should
1154	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1155	+	*/
1156	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1157	+
1158	+	/**
1159		* The number of elements to place in collections, arrays, etc.
1160		*/
1161		public static final int SIZE = 20;
#	Line 1269 | Line 1287 | public class JSR166TestCase extends Test
1287
1288		/**
1289		* Sleeps until the given time has elapsed.
1290	<	* Throws AssertionFailedError if interrupted.
1290	>	* Throws AssertionError if interrupted.
1291		*/
1292		static void sleep(long millis) {
1293		try {
1294		delay(millis);
1295		} catch (InterruptedException fail) {
1296	<	AssertionFailedError afe =
1279	<	new AssertionFailedError("Unexpected InterruptedException");
1280	<	afe.initCause(fail);
1281	<	throw afe;
1296	>	throw new AssertionError("Unexpected InterruptedException", fail);
1297		}
1298		}
1299
1300		/**
1301		* Spin-waits up to the specified number of milliseconds for the given
1302		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1303	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1304		*/
1305	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1306	<	long startTime = 0L;
1307	<	for (;;) {
1308	<	Thread.State s = thread.getState();
1309	<	if (s == Thread.State.BLOCKED ||
1310	<	s == Thread.State.WAITING ||
1311	<	s == Thread.State.TIMED_WAITING)
1312	<	return;
1313	<	else if (s == Thread.State.TERMINATED)
1305	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1306	>	Callable<Boolean> waitingForGodot) {
1307	>	for (long startTime = 0L;;) {
1308	>	switch (thread.getState()) {
1309	>	default: break;
1310	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1311	>	try {
1312	>	if (waitingForGodot == null || waitingForGodot.call())
1313	>	return;
1314	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1315	>	break;
1316	>	case TERMINATED:
1317		fail("Unexpected thread termination");
1318	<	else if (startTime == 0L)
1318	>	}
1319	>
1320	>	if (startTime == 0L)
1321		startTime = System.nanoTime();
1322		else if (millisElapsedSince(startTime) > timeoutMillis) {
1323	<	threadAssertTrue(thread.isAlive());
1324	<	fail("timed out waiting for thread to enter wait state");
1323	>	assertTrue(thread.isAlive());
1324	>	if (waitingForGodot == null
1325	>	|| thread.getState() == Thread.State.RUNNABLE)
1326	>	fail("timed out waiting for thread to enter wait state");
1327	>	else
1328	>	fail("timed out waiting for condition, thread state="
1329	>	+ thread.getState());
1330		}
1331		Thread.yield();
1332		}
#	Line 1308 | Line 1334 | public class JSR166TestCase extends Test
1334
1335		/**
1336		* Spin-waits up to the specified number of milliseconds for the given
1337	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1312	<	* and additionally satisfy the given condition.
1337	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1338		*/
1339	<	void waitForThreadToEnterWaitState(
1340	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1316	<	long startTime = 0L;
1317	<	for (;;) {
1318	<	Thread.State s = thread.getState();
1319	<	if (s == Thread.State.BLOCKED ||
1320	<	s == Thread.State.WAITING ||
1321	<	s == Thread.State.TIMED_WAITING) {
1322	<	try {
1323	<	if (waitingForGodot.call())
1324	<	return;
1325	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1326	<	}
1327	<	else if (s == Thread.State.TERMINATED)
1328	<	fail("Unexpected thread termination");
1329	<	else if (startTime == 0L)
1330	<	startTime = System.nanoTime();
1331	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1332	<	threadAssertTrue(thread.isAlive());
1333	<	fail("timed out waiting for thread to enter wait state");
1334	<	}
1335	<	Thread.yield();
1336	<	}
1339	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1340	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1341		}
1342
1343		/**
#	Line 1341 | Line 1345 | public class JSR166TestCase extends Test
1345		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1346		*/
1347		void waitForThreadToEnterWaitState(Thread thread) {
1348	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1348	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1349		}
1350
1351		/**
#	Line 1349 | Line 1353 | public class JSR166TestCase extends Test
1353		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1354		* and additionally satisfy the given condition.
1355		*/
1356	<	void waitForThreadToEnterWaitState(
1357	<	Thread thread, Callable<Boolean> waitingForGodot) {
1356	>	void waitForThreadToEnterWaitState(Thread thread,
1357	>	Callable<Boolean> waitingForGodot) {
1358		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1359		}
1360
#	Line 1369 | Line 1373 | public class JSR166TestCase extends Test
1373		//             r.run();
1374		//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1375		//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1376	<	//             throw new AssertionFailedError("did not return promptly");
1376	>	//             throw new AssertionError("did not return promptly");
1377		//     }
1378
1379		//     void assertTerminatesPromptly(Runnable r) {
#	Line 1382 | Line 1386 | public class JSR166TestCase extends Test
1386		*/
1387		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1388		long startTime = System.nanoTime();
1389	+	T actual = null;
1390		try {
1391	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1391	>	actual = f.get(timeoutMillis, MILLISECONDS);
1392		} catch (Throwable fail) { threadUnexpectedException(fail); }
1393	+	assertEquals(expectedValue, actual);
1394		if (millisElapsedSince(startTime) > timeoutMillis/2)
1395	<	throw new AssertionFailedError("timed get did not return promptly");
1395	>	throw new AssertionError("timed get did not return promptly");
1396		}
1397
1398		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1444 | Line 1450 | public class JSR166TestCase extends Test
1450		}
1451		}
1452
1447	–	public abstract class RunnableShouldThrow implements Runnable {
1448	–	protected abstract void realRun() throws Throwable;
1449	–
1450	–	final Class<?> exceptionClass;
1451	–
1452	–	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1453	–	this.exceptionClass = exceptionClass;
1454	–	}
1455	–
1456	–	public final void run() {
1457	–	try {
1458	–	realRun();
1459	–	threadShouldThrow(exceptionClass.getSimpleName());
1460	–	} catch (Throwable t) {
1461	–	if (! exceptionClass.isInstance(t))
1462	–	threadUnexpectedException(t);
1463	–	}
1464	–	}
1465	–	}
1466	–
1453		public abstract class ThreadShouldThrow extends Thread {
1454		protected abstract void realRun() throws Throwable;
1455
#	Line 1476 | Line 1462 | public class JSR166TestCase extends Test
1462		public final void run() {
1463		try {
1464		realRun();
1479	–	threadShouldThrow(exceptionClass.getSimpleName());
1465		} catch (Throwable t) {
1466		if (! exceptionClass.isInstance(t))
1467		threadUnexpectedException(t);
1468	+	return;
1469		}
1470	+	threadShouldThrow(exceptionClass.getSimpleName());
1471		}
1472		}
1473
#	Line 1490 | Line 1477 | public class JSR166TestCase extends Test
1477		public final void run() {
1478		try {
1479		realRun();
1493	–	threadShouldThrow("InterruptedException");
1480		} catch (InterruptedException success) {
1481		threadAssertFalse(Thread.interrupted());
1482	+	return;
1483		} catch (Throwable fail) {
1484		threadUnexpectedException(fail);
1485		}
1486	+	threadShouldThrow("InterruptedException");
1487		}
1488		}
1489
#	Line 1507 | Line 1495 | public class JSR166TestCase extends Test
1495		return realCall();
1496		} catch (Throwable fail) {
1497		threadUnexpectedException(fail);
1510	–	return null;
1511	–	}
1512	–	}
1513	–	}
1514	–
1515	–	public abstract class CheckedInterruptedCallable<T>
1516	–	implements Callable<T> {
1517	–	protected abstract T realCall() throws Throwable;
1518	–
1519	–	public final T call() {
1520	–	try {
1521	–	T result = realCall();
1522	–	threadShouldThrow("InterruptedException");
1523	–	return result;
1524	–	} catch (InterruptedException success) {
1525	–	threadAssertFalse(Thread.interrupted());
1526	–	} catch (Throwable fail) {
1527	–	threadUnexpectedException(fail);
1498		}
1499	<	return null;
1499	>	throw new AssertionError("unreached");
1500		}
1501		}
1502
#	Line 1583 | Line 1553 | public class JSR166TestCase extends Test
1553		}
1554
1555		public void await(CountDownLatch latch, long timeoutMillis) {
1556	+	boolean timedOut = false;
1557		try {
1558	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1588	<	fail("timed out waiting for CountDownLatch for "
1589	<	+ (timeoutMillis/1000) + " sec");
1558	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1559		} catch (Throwable fail) {
1560		threadUnexpectedException(fail);
1561		}
1562	+	if (timedOut)
1563	+	fail("timed out waiting for CountDownLatch for "
1564	+	+ (timeoutMillis/1000) + " sec");
1565		}
1566
1567		public void await(CountDownLatch latch) {
#	Line 1597 | Line 1569 | public class JSR166TestCase extends Test
1569		}
1570
1571		public void await(Semaphore semaphore) {
1572	+	boolean timedOut = false;
1573	+	try {
1574	+	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1575	+	} catch (Throwable fail) {
1576	+	threadUnexpectedException(fail);
1577	+	}
1578	+	if (timedOut)
1579	+	fail("timed out waiting for Semaphore for "
1580	+	+ (LONG_DELAY_MS/1000) + " sec");
1581	+	}
1582	+
1583	+	public void await(CyclicBarrier barrier) {
1584		try {
1585	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1602	<	fail("timed out waiting for Semaphore for "
1603	<	+ (LONG_DELAY_MS/1000) + " sec");
1585	>	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1586		} catch (Throwable fail) {
1587		threadUnexpectedException(fail);
1588		}
#	Line 1620 | Line 1602 | public class JSR166TestCase extends Test
1602		//         long startTime = System.nanoTime();
1603		//         while (!flag.get()) {
1604		//             if (millisElapsedSince(startTime) > timeoutMillis)
1605	<	//                 throw new AssertionFailedError("timed out");
1605	>	//                 throw new AssertionError("timed out");
1606		//             Thread.yield();
1607		//         }
1608		//     }
#	Line 1629 | Line 1611 | public class JSR166TestCase extends Test
1611		public String call() { throw new NullPointerException(); }
1612		}
1613
1632	–	public static class CallableOne implements Callable<Integer> {
1633	–	public Integer call() { return one; }
1634	–	}
1635	–
1636	–	public class ShortRunnable extends CheckedRunnable {
1637	–	protected void realRun() throws Throwable {
1638	–	delay(SHORT_DELAY_MS);
1639	–	}
1640	–	}
1641	–
1642	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1643	–	protected void realRun() throws InterruptedException {
1644	–	delay(SHORT_DELAY_MS);
1645	–	}
1646	–	}
1647	–
1648	–	public class SmallRunnable extends CheckedRunnable {
1649	–	protected void realRun() throws Throwable {
1650	–	delay(SMALL_DELAY_MS);
1651	–	}
1652	–	}
1653	–
1654	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1655	–	protected void realRun() {
1656	–	try {
1657	–	delay(SMALL_DELAY_MS);
1658	–	} catch (InterruptedException ok) {}
1659	–	}
1660	–	}
1661	–
1662	–	public class SmallCallable extends CheckedCallable {
1663	–	protected Object realCall() throws InterruptedException {
1664	–	delay(SMALL_DELAY_MS);
1665	–	return Boolean.TRUE;
1666	–	}
1667	–	}
1668	–
1669	–	public class MediumRunnable extends CheckedRunnable {
1670	–	protected void realRun() throws Throwable {
1671	–	delay(MEDIUM_DELAY_MS);
1672	–	}
1673	–	}
1674	–
1675	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1676	–	protected void realRun() throws InterruptedException {
1677	–	delay(MEDIUM_DELAY_MS);
1678	–	}
1679	–	}
1680	–
1614		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1615		return new CheckedRunnable() {
1616		protected void realRun() {
#	Line 1687 | Line 1620 | public class JSR166TestCase extends Test
1620		}};
1621		}
1622
1690	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1691	–	protected void realRun() {
1692	–	try {
1693	–	delay(MEDIUM_DELAY_MS);
1694	–	} catch (InterruptedException ok) {}
1695	–	}
1696	–	}
1697	–
1698	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1699	–	protected void realRun() {
1700	–	try {
1701	–	delay(LONG_DELAY_MS);
1702	–	} catch (InterruptedException ok) {}
1703	–	}
1704	–	}
1705	–
1623		/**
1624		* For use as ThreadFactory in constructors
1625		*/
#	Line 1716 | Line 1633 | public class JSR166TestCase extends Test
1633		boolean isDone();
1634		}
1635
1719	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1720	–	return new TrackedRunnable() {
1721	–	private volatile boolean done = false;
1722	–	public boolean isDone() { return done; }
1723	–	public void run() {
1724	–	try {
1725	–	delay(timeoutMillis);
1726	–	done = true;
1727	–	} catch (InterruptedException ok) {}
1728	–	}
1729	–	};
1730	–	}
1731	–
1732	–	public static class TrackedShortRunnable implements Runnable {
1733	–	public volatile boolean done = false;
1734	–	public void run() {
1735	–	try {
1736	–	delay(SHORT_DELAY_MS);
1737	–	done = true;
1738	–	} catch (InterruptedException ok) {}
1739	–	}
1740	–	}
1741	–
1742	–	public static class TrackedSmallRunnable implements Runnable {
1743	–	public volatile boolean done = false;
1744	–	public void run() {
1745	–	try {
1746	–	delay(SMALL_DELAY_MS);
1747	–	done = true;
1748	–	} catch (InterruptedException ok) {}
1749	–	}
1750	–	}
1751	–
1752	–	public static class TrackedMediumRunnable implements Runnable {
1753	–	public volatile boolean done = false;
1754	–	public void run() {
1755	–	try {
1756	–	delay(MEDIUM_DELAY_MS);
1757	–	done = true;
1758	–	} catch (InterruptedException ok) {}
1759	–	}
1760	–	}
1761	–
1762	–	public static class TrackedLongRunnable implements Runnable {
1763	–	public volatile boolean done = false;
1764	–	public void run() {
1765	–	try {
1766	–	delay(LONG_DELAY_MS);
1767	–	done = true;
1768	–	} catch (InterruptedException ok) {}
1769	–	}
1770	–	}
1771	–
1636		public static class TrackedNoOpRunnable implements Runnable {
1637		public volatile boolean done = false;
1638		public void run() {
#	Line 1776 | Line 1640 | public class JSR166TestCase extends Test
1640		}
1641		}
1642
1779	–	public static class TrackedCallable implements Callable {
1780	–	public volatile boolean done = false;
1781	–	public Object call() {
1782	–	try {
1783	–	delay(SMALL_DELAY_MS);
1784	–	done = true;
1785	–	} catch (InterruptedException ok) {}
1786	–	return Boolean.TRUE;
1787	–	}
1788	–	}
1789	–
1643		/**
1644		* Analog of CheckedRunnable for RecursiveAction
1645		*/
#	Line 1813 | Line 1666 | public class JSR166TestCase extends Test
1666		return realCompute();
1667		} catch (Throwable fail) {
1668		threadUnexpectedException(fail);
1816	–	return null;
1669		}
1670	+	throw new AssertionError("unreached");
1671		}
1672		}
1673
#	Line 1828 | Line 1681 | public class JSR166TestCase extends Test
1681
1682		/**
1683		* A CyclicBarrier that uses timed await and fails with
1684	<	* AssertionFailedErrors instead of throwing checked exceptions.
1684	>	* AssertionErrors instead of throwing checked exceptions.
1685		*/
1686		public static class CheckedBarrier extends CyclicBarrier {
1687		public CheckedBarrier(int parties) { super(parties); }
#	Line 1837 | Line 1690 | public class JSR166TestCase extends Test
1690		try {
1691		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1692		} catch (TimeoutException timedOut) {
1693	<	throw new AssertionFailedError("timed out");
1693	>	throw new AssertionError("timed out");
1694		} catch (Exception fail) {
1695	<	AssertionFailedError afe =
1843	<	new AssertionFailedError("Unexpected exception: " + fail);
1844	<	afe.initCause(fail);
1845	<	throw afe;
1695	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1696		}
1697		}
1698		}
#	Line 1853 | Line 1703 | public class JSR166TestCase extends Test
1703		assertEquals(0, q.size());
1704		assertNull(q.peek());
1705		assertNull(q.poll());
1706	<	assertNull(q.poll(0, MILLISECONDS));
1706	>	assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1707		assertEquals(q.toString(), "[]");
1708		assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1709		assertFalse(q.iterator().hasNext());
#	Line 1905 | Line 1755 | public class JSR166TestCase extends Test
1755
1756		@SuppressWarnings("unchecked")
1757		<T> T serialClone(T o) {
1758	+	T clone = null;
1759		try {
1760		ObjectInputStream ois = new ObjectInputStream
1761		(new ByteArrayInputStream(serialBytes(o)));
1762	<	T clone = (T) ois.readObject();
1912	<	if (o == clone) assertImmutable(o);
1913	<	assertSame(o.getClass(), clone.getClass());
1914	<	return clone;
1762	>	clone = (T) ois.readObject();
1763		} catch (Throwable fail) {
1764		threadUnexpectedException(fail);
1917	–	return null;
1765		}
1766	+	if (o == clone) assertImmutable(o);
1767	+	else assertSame(o.getClass(), clone.getClass());
1768	+	return clone;
1769		}
1770
1771		/**
#	Line 1934 | Line 1784 | public class JSR166TestCase extends Test
1784		(new ByteArrayInputStream(bos.toByteArray()));
1785		T clone = (T) ois.readObject();
1786		if (o == clone) assertImmutable(o);
1787	<	assertSame(o.getClass(), clone.getClass());
1787	>	else assertSame(o.getClass(), clone.getClass());
1788		return clone;
1789		}
1790
#	Line 1965 | Line 1815 | public class JSR166TestCase extends Test
1815		try { throwingAction.run(); }
1816		catch (Throwable t) {
1817		threw = true;
1818	<	if (!expectedExceptionClass.isInstance(t)) {
1819	<	AssertionFailedError afe =
1820	<	new AssertionFailedError
1821	<	("Expected " + expectedExceptionClass.getName() +
1822	<	", got " + t.getClass().getName());
1973	<	afe.initCause(t);
1974	<	threadUnexpectedException(afe);
1975	<	}
1818	>	if (!expectedExceptionClass.isInstance(t))
1819	>	throw new AssertionError(
1820	>	"Expected " + expectedExceptionClass.getName() +
1821	>	", got " + t.getClass().getName(),
1822	>	t);
1823		}
1824		if (!threw)
1825		shouldThrow(expectedExceptionClass.getName());
#	Line 2004 | Line 1851 | public class JSR166TestCase extends Test
1851		static <T> void shuffle(T[] array) {
1852		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1853		}
1854	+
1855	+	/**
1856	+	* Returns the same String as would be returned by {@link
1857	+	* Object#toString}, whether or not the given object's class
1858	+	* overrides toString().
1859	+	*
1860	+	* @see System#identityHashCode
1861	+	*/
1862	+	static String identityString(Object x) {
1863	+	return x.getClass().getName()
1864	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1865	+	}
1866	+
1867	+	// --- Shared assertions for Executor tests ---
1868	+
1869	+	/**
1870	+	* Returns maximum number of tasks that can be submitted to given
1871	+	* pool (with bounded queue) before saturation (when submission
1872	+	* throws RejectedExecutionException).
1873	+	*/
1874	+	static final int saturatedSize(ThreadPoolExecutor pool) {
1875	+	BlockingQueue<Runnable> q = pool.getQueue();
1876	+	return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1877	+	}
1878	+
1879	+	@SuppressWarnings("FutureReturnValueIgnored")
1880	+	void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1881	+	try {
1882	+	e.execute((Runnable) null);
1883	+	shouldThrow();
1884	+	} catch (NullPointerException success) {}
1885	+
1886	+	if (! (e instanceof ExecutorService)) return;
1887	+	ExecutorService es = (ExecutorService) e;
1888	+	try {
1889	+	es.submit((Runnable) null);
1890	+	shouldThrow();
1891	+	} catch (NullPointerException success) {}
1892	+	try {
1893	+	es.submit((Runnable) null, Boolean.TRUE);
1894	+	shouldThrow();
1895	+	} catch (NullPointerException success) {}
1896	+	try {
1897	+	es.submit((Callable) null);
1898	+	shouldThrow();
1899	+	} catch (NullPointerException success) {}
1900	+
1901	+	if (! (e instanceof ScheduledExecutorService)) return;
1902	+	ScheduledExecutorService ses = (ScheduledExecutorService) e;
1903	+	try {
1904	+	ses.schedule((Runnable) null,
1905	+	randomTimeout(), randomTimeUnit());
1906	+	shouldThrow();
1907	+	} catch (NullPointerException success) {}
1908	+	try {
1909	+	ses.schedule((Callable) null,
1910	+	randomTimeout(), randomTimeUnit());
1911	+	shouldThrow();
1912	+	} catch (NullPointerException success) {}
1913	+	try {
1914	+	ses.scheduleAtFixedRate((Runnable) null,
1915	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1916	+	shouldThrow();
1917	+	} catch (NullPointerException success) {}
1918	+	try {
1919	+	ses.scheduleWithFixedDelay((Runnable) null,
1920	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1921	+	shouldThrow();
1922	+	} catch (NullPointerException success) {}
1923	+	}
1924	+
1925	+	void setRejectedExecutionHandler(
1926	+	ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1927	+	p.setRejectedExecutionHandler(handler);
1928	+	assertSame(handler, p.getRejectedExecutionHandler());
1929	+	}
1930	+
1931	+	void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1932	+	final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1933	+	final long savedTaskCount = p.getTaskCount();
1934	+	final long savedCompletedTaskCount = p.getCompletedTaskCount();
1935	+	final int savedQueueSize = p.getQueue().size();
1936	+	final boolean stock = (p.getClass().getClassLoader() == null);
1937	+
1938	+	Runnable r = () -> {};
1939	+	Callable<Boolean> c = () -> Boolean.TRUE;
1940	+
1941	+	class Recorder implements RejectedExecutionHandler {
1942	+	public volatile Runnable r = null;
1943	+	public volatile ThreadPoolExecutor p = null;
1944	+	public void reset() { r = null; p = null; }
1945	+	public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1946	+	assertNull(this.r);
1947	+	assertNull(this.p);
1948	+	this.r = r;
1949	+	this.p = p;
1950	+	}
1951	+	}
1952	+
1953	+	// check custom handler is invoked exactly once per task
1954	+	Recorder recorder = new Recorder();
1955	+	setRejectedExecutionHandler(p, recorder);
1956	+	for (int i = 2; i--> 0; ) {
1957	+	recorder.reset();
1958	+	p.execute(r);
1959	+	if (stock && p.getClass() == ThreadPoolExecutor.class)
1960	+	assertSame(r, recorder.r);
1961	+	assertSame(p, recorder.p);
1962	+
1963	+	recorder.reset();
1964	+	assertFalse(p.submit(r).isDone());
1965	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1966	+	assertSame(p, recorder.p);
1967	+
1968	+	recorder.reset();
1969	+	assertFalse(p.submit(r, Boolean.TRUE).isDone());
1970	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1971	+	assertSame(p, recorder.p);
1972	+
1973	+	recorder.reset();
1974	+	assertFalse(p.submit(c).isDone());
1975	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1976	+	assertSame(p, recorder.p);
1977	+
1978	+	if (p instanceof ScheduledExecutorService) {
1979	+	ScheduledExecutorService s = (ScheduledExecutorService) p;
1980	+	ScheduledFuture<?> future;
1981	+
1982	+	recorder.reset();
1983	+	future = s.schedule(r, randomTimeout(), randomTimeUnit());
1984	+	assertFalse(future.isDone());
1985	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1986	+	assertSame(p, recorder.p);
1987	+
1988	+	recorder.reset();
1989	+	future = s.schedule(c, randomTimeout(), randomTimeUnit());
1990	+	assertFalse(future.isDone());
1991	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1992	+	assertSame(p, recorder.p);
1993	+
1994	+	recorder.reset();
1995	+	future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1996	+	assertFalse(future.isDone());
1997	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1998	+	assertSame(p, recorder.p);
1999	+
2000	+	recorder.reset();
2001	+	future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2002	+	assertFalse(future.isDone());
2003	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2004	+	assertSame(p, recorder.p);
2005	+	}
2006	+	}
2007	+
2008	+	// Checking our custom handler above should be sufficient, but
2009	+	// we add some integration tests of standard handlers.
2010	+	final AtomicReference<Thread> thread = new AtomicReference<>();
2011	+	final Runnable setThread = () -> thread.set(Thread.currentThread());
2012	+
2013	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2014	+	try {
2015	+	p.execute(setThread);
2016	+	shouldThrow();
2017	+	} catch (RejectedExecutionException success) {}
2018	+	assertNull(thread.get());
2019	+
2020	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2021	+	p.execute(setThread);
2022	+	assertNull(thread.get());
2023	+
2024	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2025	+	p.execute(setThread);
2026	+	if (p.isShutdown())
2027	+	assertNull(thread.get());
2028	+	else
2029	+	assertSame(Thread.currentThread(), thread.get());
2030	+
2031	+	setRejectedExecutionHandler(p, savedHandler);
2032	+
2033	+	// check that pool was not perturbed by handlers
2034	+	assertEquals(savedTaskCount, p.getTaskCount());
2035	+	assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2036	+	assertEquals(savedQueueSize, p.getQueue().size());
2037	+	}
2038	+
2039	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2040	+	assertEquals(x, y);
2041	+	assertEquals(y, x);
2042	+	assertEquals(x.isEmpty(), y.isEmpty());
2043	+	assertEquals(x.size(), y.size());
2044	+	if (x instanceof List) {
2045	+	assertEquals(x.toString(), y.toString());
2046	+	}
2047	+	if (x instanceof List || x instanceof Set) {
2048	+	assertEquals(x.hashCode(), y.hashCode());
2049	+	}
2050	+	if (x instanceof List || x instanceof Deque) {
2051	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2052	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2053	+	y.toArray(new Object[0])));
2054	+	}
2055	+	}
2056	+
2057	+	/**
2058	+	* A weaker form of assertCollectionsEquals which does not insist
2059	+	* that the two collections satisfy Object#equals(Object), since
2060	+	* they may use identity semantics as Deques do.
2061	+	*/
2062	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2063	+	if (x instanceof List || x instanceof Set)
2064	+	assertCollectionsEquals(x, y);
2065	+	else {
2066	+	assertEquals(x.isEmpty(), y.isEmpty());
2067	+	assertEquals(x.size(), y.size());
2068	+	assertEquals(new HashSet(x), new HashSet(y));
2069	+	if (x instanceof Deque) {
2070	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2071	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2072	+	y.toArray(new Object[0])));
2073	+	}
2074	+	}
2075	+	}
2076		}

Diff Legend

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