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.174 by jsr166, Fri Oct 9 19:09:59 2015 UTC vs.
Revision 1.238 by jsr166, Mon Dec 11 00:27:08 2017 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by Doug Lea with assistance from members of JCP JSR-166
3	<	* Expert Group and released to the public domain, as explained at
2	>	* Written by Doug Lea and Martin Buchholz with assistance from
3	>	* members of JCP JSR-166 Expert Group and released to the public
4	>	* domain, as explained at
5		* http://creativecommons.org/publicdomain/zero/1.0/
6		* Other contributors include Andrew Wright, Jeffrey Hayes,
7		* Pat Fisher, Mike Judd.
8		*/
9
10	+	/*
11	+	* @test
12	+	* @summary JSR-166 tck tests, in a number of variations.
13	+	*          The first is the conformance testing variant,
14	+	*          while others also test implementation details.
15	+	* @build *
16	+	* @modules java.management
17	+	* @run junit/othervm/timeout=1000 JSR166TestCase
18	+	* @run junit/othervm/timeout=1000
19	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
21	+	*      -Djsr166.testImplementationDetails=true
22	+	*      JSR166TestCase
23	+	* @run junit/othervm/timeout=1000
24	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
26	+	*      -Djsr166.testImplementationDetails=true
27	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28	+	*      JSR166TestCase
29	+	* @run junit/othervm/timeout=1000
30	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
32	+	*      -Djsr166.testImplementationDetails=true
33	+	*      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34	+	*      -Djava.util.secureRandomSeed=true
35	+	*      JSR166TestCase
36	+	* @run junit/othervm/timeout=1000/policy=tck.policy
37	+	*      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38	+	*      --add-opens java.base/java.lang=ALL-UNNAMED
39	+	*      -Djsr166.testImplementationDetails=true
40	+	*      JSR166TestCase
41	+	*/
42	+
43		import static java.util.concurrent.TimeUnit.MILLISECONDS;
44		import static java.util.concurrent.TimeUnit.MINUTES;
45		import static java.util.concurrent.TimeUnit.NANOSECONDS;
#	Line 20 | Line 54 | import java.lang.management.ThreadMXBean
54		import java.lang.reflect.Constructor;
55		import java.lang.reflect.Method;
56		import java.lang.reflect.Modifier;
23	–	import java.nio.file.Files;
24	–	import java.nio.file.Paths;
57		import java.security.CodeSource;
58		import java.security.Permission;
59		import java.security.PermissionCollection;
#	Line 31 | Line 63 | import java.security.ProtectionDomain;
63		import java.security.SecurityPermission;
64		import java.util.ArrayList;
65		import java.util.Arrays;
66	+	import java.util.Collection;
67	+	import java.util.Collections;
68		import java.util.Date;
69		import java.util.Enumeration;
70		import java.util.Iterator;
#	Line 42 | Line 76 | import java.util.concurrent.Callable;
76		import java.util.concurrent.CountDownLatch;
77		import java.util.concurrent.CyclicBarrier;
78		import java.util.concurrent.ExecutionException;
79	+	import java.util.concurrent.Executor;
80		import java.util.concurrent.Executors;
81		import java.util.concurrent.ExecutorService;
82		import java.util.concurrent.ForkJoinPool;
83		import java.util.concurrent.Future;
84	+	import java.util.concurrent.FutureTask;
85		import java.util.concurrent.RecursiveAction;
86		import java.util.concurrent.RecursiveTask;
87	+	import java.util.concurrent.RejectedExecutionException;
88		import java.util.concurrent.RejectedExecutionHandler;
89		import java.util.concurrent.Semaphore;
90	+	import java.util.concurrent.ScheduledExecutorService;
91	+	import java.util.concurrent.ScheduledFuture;
92	+	import java.util.concurrent.SynchronousQueue;
93		import java.util.concurrent.ThreadFactory;
94	+	import java.util.concurrent.ThreadLocalRandom;
95		import java.util.concurrent.ThreadPoolExecutor;
96	+	import java.util.concurrent.TimeUnit;
97		import java.util.concurrent.TimeoutException;
98	+	import java.util.concurrent.atomic.AtomicBoolean;
99		import java.util.concurrent.atomic.AtomicReference;
57	–	import java.util.regex.Matcher;
100		import java.util.regex.Pattern;
101
102		import junit.framework.AssertionFailedError;
#	Line 112 | Line 154 | import junit.framework.TestSuite;
154		* methods as there are exceptions the method can throw. Sometimes
155		* there are multiple tests per JSR166 method when the different
156		* "normal" behaviors differ significantly. And sometimes testcases
157	<	* cover multiple methods when they cannot be tested in
116	<	* isolation.
157	>	* cover multiple methods when they cannot be tested in isolation.
158		*
159		* <li>The documentation style for testcases is to provide as javadoc
160		* a simple sentence or two describing the property that the testcase
#	Line 176 | Line 217 | public class JSR166TestCase extends Test
217		private static final int suiteRuns =
218		Integer.getInteger("jsr166.suiteRuns", 1);
219
220	+	/**
221	+	* Returns the value of the system property, or NaN if not defined.
222	+	*/
223	+	private static float systemPropertyValue(String name) {
224	+	String floatString = System.getProperty(name);
225	+	if (floatString == null)
226	+	return Float.NaN;
227	+	try {
228	+	return Float.parseFloat(floatString);
229	+	} catch (NumberFormatException ex) {
230	+	throw new IllegalArgumentException(
231	+	String.format("Bad float value in system property %s=%s",
232	+	name, floatString));
233	+	}
234	+	}
235	+
236	+	/**
237	+	* The scaling factor to apply to standard delays used in tests.
238	+	* May be initialized from any of:
239	+	* - the "jsr166.delay.factor" system property
240	+	* - the "test.timeout.factor" system property (as used by jtreg)
241	+	*   See: http://openjdk.java.net/jtreg/tag-spec.html
242	+	* - hard-coded fuzz factor when using a known slowpoke VM
243	+	*/
244	+	private static final float delayFactor = delayFactor();
245	+
246	+	private static float delayFactor() {
247	+	float x;
248	+	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
249	+	return x;
250	+	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
251	+	return x;
252	+	String prop = System.getProperty("java.vm.version");
253	+	if (prop != null && prop.matches(".*debug.*"))
254	+	return 4.0f; // How much slower is fastdebug than product?!
255	+	return 1.0f;
256	+	}
257	+
258		public JSR166TestCase() { super(); }
259		public JSR166TestCase(String name) { super(name); }
260
#	Line 211 | Line 290 | public class JSR166TestCase extends Test
290		//                     System.err.printf(
291		//                         "Looks like we're stuck running test: %s (%d/%d)%n",
292		//                         lastTestCase, currentRun, runsPerTest);
293	<	System.err.println("availableProcessors=" +
294	<	Runtime.getRuntime().availableProcessors());
295	<	System.err.printf("cpu model = %s%n", cpuModel());
293	>	//                     System.err.println("availableProcessors=" +
294	>	//                         Runtime.getRuntime().availableProcessors());
295	>	//                     System.err.printf("cpu model = %s%n", cpuModel());
296		dumpTestThreads();
297		// one stack dump is probably enough; more would be spam
298		break;
#	Line 225 | Line 304 | public class JSR166TestCase extends Test
304		thread.start();
305		}
306
307	<	public static String cpuModel() {
308	<	try {
309	<	Matcher matcher = Pattern.compile("model name\\s*: (.*)")
310	<	.matcher(new String(
311	<	Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
312	<	matcher.find();
313	<	return matcher.group(1);
314	<	} catch (Exception ex) { return null; }
315	<	}
307	>	//     public static String cpuModel() {
308	>	//         try {
309	>	//             java.util.regex.Matcher matcher
310	>	//               = Pattern.compile("model name\\s*: (.*)")
311	>	//                 .matcher(new String(
312	>	//                     java.nio.file.Files.readAllBytes(
313	>	//                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
314	>	//             matcher.find();
315	>	//             return matcher.group(1);
316	>	//         } catch (Exception ex) { return null; }
317	>	//     }
318
319		public void runBare() throws Throwable {
320		currentTestCase = this;
#	Line 273 | Line 354 | public class JSR166TestCase extends Test
354		main(suite(), args);
355		}
356
357	+	static class PithyResultPrinter extends junit.textui.ResultPrinter {
358	+	PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
359	+	long runTime;
360	+	public void startTest(Test test) {}
361	+	protected void printHeader(long runTime) {
362	+	this.runTime = runTime; // defer printing for later
363	+	}
364	+	protected void printFooter(TestResult result) {
365	+	if (result.wasSuccessful()) {
366	+	getWriter().println("OK (" + result.runCount() + " tests)"
367	+	+ "  Time: " + elapsedTimeAsString(runTime));
368	+	} else {
369	+	getWriter().println("Time: " + elapsedTimeAsString(runTime));
370	+	super.printFooter(result);
371	+	}
372	+	}
373	+	}
374	+
375	+	/**
376	+	* Returns a TestRunner that doesn't bother with unnecessary
377	+	* fluff, like printing a "." for each test case.
378	+	*/
379	+	static junit.textui.TestRunner newPithyTestRunner() {
380	+	junit.textui.TestRunner runner = new junit.textui.TestRunner();
381	+	runner.setPrinter(new PithyResultPrinter(System.out));
382	+	return runner;
383	+	}
384	+
385		/**
386		* Runs all unit tests in the given test suite.
387		* Actual behavior influenced by jsr166.* system properties.
#	Line 284 | Line 393 | public class JSR166TestCase extends Test
393		System.setSecurityManager(new SecurityManager());
394		}
395		for (int i = 0; i < suiteRuns; i++) {
396	<	TestResult result = junit.textui.TestRunner.run(suite);
396	>	TestResult result = newPithyTestRunner().doRun(suite);
397		if (!result.wasSuccessful())
398		System.exit(1);
399		System.gc();
#	Line 336 | Line 445 | public class JSR166TestCase extends Test
445		}
446		}
447
448	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
449	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
450	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
451	<	public static boolean atLeastJava9() {
452	<	return JAVA_CLASS_VERSION >= 53.0
344	<	// As of 2015-09, java9 still uses 52.0 class file version
345	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
346	<	}
347	<	public static boolean atLeastJava10() {
348	<	return JAVA_CLASS_VERSION >= 54.0
349	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
350	<	}
448	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
449	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
450	>	public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
451	>	public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
452	>	public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
453
454		/**
455		* Collects all JSR166 unit tests as one suite.
#	Line 368 | Line 470 | public class JSR166TestCase extends Test
470		AbstractQueuedLongSynchronizerTest.suite(),
471		ArrayBlockingQueueTest.suite(),
472		ArrayDequeTest.suite(),
473	+	ArrayListTest.suite(),
474		AtomicBooleanTest.suite(),
475		AtomicIntegerArrayTest.suite(),
476		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 390 | Line 493 | public class JSR166TestCase extends Test
493		CopyOnWriteArrayListTest.suite(),
494		CopyOnWriteArraySetTest.suite(),
495		CountDownLatchTest.suite(),
496	+	CountedCompleterTest.suite(),
497		CyclicBarrierTest.suite(),
498		DelayQueueTest.suite(),
499		EntryTest.suite(),
#	Line 418 | Line 522 | public class JSR166TestCase extends Test
522		TreeMapTest.suite(),
523		TreeSetTest.suite(),
524		TreeSubMapTest.suite(),
525	<	TreeSubSetTest.suite());
525	>	TreeSubSetTest.suite(),
526	>	VectorTest.suite());
527
528		// Java8+ test classes
529		if (atLeastJava8()) {
530		String[] java8TestClassNames = {
531	+	"ArrayDeque8Test",
532		"Atomic8Test",
533		"CompletableFutureTest",
534		"ConcurrentHashMap8Test",
535	<	"CountedCompleterTest",
535	>	"CountedCompleter8Test",
536		"DoubleAccumulatorTest",
537		"DoubleAdderTest",
538		"ForkJoinPool8Test",
539		"ForkJoinTask8Test",
540	+	"HashMapTest",
541	+	"LinkedBlockingDeque8Test",
542	+	"LinkedBlockingQueue8Test",
543		"LongAccumulatorTest",
544		"LongAdderTest",
545		"SplittableRandomTest",
546		"StampedLockTest",
547		"SubmissionPublisherTest",
548		"ThreadLocalRandom8Test",
549	+	"TimeUnit8Test",
550		};
551		addNamedTestClasses(suite, java8TestClassNames);
552		}
#	Line 444 | Line 554 | public class JSR166TestCase extends Test
554		// Java9+ test classes
555		if (atLeastJava9()) {
556		String[] java9TestClassNames = {
557	<	// Currently empty, but expecting varhandle tests
557	>	"AtomicBoolean9Test",
558	>	"AtomicInteger9Test",
559	>	"AtomicIntegerArray9Test",
560	>	"AtomicLong9Test",
561	>	"AtomicLongArray9Test",
562	>	"AtomicReference9Test",
563	>	"AtomicReferenceArray9Test",
564	>	"ExecutorCompletionService9Test",
565	>	"ForkJoinPool9Test",
566		};
567		addNamedTestClasses(suite, java9TestClassNames);
568		}
#	Line 455 | Line 573 | public class JSR166TestCase extends Test
573		/** Returns list of junit-style test method names in given class. */
574		public static ArrayList<String> testMethodNames(Class<?> testClass) {
575		Method[] methods = testClass.getDeclaredMethods();
576	<	ArrayList<String> names = new ArrayList<String>(methods.length);
576	>	ArrayList<String> names = new ArrayList<>(methods.length);
577		for (Method method : methods) {
578		if (method.getName().startsWith("test")
579		&& Modifier.isPublic(method.getModifiers())
#	Line 520 | Line 638 | public class JSR166TestCase extends Test
638		public static long MEDIUM_DELAY_MS;
639		public static long LONG_DELAY_MS;
640
641	+	private static final long RANDOM_TIMEOUT;
642	+	private static final long RANDOM_EXPIRED_TIMEOUT;
643	+	private static final TimeUnit RANDOM_TIMEUNIT;
644	+	static {
645	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
646	+	long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
647	+	RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
648	+	RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
649	+	TimeUnit[] timeUnits = TimeUnit.values();
650	+	RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
651	+	}
652	+
653	+	/**
654	+	* Returns a timeout for use when any value at all will do.
655	+	*/
656	+	static long randomTimeout() { return RANDOM_TIMEOUT; }
657	+
658		/**
659	<	* Returns the shortest timed delay. This could
660	<	* be reimplemented to use for example a Property.
659	>	* Returns a timeout that means "no waiting", i.e. not positive.
660	>	*/
661	>	static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
662	>
663	>	/**
664	>	* Returns a random non-null TimeUnit.
665	>	*/
666	>	static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
667	>
668	>	/**
669	>	* Returns the shortest timed delay. This can be scaled up for
670	>	* slow machines using the jsr166.delay.factor system property,
671	>	* or via jtreg's -timeoutFactor: flag.
672	>	* http://openjdk.java.net/jtreg/command-help.html
673		*/
674		protected long getShortDelay() {
675	<	return 50;
675	>	return (long) (50 * delayFactor);
676		}
677
678		/**
#	Line 538 | Line 685 | public class JSR166TestCase extends Test
685		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
686		}
687
688	+	private static final long TIMEOUT_DELAY_MS
689	+	= (long) (12.0 * Math.cbrt(delayFactor));
690	+
691		/**
692	<	* Returns a timeout in milliseconds to be used in tests that
693	<	* verify that operations block or time out.
692	>	* Returns a timeout in milliseconds to be used in tests that verify
693	>	* that operations block or time out.  We want this to be longer
694	>	* than the OS scheduling quantum, but not too long, so don't scale
695	>	* linearly with delayFactor; we use "crazy" cube root instead.
696		*/
697	<	long timeoutMillis() {
698	<	return SHORT_DELAY_MS / 4;
697	>	static long timeoutMillis() {
698	>	return TIMEOUT_DELAY_MS;
699		}
700
701		/**
#	Line 559 | Line 711 | public class JSR166TestCase extends Test
711		* The first exception encountered if any threadAssertXXX method fails.
712		*/
713		private final AtomicReference<Throwable> threadFailure
714	<	= new AtomicReference<Throwable>(null);
714	>	= new AtomicReference<>(null);
715
716		/**
717		* Records an exception so that it can be rethrown later in the test
#	Line 838 | Line 990 | public class JSR166TestCase extends Test
990		}};
991		}
992
993	+	PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
994	+	return new PoolCleanerWithReleaser(pool, releaser(flag));
995	+	}
996	+
997	+	Runnable releaser(final AtomicBoolean flag) {
998	+	return new Runnable() { public void run() { flag.set(true); }};
999	+	}
1000	+
1001		/**
1002		* Waits out termination of a thread pool or fails doing so.
1003		*/
#	Line 861 | Line 1021 | public class JSR166TestCase extends Test
1021		}
1022		}
1023
1024	<	/** Like Runnable, but with the freedom to throw anything */
1024	>	/**
1025	>	* Like Runnable, but with the freedom to throw anything.
1026	>	* junit folks had the same idea:
1027	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1028	>	*/
1029		interface Action { public void run() throws Throwable; }
1030
1031		/**
#	Line 892 | Line 1056 | public class JSR166TestCase extends Test
1056		* Uninteresting threads are filtered out.
1057		*/
1058		static void dumpTestThreads() {
1059	+	SecurityManager sm = System.getSecurityManager();
1060	+	if (sm != null) {
1061	+	try {
1062	+	System.setSecurityManager(null);
1063	+	} catch (SecurityException giveUp) {
1064	+	return;
1065	+	}
1066	+	}
1067	+
1068		ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1069		System.err.println("------ stacktrace dump start ------");
1070		for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1071	<	String name = info.getThreadName();
1071	>	final String name = info.getThreadName();
1072	>	String lockName;
1073		if ("Signal Dispatcher".equals(name))
1074		continue;
1075		if ("Reference Handler".equals(name)
1076	<	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1076	>	&& (lockName = info.getLockName()) != null
1077	>	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1078		continue;
1079		if ("Finalizer".equals(name)
1080	<	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1080	>	&& (lockName = info.getLockName()) != null
1081	>	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1082		continue;
1083		if ("checkForWedgedTest".equals(name))
1084		continue;
1085		System.err.print(info);
1086		}
1087		System.err.println("------ stacktrace dump end ------");
912	–	}
913	–
914	–	/**
915	–	* Checks that thread does not terminate within the default
916	–	* millisecond delay of {@code timeoutMillis()}.
917	–	*/
918	–	void assertThreadStaysAlive(Thread thread) {
919	–	assertThreadStaysAlive(thread, timeoutMillis());
920	–	}
921	–
922	–	/**
923	–	* Checks that thread does not terminate within the given millisecond delay.
924	–	*/
925	–	void assertThreadStaysAlive(Thread thread, long millis) {
926	–	try {
927	–	// No need to optimize the failing case via Thread.join.
928	–	delay(millis);
929	–	assertTrue(thread.isAlive());
930	–	} catch (InterruptedException fail) {
931	–	threadFail("Unexpected InterruptedException");
932	–	}
933	–	}
1088
1089	<	/**
936	<	* Checks that the threads do not terminate within the default
937	<	* millisecond delay of {@code timeoutMillis()}.
938	<	*/
939	<	void assertThreadsStayAlive(Thread... threads) {
940	<	assertThreadsStayAlive(timeoutMillis(), threads);
1089	>	if (sm != null) System.setSecurityManager(sm);
1090		}
1091
1092		/**
1093	<	* Checks that the threads do not terminate within the given millisecond delay.
1093	>	* Checks that thread eventually enters the expected blocked thread state.
1094		*/
1095	<	void assertThreadsStayAlive(long millis, Thread... threads) {
1096	<	try {
1097	<	// No need to optimize the failing case via Thread.join.
1098	<	delay(millis);
1099	<	for (Thread thread : threads)
1100	<	assertTrue(thread.isAlive());
1101	<	} catch (InterruptedException fail) {
1102	<	threadFail("Unexpected InterruptedException");
1095	>	void assertThreadBlocks(Thread thread, Thread.State expected) {
1096	>	// always sleep at least 1 ms, with high probability avoiding
1097	>	// transitory states
1098	>	for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1099	>	try { delay(1); }
1100	>	catch (InterruptedException fail) {
1101	>	fail("Unexpected InterruptedException");
1102	>	}
1103	>	Thread.State s = thread.getState();
1104	>	if (s == expected)
1105	>	return;
1106	>	else if (s == Thread.State.TERMINATED)
1107	>	fail("Unexpected thread termination");
1108		}
1109	+	fail("timed out waiting for thread to enter thread state " + expected);
1110		}
1111
1112		/**
#	Line 992 | Line 1147 | public class JSR166TestCase extends Test
1147		}
1148
1149		/**
1150	+	* The maximum number of consecutive spurious wakeups we should
1151	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1152	+	*/
1153	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1154	+
1155	+	/**
1156		* The number of elements to place in collections, arrays, etc.
1157		*/
1158		public static final int SIZE = 20;
#	Line 1095 | Line 1256 | public class JSR166TestCase extends Test
1256		}
1257		public void refresh() {}
1258		public String toString() {
1259	<	List<Permission> ps = new ArrayList<Permission>();
1259	>	List<Permission> ps = new ArrayList<>();
1260		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1261		ps.add(e.nextElement());
1262		return "AdjustablePolicy with permissions " + ps;
#	Line 1125 | Line 1286 | public class JSR166TestCase extends Test
1286		* Sleeps until the given time has elapsed.
1287		* Throws AssertionFailedError if interrupted.
1288		*/
1289	<	void sleep(long millis) {
1289	>	static void sleep(long millis) {
1290		try {
1291		delay(millis);
1292		} catch (InterruptedException fail) {
#	Line 1141 | Line 1302 | public class JSR166TestCase extends Test
1302		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1303		*/
1304		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1305	<	long startTime = System.nanoTime();
1305	>	long startTime = 0L;
1306		for (;;) {
1307		Thread.State s = thread.getState();
1308		if (s == Thread.State.BLOCKED ||
#	Line 1150 | Line 1311 | public class JSR166TestCase extends Test
1311		return;
1312		else if (s == Thread.State.TERMINATED)
1313		fail("Unexpected thread termination");
1314	+	else if (startTime == 0L)
1315	+	startTime = System.nanoTime();
1316		else if (millisElapsedSince(startTime) > timeoutMillis) {
1317		threadAssertTrue(thread.isAlive());
1318	<	return;
1318	>	fail("timed out waiting for thread to enter wait state");
1319		}
1320		Thread.yield();
1321		}
1322		}
1323
1324		/**
1325	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1326	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1325	>	* Spin-waits up to the specified number of milliseconds for the given
1326	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1327	>	* and additionally satisfy the given condition.
1328	>	*/
1329	>	void waitForThreadToEnterWaitState(
1330	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1331	>	long startTime = 0L;
1332	>	for (;;) {
1333	>	Thread.State s = thread.getState();
1334	>	if (s == Thread.State.BLOCKED ||
1335	>	s == Thread.State.WAITING ||
1336	>	s == Thread.State.TIMED_WAITING) {
1337	>	try {
1338	>	if (waitingForGodot.call())
1339	>	return;
1340	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1341	>	}
1342	>	else if (s == Thread.State.TERMINATED)
1343	>	fail("Unexpected thread termination");
1344	>	else if (startTime == 0L)
1345	>	startTime = System.nanoTime();
1346	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1347	>	threadAssertTrue(thread.isAlive());
1348	>	fail("timed out waiting for thread to enter wait state");
1349	>	}
1350	>	Thread.yield();
1351	>	}
1352	>	}
1353	>
1354	>	/**
1355	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1356	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1357		*/
1358		void waitForThreadToEnterWaitState(Thread thread) {
1359		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1360		}
1361
1362		/**
1363	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1364	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1365	+	* and additionally satisfy the given condition.
1366	+	*/
1367	+	void waitForThreadToEnterWaitState(
1368	+	Thread thread, Callable<Boolean> waitingForGodot) {
1369	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1370	+	}
1371	+
1372	+	/**
1373		* Returns the number of milliseconds since time given by
1374		* startNanoTime, which must have been previously returned from a
1375		* call to {@link System#nanoTime()}.
#	Line 1228 | Line 1431 | public class JSR166TestCase extends Test
1431		} finally {
1432		if (t.getState() != Thread.State.TERMINATED) {
1433		t.interrupt();
1434	<	threadFail("Test timed out");
1434	>	threadFail("timed out waiting for thread to terminate");
1435		}
1436		}
1437		}
#	Line 1394 | Line 1597 | public class JSR166TestCase extends Test
1597		return new LatchAwaiter(latch);
1598		}
1599
1600	<	public void await(CountDownLatch latch) {
1600	>	public void await(CountDownLatch latch, long timeoutMillis) {
1601		try {
1602	<	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1602	>	if (!latch.await(timeoutMillis, MILLISECONDS))
1603	>	fail("timed out waiting for CountDownLatch for "
1604	>	+ (timeoutMillis/1000) + " sec");
1605		} catch (Throwable fail) {
1606		threadUnexpectedException(fail);
1607		}
1608		}
1609
1610	+	public void await(CountDownLatch latch) {
1611	+	await(latch, LONG_DELAY_MS);
1612	+	}
1613	+
1614		public void await(Semaphore semaphore) {
1615		try {
1616	<	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1616	>	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1617	>	fail("timed out waiting for Semaphore for "
1618	>	+ (LONG_DELAY_MS/1000) + " sec");
1619	>	} catch (Throwable fail) {
1620	>	threadUnexpectedException(fail);
1621	>	}
1622	>	}
1623	>
1624	>	public void await(CyclicBarrier barrier) {
1625	>	try {
1626	>	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1627		} catch (Throwable fail) {
1628		threadUnexpectedException(fail);
1629		}
#	Line 1433 | Line 1652 | public class JSR166TestCase extends Test
1652		public String call() { throw new NullPointerException(); }
1653		}
1654
1436	–	public static class CallableOne implements Callable<Integer> {
1437	–	public Integer call() { return one; }
1438	–	}
1439	–
1440	–	public class ShortRunnable extends CheckedRunnable {
1441	–	protected void realRun() throws Throwable {
1442	–	delay(SHORT_DELAY_MS);
1443	–	}
1444	–	}
1445	–
1446	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1447	–	protected void realRun() throws InterruptedException {
1448	–	delay(SHORT_DELAY_MS);
1449	–	}
1450	–	}
1451	–
1452	–	public class SmallRunnable extends CheckedRunnable {
1453	–	protected void realRun() throws Throwable {
1454	–	delay(SMALL_DELAY_MS);
1455	–	}
1456	–	}
1457	–
1655		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1656		protected void realRun() {
1657		try {
#	Line 1463 | Line 1660 | public class JSR166TestCase extends Test
1660		}
1661		}
1662
1466	–	public class SmallCallable extends CheckedCallable {
1467	–	protected Object realCall() throws InterruptedException {
1468	–	delay(SMALL_DELAY_MS);
1469	–	return Boolean.TRUE;
1470	–	}
1471	–	}
1472	–
1473	–	public class MediumRunnable extends CheckedRunnable {
1474	–	protected void realRun() throws Throwable {
1475	–	delay(MEDIUM_DELAY_MS);
1476	–	}
1477	–	}
1478	–
1479	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1480	–	protected void realRun() throws InterruptedException {
1481	–	delay(MEDIUM_DELAY_MS);
1482	–	}
1483	–	}
1484	–
1663		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1664		return new CheckedRunnable() {
1665		protected void realRun() {
#	Line 1491 | Line 1669 | public class JSR166TestCase extends Test
1669		}};
1670		}
1671
1494	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1495	–	protected void realRun() {
1496	–	try {
1497	–	delay(MEDIUM_DELAY_MS);
1498	–	} catch (InterruptedException ok) {}
1499	–	}
1500	–	}
1501	–
1502	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1503	–	protected void realRun() {
1504	–	try {
1505	–	delay(LONG_DELAY_MS);
1506	–	} catch (InterruptedException ok) {}
1507	–	}
1508	–	}
1509	–
1672		/**
1673		* For use as ThreadFactory in constructors
1674		*/
#	Line 1520 | Line 1682 | public class JSR166TestCase extends Test
1682		boolean isDone();
1683		}
1684
1523	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1524	–	return new TrackedRunnable() {
1525	–	private volatile boolean done = false;
1526	–	public boolean isDone() { return done; }
1527	–	public void run() {
1528	–	try {
1529	–	delay(timeoutMillis);
1530	–	done = true;
1531	–	} catch (InterruptedException ok) {}
1532	–	}
1533	–	};
1534	–	}
1535	–
1536	–	public static class TrackedShortRunnable implements Runnable {
1537	–	public volatile boolean done = false;
1538	–	public void run() {
1539	–	try {
1540	–	delay(SHORT_DELAY_MS);
1541	–	done = true;
1542	–	} catch (InterruptedException ok) {}
1543	–	}
1544	–	}
1545	–
1546	–	public static class TrackedSmallRunnable implements Runnable {
1547	–	public volatile boolean done = false;
1548	–	public void run() {
1549	–	try {
1550	–	delay(SMALL_DELAY_MS);
1551	–	done = true;
1552	–	} catch (InterruptedException ok) {}
1553	–	}
1554	–	}
1555	–
1556	–	public static class TrackedMediumRunnable implements Runnable {
1557	–	public volatile boolean done = false;
1558	–	public void run() {
1559	–	try {
1560	–	delay(MEDIUM_DELAY_MS);
1561	–	done = true;
1562	–	} catch (InterruptedException ok) {}
1563	–	}
1564	–	}
1565	–
1566	–	public static class TrackedLongRunnable implements Runnable {
1567	–	public volatile boolean done = false;
1568	–	public void run() {
1569	–	try {
1570	–	delay(LONG_DELAY_MS);
1571	–	done = true;
1572	–	} catch (InterruptedException ok) {}
1573	–	}
1574	–	}
1575	–
1685		public static class TrackedNoOpRunnable implements Runnable {
1686		public volatile boolean done = false;
1687		public void run() {
#	Line 1580 | Line 1689 | public class JSR166TestCase extends Test
1689		}
1690		}
1691
1583	–	public static class TrackedCallable implements Callable {
1584	–	public volatile boolean done = false;
1585	–	public Object call() {
1586	–	try {
1587	–	delay(SMALL_DELAY_MS);
1588	–	done = true;
1589	–	} catch (InterruptedException ok) {}
1590	–	return Boolean.TRUE;
1591	–	}
1592	–	}
1593	–
1692		/**
1693		* Analog of CheckedRunnable for RecursiveAction
1694		*/
#	Line 1634 | Line 1732 | public class JSR166TestCase extends Test
1732		* A CyclicBarrier that uses timed await and fails with
1733		* AssertionFailedErrors instead of throwing checked exceptions.
1734		*/
1735	<	public class CheckedBarrier extends CyclicBarrier {
1735	>	public static class CheckedBarrier extends CyclicBarrier {
1736		public CheckedBarrier(int parties) { super(parties); }
1737
1738		public int await() {
#	Line 1657 | Line 1755 | public class JSR166TestCase extends Test
1755		assertEquals(0, q.size());
1756		assertNull(q.peek());
1757		assertNull(q.poll());
1758	<	assertNull(q.poll(0, MILLISECONDS));
1758	>	assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1759		assertEquals(q.toString(), "[]");
1760		assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1761		assertFalse(q.iterator().hasNext());
#	Line 1698 | Line 1796 | public class JSR166TestCase extends Test
1796		}
1797		}
1798
1799	+	void assertImmutable(final Object o) {
1800	+	if (o instanceof Collection) {
1801	+	assertThrows(
1802	+	UnsupportedOperationException.class,
1803	+	new Runnable() { public void run() {
1804	+	((Collection) o).add(null);}});
1805	+	}
1806	+	}
1807	+
1808		@SuppressWarnings("unchecked")
1809		<T> T serialClone(T o) {
1810		try {
1811		ObjectInputStream ois = new ObjectInputStream
1812		(new ByteArrayInputStream(serialBytes(o)));
1813		T clone = (T) ois.readObject();
1814	+	if (o == clone) assertImmutable(o);
1815		assertSame(o.getClass(), clone.getClass());
1816		return clone;
1817		} catch (Throwable fail) {
#	Line 1712 | Line 1820 | public class JSR166TestCase extends Test
1820		}
1821		}
1822
1823	+	/**
1824	+	* A version of serialClone that leaves error handling (for
1825	+	* e.g. NotSerializableException) up to the caller.
1826	+	*/
1827	+	@SuppressWarnings("unchecked")
1828	+	<T> T serialClonePossiblyFailing(T o)
1829	+	throws ReflectiveOperationException, java.io.IOException {
1830	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1831	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1832	+	oos.writeObject(o);
1833	+	oos.flush();
1834	+	oos.close();
1835	+	ObjectInputStream ois = new ObjectInputStream
1836	+	(new ByteArrayInputStream(bos.toByteArray()));
1837	+	T clone = (T) ois.readObject();
1838	+	if (o == clone) assertImmutable(o);
1839	+	assertSame(o.getClass(), clone.getClass());
1840	+	return clone;
1841	+	}
1842	+
1843	+	/**
1844	+	* If o implements Cloneable and has a public clone method,
1845	+	* returns a clone of o, else null.
1846	+	*/
1847	+	@SuppressWarnings("unchecked")
1848	+	<T> T cloneableClone(T o) {
1849	+	if (!(o instanceof Cloneable)) return null;
1850	+	final T clone;
1851	+	try {
1852	+	clone = (T) o.getClass().getMethod("clone").invoke(o);
1853	+	} catch (NoSuchMethodException ok) {
1854	+	return null;
1855	+	} catch (ReflectiveOperationException unexpected) {
1856	+	throw new Error(unexpected);
1857	+	}
1858	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1859	+	assertSame(o.getClass(), clone.getClass());
1860	+	return clone;
1861	+	}
1862	+
1863		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1864		Runnable... throwingActions) {
1865		for (Runnable throwingAction : throwingActions) {
#	Line 1740 | Line 1888 | public class JSR166TestCase extends Test
1888		} catch (NoSuchElementException success) {}
1889		assertFalse(it.hasNext());
1890		}
1891	+
1892	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1893	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1894	+	}
1895	+
1896	+	public Runnable runnableThrowing(final RuntimeException ex) {
1897	+	return new Runnable() { public void run() { throw ex; }};
1898	+	}
1899	+
1900	+	/** A reusable thread pool to be shared by tests. */
1901	+	static final ExecutorService cachedThreadPool =
1902	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1903	+	1000L, MILLISECONDS,
1904	+	new SynchronousQueue<Runnable>());
1905	+
1906	+	static <T> void shuffle(T[] array) {
1907	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1908	+	}
1909	+
1910	+	/**
1911	+	* Returns the same String as would be returned by {@link
1912	+	* Object#toString}, whether or not the given object's class
1913	+	* overrides toString().
1914	+	*
1915	+	* @see System#identityHashCode
1916	+	*/
1917	+	static String identityString(Object x) {
1918	+	return x.getClass().getName()
1919	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1920	+	}
1921	+
1922	+	// --- Shared assertions for Executor tests ---
1923	+
1924	+	/**
1925	+	* Returns maximum number of tasks that can be submitted to given
1926	+	* pool (with bounded queue) before saturation (when submission
1927	+	* throws RejectedExecutionException).
1928	+	*/
1929	+	static final int saturatedSize(ThreadPoolExecutor pool) {
1930	+	BlockingQueue<Runnable> q = pool.getQueue();
1931	+	return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1932	+	}
1933	+
1934	+	@SuppressWarnings("FutureReturnValueIgnored")
1935	+	void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1936	+	try {
1937	+	e.execute((Runnable) null);
1938	+	shouldThrow();
1939	+	} catch (NullPointerException success) {}
1940	+
1941	+	if (! (e instanceof ExecutorService)) return;
1942	+	ExecutorService es = (ExecutorService) e;
1943	+	try {
1944	+	es.submit((Runnable) null);
1945	+	shouldThrow();
1946	+	} catch (NullPointerException success) {}
1947	+	try {
1948	+	es.submit((Runnable) null, Boolean.TRUE);
1949	+	shouldThrow();
1950	+	} catch (NullPointerException success) {}
1951	+	try {
1952	+	es.submit((Callable) null);
1953	+	shouldThrow();
1954	+	} catch (NullPointerException success) {}
1955	+
1956	+	if (! (e instanceof ScheduledExecutorService)) return;
1957	+	ScheduledExecutorService ses = (ScheduledExecutorService) e;
1958	+	try {
1959	+	ses.schedule((Runnable) null,
1960	+	randomTimeout(), randomTimeUnit());
1961	+	shouldThrow();
1962	+	} catch (NullPointerException success) {}
1963	+	try {
1964	+	ses.schedule((Callable) null,
1965	+	randomTimeout(), randomTimeUnit());
1966	+	shouldThrow();
1967	+	} catch (NullPointerException success) {}
1968	+	try {
1969	+	ses.scheduleAtFixedRate((Runnable) null,
1970	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1971	+	shouldThrow();
1972	+	} catch (NullPointerException success) {}
1973	+	try {
1974	+	ses.scheduleWithFixedDelay((Runnable) null,
1975	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1976	+	shouldThrow();
1977	+	} catch (NullPointerException success) {}
1978	+	}
1979	+
1980	+	void setRejectedExecutionHandler(
1981	+	ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1982	+	p.setRejectedExecutionHandler(handler);
1983	+	assertSame(handler, p.getRejectedExecutionHandler());
1984	+	}
1985	+
1986	+	void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1987	+	final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1988	+	final long savedTaskCount = p.getTaskCount();
1989	+	final long savedCompletedTaskCount = p.getCompletedTaskCount();
1990	+	final int savedQueueSize = p.getQueue().size();
1991	+	final boolean stock = (p.getClass().getClassLoader() == null);
1992	+
1993	+	Runnable r = () -> {};
1994	+	Callable<Boolean> c = () -> Boolean.TRUE;
1995	+
1996	+	class Recorder implements RejectedExecutionHandler {
1997	+	public volatile Runnable r = null;
1998	+	public volatile ThreadPoolExecutor p = null;
1999	+	public void reset() { r = null; p = null; }
2000	+	public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
2001	+	assertNull(this.r);
2002	+	assertNull(this.p);
2003	+	this.r = r;
2004	+	this.p = p;
2005	+	}
2006	+	}
2007	+
2008	+	// check custom handler is invoked exactly once per task
2009	+	Recorder recorder = new Recorder();
2010	+	setRejectedExecutionHandler(p, recorder);
2011	+	for (int i = 2; i--> 0; ) {
2012	+	recorder.reset();
2013	+	p.execute(r);
2014	+	if (stock && p.getClass() == ThreadPoolExecutor.class)
2015	+	assertSame(r, recorder.r);
2016	+	assertSame(p, recorder.p);
2017	+
2018	+	recorder.reset();
2019	+	assertFalse(p.submit(r).isDone());
2020	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2021	+	assertSame(p, recorder.p);
2022	+
2023	+	recorder.reset();
2024	+	assertFalse(p.submit(r, Boolean.TRUE).isDone());
2025	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2026	+	assertSame(p, recorder.p);
2027	+
2028	+	recorder.reset();
2029	+	assertFalse(p.submit(c).isDone());
2030	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2031	+	assertSame(p, recorder.p);
2032	+
2033	+	if (p instanceof ScheduledExecutorService) {
2034	+	ScheduledExecutorService s = (ScheduledExecutorService) p;
2035	+	ScheduledFuture<?> future;
2036	+
2037	+	recorder.reset();
2038	+	future = s.schedule(r, randomTimeout(), randomTimeUnit());
2039	+	assertFalse(future.isDone());
2040	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2041	+	assertSame(p, recorder.p);
2042	+
2043	+	recorder.reset();
2044	+	future = s.schedule(c, randomTimeout(), randomTimeUnit());
2045	+	assertFalse(future.isDone());
2046	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2047	+	assertSame(p, recorder.p);
2048	+
2049	+	recorder.reset();
2050	+	future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2051	+	assertFalse(future.isDone());
2052	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2053	+	assertSame(p, recorder.p);
2054	+
2055	+	recorder.reset();
2056	+	future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2057	+	assertFalse(future.isDone());
2058	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2059	+	assertSame(p, recorder.p);
2060	+	}
2061	+	}
2062	+
2063	+	// Checking our custom handler above should be sufficient, but
2064	+	// we add some integration tests of standard handlers.
2065	+	final AtomicReference<Thread> thread = new AtomicReference<>();
2066	+	final Runnable setThread = () -> thread.set(Thread.currentThread());
2067	+
2068	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2069	+	try {
2070	+	p.execute(setThread);
2071	+	shouldThrow();
2072	+	} catch (RejectedExecutionException success) {}
2073	+	assertNull(thread.get());
2074	+
2075	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2076	+	p.execute(setThread);
2077	+	assertNull(thread.get());
2078	+
2079	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2080	+	p.execute(setThread);
2081	+	if (p.isShutdown())
2082	+	assertNull(thread.get());
2083	+	else
2084	+	assertSame(Thread.currentThread(), thread.get());
2085	+
2086	+	setRejectedExecutionHandler(p, savedHandler);
2087	+
2088	+	// check that pool was not perturbed by handlers
2089	+	assertEquals(savedTaskCount, p.getTaskCount());
2090	+	assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2091	+	assertEquals(savedQueueSize, p.getQueue().size());
2092	+	}
2093		}

Diff Legend

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