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.51 by jsr166, Wed Sep 1 06:41:55 2010 UTC vs.
Revision 1.104 by dl, Thu Mar 21 00:26:43 2013 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
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
10	<	import java.util.*;
10	>	import java.io.ByteArrayInputStream;
11	>	import java.io.ByteArrayOutputStream;
12	>	import java.io.ObjectInputStream;
13	>	import java.io.ObjectOutputStream;
14	>	import java.lang.management.ManagementFactory;
15	>	import java.lang.management.ThreadInfo;
16	>	import java.lang.reflect.Method;
17	>	import java.util.ArrayList;
18	>	import java.util.Arrays;
19	>	import java.util.Date;
20	>	import java.util.Enumeration;
21	>	import java.util.List;
22	>	import java.util.NoSuchElementException;
23	>	import java.util.PropertyPermission;
24		import java.util.concurrent.*;
25	+	import java.util.concurrent.atomic.AtomicBoolean;
26	+	import java.util.concurrent.atomic.AtomicReference;
27		import static java.util.concurrent.TimeUnit.MILLISECONDS;
28	<	import java.io.*;
29	<	import java.security.*;
28	>	import static java.util.concurrent.TimeUnit.NANOSECONDS;
29	>	import java.security.CodeSource;
30	>	import java.security.Permission;
31	>	import java.security.PermissionCollection;
32	>	import java.security.Permissions;
33	>	import java.security.Policy;
34	>	import java.security.ProtectionDomain;
35	>	import java.security.SecurityPermission;
36
37		/**
38		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 54 | Line 75 | import java.security.*;
75		*
76		* </ol>
77		*
78	<	* <p> <b>Other notes</b>
78	>	* <p><b>Other notes</b>
79		* <ul>
80		*
81		* <li> Usually, there is one testcase method per JSR166 method
#	Line 90 | Line 111 | public class JSR166TestCase extends Test
111		private static final boolean useSecurityManager =
112		Boolean.getBoolean("jsr166.useSecurityManager");
113
114	+	protected static final boolean expensiveTests =
115	+	Boolean.getBoolean("jsr166.expensiveTests");
116	+
117	+	/**
118	+	* If true, report on stdout all "slow" tests, that is, ones that
119	+	* take more than profileThreshold milliseconds to execute.
120	+	*/
121	+	private static final boolean profileTests =
122	+	Boolean.getBoolean("jsr166.profileTests");
123	+
124	+	/**
125	+	* The number of milliseconds that tests are permitted for
126	+	* execution without being reported, when profileTests is set.
127	+	*/
128	+	private static final long profileThreshold =
129	+	Long.getLong("jsr166.profileThreshold", 100);
130	+
131	+	protected void runTest() throws Throwable {
132	+	if (profileTests)
133	+	runTestProfiled();
134	+	else
135	+	super.runTest();
136	+	}
137	+
138	+	protected void runTestProfiled() throws Throwable {
139	+	long t0 = System.nanoTime();
140	+	try {
141	+	super.runTest();
142	+	} finally {
143	+	long elapsedMillis =
144	+	(System.nanoTime() - t0) / (1000L * 1000L);
145	+	if (elapsedMillis >= profileThreshold)
146	+	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
147	+	}
148	+	}
149	+
150		/**
151	<	* Runs all JSR166 unit tests using junit.textui.TestRunner
151	>	* 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.
154		*/
155		public static void main(String[] args) {
156		if (useSecurityManager) {
#	Line 99 | Line 158 | public class JSR166TestCase extends Test
158		Policy.setPolicy(permissivePolicy());
159		System.setSecurityManager(new SecurityManager());
160		}
161	<	int iters = 1;
162	<	if (args.length > 0)
104	<	iters = Integer.parseInt(args[0]);
161	>	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
162	>
163		Test s = suite();
164		for (int i = 0; i < iters; ++i) {
165		junit.textui.TestRunner.run(s);
#	Line 111 | Line 169 | public class JSR166TestCase extends Test
169		System.exit(0);
170		}
171
172	+	public static TestSuite newTestSuite(Object... suiteOrClasses) {
173	+	TestSuite suite = new TestSuite();
174	+	for (Object suiteOrClass : suiteOrClasses) {
175	+	if (suiteOrClass instanceof TestSuite)
176	+	suite.addTest((TestSuite) suiteOrClass);
177	+	else if (suiteOrClass instanceof Class)
178	+	suite.addTest(new TestSuite((Class<?>) suiteOrClass));
179	+	else
180	+	throw new ClassCastException("not a test suite or class");
181	+	}
182	+	return suite;
183	+	}
184	+
185	+	public static void addNamedTestClasses(TestSuite suite,
186	+	String... testClassNames) {
187	+	for (String testClassName : testClassNames) {
188	+	try {
189	+	Class<?> testClass = Class.forName(testClassName);
190	+	Method m = testClass.getDeclaredMethod("suite",
191	+	new Class<?>[0]);
192	+	suite.addTest(newTestSuite((Test)m.invoke(null)));
193	+	} catch (Exception e) {
194	+	throw new Error("Missing test class", e);
195	+	}
196	+	}
197	+	}
198	+
199	+	public static final double JAVA_CLASS_VERSION;
200	+	static {
201	+	try {
202	+	JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
203	+	new java.security.PrivilegedAction<Double>() {
204	+	public Double run() {
205	+	return Double.valueOf(System.getProperty("java.class.version"));}});
206	+	} catch (Throwable t) {
207	+	throw new Error(t);
208	+	}
209	+	}
210	+
211	+	public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
212	+	public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
213	+	public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
214	+
215		/**
216	<	* Collects all JSR166 unit tests as one suite
216	>	* Collects all JSR166 unit tests as one suite.
217		*/
218		public static Test suite() {
219	<	TestSuite suite = new TestSuite("JSR166 Unit Tests");
220	<
221	<	suite.addTest(new TestSuite(ForkJoinPoolTest.class));
222	<	suite.addTest(new TestSuite(ForkJoinTaskTest.class));
223	<	suite.addTest(new TestSuite(RecursiveActionTest.class));
224	<	suite.addTest(new TestSuite(RecursiveTaskTest.class));
225	<	suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
226	<	suite.addTest(new TestSuite(PhaserTest.class));
227	<	suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
228	<	suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
229	<	suite.addTest(new TestSuite(AbstractQueueTest.class));
230	<	suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
231	<	suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
232	<	suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
233	<	suite.addTest(new TestSuite(ArrayDequeTest.class));
234	<	suite.addTest(new TestSuite(AtomicBooleanTest.class));
235	<	suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
236	<	suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
237	<	suite.addTest(new TestSuite(AtomicIntegerTest.class));
238	<	suite.addTest(new TestSuite(AtomicLongArrayTest.class));
239	<	suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
240	<	suite.addTest(new TestSuite(AtomicLongTest.class));
241	<	suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
242	<	suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
243	<	suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
244	<	suite.addTest(new TestSuite(AtomicReferenceTest.class));
245	<	suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
246	<	suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
247	<	suite.addTest(new TestSuite(ConcurrentLinkedDequeTest.class));
248	<	suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
249	<	suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
250	<	suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
251	<	suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
252	<	suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
253	<	suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
254	<	suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
255	<	suite.addTest(new TestSuite(CountDownLatchTest.class));
256	<	suite.addTest(new TestSuite(CyclicBarrierTest.class));
257	<	suite.addTest(new TestSuite(DelayQueueTest.class));
258	<	suite.addTest(new TestSuite(EntryTest.class));
259	<	suite.addTest(new TestSuite(ExchangerTest.class));
260	<	suite.addTest(new TestSuite(ExecutorsTest.class));
261	<	suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
262	<	suite.addTest(new TestSuite(FutureTaskTest.class));
263	<	suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
264	<	suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
265	<	suite.addTest(new TestSuite(LinkedListTest.class));
266	<	suite.addTest(new TestSuite(LockSupportTest.class));
267	<	suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
268	<	suite.addTest(new TestSuite(PriorityQueueTest.class));
269	<	suite.addTest(new TestSuite(ReentrantLockTest.class));
270	<	suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
271	<	suite.addTest(new TestSuite(ScheduledExecutorTest.class));
272	<	suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
273	<	suite.addTest(new TestSuite(SemaphoreTest.class));
274	<	suite.addTest(new TestSuite(SynchronousQueueTest.class));
275	<	suite.addTest(new TestSuite(SystemTest.class));
276	<	suite.addTest(new TestSuite(ThreadLocalTest.class));
277	<	suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
278	<	suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
279	<	suite.addTest(new TestSuite(ThreadTest.class));
280	<	suite.addTest(new TestSuite(TimeUnitTest.class));
281	<	suite.addTest(new TestSuite(TreeMapTest.class));
282	<	suite.addTest(new TestSuite(TreeSetTest.class));
283	<	suite.addTest(new TestSuite(TreeSubMapTest.class));
284	<	suite.addTest(new TestSuite(TreeSubSetTest.class));
219	>	// Java7+ test classes
220	>	TestSuite suite = newTestSuite(
221	>	ForkJoinPoolTest.suite(),
222	>	ForkJoinTaskTest.suite(),
223	>	RecursiveActionTest.suite(),
224	>	RecursiveTaskTest.suite(),
225	>	LinkedTransferQueueTest.suite(),
226	>	PhaserTest.suite(),
227	>	ThreadLocalRandomTest.suite(),
228	>	AbstractExecutorServiceTest.suite(),
229	>	AbstractQueueTest.suite(),
230	>	AbstractQueuedSynchronizerTest.suite(),
231	>	AbstractQueuedLongSynchronizerTest.suite(),
232	>	ArrayBlockingQueueTest.suite(),
233	>	ArrayDequeTest.suite(),
234	>	AtomicBooleanTest.suite(),
235	>	AtomicIntegerArrayTest.suite(),
236	>	AtomicIntegerFieldUpdaterTest.suite(),
237	>	AtomicIntegerTest.suite(),
238	>	AtomicLongArrayTest.suite(),
239	>	AtomicLongFieldUpdaterTest.suite(),
240	>	AtomicLongTest.suite(),
241	>	AtomicMarkableReferenceTest.suite(),
242	>	AtomicReferenceArrayTest.suite(),
243	>	AtomicReferenceFieldUpdaterTest.suite(),
244	>	AtomicReferenceTest.suite(),
245	>	AtomicStampedReferenceTest.suite(),
246	>	ConcurrentHashMapTest.suite(),
247	>	ConcurrentLinkedDequeTest.suite(),
248	>	ConcurrentLinkedQueueTest.suite(),
249	>	ConcurrentSkipListMapTest.suite(),
250	>	ConcurrentSkipListSubMapTest.suite(),
251	>	ConcurrentSkipListSetTest.suite(),
252	>	ConcurrentSkipListSubSetTest.suite(),
253	>	CopyOnWriteArrayListTest.suite(),
254	>	CopyOnWriteArraySetTest.suite(),
255	>	CountDownLatchTest.suite(),
256	>	CyclicBarrierTest.suite(),
257	>	DelayQueueTest.suite(),
258	>	EntryTest.suite(),
259	>	ExchangerTest.suite(),
260	>	ExecutorsTest.suite(),
261	>	ExecutorCompletionServiceTest.suite(),
262	>	FutureTaskTest.suite(),
263	>	LinkedBlockingDequeTest.suite(),
264	>	LinkedBlockingQueueTest.suite(),
265	>	LinkedListTest.suite(),
266	>	LockSupportTest.suite(),
267	>	PriorityBlockingQueueTest.suite(),
268	>	PriorityQueueTest.suite(),
269	>	ReentrantLockTest.suite(),
270	>	ReentrantReadWriteLockTest.suite(),
271	>	ScheduledExecutorTest.suite(),
272	>	ScheduledExecutorSubclassTest.suite(),
273	>	SemaphoreTest.suite(),
274	>	SynchronousQueueTest.suite(),
275	>	SystemTest.suite(),
276	>	ThreadLocalTest.suite(),
277	>	ThreadPoolExecutorTest.suite(),
278	>	ThreadPoolExecutorSubclassTest.suite(),
279	>	ThreadTest.suite(),
280	>	TimeUnitTest.suite(),
281	>	TreeMapTest.suite(),
282	>	TreeSetTest.suite(),
283	>	TreeSubMapTest.suite(),
284	>	TreeSubSetTest.suite());
285	>
286	>	// Java8+ test classes
287	>	if (atLeastJava8()) {
288	>	String[] java8TestClassNames = {
289	>	"CompletableFutureTest",
290	>	"CountedCompleterTest",
291	>	"DoubleAccumulatorTest",
292	>	"DoubleAdderTest",
293	>	"ForkJoinPool8Test",
294	>	"LongAccumulatorTest",
295	>	"LongAdderTest",
296	>	"StampedLockTest",
297	>	};
298	>	addNamedTestClasses(suite, java8TestClassNames);
299	>	}
300
301		return suite;
302		}
#	Line 200 | Line 316 | public class JSR166TestCase extends Test
316		return 50;
317		}
318
203	–
319		/**
320		* Sets delays as multiples of SHORT_DELAY.
321		*/
322		protected void setDelays() {
323		SHORT_DELAY_MS = getShortDelay();
324	<	SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
324	>	SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
325		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
326	<	LONG_DELAY_MS = SHORT_DELAY_MS * 50;
326	>	LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
327	>	}
328	>
329	>	/**
330	>	* Returns a timeout in milliseconds to be used in tests that
331	>	* verify that operations block or time out.
332	>	*/
333	>	long timeoutMillis() {
334	>	return SHORT_DELAY_MS / 4;
335		}
336
337		/**
338	<	* Flag set true if any threadAssert methods fail
338	>	* Returns a new Date instance representing a time delayMillis
339	>	* milliseconds in the future.
340		*/
341	<	volatile boolean threadFailed;
341	>	Date delayedDate(long delayMillis) {
342	>	return new Date(System.currentTimeMillis() + delayMillis);
343	>	}
344	>
345	>	/**
346	>	* The first exception encountered if any threadAssertXXX method fails.
347	>	*/
348	>	private final AtomicReference<Throwable> threadFailure
349	>	= new AtomicReference<Throwable>(null);
350
351		/**
352	<	* Initializes test to indicate that no thread assertions have failed
352	>	* Records an exception so that it can be rethrown later in the test
353	>	* harness thread, triggering a test case failure.  Only the first
354	>	* failure is recorded; subsequent calls to this method from within
355	>	* the same test have no effect.
356		*/
357	+	public void threadRecordFailure(Throwable t) {
358	+	threadFailure.compareAndSet(null, t);
359	+	}
360	+
361		public void setUp() {
362		setDelays();
224	–	threadFailed = false;
363		}
364
365		/**
366	<	* Triggers test case failure if any thread assertions have failed
366	>	* Extra checks that get done for all test cases.
367	>	*
368	>	* Triggers test case failure if any thread assertions have failed,
369	>	* by rethrowing, in the test harness thread, any exception recorded
370	>	* earlier by threadRecordFailure.
371	>	*
372	>	* Triggers test case failure if interrupt status is set in the main thread.
373	>	*/
374	>	public void tearDown() throws Exception {
375	>	Throwable t = threadFailure.getAndSet(null);
376	>	if (t != null) {
377	>	if (t instanceof Error)
378	>	throw (Error) t;
379	>	else if (t instanceof RuntimeException)
380	>	throw (RuntimeException) t;
381	>	else if (t instanceof Exception)
382	>	throw (Exception) t;
383	>	else {
384	>	AssertionFailedError afe =
385	>	new AssertionFailedError(t.toString());
386	>	afe.initCause(t);
387	>	throw afe;
388	>	}
389	>	}
390	>
391	>	if (Thread.interrupted())
392	>	throw new AssertionFailedError("interrupt status set in main thread");
393	>
394	>	checkForkJoinPoolThreadLeaks();
395	>	}
396	>
397	>	/**
398	>	* Find missing try { ... } finally { joinPool(e); }
399		*/
400	<	public void tearDown() {
401	<	assertFalse(threadFailed);
400	>	void checkForkJoinPoolThreadLeaks() throws InterruptedException {
401	>	Thread[] survivors = new Thread[5];
402	>	int count = Thread.enumerate(survivors);
403	>	for (int i = 0; i < count; i++) {
404	>	Thread thread = survivors[i];
405	>	String name = thread.getName();
406	>	if (name.startsWith("ForkJoinPool-")) {
407	>	// give thread some time to terminate
408	>	thread.join(LONG_DELAY_MS);
409	>	if (!thread.isAlive()) continue;
410	>	thread.stop();
411	>	throw new AssertionFailedError
412	>	(String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
413	>	toString(), name));
414	>	}
415	>	}
416		}
417
418		/**
419	<	* Fail, also setting status to indicate current testcase should fail
419	>	* Just like fail(reason), but additionally recording (using
420	>	* threadRecordFailure) any AssertionFailedError thrown, so that
421	>	* the current testcase will fail.
422		*/
423		public void threadFail(String reason) {
424	<	threadFailed = true;
425	<	fail(reason);
424	>	try {
425	>	fail(reason);
426	>	} catch (AssertionFailedError t) {
427	>	threadRecordFailure(t);
428	>	fail(reason);
429	>	}
430		}
431
432		/**
433	<	* If expression not true, set status to indicate current testcase
434	<	* should fail
433	>	* Just like assertTrue(b), but additionally recording (using
434	>	* threadRecordFailure) any AssertionFailedError thrown, so that
435	>	* the current testcase will fail.
436		*/
437		public void threadAssertTrue(boolean b) {
438	<	if (!b) {
248	<	threadFailed = true;
438	>	try {
439		assertTrue(b);
440	+	} catch (AssertionFailedError t) {
441	+	threadRecordFailure(t);
442	+	throw t;
443		}
444		}
445
446		/**
447	<	* If expression not false, set status to indicate current testcase
448	<	* should fail
447	>	* Just like assertFalse(b), but additionally recording (using
448	>	* threadRecordFailure) any AssertionFailedError thrown, so that
449	>	* the current testcase will fail.
450		*/
451		public void threadAssertFalse(boolean b) {
452	<	if (b) {
259	<	threadFailed = true;
452	>	try {
453		assertFalse(b);
454	+	} catch (AssertionFailedError t) {
455	+	threadRecordFailure(t);
456	+	throw t;
457		}
458		}
459
460		/**
461	<	* If argument not null, set status to indicate current testcase
462	<	* should fail
461	>	* Just like assertNull(x), but additionally recording (using
462	>	* threadRecordFailure) any AssertionFailedError thrown, so that
463	>	* the current testcase will fail.
464		*/
465		public void threadAssertNull(Object x) {
466	<	if (x != null) {
270	<	threadFailed = true;
466	>	try {
467		assertNull(x);
468	+	} catch (AssertionFailedError t) {
469	+	threadRecordFailure(t);
470	+	throw t;
471		}
472		}
473
474		/**
475	<	* If arguments not equal, set status to indicate current testcase
476	<	* should fail
475	>	* Just like assertEquals(x, y), but additionally recording (using
476	>	* threadRecordFailure) any AssertionFailedError thrown, so that
477	>	* the current testcase will fail.
478		*/
479		public void threadAssertEquals(long x, long y) {
480	<	if (x != y) {
281	<	threadFailed = true;
480	>	try {
481		assertEquals(x, y);
482	+	} catch (AssertionFailedError t) {
483	+	threadRecordFailure(t);
484	+	throw t;
485		}
486		}
487
488		/**
489	<	* If arguments not equal, set status to indicate current testcase
490	<	* should fail
489	>	* Just like assertEquals(x, y), but additionally recording (using
490	>	* threadRecordFailure) any AssertionFailedError thrown, so that
491	>	* the current testcase will fail.
492		*/
493		public void threadAssertEquals(Object x, Object y) {
494	<	if (x != y && (x == null || !x.equals(y))) {
292	<	threadFailed = true;
494	>	try {
495		assertEquals(x, y);
496	+	} catch (AssertionFailedError t) {
497	+	threadRecordFailure(t);
498	+	throw t;
499	+	} catch (Throwable t) {
500	+	threadUnexpectedException(t);
501	+	}
502	+	}
503	+
504	+	/**
505	+	* Just like assertSame(x, y), but additionally recording (using
506	+	* threadRecordFailure) any AssertionFailedError thrown, so that
507	+	* the current testcase will fail.
508	+	*/
509	+	public void threadAssertSame(Object x, Object y) {
510	+	try {
511	+	assertSame(x, y);
512	+	} catch (AssertionFailedError t) {
513	+	threadRecordFailure(t);
514	+	throw t;
515		}
516		}
517
518		/**
519	<	* threadFail with message "should throw exception"
519	>	* Calls threadFail with message "should throw exception".
520		*/
521		public void threadShouldThrow() {
522	<	threadFailed = true;
302	<	fail("should throw exception");
522	>	threadFail("should throw exception");
523		}
524
525		/**
526	<	* threadFail with message "should throw" + exceptionName
526	>	* Calls threadFail with message "should throw" + exceptionName.
527		*/
528		public void threadShouldThrow(String exceptionName) {
529	<	threadFailed = true;
310	<	fail("should throw " + exceptionName);
529	>	threadFail("should throw " + exceptionName);
530		}
531
532		/**
533	<	* threadFail with message "Unexpected exception"
533	>	* Records the given exception using {@link #threadRecordFailure},
534	>	* then rethrows the exception, wrapping it in an
535	>	* AssertionFailedError if necessary.
536		*/
537	<	public void threadUnexpectedException() {
538	<	threadFailed = true;
539	<	fail("Unexpected exception");
537	>	public void threadUnexpectedException(Throwable t) {
538	>	threadRecordFailure(t);
539	>	t.printStackTrace();
540	>	if (t instanceof RuntimeException)
541	>	throw (RuntimeException) t;
542	>	else if (t instanceof Error)
543	>	throw (Error) t;
544	>	else {
545	>	AssertionFailedError afe =
546	>	new AssertionFailedError("unexpected exception: " + t);
547	>	afe.initCause(t);
548	>	throw afe;
549	>	}
550		}
551
552		/**
553	<	* threadFail with message "Unexpected exception", with argument
553	>	* Delays, via Thread.sleep, for the given millisecond delay, but
554	>	* if the sleep is shorter than specified, may re-sleep or yield
555	>	* until time elapses.
556		*/
557	<	public void threadUnexpectedException(Throwable ex) {
558	<	threadFailed = true;
559	<	ex.printStackTrace();
560	<	fail("Unexpected exception: " + ex);
557	>	static void delay(long millis) throws InterruptedException {
558	>	long startTime = System.nanoTime();
559	>	long ns = millis * 1000 * 1000;
560	>	for (;;) {
561	>	if (millis > 0L)
562	>	Thread.sleep(millis);
563	>	else // too short to sleep
564	>	Thread.yield();
565	>	long d = ns - (System.nanoTime() - startTime);
566	>	if (d > 0L)
567	>	millis = d / (1000 * 1000);
568	>	else
569	>	break;
570	>	}
571		}
572
573		/**
574	<	* Wait out termination of a thread pool or fail doing so
574	>	* Waits out termination of a thread pool or fails doing so.
575		*/
576	<	public void joinPool(ExecutorService exec) {
576	>	void joinPool(ExecutorService exec) {
577		try {
578		exec.shutdown();
579	<	assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
579	>	assertTrue("ExecutorService did not terminate in a timely manner",
580	>	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
581		} catch (SecurityException ok) {
582		// Allowed in case test doesn't have privs
583		} catch (InterruptedException ie) {
#	Line 341 | Line 585 | public class JSR166TestCase extends Test
585		}
586		}
587
588	+	/**
589	+	* A debugging tool to print all stack traces, as jstack does.
590	+	*/
591	+	static void printAllStackTraces() {
592	+	for (ThreadInfo info :
593	+	ManagementFactory.getThreadMXBean()
594	+	.dumpAllThreads(true, true))
595	+	System.err.print(info);
596	+	}
597
598		/**
599	<	* fail with message "should throw exception"
599	>	* Checks that thread does not terminate within the default
600	>	* millisecond delay of {@code timeoutMillis()}.
601		*/
602	<	public void shouldThrow() {
603	<	fail("Should throw exception");
602	>	void assertThreadStaysAlive(Thread thread) {
603	>	assertThreadStaysAlive(thread, timeoutMillis());
604		}
605
606		/**
607	<	* fail with message "should throw " + exceptionName
607	>	* Checks that thread does not terminate within the given millisecond delay.
608		*/
609	<	public void shouldThrow(String exceptionName) {
610	<	fail("Should throw " + exceptionName);
609	>	void assertThreadStaysAlive(Thread thread, long millis) {
610	>	try {
611	>	// No need to optimize the failing case via Thread.join.
612	>	delay(millis);
613	>	assertTrue(thread.isAlive());
614	>	} catch (InterruptedException ie) {
615	>	fail("Unexpected InterruptedException");
616	>	}
617	>	}
618	>
619	>	/**
620	>	* Checks that the threads do not terminate within the default
621	>	* millisecond delay of {@code timeoutMillis()}.
622	>	*/
623	>	void assertThreadsStayAlive(Thread... threads) {
624	>	assertThreadsStayAlive(timeoutMillis(), threads);
625	>	}
626	>
627	>	/**
628	>	* Checks that the threads do not terminate within the given millisecond delay.
629	>	*/
630	>	void assertThreadsStayAlive(long millis, Thread... threads) {
631	>	try {
632	>	// No need to optimize the failing case via Thread.join.
633	>	delay(millis);
634	>	for (Thread thread : threads)
635	>	assertTrue(thread.isAlive());
636	>	} catch (InterruptedException ie) {
637	>	fail("Unexpected InterruptedException");
638	>	}
639		}
640
641		/**
642	<	* fail with message "Unexpected exception"
642	>	* Checks that future.get times out, with the default timeout of
643	>	* {@code timeoutMillis()}.
644		*/
645	<	public void unexpectedException() {
646	<	fail("Unexpected exception");
645	>	void assertFutureTimesOut(Future future) {
646	>	assertFutureTimesOut(future, timeoutMillis());
647		}
648
649		/**
650	<	* fail with message "Unexpected exception", with argument
650	>	* Checks that future.get times out, with the given millisecond timeout.
651		*/
652	<	public void unexpectedException(Throwable ex) {
653	<	ex.printStackTrace();
654	<	fail("Unexpected exception: " + ex);
652	>	void assertFutureTimesOut(Future future, long timeoutMillis) {
653	>	long startTime = System.nanoTime();
654	>	try {
655	>	future.get(timeoutMillis, MILLISECONDS);
656	>	shouldThrow();
657	>	} catch (TimeoutException success) {
658	>	} catch (Exception e) {
659	>	threadUnexpectedException(e);
660	>	} finally { future.cancel(true); }
661	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
662		}
663
664	+	/**
665	+	* Fails with message "should throw exception".
666	+	*/
667	+	public void shouldThrow() {
668	+	fail("Should throw exception");
669	+	}
670	+
671	+	/**
672	+	* Fails with message "should throw " + exceptionName.
673	+	*/
674	+	public void shouldThrow(String exceptionName) {
675	+	fail("Should throw " + exceptionName);
676	+	}
677
678		/**
679		* The number of elements to place in collections, arrays, etc.
#	Line 409 | Line 712 | public class JSR166TestCase extends Test
712		SecurityManager sm = System.getSecurityManager();
713		if (sm == null) {
714		r.run();
715	+	}
716	+	runWithSecurityManagerWithPermissions(r, permissions);
717	+	}
718	+
719	+	/**
720	+	* Runs Runnable r with a security policy that permits precisely
721	+	* the specified permissions.  If there is no current security
722	+	* manager, a temporary one is set for the duration of the
723	+	* Runnable.  We require that any security manager permit
724	+	* getPolicy/setPolicy.
725	+	*/
726	+	public void runWithSecurityManagerWithPermissions(Runnable r,
727	+	Permission... permissions) {
728	+	SecurityManager sm = System.getSecurityManager();
729	+	if (sm == null) {
730		Policy savedPolicy = Policy.getPolicy();
731		try {
732		Policy.setPolicy(permissivePolicy());
733		System.setSecurityManager(new SecurityManager());
734	<	runWithPermissions(r, permissions);
734	>	runWithSecurityManagerWithPermissions(r, permissions);
735		} finally {
736		System.setSecurityManager(null);
737		Policy.setPolicy(savedPolicy);
#	Line 461 | Line 779 | public class JSR166TestCase extends Test
779		return perms.implies(p);
780		}
781		public void refresh() {}
782	+	public String toString() {
783	+	List<Permission> ps = new ArrayList<Permission>();
784	+	for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
785	+	ps.add(e.nextElement());
786	+	return "AdjustablePolicy with permissions " + ps;
787	+	}
788		}
789
790		/**
#	Line 483 | Line 807 | public class JSR166TestCase extends Test
807		}
808
809		/**
810	<	* Sleep until the timeout has elapsed, or interrupted.
811	<	* Does <em>NOT</em> throw InterruptedException.
810	>	* Sleeps until the given time has elapsed.
811	>	* Throws AssertionFailedError if interrupted.
812		*/
813	<	void sleepTillInterrupted(long timeoutMillis) {
813	>	void sleep(long millis) {
814		try {
815	<	Thread.sleep(timeoutMillis);
816	<	} catch (InterruptedException wakeup) {}
815	>	delay(millis);
816	>	} catch (InterruptedException ie) {
817	>	AssertionFailedError afe =
818	>	new AssertionFailedError("Unexpected InterruptedException");
819	>	afe.initCause(ie);
820	>	throw afe;
821	>	}
822	>	}
823	>
824	>	/**
825	>	* Spin-waits up to the specified number of milliseconds for the given
826	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
827	>	*/
828	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
829	>	long startTime = System.nanoTime();
830	>	for (;;) {
831	>	Thread.State s = thread.getState();
832	>	if (s == Thread.State.BLOCKED ||
833	>	s == Thread.State.WAITING ||
834	>	s == Thread.State.TIMED_WAITING)
835	>	return;
836	>	else if (s == Thread.State.TERMINATED)
837	>	fail("Unexpected thread termination");
838	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
839	>	threadAssertTrue(thread.isAlive());
840	>	return;
841	>	}
842	>	Thread.yield();
843	>	}
844	>	}
845	>
846	>	/**
847	>	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
848	>	* state: BLOCKED, WAITING, or TIMED_WAITING.
849	>	*/
850	>	void waitForThreadToEnterWaitState(Thread thread) {
851	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
852	>	}
853	>
854	>	/**
855	>	* Returns the number of milliseconds since time given by
856	>	* startNanoTime, which must have been previously returned from a
857	>	* call to {@link System.nanoTime()}.
858	>	*/
859	>	long millisElapsedSince(long startNanoTime) {
860	>	return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
861		}
862
863		/**
864	<	* Returns a new started Thread running the given runnable.
864	>	* Returns a new started daemon Thread running the given runnable.
865		*/
866		Thread newStartedThread(Runnable runnable) {
867		Thread t = new Thread(runnable);
868	+	t.setDaemon(true);
869		t.start();
870		return t;
871		}
872
873	+	/**
874	+	* Waits for the specified time (in milliseconds) for the thread
875	+	* to terminate (using {@link Thread#join(long)}), else interrupts
876	+	* the thread (in the hope that it may terminate later) and fails.
877	+	*/
878	+	void awaitTermination(Thread t, long timeoutMillis) {
879	+	try {
880	+	t.join(timeoutMillis);
881	+	} catch (InterruptedException ie) {
882	+	threadUnexpectedException(ie);
883	+	} finally {
884	+	if (t.getState() != Thread.State.TERMINATED) {
885	+	t.interrupt();
886	+	fail("Test timed out");
887	+	}
888	+	}
889	+	}
890	+
891	+	/**
892	+	* Waits for LONG_DELAY_MS milliseconds for the thread to
893	+	* terminate (using {@link Thread#join(long)}), else interrupts
894	+	* the thread (in the hope that it may terminate later) and fails.
895	+	*/
896	+	void awaitTermination(Thread t) {
897	+	awaitTermination(t, LONG_DELAY_MS);
898	+	}
899	+
900		// Some convenient Runnable classes
901
902		public abstract class CheckedRunnable implements Runnable {
#	Line 563 | Line 959 | public class JSR166TestCase extends Test
959		realRun();
960		threadShouldThrow("InterruptedException");
961		} catch (InterruptedException success) {
962	+	threadAssertFalse(Thread.interrupted());
963		} catch (Throwable t) {
964		threadUnexpectedException(t);
965		}
#	Line 577 | Line 974 | public class JSR166TestCase extends Test
974		return realCall();
975		} catch (Throwable t) {
976		threadUnexpectedException(t);
977	+	return null;
978		}
581	–	return null;
979		}
980		}
981
982	<	public abstract class CheckedInterruptedCallable<T> implements Callable<T> {
982	>	public abstract class CheckedInterruptedCallable<T>
983	>	implements Callable<T> {
984		protected abstract T realCall() throws Throwable;
985
986		public final T call() {
#	Line 591 | Line 989 | public class JSR166TestCase extends Test
989		threadShouldThrow("InterruptedException");
990		return result;
991		} catch (InterruptedException success) {
992	+	threadAssertFalse(Thread.interrupted());
993		} catch (Throwable t) {
994		threadUnexpectedException(t);
995		}
#	Line 614 | Line 1013 | public class JSR166TestCase extends Test
1013
1014		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
1015		return new CheckedCallable<String>() {
1016	<	public String realCall() {
1016	>	protected String realCall() {
1017		try {
1018		latch.await();
1019		} catch (InterruptedException quittingTime) {}
#	Line 622 | Line 1021 | public class JSR166TestCase extends Test
1021		}};
1022		}
1023
1024	+	public Runnable awaiter(final CountDownLatch latch) {
1025	+	return new CheckedRunnable() {
1026	+	public void realRun() throws InterruptedException {
1027	+	await(latch);
1028	+	}};
1029	+	}
1030	+
1031	+	public void await(CountDownLatch latch) {
1032	+	try {
1033	+	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1034	+	} catch (Throwable t) {
1035	+	threadUnexpectedException(t);
1036	+	}
1037	+	}
1038	+
1039	+	public void await(Semaphore semaphore) {
1040	+	try {
1041	+	assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1042	+	} catch (Throwable t) {
1043	+	threadUnexpectedException(t);
1044	+	}
1045	+	}
1046	+
1047	+	//     /**
1048	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1049	+	//      */
1050	+	//     public void await(AtomicBoolean flag) {
1051	+	//         await(flag, LONG_DELAY_MS);
1052	+	//     }
1053	+
1054	+	//     /**
1055	+	//      * Spin-waits up to the specified timeout until flag becomes true.
1056	+	//      */
1057	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
1058	+	//         long startTime = System.nanoTime();
1059	+	//         while (!flag.get()) {
1060	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
1061	+	//                 throw new AssertionFailedError("timed out");
1062	+	//             Thread.yield();
1063	+	//         }
1064	+	//     }
1065	+
1066		public static class NPETask implements Callable<String> {
1067		public String call() { throw new NullPointerException(); }
1068		}
#	Line 632 | Line 1073 | public class JSR166TestCase extends Test
1073
1074		public class ShortRunnable extends CheckedRunnable {
1075		protected void realRun() throws Throwable {
1076	<	Thread.sleep(SHORT_DELAY_MS);
1076	>	delay(SHORT_DELAY_MS);
1077		}
1078		}
1079
1080		public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1081		protected void realRun() throws InterruptedException {
1082	<	Thread.sleep(SHORT_DELAY_MS);
1082	>	delay(SHORT_DELAY_MS);
1083		}
1084		}
1085
1086		public class SmallRunnable extends CheckedRunnable {
1087		protected void realRun() throws Throwable {
1088	<	Thread.sleep(SMALL_DELAY_MS);
1088	>	delay(SMALL_DELAY_MS);
1089		}
1090		}
1091
1092		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1093		protected void realRun() {
1094		try {
1095	<	Thread.sleep(SMALL_DELAY_MS);
1095	>	delay(SMALL_DELAY_MS);
1096		} catch (InterruptedException ok) {}
1097		}
1098		}
1099
1100		public class SmallCallable extends CheckedCallable {
1101		protected Object realCall() throws InterruptedException {
1102	<	Thread.sleep(SMALL_DELAY_MS);
1102	>	delay(SMALL_DELAY_MS);
1103		return Boolean.TRUE;
1104		}
1105		}
1106
666	–	public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
667	–	protected void realRun() throws InterruptedException {
668	–	Thread.sleep(SMALL_DELAY_MS);
669	–	}
670	–	}
671	–
1107		public class MediumRunnable extends CheckedRunnable {
1108		protected void realRun() throws Throwable {
1109	<	Thread.sleep(MEDIUM_DELAY_MS);
1109	>	delay(MEDIUM_DELAY_MS);
1110		}
1111		}
1112
1113		public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1114		protected void realRun() throws InterruptedException {
1115	<	Thread.sleep(MEDIUM_DELAY_MS);
1115	>	delay(MEDIUM_DELAY_MS);
1116		}
1117		}
1118
1119	+	public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1120	+	return new CheckedRunnable() {
1121	+	protected void realRun() {
1122	+	try {
1123	+	delay(timeoutMillis);
1124	+	} catch (InterruptedException ok) {}
1125	+	}};
1126	+	}
1127	+
1128		public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1129		protected void realRun() {
1130		try {
1131	<	Thread.sleep(MEDIUM_DELAY_MS);
1131	>	delay(MEDIUM_DELAY_MS);
1132		} catch (InterruptedException ok) {}
1133		}
1134		}
#	Line 692 | Line 1136 | public class JSR166TestCase extends Test
1136		public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1137		protected void realRun() {
1138		try {
1139	<	Thread.sleep(LONG_DELAY_MS);
1139	>	delay(LONG_DELAY_MS);
1140		} catch (InterruptedException ok) {}
1141		}
1142		}
#	Line 706 | Line 1150 | public class JSR166TestCase extends Test
1150		}
1151		}
1152
1153	+	public interface TrackedRunnable extends Runnable {
1154	+	boolean isDone();
1155	+	}
1156	+
1157	+	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1158	+	return new TrackedRunnable() {
1159	+	private volatile boolean done = false;
1160	+	public boolean isDone() { return done; }
1161	+	public void run() {
1162	+	try {
1163	+	delay(timeoutMillis);
1164	+	done = true;
1165	+	} catch (InterruptedException ok) {}
1166	+	}
1167	+	};
1168	+	}
1169	+
1170		public static class TrackedShortRunnable implements Runnable {
1171		public volatile boolean done = false;
1172		public void run() {
1173		try {
1174	<	Thread.sleep(SMALL_DELAY_MS);
1174	>	delay(SHORT_DELAY_MS);
1175	>	done = true;
1176	>	} catch (InterruptedException ok) {}
1177	>	}
1178	>	}
1179	>
1180	>	public static class TrackedSmallRunnable implements Runnable {
1181	>	public volatile boolean done = false;
1182	>	public void run() {
1183	>	try {
1184	>	delay(SMALL_DELAY_MS);
1185		done = true;
1186		} catch (InterruptedException ok) {}
1187		}
#	Line 720 | Line 1191 | public class JSR166TestCase extends Test
1191		public volatile boolean done = false;
1192		public void run() {
1193		try {
1194	<	Thread.sleep(MEDIUM_DELAY_MS);
1194	>	delay(MEDIUM_DELAY_MS);
1195		done = true;
1196		} catch (InterruptedException ok) {}
1197		}
#	Line 730 | Line 1201 | public class JSR166TestCase extends Test
1201		public volatile boolean done = false;
1202		public void run() {
1203		try {
1204	<	Thread.sleep(LONG_DELAY_MS);
1204	>	delay(LONG_DELAY_MS);
1205		done = true;
1206		} catch (InterruptedException ok) {}
1207		}
#	Line 747 | Line 1218 | public class JSR166TestCase extends Test
1218		public volatile boolean done = false;
1219		public Object call() {
1220		try {
1221	<	Thread.sleep(SMALL_DELAY_MS);
1221	>	delay(SMALL_DELAY_MS);
1222		done = true;
1223		} catch (InterruptedException ok) {}
1224		return Boolean.TRUE;
1225		}
1226		}
1227
1228	+	/**
1229	+	* Analog of CheckedRunnable for RecursiveAction
1230	+	*/
1231	+	public abstract class CheckedRecursiveAction extends RecursiveAction {
1232	+	protected abstract void realCompute() throws Throwable;
1233	+
1234	+	public final void compute() {
1235	+	try {
1236	+	realCompute();
1237	+	} catch (Throwable t) {
1238	+	threadUnexpectedException(t);
1239	+	}
1240	+	}
1241	+	}
1242	+
1243	+	/**
1244	+	* Analog of CheckedCallable for RecursiveTask
1245	+	*/
1246	+	public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1247	+	protected abstract T realCompute() throws Throwable;
1248	+
1249	+	public final T compute() {
1250	+	try {
1251	+	return realCompute();
1252	+	} catch (Throwable t) {
1253	+	threadUnexpectedException(t);
1254	+	return null;
1255	+	}
1256	+	}
1257	+	}
1258
1259		/**
1260		* For use as RejectedExecutionHandler in constructors
#	Line 763 | Line 1264 | public class JSR166TestCase extends Test
1264		ThreadPoolExecutor executor) {}
1265		}
1266
1267	+	/**
1268	+	* A CyclicBarrier that uses timed await and fails with
1269	+	* AssertionFailedErrors instead of throwing checked exceptions.
1270	+	*/
1271	+	public class CheckedBarrier extends CyclicBarrier {
1272	+	public CheckedBarrier(int parties) { super(parties); }
1273	+
1274	+	public int await() {
1275	+	try {
1276	+	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1277	+	} catch (TimeoutException e) {
1278	+	throw new AssertionFailedError("timed out");
1279	+	} catch (Exception e) {
1280	+	AssertionFailedError afe =
1281	+	new AssertionFailedError("Unexpected exception: " + e);
1282	+	afe.initCause(e);
1283	+	throw afe;
1284	+	}
1285	+	}
1286	+	}
1287	+
1288	+	void checkEmpty(BlockingQueue q) {
1289	+	try {
1290	+	assertTrue(q.isEmpty());
1291	+	assertEquals(0, q.size());
1292	+	assertNull(q.peek());
1293	+	assertNull(q.poll());
1294	+	assertNull(q.poll(0, MILLISECONDS));
1295	+	assertEquals(q.toString(), "[]");
1296	+	assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1297	+	assertFalse(q.iterator().hasNext());
1298	+	try {
1299	+	q.element();
1300	+	shouldThrow();
1301	+	} catch (NoSuchElementException success) {}
1302	+	try {
1303	+	q.iterator().next();
1304	+	shouldThrow();
1305	+	} catch (NoSuchElementException success) {}
1306	+	try {
1307	+	q.remove();
1308	+	shouldThrow();
1309	+	} catch (NoSuchElementException success) {}
1310	+	} catch (InterruptedException ie) {
1311	+	threadUnexpectedException(ie);
1312	+	}
1313	+	}
1314	+
1315	+	void assertSerialEquals(Object x, Object y) {
1316	+	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1317	+	}
1318	+
1319	+	void assertNotSerialEquals(Object x, Object y) {
1320	+	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1321	+	}
1322	+
1323	+	byte[] serialBytes(Object o) {
1324	+	try {
1325	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1326	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1327	+	oos.writeObject(o);
1328	+	oos.flush();
1329	+	oos.close();
1330	+	return bos.toByteArray();
1331	+	} catch (Throwable t) {
1332	+	threadUnexpectedException(t);
1333	+	return new byte[0];
1334	+	}
1335	+	}
1336	+
1337	+	@SuppressWarnings("unchecked")
1338	+	<T> T serialClone(T o) {
1339	+	try {
1340	+	ObjectInputStream ois = new ObjectInputStream
1341	+	(new ByteArrayInputStream(serialBytes(o)));
1342	+	T clone = (T) ois.readObject();
1343	+	assertSame(o.getClass(), clone.getClass());
1344	+	return clone;
1345	+	} catch (Throwable t) {
1346	+	threadUnexpectedException(t);
1347	+	return null;
1348	+	}
1349	+	}
1350		}

Diff Legend

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