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.213 by jsr166, Fri Dec 9 06:58:57 2016 UTC vs.
Revision 1.243 by jsr166, Thu Apr 5 03:36:54 2018 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.
#	Line 8 | Line 9
9
10		/*
11		* @test
12	<	* @summary JSR-166 tck tests (conformance testing mode)
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	<	*/
19	<
20	<	/*
21	<	* @test
22	<	* @summary JSR-166 tck tests (whitebox tests allowed)
23	<	* @build *
24	<	* @modules java.base/java.util.concurrent:open
25	<	*          java.management
26	<	* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
27	<	* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 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;
#	Line 38 | 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;
41	–	import java.nio.file.Files;
42	–	import java.nio.file.Paths;
57		import java.security.CodeSource;
58		import java.security.Permission;
59		import java.security.PermissionCollection;
#	Line 52 | 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;
80	–	import java.util.regex.Matcher;
103		import java.util.regex.Pattern;
104
83	–	import junit.framework.AssertionFailedError;
105		import junit.framework.Test;
106		import junit.framework.TestCase;
107		import junit.framework.TestResult;
#	Line 287 | Line 308 | public class JSR166TestCase extends Test
308
309		//     public static String cpuModel() {
310		//         try {
311	<	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
311	>	//             java.util.regex.Matcher matcher
312	>	//               = Pattern.compile("model name\\s*: (.*)")
313		//                 .matcher(new String(
314	<	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
314	>	//                     java.nio.file.Files.readAllBytes(
315	>	//                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
316		//             matcher.find();
317		//             return matcher.group(1);
318		//         } catch (Exception ex) { return null; }
#	Line 398 | Line 421 | public class JSR166TestCase extends Test
421		for (String testClassName : testClassNames) {
422		try {
423		Class<?> testClass = Class.forName(testClassName);
424	<	Method m = testClass.getDeclaredMethod("suite",
402	<	new Class<?>[0]);
424	>	Method m = testClass.getDeclaredMethod("suite");
425		suite.addTest(newTestSuite((Test)m.invoke(null)));
426	<	} catch (Exception e) {
427	<	throw new Error("Missing test class", e);
426	>	} catch (ReflectiveOperationException e) {
427	>	throw new AssertionError("Missing test class", e);
428		}
429		}
430		}
#	Line 424 | Line 446 | public class JSR166TestCase extends Test
446		}
447		}
448
449	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
450	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
451	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
452	<	public static boolean atLeastJava9() {
453	<	return JAVA_CLASS_VERSION >= 53.0
432	<	// As of 2015-09, java9 still uses 52.0 class file version
433	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
434	<	}
435	<	public static boolean atLeastJava10() {
436	<	return JAVA_CLASS_VERSION >= 54.0
437	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
438	<	}
449	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
450	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
451	>	public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
452	>	public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
453	>	public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
454
455		/**
456		* Collects all JSR166 unit tests as one suite.
#	Line 523 | Line 538 | public class JSR166TestCase extends Test
538		"DoubleAdderTest",
539		"ForkJoinPool8Test",
540		"ForkJoinTask8Test",
541	+	"HashMapTest",
542	+	"LinkedBlockingDeque8Test",
543	+	"LinkedBlockingQueue8Test",
544		"LongAccumulatorTest",
545		"LongAdderTest",
546		"SplittableRandomTest",
#	Line 545 | Line 563 | public class JSR166TestCase extends Test
563		"AtomicReference9Test",
564		"AtomicReferenceArray9Test",
565		"ExecutorCompletionService9Test",
566	+	"ForkJoinPool9Test",
567		};
568		addNamedTestClasses(suite, java9TestClassNames);
569		}
#	Line 555 | Line 574 | public class JSR166TestCase extends Test
574		/** Returns list of junit-style test method names in given class. */
575		public static ArrayList<String> testMethodNames(Class<?> testClass) {
576		Method[] methods = testClass.getDeclaredMethods();
577	<	ArrayList<String> names = new ArrayList<String>(methods.length);
577	>	ArrayList<String> names = new ArrayList<>(methods.length);
578		for (Method method : methods) {
579		if (method.getName().startsWith("test")
580		&& Modifier.isPublic(method.getModifiers())
#	Line 582 | Line 601 | public class JSR166TestCase extends Test
601		for (String methodName : testMethodNames(testClass))
602		suite.addTest((Test) c.newInstance(data, methodName));
603		return suite;
604	<	} catch (Exception e) {
605	<	throw new Error(e);
604	>	} catch (ReflectiveOperationException e) {
605	>	throw new AssertionError(e);
606		}
607		}
608
#	Line 599 | Line 618 | public class JSR166TestCase extends Test
618		if (atLeastJava8()) {
619		String name = testClass.getName();
620		String name8 = name.replaceAll("Test$", "8Test");
621	<	if (name.equals(name8)) throw new Error(name);
621	>	if (name.equals(name8)) throw new AssertionError(name);
622		try {
623		return (Test)
624		Class.forName(name8)
625	<	.getMethod("testSuite", new Class[] { dataClass })
625	>	.getMethod("testSuite", dataClass)
626		.invoke(null, data);
627	<	} catch (Exception e) {
628	<	throw new Error(e);
627	>	} catch (ReflectiveOperationException e) {
628	>	throw new AssertionError(e);
629		}
630		} else {
631		return new TestSuite();
#	Line 620 | Line 639 | public class JSR166TestCase extends Test
639		public static long MEDIUM_DELAY_MS;
640		public static long LONG_DELAY_MS;
641
642	+	private static final long RANDOM_TIMEOUT;
643	+	private static final long RANDOM_EXPIRED_TIMEOUT;
644	+	private static final TimeUnit RANDOM_TIMEUNIT;
645	+	static {
646	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
647	+	long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
648	+	RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
649	+	RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
650	+	TimeUnit[] timeUnits = TimeUnit.values();
651	+	RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
652	+	}
653	+
654	+	/**
655	+	* Returns a timeout for use when any value at all will do.
656	+	*/
657	+	static long randomTimeout() { return RANDOM_TIMEOUT; }
658	+
659	+	/**
660	+	* Returns a timeout that means "no waiting", i.e. not positive.
661	+	*/
662	+	static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
663	+
664	+	/**
665	+	* Returns a random non-null TimeUnit.
666	+	*/
667	+	static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
668	+
669		/**
670		* Returns the shortest timed delay. This can be scaled up for
671		* slow machines using the jsr166.delay.factor system property,
#	Line 640 | Line 686 | public class JSR166TestCase extends Test
686		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
687		}
688
689	+	private static final long TIMEOUT_DELAY_MS
690	+	= (long) (12.0 * Math.cbrt(delayFactor));
691	+
692		/**
693	<	* Returns a timeout in milliseconds to be used in tests that
694	<	* verify that operations block or time out.
693	>	* Returns a timeout in milliseconds to be used in tests that verify
694	>	* that operations block or time out.  We want this to be longer
695	>	* than the OS scheduling quantum, but not too long, so don't scale
696	>	* linearly with delayFactor; we use "crazy" cube root instead.
697		*/
698	<	long timeoutMillis() {
699	<	return SHORT_DELAY_MS / 4;
698	>	static long timeoutMillis() {
699	>	return TIMEOUT_DELAY_MS;
700		}
701
702		/**
#	Line 661 | Line 712 | public class JSR166TestCase extends Test
712		* The first exception encountered if any threadAssertXXX method fails.
713		*/
714		private final AtomicReference<Throwable> threadFailure
715	<	= new AtomicReference<Throwable>(null);
715	>	= new AtomicReference<>(null);
716
717		/**
718		* Records an exception so that it can be rethrown later in the test
#	Line 683 | Line 734 | public class JSR166TestCase extends Test
734		String msg = toString() + ": " + String.format(format, args);
735		System.err.println(msg);
736		dumpTestThreads();
737	<	throw new AssertionFailedError(msg);
737	>	throw new AssertionError(msg);
738		}
739
740		/**
#	Line 704 | Line 755 | public class JSR166TestCase extends Test
755		throw (RuntimeException) t;
756		else if (t instanceof Exception)
757		throw (Exception) t;
758	<	else {
759	<	AssertionFailedError afe =
709	<	new AssertionFailedError(t.toString());
710	<	afe.initCause(t);
711	<	throw afe;
712	<	}
758	>	else
759	>	throw new AssertionError(t.toString(), t);
760		}
761
762		if (Thread.interrupted())
#	Line 743 | Line 790 | public class JSR166TestCase extends Test
790
791		/**
792		* Just like fail(reason), but additionally recording (using
793	<	* threadRecordFailure) any AssertionFailedError thrown, so that
794	<	* the current testcase will fail.
793	>	* threadRecordFailure) any AssertionError thrown, so that the
794	>	* current testcase will fail.
795		*/
796		public void threadFail(String reason) {
797		try {
798		fail(reason);
799	<	} catch (AssertionFailedError t) {
800	<	threadRecordFailure(t);
801	<	throw t;
799	>	} catch (AssertionError fail) {
800	>	threadRecordFailure(fail);
801	>	throw fail;
802		}
803		}
804
805		/**
806		* Just like assertTrue(b), but additionally recording (using
807	<	* threadRecordFailure) any AssertionFailedError thrown, so that
808	<	* the current testcase will fail.
807	>	* threadRecordFailure) any AssertionError thrown, so that the
808	>	* current testcase will fail.
809		*/
810		public void threadAssertTrue(boolean b) {
811		try {
812		assertTrue(b);
813	<	} catch (AssertionFailedError t) {
814	<	threadRecordFailure(t);
815	<	throw t;
813	>	} catch (AssertionError fail) {
814	>	threadRecordFailure(fail);
815	>	throw fail;
816		}
817		}
818
819		/**
820		* Just like assertFalse(b), but additionally recording (using
821	<	* threadRecordFailure) any AssertionFailedError thrown, so that
822	<	* the current testcase will fail.
821	>	* threadRecordFailure) any AssertionError thrown, so that the
822	>	* current testcase will fail.
823		*/
824		public void threadAssertFalse(boolean b) {
825		try {
826		assertFalse(b);
827	<	} catch (AssertionFailedError t) {
828	<	threadRecordFailure(t);
829	<	throw t;
827	>	} catch (AssertionError fail) {
828	>	threadRecordFailure(fail);
829	>	throw fail;
830		}
831		}
832
833		/**
834		* Just like assertNull(x), but additionally recording (using
835	<	* threadRecordFailure) any AssertionFailedError thrown, so that
836	<	* the current testcase will fail.
835	>	* threadRecordFailure) any AssertionError thrown, so that the
836	>	* current testcase will fail.
837		*/
838		public void threadAssertNull(Object x) {
839		try {
840		assertNull(x);
841	<	} catch (AssertionFailedError t) {
842	<	threadRecordFailure(t);
843	<	throw t;
841	>	} catch (AssertionError fail) {
842	>	threadRecordFailure(fail);
843	>	throw fail;
844		}
845		}
846
847		/**
848		* Just like assertEquals(x, y), but additionally recording (using
849	<	* threadRecordFailure) any AssertionFailedError thrown, so that
850	<	* the current testcase will fail.
849	>	* threadRecordFailure) any AssertionError thrown, so that the
850	>	* current testcase will fail.
851		*/
852		public void threadAssertEquals(long x, long y) {
853		try {
854		assertEquals(x, y);
855	<	} catch (AssertionFailedError t) {
856	<	threadRecordFailure(t);
857	<	throw t;
855	>	} catch (AssertionError fail) {
856	>	threadRecordFailure(fail);
857	>	throw fail;
858		}
859		}
860
861		/**
862		* Just like assertEquals(x, y), but additionally recording (using
863	<	* threadRecordFailure) any AssertionFailedError thrown, so that
864	<	* the current testcase will fail.
863	>	* threadRecordFailure) any AssertionError thrown, so that the
864	>	* current testcase will fail.
865		*/
866		public void threadAssertEquals(Object x, Object y) {
867		try {
868		assertEquals(x, y);
869	<	} catch (AssertionFailedError fail) {
869	>	} catch (AssertionError fail) {
870		threadRecordFailure(fail);
871		throw fail;
872		} catch (Throwable fail) {
#	Line 829 | Line 876 | public class JSR166TestCase extends Test
876
877		/**
878		* Just like assertSame(x, y), but additionally recording (using
879	<	* threadRecordFailure) any AssertionFailedError thrown, so that
880	<	* the current testcase will fail.
879	>	* threadRecordFailure) any AssertionError thrown, so that the
880	>	* current testcase will fail.
881		*/
882		public void threadAssertSame(Object x, Object y) {
883		try {
884		assertSame(x, y);
885	<	} catch (AssertionFailedError fail) {
885	>	} catch (AssertionError fail) {
886		threadRecordFailure(fail);
887		throw fail;
888		}
#	Line 857 | Line 904 | public class JSR166TestCase extends Test
904
905		/**
906		* Records the given exception using {@link #threadRecordFailure},
907	<	* then rethrows the exception, wrapping it in an
908	<	* AssertionFailedError if necessary.
907	>	* then rethrows the exception, wrapping it in an AssertionError
908	>	* if necessary.
909		*/
910		public void threadUnexpectedException(Throwable t) {
911		threadRecordFailure(t);
#	Line 867 | Line 914 | public class JSR166TestCase extends Test
914		throw (RuntimeException) t;
915		else if (t instanceof Error)
916		throw (Error) t;
917	<	else {
918	<	AssertionFailedError afe =
872	<	new AssertionFailedError("unexpected exception: " + t);
873	<	afe.initCause(t);
874	<	throw afe;
875	<	}
917	>	else
918	>	throw new AssertionError("unexpected exception: " + t, t);
919		}
920
921		/**
#	Line 1040 | Line 1083 | public class JSR166TestCase extends Test
1083		}
1084
1085		/**
1086	<	* Checks that thread does not terminate within the default
1044	<	* millisecond delay of {@code timeoutMillis()}.
1045	<	*/
1046	<	void assertThreadStaysAlive(Thread thread) {
1047	<	assertThreadStaysAlive(thread, timeoutMillis());
1048	<	}
1049	<
1050	<	/**
1051	<	* Checks that thread does not terminate within the given millisecond delay.
1086	>	* Checks that thread eventually enters the expected blocked thread state.
1087		*/
1088	<	void assertThreadStaysAlive(Thread thread, long millis) {
1089	<	try {
1090	<	// No need to optimize the failing case via Thread.join.
1091	<	delay(millis);
1092	<	assertTrue(thread.isAlive());
1093	<	} catch (InterruptedException fail) {
1094	<	threadFail("Unexpected InterruptedException");
1095	<	}
1096	<	}
1097	<
1098	<	/**
1099	<	* Checks that the threads do not terminate within the default
1100	<	* millisecond delay of {@code timeoutMillis()}.
1066	<	*/
1067	<	void assertThreadsStayAlive(Thread... threads) {
1068	<	assertThreadsStayAlive(timeoutMillis(), threads);
1069	<	}
1070	<
1071	<	/**
1072	<	* Checks that the threads do not terminate within the given millisecond delay.
1073	<	*/
1074	<	void assertThreadsStayAlive(long millis, Thread... threads) {
1075	<	try {
1076	<	// No need to optimize the failing case via Thread.join.
1077	<	delay(millis);
1078	<	for (Thread thread : threads)
1079	<	assertTrue(thread.isAlive());
1080	<	} catch (InterruptedException fail) {
1081	<	threadFail("Unexpected InterruptedException");
1088	>	void assertThreadBlocks(Thread thread, Thread.State expected) {
1089	>	// always sleep at least 1 ms, with high probability avoiding
1090	>	// transitory states
1091	>	for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1092	>	try { delay(1); }
1093	>	catch (InterruptedException fail) {
1094	>	throw new AssertionError("Unexpected InterruptedException", fail);
1095	>	}
1096	>	Thread.State s = thread.getState();
1097	>	if (s == expected)
1098	>	return;
1099	>	else if (s == Thread.State.TERMINATED)
1100	>	fail("Unexpected thread termination");
1101		}
1102	+	fail("timed out waiting for thread to enter thread state " + expected);
1103		}
1104
1105		/**
#	Line 1120 | Line 1140 | public class JSR166TestCase extends Test
1140		}
1141
1142		/**
1143	+	* The maximum number of consecutive spurious wakeups we should
1144	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1145	+	*/
1146	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1147	+
1148	+	/**
1149		* The number of elements to place in collections, arrays, etc.
1150		*/
1151		public static final int SIZE = 20;
#	Line 1223 | Line 1249 | public class JSR166TestCase extends Test
1249		}
1250		public void refresh() {}
1251		public String toString() {
1252	<	List<Permission> ps = new ArrayList<Permission>();
1252	>	List<Permission> ps = new ArrayList<>();
1253		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1254		ps.add(e.nextElement());
1255		return "AdjustablePolicy with permissions " + ps;
#	Line 1251 | Line 1277 | public class JSR166TestCase extends Test
1277
1278		/**
1279		* Sleeps until the given time has elapsed.
1280	<	* Throws AssertionFailedError if interrupted.
1280	>	* Throws AssertionError if interrupted.
1281		*/
1282		static void sleep(long millis) {
1283		try {
1284		delay(millis);
1285		} catch (InterruptedException fail) {
1286	<	AssertionFailedError afe =
1261	<	new AssertionFailedError("Unexpected InterruptedException");
1262	<	afe.initCause(fail);
1263	<	throw afe;
1286	>	throw new AssertionError("Unexpected InterruptedException", fail);
1287		}
1288		}
1289
#	Line 1282 | Line 1305 | public class JSR166TestCase extends Test
1305		startTime = System.nanoTime();
1306		else if (millisElapsedSince(startTime) > timeoutMillis) {
1307		threadAssertTrue(thread.isAlive());
1308	<	return;
1308	>	fail("timed out waiting for thread to enter wait state");
1309	>	}
1310	>	Thread.yield();
1311	>	}
1312	>	}
1313	>
1314	>	/**
1315	>	* Spin-waits up to the specified number of milliseconds for the given
1316	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1317	>	* and additionally satisfy the given condition.
1318	>	*/
1319	>	void waitForThreadToEnterWaitState(
1320	>	Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1321	>	long startTime = 0L;
1322	>	for (;;) {
1323	>	Thread.State s = thread.getState();
1324	>	if (s == Thread.State.BLOCKED ||
1325	>	s == Thread.State.WAITING ||
1326	>	s == Thread.State.TIMED_WAITING) {
1327	>	try {
1328	>	if (waitingForGodot.call())
1329	>	return;
1330	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1331	>	}
1332	>	else if (s == Thread.State.TERMINATED)
1333	>	fail("Unexpected thread termination");
1334	>	else if (startTime == 0L)
1335	>	startTime = System.nanoTime();
1336	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
1337	>	threadAssertTrue(thread.isAlive());
1338	>	fail("timed out waiting for thread to enter wait state");
1339		}
1340		Thread.yield();
1341		}
1342		}
1343
1344		/**
1345	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1346	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1345	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1346	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1347		*/
1348		void waitForThreadToEnterWaitState(Thread thread) {
1349		waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1350		}
1351
1352		/**
1353	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1354	+	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1355	+	* and additionally satisfy the given condition.
1356	+	*/
1357	+	void waitForThreadToEnterWaitState(
1358	+	Thread thread, Callable<Boolean> waitingForGodot) {
1359	+	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1360	+	}
1361	+
1362	+	/**
1363		* Returns the number of milliseconds since time given by
1364		* startNanoTime, which must have been previously returned from a
1365		* call to {@link System#nanoTime()}.
#	Line 1311 | Line 1374 | public class JSR166TestCase extends Test
1374		//             r.run();
1375		//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1376		//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1377	<	//             throw new AssertionFailedError("did not return promptly");
1377	>	//             throw new AssertionError("did not return promptly");
1378		//     }
1379
1380		//     void assertTerminatesPromptly(Runnable r) {
#	Line 1328 | Line 1391 | public class JSR166TestCase extends Test
1391		assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1392		} catch (Throwable fail) { threadUnexpectedException(fail); }
1393		if (millisElapsedSince(startTime) > timeoutMillis/2)
1394	<	throw new AssertionFailedError("timed get did not return promptly");
1394	>	throw new AssertionError("timed get did not return promptly");
1395		}
1396
1397		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1386 | Line 1449 | public class JSR166TestCase extends Test
1449		}
1450		}
1451
1389	–	public abstract class RunnableShouldThrow implements Runnable {
1390	–	protected abstract void realRun() throws Throwable;
1391	–
1392	–	final Class<?> exceptionClass;
1393	–
1394	–	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1395	–	this.exceptionClass = exceptionClass;
1396	–	}
1397	–
1398	–	public final void run() {
1399	–	try {
1400	–	realRun();
1401	–	threadShouldThrow(exceptionClass.getSimpleName());
1402	–	} catch (Throwable t) {
1403	–	if (! exceptionClass.isInstance(t))
1404	–	threadUnexpectedException(t);
1405	–	}
1406	–	}
1407	–	}
1408	–
1452		public abstract class ThreadShouldThrow extends Thread {
1453		protected abstract void realRun() throws Throwable;
1454
#	Line 1548 | Line 1591 | public class JSR166TestCase extends Test
1591		}
1592		}
1593
1594	+	public void await(CyclicBarrier barrier) {
1595	+	try {
1596	+	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1597	+	} catch (Throwable fail) {
1598	+	threadUnexpectedException(fail);
1599	+	}
1600	+	}
1601	+
1602		//     /**
1603		//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1604		//      */
#	Line 1562 | Line 1613 | public class JSR166TestCase extends Test
1613		//         long startTime = System.nanoTime();
1614		//         while (!flag.get()) {
1615		//             if (millisElapsedSince(startTime) > timeoutMillis)
1616	<	//                 throw new AssertionFailedError("timed out");
1616	>	//                 throw new AssertionError("timed out");
1617		//             Thread.yield();
1618		//         }
1619		//     }
#	Line 1571 | Line 1622 | public class JSR166TestCase extends Test
1622		public String call() { throw new NullPointerException(); }
1623		}
1624
1574	–	public static class CallableOne implements Callable<Integer> {
1575	–	public Integer call() { return one; }
1576	–	}
1577	–
1578	–	public class ShortRunnable extends CheckedRunnable {
1579	–	protected void realRun() throws Throwable {
1580	–	delay(SHORT_DELAY_MS);
1581	–	}
1582	–	}
1583	–
1584	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1585	–	protected void realRun() throws InterruptedException {
1586	–	delay(SHORT_DELAY_MS);
1587	–	}
1588	–	}
1589	–
1590	–	public class SmallRunnable extends CheckedRunnable {
1591	–	protected void realRun() throws Throwable {
1592	–	delay(SMALL_DELAY_MS);
1593	–	}
1594	–	}
1595	–
1625		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1626		protected void realRun() {
1627		try {
#	Line 1601 | Line 1630 | public class JSR166TestCase extends Test
1630		}
1631		}
1632
1604	–	public class SmallCallable extends CheckedCallable {
1605	–	protected Object realCall() throws InterruptedException {
1606	–	delay(SMALL_DELAY_MS);
1607	–	return Boolean.TRUE;
1608	–	}
1609	–	}
1610	–
1611	–	public class MediumRunnable extends CheckedRunnable {
1612	–	protected void realRun() throws Throwable {
1613	–	delay(MEDIUM_DELAY_MS);
1614	–	}
1615	–	}
1616	–
1617	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1618	–	protected void realRun() throws InterruptedException {
1619	–	delay(MEDIUM_DELAY_MS);
1620	–	}
1621	–	}
1622	–
1633		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1634		return new CheckedRunnable() {
1635		protected void realRun() {
#	Line 1629 | Line 1639 | public class JSR166TestCase extends Test
1639		}};
1640		}
1641
1632	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1633	–	protected void realRun() {
1634	–	try {
1635	–	delay(MEDIUM_DELAY_MS);
1636	–	} catch (InterruptedException ok) {}
1637	–	}
1638	–	}
1639	–
1640	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1641	–	protected void realRun() {
1642	–	try {
1643	–	delay(LONG_DELAY_MS);
1644	–	} catch (InterruptedException ok) {}
1645	–	}
1646	–	}
1647	–
1642		/**
1643		* For use as ThreadFactory in constructors
1644		*/
#	Line 1658 | Line 1652 | public class JSR166TestCase extends Test
1652		boolean isDone();
1653		}
1654
1661	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1662	–	return new TrackedRunnable() {
1663	–	private volatile boolean done = false;
1664	–	public boolean isDone() { return done; }
1665	–	public void run() {
1666	–	try {
1667	–	delay(timeoutMillis);
1668	–	done = true;
1669	–	} catch (InterruptedException ok) {}
1670	–	}
1671	–	};
1672	–	}
1673	–
1674	–	public static class TrackedShortRunnable implements Runnable {
1675	–	public volatile boolean done = false;
1676	–	public void run() {
1677	–	try {
1678	–	delay(SHORT_DELAY_MS);
1679	–	done = true;
1680	–	} catch (InterruptedException ok) {}
1681	–	}
1682	–	}
1683	–
1684	–	public static class TrackedSmallRunnable implements Runnable {
1685	–	public volatile boolean done = false;
1686	–	public void run() {
1687	–	try {
1688	–	delay(SMALL_DELAY_MS);
1689	–	done = true;
1690	–	} catch (InterruptedException ok) {}
1691	–	}
1692	–	}
1693	–
1694	–	public static class TrackedMediumRunnable implements Runnable {
1695	–	public volatile boolean done = false;
1696	–	public void run() {
1697	–	try {
1698	–	delay(MEDIUM_DELAY_MS);
1699	–	done = true;
1700	–	} catch (InterruptedException ok) {}
1701	–	}
1702	–	}
1703	–
1704	–	public static class TrackedLongRunnable implements Runnable {
1705	–	public volatile boolean done = false;
1706	–	public void run() {
1707	–	try {
1708	–	delay(LONG_DELAY_MS);
1709	–	done = true;
1710	–	} catch (InterruptedException ok) {}
1711	–	}
1712	–	}
1713	–
1655		public static class TrackedNoOpRunnable implements Runnable {
1656		public volatile boolean done = false;
1657		public void run() {
#	Line 1718 | Line 1659 | public class JSR166TestCase extends Test
1659		}
1660		}
1661
1721	–	public static class TrackedCallable implements Callable {
1722	–	public volatile boolean done = false;
1723	–	public Object call() {
1724	–	try {
1725	–	delay(SMALL_DELAY_MS);
1726	–	done = true;
1727	–	} catch (InterruptedException ok) {}
1728	–	return Boolean.TRUE;
1729	–	}
1730	–	}
1731	–
1662		/**
1663		* Analog of CheckedRunnable for RecursiveAction
1664		*/
#	Line 1770 | Line 1700 | public class JSR166TestCase extends Test
1700
1701		/**
1702		* A CyclicBarrier that uses timed await and fails with
1703	<	* AssertionFailedErrors instead of throwing checked exceptions.
1703	>	* AssertionErrors instead of throwing checked exceptions.
1704		*/
1705		public static class CheckedBarrier extends CyclicBarrier {
1706		public CheckedBarrier(int parties) { super(parties); }
#	Line 1779 | Line 1709 | public class JSR166TestCase extends Test
1709		try {
1710		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1711		} catch (TimeoutException timedOut) {
1712	<	throw new AssertionFailedError("timed out");
1712	>	throw new AssertionError("timed out");
1713		} catch (Exception fail) {
1714	<	AssertionFailedError afe =
1785	<	new AssertionFailedError("Unexpected exception: " + fail);
1786	<	afe.initCause(fail);
1787	<	throw afe;
1714	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1715		}
1716		}
1717		}
#	Line 1795 | Line 1722 | public class JSR166TestCase extends Test
1722		assertEquals(0, q.size());
1723		assertNull(q.peek());
1724		assertNull(q.poll());
1725	<	assertNull(q.poll(0, MILLISECONDS));
1725	>	assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1726		assertEquals(q.toString(), "[]");
1727		assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1728		assertFalse(q.iterator().hasNext());
#	Line 1907 | Line 1834 | public class JSR166TestCase extends Test
1834		try { throwingAction.run(); }
1835		catch (Throwable t) {
1836		threw = true;
1837	<	if (!expectedExceptionClass.isInstance(t)) {
1838	<	AssertionFailedError afe =
1839	<	new AssertionFailedError
1840	<	("Expected " + expectedExceptionClass.getName() +
1841	<	", got " + t.getClass().getName());
1915	<	afe.initCause(t);
1916	<	threadUnexpectedException(afe);
1917	<	}
1837	>	if (!expectedExceptionClass.isInstance(t))
1838	>	throw new AssertionError(
1839	>	"Expected " + expectedExceptionClass.getName() +
1840	>	", got " + t.getClass().getName(),
1841	>	t);
1842		}
1843		if (!threw)
1844		shouldThrow(expectedExceptionClass.getName());
#	Line 1946 | Line 1870 | public class JSR166TestCase extends Test
1870		static <T> void shuffle(T[] array) {
1871		Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1872		}
1873	+
1874	+	/**
1875	+	* Returns the same String as would be returned by {@link
1876	+	* Object#toString}, whether or not the given object's class
1877	+	* overrides toString().
1878	+	*
1879	+	* @see System#identityHashCode
1880	+	*/
1881	+	static String identityString(Object x) {
1882	+	return x.getClass().getName()
1883	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1884	+	}
1885	+
1886	+	// --- Shared assertions for Executor tests ---
1887	+
1888	+	/**
1889	+	* Returns maximum number of tasks that can be submitted to given
1890	+	* pool (with bounded queue) before saturation (when submission
1891	+	* throws RejectedExecutionException).
1892	+	*/
1893	+	static final int saturatedSize(ThreadPoolExecutor pool) {
1894	+	BlockingQueue<Runnable> q = pool.getQueue();
1895	+	return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1896	+	}
1897	+
1898	+	@SuppressWarnings("FutureReturnValueIgnored")
1899	+	void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1900	+	try {
1901	+	e.execute((Runnable) null);
1902	+	shouldThrow();
1903	+	} catch (NullPointerException success) {}
1904	+
1905	+	if (! (e instanceof ExecutorService)) return;
1906	+	ExecutorService es = (ExecutorService) e;
1907	+	try {
1908	+	es.submit((Runnable) null);
1909	+	shouldThrow();
1910	+	} catch (NullPointerException success) {}
1911	+	try {
1912	+	es.submit((Runnable) null, Boolean.TRUE);
1913	+	shouldThrow();
1914	+	} catch (NullPointerException success) {}
1915	+	try {
1916	+	es.submit((Callable) null);
1917	+	shouldThrow();
1918	+	} catch (NullPointerException success) {}
1919	+
1920	+	if (! (e instanceof ScheduledExecutorService)) return;
1921	+	ScheduledExecutorService ses = (ScheduledExecutorService) e;
1922	+	try {
1923	+	ses.schedule((Runnable) null,
1924	+	randomTimeout(), randomTimeUnit());
1925	+	shouldThrow();
1926	+	} catch (NullPointerException success) {}
1927	+	try {
1928	+	ses.schedule((Callable) null,
1929	+	randomTimeout(), randomTimeUnit());
1930	+	shouldThrow();
1931	+	} catch (NullPointerException success) {}
1932	+	try {
1933	+	ses.scheduleAtFixedRate((Runnable) null,
1934	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1935	+	shouldThrow();
1936	+	} catch (NullPointerException success) {}
1937	+	try {
1938	+	ses.scheduleWithFixedDelay((Runnable) null,
1939	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1940	+	shouldThrow();
1941	+	} catch (NullPointerException success) {}
1942	+	}
1943	+
1944	+	void setRejectedExecutionHandler(
1945	+	ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1946	+	p.setRejectedExecutionHandler(handler);
1947	+	assertSame(handler, p.getRejectedExecutionHandler());
1948	+	}
1949	+
1950	+	void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1951	+	final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1952	+	final long savedTaskCount = p.getTaskCount();
1953	+	final long savedCompletedTaskCount = p.getCompletedTaskCount();
1954	+	final int savedQueueSize = p.getQueue().size();
1955	+	final boolean stock = (p.getClass().getClassLoader() == null);
1956	+
1957	+	Runnable r = () -> {};
1958	+	Callable<Boolean> c = () -> Boolean.TRUE;
1959	+
1960	+	class Recorder implements RejectedExecutionHandler {
1961	+	public volatile Runnable r = null;
1962	+	public volatile ThreadPoolExecutor p = null;
1963	+	public void reset() { r = null; p = null; }
1964	+	public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1965	+	assertNull(this.r);
1966	+	assertNull(this.p);
1967	+	this.r = r;
1968	+	this.p = p;
1969	+	}
1970	+	}
1971	+
1972	+	// check custom handler is invoked exactly once per task
1973	+	Recorder recorder = new Recorder();
1974	+	setRejectedExecutionHandler(p, recorder);
1975	+	for (int i = 2; i--> 0; ) {
1976	+	recorder.reset();
1977	+	p.execute(r);
1978	+	if (stock && p.getClass() == ThreadPoolExecutor.class)
1979	+	assertSame(r, recorder.r);
1980	+	assertSame(p, recorder.p);
1981	+
1982	+	recorder.reset();
1983	+	assertFalse(p.submit(r).isDone());
1984	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1985	+	assertSame(p, recorder.p);
1986	+
1987	+	recorder.reset();
1988	+	assertFalse(p.submit(r, Boolean.TRUE).isDone());
1989	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1990	+	assertSame(p, recorder.p);
1991	+
1992	+	recorder.reset();
1993	+	assertFalse(p.submit(c).isDone());
1994	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1995	+	assertSame(p, recorder.p);
1996	+
1997	+	if (p instanceof ScheduledExecutorService) {
1998	+	ScheduledExecutorService s = (ScheduledExecutorService) p;
1999	+	ScheduledFuture<?> future;
2000	+
2001	+	recorder.reset();
2002	+	future = s.schedule(r, randomTimeout(), randomTimeUnit());
2003	+	assertFalse(future.isDone());
2004	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2005	+	assertSame(p, recorder.p);
2006	+
2007	+	recorder.reset();
2008	+	future = s.schedule(c, randomTimeout(), randomTimeUnit());
2009	+	assertFalse(future.isDone());
2010	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2011	+	assertSame(p, recorder.p);
2012	+
2013	+	recorder.reset();
2014	+	future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2015	+	assertFalse(future.isDone());
2016	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2017	+	assertSame(p, recorder.p);
2018	+
2019	+	recorder.reset();
2020	+	future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2021	+	assertFalse(future.isDone());
2022	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2023	+	assertSame(p, recorder.p);
2024	+	}
2025	+	}
2026	+
2027	+	// Checking our custom handler above should be sufficient, but
2028	+	// we add some integration tests of standard handlers.
2029	+	final AtomicReference<Thread> thread = new AtomicReference<>();
2030	+	final Runnable setThread = () -> thread.set(Thread.currentThread());
2031	+
2032	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2033	+	try {
2034	+	p.execute(setThread);
2035	+	shouldThrow();
2036	+	} catch (RejectedExecutionException success) {}
2037	+	assertNull(thread.get());
2038	+
2039	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2040	+	p.execute(setThread);
2041	+	assertNull(thread.get());
2042	+
2043	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2044	+	p.execute(setThread);
2045	+	if (p.isShutdown())
2046	+	assertNull(thread.get());
2047	+	else
2048	+	assertSame(Thread.currentThread(), thread.get());
2049	+
2050	+	setRejectedExecutionHandler(p, savedHandler);
2051	+
2052	+	// check that pool was not perturbed by handlers
2053	+	assertEquals(savedTaskCount, p.getTaskCount());
2054	+	assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2055	+	assertEquals(savedQueueSize, p.getQueue().size());
2056	+	}
2057	+
2058	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2059	+	assertEquals(x, y);
2060	+	assertEquals(y, x);
2061	+	assertEquals(x.isEmpty(), y.isEmpty());
2062	+	assertEquals(x.size(), y.size());
2063	+	if (x instanceof List) {
2064	+	assertEquals(x.toString(), y.toString());
2065	+	}
2066	+	if (x instanceof List || x instanceof Set) {
2067	+	assertEquals(x.hashCode(), y.hashCode());
2068	+	}
2069	+	if (x instanceof List || 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	+	/**
2077	+	* A weaker form of assertCollectionsEquals which does not insist
2078	+	* that the two collections satisfy Object#equals(Object), since
2079	+	* they may use identity semantics as Deques do.
2080	+	*/
2081	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2082	+	if (x instanceof List || x instanceof Set)
2083	+	assertCollectionsEquals(x, y);
2084	+	else {
2085	+	assertEquals(x.isEmpty(), y.isEmpty());
2086	+	assertEquals(x.size(), y.size());
2087	+	assertEquals(new HashSet(x), new HashSet(y));
2088	+	if (x instanceof Deque) {
2089	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2090	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2091	+	y.toArray(new Object[0])));
2092	+	}
2093	+	}
2094	+	}
2095		}

Diff Legend

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