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.230 by jsr166, Mon May 15 16:21:07 2017 UTC vs.
Revision 1.254 by jsr166, Wed Apr 24 17:36:09 2019 UTC

#	Line 66 | Line 66 | import java.util.Arrays;
66		import java.util.Collection;
67		import java.util.Collections;
68		import java.util.Date;
69	+	import java.util.Deque;
70		import java.util.Enumeration;
71	+	import java.util.HashSet;
72		import java.util.Iterator;
73		import java.util.List;
74		import java.util.NoSuchElementException;
75		import java.util.PropertyPermission;
76	+	import java.util.Set;
77		import java.util.concurrent.BlockingQueue;
78		import java.util.concurrent.Callable;
79		import java.util.concurrent.CountDownLatch;
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
463	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
464	<	}
465	<	public static boolean atLeastJava10() {
466	<	return JAVA_CLASS_VERSION >= 54.0
467	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
468	<	}
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	>	public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
464	>	public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
465	>	public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
466	>	public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
467	>	public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
468	>	public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
469
470		/**
471		* Collects all JSR166 unit tests as one suite.
#	Line 502 | Line 517 | public class JSR166TestCase extends Test
517		ExecutorsTest.suite(),
518		ExecutorCompletionServiceTest.suite(),
519		FutureTaskTest.suite(),
520	+	HashtableTest.suite(),
521		LinkedBlockingDequeTest.suite(),
522		LinkedBlockingQueueTest.suite(),
523		LinkedListTest.suite(),
#	Line 538 | Line 554 | public class JSR166TestCase extends Test
554		"DoubleAdderTest",
555		"ForkJoinPool8Test",
556		"ForkJoinTask8Test",
557	+	"HashMapTest",
558		"LinkedBlockingDeque8Test",
559		"LinkedBlockingQueue8Test",
560	+	"LinkedHashMapTest",
561		"LongAccumulatorTest",
562		"LongAdderTest",
563		"SplittableRandomTest",
#	Line 600 | Line 618 | public class JSR166TestCase extends Test
618		for (String methodName : testMethodNames(testClass))
619		suite.addTest((Test) c.newInstance(data, methodName));
620		return suite;
621	<	} catch (Exception e) {
622	<	throw new Error(e);
621	>	} catch (ReflectiveOperationException e) {
622	>	throw new AssertionError(e);
623		}
624		}
625
#	Line 617 | Line 635 | public class JSR166TestCase extends Test
635		if (atLeastJava8()) {
636		String name = testClass.getName();
637		String name8 = name.replaceAll("Test$", "8Test");
638	<	if (name.equals(name8)) throw new Error(name);
638	>	if (name.equals(name8)) throw new AssertionError(name);
639		try {
640		return (Test)
641		Class.forName(name8)
642	<	.getMethod("testSuite", new Class[] { dataClass })
642	>	.getMethod("testSuite", dataClass)
643		.invoke(null, data);
644	<	} catch (Exception e) {
645	<	throw new Error(e);
644	>	} catch (ReflectiveOperationException e) {
645	>	throw new AssertionError(e);
646		}
647		} else {
648		return new TestSuite();
#	Line 638 | Line 656 | public class JSR166TestCase extends Test
656		public static long MEDIUM_DELAY_MS;
657		public static long LONG_DELAY_MS;
658
659	+	private static final long RANDOM_TIMEOUT;
660	+	private static final long RANDOM_EXPIRED_TIMEOUT;
661	+	private static final TimeUnit RANDOM_TIMEUNIT;
662	+	static {
663	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
664	+	long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
665	+	RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
666	+	RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
667	+	TimeUnit[] timeUnits = TimeUnit.values();
668	+	RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
669	+	}
670	+
671	+	/**
672	+	* Returns a timeout for use when any value at all will do.
673	+	*/
674	+	static long randomTimeout() { return RANDOM_TIMEOUT; }
675	+
676	+	/**
677	+	* Returns a timeout that means "no waiting", i.e. not positive.
678	+	*/
679	+	static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
680	+
681	+	/**
682	+	* Returns a random non-null TimeUnit.
683	+	*/
684	+	static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
685	+
686		/**
687		* Returns the shortest timed delay. This can be scaled up for
688		* slow machines using the jsr166.delay.factor system property,
#	Line 706 | Line 751 | public class JSR166TestCase extends Test
751		String msg = toString() + ": " + String.format(format, args);
752		System.err.println(msg);
753		dumpTestThreads();
754	<	throw new AssertionFailedError(msg);
754	>	throw new AssertionError(msg);
755		}
756
757		/**
#	Line 727 | Line 772 | public class JSR166TestCase extends Test
772		throw (RuntimeException) t;
773		else if (t instanceof Exception)
774		throw (Exception) t;
775	<	else {
776	<	AssertionFailedError afe =
732	<	new AssertionFailedError(t.toString());
733	<	afe.initCause(t);
734	<	throw afe;
735	<	}
775	>	else
776	>	throw new AssertionError(t.toString(), t);
777		}
778
779		if (Thread.interrupted())
#	Line 766 | Line 807 | public class JSR166TestCase extends Test
807
808		/**
809		* Just like fail(reason), but additionally recording (using
810	<	* threadRecordFailure) any AssertionFailedError thrown, so that
811	<	* the current testcase will fail.
810	>	* threadRecordFailure) any AssertionError thrown, so that the
811	>	* current testcase will fail.
812		*/
813		public void threadFail(String reason) {
814		try {
815		fail(reason);
816	<	} catch (AssertionFailedError t) {
817	<	threadRecordFailure(t);
818	<	throw t;
816	>	} catch (AssertionError fail) {
817	>	threadRecordFailure(fail);
818	>	throw fail;
819		}
820		}
821
822		/**
823		* Just like assertTrue(b), but additionally recording (using
824	<	* threadRecordFailure) any AssertionFailedError thrown, so that
825	<	* the current testcase will fail.
824	>	* threadRecordFailure) any AssertionError thrown, so that the
825	>	* current testcase will fail.
826		*/
827		public void threadAssertTrue(boolean b) {
828		try {
829		assertTrue(b);
830	<	} catch (AssertionFailedError t) {
831	<	threadRecordFailure(t);
832	<	throw t;
830	>	} catch (AssertionError fail) {
831	>	threadRecordFailure(fail);
832	>	throw fail;
833		}
834		}
835
836		/**
837		* Just like assertFalse(b), but additionally recording (using
838	<	* threadRecordFailure) any AssertionFailedError thrown, so that
839	<	* the current testcase will fail.
838	>	* threadRecordFailure) any AssertionError thrown, so that the
839	>	* current testcase will fail.
840		*/
841		public void threadAssertFalse(boolean b) {
842		try {
843		assertFalse(b);
844	<	} catch (AssertionFailedError t) {
845	<	threadRecordFailure(t);
846	<	throw t;
844	>	} catch (AssertionError fail) {
845	>	threadRecordFailure(fail);
846	>	throw fail;
847		}
848		}
849
850		/**
851		* Just like assertNull(x), but additionally recording (using
852	<	* threadRecordFailure) any AssertionFailedError thrown, so that
853	<	* the current testcase will fail.
852	>	* threadRecordFailure) any AssertionError thrown, so that the
853	>	* current testcase will fail.
854		*/
855		public void threadAssertNull(Object x) {
856		try {
857		assertNull(x);
858	<	} catch (AssertionFailedError t) {
859	<	threadRecordFailure(t);
860	<	throw t;
858	>	} catch (AssertionError fail) {
859	>	threadRecordFailure(fail);
860	>	throw fail;
861		}
862		}
863
864		/**
865		* Just like assertEquals(x, y), but additionally recording (using
866	<	* threadRecordFailure) any AssertionFailedError thrown, so that
867	<	* the current testcase will fail.
866	>	* threadRecordFailure) any AssertionError thrown, so that the
867	>	* current testcase will fail.
868		*/
869		public void threadAssertEquals(long x, long y) {
870		try {
871		assertEquals(x, y);
872	<	} catch (AssertionFailedError t) {
873	<	threadRecordFailure(t);
874	<	throw t;
872	>	} catch (AssertionError fail) {
873	>	threadRecordFailure(fail);
874	>	throw fail;
875		}
876		}
877
878		/**
879		* Just like assertEquals(x, y), but additionally recording (using
880	<	* threadRecordFailure) any AssertionFailedError thrown, so that
881	<	* the current testcase will fail.
880	>	* threadRecordFailure) any AssertionError thrown, so that the
881	>	* current testcase will fail.
882		*/
883		public void threadAssertEquals(Object x, Object y) {
884		try {
885		assertEquals(x, y);
886	<	} catch (AssertionFailedError fail) {
886	>	} catch (AssertionError fail) {
887		threadRecordFailure(fail);
888		throw fail;
889		} catch (Throwable fail) {
#	Line 852 | Line 893 | public class JSR166TestCase extends Test
893
894		/**
895		* Just like assertSame(x, y), but additionally recording (using
896	<	* threadRecordFailure) any AssertionFailedError thrown, so that
897	<	* the current testcase will fail.
896	>	* threadRecordFailure) any AssertionError thrown, so that the
897	>	* current testcase will fail.
898		*/
899		public void threadAssertSame(Object x, Object y) {
900		try {
901		assertSame(x, y);
902	<	} catch (AssertionFailedError fail) {
902	>	} catch (AssertionError fail) {
903		threadRecordFailure(fail);
904		throw fail;
905		}
#	Line 880 | Line 921 | public class JSR166TestCase extends Test
921
922		/**
923		* Records the given exception using {@link #threadRecordFailure},
924	<	* then rethrows the exception, wrapping it in an
925	<	* AssertionFailedError if necessary.
924	>	* then rethrows the exception, wrapping it in an AssertionError
925	>	* if necessary.
926		*/
927		public void threadUnexpectedException(Throwable t) {
928		threadRecordFailure(t);
#	Line 890 | Line 931 | public class JSR166TestCase extends Test
931		throw (RuntimeException) t;
932		else if (t instanceof Error)
933		throw (Error) t;
934	<	else {
935	<	AssertionFailedError afe =
895	<	new AssertionFailedError("unexpected exception: " + t);
896	<	afe.initCause(t);
897	<	throw afe;
898	<	}
934	>	else
935	>	throw new AssertionError("unexpected exception: " + t, t);
936		}
937
938		/**
#	Line 1071 | Line 1108 | public class JSR166TestCase extends Test
1108		for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1109		try { delay(1); }
1110		catch (InterruptedException fail) {
1111	<	fail("Unexpected InterruptedException");
1111	>	throw new AssertionError("Unexpected InterruptedException", fail);
1112		}
1113		Thread.State s = thread.getState();
1114		if (s == expected)
#	Line 1083 | Line 1120 | public class JSR166TestCase extends Test
1120		}
1121
1122		/**
1086	–	* Checks that thread does not terminate within the default
1087	–	* millisecond delay of {@code timeoutMillis()}.
1088	–	* TODO: REMOVEME
1089	–	*/
1090	–	void assertThreadStaysAlive(Thread thread) {
1091	–	assertThreadStaysAlive(thread, timeoutMillis());
1092	–	}
1093	–
1094	–	/**
1095	–	* Checks that thread does not terminate within the given millisecond delay.
1096	–	* TODO: REMOVEME
1097	–	*/
1098	–	void assertThreadStaysAlive(Thread thread, long millis) {
1099	–	try {
1100	–	// No need to optimize the failing case via Thread.join.
1101	–	delay(millis);
1102	–	assertTrue(thread.isAlive());
1103	–	} catch (InterruptedException fail) {
1104	–	threadFail("Unexpected InterruptedException");
1105	–	}
1106	–	}
1107	–
1108	–	/**
1123		* Checks that future.get times out, with the default timeout of
1124		* {@code timeoutMillis()}.
1125		*/
#	Line 1280 | Line 1294 | public class JSR166TestCase extends Test
1294
1295		/**
1296		* Sleeps until the given time has elapsed.
1297	<	* Throws AssertionFailedError if interrupted.
1297	>	* Throws AssertionError if interrupted.
1298		*/
1299		static void sleep(long millis) {
1300		try {
1301		delay(millis);
1302		} catch (InterruptedException fail) {
1303	<	AssertionFailedError afe =
1290	<	new AssertionFailedError("Unexpected InterruptedException");
1291	<	afe.initCause(fail);
1292	<	throw afe;
1303	>	throw new AssertionError("Unexpected InterruptedException", fail);
1304		}
1305		}
1306
1307		/**
1308		* Spin-waits up to the specified number of milliseconds for the given
1309		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1310	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1311		*/
1312	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1313	<	long startTime = 0L;
1314	<	for (;;) {
1315	<	Thread.State s = thread.getState();
1316	<	if (s == Thread.State.BLOCKED ||
1317	<	s == Thread.State.WAITING ||
1318	<	s == Thread.State.TIMED_WAITING)
1319	<	return;
1320	<	else if (s == Thread.State.TERMINATED)
1312	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1313	>	Callable<Boolean> waitingForGodot) {
1314	>	for (long startTime = 0L;;) {
1315	>	switch (thread.getState()) {
1316	>	default: break;
1317	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1318	>	try {
1319	>	if (waitingForGodot == null || waitingForGodot.call())
1320	>	return;
1321	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1322	>	break;
1323	>	case TERMINATED:
1324		fail("Unexpected thread termination");
1325	<	else if (startTime == 0L)
1325	>	}
1326	>
1327	>	if (startTime == 0L)
1328		startTime = System.nanoTime();
1329		else if (millisElapsedSince(startTime) > timeoutMillis) {
1330	<	threadAssertTrue(thread.isAlive());
1331	<	fail("timed out waiting for thread to enter wait state");
1330	>	assertTrue(thread.isAlive());
1331	>	if (waitingForGodot == null
1332	>	|| thread.getState() == Thread.State.RUNNABLE)
1333	>	fail("timed out waiting for thread to enter wait state");
1334	>	else
1335	>	fail("timed out waiting for condition, thread state="
1336	>	+ thread.getState());
1337		}
1338		Thread.yield();
1339		}
#	Line 1319 | Line 1341 | public class JSR166TestCase extends Test
1341
1342		/**
1343		* Spin-waits up to the specified number of milliseconds for the given
1344	<	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1323	<	* and additionally satisfy the given condition.
1344	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1345		*/
1346	<	void waitForThreadToEnterWaitState(
1347	<	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1327	<	long startTime = 0L;
1328	<	for (;;) {
1329	<	Thread.State s = thread.getState();
1330	<	if (s == Thread.State.BLOCKED ||
1331	<	s == Thread.State.WAITING ||
1332	<	s == Thread.State.TIMED_WAITING) {
1333	<	try {
1334	<	if (waitingForGodot.call())
1335	<	return;
1336	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
1337	<	}
1338	<	else if (s == Thread.State.TERMINATED)
1339	<	fail("Unexpected thread termination");
1340	<	else if (startTime == 0L)
1341	<	startTime = System.nanoTime();
1342	<	else if (millisElapsedSince(startTime) > timeoutMillis) {
1343	<	threadAssertTrue(thread.isAlive());
1344	<	fail("timed out waiting for thread to enter wait state");
1345	<	}
1346	<	Thread.yield();
1347	<	}
1346	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1347	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1348		}
1349
1350		/**
#	Line 1352 | Line 1352 | public class JSR166TestCase extends Test
1352		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1353		*/
1354		void waitForThreadToEnterWaitState(Thread thread) {
1355	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1355	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1356		}
1357
1358		/**
#	Line 1360 | Line 1360 | public class JSR166TestCase extends Test
1360		* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1361		* and additionally satisfy the given condition.
1362		*/
1363	<	void waitForThreadToEnterWaitState(
1364	<	Thread thread, Callable<Boolean> waitingForGodot) {
1363	>	void waitForThreadToEnterWaitState(Thread thread,
1364	>	Callable<Boolean> waitingForGodot) {
1365		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1366		}
1367
#	Line 1380 | Line 1380 | public class JSR166TestCase extends Test
1380		//             r.run();
1381		//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1382		//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1383	<	//             throw new AssertionFailedError("did not return promptly");
1383	>	//             throw new AssertionError("did not return promptly");
1384		//     }
1385
1386		//     void assertTerminatesPromptly(Runnable r) {
#	Line 1393 | Line 1393 | public class JSR166TestCase extends Test
1393		*/
1394		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1395		long startTime = System.nanoTime();
1396	+	T actual = null;
1397		try {
1398	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1398	>	actual = f.get(timeoutMillis, MILLISECONDS);
1399		} catch (Throwable fail) { threadUnexpectedException(fail); }
1400	+	assertEquals(expectedValue, actual);
1401		if (millisElapsedSince(startTime) > timeoutMillis/2)
1402	<	throw new AssertionFailedError("timed get did not return promptly");
1402	>	throw new AssertionError("timed get did not return promptly");
1403		}
1404
1405		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1455 | Line 1457 | public class JSR166TestCase extends Test
1457		}
1458		}
1459
1458	–	public abstract class RunnableShouldThrow implements Runnable {
1459	–	protected abstract void realRun() throws Throwable;
1460	–
1461	–	final Class<?> exceptionClass;
1462	–
1463	–	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1464	–	this.exceptionClass = exceptionClass;
1465	–	}
1466	–
1467	–	public final void run() {
1468	–	try {
1469	–	realRun();
1470	–	threadShouldThrow(exceptionClass.getSimpleName());
1471	–	} catch (Throwable t) {
1472	–	if (! exceptionClass.isInstance(t))
1473	–	threadUnexpectedException(t);
1474	–	}
1475	–	}
1476	–	}
1477	–
1460		public abstract class ThreadShouldThrow extends Thread {
1461		protected abstract void realRun() throws Throwable;
1462
#	Line 1487 | Line 1469 | public class JSR166TestCase extends Test
1469		public final void run() {
1470		try {
1471		realRun();
1490	–	threadShouldThrow(exceptionClass.getSimpleName());
1472		} catch (Throwable t) {
1473		if (! exceptionClass.isInstance(t))
1474		threadUnexpectedException(t);
1475	+	return;
1476		}
1477	+	threadShouldThrow(exceptionClass.getSimpleName());
1478		}
1479		}
1480
#	Line 1501 | Line 1484 | public class JSR166TestCase extends Test
1484		public final void run() {
1485		try {
1486		realRun();
1504	–	threadShouldThrow("InterruptedException");
1487		} catch (InterruptedException success) {
1488		threadAssertFalse(Thread.interrupted());
1489	+	return;
1490		} catch (Throwable fail) {
1491		threadUnexpectedException(fail);
1492		}
1493	+	threadShouldThrow("InterruptedException");
1494		}
1495		}
1496
#	Line 1518 | Line 1502 | public class JSR166TestCase extends Test
1502		return realCall();
1503		} catch (Throwable fail) {
1504		threadUnexpectedException(fail);
1521	–	return null;
1505		}
1506	<	}
1524	<	}
1525	<
1526	<	public abstract class CheckedInterruptedCallable<T>
1527	<	implements Callable<T> {
1528	<	protected abstract T realCall() throws Throwable;
1529	<
1530	<	public final T call() {
1531	<	try {
1532	<	T result = realCall();
1533	<	threadShouldThrow("InterruptedException");
1534	<	return result;
1535	<	} catch (InterruptedException success) {
1536	<	threadAssertFalse(Thread.interrupted());
1537	<	} catch (Throwable fail) {
1538	<	threadUnexpectedException(fail);
1539	<	}
1540	<	return null;
1506	>	throw new AssertionError("unreached");
1507		}
1508		}
1509
#	Line 1594 | Line 1560 | public class JSR166TestCase extends Test
1560		}
1561
1562		public void await(CountDownLatch latch, long timeoutMillis) {
1563	+	boolean timedOut = false;
1564		try {
1565	<	if (!latch.await(timeoutMillis, MILLISECONDS))
1599	<	fail("timed out waiting for CountDownLatch for "
1600	<	+ (timeoutMillis/1000) + " sec");
1565	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1566		} catch (Throwable fail) {
1567		threadUnexpectedException(fail);
1568		}
1569	+	if (timedOut)
1570	+	fail("timed out waiting for CountDownLatch for "
1571	+	+ (timeoutMillis/1000) + " sec");
1572		}
1573
1574		public void await(CountDownLatch latch) {
#	Line 1608 | Line 1576 | public class JSR166TestCase extends Test
1576		}
1577
1578		public void await(Semaphore semaphore) {
1579	+	boolean timedOut = false;
1580		try {
1581	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1613	<	fail("timed out waiting for Semaphore for "
1614	<	+ (LONG_DELAY_MS/1000) + " sec");
1581	>	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1582		} catch (Throwable fail) {
1583		threadUnexpectedException(fail);
1584		}
1585	+	if (timedOut)
1586	+	fail("timed out waiting for Semaphore for "
1587	+	+ (LONG_DELAY_MS/1000) + " sec");
1588		}
1589
1590		public void await(CyclicBarrier barrier) {
#	Line 1639 | Line 1609 | public class JSR166TestCase extends Test
1609		//         long startTime = System.nanoTime();
1610		//         while (!flag.get()) {
1611		//             if (millisElapsedSince(startTime) > timeoutMillis)
1612	<	//                 throw new AssertionFailedError("timed out");
1612	>	//                 throw new AssertionError("timed out");
1613		//             Thread.yield();
1614		//         }
1615		//     }
#	Line 1648 | Line 1618 | public class JSR166TestCase extends Test
1618		public String call() { throw new NullPointerException(); }
1619		}
1620
1651	–	public static class CallableOne implements Callable<Integer> {
1652	–	public Integer call() { return one; }
1653	–	}
1654	–
1655	–	public class ShortRunnable extends CheckedRunnable {
1656	–	protected void realRun() throws Throwable {
1657	–	delay(SHORT_DELAY_MS);
1658	–	}
1659	–	}
1660	–
1661	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1662	–	protected void realRun() throws InterruptedException {
1663	–	delay(SHORT_DELAY_MS);
1664	–	}
1665	–	}
1666	–
1667	–	public class SmallRunnable extends CheckedRunnable {
1668	–	protected void realRun() throws Throwable {
1669	–	delay(SMALL_DELAY_MS);
1670	–	}
1671	–	}
1672	–
1673	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1674	–	protected void realRun() {
1675	–	try {
1676	–	delay(SMALL_DELAY_MS);
1677	–	} catch (InterruptedException ok) {}
1678	–	}
1679	–	}
1680	–
1681	–	public class SmallCallable extends CheckedCallable {
1682	–	protected Object realCall() throws InterruptedException {
1683	–	delay(SMALL_DELAY_MS);
1684	–	return Boolean.TRUE;
1685	–	}
1686	–	}
1687	–
1688	–	public class MediumRunnable extends CheckedRunnable {
1689	–	protected void realRun() throws Throwable {
1690	–	delay(MEDIUM_DELAY_MS);
1691	–	}
1692	–	}
1693	–
1694	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1695	–	protected void realRun() throws InterruptedException {
1696	–	delay(MEDIUM_DELAY_MS);
1697	–	}
1698	–	}
1699	–
1621		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1622		return new CheckedRunnable() {
1623		protected void realRun() {
#	Line 1706 | Line 1627 | public class JSR166TestCase extends Test
1627		}};
1628		}
1629
1709	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1710	–	protected void realRun() {
1711	–	try {
1712	–	delay(MEDIUM_DELAY_MS);
1713	–	} catch (InterruptedException ok) {}
1714	–	}
1715	–	}
1716	–
1717	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1718	–	protected void realRun() {
1719	–	try {
1720	–	delay(LONG_DELAY_MS);
1721	–	} catch (InterruptedException ok) {}
1722	–	}
1723	–	}
1724	–
1630		/**
1631		* For use as ThreadFactory in constructors
1632		*/
#	Line 1735 | Line 1640 | public class JSR166TestCase extends Test
1640		boolean isDone();
1641		}
1642
1738	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1739	–	return new TrackedRunnable() {
1740	–	private volatile boolean done = false;
1741	–	public boolean isDone() { return done; }
1742	–	public void run() {
1743	–	try {
1744	–	delay(timeoutMillis);
1745	–	done = true;
1746	–	} catch (InterruptedException ok) {}
1747	–	}
1748	–	};
1749	–	}
1750	–
1751	–	public static class TrackedShortRunnable implements Runnable {
1752	–	public volatile boolean done = false;
1753	–	public void run() {
1754	–	try {
1755	–	delay(SHORT_DELAY_MS);
1756	–	done = true;
1757	–	} catch (InterruptedException ok) {}
1758	–	}
1759	–	}
1760	–
1761	–	public static class TrackedSmallRunnable implements Runnable {
1762	–	public volatile boolean done = false;
1763	–	public void run() {
1764	–	try {
1765	–	delay(SMALL_DELAY_MS);
1766	–	done = true;
1767	–	} catch (InterruptedException ok) {}
1768	–	}
1769	–	}
1770	–
1771	–	public static class TrackedMediumRunnable implements Runnable {
1772	–	public volatile boolean done = false;
1773	–	public void run() {
1774	–	try {
1775	–	delay(MEDIUM_DELAY_MS);
1776	–	done = true;
1777	–	} catch (InterruptedException ok) {}
1778	–	}
1779	–	}
1780	–
1781	–	public static class TrackedLongRunnable implements Runnable {
1782	–	public volatile boolean done = false;
1783	–	public void run() {
1784	–	try {
1785	–	delay(LONG_DELAY_MS);
1786	–	done = true;
1787	–	} catch (InterruptedException ok) {}
1788	–	}
1789	–	}
1790	–
1643		public static class TrackedNoOpRunnable implements Runnable {
1644		public volatile boolean done = false;
1645		public void run() {
#	Line 1795 | Line 1647 | public class JSR166TestCase extends Test
1647		}
1648		}
1649
1798	–	public static class TrackedCallable implements Callable {
1799	–	public volatile boolean done = false;
1800	–	public Object call() {
1801	–	try {
1802	–	delay(SMALL_DELAY_MS);
1803	–	done = true;
1804	–	} catch (InterruptedException ok) {}
1805	–	return Boolean.TRUE;
1806	–	}
1807	–	}
1808	–
1650		/**
1651		* Analog of CheckedRunnable for RecursiveAction
1652		*/
#	Line 1832 | Line 1673 | public class JSR166TestCase extends Test
1673		return realCompute();
1674		} catch (Throwable fail) {
1675		threadUnexpectedException(fail);
1835	–	return null;
1676		}
1677	+	throw new AssertionError("unreached");
1678		}
1679		}
1680
#	Line 1847 | Line 1688 | public class JSR166TestCase extends Test
1688
1689		/**
1690		* A CyclicBarrier that uses timed await and fails with
1691	<	* AssertionFailedErrors instead of throwing checked exceptions.
1691	>	* AssertionErrors instead of throwing checked exceptions.
1692		*/
1693		public static class CheckedBarrier extends CyclicBarrier {
1694		public CheckedBarrier(int parties) { super(parties); }
#	Line 1856 | Line 1697 | public class JSR166TestCase extends Test
1697		try {
1698		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1699		} catch (TimeoutException timedOut) {
1700	<	throw new AssertionFailedError("timed out");
1700	>	throw new AssertionError("timed out");
1701		} catch (Exception fail) {
1702	<	AssertionFailedError afe =
1862	<	new AssertionFailedError("Unexpected exception: " + fail);
1863	<	afe.initCause(fail);
1864	<	throw afe;
1702	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1703		}
1704		}
1705		}
#	Line 1872 | Line 1710 | public class JSR166TestCase extends Test
1710		assertEquals(0, q.size());
1711		assertNull(q.peek());
1712		assertNull(q.poll());
1713	<	assertNull(q.poll(0, MILLISECONDS));
1713	>	assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1714		assertEquals(q.toString(), "[]");
1715		assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1716		assertFalse(q.iterator().hasNext());
#	Line 1913 | Line 1751 | public class JSR166TestCase extends Test
1751		}
1752		}
1753
1754	<	void assertImmutable(final Object o) {
1754	>	void assertImmutable(Object o) {
1755		if (o instanceof Collection) {
1756		assertThrows(
1757		UnsupportedOperationException.class,
1758	<	new Runnable() { public void run() {
1921	<	((Collection) o).add(null);}});
1758	>	() -> ((Collection) o).add(null));
1759		}
1760		}
1761
1762		@SuppressWarnings("unchecked")
1763		<T> T serialClone(T o) {
1764	+	T clone = null;
1765		try {
1766		ObjectInputStream ois = new ObjectInputStream
1767		(new ByteArrayInputStream(serialBytes(o)));
1768	<	T clone = (T) ois.readObject();
1931	<	if (o == clone) assertImmutable(o);
1932	<	assertSame(o.getClass(), clone.getClass());
1933	<	return clone;
1768	>	clone = (T) ois.readObject();
1769		} catch (Throwable fail) {
1770		threadUnexpectedException(fail);
1936	–	return null;
1771		}
1772	+	if (o == clone) assertImmutable(o);
1773	+	else assertSame(o.getClass(), clone.getClass());
1774	+	return clone;
1775		}
1776
1777		/**
#	Line 1953 | Line 1790 | public class JSR166TestCase extends Test
1790		(new ByteArrayInputStream(bos.toByteArray()));
1791		T clone = (T) ois.readObject();
1792		if (o == clone) assertImmutable(o);
1793	<	assertSame(o.getClass(), clone.getClass());
1793	>	else assertSame(o.getClass(), clone.getClass());
1794		return clone;
1795		}
1796
#	Line 1978 | Line 1815 | public class JSR166TestCase extends Test
1815		}
1816
1817		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1818	<	Runnable... throwingActions) {
1819	<	for (Runnable throwingAction : throwingActions) {
1818	>	Action... throwingActions) {
1819	>	for (Action throwingAction : throwingActions) {
1820		boolean threw = false;
1821		try { throwingAction.run(); }
1822		catch (Throwable t) {
1823		threw = true;
1824	<	if (!expectedExceptionClass.isInstance(t)) {
1825	<	AssertionFailedError afe =
1826	<	new AssertionFailedError
1827	<	("Expected " + expectedExceptionClass.getName() +
1828	<	", got " + t.getClass().getName());
1992	<	afe.initCause(t);
1993	<	threadUnexpectedException(afe);
1994	<	}
1824	>	if (!expectedExceptionClass.isInstance(t))
1825	>	throw new AssertionError(
1826	>	"Expected " + expectedExceptionClass.getName() +
1827	>	", got " + t.getClass().getName(),
1828	>	t);
1829		}
1830		if (!threw)
1831		shouldThrow(expectedExceptionClass.getName());
#	Line 2023 | Line 1857 | public class JSR166TestCase extends Test
1857		static <T> void shuffle(T[] array) {
1858		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1859		}
1860	+
1861	+	/**
1862	+	* Returns the same String as would be returned by {@link
1863	+	* Object#toString}, whether or not the given object's class
1864	+	* overrides toString().
1865	+	*
1866	+	* @see System#identityHashCode
1867	+	*/
1868	+	static String identityString(Object x) {
1869	+	return x.getClass().getName()
1870	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1871	+	}
1872	+
1873	+	// --- Shared assertions for Executor tests ---
1874	+
1875	+	/**
1876	+	* Returns maximum number of tasks that can be submitted to given
1877	+	* pool (with bounded queue) before saturation (when submission
1878	+	* throws RejectedExecutionException).
1879	+	*/
1880	+	static final int saturatedSize(ThreadPoolExecutor pool) {
1881	+	BlockingQueue<Runnable> q = pool.getQueue();
1882	+	return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1883	+	}
1884	+
1885	+	@SuppressWarnings("FutureReturnValueIgnored")
1886	+	void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1887	+	try {
1888	+	e.execute((Runnable) null);
1889	+	shouldThrow();
1890	+	} catch (NullPointerException success) {}
1891	+
1892	+	if (! (e instanceof ExecutorService)) return;
1893	+	ExecutorService es = (ExecutorService) e;
1894	+	try {
1895	+	es.submit((Runnable) null);
1896	+	shouldThrow();
1897	+	} catch (NullPointerException success) {}
1898	+	try {
1899	+	es.submit((Runnable) null, Boolean.TRUE);
1900	+	shouldThrow();
1901	+	} catch (NullPointerException success) {}
1902	+	try {
1903	+	es.submit((Callable) null);
1904	+	shouldThrow();
1905	+	} catch (NullPointerException success) {}
1906	+
1907	+	if (! (e instanceof ScheduledExecutorService)) return;
1908	+	ScheduledExecutorService ses = (ScheduledExecutorService) e;
1909	+	try {
1910	+	ses.schedule((Runnable) null,
1911	+	randomTimeout(), randomTimeUnit());
1912	+	shouldThrow();
1913	+	} catch (NullPointerException success) {}
1914	+	try {
1915	+	ses.schedule((Callable) null,
1916	+	randomTimeout(), randomTimeUnit());
1917	+	shouldThrow();
1918	+	} catch (NullPointerException success) {}
1919	+	try {
1920	+	ses.scheduleAtFixedRate((Runnable) null,
1921	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1922	+	shouldThrow();
1923	+	} catch (NullPointerException success) {}
1924	+	try {
1925	+	ses.scheduleWithFixedDelay((Runnable) null,
1926	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1927	+	shouldThrow();
1928	+	} catch (NullPointerException success) {}
1929	+	}
1930	+
1931	+	void setRejectedExecutionHandler(
1932	+	ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1933	+	p.setRejectedExecutionHandler(handler);
1934	+	assertSame(handler, p.getRejectedExecutionHandler());
1935	+	}
1936	+
1937	+	void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1938	+	final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1939	+	final long savedTaskCount = p.getTaskCount();
1940	+	final long savedCompletedTaskCount = p.getCompletedTaskCount();
1941	+	final int savedQueueSize = p.getQueue().size();
1942	+	final boolean stock = (p.getClass().getClassLoader() == null);
1943	+
1944	+	Runnable r = () -> {};
1945	+	Callable<Boolean> c = () -> Boolean.TRUE;
1946	+
1947	+	class Recorder implements RejectedExecutionHandler {
1948	+	public volatile Runnable r = null;
1949	+	public volatile ThreadPoolExecutor p = null;
1950	+	public void reset() { r = null; p = null; }
1951	+	public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1952	+	assertNull(this.r);
1953	+	assertNull(this.p);
1954	+	this.r = r;
1955	+	this.p = p;
1956	+	}
1957	+	}
1958	+
1959	+	// check custom handler is invoked exactly once per task
1960	+	Recorder recorder = new Recorder();
1961	+	setRejectedExecutionHandler(p, recorder);
1962	+	for (int i = 2; i--> 0; ) {
1963	+	recorder.reset();
1964	+	p.execute(r);
1965	+	if (stock && p.getClass() == ThreadPoolExecutor.class)
1966	+	assertSame(r, recorder.r);
1967	+	assertSame(p, recorder.p);
1968	+
1969	+	recorder.reset();
1970	+	assertFalse(p.submit(r).isDone());
1971	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1972	+	assertSame(p, recorder.p);
1973	+
1974	+	recorder.reset();
1975	+	assertFalse(p.submit(r, Boolean.TRUE).isDone());
1976	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1977	+	assertSame(p, recorder.p);
1978	+
1979	+	recorder.reset();
1980	+	assertFalse(p.submit(c).isDone());
1981	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1982	+	assertSame(p, recorder.p);
1983	+
1984	+	if (p instanceof ScheduledExecutorService) {
1985	+	ScheduledExecutorService s = (ScheduledExecutorService) p;
1986	+	ScheduledFuture<?> future;
1987	+
1988	+	recorder.reset();
1989	+	future = s.schedule(r, 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.schedule(c, randomTimeout(), randomTimeUnit());
1996	+	assertFalse(future.isDone());
1997	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1998	+	assertSame(p, recorder.p);
1999	+
2000	+	recorder.reset();
2001	+	future = s.scheduleAtFixedRate(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	+	recorder.reset();
2007	+	future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2008	+	assertFalse(future.isDone());
2009	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2010	+	assertSame(p, recorder.p);
2011	+	}
2012	+	}
2013	+
2014	+	// Checking our custom handler above should be sufficient, but
2015	+	// we add some integration tests of standard handlers.
2016	+	final AtomicReference<Thread> thread = new AtomicReference<>();
2017	+	final Runnable setThread = () -> thread.set(Thread.currentThread());
2018	+
2019	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2020	+	try {
2021	+	p.execute(setThread);
2022	+	shouldThrow();
2023	+	} catch (RejectedExecutionException success) {}
2024	+	assertNull(thread.get());
2025	+
2026	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2027	+	p.execute(setThread);
2028	+	assertNull(thread.get());
2029	+
2030	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2031	+	p.execute(setThread);
2032	+	if (p.isShutdown())
2033	+	assertNull(thread.get());
2034	+	else
2035	+	assertSame(Thread.currentThread(), thread.get());
2036	+
2037	+	setRejectedExecutionHandler(p, savedHandler);
2038	+
2039	+	// check that pool was not perturbed by handlers
2040	+	assertEquals(savedTaskCount, p.getTaskCount());
2041	+	assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2042	+	assertEquals(savedQueueSize, p.getQueue().size());
2043	+	}
2044	+
2045	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2046	+	assertEquals(x, y);
2047	+	assertEquals(y, x);
2048	+	assertEquals(x.isEmpty(), y.isEmpty());
2049	+	assertEquals(x.size(), y.size());
2050	+	if (x instanceof List) {
2051	+	assertEquals(x.toString(), y.toString());
2052	+	}
2053	+	if (x instanceof List || x instanceof Set) {
2054	+	assertEquals(x.hashCode(), y.hashCode());
2055	+	}
2056	+	if (x instanceof List || x instanceof Deque) {
2057	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2058	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2059	+	y.toArray(new Object[0])));
2060	+	}
2061	+	}
2062	+
2063	+	/**
2064	+	* A weaker form of assertCollectionsEquals which does not insist
2065	+	* that the two collections satisfy Object#equals(Object), since
2066	+	* they may use identity semantics as Deques do.
2067	+	*/
2068	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2069	+	if (x instanceof List || x instanceof Set)
2070	+	assertCollectionsEquals(x, y);
2071	+	else {
2072	+	assertEquals(x.isEmpty(), y.isEmpty());
2073	+	assertEquals(x.size(), y.size());
2074	+	assertEquals(new HashSet(x), new HashSet(y));
2075	+	if (x instanceof Deque) {
2076	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2077	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2078	+	y.toArray(new Object[0])));
2079	+	}
2080	+	}
2081	+	}
2082		}

Diff Legend

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