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.49 by jsr166, Tue Jan 5 02:08:37 2010 UTC vs.
Revision 1.71 by jsr166, Mon Nov 22 06:53:32 2010 UTC

#	Line 7 | Line 7
7		*/
8
9		import junit.framework.*;
10	<	import java.util.*;
10	>	import java.util.PropertyPermission;
11		import java.util.concurrent.*;
12	+	import java.util.concurrent.atomic.AtomicReference;
13		import static java.util.concurrent.TimeUnit.MILLISECONDS;
14	<	import java.io.*;
15	<	import java.security.*;
14	>	import static java.util.concurrent.TimeUnit.NANOSECONDS;
15	>	import java.security.CodeSource;
16	>	import java.security.Permission;
17	>	import java.security.PermissionCollection;
18	>	import java.security.Permissions;
19	>	import java.security.Policy;
20	>	import java.security.ProtectionDomain;
21	>	import java.security.SecurityPermission;
22
23		/**
24		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 26 | Line 33 | import java.security.*;
33		* <li> All assertions in code running in generated threads must use
34		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
35		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
36	<	* <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
36	>	* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
37		* particularly recommended) for other code to use these forms too.
38		* Only the most typically used JUnit assertion methods are defined
39		* this way, but enough to live with.</li>
40		*
41		* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
42	<	* to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
42	>	* to invoke {@code super.setUp} and {@code super.tearDown} within
43		* them. These methods are used to clear and check for thread
44		* assertion failures.</li>
45		*
46	<	* <li>All delays and timeouts must use one of the constants <tt>
47	<	* SHORT_DELAY_MS</tt>, <tt> SMALL_DELAY_MS</tt>, <tt> MEDIUM_DELAY_MS</tt>,
48	<	* <tt> LONG_DELAY_MS</tt>. The idea here is that a SHORT is always
46	>	* <li>All delays and timeouts must use one of the constants {@code
47	>	* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
48	>	* {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
49		* discriminable from zero time, and always allows enough time for the
50		* small amounts of computation (creating a thread, calling a few
51		* methods, etc) needed to reach a timeout point. Similarly, a SMALL
#	Line 48 | Line 55 | import java.security.*;
55		* in one spot to rerun tests on slower platforms.</li>
56		*
57		* <li> All threads generated must be joined inside each test case
58	<	* method (or <tt>fail</tt> to do so) before returning from the
59	<	* method. The <tt> joinPool</tt> method can be used to do this when
58	>	* method (or {@code fail} to do so) before returning from the
59	>	* method. The {@code joinPool} method can be used to do this when
60		* using Executors.</li>
61		*
62		* </ol>
#	Line 81 | Line 88 | import java.security.*;
88		* any particular package to simplify things for people integrating
89		* them in TCK test suites.</li>
90		*
91	<	* <li> As a convenience, the <tt>main</tt> of this class (JSR166TestCase)
91	>	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
92		* runs all JSR166 unit tests.</li>
93		*
94		* </ul>
#	Line 90 | Line 97 | public class JSR166TestCase extends Test
97		private static final boolean useSecurityManager =
98		Boolean.getBoolean("jsr166.useSecurityManager");
99
100	+	protected static final boolean expensiveTests =
101	+	Boolean.getBoolean("jsr166.expensiveTests");
102	+
103	+	/**
104	+	* If true, report on stdout all "slow" tests, that is, ones that
105	+	* take more than profileThreshold milliseconds to execute.
106	+	*/
107	+	private static final boolean profileTests =
108	+	Boolean.getBoolean("jsr166.profileTests");
109	+
110	+	/**
111	+	* The number of milliseconds that tests are permitted for
112	+	* execution without being reported, when profileTests is set.
113	+	*/
114	+	private static final long profileThreshold =
115	+	Long.getLong("jsr166.profileThreshold", 100);
116	+
117	+	protected void runTest() throws Throwable {
118	+	if (profileTests)
119	+	runTestProfiled();
120	+	else
121	+	super.runTest();
122	+	}
123	+
124	+	protected void runTestProfiled() throws Throwable {
125	+	long t0 = System.nanoTime();
126	+	try {
127	+	super.runTest();
128	+	} finally {
129	+	long elapsedMillis =
130	+	(System.nanoTime() - t0) / (1000L * 1000L);
131	+	if (elapsedMillis >= profileThreshold)
132	+	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
133	+	}
134	+	}
135	+
136		/**
137		* Runs all JSR166 unit tests using junit.textui.TestRunner
138		*/
#	Line 99 | Line 142 | public class JSR166TestCase extends Test
142		Policy.setPolicy(permissivePolicy());
143		System.setSecurityManager(new SecurityManager());
144		}
145	<	int iters = 1;
146	<	if (args.length > 0)
104	<	iters = Integer.parseInt(args[0]);
145	>	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
146	>
147		Test s = suite();
148		for (int i = 0; i < iters; ++i) {
149		junit.textui.TestRunner.run(s);
#	Line 111 | Line 153 | public class JSR166TestCase extends Test
153		System.exit(0);
154		}
155
156	+	public static TestSuite newTestSuite(Object... suiteOrClasses) {
157	+	TestSuite suite = new TestSuite();
158	+	for (Object suiteOrClass : suiteOrClasses) {
159	+	if (suiteOrClass instanceof TestSuite)
160	+	suite.addTest((TestSuite) suiteOrClass);
161	+	else if (suiteOrClass instanceof Class)
162	+	suite.addTest(new TestSuite((Class<?>) suiteOrClass));
163	+	else
164	+	throw new ClassCastException("not a test suite or class");
165	+	}
166	+	return suite;
167	+	}
168	+
169		/**
170	<	* Collects all JSR166 unit tests as one suite
170	>	* Collects all JSR166 unit tests as one suite.
171		*/
172		public static Test suite() {
173	<	TestSuite suite = new TestSuite("JSR166 Unit Tests");
174	<
175	<	suite.addTest(new TestSuite(ForkJoinPoolTest.class));
176	<	suite.addTest(new TestSuite(ForkJoinTaskTest.class));
177	<	suite.addTest(new TestSuite(RecursiveActionTest.class));
178	<	suite.addTest(new TestSuite(RecursiveTaskTest.class));
179	<	suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
180	<	suite.addTest(new TestSuite(PhaserTest.class));
181	<	suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
182	<	suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
183	<	suite.addTest(new TestSuite(AbstractQueueTest.class));
184	<	suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
185	<	suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
186	<	suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
187	<	suite.addTest(new TestSuite(ArrayDequeTest.class));
188	<	suite.addTest(new TestSuite(AtomicBooleanTest.class));
189	<	suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
190	<	suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
191	<	suite.addTest(new TestSuite(AtomicIntegerTest.class));
192	<	suite.addTest(new TestSuite(AtomicLongArrayTest.class));
193	<	suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
194	<	suite.addTest(new TestSuite(AtomicLongTest.class));
195	<	suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
196	<	suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
197	<	suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
198	<	suite.addTest(new TestSuite(AtomicReferenceTest.class));
199	<	suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
200	<	suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
201	<	suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
202	<	suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
203	<	suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
204	<	suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
205	<	suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
206	<	suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
207	<	suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
208	<	suite.addTest(new TestSuite(CountDownLatchTest.class));
209	<	suite.addTest(new TestSuite(CyclicBarrierTest.class));
210	<	suite.addTest(new TestSuite(DelayQueueTest.class));
211	<	suite.addTest(new TestSuite(EntryTest.class));
212	<	suite.addTest(new TestSuite(ExchangerTest.class));
213	<	suite.addTest(new TestSuite(ExecutorsTest.class));
214	<	suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
215	<	suite.addTest(new TestSuite(FutureTaskTest.class));
216	<	suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
217	<	suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
218	<	suite.addTest(new TestSuite(LinkedListTest.class));
219	<	suite.addTest(new TestSuite(LockSupportTest.class));
220	<	suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
221	<	suite.addTest(new TestSuite(PriorityQueueTest.class));
222	<	suite.addTest(new TestSuite(ReentrantLockTest.class));
223	<	suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
224	<	suite.addTest(new TestSuite(ScheduledExecutorTest.class));
225	<	suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
226	<	suite.addTest(new TestSuite(SemaphoreTest.class));
227	<	suite.addTest(new TestSuite(SynchronousQueueTest.class));
228	<	suite.addTest(new TestSuite(SystemTest.class));
229	<	suite.addTest(new TestSuite(ThreadLocalTest.class));
230	<	suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
231	<	suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
232	<	suite.addTest(new TestSuite(ThreadTest.class));
233	<	suite.addTest(new TestSuite(TimeUnitTest.class));
234	<	suite.addTest(new TestSuite(TreeMapTest.class));
235	<	suite.addTest(new TestSuite(TreeSetTest.class));
236	<	suite.addTest(new TestSuite(TreeSubMapTest.class));
237	<	suite.addTest(new TestSuite(TreeSubSetTest.class));
183	<
184	<	return suite;
173	>	return newTestSuite(
174	>	ForkJoinPoolTest.suite(),
175	>	ForkJoinTaskTest.suite(),
176	>	RecursiveActionTest.suite(),
177	>	RecursiveTaskTest.suite(),
178	>	LinkedTransferQueueTest.suite(),
179	>	PhaserTest.suite(),
180	>	ThreadLocalRandomTest.suite(),
181	>	AbstractExecutorServiceTest.suite(),
182	>	AbstractQueueTest.suite(),
183	>	AbstractQueuedSynchronizerTest.suite(),
184	>	AbstractQueuedLongSynchronizerTest.suite(),
185	>	ArrayBlockingQueueTest.suite(),
186	>	ArrayDequeTest.suite(),
187	>	AtomicBooleanTest.suite(),
188	>	AtomicIntegerArrayTest.suite(),
189	>	AtomicIntegerFieldUpdaterTest.suite(),
190	>	AtomicIntegerTest.suite(),
191	>	AtomicLongArrayTest.suite(),
192	>	AtomicLongFieldUpdaterTest.suite(),
193	>	AtomicLongTest.suite(),
194	>	AtomicMarkableReferenceTest.suite(),
195	>	AtomicReferenceArrayTest.suite(),
196	>	AtomicReferenceFieldUpdaterTest.suite(),
197	>	AtomicReferenceTest.suite(),
198	>	AtomicStampedReferenceTest.suite(),
199	>	ConcurrentHashMapTest.suite(),
200	>	ConcurrentLinkedDequeTest.suite(),
201	>	ConcurrentLinkedQueueTest.suite(),
202	>	ConcurrentSkipListMapTest.suite(),
203	>	ConcurrentSkipListSubMapTest.suite(),
204	>	ConcurrentSkipListSetTest.suite(),
205	>	ConcurrentSkipListSubSetTest.suite(),
206	>	CopyOnWriteArrayListTest.suite(),
207	>	CopyOnWriteArraySetTest.suite(),
208	>	CountDownLatchTest.suite(),
209	>	CyclicBarrierTest.suite(),
210	>	DelayQueueTest.suite(),
211	>	EntryTest.suite(),
212	>	ExchangerTest.suite(),
213	>	ExecutorsTest.suite(),
214	>	ExecutorCompletionServiceTest.suite(),
215	>	FutureTaskTest.suite(),
216	>	LinkedBlockingDequeTest.suite(),
217	>	LinkedBlockingQueueTest.suite(),
218	>	LinkedListTest.suite(),
219	>	LockSupportTest.suite(),
220	>	PriorityBlockingQueueTest.suite(),
221	>	PriorityQueueTest.suite(),
222	>	ReentrantLockTest.suite(),
223	>	ReentrantReadWriteLockTest.suite(),
224	>	ScheduledExecutorTest.suite(),
225	>	ScheduledExecutorSubclassTest.suite(),
226	>	SemaphoreTest.suite(),
227	>	SynchronousQueueTest.suite(),
228	>	SystemTest.suite(),
229	>	ThreadLocalTest.suite(),
230	>	ThreadPoolExecutorTest.suite(),
231	>	ThreadPoolExecutorSubclassTest.suite(),
232	>	ThreadTest.suite(),
233	>	TimeUnitTest.suite(),
234	>	TreeMapTest.suite(),
235	>	TreeSetTest.suite(),
236	>	TreeSubMapTest.suite(),
237	>	TreeSubSetTest.suite());
238		}
239
240
#	Line 205 | Line 258 | public class JSR166TestCase extends Test
258		*/
259		protected void setDelays() {
260		SHORT_DELAY_MS = getShortDelay();
261	<	SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
261	>	SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
262		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
263	<	LONG_DELAY_MS = SHORT_DELAY_MS * 50;
263	>	LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
264		}
265
266		/**
267	<	* Flag set true if any threadAssert methods fail
267	>	* The first exception encountered if any threadAssertXXX method fails.
268		*/
269	<	volatile boolean threadFailed;
269	>	private final AtomicReference<Throwable> threadFailure
270	>	= new AtomicReference<Throwable>(null);
271
272		/**
273	<	* Initializes test to indicate that no thread assertions have failed
273	>	* Records an exception so that it can be rethrown later in the test
274	>	* harness thread, triggering a test case failure.  Only the first
275	>	* failure is recorded; subsequent calls to this method from within
276	>	* the same test have no effect.
277		*/
278	+	public void threadRecordFailure(Throwable t) {
279	+	threadFailure.compareAndSet(null, t);
280	+	}
281	+
282		public void setUp() {
283		setDelays();
223	–	threadFailed = false;
284		}
285
286		/**
287	<	* Triggers test case failure if any thread assertions have failed
288	<	*/
289	<	public void tearDown() {
290	<	assertFalse(threadFailed);
287	>	* Triggers test case failure if any thread assertions have failed,
288	>	* by rethrowing, in the test harness thread, any exception recorded
289	>	* earlier by threadRecordFailure.
290	>	*/
291	>	public void tearDown() throws Exception {
292	>	Throwable t = threadFailure.getAndSet(null);
293	>	if (t != null) {
294	>	if (t instanceof Error)
295	>	throw (Error) t;
296	>	else if (t instanceof RuntimeException)
297	>	throw (RuntimeException) t;
298	>	else if (t instanceof Exception)
299	>	throw (Exception) t;
300	>	else {
301	>	AssertionFailedError afe =
302	>	new AssertionFailedError(t.toString());
303	>	afe.initCause(t);
304	>	throw afe;
305	>	}
306	>	}
307		}
308
309		/**
310	<	* Fail, also setting status to indicate current testcase should fail
310	>	* Just like fail(reason), but additionally recording (using
311	>	* threadRecordFailure) any AssertionFailedError thrown, so that
312	>	* the current testcase will fail.
313		*/
314		public void threadFail(String reason) {
315	<	threadFailed = true;
316	<	fail(reason);
315	>	try {
316	>	fail(reason);
317	>	} catch (AssertionFailedError t) {
318	>	threadRecordFailure(t);
319	>	fail(reason);
320	>	}
321		}
322
323		/**
324	<	* If expression not true, set status to indicate current testcase
325	<	* should fail
324	>	* Just like assertTrue(b), but additionally recording (using
325	>	* threadRecordFailure) any AssertionFailedError thrown, so that
326	>	* the current testcase will fail.
327		*/
328		public void threadAssertTrue(boolean b) {
329	<	if (!b) {
247	<	threadFailed = true;
329	>	try {
330		assertTrue(b);
331	+	} catch (AssertionFailedError t) {
332	+	threadRecordFailure(t);
333	+	throw t;
334		}
335		}
336
337		/**
338	<	* If expression not false, set status to indicate current testcase
339	<	* should fail
338	>	* Just like assertFalse(b), but additionally recording (using
339	>	* threadRecordFailure) any AssertionFailedError thrown, so that
340	>	* the current testcase will fail.
341		*/
342		public void threadAssertFalse(boolean b) {
343	<	if (b) {
258	<	threadFailed = true;
343	>	try {
344		assertFalse(b);
345	+	} catch (AssertionFailedError t) {
346	+	threadRecordFailure(t);
347	+	throw t;
348		}
349		}
350
351		/**
352	<	* If argument not null, set status to indicate current testcase
353	<	* should fail
352	>	* Just like assertNull(x), but additionally recording (using
353	>	* threadRecordFailure) any AssertionFailedError thrown, so that
354	>	* the current testcase will fail.
355		*/
356		public void threadAssertNull(Object x) {
357	<	if (x != null) {
269	<	threadFailed = true;
357	>	try {
358		assertNull(x);
359	+	} catch (AssertionFailedError t) {
360	+	threadRecordFailure(t);
361	+	throw t;
362		}
363		}
364
365		/**
366	<	* If arguments not equal, set status to indicate current testcase
367	<	* should fail
366	>	* Just like assertEquals(x, y), but additionally recording (using
367	>	* threadRecordFailure) any AssertionFailedError thrown, so that
368	>	* the current testcase will fail.
369		*/
370		public void threadAssertEquals(long x, long y) {
371	<	if (x != y) {
280	<	threadFailed = true;
371	>	try {
372		assertEquals(x, y);
373	+	} catch (AssertionFailedError t) {
374	+	threadRecordFailure(t);
375	+	throw t;
376		}
377		}
378
379		/**
380	<	* If arguments not equal, set status to indicate current testcase
381	<	* should fail
380	>	* Just like assertEquals(x, y), but additionally recording (using
381	>	* threadRecordFailure) any AssertionFailedError thrown, so that
382	>	* the current testcase will fail.
383		*/
384		public void threadAssertEquals(Object x, Object y) {
385	<	if (x != y && (x == null || !x.equals(y))) {
291	<	threadFailed = true;
385	>	try {
386		assertEquals(x, y);
387	+	} catch (AssertionFailedError t) {
388	+	threadRecordFailure(t);
389	+	throw t;
390	+	} catch (Throwable t) {
391	+	threadUnexpectedException(t);
392		}
393		}
394
395		/**
396	<	* threadFail with message "should throw exception"
396	>	* Just like assertSame(x, y), but additionally recording (using
397	>	* threadRecordFailure) any AssertionFailedError thrown, so that
398	>	* the current testcase will fail.
399		*/
400	<	public void threadShouldThrow() {
401	<	threadFailed = true;
402	<	fail("should throw exception");
400	>	public void threadAssertSame(Object x, Object y) {
401	>	try {
402	>	assertSame(x, y);
403	>	} catch (AssertionFailedError t) {
404	>	threadRecordFailure(t);
405	>	throw t;
406	>	}
407		}
408
409		/**
410	<	* threadFail with message "should throw" + exceptionName
410	>	* Calls threadFail with message "should throw exception".
411		*/
412	<	public void threadShouldThrow(String exceptionName) {
413	<	threadFailed = true;
309	<	fail("should throw " + exceptionName);
412	>	public void threadShouldThrow() {
413	>	threadFail("should throw exception");
414		}
415
416		/**
417	<	* threadFail with message "Unexpected exception"
417	>	* Calls threadFail with message "should throw" + exceptionName.
418		*/
419	<	public void threadUnexpectedException() {
420	<	threadFailed = true;
317	<	fail("Unexpected exception");
419	>	public void threadShouldThrow(String exceptionName) {
420	>	threadFail("should throw " + exceptionName);
421		}
422
423		/**
424	<	* threadFail with message "Unexpected exception", with argument
424	>	* Records the given exception using {@link #threadRecordFailure},
425	>	* then rethrows the exception, wrapping it in an
426	>	* AssertionFailedError if necessary.
427		*/
428	<	public void threadUnexpectedException(Throwable ex) {
429	<	threadFailed = true;
430	<	ex.printStackTrace();
431	<	fail("Unexpected exception: " + ex);
428	>	public void threadUnexpectedException(Throwable t) {
429	>	threadRecordFailure(t);
430	>	t.printStackTrace();
431	>	if (t instanceof RuntimeException)
432	>	throw (RuntimeException) t;
433	>	else if (t instanceof Error)
434	>	throw (Error) t;
435	>	else {
436	>	AssertionFailedError afe =
437	>	new AssertionFailedError("unexpected exception: " + t);
438	>	t.initCause(t);
439	>	throw afe;
440	>	}
441		}
442
443		/**
444	<	* Wait out termination of a thread pool or fail doing so
444	>	* Waits out termination of a thread pool or fails doing so.
445		*/
446		public void joinPool(ExecutorService exec) {
447		try {
448		exec.shutdown();
449	<	assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
449	>	assertTrue("ExecutorService did not terminate in a timely manner",
450	>	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
451		} catch (SecurityException ok) {
452		// Allowed in case test doesn't have privs
453		} catch (InterruptedException ie) {
#	Line 342 | Line 457 | public class JSR166TestCase extends Test
457
458
459		/**
460	<	* fail with message "should throw exception"
460	>	* Fails with message "should throw exception".
461		*/
462		public void shouldThrow() {
463		fail("Should throw exception");
464		}
465
466		/**
467	<	* fail with message "should throw " + exceptionName
467	>	* Fails with message "should throw " + exceptionName.
468		*/
469		public void shouldThrow(String exceptionName) {
470		fail("Should throw " + exceptionName);
471		}
472
473		/**
359	–	* fail with message "Unexpected exception"
360	–	*/
361	–	public void unexpectedException() {
362	–	fail("Unexpected exception");
363	–	}
364	–
365	–	/**
366	–	* fail with message "Unexpected exception", with argument
367	–	*/
368	–	public void unexpectedException(Throwable ex) {
369	–	ex.printStackTrace();
370	–	fail("Unexpected exception: " + ex);
371	–	}
372	–
373	–
374	–	/**
474		* The number of elements to place in collections, arrays, etc.
475		*/
476		public static final int SIZE = 20;
#	Line 482 | Line 581 | public class JSR166TestCase extends Test
581		}
582
583		/**
584	<	* Sleep until the timeout has elapsed, or interrupted.
584	>	* Sleeps until the given time has elapsed.
585	>	* Throws AssertionFailedError if interrupted.
586	>	*/
587	>	void sleep(long millis) {
588	>	try {
589	>	Thread.sleep(millis);
590	>	} catch (InterruptedException ie) {
591	>	AssertionFailedError afe =
592	>	new AssertionFailedError("Unexpected InterruptedException");
593	>	afe.initCause(ie);
594	>	throw afe;
595	>	}
596	>	}
597	>
598	>	/**
599	>	* Sleeps until the timeout has elapsed, or interrupted.
600		* Does <em>NOT</em> throw InterruptedException.
601		*/
602		void sleepTillInterrupted(long timeoutMillis) {
#	Line 492 | Line 606 | public class JSR166TestCase extends Test
606		}
607
608		/**
609	<	* Returns a new started Thread running the given runnable.
609	>	* Waits up to the specified number of milliseconds for the given
610	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
611	>	*/
612	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
613	>	long timeoutNanos = timeoutMillis * 1000L * 1000L;
614	>	long t0 = System.nanoTime();
615	>	for (;;) {
616	>	Thread.State s = thread.getState();
617	>	if (s == Thread.State.BLOCKED ||
618	>	s == Thread.State.WAITING ||
619	>	s == Thread.State.TIMED_WAITING)
620	>	return;
621	>	else if (s == Thread.State.TERMINATED)
622	>	fail("Unexpected thread termination");
623	>	else if (System.nanoTime() - t0 > timeoutNanos) {
624	>	threadAssertTrue(thread.isAlive());
625	>	return;
626	>	}
627	>	Thread.yield();
628	>	}
629	>	}
630	>
631	>	/**
632	>	* Returns the number of milliseconds since time given by
633	>	* startNanoTime, which must have been previously returned from a
634	>	* call to {@link System.nanoTime()}.
635	>	*/
636	>	long millisElapsedSince(long startNanoTime) {
637	>	return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
638	>	}
639	>
640	>	/**
641	>	* Returns a new started daemon Thread running the given runnable.
642		*/
643		Thread newStartedThread(Runnable runnable) {
644		Thread t = new Thread(runnable);
645	+	t.setDaemon(true);
646		t.start();
647		return t;
648		}
649
650	+	/**
651	+	* Waits for the specified time (in milliseconds) for the thread
652	+	* to terminate (using {@link Thread#join(long)}), else interrupts
653	+	* the thread (in the hope that it may terminate later) and fails.
654	+	*/
655	+	void awaitTermination(Thread t, long timeoutMillis) {
656	+	try {
657	+	t.join(timeoutMillis);
658	+	} catch (InterruptedException ie) {
659	+	threadUnexpectedException(ie);
660	+	} finally {
661	+	if (t.isAlive()) {
662	+	t.interrupt();
663	+	fail("Test timed out");
664	+	}
665	+	}
666	+	}
667	+
668		// Some convenient Runnable classes
669
670		public abstract class CheckedRunnable implements Runnable {
#	Line 576 | Line 741 | public class JSR166TestCase extends Test
741		return realCall();
742		} catch (Throwable t) {
743		threadUnexpectedException(t);
744	+	return null;
745		}
580	–	return null;
746		}
747		}
748
749	<	public abstract class CheckedInterruptedCallable<T> implements Callable<T> {
749	>	public abstract class CheckedInterruptedCallable<T>
750	>	implements Callable<T> {
751		protected abstract T realCall() throws Throwable;
752
753		public final T call() {
#	Line 613 | Line 779 | public class JSR166TestCase extends Test
779
780		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
781		return new CheckedCallable<String>() {
782	<	public String realCall() {
782	>	protected String realCall() {
783		try {
784		latch.await();
785		} catch (InterruptedException quittingTime) {}
#	Line 662 | Line 828 | public class JSR166TestCase extends Test
828		}
829		}
830
665	–	public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
666	–	protected void realRun() throws InterruptedException {
667	–	Thread.sleep(SMALL_DELAY_MS);
668	–	}
669	–	}
670	–
831		public class MediumRunnable extends CheckedRunnable {
832		protected void realRun() throws Throwable {
833		Thread.sleep(MEDIUM_DELAY_MS);
#	Line 680 | Line 840 | public class JSR166TestCase extends Test
840		}
841		}
842
843	+	public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
844	+	return new CheckedRunnable() {
845	+	protected void realRun() {
846	+	try {
847	+	Thread.sleep(timeoutMillis);
848	+	} catch (InterruptedException ok) {}
849	+	}};
850	+	}
851	+
852		public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
853		protected void realRun() {
854		try {
#	Line 705 | Line 874 | public class JSR166TestCase extends Test
874		}
875		}
876
877	+	public interface TrackedRunnable extends Runnable {
878	+	boolean isDone();
879	+	}
880	+
881	+	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
882	+	return new TrackedRunnable() {
883	+	private volatile boolean done = false;
884	+	public boolean isDone() { return done; }
885	+	public void run() {
886	+	try {
887	+	Thread.sleep(timeoutMillis);
888	+	done = true;
889	+	} catch (InterruptedException ok) {}
890	+	}
891	+	};
892	+	}
893	+
894		public static class TrackedShortRunnable implements Runnable {
895		public volatile boolean done = false;
896		public void run() {
897		try {
898	+	Thread.sleep(SHORT_DELAY_MS);
899	+	done = true;
900	+	} catch (InterruptedException ok) {}
901	+	}
902	+	}
903	+
904	+	public static class TrackedSmallRunnable implements Runnable {
905	+	public volatile boolean done = false;
906	+	public void run() {
907	+	try {
908		Thread.sleep(SMALL_DELAY_MS);
909		done = true;
910		} catch (InterruptedException ok) {}
#	Line 753 | Line 949 | public class JSR166TestCase extends Test
949		}
950		}
951
952	+	/**
953	+	* Analog of CheckedRunnable for RecursiveAction
954	+	*/
955	+	public abstract class CheckedRecursiveAction extends RecursiveAction {
956	+	protected abstract void realCompute() throws Throwable;
957	+
958	+	public final void compute() {
959	+	try {
960	+	realCompute();
961	+	} catch (Throwable t) {
962	+	threadUnexpectedException(t);
963	+	}
964	+	}
965	+	}
966	+
967	+	/**
968	+	* Analog of CheckedCallable for RecursiveTask
969	+	*/
970	+	public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
971	+	protected abstract T realCompute() throws Throwable;
972	+
973	+	public final T compute() {
974	+	try {
975	+	return realCompute();
976	+	} catch (Throwable t) {
977	+	threadUnexpectedException(t);
978	+	return null;
979	+	}
980	+	}
981	+	}
982
983		/**
984		* For use as RejectedExecutionHandler in constructors
#	Line 762 | Line 988 | public class JSR166TestCase extends Test
988		ThreadPoolExecutor executor) {}
989		}
990
991	+	/**
992	+	* A CyclicBarrier that fails with AssertionFailedErrors instead
993	+	* of throwing checked exceptions.
994	+	*/
995	+	public class CheckedBarrier extends CyclicBarrier {
996	+	public CheckedBarrier(int parties) { super(parties); }
997	+
998	+	public int await() {
999	+	try {
1000	+	return super.await();
1001	+	} catch (Exception e) {
1002	+	AssertionFailedError afe =
1003	+	new AssertionFailedError("Unexpected exception: " + e);
1004	+	afe.initCause(e);
1005	+	throw afe;
1006	+	}
1007	+	}
1008	+	}
1009	+
1010		}

Diff Legend

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