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.42 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.65 by jsr166, Thu Oct 21 23:22:49 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 java.security.CodeSource;
15	>	import java.security.Permission;
16	>	import java.security.PermissionCollection;
17	>	import java.security.Permissions;
18	>	import java.security.Policy;
19	>	import java.security.ProtectionDomain;
20	>	import java.security.SecurityPermission;
21
22		/**
23		* Base class for JSR166 Junit TCK tests.  Defines some constants,
#	Line 26 | Line 32 | import java.security.*;
32		* <li> All assertions in code running in generated threads must use
33		* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
34		* #threadAssertEquals}, or {@link #threadAssertNull}, (not
35	<	* <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
35	>	* {@code fail}, {@code assertTrue}, etc.) It is OK (but not
36		* particularly recommended) for other code to use these forms too.
37		* Only the most typically used JUnit assertion methods are defined
38		* this way, but enough to live with.</li>
39		*
40		* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
41	<	* to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
41	>	* to invoke {@code super.setUp} and {@code super.tearDown} within
42		* them. These methods are used to clear and check for thread
43		* assertion failures.</li>
44		*
45	<	* <li>All delays and timeouts must use one of the constants <tt>
46	<	* SHORT_DELAY_MS</tt>, <tt> SMALL_DELAY_MS</tt>, <tt> MEDIUM_DELAY_MS</tt>,
47	<	* <tt> LONG_DELAY_MS</tt>. The idea here is that a SHORT is always
45	>	* <li>All delays and timeouts must use one of the constants {@code
46	>	* SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
47	>	* {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
48		* discriminable from zero time, and always allows enough time for the
49		* small amounts of computation (creating a thread, calling a few
50		* methods, etc) needed to reach a timeout point. Similarly, a SMALL
#	Line 48 | Line 54 | import java.security.*;
54		* in one spot to rerun tests on slower platforms.</li>
55		*
56		* <li> All threads generated must be joined inside each test case
57	<	* method (or <tt>fail</tt> to do so) before returning from the
58	<	* method. The <tt> joinPool</tt> method can be used to do this when
57	>	* method (or {@code fail} to do so) before returning from the
58	>	* method. The {@code joinPool} method can be used to do this when
59		* using Executors.</li>
60		*
61		* </ol>
#	Line 81 | Line 87 | import java.security.*;
87		* any particular package to simplify things for people integrating
88		* them in TCK test suites.</li>
89		*
90	<	* <li> As a convenience, the <tt>main</tt> of this class (JSR166TestCase)
90	>	* <li> As a convenience, the {@code main} of this class (JSR166TestCase)
91		* runs all JSR166 unit tests.</li>
92		*
93		* </ul>
94		*/
95		public class JSR166TestCase extends TestCase {
96	+	private static final boolean useSecurityManager =
97	+	Boolean.getBoolean("jsr166.useSecurityManager");
98	+
99	+	protected static final boolean expensiveTests =
100	+	Boolean.getBoolean("jsr166.expensiveTests");
101	+
102	+	/**
103	+	* If true, report on stdout all "slow" tests, that is, ones that
104	+	* take more than profileThreshold milliseconds to execute.
105	+	*/
106	+	private static final boolean profileTests =
107	+	Boolean.getBoolean("jsr166.profileTests");
108	+
109	+	/**
110	+	* The number of milliseconds that tests are permitted for
111	+	* execution without being reported, when profileTests is set.
112	+	*/
113	+	private static final long profileThreshold =
114	+	Long.getLong("jsr166.profileThreshold", 100);
115	+
116	+	protected void runTest() throws Throwable {
117	+	if (profileTests)
118	+	runTestProfiled();
119	+	else
120	+	super.runTest();
121	+	}
122	+
123	+	protected void runTestProfiled() throws Throwable {
124	+	long t0 = System.nanoTime();
125	+	try {
126	+	super.runTest();
127	+	} finally {
128	+	long elapsedMillis =
129	+	(System.nanoTime() - t0) / (1000L * 1000L);
130	+	if (elapsedMillis >= profileThreshold)
131	+	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
132	+	}
133	+	}
134	+
135		/**
136		* Runs all JSR166 unit tests using junit.textui.TestRunner
137		*/
138		public static void main(String[] args) {
139	<	int iters = 1;
140	<	if (args.length > 0)
141	<	iters = Integer.parseInt(args[0]);
139	>	if (useSecurityManager) {
140	>	System.err.println("Setting a permissive security manager");
141	>	Policy.setPolicy(permissivePolicy());
142	>	System.setSecurityManager(new SecurityManager());
143	>	}
144	>	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
145	>
146		Test s = suite();
147		for (int i = 0; i < iters; ++i) {
148		junit.textui.TestRunner.run(s);
#	Line 103 | Line 152 | public class JSR166TestCase extends Test
152		System.exit(0);
153		}
154
155	+	public static TestSuite newTestSuite(Object... suiteOrClasses) {
156	+	TestSuite suite = new TestSuite();
157	+	for (Object suiteOrClass : suiteOrClasses) {
158	+	if (suiteOrClass instanceof TestSuite)
159	+	suite.addTest((TestSuite) suiteOrClass);
160	+	else if (suiteOrClass instanceof Class)
161	+	suite.addTest(new TestSuite((Class<?>) suiteOrClass));
162	+	else
163	+	throw new ClassCastException("not a test suite or class");
164	+	}
165	+	return suite;
166	+	}
167	+
168		/**
169	<	* Collects all JSR166 unit tests as one suite
169	>	* Collects all JSR166 unit tests as one suite.
170		*/
171		public static Test suite() {
172	<	TestSuite suite = new TestSuite("JSR166 Unit Tests");
173	<
174	<	suite.addTest(new TestSuite(ForkJoinPoolTest.class));
175	<	suite.addTest(new TestSuite(ForkJoinTaskTest.class));
176	<	suite.addTest(new TestSuite(RecursiveActionTest.class));
177	<	suite.addTest(new TestSuite(RecursiveTaskTest.class));
178	<	suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
179	<	suite.addTest(new TestSuite(PhaserTest.class));
180	<	suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
181	<	suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
182	<	suite.addTest(new TestSuite(AbstractQueueTest.class));
183	<	suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
184	<	suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
185	<	suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
186	<	suite.addTest(new TestSuite(ArrayDequeTest.class));
187	<	suite.addTest(new TestSuite(AtomicBooleanTest.class));
188	<	suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
189	<	suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
190	<	suite.addTest(new TestSuite(AtomicIntegerTest.class));
191	<	suite.addTest(new TestSuite(AtomicLongArrayTest.class));
192	<	suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
193	<	suite.addTest(new TestSuite(AtomicLongTest.class));
194	<	suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
195	<	suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
196	<	suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
197	<	suite.addTest(new TestSuite(AtomicReferenceTest.class));
198	<	suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
199	<	suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
200	<	suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
201	<	suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
202	<	suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
203	<	suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
204	<	suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
205	<	suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
206	<	suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
207	<	suite.addTest(new TestSuite(CountDownLatchTest.class));
208	<	suite.addTest(new TestSuite(CyclicBarrierTest.class));
209	<	suite.addTest(new TestSuite(DelayQueueTest.class));
210	<	suite.addTest(new TestSuite(EntryTest.class));
211	<	suite.addTest(new TestSuite(ExchangerTest.class));
212	<	suite.addTest(new TestSuite(ExecutorsTest.class));
213	<	suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
214	<	suite.addTest(new TestSuite(FutureTaskTest.class));
215	<	suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
216	<	suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
217	<	suite.addTest(new TestSuite(LinkedListTest.class));
218	<	suite.addTest(new TestSuite(LockSupportTest.class));
219	<	suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
220	<	suite.addTest(new TestSuite(PriorityQueueTest.class));
221	<	suite.addTest(new TestSuite(ReentrantLockTest.class));
222	<	suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
223	<	suite.addTest(new TestSuite(ScheduledExecutorTest.class));
224	<	suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
225	<	suite.addTest(new TestSuite(SemaphoreTest.class));
226	<	suite.addTest(new TestSuite(SynchronousQueueTest.class));
227	<	suite.addTest(new TestSuite(SystemTest.class));
228	<	suite.addTest(new TestSuite(ThreadLocalTest.class));
229	<	suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
230	<	suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
231	<	suite.addTest(new TestSuite(ThreadTest.class));
232	<	suite.addTest(new TestSuite(TimeUnitTest.class));
233	<	suite.addTest(new TestSuite(TreeMapTest.class));
234	<	suite.addTest(new TestSuite(TreeSetTest.class));
235	<	suite.addTest(new TestSuite(TreeSubMapTest.class));
236	<	suite.addTest(new TestSuite(TreeSubSetTest.class));
175	<
176	<	return suite;
172	>	return newTestSuite(
173	>	ForkJoinPoolTest.suite(),
174	>	ForkJoinTaskTest.suite(),
175	>	RecursiveActionTest.suite(),
176	>	RecursiveTaskTest.suite(),
177	>	LinkedTransferQueueTest.suite(),
178	>	PhaserTest.suite(),
179	>	ThreadLocalRandomTest.suite(),
180	>	AbstractExecutorServiceTest.suite(),
181	>	AbstractQueueTest.suite(),
182	>	AbstractQueuedSynchronizerTest.suite(),
183	>	AbstractQueuedLongSynchronizerTest.suite(),
184	>	ArrayBlockingQueueTest.suite(),
185	>	ArrayDequeTest.suite(),
186	>	AtomicBooleanTest.suite(),
187	>	AtomicIntegerArrayTest.suite(),
188	>	AtomicIntegerFieldUpdaterTest.suite(),
189	>	AtomicIntegerTest.suite(),
190	>	AtomicLongArrayTest.suite(),
191	>	AtomicLongFieldUpdaterTest.suite(),
192	>	AtomicLongTest.suite(),
193	>	AtomicMarkableReferenceTest.suite(),
194	>	AtomicReferenceArrayTest.suite(),
195	>	AtomicReferenceFieldUpdaterTest.suite(),
196	>	AtomicReferenceTest.suite(),
197	>	AtomicStampedReferenceTest.suite(),
198	>	ConcurrentHashMapTest.suite(),
199	>	ConcurrentLinkedDequeTest.suite(),
200	>	ConcurrentLinkedQueueTest.suite(),
201	>	ConcurrentSkipListMapTest.suite(),
202	>	ConcurrentSkipListSubMapTest.suite(),
203	>	ConcurrentSkipListSetTest.suite(),
204	>	ConcurrentSkipListSubSetTest.suite(),
205	>	CopyOnWriteArrayListTest.suite(),
206	>	CopyOnWriteArraySetTest.suite(),
207	>	CountDownLatchTest.suite(),
208	>	CyclicBarrierTest.suite(),
209	>	DelayQueueTest.suite(),
210	>	EntryTest.suite(),
211	>	ExchangerTest.suite(),
212	>	ExecutorsTest.suite(),
213	>	ExecutorCompletionServiceTest.suite(),
214	>	FutureTaskTest.suite(),
215	>	LinkedBlockingDequeTest.suite(),
216	>	LinkedBlockingQueueTest.suite(),
217	>	LinkedListTest.suite(),
218	>	LockSupportTest.suite(),
219	>	PriorityBlockingQueueTest.suite(),
220	>	PriorityQueueTest.suite(),
221	>	ReentrantLockTest.suite(),
222	>	ReentrantReadWriteLockTest.suite(),
223	>	ScheduledExecutorTest.suite(),
224	>	ScheduledExecutorSubclassTest.suite(),
225	>	SemaphoreTest.suite(),
226	>	SynchronousQueueTest.suite(),
227	>	SystemTest.suite(),
228	>	ThreadLocalTest.suite(),
229	>	ThreadPoolExecutorTest.suite(),
230	>	ThreadPoolExecutorSubclassTest.suite(),
231	>	ThreadTest.suite(),
232	>	TimeUnitTest.suite(),
233	>	TreeMapTest.suite(),
234	>	TreeSetTest.suite(),
235	>	TreeSubMapTest.suite(),
236	>	TreeSubSetTest.suite());
237		}
238
239
#	Line 195 | Line 255 | public class JSR166TestCase extends Test
255		/**
256		* Sets delays as multiples of SHORT_DELAY.
257		*/
258	<	protected  void setDelays() {
258	>	protected void setDelays() {
259		SHORT_DELAY_MS = getShortDelay();
260	<	SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
260	>	SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
261		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
262	<	LONG_DELAY_MS = SHORT_DELAY_MS * 50;
262	>	LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
263		}
264
265		/**
266	<	* Flag set true if any threadAssert methods fail
266	>	* The first exception encountered if any threadAssertXXX method fails.
267		*/
268	<	volatile boolean threadFailed;
268	>	private final AtomicReference<Throwable> threadFailure
269	>	= new AtomicReference<Throwable>(null);
270
271		/**
272	<	* Initializes test to indicate that no thread assertions have failed
272	>	* Records an exception so that it can be rethrown later in the test
273	>	* harness thread, triggering a test case failure.  Only the first
274	>	* failure is recorded; subsequent calls to this method from within
275	>	* the same test have no effect.
276		*/
277	+	public void threadRecordFailure(Throwable t) {
278	+	threadFailure.compareAndSet(null, t);
279	+	}
280	+
281		public void setUp() {
282		setDelays();
215	–	threadFailed = false;
283		}
284
285		/**
286	<	* Triggers test case failure if any thread assertions have failed
287	<	*/
288	<	public void tearDown() {
289	<	assertFalse(threadFailed);
286	>	* Triggers test case failure if any thread assertions have failed,
287	>	* by rethrowing, in the test harness thread, any exception recorded
288	>	* earlier by threadRecordFailure.
289	>	*/
290	>	public void tearDown() throws Exception {
291	>	Throwable t = threadFailure.get();
292	>	if (t != null) {
293	>	if (t instanceof Error)
294	>	throw (Error) t;
295	>	else if (t instanceof RuntimeException)
296	>	throw (RuntimeException) t;
297	>	else if (t instanceof Exception)
298	>	throw (Exception) t;
299	>	else {
300	>	AssertionFailedError afe =
301	>	new AssertionFailedError(t.toString());
302	>	afe.initCause(t);
303	>	throw afe;
304	>	}
305	>	}
306		}
307
308		/**
309	<	* Fail, also setting status to indicate current testcase should fail
309	>	* Just like fail(reason), but additionally recording (using
310	>	* threadRecordFailure) any AssertionFailedError thrown, so that
311	>	* the current testcase will fail.
312		*/
313		public void threadFail(String reason) {
314	<	threadFailed = true;
315	<	fail(reason);
314	>	try {
315	>	fail(reason);
316	>	} catch (AssertionFailedError t) {
317	>	threadRecordFailure(t);
318	>	fail(reason);
319	>	}
320		}
321
322		/**
323	<	* If expression not true, set status to indicate current testcase
324	<	* should fail
323	>	* Just like assertTrue(b), but additionally recording (using
324	>	* threadRecordFailure) any AssertionFailedError thrown, so that
325	>	* the current testcase will fail.
326		*/
327		public void threadAssertTrue(boolean b) {
328	<	if (!b) {
239	<	threadFailed = true;
328	>	try {
329		assertTrue(b);
330	+	} catch (AssertionFailedError t) {
331	+	threadRecordFailure(t);
332	+	throw t;
333		}
334		}
335
336		/**
337	<	* If expression not false, set status to indicate current testcase
338	<	* should fail
337	>	* Just like assertFalse(b), but additionally recording (using
338	>	* threadRecordFailure) any AssertionFailedError thrown, so that
339	>	* the current testcase will fail.
340		*/
341		public void threadAssertFalse(boolean b) {
342	<	if (b) {
250	<	threadFailed = true;
342	>	try {
343		assertFalse(b);
344	+	} catch (AssertionFailedError t) {
345	+	threadRecordFailure(t);
346	+	throw t;
347		}
348		}
349
350		/**
351	<	* If argument not null, set status to indicate current testcase
352	<	* should fail
351	>	* Just like assertNull(x), but additionally recording (using
352	>	* threadRecordFailure) any AssertionFailedError thrown, so that
353	>	* the current testcase will fail.
354		*/
355		public void threadAssertNull(Object x) {
356	<	if (x != null) {
261	<	threadFailed = true;
356	>	try {
357		assertNull(x);
358	+	} catch (AssertionFailedError t) {
359	+	threadRecordFailure(t);
360	+	throw t;
361		}
362		}
363
364		/**
365	<	* If arguments not equal, set status to indicate current testcase
366	<	* should fail
365	>	* Just like assertEquals(x, y), but additionally recording (using
366	>	* threadRecordFailure) any AssertionFailedError thrown, so that
367	>	* the current testcase will fail.
368		*/
369		public void threadAssertEquals(long x, long y) {
370	<	if (x != y) {
272	<	threadFailed = true;
370	>	try {
371		assertEquals(x, y);
372	+	} catch (AssertionFailedError t) {
373	+	threadRecordFailure(t);
374	+	throw t;
375		}
376		}
377
378		/**
379	<	* If arguments not equal, set status to indicate current testcase
380	<	* should fail
379	>	* Just like assertEquals(x, y), but additionally recording (using
380	>	* threadRecordFailure) any AssertionFailedError thrown, so that
381	>	* the current testcase will fail.
382		*/
383		public void threadAssertEquals(Object x, Object y) {
384	<	if (x != y && (x == null || !x.equals(y))) {
283	<	threadFailed = true;
384	>	try {
385		assertEquals(x, y);
386	+	} catch (AssertionFailedError t) {
387	+	threadRecordFailure(t);
388	+	throw t;
389	+	} catch (Throwable t) {
390	+	threadUnexpectedException(t);
391		}
392		}
393
394		/**
395	<	* threadFail with message "should throw exception"
395	>	* Just like assertSame(x, y), but additionally recording (using
396	>	* threadRecordFailure) any AssertionFailedError thrown, so that
397	>	* the current testcase will fail.
398		*/
399	<	public void threadShouldThrow() {
400	<	threadFailed = true;
401	<	fail("should throw exception");
399	>	public void threadAssertSame(Object x, Object y) {
400	>	try {
401	>	assertSame(x, y);
402	>	} catch (AssertionFailedError t) {
403	>	threadRecordFailure(t);
404	>	throw t;
405	>	}
406		}
407
408		/**
409	<	* threadFail with message "should throw" + exceptionName
409	>	* Calls threadFail with message "should throw exception".
410		*/
411	<	public void threadShouldThrow(String exceptionName) {
412	<	threadFailed = true;
301	<	fail("should throw " + exceptionName);
411	>	public void threadShouldThrow() {
412	>	threadFail("should throw exception");
413		}
414
415		/**
416	<	* threadFail with message "Unexpected exception"
416	>	* Calls threadFail with message "should throw" + exceptionName.
417		*/
418	<	public void threadUnexpectedException() {
419	<	threadFailed = true;
309	<	fail("Unexpected exception");
418	>	public void threadShouldThrow(String exceptionName) {
419	>	threadFail("should throw " + exceptionName);
420		}
421
422		/**
423	<	* threadFail with message "Unexpected exception", with argument
423	>	* Records the given exception using {@link #threadRecordFailure},
424	>	* then rethrows the exception, wrapping it in an
425	>	* AssertionFailedError if necessary.
426		*/
427	<	public void threadUnexpectedException(Throwable ex) {
428	<	threadFailed = true;
429	<	ex.printStackTrace();
430	<	fail("Unexpected exception: " + ex);
427	>	public void threadUnexpectedException(Throwable t) {
428	>	threadRecordFailure(t);
429	>	t.printStackTrace();
430	>	if (t instanceof RuntimeException)
431	>	throw (RuntimeException) t;
432	>	else if (t instanceof Error)
433	>	throw (Error) t;
434	>	else {
435	>	AssertionFailedError afe =
436	>	new AssertionFailedError("unexpected exception: " + t);
437	>	t.initCause(t);
438	>	throw afe;
439	>	}
440		}
441
442		/**
443	<	* Wait out termination of a thread pool or fail doing so
443	>	* Waits out termination of a thread pool or fails doing so.
444		*/
445		public void joinPool(ExecutorService exec) {
446		try {
447		exec.shutdown();
448	<	assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
448	>	assertTrue("ExecutorService did not terminate in a timely manner",
449	>	exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
450		} catch (SecurityException ok) {
451		// Allowed in case test doesn't have privs
452		} catch (InterruptedException ie) {
453	<	fail("Unexpected exception");
453	>	fail("Unexpected InterruptedException");
454		}
455		}
456
457
458		/**
459	<	* fail with message "should throw exception"
459	>	* Fails with message "should throw exception".
460		*/
461		public void shouldThrow() {
462		fail("Should throw exception");
463		}
464
465		/**
466	<	* fail with message "should throw " + exceptionName
466	>	* Fails with message "should throw " + exceptionName.
467		*/
468		public void shouldThrow(String exceptionName) {
469		fail("Should throw " + exceptionName);
470		}
471
472		/**
473	<	* fail with message "Unexpected exception"
473	>	* The number of elements to place in collections, arrays, etc.
474		*/
475	<	public void unexpectedException() {
476	<	fail("Unexpected exception");
477	<	}
475	>	public static final int SIZE = 20;
476	>
477	>	// Some convenient Integer constants
478	>
479	>	public static final Integer zero  = new Integer(0);
480	>	public static final Integer one   = new Integer(1);
481	>	public static final Integer two   = new Integer(2);
482	>	public static final Integer three = new Integer(3);
483	>	public static final Integer four  = new Integer(4);
484	>	public static final Integer five  = new Integer(5);
485	>	public static final Integer six   = new Integer(6);
486	>	public static final Integer seven = new Integer(7);
487	>	public static final Integer eight = new Integer(8);
488	>	public static final Integer nine  = new Integer(9);
489	>	public static final Integer m1  = new Integer(-1);
490	>	public static final Integer m2  = new Integer(-2);
491	>	public static final Integer m3  = new Integer(-3);
492	>	public static final Integer m4  = new Integer(-4);
493	>	public static final Integer m5  = new Integer(-5);
494	>	public static final Integer m6  = new Integer(-6);
495	>	public static final Integer m10 = new Integer(-10);
496	>
497
498		/**
499	<	* fail with message "Unexpected exception", with argument
500	<	*/
501	<	public void unexpectedException(Throwable ex) {
502	<	ex.printStackTrace();
503	<	fail("Unexpected exception: " + ex);
499	>	* Runs Runnable r with a security policy that permits precisely
500	>	* the specified permissions.  If there is no current security
501	>	* manager, the runnable is run twice, both with and without a
502	>	* security manager.  We require that any security manager permit
503	>	* getPolicy/setPolicy.
504	>	*/
505	>	public void runWithPermissions(Runnable r, Permission... permissions) {
506	>	SecurityManager sm = System.getSecurityManager();
507	>	if (sm == null) {
508	>	r.run();
509	>	Policy savedPolicy = Policy.getPolicy();
510	>	try {
511	>	Policy.setPolicy(permissivePolicy());
512	>	System.setSecurityManager(new SecurityManager());
513	>	runWithPermissions(r, permissions);
514	>	} finally {
515	>	System.setSecurityManager(null);
516	>	Policy.setPolicy(savedPolicy);
517	>	}
518	>	} else {
519	>	Policy savedPolicy = Policy.getPolicy();
520	>	AdjustablePolicy policy = new AdjustablePolicy(permissions);
521	>	Policy.setPolicy(policy);
522	>
523	>	try {
524	>	r.run();
525	>	} finally {
526	>	policy.addPermission(new SecurityPermission("setPolicy"));
527	>	Policy.setPolicy(savedPolicy);
528	>	}
529	>	}
530		}
531
365	–
532		/**
533	<	* The number of elements to place in collections, arrays, etc.
533	>	* Runs a runnable without any permissions.
534		*/
535	<	static final int SIZE = 20;
536	<
537	<	// Some convenient Integer constants
372	<
373	<	static final Integer zero = new Integer(0);
374	<	static final Integer one = new Integer(1);
375	<	static final Integer two = new Integer(2);
376	<	static final Integer three  = new Integer(3);
377	<	static final Integer four  = new Integer(4);
378	<	static final Integer five  = new Integer(5);
379	<	static final Integer six = new Integer(6);
380	<	static final Integer seven = new Integer(7);
381	<	static final Integer eight = new Integer(8);
382	<	static final Integer nine = new Integer(9);
383	<	static final Integer m1  = new Integer(-1);
384	<	static final Integer m2  = new Integer(-2);
385	<	static final Integer m3  = new Integer(-3);
386	<	static final Integer m4 = new Integer(-4);
387	<	static final Integer m5 = new Integer(-5);
388	<	static final Integer m6 = new Integer(-6);
389	<	static final Integer m10 = new Integer(-10);
390	<
535	>	public void runWithoutPermissions(Runnable r) {
536	>	runWithPermissions(r);
537	>	}
538
539		/**
540		* A security policy where new permissions can be dynamically added
541		* or all cleared.
542		*/
543	<	static class AdjustablePolicy extends java.security.Policy {
543	>	public static class AdjustablePolicy extends java.security.Policy {
544		Permissions perms = new Permissions();
545	<	AdjustablePolicy() { }
545	>	AdjustablePolicy(Permission... permissions) {
546	>	for (Permission permission : permissions)
547	>	perms.add(permission);
548	>	}
549		void addPermission(Permission perm) { perms.add(perm); }
550		void clearPermissions() { perms = new Permissions(); }
551		public PermissionCollection getPermissions(CodeSource cs) {
#	Line 411 | Line 561 | public class JSR166TestCase extends Test
561		}
562
563		/**
564	<	* Sleep until the timeout has elapsed, or interrupted.
564	>	* Returns a policy containing all the permissions we ever need.
565	>	*/
566	>	public static Policy permissivePolicy() {
567	>	return new AdjustablePolicy
568	>	// Permissions j.u.c. needs directly
569	>	(new RuntimePermission("modifyThread"),
570	>	new RuntimePermission("getClassLoader"),
571	>	new RuntimePermission("setContextClassLoader"),
572	>	// Permissions needed to change permissions!
573	>	new SecurityPermission("getPolicy"),
574	>	new SecurityPermission("setPolicy"),
575	>	new RuntimePermission("setSecurityManager"),
576	>	// Permissions needed by the junit test harness
577	>	new RuntimePermission("accessDeclaredMembers"),
578	>	new PropertyPermission("*", "read"),
579	>	new java.io.FilePermission("<<ALL FILES>>", "read"));
580	>	}
581	>
582	>	/**
583	>	* Sleeps until the given time has elapsed.
584	>	* Throws AssertionFailedError if interrupted.
585	>	*/
586	>	void sleep(long millis) {
587	>	try {
588	>	Thread.sleep(millis);
589	>	} catch (InterruptedException ie) {
590	>	AssertionFailedError afe =
591	>	new AssertionFailedError("Unexpected InterruptedException");
592	>	afe.initCause(ie);
593	>	throw afe;
594	>	}
595	>	}
596	>
597	>	/**
598	>	* Sleeps until the timeout has elapsed, or interrupted.
599		* Does <em>NOT</em> throw InterruptedException.
600		*/
601		void sleepTillInterrupted(long timeoutMillis) {
602		try {
603		Thread.sleep(timeoutMillis);
604	<	} catch (InterruptedException wakeup) {
604	>	} catch (InterruptedException wakeup) {}
605	>	}
606	>
607	>	/**
608	>	* Waits up to the specified number of milliseconds for the given
609	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
610	>	*/
611	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
612	>	long timeoutNanos = timeoutMillis * 1000L * 1000L;
613	>	long t0 = System.nanoTime();
614	>	for (;;) {
615	>	Thread.State s = thread.getState();
616	>	if (s == Thread.State.BLOCKED ||
617	>	s == Thread.State.WAITING ||
618	>	s == Thread.State.TIMED_WAITING ||
619	>	System.nanoTime() - t0 > timeoutNanos)
620	>	return;
621	>	Thread.yield();
622		}
623		}
624
625		/**
626	<	* Returns a new started Thread running the given runnable.
626	>	* Returns a new started daemon Thread running the given runnable.
627		*/
628		Thread newStartedThread(Runnable runnable) {
629		Thread t = new Thread(runnable);
630	+	t.setDaemon(true);
631		t.start();
632		return t;
633		}
634
635	+	/**
636	+	* Waits for the specified time (in milliseconds) for the thread
637	+	* to terminate (using {@link Thread#join(long)}), else interrupts
638	+	* the thread (in the hope that it may terminate later) and fails.
639	+	*/
640	+	void awaitTermination(Thread t, long timeoutMillis) {
641	+	try {
642	+	t.join(timeoutMillis);
643	+	} catch (InterruptedException ie) {
644	+	threadUnexpectedException(ie);
645	+	} finally {
646	+	if (t.isAlive()) {
647	+	t.interrupt();
648	+	fail("Test timed out");
649	+	}
650	+	}
651	+	}
652	+
653		// Some convenient Runnable classes
654
655	<	abstract class CheckedRunnable implements Runnable {
656	<	abstract void realRun() throws Throwable;
655	>	public abstract class CheckedRunnable implements Runnable {
656	>	protected abstract void realRun() throws Throwable;
657
658		public final void run() {
659		try {
#	Line 444 | Line 664 | public class JSR166TestCase extends Test
664		}
665		}
666
667	<	abstract class RunnableShouldThrow implements Runnable {
668	<	abstract void realRun() throws Throwable;
667	>	public abstract class RunnableShouldThrow implements Runnable {
668	>	protected abstract void realRun() throws Throwable;
669
670		final Class<?> exceptionClass;
671
#	Line 457 | Line 677 | public class JSR166TestCase extends Test
677		try {
678		realRun();
679		threadShouldThrow(exceptionClass.getSimpleName());
460	–	} catch (InterruptedException success) {
680		} catch (Throwable t) {
681		if (! exceptionClass.isInstance(t))
682		threadUnexpectedException(t);
#	Line 465 | Line 684 | public class JSR166TestCase extends Test
684		}
685		}
686
687	<	abstract class ThreadShouldThrow extends Thread {
688	<	abstract void realRun() throws Throwable;
687	>	public abstract class ThreadShouldThrow extends Thread {
688	>	protected abstract void realRun() throws Throwable;
689
690		final Class<?> exceptionClass;
691
#	Line 478 | Line 697 | public class JSR166TestCase extends Test
697		try {
698		realRun();
699		threadShouldThrow(exceptionClass.getSimpleName());
481	–	} catch (InterruptedException success) {
700		} catch (Throwable t) {
701		if (! exceptionClass.isInstance(t))
702		threadUnexpectedException(t);
#	Line 486 | Line 704 | public class JSR166TestCase extends Test
704		}
705		}
706
707	<	abstract class CheckedInterruptedRunnable implements Runnable {
708	<	abstract void realRun() throws Throwable;
707	>	public abstract class CheckedInterruptedRunnable implements Runnable {
708	>	protected abstract void realRun() throws Throwable;
709
710		public final void run() {
711		try {
#	Line 500 | Line 718 | public class JSR166TestCase extends Test
718		}
719		}
720
721	<	abstract class CheckedCallable<T> implements Callable<T> {
722	<	abstract T realCall() throws Throwable;
721	>	public abstract class CheckedCallable<T> implements Callable<T> {
722	>	protected abstract T realCall() throws Throwable;
723
724		public final T call() {
725		try {
726		return realCall();
727		} catch (Throwable t) {
728		threadUnexpectedException(t);
729	+	return null;
730		}
512	–	return null;
731		}
732		}
733
734	<	abstract class CheckedInterruptedCallable<T> implements Callable<T> {
735	<	abstract T realCall() throws Throwable;
734	>	public abstract class CheckedInterruptedCallable<T>
735	>	implements Callable<T> {
736	>	protected abstract T realCall() throws Throwable;
737
738		public final T call() {
739		try {
#	Line 529 | Line 748 | public class JSR166TestCase extends Test
748		}
749		}
750
751	<	static class NoOpRunnable implements Runnable {
751	>	public static class NoOpRunnable implements Runnable {
752		public void run() {}
753		}
754
755	<	static class NoOpCallable implements Callable {
755	>	public static class NoOpCallable implements Callable {
756		public Object call() { return Boolean.TRUE; }
757		}
758
759	<	static final String TEST_STRING = "a test string";
759	>	public static final String TEST_STRING = "a test string";
760
761	<	static class StringTask implements Callable<String> {
761	>	public static class StringTask implements Callable<String> {
762		public String call() { return TEST_STRING; }
763		}
764
765	<	static class NPETask implements Callable<String> {
765	>	public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
766	>	return new CheckedCallable<String>() {
767	>	protected String realCall() {
768	>	try {
769	>	latch.await();
770	>	} catch (InterruptedException quittingTime) {}
771	>	return TEST_STRING;
772	>	}};
773	>	}
774	>
775	>	public static class NPETask implements Callable<String> {
776		public String call() { throw new NullPointerException(); }
777		}
778
779	<	static class CallableOne implements Callable<Integer> {
779	>	public static class CallableOne implements Callable<Integer> {
780		public Integer call() { return one; }
781		}
782
783	<	class ShortRunnable extends CheckedRunnable {
784	<	void realRun() throws Throwable {
783	>	public class ShortRunnable extends CheckedRunnable {
784	>	protected void realRun() throws Throwable {
785		Thread.sleep(SHORT_DELAY_MS);
786		}
787		}
788
789	<	class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
790	<	void realRun() throws InterruptedException {
789	>	public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
790	>	protected void realRun() throws InterruptedException {
791		Thread.sleep(SHORT_DELAY_MS);
792		}
793		}
794
795	<	class SmallRunnable extends CheckedRunnable {
796	<	void realRun() throws Throwable {
795	>	public class SmallRunnable extends CheckedRunnable {
796	>	protected void realRun() throws Throwable {
797		Thread.sleep(SMALL_DELAY_MS);
798		}
799		}
800
801	<	class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
802	<	void realRun() {
801	>	public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
802	>	protected void realRun() {
803		try {
804		Thread.sleep(SMALL_DELAY_MS);
805	<	}
577	<	catch (InterruptedException ok) {
578	<	}
805	>	} catch (InterruptedException ok) {}
806		}
807		}
808
809	<	class SmallCallable extends CheckedCallable {
810	<	Object realCall() throws Throwable {
809	>	public class SmallCallable extends CheckedCallable {
810	>	protected Object realCall() throws InterruptedException {
811		Thread.sleep(SMALL_DELAY_MS);
812		return Boolean.TRUE;
813		}
814		}
815
816	<	class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
817	<	void realRun() throws InterruptedException {
818	<	Thread.sleep(SMALL_DELAY_MS);
816	>	public class MediumRunnable extends CheckedRunnable {
817	>	protected void realRun() throws Throwable {
818	>	Thread.sleep(MEDIUM_DELAY_MS);
819		}
820		}
821
822	<	class MediumRunnable extends CheckedRunnable {
823	<	void realRun() throws Throwable {
822	>	public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
823	>	protected void realRun() throws InterruptedException {
824		Thread.sleep(MEDIUM_DELAY_MS);
825		}
826		}
827
828	<	class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
829	<	void realRun() throws InterruptedException {
830	<	Thread.sleep(MEDIUM_DELAY_MS);
831	<	}
828	>	public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
829	>	return new CheckedRunnable() {
830	>	protected void realRun() {
831	>	try {
832	>	Thread.sleep(timeoutMillis);
833	>	} catch (InterruptedException ok) {}
834	>	}};
835		}
836
837	<	class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
838	<	void realRun() {
837	>	public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
838	>	protected void realRun() {
839		try {
840		Thread.sleep(MEDIUM_DELAY_MS);
841	<	}
612	<	catch (InterruptedException ok) {
613	<	}
841	>	} catch (InterruptedException ok) {}
842		}
843		}
844
845	<	class LongPossiblyInterruptedRunnable extends CheckedRunnable {
846	<	void realRun() {
845	>	public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
846	>	protected void realRun() {
847		try {
848		Thread.sleep(LONG_DELAY_MS);
849	<	}
622	<	catch (InterruptedException ok) {
623	<	}
849	>	} catch (InterruptedException ok) {}
850		}
851		}
852
853		/**
854		* For use as ThreadFactory in constructors
855		*/
856	<	static class SimpleThreadFactory implements ThreadFactory {
856	>	public static class SimpleThreadFactory implements ThreadFactory {
857		public Thread newThread(Runnable r) {
858		return new Thread(r);
859		}
860		}
861
862	<	static class TrackedShortRunnable implements Runnable {
863	<	volatile boolean done = false;
862	>	public interface TrackedRunnable extends Runnable {
863	>	boolean isDone();
864	>	}
865	>
866	>	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
867	>	return new TrackedRunnable() {
868	>	private volatile boolean done = false;
869	>	public boolean isDone() { return done; }
870	>	public void run() {
871	>	try {
872	>	Thread.sleep(timeoutMillis);
873	>	done = true;
874	>	} catch (InterruptedException ok) {}
875	>	}
876	>	};
877	>	}
878	>
879	>	public static class TrackedShortRunnable implements Runnable {
880	>	public volatile boolean done = false;
881	>	public void run() {
882	>	try {
883	>	Thread.sleep(SHORT_DELAY_MS);
884	>	done = true;
885	>	} catch (InterruptedException ok) {}
886	>	}
887	>	}
888	>
889	>	public static class TrackedSmallRunnable implements Runnable {
890	>	public volatile boolean done = false;
891		public void run() {
892		try {
893		Thread.sleep(SMALL_DELAY_MS);
894		done = true;
895	<	} catch (InterruptedException ok) {
643	<	}
895	>	} catch (InterruptedException ok) {}
896		}
897		}
898
899	<	static class TrackedMediumRunnable implements Runnable {
900	<	volatile boolean done = false;
899	>	public static class TrackedMediumRunnable implements Runnable {
900	>	public volatile boolean done = false;
901		public void run() {
902		try {
903		Thread.sleep(MEDIUM_DELAY_MS);
904		done = true;
905	<	} catch (InterruptedException ok) {
654	<	}
905	>	} catch (InterruptedException ok) {}
906		}
907		}
908
909	<	static class TrackedLongRunnable implements Runnable {
910	<	volatile boolean done = false;
909	>	public static class TrackedLongRunnable implements Runnable {
910	>	public volatile boolean done = false;
911		public void run() {
912		try {
913		Thread.sleep(LONG_DELAY_MS);
914		done = true;
915	<	} catch (InterruptedException ok) {
665	<	}
915	>	} catch (InterruptedException ok) {}
916		}
917		}
918
919	<	static class TrackedNoOpRunnable implements Runnable {
920	<	volatile boolean done = false;
919	>	public static class TrackedNoOpRunnable implements Runnable {
920	>	public volatile boolean done = false;
921		public void run() {
922		done = true;
923		}
924		}
925
926	<	static class TrackedCallable implements Callable {
927	<	volatile boolean done = false;
926	>	public static class TrackedCallable implements Callable {
927	>	public volatile boolean done = false;
928		public Object call() {
929		try {
930		Thread.sleep(SMALL_DELAY_MS);
931		done = true;
932	<	} catch (InterruptedException ok) {
683	<	}
932	>	} catch (InterruptedException ok) {}
933		return Boolean.TRUE;
934		}
935		}
936
937	+	/**
938	+	* Analog of CheckedRunnable for RecursiveAction
939	+	*/
940	+	public abstract class CheckedRecursiveAction extends RecursiveAction {
941	+	protected abstract void realCompute() throws Throwable;
942	+
943	+	public final void compute() {
944	+	try {
945	+	realCompute();
946	+	} catch (Throwable t) {
947	+	threadUnexpectedException(t);
948	+	}
949	+	}
950	+	}
951	+
952	+	/**
953	+	* Analog of CheckedCallable for RecursiveTask
954	+	*/
955	+	public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
956	+	protected abstract T realCompute() throws Throwable;
957	+
958	+	public final T compute() {
959	+	try {
960	+	return realCompute();
961	+	} catch (Throwable t) {
962	+	threadUnexpectedException(t);
963	+	return null;
964	+	}
965	+	}
966	+	}
967
968		/**
969		* For use as RejectedExecutionHandler in constructors
970		*/
971	<	static class NoOpREHandler implements RejectedExecutionHandler {
971	>	public static class NoOpREHandler implements RejectedExecutionHandler {
972		public void rejectedExecution(Runnable r,
973		ThreadPoolExecutor executor) {}
974		}
975
976	+	/**
977	+	* A CyclicBarrier that fails with AssertionFailedErrors instead
978	+	* of throwing checked exceptions.
979	+	*/
980	+	public class CheckedBarrier extends CyclicBarrier {
981	+	public CheckedBarrier(int parties) { super(parties); }
982	+
983	+	public int await() {
984	+	try {
985	+	return super.await();
986	+	} catch (Exception e) {
987	+	AssertionFailedError afe =
988	+	new AssertionFailedError("Unexpected exception: " + e);
989	+	afe.initCause(e);
990	+	throw afe;
991	+	}
992	+	}
993	+	}
994	+
995		}

Diff Legend

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