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.187 by jsr166, Mon Feb 22 20:41:59 2016 UTC vs.
Revision 1.270 by jsr166, Sun Sep 29 20:18:35 2019 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
13	<	* @modules java.management
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	<	* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
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;
#	Line 23 | Line 49 | import java.io.ByteArrayOutputStream;
49		import java.io.ObjectInputStream;
50		import java.io.ObjectOutputStream;
51		import java.lang.management.ManagementFactory;
52	+	import java.lang.management.LockInfo;
53		import java.lang.management.ThreadInfo;
54		import java.lang.management.ThreadMXBean;
55		import java.lang.reflect.Constructor;
56		import java.lang.reflect.Method;
57		import java.lang.reflect.Modifier;
31	–	import java.nio.file.Files;
32	–	import java.nio.file.Paths;
58		import java.security.CodeSource;
59		import java.security.Permission;
60		import java.security.PermissionCollection;
#	Line 39 | Line 64 | import java.security.ProtectionDomain;
64		import java.security.SecurityPermission;
65		import java.util.ArrayList;
66		import java.util.Arrays;
67	+	import java.util.Collection;
68	+	import java.util.Collections;
69		import java.util.Date;
70	+	import java.util.Deque;
71		import java.util.Enumeration;
72	+	import java.util.HashSet;
73		import java.util.Iterator;
74		import java.util.List;
75		import java.util.NoSuchElementException;
76		import java.util.PropertyPermission;
77	+	import java.util.Set;
78		import java.util.concurrent.BlockingQueue;
79		import java.util.concurrent.Callable;
80		import java.util.concurrent.CountDownLatch;
81		import java.util.concurrent.CyclicBarrier;
82		import java.util.concurrent.ExecutionException;
83	+	import java.util.concurrent.Executor;
84		import java.util.concurrent.Executors;
85		import java.util.concurrent.ExecutorService;
86		import java.util.concurrent.ForkJoinPool;
87		import java.util.concurrent.Future;
88	+	import java.util.concurrent.FutureTask;
89		import java.util.concurrent.RecursiveAction;
90		import java.util.concurrent.RecursiveTask;
91	+	import java.util.concurrent.RejectedExecutionException;
92		import java.util.concurrent.RejectedExecutionHandler;
93		import java.util.concurrent.Semaphore;
94	+	import java.util.concurrent.ScheduledExecutorService;
95	+	import java.util.concurrent.ScheduledFuture;
96	+	import java.util.concurrent.SynchronousQueue;
97		import java.util.concurrent.ThreadFactory;
98	+	import java.util.concurrent.ThreadLocalRandom;
99		import java.util.concurrent.ThreadPoolExecutor;
100	+	import java.util.concurrent.TimeUnit;
101		import java.util.concurrent.TimeoutException;
102		import java.util.concurrent.atomic.AtomicBoolean;
103		import java.util.concurrent.atomic.AtomicReference;
66	–	import java.util.regex.Matcher;
104		import java.util.regex.Pattern;
105
69	–	import junit.framework.AssertionFailedError;
106		import junit.framework.Test;
107		import junit.framework.TestCase;
108		import junit.framework.TestResult;
#	Line 82 | Line 118 | import junit.framework.TestSuite;
118		*
119		* <ol>
120		*
121	<	* <li>All assertions in code running in generated threads must use
122	<	* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
123	<	* #threadAssertEquals}, or {@link #threadAssertNull}, (not
124	<	* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
125	<	* particularly recommended) for other code to use these forms too.
126	<	* Only the most typically used JUnit assertion methods are defined
127	<	* this way, but enough to live with.
121	>	* <li>All code not running in the main test thread (manually spawned threads
122	>	* or the common fork join pool) must be checked for failure (and completion!).
123	>	* Mechanisms that can be used to ensure this are:
124	>	*   <ol>
125	>	*   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
126	>	*    that the task completed normally, which is checked before returning from
127	>	*    the test method in the main thread.
128	>	*   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
129	>	*    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
130	>	*    Only the most typically used JUnit assertion methods are defined
131	>	*    this way, but enough to live with.
132	>	*   <li>Recording failure explicitly using {@link #threadUnexpectedException}
133	>	*    or {@link #threadRecordFailure}.
134	>	*   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
135	>	*   </ol>
136		*
137		* <li>If you override {@link #setUp} or {@link #tearDown}, make sure
138		* to invoke {@code super.setUp} and {@code super.tearDown} within
#	Line 184 | Line 228 | public class JSR166TestCase extends Test
228		private static final int suiteRuns =
229		Integer.getInteger("jsr166.suiteRuns", 1);
230
231	<	private static float systemPropertyValue(String name, float defaultValue) {
231	>	/**
232	>	* Returns the value of the system property, or NaN if not defined.
233	>	*/
234	>	private static float systemPropertyValue(String name) {
235		String floatString = System.getProperty(name);
236		if (floatString == null)
237	<	return defaultValue;
237	>	return Float.NaN;
238		try {
239		return Float.parseFloat(floatString);
240		} catch (NumberFormatException ex) {
#	Line 197 | Line 244 | public class JSR166TestCase extends Test
244		}
245		}
246
247	<	/**
248	<	* The scaling factor to apply to standard delays used in tests.
202	<	*/
203	<	private static final float delayFactor =
204	<	systemPropertyValue("jsr166.delay.factor", 1.0f);
247	>	private static final ThreadMXBean THREAD_MXBEAN
248	>	= ManagementFactory.getThreadMXBean();
249
250		/**
251	<	* The timeout factor as used in the jtreg test harness.
252	<	* See: http://openjdk.java.net/jtreg/tag-spec.html
253	<	*/
254	<	private static final float jtregTestTimeoutFactor
255	<	= systemPropertyValue("test.timeout.factor", 1.0f);
251	>	* The scaling factor to apply to standard delays used in tests.
252	>	* May be initialized from any of:
253	>	* - the "jsr166.delay.factor" system property
254	>	* - the "test.timeout.factor" system property (as used by jtreg)
255	>	*   See: http://openjdk.java.net/jtreg/tag-spec.html
256	>	* - hard-coded fuzz factor when using a known slowpoke VM
257	>	*/
258	>	private static final float delayFactor = delayFactor();
259	>
260	>	private static float delayFactor() {
261	>	float x;
262	>	if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
263	>	return x;
264	>	if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
265	>	return x;
266	>	String prop = System.getProperty("java.vm.version");
267	>	if (prop != null && prop.matches(".*debug.*"))
268	>	return 4.0f; // How much slower is fastdebug than product?!
269	>	return 1.0f;
270	>	}
271
272		public JSR166TestCase() { super(); }
273		public JSR166TestCase(String name) { super(name); }
#	Line 229 | Line 288 | public class JSR166TestCase extends Test
288		static volatile TestCase currentTestCase;
289		// static volatile int currentRun = 0;
290		static {
291	<	Runnable checkForWedgedTest = new Runnable() { public void run() {
291	>	Runnable wedgedTestDetector = new Runnable() { public void run() {
292		// Avoid spurious reports with enormous runsPerTest.
293		// A single test case run should never take more than 1 second.
294		// But let's cap it at the high end too ...
295	<	final int timeoutMinutes =
296	<	Math.min(15, Math.max(runsPerTest / 60, 1));
295	>	final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
296	>	* Math.max((int) delayFactor, 1);
297	>	final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
298		for (TestCase lastTestCase = currentTestCase;;) {
299		try { MINUTES.sleep(timeoutMinutes); }
300		catch (InterruptedException unexpected) { break; }
#	Line 254 | Line 314 | public class JSR166TestCase extends Test
314		}
315		lastTestCase = currentTestCase;
316		}}};
317	<	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
317	>	Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
318		thread.setDaemon(true);
319		thread.start();
320		}
321
322		//     public static String cpuModel() {
323		//         try {
324	<	//             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
324	>	//             java.util.regex.Matcher matcher
325	>	//               = Pattern.compile("model name\\s*: (.*)")
326		//                 .matcher(new String(
327	<	//                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
327	>	//                     java.nio.file.Files.readAllBytes(
328	>	//                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
329		//             matcher.find();
330		//             return matcher.group(1);
331		//         } catch (Exception ex) { return null; }
#	Line 296 | Line 358 | public class JSR166TestCase extends Test
358		// Never report first run of any test; treat it as a
359		// warmup run, notably to trigger all needed classloading,
360		if (i > 0)
361	<	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
361	>	System.out.printf("%s: %d%n", toString(), elapsedMillis);
362		}
363		}
364
#	Line 372 | Line 434 | public class JSR166TestCase extends Test
434		for (String testClassName : testClassNames) {
435		try {
436		Class<?> testClass = Class.forName(testClassName);
437	<	Method m = testClass.getDeclaredMethod("suite",
376	<	new Class<?>[0]);
437	>	Method m = testClass.getDeclaredMethod("suite");
438		suite.addTest(newTestSuite((Test)m.invoke(null)));
439	<	} catch (Exception e) {
440	<	throw new Error("Missing test class", e);
439	>	} catch (ReflectiveOperationException e) {
440	>	throw new AssertionError("Missing test class", e);
441		}
442		}
443		}
#	Line 398 | Line 459 | public class JSR166TestCase extends Test
459		}
460		}
461
462	<	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
463	<	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
464	<	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
465	<	public static boolean atLeastJava9() {
466	<	return JAVA_CLASS_VERSION >= 53.0
467	<	// As of 2015-09, java9 still uses 52.0 class file version
468	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
469	<	}
470	<	public static boolean atLeastJava10() {
471	<	return JAVA_CLASS_VERSION >= 54.0
472	<	|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
473	<	}
462	>	public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
463	>	public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
464	>	public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
465	>	public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
466	>	public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
467	>	public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
468	>	public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
469	>	public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
470	>	public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
471	>	public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
472	>	public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
473	>	public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
474
475		/**
476		* Collects all JSR166 unit tests as one suite.
#	Line 430 | Line 491 | public class JSR166TestCase extends Test
491		AbstractQueuedLongSynchronizerTest.suite(),
492		ArrayBlockingQueueTest.suite(),
493		ArrayDequeTest.suite(),
494	+	ArrayListTest.suite(),
495		AtomicBooleanTest.suite(),
496		AtomicIntegerArrayTest.suite(),
497		AtomicIntegerFieldUpdaterTest.suite(),
#	Line 452 | Line 514 | public class JSR166TestCase extends Test
514		CopyOnWriteArrayListTest.suite(),
515		CopyOnWriteArraySetTest.suite(),
516		CountDownLatchTest.suite(),
517	+	CountedCompleterTest.suite(),
518		CyclicBarrierTest.suite(),
519		DelayQueueTest.suite(),
520		EntryTest.suite(),
#	Line 459 | Line 522 | public class JSR166TestCase extends Test
522		ExecutorsTest.suite(),
523		ExecutorCompletionServiceTest.suite(),
524		FutureTaskTest.suite(),
525	+	HashtableTest.suite(),
526		LinkedBlockingDequeTest.suite(),
527		LinkedBlockingQueueTest.suite(),
528		LinkedListTest.suite(),
#	Line 480 | Line 544 | public class JSR166TestCase extends Test
544		TreeMapTest.suite(),
545		TreeSetTest.suite(),
546		TreeSubMapTest.suite(),
547	<	TreeSubSetTest.suite());
547	>	TreeSubSetTest.suite(),
548	>	VectorTest.suite());
549
550		// Java8+ test classes
551		if (atLeastJava8()) {
552		String[] java8TestClassNames = {
553	+	"ArrayDeque8Test",
554		"Atomic8Test",
555		"CompletableFutureTest",
556		"ConcurrentHashMap8Test",
557	<	"CountedCompleterTest",
557	>	"CountedCompleter8Test",
558		"DoubleAccumulatorTest",
559		"DoubleAdderTest",
560		"ForkJoinPool8Test",
561		"ForkJoinTask8Test",
562	+	"HashMapTest",
563	+	"LinkedBlockingDeque8Test",
564	+	"LinkedBlockingQueue8Test",
565	+	"LinkedHashMapTest",
566		"LongAccumulatorTest",
567		"LongAdderTest",
568		"SplittableRandomTest",
569		"StampedLockTest",
570		"SubmissionPublisherTest",
571		"ThreadLocalRandom8Test",
572	+	"TimeUnit8Test",
573		};
574		addNamedTestClasses(suite, java8TestClassNames);
575		}
#	Line 506 | Line 577 | public class JSR166TestCase extends Test
577		// Java9+ test classes
578		if (atLeastJava9()) {
579		String[] java9TestClassNames = {
580	<	// Currently empty, but expecting varhandle tests
580	>	"AtomicBoolean9Test",
581	>	"AtomicInteger9Test",
582	>	"AtomicIntegerArray9Test",
583	>	"AtomicLong9Test",
584	>	"AtomicLongArray9Test",
585	>	"AtomicReference9Test",
586	>	"AtomicReferenceArray9Test",
587	>	"ExecutorCompletionService9Test",
588	>	"ForkJoinPool9Test",
589		};
590		addNamedTestClasses(suite, java9TestClassNames);
591		}
#	Line 517 | Line 596 | public class JSR166TestCase extends Test
596		/** Returns list of junit-style test method names in given class. */
597		public static ArrayList<String> testMethodNames(Class<?> testClass) {
598		Method[] methods = testClass.getDeclaredMethods();
599	<	ArrayList<String> names = new ArrayList<String>(methods.length);
599	>	ArrayList<String> names = new ArrayList<>(methods.length);
600		for (Method method : methods) {
601		if (method.getName().startsWith("test")
602		&& Modifier.isPublic(method.getModifiers())
#	Line 544 | Line 623 | public class JSR166TestCase extends Test
623		for (String methodName : testMethodNames(testClass))
624		suite.addTest((Test) c.newInstance(data, methodName));
625		return suite;
626	<	} catch (Exception e) {
627	<	throw new Error(e);
626	>	} catch (ReflectiveOperationException e) {
627	>	throw new AssertionError(e);
628		}
629		}
630
#	Line 561 | Line 640 | public class JSR166TestCase extends Test
640		if (atLeastJava8()) {
641		String name = testClass.getName();
642		String name8 = name.replaceAll("Test$", "8Test");
643	<	if (name.equals(name8)) throw new Error(name);
643	>	if (name.equals(name8)) throw new AssertionError(name);
644		try {
645		return (Test)
646		Class.forName(name8)
647	<	.getMethod("testSuite", new Class[] { dataClass })
647	>	.getMethod("testSuite", dataClass)
648		.invoke(null, data);
649	<	} catch (Exception e) {
650	<	throw new Error(e);
649	>	} catch (ReflectiveOperationException e) {
650	>	throw new AssertionError(e);
651		}
652		} else {
653		return new TestSuite();
#	Line 583 | Line 662 | public class JSR166TestCase extends Test
662		public static long LONG_DELAY_MS;
663
664		/**
665	+	* A delay significantly longer than LONG_DELAY_MS.
666	+	* Use this in a thread that is waited for via awaitTermination(Thread).
667	+	*/
668	+	public static long LONGER_DELAY_MS;
669	+
670	+	private static final long RANDOM_TIMEOUT;
671	+	private static final long RANDOM_EXPIRED_TIMEOUT;
672	+	private static final TimeUnit RANDOM_TIMEUNIT;
673	+	static {
674	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
675	+	long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
676	+	RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
677	+	RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
678	+	TimeUnit[] timeUnits = TimeUnit.values();
679	+	RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
680	+	}
681	+
682	+	/**
683	+	* Returns a timeout for use when any value at all will do.
684	+	*/
685	+	static long randomTimeout() { return RANDOM_TIMEOUT; }
686	+
687	+	/**
688	+	* Returns a timeout that means "no waiting", i.e. not positive.
689	+	*/
690	+	static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
691	+
692	+	/**
693	+	* Returns a random non-null TimeUnit.
694	+	*/
695	+	static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
696	+
697	+	/**
698	+	* Returns a random boolean; a "coin flip".
699	+	*/
700	+	static boolean randomBoolean() {
701	+	return ThreadLocalRandom.current().nextBoolean();
702	+	}
703	+
704	+	/**
705	+	* Returns a random element from given choices.
706	+	*/
707	+	<T> T chooseRandomly(List<T> choices) {
708	+	return choices.get(ThreadLocalRandom.current().nextInt(choices.size()));
709	+	}
710	+
711	+	/**
712	+	* Returns a random element from given choices.
713	+	*/
714	+	<T> T chooseRandomly(T... choices) {
715	+	return choices[ThreadLocalRandom.current().nextInt(choices.length)];
716	+	}
717	+
718	+	/**
719		* Returns the shortest timed delay. This can be scaled up for
720		* slow machines using the jsr166.delay.factor system property,
721		* or via jtreg's -timeoutFactor: flag.
722		* http://openjdk.java.net/jtreg/command-help.html
723		*/
724		protected long getShortDelay() {
725	<	return (long) (50 * delayFactor * jtregTestTimeoutFactor);
725	>	return (long) (50 * delayFactor);
726		}
727
728		/**
#	Line 600 | Line 733 | public class JSR166TestCase extends Test
733		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
734		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
735		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
736	+	LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
737		}
738
739	+	private static final long TIMEOUT_DELAY_MS
740	+	= (long) (12.0 * Math.cbrt(delayFactor));
741	+
742		/**
743	<	* Returns a timeout in milliseconds to be used in tests that
744	<	* verify that operations block or time out.
743	>	* Returns a timeout in milliseconds to be used in tests that verify
744	>	* that operations block or time out.  We want this to be longer
745	>	* than the OS scheduling quantum, but not too long, so don't scale
746	>	* linearly with delayFactor; we use "crazy" cube root instead.
747		*/
748	<	long timeoutMillis() {
749	<	return SHORT_DELAY_MS / 4;
748	>	static long timeoutMillis() {
749	>	return TIMEOUT_DELAY_MS;
750		}
751
752		/**
#	Line 623 | Line 762 | public class JSR166TestCase extends Test
762		* The first exception encountered if any threadAssertXXX method fails.
763		*/
764		private final AtomicReference<Throwable> threadFailure
765	<	= new AtomicReference<Throwable>(null);
765	>	= new AtomicReference<>(null);
766
767		/**
768		* Records an exception so that it can be rethrown later in the test
#	Line 633 | Line 772 | public class JSR166TestCase extends Test
772		*/
773		public void threadRecordFailure(Throwable t) {
774		System.err.println(t);
775	<	dumpTestThreads();
776	<	threadFailure.compareAndSet(null, t);
775	>	if (threadFailure.compareAndSet(null, t))
776	>	dumpTestThreads();
777		}
778
779		public void setUp() {
#	Line 645 | Line 784 | public class JSR166TestCase extends Test
784		String msg = toString() + ": " + String.format(format, args);
785		System.err.println(msg);
786		dumpTestThreads();
787	<	throw new AssertionFailedError(msg);
787	>	throw new AssertionError(msg);
788		}
789
790		/**
#	Line 666 | Line 805 | public class JSR166TestCase extends Test
805		throw (RuntimeException) t;
806		else if (t instanceof Exception)
807		throw (Exception) t;
808	<	else {
809	<	AssertionFailedError afe =
671	<	new AssertionFailedError(t.toString());
672	<	afe.initCause(t);
673	<	throw afe;
674	<	}
808	>	else
809	>	throw new AssertionError(t.toString(), t);
810		}
811
812		if (Thread.interrupted())
#	Line 705 | Line 840 | public class JSR166TestCase extends Test
840
841		/**
842		* Just like fail(reason), but additionally recording (using
843	<	* threadRecordFailure) any AssertionFailedError thrown, so that
844	<	* the current testcase will fail.
843	>	* threadRecordFailure) any AssertionError thrown, so that the
844	>	* current testcase will fail.
845		*/
846		public void threadFail(String reason) {
847		try {
848		fail(reason);
849	<	} catch (AssertionFailedError t) {
850	<	threadRecordFailure(t);
851	<	throw t;
849	>	} catch (AssertionError fail) {
850	>	threadRecordFailure(fail);
851	>	throw fail;
852		}
853		}
854
855		/**
856		* Just like assertTrue(b), but additionally recording (using
857	<	* threadRecordFailure) any AssertionFailedError thrown, so that
858	<	* the current testcase will fail.
857	>	* threadRecordFailure) any AssertionError thrown, so that the
858	>	* current testcase will fail.
859		*/
860		public void threadAssertTrue(boolean b) {
861		try {
862		assertTrue(b);
863	<	} catch (AssertionFailedError t) {
864	<	threadRecordFailure(t);
865	<	throw t;
863	>	} catch (AssertionError fail) {
864	>	threadRecordFailure(fail);
865	>	throw fail;
866		}
867		}
868
869		/**
870		* Just like assertFalse(b), but additionally recording (using
871	<	* threadRecordFailure) any AssertionFailedError thrown, so that
872	<	* the current testcase will fail.
871	>	* threadRecordFailure) any AssertionError thrown, so that the
872	>	* current testcase will fail.
873		*/
874		public void threadAssertFalse(boolean b) {
875		try {
876		assertFalse(b);
877	<	} catch (AssertionFailedError t) {
878	<	threadRecordFailure(t);
879	<	throw t;
877	>	} catch (AssertionError fail) {
878	>	threadRecordFailure(fail);
879	>	throw fail;
880		}
881		}
882
883		/**
884		* Just like assertNull(x), but additionally recording (using
885	<	* threadRecordFailure) any AssertionFailedError thrown, so that
886	<	* the current testcase will fail.
885	>	* threadRecordFailure) any AssertionError thrown, so that the
886	>	* current testcase will fail.
887		*/
888		public void threadAssertNull(Object x) {
889		try {
890		assertNull(x);
891	<	} catch (AssertionFailedError t) {
892	<	threadRecordFailure(t);
893	<	throw t;
891	>	} catch (AssertionError fail) {
892	>	threadRecordFailure(fail);
893	>	throw fail;
894		}
895		}
896
897		/**
898		* Just like assertEquals(x, y), but additionally recording (using
899	<	* threadRecordFailure) any AssertionFailedError thrown, so that
900	<	* the current testcase will fail.
899	>	* threadRecordFailure) any AssertionError thrown, so that the
900	>	* current testcase will fail.
901		*/
902		public void threadAssertEquals(long x, long y) {
903		try {
904		assertEquals(x, y);
905	<	} catch (AssertionFailedError t) {
906	<	threadRecordFailure(t);
907	<	throw t;
905	>	} catch (AssertionError fail) {
906	>	threadRecordFailure(fail);
907	>	throw fail;
908		}
909		}
910
911		/**
912		* Just like assertEquals(x, y), but additionally recording (using
913	<	* threadRecordFailure) any AssertionFailedError thrown, so that
914	<	* the current testcase will fail.
913	>	* threadRecordFailure) any AssertionError thrown, so that the
914	>	* current testcase will fail.
915		*/
916		public void threadAssertEquals(Object x, Object y) {
917		try {
918		assertEquals(x, y);
919	<	} catch (AssertionFailedError fail) {
919	>	} catch (AssertionError fail) {
920		threadRecordFailure(fail);
921		throw fail;
922		} catch (Throwable fail) {
#	Line 791 | Line 926 | public class JSR166TestCase extends Test
926
927		/**
928		* Just like assertSame(x, y), but additionally recording (using
929	<	* threadRecordFailure) any AssertionFailedError thrown, so that
930	<	* the current testcase will fail.
929	>	* threadRecordFailure) any AssertionError thrown, so that the
930	>	* current testcase will fail.
931		*/
932		public void threadAssertSame(Object x, Object y) {
933		try {
934		assertSame(x, y);
935	<	} catch (AssertionFailedError fail) {
935	>	} catch (AssertionError fail) {
936		threadRecordFailure(fail);
937		throw fail;
938		}
#	Line 819 | Line 954 | public class JSR166TestCase extends Test
954
955		/**
956		* Records the given exception using {@link #threadRecordFailure},
957	<	* then rethrows the exception, wrapping it in an
958	<	* AssertionFailedError if necessary.
957	>	* then rethrows the exception, wrapping it in an AssertionError
958	>	* if necessary.
959		*/
960		public void threadUnexpectedException(Throwable t) {
961		threadRecordFailure(t);
#	Line 829 | Line 964 | public class JSR166TestCase extends Test
964		throw (RuntimeException) t;
965		else if (t instanceof Error)
966		throw (Error) t;
967	<	else {
968	<	AssertionFailedError afe =
834	<	new AssertionFailedError("unexpected exception: " + t);
835	<	afe.initCause(t);
836	<	throw afe;
837	<	}
967	>	else
968	>	throw new AssertionError("unexpected exception: " + t, t);
969		}
970
971		/**
#	Line 933 | Line 1064 | public class JSR166TestCase extends Test
1064		}
1065		}
1066
1067	<	/** Like Runnable, but with the freedom to throw anything */
1067	>	/**
1068	>	* Like Runnable, but with the freedom to throw anything.
1069	>	* junit folks had the same idea:
1070	>	* http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1071	>	*/
1072		interface Action { public void run() throws Throwable; }
1073
1074		/**
#	Line 959 | Line 1094 | public class JSR166TestCase extends Test
1094		}
1095		}
1096
1097	+	/** Returns true if thread info might be useful in a thread dump. */
1098	+	static boolean threadOfInterest(ThreadInfo info) {
1099	+	final String name = info.getThreadName();
1100	+	String lockName;
1101	+	if (name == null)
1102	+	return true;
1103	+	if (name.equals("Signal Dispatcher")
1104	+	|| name.equals("WedgedTestDetector"))
1105	+	return false;
1106	+	if (name.equals("Reference Handler")) {
1107	+	// Reference Handler stacktrace changed in JDK-8156500
1108	+	StackTraceElement[] stackTrace; String methodName;
1109	+	if ((stackTrace = info.getStackTrace()) != null
1110	+	&& stackTrace.length > 0
1111	+	&& (methodName = stackTrace[0].getMethodName()) != null
1112	+	&& methodName.equals("waitForReferencePendingList"))
1113	+	return false;
1114	+	// jdk8 Reference Handler stacktrace
1115	+	if ((lockName = info.getLockName()) != null
1116	+	&& lockName.startsWith("java.lang.ref"))
1117	+	return false;
1118	+	}
1119	+	if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
1120	+	&& (lockName = info.getLockName()) != null
1121	+	&& lockName.startsWith("java.lang.ref"))
1122	+	return false;
1123	+	if (name.startsWith("ForkJoinPool.commonPool-worker")
1124	+	&& (lockName = info.getLockName()) != null
1125	+	&& lockName.startsWith("java.util.concurrent.ForkJoinPool"))
1126	+	return false;
1127	+	return true;
1128	+	}
1129	+
1130		/**
1131		* A debugging tool to print stack traces of most threads, as jstack does.
1132		* Uninteresting threads are filtered out.
1133		*/
1134		static void dumpTestThreads() {
1135	<	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1136	<	System.err.println("------ stacktrace dump start ------");
1137	<	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1138	<	String name = info.getThreadName();
1139	<	if ("Signal Dispatcher".equals(name))
1140	<	continue;
1141	<	if ("Reference Handler".equals(name)
974	<	&& info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
975	<	continue;
976	<	if ("Finalizer".equals(name)
977	<	&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
978	<	continue;
979	<	if ("checkForWedgedTest".equals(name))
980	<	continue;
981	<	System.err.print(info);
1135	>	SecurityManager sm = System.getSecurityManager();
1136	>	if (sm != null) {
1137	>	try {
1138	>	System.setSecurityManager(null);
1139	>	} catch (SecurityException giveUp) {
1140	>	return;
1141	>	}
1142		}
1143	+
1144	+	System.err.println("------ stacktrace dump start ------");
1145	+	for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
1146	+	if (threadOfInterest(info))
1147	+	System.err.print(info);
1148		System.err.println("------ stacktrace dump end ------");
984	–	}
1149
1150	<	/**
987	<	* Checks that thread does not terminate within the default
988	<	* millisecond delay of {@code timeoutMillis()}.
989	<	*/
990	<	void assertThreadStaysAlive(Thread thread) {
991	<	assertThreadStaysAlive(thread, timeoutMillis());
1150	>	if (sm != null) System.setSecurityManager(sm);
1151		}
1152
1153		/**
1154	<	* Checks that thread does not terminate within the given millisecond delay.
1154	>	* Checks that thread eventually enters the expected blocked thread state.
1155		*/
1156	<	void assertThreadStaysAlive(Thread thread, long millis) {
1157	<	try {
1158	<	// No need to optimize the failing case via Thread.join.
1159	<	delay(millis);
1160	<	assertTrue(thread.isAlive());
1161	<	} catch (InterruptedException fail) {
1162	<	threadFail("Unexpected InterruptedException");
1156	>	void assertThreadBlocks(Thread thread, Thread.State expected) {
1157	>	// always sleep at least 1 ms, with high probability avoiding
1158	>	// transitory states
1159	>	for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1160	>	try { delay(1); }
1161	>	catch (InterruptedException fail) {
1162	>	throw new AssertionError("Unexpected InterruptedException", fail);
1163	>	}
1164	>	Thread.State s = thread.getState();
1165	>	if (s == expected)
1166	>	return;
1167	>	else if (s == Thread.State.TERMINATED)
1168	>	fail("Unexpected thread termination");
1169		}
1170	+	fail("timed out waiting for thread to enter thread state " + expected);
1171		}
1172
1173		/**
1174	<	* Checks that the threads do not terminate within the default
1009	<	* millisecond delay of {@code timeoutMillis()}.
1174	>	* Returns the thread's blocker's class name, if any, else null.
1175		*/
1176	<	void assertThreadsStayAlive(Thread... threads) {
1177	<	assertThreadsStayAlive(timeoutMillis(), threads);
1178	<	}
1179	<
1180	<	/**
1181	<	* Checks that the threads do not terminate within the given millisecond delay.
1017	<	*/
1018	<	void assertThreadsStayAlive(long millis, Thread... threads) {
1019	<	try {
1020	<	// No need to optimize the failing case via Thread.join.
1021	<	delay(millis);
1022	<	for (Thread thread : threads)
1023	<	assertTrue(thread.isAlive());
1024	<	} catch (InterruptedException fail) {
1025	<	threadFail("Unexpected InterruptedException");
1026	<	}
1176	>	String blockerClassName(Thread thread) {
1177	>	ThreadInfo threadInfo; LockInfo lockInfo;
1178	>	if ((threadInfo = THREAD_MXBEAN.getThreadInfo(thread.getId(), 0)) != null
1179	>	&& (lockInfo = threadInfo.getLockInfo()) != null)
1180	>	return lockInfo.getClassName();
1181	>	return null;
1182		}
1183
1184		/**
#	Line 1064 | Line 1219 | public class JSR166TestCase extends Test
1219		}
1220
1221		/**
1222	+	* The maximum number of consecutive spurious wakeups we should
1223	+	* tolerate (from APIs like LockSupport.park) before failing a test.
1224	+	*/
1225	+	static final int MAX_SPURIOUS_WAKEUPS = 10;
1226	+
1227	+	/**
1228		* The number of elements to place in collections, arrays, etc.
1229		*/
1230		public static final int SIZE = 20;
#	Line 1167 | Line 1328 | public class JSR166TestCase extends Test
1328		}
1329		public void refresh() {}
1330		public String toString() {
1331	<	List<Permission> ps = new ArrayList<Permission>();
1331	>	List<Permission> ps = new ArrayList<>();
1332		for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1333		ps.add(e.nextElement());
1334		return "AdjustablePolicy with permissions " + ps;
#	Line 1195 | Line 1356 | public class JSR166TestCase extends Test
1356
1357		/**
1358		* Sleeps until the given time has elapsed.
1359	<	* Throws AssertionFailedError if interrupted.
1359	>	* Throws AssertionError if interrupted.
1360		*/
1361	<	void sleep(long millis) {
1361	>	static void sleep(long millis) {
1362		try {
1363		delay(millis);
1364		} catch (InterruptedException fail) {
1365	<	AssertionFailedError afe =
1205	<	new AssertionFailedError("Unexpected InterruptedException");
1206	<	afe.initCause(fail);
1207	<	throw afe;
1365	>	throw new AssertionError("Unexpected InterruptedException", fail);
1366		}
1367		}
1368
1369		/**
1370		* Spin-waits up to the specified number of milliseconds for the given
1371		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1372	+	* @param waitingForGodot if non-null, an additional condition to satisfy
1373		*/
1374	<	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1375	<	long startTime = System.nanoTime();
1376	<	for (;;) {
1377	<	Thread.State s = thread.getState();
1378	<	if (s == Thread.State.BLOCKED ||
1379	<	s == Thread.State.WAITING ||
1380	<	s == Thread.State.TIMED_WAITING)
1381	<	return;
1382	<	else if (s == Thread.State.TERMINATED)
1374	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1375	>	Callable<Boolean> waitingForGodot) {
1376	>	for (long startTime = 0L;;) {
1377	>	switch (thread.getState()) {
1378	>	default: break;
1379	>	case BLOCKED: case WAITING: case TIMED_WAITING:
1380	>	try {
1381	>	if (waitingForGodot == null || waitingForGodot.call())
1382	>	return;
1383	>	} catch (Throwable fail) { threadUnexpectedException(fail); }
1384	>	break;
1385	>	case TERMINATED:
1386		fail("Unexpected thread termination");
1387	+	}
1388	+
1389	+	if (startTime == 0L)
1390	+	startTime = System.nanoTime();
1391		else if (millisElapsedSince(startTime) > timeoutMillis) {
1392	<	threadAssertTrue(thread.isAlive());
1393	<	return;
1392	>	assertTrue(thread.isAlive());
1393	>	if (waitingForGodot == null
1394	>	|| thread.getState() == Thread.State.RUNNABLE)
1395	>	fail("timed out waiting for thread to enter wait state");
1396	>	else
1397	>	fail("timed out waiting for condition, thread state="
1398	>	+ thread.getState());
1399		}
1400		Thread.yield();
1401		}
1402		}
1403
1404		/**
1405	<	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
1406	<	* state: BLOCKED, WAITING, or TIMED_WAITING.
1405	>	* Spin-waits up to the specified number of milliseconds for the given
1406	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1407	>	*/
1408	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1409	>	waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1410	>	}
1411	>
1412	>	/**
1413	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1414	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1415		*/
1416		void waitForThreadToEnterWaitState(Thread thread) {
1417	<	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1417	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1418	>	}
1419	>
1420	>	/**
1421	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1422	>	* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1423	>	* and additionally satisfy the given condition.
1424	>	*/
1425	>	void waitForThreadToEnterWaitState(Thread thread,
1426	>	Callable<Boolean> waitingForGodot) {
1427	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1428	>	}
1429	>
1430	>	/**
1431	>	* Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1432	>	* be interrupted.  Clears the interrupt status before returning.
1433	>	*/
1434	>	void awaitInterrupted() {
1435	>	for (long startTime = 0L; !Thread.interrupted(); ) {
1436	>	if (startTime == 0L)
1437	>	startTime = System.nanoTime();
1438	>	else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1439	>	fail("timed out waiting for thread interrupt");
1440	>	Thread.yield();
1441	>	}
1442		}
1443
1444		/**
#	Line 1247 | Line 1450 | public class JSR166TestCase extends Test
1450		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1451		}
1452
1250	–	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1251	–	//         long startTime = System.nanoTime();
1252	–	//         try {
1253	–	//             r.run();
1254	–	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1255	–	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1256	–	//             throw new AssertionFailedError("did not return promptly");
1257	–	//     }
1258	–
1259	–	//     void assertTerminatesPromptly(Runnable r) {
1260	–	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1261	–	//     }
1262	–
1453		/**
1454		* Checks that timed f.get() returns the expected value, and does not
1455		* wait for the timeout to elapse before returning.
1456		*/
1457		<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1458		long startTime = System.nanoTime();
1459	+	T actual = null;
1460		try {
1461	<	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1461	>	actual = f.get(timeoutMillis, MILLISECONDS);
1462		} catch (Throwable fail) { threadUnexpectedException(fail); }
1463	+	assertEquals(expectedValue, actual);
1464		if (millisElapsedSince(startTime) > timeoutMillis/2)
1465	<	throw new AssertionFailedError("timed get did not return promptly");
1465	>	throw new AssertionError("timed get did not return promptly");
1466		}
1467
1468		<T> void checkTimedGet(Future<T> f, T expectedValue) {
#	Line 1288 | Line 1480 | public class JSR166TestCase extends Test
1480		}
1481
1482		/**
1483	+	* Returns a new started daemon Thread running the given action,
1484	+	* wrapped in a CheckedRunnable.
1485	+	*/
1486	+	Thread newStartedThread(Action action) {
1487	+	return newStartedThread(checkedRunnable(action));
1488	+	}
1489	+
1490	+	/**
1491		* Waits for the specified time (in milliseconds) for the thread
1492		* to terminate (using {@link Thread#join(long)}), else interrupts
1493		* the thread (in the hope that it may terminate later) and fails.
1494		*/
1495	<	void awaitTermination(Thread t, long timeoutMillis) {
1495	>	void awaitTermination(Thread thread, long timeoutMillis) {
1496		try {
1497	<	t.join(timeoutMillis);
1497	>	thread.join(timeoutMillis);
1498		} catch (InterruptedException fail) {
1499		threadUnexpectedException(fail);
1500	<	} finally {
1501	<	if (t.getState() != Thread.State.TERMINATED) {
1502	<	t.interrupt();
1503	<	threadFail("timed out waiting for thread to terminate");
1500	>	}
1501	>	if (thread.getState() != Thread.State.TERMINATED) {
1502	>	String detail = String.format(
1503	>	"timed out waiting for thread to terminate, thread=%s, state=%s" ,
1504	>	thread, thread.getState());
1505	>	try {
1506	>	threadFail(detail);
1507	>	} finally {
1508	>	// Interrupt thread __after__ having reported its stack trace
1509	>	thread.interrupt();
1510		}
1511		}
1512		}
#	Line 1328 | Line 1534 | public class JSR166TestCase extends Test
1534		}
1535		}
1536
1537	<	public abstract class RunnableShouldThrow implements Runnable {
1538	<	protected abstract void realRun() throws Throwable;
1539	<
1540	<	final Class<?> exceptionClass;
1541	<
1336	<	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1337	<	this.exceptionClass = exceptionClass;
1338	<	}
1339	<
1340	<	public final void run() {
1341	<	try {
1342	<	realRun();
1343	<	threadShouldThrow(exceptionClass.getSimpleName());
1344	<	} catch (Throwable t) {
1345	<	if (! exceptionClass.isInstance(t))
1346	<	threadUnexpectedException(t);
1347	<	}
1348	<	}
1537	>	Runnable checkedRunnable(Action action) {
1538	>	return new CheckedRunnable() {
1539	>	public void realRun() throws Throwable {
1540	>	action.run();
1541	>	}};
1542		}
1543
1544		public abstract class ThreadShouldThrow extends Thread {
#	Line 1360 | Line 1553 | public class JSR166TestCase extends Test
1553		public final void run() {
1554		try {
1555		realRun();
1363	–	threadShouldThrow(exceptionClass.getSimpleName());
1556		} catch (Throwable t) {
1557		if (! exceptionClass.isInstance(t))
1558		threadUnexpectedException(t);
1559	+	return;
1560		}
1561	+	threadShouldThrow(exceptionClass.getSimpleName());
1562		}
1563		}
1564
#	Line 1374 | Line 1568 | public class JSR166TestCase extends Test
1568		public final void run() {
1569		try {
1570		realRun();
1377	–	threadShouldThrow("InterruptedException");
1571		} catch (InterruptedException success) {
1572		threadAssertFalse(Thread.interrupted());
1573	+	return;
1574		} catch (Throwable fail) {
1575		threadUnexpectedException(fail);
1576		}
1577	+	threadShouldThrow("InterruptedException");
1578		}
1579		}
1580
#	Line 1391 | Line 1586 | public class JSR166TestCase extends Test
1586		return realCall();
1587		} catch (Throwable fail) {
1588		threadUnexpectedException(fail);
1394	–	return null;
1589		}
1590	<	}
1397	<	}
1398	<
1399	<	public abstract class CheckedInterruptedCallable<T>
1400	<	implements Callable<T> {
1401	<	protected abstract T realCall() throws Throwable;
1402	<
1403	<	public final T call() {
1404	<	try {
1405	<	T result = realCall();
1406	<	threadShouldThrow("InterruptedException");
1407	<	return result;
1408	<	} catch (InterruptedException success) {
1409	<	threadAssertFalse(Thread.interrupted());
1410	<	} catch (Throwable fail) {
1411	<	threadUnexpectedException(fail);
1412	<	}
1413	<	return null;
1590	>	throw new AssertionError("unreached");
1591		}
1592		}
1593
#	Line 1466 | Line 1643 | public class JSR166TestCase extends Test
1643		return new LatchAwaiter(latch);
1644		}
1645
1646	<	public void await(CountDownLatch latch) {
1646	>	public void await(CountDownLatch latch, long timeoutMillis) {
1647	>	boolean timedOut = false;
1648		try {
1649	<	if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1472	<	fail("timed out waiting for CountDownLatch for "
1473	<	+ (LONG_DELAY_MS/1000) + " sec");
1649	>	timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1650		} catch (Throwable fail) {
1651		threadUnexpectedException(fail);
1652		}
1653	+	if (timedOut)
1654	+	fail("timed out waiting for CountDownLatch for "
1655	+	+ (timeoutMillis/1000) + " sec");
1656	+	}
1657	+
1658	+	public void await(CountDownLatch latch) {
1659	+	await(latch, LONG_DELAY_MS);
1660		}
1661
1662		public void await(Semaphore semaphore) {
1663	+	boolean timedOut = false;
1664	+	try {
1665	+	timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1666	+	} catch (Throwable fail) {
1667	+	threadUnexpectedException(fail);
1668	+	}
1669	+	if (timedOut)
1670	+	fail("timed out waiting for Semaphore for "
1671	+	+ (LONG_DELAY_MS/1000) + " sec");
1672	+	}
1673	+
1674	+	public void await(CyclicBarrier barrier) {
1675		try {
1676	<	if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1482	<	fail("timed out waiting for Semaphore for "
1483	<	+ (LONG_DELAY_MS/1000) + " sec");
1676	>	barrier.await(LONG_DELAY_MS, MILLISECONDS);
1677		} catch (Throwable fail) {
1678		threadUnexpectedException(fail);
1679		}
#	Line 1500 | Line 1693 | public class JSR166TestCase extends Test
1693		//         long startTime = System.nanoTime();
1694		//         while (!flag.get()) {
1695		//             if (millisElapsedSince(startTime) > timeoutMillis)
1696	<	//                 throw new AssertionFailedError("timed out");
1696	>	//                 throw new AssertionError("timed out");
1697		//             Thread.yield();
1698		//         }
1699		//     }
#	Line 1509 | Line 1702 | public class JSR166TestCase extends Test
1702		public String call() { throw new NullPointerException(); }
1703		}
1704
1512	–	public static class CallableOne implements Callable<Integer> {
1513	–	public Integer call() { return one; }
1514	–	}
1515	–
1516	–	public class ShortRunnable extends CheckedRunnable {
1517	–	protected void realRun() throws Throwable {
1518	–	delay(SHORT_DELAY_MS);
1519	–	}
1520	–	}
1521	–
1522	–	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1523	–	protected void realRun() throws InterruptedException {
1524	–	delay(SHORT_DELAY_MS);
1525	–	}
1526	–	}
1527	–
1528	–	public class SmallRunnable extends CheckedRunnable {
1529	–	protected void realRun() throws Throwable {
1530	–	delay(SMALL_DELAY_MS);
1531	–	}
1532	–	}
1533	–
1534	–	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1535	–	protected void realRun() {
1536	–	try {
1537	–	delay(SMALL_DELAY_MS);
1538	–	} catch (InterruptedException ok) {}
1539	–	}
1540	–	}
1541	–
1542	–	public class SmallCallable extends CheckedCallable {
1543	–	protected Object realCall() throws InterruptedException {
1544	–	delay(SMALL_DELAY_MS);
1545	–	return Boolean.TRUE;
1546	–	}
1547	–	}
1548	–
1549	–	public class MediumRunnable extends CheckedRunnable {
1550	–	protected void realRun() throws Throwable {
1551	–	delay(MEDIUM_DELAY_MS);
1552	–	}
1553	–	}
1554	–
1555	–	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1556	–	protected void realRun() throws InterruptedException {
1557	–	delay(MEDIUM_DELAY_MS);
1558	–	}
1559	–	}
1560	–
1705		public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1706		return new CheckedRunnable() {
1707		protected void realRun() {
#	Line 1567 | Line 1711 | public class JSR166TestCase extends Test
1711		}};
1712		}
1713
1570	–	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1571	–	protected void realRun() {
1572	–	try {
1573	–	delay(MEDIUM_DELAY_MS);
1574	–	} catch (InterruptedException ok) {}
1575	–	}
1576	–	}
1577	–
1578	–	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1579	–	protected void realRun() {
1580	–	try {
1581	–	delay(LONG_DELAY_MS);
1582	–	} catch (InterruptedException ok) {}
1583	–	}
1584	–	}
1585	–
1714		/**
1715		* For use as ThreadFactory in constructors
1716		*/
#	Line 1596 | Line 1724 | public class JSR166TestCase extends Test
1724		boolean isDone();
1725		}
1726
1599	–	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1600	–	return new TrackedRunnable() {
1601	–	private volatile boolean done = false;
1602	–	public boolean isDone() { return done; }
1603	–	public void run() {
1604	–	try {
1605	–	delay(timeoutMillis);
1606	–	done = true;
1607	–	} catch (InterruptedException ok) {}
1608	–	}
1609	–	};
1610	–	}
1611	–
1612	–	public static class TrackedShortRunnable implements Runnable {
1613	–	public volatile boolean done = false;
1614	–	public void run() {
1615	–	try {
1616	–	delay(SHORT_DELAY_MS);
1617	–	done = true;
1618	–	} catch (InterruptedException ok) {}
1619	–	}
1620	–	}
1621	–
1622	–	public static class TrackedSmallRunnable implements Runnable {
1623	–	public volatile boolean done = false;
1624	–	public void run() {
1625	–	try {
1626	–	delay(SMALL_DELAY_MS);
1627	–	done = true;
1628	–	} catch (InterruptedException ok) {}
1629	–	}
1630	–	}
1631	–
1632	–	public static class TrackedMediumRunnable implements Runnable {
1633	–	public volatile boolean done = false;
1634	–	public void run() {
1635	–	try {
1636	–	delay(MEDIUM_DELAY_MS);
1637	–	done = true;
1638	–	} catch (InterruptedException ok) {}
1639	–	}
1640	–	}
1641	–
1642	–	public static class TrackedLongRunnable implements Runnable {
1643	–	public volatile boolean done = false;
1644	–	public void run() {
1645	–	try {
1646	–	delay(LONG_DELAY_MS);
1647	–	done = true;
1648	–	} catch (InterruptedException ok) {}
1649	–	}
1650	–	}
1651	–
1727		public static class TrackedNoOpRunnable implements Runnable {
1728		public volatile boolean done = false;
1729		public void run() {
#	Line 1656 | Line 1731 | public class JSR166TestCase extends Test
1731		}
1732		}
1733
1659	–	public static class TrackedCallable implements Callable {
1660	–	public volatile boolean done = false;
1661	–	public Object call() {
1662	–	try {
1663	–	delay(SMALL_DELAY_MS);
1664	–	done = true;
1665	–	} catch (InterruptedException ok) {}
1666	–	return Boolean.TRUE;
1667	–	}
1668	–	}
1669	–
1734		/**
1735		* Analog of CheckedRunnable for RecursiveAction
1736		*/
#	Line 1693 | Line 1757 | public class JSR166TestCase extends Test
1757		return realCompute();
1758		} catch (Throwable fail) {
1759		threadUnexpectedException(fail);
1696	–	return null;
1760		}
1761	+	throw new AssertionError("unreached");
1762		}
1763		}
1764
#	Line 1708 | Line 1772 | public class JSR166TestCase extends Test
1772
1773		/**
1774		* A CyclicBarrier that uses timed await and fails with
1775	<	* AssertionFailedErrors instead of throwing checked exceptions.
1775	>	* AssertionErrors instead of throwing checked exceptions.
1776		*/
1777	<	public class CheckedBarrier extends CyclicBarrier {
1777	>	public static class CheckedBarrier extends CyclicBarrier {
1778		public CheckedBarrier(int parties) { super(parties); }
1779
1780		public int await() {
1781		try {
1782	<	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1782	>	return super.await(LONGER_DELAY_MS, MILLISECONDS);
1783		} catch (TimeoutException timedOut) {
1784	<	throw new AssertionFailedError("timed out");
1784	>	throw new AssertionError("timed out");
1785		} catch (Exception fail) {
1786	<	AssertionFailedError afe =
1723	<	new AssertionFailedError("Unexpected exception: " + fail);
1724	<	afe.initCause(fail);
1725	<	throw afe;
1786	>	throw new AssertionError("Unexpected exception: " + fail, fail);
1787		}
1788		}
1789		}
#	Line 1733 | Line 1794 | public class JSR166TestCase extends Test
1794		assertEquals(0, q.size());
1795		assertNull(q.peek());
1796		assertNull(q.poll());
1797	<	assertNull(q.poll(0, MILLISECONDS));
1797	>	assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1798		assertEquals(q.toString(), "[]");
1799		assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1800		assertFalse(q.iterator().hasNext());
#	Line 1774 | Line 1835 | public class JSR166TestCase extends Test
1835		}
1836		}
1837
1838	+	void assertImmutable(Object o) {
1839	+	if (o instanceof Collection) {
1840	+	assertThrows(
1841	+	UnsupportedOperationException.class,
1842	+	() -> ((Collection) o).add(null));
1843	+	}
1844	+	}
1845	+
1846		@SuppressWarnings("unchecked")
1847		<T> T serialClone(T o) {
1848	+	T clone = null;
1849		try {
1850		ObjectInputStream ois = new ObjectInputStream
1851		(new ByteArrayInputStream(serialBytes(o)));
1852	<	T clone = (T) ois.readObject();
1783	<	assertSame(o.getClass(), clone.getClass());
1784	<	return clone;
1852	>	clone = (T) ois.readObject();
1853		} catch (Throwable fail) {
1854		threadUnexpectedException(fail);
1855	+	}
1856	+	if (o == clone) assertImmutable(o);
1857	+	else assertSame(o.getClass(), clone.getClass());
1858	+	return clone;
1859	+	}
1860	+
1861	+	/**
1862	+	* A version of serialClone that leaves error handling (for
1863	+	* e.g. NotSerializableException) up to the caller.
1864	+	*/
1865	+	@SuppressWarnings("unchecked")
1866	+	<T> T serialClonePossiblyFailing(T o)
1867	+	throws ReflectiveOperationException, java.io.IOException {
1868	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1869	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1870	+	oos.writeObject(o);
1871	+	oos.flush();
1872	+	oos.close();
1873	+	ObjectInputStream ois = new ObjectInputStream
1874	+	(new ByteArrayInputStream(bos.toByteArray()));
1875	+	T clone = (T) ois.readObject();
1876	+	if (o == clone) assertImmutable(o);
1877	+	else assertSame(o.getClass(), clone.getClass());
1878	+	return clone;
1879	+	}
1880	+
1881	+	/**
1882	+	* If o implements Cloneable and has a public clone method,
1883	+	* returns a clone of o, else null.
1884	+	*/
1885	+	@SuppressWarnings("unchecked")
1886	+	<T> T cloneableClone(T o) {
1887	+	if (!(o instanceof Cloneable)) return null;
1888	+	final T clone;
1889	+	try {
1890	+	clone = (T) o.getClass().getMethod("clone").invoke(o);
1891	+	} catch (NoSuchMethodException ok) {
1892		return null;
1893	+	} catch (ReflectiveOperationException unexpected) {
1894	+	throw new Error(unexpected);
1895		}
1896	+	assertNotSame(o, clone); // not 100% guaranteed by spec
1897	+	assertSame(o.getClass(), clone.getClass());
1898	+	return clone;
1899		}
1900
1901		public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1902	<	Runnable... throwingActions) {
1903	<	for (Runnable throwingAction : throwingActions) {
1902	>	Action... throwingActions) {
1903	>	for (Action throwingAction : throwingActions) {
1904		boolean threw = false;
1905		try { throwingAction.run(); }
1906		catch (Throwable t) {
1907		threw = true;
1908	<	if (!expectedExceptionClass.isInstance(t)) {
1909	<	AssertionFailedError afe =
1910	<	new AssertionFailedError
1911	<	("Expected " + expectedExceptionClass.getName() +
1912	<	", got " + t.getClass().getName());
1803	<	afe.initCause(t);
1804	<	threadUnexpectedException(afe);
1805	<	}
1908	>	if (!expectedExceptionClass.isInstance(t))
1909	>	throw new AssertionError(
1910	>	"Expected " + expectedExceptionClass.getName() +
1911	>	", got " + t.getClass().getName(),
1912	>	t);
1913		}
1914		if (!threw)
1915		shouldThrow(expectedExceptionClass.getName());
#	Line 1816 | Line 1923 | public class JSR166TestCase extends Test
1923		} catch (NoSuchElementException success) {}
1924		assertFalse(it.hasNext());
1925		}
1926	+
1927	+	public <T> Callable<T> callableThrowing(final Exception ex) {
1928	+	return new Callable<T>() { public T call() throws Exception { throw ex; }};
1929	+	}
1930	+
1931	+	public Runnable runnableThrowing(final RuntimeException ex) {
1932	+	return new Runnable() { public void run() { throw ex; }};
1933	+	}
1934	+
1935	+	/** A reusable thread pool to be shared by tests. */
1936	+	static final ExecutorService cachedThreadPool =
1937	+	new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1938	+	1000L, MILLISECONDS,
1939	+	new SynchronousQueue<Runnable>());
1940	+
1941	+	static <T> void shuffle(T[] array) {
1942	+	Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1943	+	}
1944	+
1945	+	/**
1946	+	* Returns the same String as would be returned by {@link
1947	+	* Object#toString}, whether or not the given object's class
1948	+	* overrides toString().
1949	+	*
1950	+	* @see System#identityHashCode
1951	+	*/
1952	+	static String identityString(Object x) {
1953	+	return x.getClass().getName()
1954	+	+ "@" + Integer.toHexString(System.identityHashCode(x));
1955	+	}
1956	+
1957	+	// --- Shared assertions for Executor tests ---
1958	+
1959	+	/**
1960	+	* Returns maximum number of tasks that can be submitted to given
1961	+	* pool (with bounded queue) before saturation (when submission
1962	+	* throws RejectedExecutionException).
1963	+	*/
1964	+	static final int saturatedSize(ThreadPoolExecutor pool) {
1965	+	BlockingQueue<Runnable> q = pool.getQueue();
1966	+	return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1967	+	}
1968	+
1969	+	@SuppressWarnings("FutureReturnValueIgnored")
1970	+	void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1971	+	try {
1972	+	e.execute((Runnable) null);
1973	+	shouldThrow();
1974	+	} catch (NullPointerException success) {}
1975	+
1976	+	if (! (e instanceof ExecutorService)) return;
1977	+	ExecutorService es = (ExecutorService) e;
1978	+	try {
1979	+	es.submit((Runnable) null);
1980	+	shouldThrow();
1981	+	} catch (NullPointerException success) {}
1982	+	try {
1983	+	es.submit((Runnable) null, Boolean.TRUE);
1984	+	shouldThrow();
1985	+	} catch (NullPointerException success) {}
1986	+	try {
1987	+	es.submit((Callable) null);
1988	+	shouldThrow();
1989	+	} catch (NullPointerException success) {}
1990	+
1991	+	if (! (e instanceof ScheduledExecutorService)) return;
1992	+	ScheduledExecutorService ses = (ScheduledExecutorService) e;
1993	+	try {
1994	+	ses.schedule((Runnable) null,
1995	+	randomTimeout(), randomTimeUnit());
1996	+	shouldThrow();
1997	+	} catch (NullPointerException success) {}
1998	+	try {
1999	+	ses.schedule((Callable) null,
2000	+	randomTimeout(), randomTimeUnit());
2001	+	shouldThrow();
2002	+	} catch (NullPointerException success) {}
2003	+	try {
2004	+	ses.scheduleAtFixedRate((Runnable) null,
2005	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2006	+	shouldThrow();
2007	+	} catch (NullPointerException success) {}
2008	+	try {
2009	+	ses.scheduleWithFixedDelay((Runnable) null,
2010	+	randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2011	+	shouldThrow();
2012	+	} catch (NullPointerException success) {}
2013	+	}
2014	+
2015	+	void setRejectedExecutionHandler(
2016	+	ThreadPoolExecutor p, RejectedExecutionHandler handler) {
2017	+	p.setRejectedExecutionHandler(handler);
2018	+	assertSame(handler, p.getRejectedExecutionHandler());
2019	+	}
2020	+
2021	+	void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
2022	+	final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
2023	+	final long savedTaskCount = p.getTaskCount();
2024	+	final long savedCompletedTaskCount = p.getCompletedTaskCount();
2025	+	final int savedQueueSize = p.getQueue().size();
2026	+	final boolean stock = (p.getClass().getClassLoader() == null);
2027	+
2028	+	Runnable r = () -> {};
2029	+	Callable<Boolean> c = () -> Boolean.TRUE;
2030	+
2031	+	class Recorder implements RejectedExecutionHandler {
2032	+	public volatile Runnable r = null;
2033	+	public volatile ThreadPoolExecutor p = null;
2034	+	public void reset() { r = null; p = null; }
2035	+	public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
2036	+	assertNull(this.r);
2037	+	assertNull(this.p);
2038	+	this.r = r;
2039	+	this.p = p;
2040	+	}
2041	+	}
2042	+
2043	+	// check custom handler is invoked exactly once per task
2044	+	Recorder recorder = new Recorder();
2045	+	setRejectedExecutionHandler(p, recorder);
2046	+	for (int i = 2; i--> 0; ) {
2047	+	recorder.reset();
2048	+	p.execute(r);
2049	+	if (stock && p.getClass() == ThreadPoolExecutor.class)
2050	+	assertSame(r, recorder.r);
2051	+	assertSame(p, recorder.p);
2052	+
2053	+	recorder.reset();
2054	+	assertFalse(p.submit(r).isDone());
2055	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2056	+	assertSame(p, recorder.p);
2057	+
2058	+	recorder.reset();
2059	+	assertFalse(p.submit(r, Boolean.TRUE).isDone());
2060	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2061	+	assertSame(p, recorder.p);
2062	+
2063	+	recorder.reset();
2064	+	assertFalse(p.submit(c).isDone());
2065	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2066	+	assertSame(p, recorder.p);
2067	+
2068	+	if (p instanceof ScheduledExecutorService) {
2069	+	ScheduledExecutorService s = (ScheduledExecutorService) p;
2070	+	ScheduledFuture<?> future;
2071	+
2072	+	recorder.reset();
2073	+	future = s.schedule(r, randomTimeout(), randomTimeUnit());
2074	+	assertFalse(future.isDone());
2075	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2076	+	assertSame(p, recorder.p);
2077	+
2078	+	recorder.reset();
2079	+	future = s.schedule(c, randomTimeout(), randomTimeUnit());
2080	+	assertFalse(future.isDone());
2081	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2082	+	assertSame(p, recorder.p);
2083	+
2084	+	recorder.reset();
2085	+	future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2086	+	assertFalse(future.isDone());
2087	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2088	+	assertSame(p, recorder.p);
2089	+
2090	+	recorder.reset();
2091	+	future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2092	+	assertFalse(future.isDone());
2093	+	if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2094	+	assertSame(p, recorder.p);
2095	+	}
2096	+	}
2097	+
2098	+	// Checking our custom handler above should be sufficient, but
2099	+	// we add some integration tests of standard handlers.
2100	+	final AtomicReference<Thread> thread = new AtomicReference<>();
2101	+	final Runnable setThread = () -> thread.set(Thread.currentThread());
2102	+
2103	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2104	+	try {
2105	+	p.execute(setThread);
2106	+	shouldThrow();
2107	+	} catch (RejectedExecutionException success) {}
2108	+	assertNull(thread.get());
2109	+
2110	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2111	+	p.execute(setThread);
2112	+	assertNull(thread.get());
2113	+
2114	+	setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2115	+	p.execute(setThread);
2116	+	if (p.isShutdown())
2117	+	assertNull(thread.get());
2118	+	else
2119	+	assertSame(Thread.currentThread(), thread.get());
2120	+
2121	+	setRejectedExecutionHandler(p, savedHandler);
2122	+
2123	+	// check that pool was not perturbed by handlers
2124	+	assertEquals(savedTaskCount, p.getTaskCount());
2125	+	assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2126	+	assertEquals(savedQueueSize, p.getQueue().size());
2127	+	}
2128	+
2129	+	void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2130	+	assertEquals(x, y);
2131	+	assertEquals(y, x);
2132	+	assertEquals(x.isEmpty(), y.isEmpty());
2133	+	assertEquals(x.size(), y.size());
2134	+	if (x instanceof List) {
2135	+	assertEquals(x.toString(), y.toString());
2136	+	}
2137	+	if (x instanceof List || x instanceof Set) {
2138	+	assertEquals(x.hashCode(), y.hashCode());
2139	+	}
2140	+	if (x instanceof List || x instanceof Deque) {
2141	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2142	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2143	+	y.toArray(new Object[0])));
2144	+	}
2145	+	}
2146	+
2147	+	/**
2148	+	* A weaker form of assertCollectionsEquals which does not insist
2149	+	* that the two collections satisfy Object#equals(Object), since
2150	+	* they may use identity semantics as Deques do.
2151	+	*/
2152	+	void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2153	+	if (x instanceof List || x instanceof Set)
2154	+	assertCollectionsEquals(x, y);
2155	+	else {
2156	+	assertEquals(x.isEmpty(), y.isEmpty());
2157	+	assertEquals(x.size(), y.size());
2158	+	assertEquals(new HashSet(x), new HashSet(y));
2159	+	if (x instanceof Deque) {
2160	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2161	+	assertTrue(Arrays.equals(x.toArray(new Object[0]),
2162	+	y.toArray(new Object[0])));
2163	+	}
2164	+	}
2165	+	}
2166		}

Diff Legend

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