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.99 by jsr166, Tue Feb 5 03:39:34 2013 UTC vs.
Revision 1.136 by jsr166, Fri Sep 4 18:16:28 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>	import static java.util.concurrent.TimeUnit.NANOSECONDS;
11	>
12		import java.io.ByteArrayInputStream;
13		import java.io.ByteArrayOutputStream;
14		import java.io.ObjectInputStream;
15		import java.io.ObjectOutputStream;
16		import java.lang.management.ManagementFactory;
17		import java.lang.management.ThreadInfo;
18	+	import java.lang.reflect.Constructor;
19		import java.lang.reflect.Method;
20	+	import java.lang.reflect.Modifier;
21	+	import java.security.CodeSource;
22	+	import java.security.Permission;
23	+	import java.security.PermissionCollection;
24	+	import java.security.Permissions;
25	+	import java.security.Policy;
26	+	import java.security.ProtectionDomain;
27	+	import java.security.SecurityPermission;
28		import java.util.ArrayList;
29		import java.util.Arrays;
30		import java.util.Date;
31		import java.util.Enumeration;
32	+	import java.util.Iterator;
33		import java.util.List;
34		import java.util.NoSuchElementException;
35		import java.util.PropertyPermission;
36	<	import java.util.concurrent.*;
37	<	import java.util.concurrent.atomic.AtomicBoolean;
36	>	import java.util.concurrent.BlockingQueue;
37	>	import java.util.concurrent.Callable;
38	>	import java.util.concurrent.CountDownLatch;
39	>	import java.util.concurrent.CyclicBarrier;
40	>	import java.util.concurrent.ExecutorService;
41	>	import java.util.concurrent.Future;
42	>	import java.util.concurrent.RecursiveAction;
43	>	import java.util.concurrent.RecursiveTask;
44	>	import java.util.concurrent.RejectedExecutionHandler;
45	>	import java.util.concurrent.Semaphore;
46	>	import java.util.concurrent.ThreadFactory;
47	>	import java.util.concurrent.ThreadPoolExecutor;
48	>	import java.util.concurrent.TimeoutException;
49		import java.util.concurrent.atomic.AtomicReference;
50	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
51	<	import static java.util.concurrent.TimeUnit.NANOSECONDS;
52	<	import java.security.CodeSource;
53	<	import java.security.Permission;
54	<	import java.security.PermissionCollection;
55	<	import java.security.Permissions;
56	<	import java.security.Policy;
34	<	import java.security.ProtectionDomain;
35	<	import java.security.SecurityPermission;
50	>	import java.util.regex.Pattern;
51	>
52	>	import junit.framework.AssertionFailedError;
53	>	import junit.framework.Test;
54	>	import junit.framework.TestCase;
55	>	import junit.framework.TestResult;
56	>	import junit.framework.TestSuite;
57
58		/**
59		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 115 | Line 136 | public class JSR166TestCase extends Test
136		Boolean.getBoolean("jsr166.expensiveTests");
137
138		/**
139	+	* If true, also run tests that are not part of the official tck
140	+	* because they test unspecified implementation details.
141	+	*/
142	+	protected static final boolean testImplementationDetails =
143	+	Boolean.getBoolean("jsr166.testImplementationDetails");
144	+
145	+	/**
146		* If true, report on stdout all "slow" tests, that is, ones that
147		* take more than profileThreshold milliseconds to execute.
148		*/
#	Line 128 | Line 156 | public class JSR166TestCase extends Test
156		private static final long profileThreshold =
157		Long.getLong("jsr166.profileThreshold", 100);
158
159	+	/**
160	+	* The number of repetitions per test (for tickling rare bugs).
161	+	*/
162	+	private static final int runsPerTest =
163	+	Integer.getInteger("jsr166.runsPerTest", 1);
164	+
165	+	/**
166	+	* The number of repetitions of the test suite (for finding leaks?).
167	+	*/
168	+	private static final int suiteRuns =
169	+	Integer.getInteger("jsr166.suiteRuns", 1);
170	+
171	+	public JSR166TestCase() { super(); }
172	+	public JSR166TestCase(String name) { super(name); }
173	+
174	+	/**
175	+	* A filter for tests to run, matching strings of the form
176	+	* methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
177	+	* Usefully combined with jsr166.runsPerTest.
178	+	*/
179	+	private static final Pattern methodFilter = methodFilter();
180	+
181	+	private static Pattern methodFilter() {
182	+	String regex = System.getProperty("jsr166.methodFilter");
183	+	return (regex == null) ? null : Pattern.compile(regex);
184	+	}
185	+
186		protected void runTest() throws Throwable {
187	<	if (profileTests)
188	<	runTestProfiled();
189	<	else
190	<	super.runTest();
187	>	if (methodFilter == null
188	>	|| methodFilter.matcher(toString()).find()) {
189	>	for (int i = 0; i < runsPerTest; i++) {
190	>	if (profileTests)
191	>	runTestProfiled();
192	>	else
193	>	super.runTest();
194	>	}
195	>	}
196		}
197
198		protected void runTestProfiled() throws Throwable {
199	+	// Warmup run, notably to trigger all needed classloading.
200	+	super.runTest();
201		long t0 = System.nanoTime();
202		try {
203		super.runTest();
204		} finally {
205	<	long elapsedMillis =
144	<	(System.nanoTime() - t0) / (1000L * 1000L);
205	>	long elapsedMillis = millisElapsedSince(t0);
206		if (elapsedMillis >= profileThreshold)
207		System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
208		}
#	Line 149 | Line 210 | public class JSR166TestCase extends Test
210
211		/**
212		* Runs all JSR166 unit tests using junit.textui.TestRunner.
152	–	* Optional command line arg provides the number of iterations to
153	–	* repeat running the tests.
213		*/
214		public static void main(String[] args) {
215	+	main(suite(), args);
216	+	}
217	+
218	+	/**
219	+	* Runs all unit tests in the given test suite.
220	+	* Actual behavior influenced by jsr166.* system properties.
221	+	*/
222	+	static void main(Test suite, String[] args) {
223		if (useSecurityManager) {
224		System.err.println("Setting a permissive security manager");
225		Policy.setPolicy(permissivePolicy());
226		System.setSecurityManager(new SecurityManager());
227		}
228	<	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
229	<
230	<	Test s = suite();
231	<	for (int i = 0; i < iters; ++i) {
165	<	junit.textui.TestRunner.run(s);
228	>	for (int i = 0; i < suiteRuns; i++) {
229	>	TestResult result = junit.textui.TestRunner.run(suite);
230	>	if (!result.wasSuccessful())
231	>	System.exit(1);
232		System.gc();
233		System.runFinalization();
234		}
169	–	System.exit(0);
235		}
236
237		public static TestSuite newTestSuite(Object... suiteOrClasses) {
#	Line 197 | Line 262 | public class JSR166TestCase extends Test
262		}
263
264		public static final double JAVA_CLASS_VERSION;
265	+	public static final String JAVA_SPECIFICATION_VERSION;
266		static {
267		try {
268		JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
269		new java.security.PrivilegedAction<Double>() {
270		public Double run() {
271		return Double.valueOf(System.getProperty("java.class.version"));}});
272	+	JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
273	+	new java.security.PrivilegedAction<String>() {
274	+	public String run() {
275	+	return System.getProperty("java.specification.version");}});
276		} catch (Throwable t) {
277		throw new Error(t);
278		}
#	Line 211 | Line 281 | public class JSR166TestCase extends Test
281		public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
282		public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
283		public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
284	+	public static boolean atLeastJava9() {
285	+	// As of 2015-09, java9 still uses 52.0 class file version
286	+	return JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
287	+	}
288	+	// public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; }
289	+	public static boolean atLeastJava10() {
290	+	return JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
291	+	}
292
293		/**
294		* Collects all JSR166 unit tests as one suite.
#	Line 286 | Line 364 | public class JSR166TestCase extends Test
364		// Java8+ test classes
365		if (atLeastJava8()) {
366		String[] java8TestClassNames = {
367	<	"StampedLockTest",
367	>	"Atomic8Test",
368	>	"CompletableFutureTest",
369	>	"ConcurrentHashMap8Test",
370	>	"CountedCompleterTest",
371	>	"DoubleAccumulatorTest",
372	>	"DoubleAdderTest",
373		"ForkJoinPool8Test",
374	+	"ForkJoinTask8Test",
375	+	"LongAccumulatorTest",
376	+	"LongAdderTest",
377	+	"SplittableRandomTest",
378	+	"StampedLockTest",
379	+	"ThreadLocalRandom8Test",
380		};
381		addNamedTestClasses(suite, java8TestClassNames);
382		}
383
384	+	// Java9+ test classes
385	+	if (atLeastJava9()) {
386	+	String[] java9TestClassNames = {
387	+	"ThreadPoolExecutor9Test",
388	+	};
389	+	addNamedTestClasses(suite, java9TestClassNames);
390	+	}
391	+
392		return suite;
393		}
394
395	+	/** Returns list of junit-style test method names in given class. */
396	+	public static ArrayList<String> testMethodNames(Class<?> testClass) {
397	+	Method[] methods = testClass.getDeclaredMethods();
398	+	ArrayList<String> names = new ArrayList<String>(methods.length);
399	+	for (Method method : methods) {
400	+	if (method.getName().startsWith("test")
401	+	&& Modifier.isPublic(method.getModifiers())
402	+	// method.getParameterCount() requires jdk8+
403	+	&& method.getParameterTypes().length == 0) {
404	+	names.add(method.getName());
405	+	}
406	+	}
407	+	return names;
408	+	}
409	+
410	+	/**
411	+	* Returns junit-style testSuite for the given test class, but
412	+	* parameterized by passing extra data to each test.
413	+	*/
414	+	public static <ExtraData> Test parameterizedTestSuite
415	+	(Class<? extends JSR166TestCase> testClass,
416	+	Class<ExtraData> dataClass,
417	+	ExtraData data) {
418	+	try {
419	+	TestSuite suite = new TestSuite();
420	+	Constructor c =
421	+	testClass.getDeclaredConstructor(dataClass, String.class);
422	+	for (String methodName : testMethodNames(testClass))
423	+	suite.addTest((Test) c.newInstance(data, methodName));
424	+	return suite;
425	+	} catch (Exception e) {
426	+	throw new Error(e);
427	+	}
428	+	}
429	+
430	+	/**
431	+	* Returns junit-style testSuite for the jdk8 extension of the
432	+	* given test class, but parameterized by passing extra data to
433	+	* each test.  Uses reflection to allow compilation in jdk7.
434	+	*/
435	+	public static <ExtraData> Test jdk8ParameterizedTestSuite
436	+	(Class<? extends JSR166TestCase> testClass,
437	+	Class<ExtraData> dataClass,
438	+	ExtraData data) {
439	+	if (atLeastJava8()) {
440	+	String name = testClass.getName();
441	+	String name8 = name.replaceAll("Test$", "8Test");
442	+	if (name.equals(name8)) throw new Error(name);
443	+	try {
444	+	return (Test)
445	+	Class.forName(name8)
446	+	.getMethod("testSuite", new Class[] { dataClass })
447	+	.invoke(null, data);
448	+	} catch (Exception e) {
449	+	throw new Error(e);
450	+	}
451	+	} else {
452	+	return new TestSuite();
453	+	}
454	+
455	+	}
456	+
457	+	// Delays for timing-dependent tests, in milliseconds.
458
459		public static long SHORT_DELAY_MS;
460		public static long SMALL_DELAY_MS;
461		public static long MEDIUM_DELAY_MS;
462		public static long LONG_DELAY_MS;
463
304	–
464		/**
465		* Returns the shortest timed delay. This could
466		* be reimplemented to use for example a Property.
#	Line 329 | Line 488 | public class JSR166TestCase extends Test
488		}
489
490		/**
491	<	* Returns a new Date instance representing a time delayMillis
492	<	* milliseconds in the future.
491	>	* Returns a new Date instance representing a time at least
492	>	* delayMillis milliseconds in the future.
493		*/
494		Date delayedDate(long delayMillis) {
495	<	return new Date(System.currentTimeMillis() + delayMillis);
495	>	// Add 1 because currentTimeMillis is known to round into the past.
496	>	return new Date(System.currentTimeMillis() + delayMillis + 1);
497		}
498
499		/**
#	Line 384 | Line 544 | public class JSR166TestCase extends Test
544
545		if (Thread.interrupted())
546		throw new AssertionFailedError("interrupt status set in main thread");
547	+
548	+	checkForkJoinPoolThreadLeaks();
549	+	}
550	+
551	+	/**
552	+	* Finds missing try { ... } finally { joinPool(e); }
553	+	*/
554	+	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
555	+	Thread[] survivors = new Thread[5];
556	+	int count = Thread.enumerate(survivors);
557	+	for (int i = 0; i < count; i++) {
558	+	Thread thread = survivors[i];
559	+	String name = thread.getName();
560	+	if (name.startsWith("ForkJoinPool-")) {
561	+	// give thread some time to terminate
562	+	thread.join(LONG_DELAY_MS);
563	+	if (!thread.isAlive()) continue;
564	+	throw new AssertionFailedError
565	+	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
566	+	toString(), name));
567	+	}
568	+	}
569		}
570
571		/**
#	Line 464 | Line 646 | public class JSR166TestCase extends Test
646		public void threadAssertEquals(Object x, Object y) {
647		try {
648		assertEquals(x, y);
649	<	} catch (AssertionFailedError t) {
650	<	threadRecordFailure(t);
651	<	throw t;
652	<	} catch (Throwable t) {
653	<	threadUnexpectedException(t);
649	>	} catch (AssertionFailedError fail) {
650	>	threadRecordFailure(fail);
651	>	throw fail;
652	>	} catch (Throwable fail) {
653	>	threadUnexpectedException(fail);
654		}
655		}
656
#	Line 480 | Line 662 | public class JSR166TestCase extends Test
662		public void threadAssertSame(Object x, Object y) {
663		try {
664		assertSame(x, y);
665	<	} catch (AssertionFailedError t) {
666	<	threadRecordFailure(t);
667	<	throw t;
665	>	} catch (AssertionFailedError fail) {
666	>	threadRecordFailure(fail);
667	>	throw fail;
668		}
669		}
670
#	Line 547 | Line 729 | public class JSR166TestCase extends Test
729		void joinPool(ExecutorService exec) {
730		try {
731		exec.shutdown();
732	<	assertTrue("ExecutorService did not terminate in a timely manner",
733	<	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
732	>	if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
733	>	fail("ExecutorService " + exec +
734	>	" did not terminate in a timely manner");
735		} catch (SecurityException ok) {
736		// Allowed in case test doesn't have privs
737	<	} catch (InterruptedException ie) {
737	>	} catch (InterruptedException fail) {
738		fail("Unexpected InterruptedException");
739		}
740		}
#	Line 582 | Line 765 | public class JSR166TestCase extends Test
765		// No need to optimize the failing case via Thread.join.
766		delay(millis);
767		assertTrue(thread.isAlive());
768	<	} catch (InterruptedException ie) {
768	>	} catch (InterruptedException fail) {
769		fail("Unexpected InterruptedException");
770		}
771		}
#	Line 604 | Line 787 | public class JSR166TestCase extends Test
787		delay(millis);
788		for (Thread thread : threads)
789		assertTrue(thread.isAlive());
790	<	} catch (InterruptedException ie) {
790	>	} catch (InterruptedException fail) {
791		fail("Unexpected InterruptedException");
792		}
793		}
#	Line 626 | Line 809 | public class JSR166TestCase extends Test
809		future.get(timeoutMillis, MILLISECONDS);
810		shouldThrow();
811		} catch (TimeoutException success) {
812	<	} catch (Exception e) {
813	<	threadUnexpectedException(e);
812	>	} catch (Exception fail) {
813	>	threadUnexpectedException(fail);
814		} finally { future.cancel(true); }
815		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
816		}
#	Line 671 | Line 854 | public class JSR166TestCase extends Test
854		public static final Integer m6  = new Integer(-6);
855		public static final Integer m10 = new Integer(-10);
856
674	–
857		/**
858		* Runs Runnable r with a security policy that permits precisely
859		* the specified permissions.  If there is no current security
#	Line 784 | Line 966 | public class JSR166TestCase extends Test
966		void sleep(long millis) {
967		try {
968		delay(millis);
969	<	} catch (InterruptedException ie) {
969	>	} catch (InterruptedException fail) {
970		AssertionFailedError afe =
971		new AssertionFailedError("Unexpected InterruptedException");
972	<	afe.initCause(ie);
972	>	afe.initCause(fail);
973		throw afe;
974		}
975		}
#	Line 825 | Line 1007 | public class JSR166TestCase extends Test
1007		/**
1008		* Returns the number of milliseconds since time given by
1009		* startNanoTime, which must have been previously returned from a
1010	<	* call to {@link System.nanoTime()}.
1010	>	* call to {@link System#nanoTime()}.
1011		*/
1012	<	long millisElapsedSince(long startNanoTime) {
1012	>	static long millisElapsedSince(long startNanoTime) {
1013		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1014		}
1015
1016	+	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1017	+	//         long startTime = System.nanoTime();
1018	+	//         try {
1019	+	//             r.run();
1020	+	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1021	+	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1022	+	//             throw new AssertionFailedError("did not return promptly");
1023	+	//     }
1024	+
1025	+	//     void assertTerminatesPromptly(Runnable r) {
1026	+	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1027	+	//     }
1028	+
1029	+	/**
1030	+	* Checks that timed f.get() returns the expected value, and does not
1031	+	* wait for the timeout to elapse before returning.
1032	+	*/
1033	+	<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1034	+	long startTime = System.nanoTime();
1035	+	try {
1036	+	assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1037	+	} catch (Throwable fail) { threadUnexpectedException(fail); }
1038	+	if (millisElapsedSince(startTime) > timeoutMillis/2)
1039	+	throw new AssertionFailedError("timed get did not return promptly");
1040	+	}
1041	+
1042	+	<T> void checkTimedGet(Future<T> f, T expectedValue) {
1043	+	checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1044	+	}
1045	+
1046		/**
1047		* Returns a new started daemon Thread running the given runnable.
1048		*/
#	Line 849 | Line 1061 | public class JSR166TestCase extends Test
1061		void awaitTermination(Thread t, long timeoutMillis) {
1062		try {
1063		t.join(timeoutMillis);
1064	<	} catch (InterruptedException ie) {
1065	<	threadUnexpectedException(ie);
1064	>	} catch (InterruptedException fail) {
1065	>	threadUnexpectedException(fail);
1066		} finally {
1067		if (t.getState() != Thread.State.TERMINATED) {
1068		t.interrupt();
#	Line 876 | Line 1088 | public class JSR166TestCase extends Test
1088		public final void run() {
1089		try {
1090		realRun();
1091	<	} catch (Throwable t) {
1092	<	threadUnexpectedException(t);
1091	>	} catch (Throwable fail) {
1092	>	threadUnexpectedException(fail);
1093		}
1094		}
1095		}
#	Line 931 | Line 1143 | public class JSR166TestCase extends Test
1143		threadShouldThrow("InterruptedException");
1144		} catch (InterruptedException success) {
1145		threadAssertFalse(Thread.interrupted());
1146	<	} catch (Throwable t) {
1147	<	threadUnexpectedException(t);
1146	>	} catch (Throwable fail) {
1147	>	threadUnexpectedException(fail);
1148		}
1149		}
1150		}
#	Line 943 | Line 1155 | public class JSR166TestCase extends Test
1155		public final T call() {
1156		try {
1157		return realCall();
1158	<	} catch (Throwable t) {
1159	<	threadUnexpectedException(t);
1158	>	} catch (Throwable fail) {
1159	>	threadUnexpectedException(fail);
1160		return null;
1161		}
1162		}
#	Line 961 | Line 1173 | public class JSR166TestCase extends Test
1173		return result;
1174		} catch (InterruptedException success) {
1175		threadAssertFalse(Thread.interrupted());
1176	<	} catch (Throwable t) {
1177	<	threadUnexpectedException(t);
1176	>	} catch (Throwable fail) {
1177	>	threadUnexpectedException(fail);
1178		}
1179		return null;
1180		}
#	Line 1002 | Line 1214 | public class JSR166TestCase extends Test
1214		public void await(CountDownLatch latch) {
1215		try {
1216		assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1217	<	} catch (Throwable t) {
1218	<	threadUnexpectedException(t);
1217	>	} catch (Throwable fail) {
1218	>	threadUnexpectedException(fail);
1219		}
1220		}
1221
1222		public void await(Semaphore semaphore) {
1223		try {
1224		assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1225	<	} catch (Throwable t) {
1226	<	threadUnexpectedException(t);
1225	>	} catch (Throwable fail) {
1226	>	threadUnexpectedException(fail);
1227		}
1228		}
1229
#	Line 1202 | Line 1414 | public class JSR166TestCase extends Test
1414		public abstract class CheckedRecursiveAction extends RecursiveAction {
1415		protected abstract void realCompute() throws Throwable;
1416
1417	<	public final void compute() {
1417	>	@Override protected final void compute() {
1418		try {
1419		realCompute();
1420	<	} catch (Throwable t) {
1421	<	threadUnexpectedException(t);
1420	>	} catch (Throwable fail) {
1421	>	threadUnexpectedException(fail);
1422		}
1423		}
1424		}
#	Line 1217 | Line 1429 | public class JSR166TestCase extends Test
1429		public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1430		protected abstract T realCompute() throws Throwable;
1431
1432	<	public final T compute() {
1432	>	@Override protected final T compute() {
1433		try {
1434		return realCompute();
1435	<	} catch (Throwable t) {
1436	<	threadUnexpectedException(t);
1435	>	} catch (Throwable fail) {
1436	>	threadUnexpectedException(fail);
1437		return null;
1438		}
1439		}
#	Line 1245 | Line 1457 | public class JSR166TestCase extends Test
1457		public int await() {
1458		try {
1459		return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1460	<	} catch (TimeoutException e) {
1460	>	} catch (TimeoutException timedOut) {
1461		throw new AssertionFailedError("timed out");
1462	<	} catch (Exception e) {
1462	>	} catch (Exception fail) {
1463		AssertionFailedError afe =
1464	<	new AssertionFailedError("Unexpected exception: " + e);
1465	<	afe.initCause(e);
1464	>	new AssertionFailedError("Unexpected exception: " + fail);
1465	>	afe.initCause(fail);
1466		throw afe;
1467		}
1468		}
#	Line 1278 | Line 1490 | public class JSR166TestCase extends Test
1490		q.remove();
1491		shouldThrow();
1492		} catch (NoSuchElementException success) {}
1493	<	} catch (InterruptedException ie) {
1282	<	threadUnexpectedException(ie);
1283	<	}
1493	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
1494		}
1495
1496		void assertSerialEquals(Object x, Object y) {
#	Line 1299 | Line 1509 | public class JSR166TestCase extends Test
1509		oos.flush();
1510		oos.close();
1511		return bos.toByteArray();
1512	<	} catch (Throwable t) {
1513	<	threadUnexpectedException(t);
1512	>	} catch (Throwable fail) {
1513	>	threadUnexpectedException(fail);
1514		return new byte[0];
1515		}
1516		}
#	Line 1313 | Line 1523 | public class JSR166TestCase extends Test
1523		T clone = (T) ois.readObject();
1524		assertSame(o.getClass(), clone.getClass());
1525		return clone;
1526	<	} catch (Throwable t) {
1527	<	threadUnexpectedException(t);
1526	>	} catch (Throwable fail) {
1527	>	threadUnexpectedException(fail);
1528		return null;
1529		}
1530		}
1531	+
1532	+	public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1533	+	Runnable... throwingActions) {
1534	+	for (Runnable throwingAction : throwingActions) {
1535	+	boolean threw = false;
1536	+	try { throwingAction.run(); }
1537	+	catch (Throwable t) {
1538	+	threw = true;
1539	+	if (!expectedExceptionClass.isInstance(t)) {
1540	+	AssertionFailedError afe =
1541	+	new AssertionFailedError
1542	+	("Expected " + expectedExceptionClass.getName() +
1543	+	", got " + t.getClass().getName());
1544	+	afe.initCause(t);
1545	+	threadUnexpectedException(afe);
1546	+	}
1547	+	}
1548	+	if (!threw)
1549	+	shouldThrow(expectedExceptionClass.getName());
1550	+	}
1551	+	}
1552	+
1553	+	public void assertIteratorExhausted(Iterator<?> it) {
1554	+	try {
1555	+	it.next();
1556	+	shouldThrow();
1557	+	} catch (NoSuchElementException success) {}
1558	+	assertFalse(it.hasNext());
1559	+	}
1560		}

Diff Legend

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