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.54 by jsr166, Fri Sep 17 00:52:36 2010 UTC vs.
Revision 1.77 by jsr166, Fri May 6 17:26:29 2011 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.Arrays;
11	+	import java.util.NoSuchElementException;
12		import java.util.PropertyPermission;
13		import java.util.concurrent.*;
14		import java.util.concurrent.atomic.AtomicReference;
15		import static java.util.concurrent.TimeUnit.MILLISECONDS;
16	+	import static java.util.concurrent.TimeUnit.NANOSECONDS;
17		import java.security.CodeSource;
18		import java.security.Permission;
19		import java.security.PermissionCollection;
#	Line 96 | Line 99 | public class JSR166TestCase extends Test
99		private static final boolean useSecurityManager =
100		Boolean.getBoolean("jsr166.useSecurityManager");
101
102	+	protected static final boolean expensiveTests =
103	+	Boolean.getBoolean("jsr166.expensiveTests");
104	+
105	+	/**
106	+	* If true, report on stdout all "slow" tests, that is, ones that
107	+	* take more than profileThreshold milliseconds to execute.
108	+	*/
109	+	private static final boolean profileTests =
110	+	Boolean.getBoolean("jsr166.profileTests");
111	+
112	+	/**
113	+	* The number of milliseconds that tests are permitted for
114	+	* execution without being reported, when profileTests is set.
115	+	*/
116	+	private static final long profileThreshold =
117	+	Long.getLong("jsr166.profileThreshold", 100);
118	+
119	+	protected void runTest() throws Throwable {
120	+	if (profileTests)
121	+	runTestProfiled();
122	+	else
123	+	super.runTest();
124	+	}
125	+
126	+	protected void runTestProfiled() throws Throwable {
127	+	long t0 = System.nanoTime();
128	+	try {
129	+	super.runTest();
130	+	} finally {
131	+	long elapsedMillis =
132	+	(System.nanoTime() - t0) / (1000L * 1000L);
133	+	if (elapsedMillis >= profileThreshold)
134	+	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
135	+	}
136	+	}
137	+
138		/**
139		* Runs all JSR166 unit tests using junit.textui.TestRunner
140		*/
#	Line 105 | Line 144 | public class JSR166TestCase extends Test
144		Policy.setPolicy(permissivePolicy());
145		System.setSecurityManager(new SecurityManager());
146		}
147	<	int iters = 1;
148	<	if (args.length > 0)
110	<	iters = Integer.parseInt(args[0]);
147	>	int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
148	>
149		Test s = suite();
150		for (int i = 0; i < iters; ++i) {
151		junit.textui.TestRunner.run(s);
#	Line 117 | Line 155 | public class JSR166TestCase extends Test
155		System.exit(0);
156		}
157
158	+	public static TestSuite newTestSuite(Object... suiteOrClasses) {
159	+	TestSuite suite = new TestSuite();
160	+	for (Object suiteOrClass : suiteOrClasses) {
161	+	if (suiteOrClass instanceof TestSuite)
162	+	suite.addTest((TestSuite) suiteOrClass);
163	+	else if (suiteOrClass instanceof Class)
164	+	suite.addTest(new TestSuite((Class<?>) suiteOrClass));
165	+	else
166	+	throw new ClassCastException("not a test suite or class");
167	+	}
168	+	return suite;
169	+	}
170	+
171		/**
172	<	* Collects all JSR166 unit tests as one suite
172	>	* Collects all JSR166 unit tests as one suite.
173		*/
174		public static Test suite() {
175	<	TestSuite suite = new TestSuite("JSR166 Unit Tests");
176	<
177	<	suite.addTest(new TestSuite(ForkJoinPoolTest.class));
178	<	suite.addTest(new TestSuite(ForkJoinTaskTest.class));
179	<	suite.addTest(new TestSuite(RecursiveActionTest.class));
180	<	suite.addTest(new TestSuite(RecursiveTaskTest.class));
181	<	suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
182	<	suite.addTest(new TestSuite(PhaserTest.class));
183	<	suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
184	<	suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
185	<	suite.addTest(new TestSuite(AbstractQueueTest.class));
186	<	suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
187	<	suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
188	<	suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
189	<	suite.addTest(new TestSuite(ArrayDequeTest.class));
190	<	suite.addTest(new TestSuite(AtomicBooleanTest.class));
191	<	suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
192	<	suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
193	<	suite.addTest(new TestSuite(AtomicIntegerTest.class));
194	<	suite.addTest(new TestSuite(AtomicLongArrayTest.class));
195	<	suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
196	<	suite.addTest(new TestSuite(AtomicLongTest.class));
197	<	suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
198	<	suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
199	<	suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
200	<	suite.addTest(new TestSuite(AtomicReferenceTest.class));
201	<	suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
202	<	suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
203	<	suite.addTest(new TestSuite(ConcurrentLinkedDequeTest.class));
204	<	suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
205	<	suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
206	<	suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
207	<	suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
208	<	suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
209	<	suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
210	<	suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
211	<	suite.addTest(new TestSuite(CountDownLatchTest.class));
212	<	suite.addTest(new TestSuite(CyclicBarrierTest.class));
213	<	suite.addTest(new TestSuite(DelayQueueTest.class));
214	<	suite.addTest(new TestSuite(EntryTest.class));
215	<	suite.addTest(new TestSuite(ExchangerTest.class));
216	<	suite.addTest(new TestSuite(ExecutorsTest.class));
217	<	suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
218	<	suite.addTest(new TestSuite(FutureTaskTest.class));
219	<	suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
220	<	suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
221	<	suite.addTest(new TestSuite(LinkedListTest.class));
222	<	suite.addTest(new TestSuite(LockSupportTest.class));
223	<	suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
224	<	suite.addTest(new TestSuite(PriorityQueueTest.class));
225	<	suite.addTest(new TestSuite(ReentrantLockTest.class));
226	<	suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
227	<	suite.addTest(new TestSuite(ScheduledExecutorTest.class));
228	<	suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
229	<	suite.addTest(new TestSuite(SemaphoreTest.class));
230	<	suite.addTest(new TestSuite(SynchronousQueueTest.class));
231	<	suite.addTest(new TestSuite(SystemTest.class));
232	<	suite.addTest(new TestSuite(ThreadLocalTest.class));
233	<	suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
234	<	suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
235	<	suite.addTest(new TestSuite(ThreadTest.class));
236	<	suite.addTest(new TestSuite(TimeUnitTest.class));
237	<	suite.addTest(new TestSuite(TreeMapTest.class));
238	<	suite.addTest(new TestSuite(TreeSetTest.class));
239	<	suite.addTest(new TestSuite(TreeSubMapTest.class));
189	<	suite.addTest(new TestSuite(TreeSubSetTest.class));
190	<
191	<	return suite;
175	>	return newTestSuite(
176	>	ForkJoinPoolTest.suite(),
177	>	ForkJoinTaskTest.suite(),
178	>	RecursiveActionTest.suite(),
179	>	RecursiveTaskTest.suite(),
180	>	LinkedTransferQueueTest.suite(),
181	>	PhaserTest.suite(),
182	>	ThreadLocalRandomTest.suite(),
183	>	AbstractExecutorServiceTest.suite(),
184	>	AbstractQueueTest.suite(),
185	>	AbstractQueuedSynchronizerTest.suite(),
186	>	AbstractQueuedLongSynchronizerTest.suite(),
187	>	ArrayBlockingQueueTest.suite(),
188	>	ArrayDequeTest.suite(),
189	>	AtomicBooleanTest.suite(),
190	>	AtomicIntegerArrayTest.suite(),
191	>	AtomicIntegerFieldUpdaterTest.suite(),
192	>	AtomicIntegerTest.suite(),
193	>	AtomicLongArrayTest.suite(),
194	>	AtomicLongFieldUpdaterTest.suite(),
195	>	AtomicLongTest.suite(),
196	>	AtomicMarkableReferenceTest.suite(),
197	>	AtomicReferenceArrayTest.suite(),
198	>	AtomicReferenceFieldUpdaterTest.suite(),
199	>	AtomicReferenceTest.suite(),
200	>	AtomicStampedReferenceTest.suite(),
201	>	ConcurrentHashMapTest.suite(),
202	>	ConcurrentLinkedDequeTest.suite(),
203	>	ConcurrentLinkedQueueTest.suite(),
204	>	ConcurrentSkipListMapTest.suite(),
205	>	ConcurrentSkipListSubMapTest.suite(),
206	>	ConcurrentSkipListSetTest.suite(),
207	>	ConcurrentSkipListSubSetTest.suite(),
208	>	CopyOnWriteArrayListTest.suite(),
209	>	CopyOnWriteArraySetTest.suite(),
210	>	CountDownLatchTest.suite(),
211	>	CyclicBarrierTest.suite(),
212	>	DelayQueueTest.suite(),
213	>	EntryTest.suite(),
214	>	ExchangerTest.suite(),
215	>	ExecutorsTest.suite(),
216	>	ExecutorCompletionServiceTest.suite(),
217	>	FutureTaskTest.suite(),
218	>	LinkedBlockingDequeTest.suite(),
219	>	LinkedBlockingQueueTest.suite(),
220	>	LinkedListTest.suite(),
221	>	LockSupportTest.suite(),
222	>	PriorityBlockingQueueTest.suite(),
223	>	PriorityQueueTest.suite(),
224	>	ReentrantLockTest.suite(),
225	>	ReentrantReadWriteLockTest.suite(),
226	>	ScheduledExecutorTest.suite(),
227	>	ScheduledExecutorSubclassTest.suite(),
228	>	SemaphoreTest.suite(),
229	>	SynchronousQueueTest.suite(),
230	>	SystemTest.suite(),
231	>	ThreadLocalTest.suite(),
232	>	ThreadPoolExecutorTest.suite(),
233	>	ThreadPoolExecutorSubclassTest.suite(),
234	>	ThreadTest.suite(),
235	>	TimeUnitTest.suite(),
236	>	TreeMapTest.suite(),
237	>	TreeSetTest.suite(),
238	>	TreeSubMapTest.suite(),
239	>	TreeSubSetTest.suite());
240		}
241
242
#	Line 214 | Line 262 | public class JSR166TestCase extends Test
262		SHORT_DELAY_MS = getShortDelay();
263		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
264		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
265	<	LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
265	>	LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
266		}
267
268		/**
#	Line 243 | Line 291 | public class JSR166TestCase extends Test
291		* earlier by threadRecordFailure.
292		*/
293		public void tearDown() throws Exception {
294	<	Throwable t = threadFailure.get();
294	>	Throwable t = threadFailure.getAndSet(null);
295		if (t != null) {
296		if (t instanceof Error)
297		throw (Error) t;
#	Line 251 | Line 299 | public class JSR166TestCase extends Test
299		throw (RuntimeException) t;
300		else if (t instanceof Exception)
301		throw (Exception) t;
302	<	else
303	<	throw new AssertionError(t);
302	>	else {
303	>	AssertionFailedError afe =
304	>	new AssertionFailedError(t.toString());
305	>	afe.initCause(t);
306	>	throw afe;
307	>	}
308		}
309		}
310
311		/**
312		* Just like fail(reason), but additionally recording (using
313	<	* threadRecordFailure) any AssertionError thrown, so that the current
314	<	* testcase will fail.
313	>	* threadRecordFailure) any AssertionFailedError thrown, so that
314	>	* the current testcase will fail.
315		*/
316		public void threadFail(String reason) {
317		try {
318		fail(reason);
319	<	} catch (Throwable t) {
319	>	} catch (AssertionFailedError t) {
320		threadRecordFailure(t);
321		fail(reason);
322		}
#	Line 272 | Line 324 | public class JSR166TestCase extends Test
324
325		/**
326		* Just like assertTrue(b), but additionally recording (using
327	<	* threadRecordFailure) any AssertionError thrown, so that the current
328	<	* testcase will fail.
327	>	* threadRecordFailure) any AssertionFailedError thrown, so that
328	>	* the current testcase will fail.
329		*/
330		public void threadAssertTrue(boolean b) {
331		try {
332		assertTrue(b);
333	<	} catch (AssertionError t) {
333	>	} catch (AssertionFailedError t) {
334		threadRecordFailure(t);
335		throw t;
336		}
#	Line 286 | Line 338 | public class JSR166TestCase extends Test
338
339		/**
340		* Just like assertFalse(b), but additionally recording (using
341	<	* threadRecordFailure) any AssertionError thrown, so that the
342	<	* current testcase will fail.
341	>	* threadRecordFailure) any AssertionFailedError thrown, so that
342	>	* the current testcase will fail.
343		*/
344		public void threadAssertFalse(boolean b) {
345		try {
346		assertFalse(b);
347	<	} catch (AssertionError t) {
347	>	} catch (AssertionFailedError t) {
348		threadRecordFailure(t);
349		throw t;
350		}
#	Line 300 | Line 352 | public class JSR166TestCase extends Test
352
353		/**
354		* Just like assertNull(x), but additionally recording (using
355	<	* threadRecordFailure) any AssertionError thrown, so that the
356	<	* current testcase will fail.
355	>	* threadRecordFailure) any AssertionFailedError thrown, so that
356	>	* the current testcase will fail.
357		*/
358		public void threadAssertNull(Object x) {
359		try {
360		assertNull(x);
361	<	} catch (AssertionError t) {
361	>	} catch (AssertionFailedError t) {
362		threadRecordFailure(t);
363		throw t;
364		}
#	Line 314 | Line 366 | public class JSR166TestCase extends Test
366
367		/**
368		* Just like assertEquals(x, y), but additionally recording (using
369	<	* threadRecordFailure) any AssertionError thrown, so that the
370	<	* current testcase will fail.
369	>	* threadRecordFailure) any AssertionFailedError thrown, so that
370	>	* the current testcase will fail.
371		*/
372		public void threadAssertEquals(long x, long y) {
373		try {
374		assertEquals(x, y);
375	<	} catch (AssertionError t) {
375	>	} catch (AssertionFailedError t) {
376		threadRecordFailure(t);
377		throw t;
378		}
#	Line 328 | Line 380 | public class JSR166TestCase extends Test
380
381		/**
382		* Just like assertEquals(x, y), but additionally recording (using
383	<	* threadRecordFailure) any AssertionError thrown, so that the
384	<	* current testcase will fail.
383	>	* threadRecordFailure) any AssertionFailedError thrown, so that
384	>	* the current testcase will fail.
385		*/
386		public void threadAssertEquals(Object x, Object y) {
387		try {
388		assertEquals(x, y);
389	<	} catch (AssertionError t) {
389	>	} catch (AssertionFailedError t) {
390		threadRecordFailure(t);
391		throw t;
392	+	} catch (Throwable t) {
393	+	threadUnexpectedException(t);
394		}
395		}
396
397		/**
398		* Just like assertSame(x, y), but additionally recording (using
399	<	* threadRecordFailure) any AssertionError thrown, so that the
400	<	* current testcase will fail.
399	>	* threadRecordFailure) any AssertionFailedError thrown, so that
400	>	* the current testcase will fail.
401		*/
402		public void threadAssertSame(Object x, Object y) {
403		try {
404		assertSame(x, y);
405	<	} catch (AssertionError t) {
405	>	} catch (AssertionFailedError t) {
406		threadRecordFailure(t);
407		throw t;
408		}
#	Line 369 | Line 423 | public class JSR166TestCase extends Test
423		}
424
425		/**
426	<	* Calls threadFail with message "Unexpected exception" + ex.
426	>	* Records the given exception using {@link #threadRecordFailure},
427	>	* then rethrows the exception, wrapping it in an
428	>	* AssertionFailedError if necessary.
429		*/
430		public void threadUnexpectedException(Throwable t) {
431		threadRecordFailure(t);
432		t.printStackTrace();
377	–	// Rethrow, wrapping in an AssertionError if necessary
433		if (t instanceof RuntimeException)
434		throw (RuntimeException) t;
435		else if (t instanceof Error)
436		throw (Error) t;
437		else {
438	<	AssertionError ae = new AssertionError("unexpected exception: " + t);
438	>	AssertionFailedError afe =
439	>	new AssertionFailedError("unexpected exception: " + t);
440		t.initCause(t);
441	<	throw ae;
442	<	}
441	>	throw afe;
442	>	}
443	>	}
444	>
445	>	/**
446	>	* Delays, via Thread.sleep for the given millisecond delay, but
447	>	* if the sleep is shorter than specified, may re-sleep or yield
448	>	* until time elapses.
449	>	*/
450	>	public static void delay(long ms) throws InterruptedException {
451	>	long startTime = System.nanoTime();
452	>	long ns = ms * 1000 * 1000;
453	>	for (;;) {
454	>	if (ms > 0L)
455	>	Thread.sleep(ms);
456	>	else // too short to sleep
457	>	Thread.yield();
458	>	long d = ns - (System.nanoTime() - startTime);
459	>	if (d > 0L)
460	>	ms = d / (1000 * 1000);
461	>	else
462	>	break;
463	>	}
464		}
465
466		/**
#	Line 393 | Line 470 | public class JSR166TestCase extends Test
470		try {
471		exec.shutdown();
472		assertTrue("ExecutorService did not terminate in a timely manner",
473	<	exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
473	>	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
474		} catch (SecurityException ok) {
475		// Allowed in case test doesn't have privs
476		} catch (InterruptedException ie) {
#	Line 417 | Line 494 | public class JSR166TestCase extends Test
494		}
495
496		/**
420	–	* Fails with message "Unexpected exception: " + ex.
421	–	*/
422	–	public void unexpectedException(Throwable ex) {
423	–	ex.printStackTrace();
424	–	fail("Unexpected exception: " + ex);
425	–	}
426	–
427	–
428	–	/**
497		* The number of elements to place in collections, arrays, etc.
498		*/
499		public static final int SIZE = 20;
#	Line 536 | Line 604 | public class JSR166TestCase extends Test
604		}
605
606		/**
607	<	* Sleep until the timeout has elapsed, or interrupted.
607	>	* Sleeps until the given time has elapsed.
608	>	* Throws AssertionFailedError if interrupted.
609	>	*/
610	>	void sleep(long millis) {
611	>	try {
612	>	delay(millis);
613	>	} catch (InterruptedException ie) {
614	>	AssertionFailedError afe =
615	>	new AssertionFailedError("Unexpected InterruptedException");
616	>	afe.initCause(ie);
617	>	throw afe;
618	>	}
619	>	}
620	>
621	>	/**
622	>	* Sleeps until the timeout has elapsed, or interrupted.
623		* Does <em>NOT</em> throw InterruptedException.
624		*/
625		void sleepTillInterrupted(long timeoutMillis) {
#	Line 546 | Line 629 | public class JSR166TestCase extends Test
629		}
630
631		/**
632	<	* Returns a new started Thread running the given runnable.
632	>	* Waits up to the specified number of milliseconds for the given
633	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
634	>	*/
635	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
636	>	long timeoutNanos = timeoutMillis * 1000L * 1000L;
637	>	long t0 = System.nanoTime();
638	>	for (;;) {
639	>	Thread.State s = thread.getState();
640	>	if (s == Thread.State.BLOCKED ||
641	>	s == Thread.State.WAITING ||
642	>	s == Thread.State.TIMED_WAITING)
643	>	return;
644	>	else if (s == Thread.State.TERMINATED)
645	>	fail("Unexpected thread termination");
646	>	else if (System.nanoTime() - t0 > timeoutNanos) {
647	>	threadAssertTrue(thread.isAlive());
648	>	return;
649	>	}
650	>	Thread.yield();
651	>	}
652	>	}
653	>
654	>	/**
655	>	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
656	>	* state: BLOCKED, WAITING, or TIMED_WAITING.
657	>	*/
658	>	void waitForThreadToEnterWaitState(Thread thread) {
659	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
660	>	}
661	>
662	>	/**
663	>	* Returns the number of milliseconds since time given by
664	>	* startNanoTime, which must have been previously returned from a
665	>	* call to {@link System.nanoTime()}.
666	>	*/
667	>	long millisElapsedSince(long startNanoTime) {
668	>	return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
669	>	}
670	>
671	>	/**
672	>	* Returns a new started daemon Thread running the given runnable.
673		*/
674		Thread newStartedThread(Runnable runnable) {
675		Thread t = new Thread(runnable);
676	+	t.setDaemon(true);
677		t.start();
678		return t;
679		}
680
681	+	/**
682	+	* Waits for the specified time (in milliseconds) for the thread
683	+	* to terminate (using {@link Thread#join(long)}), else interrupts
684	+	* the thread (in the hope that it may terminate later) and fails.
685	+	*/
686	+	void awaitTermination(Thread t, long timeoutMillis) {
687	+	try {
688	+	t.join(timeoutMillis);
689	+	} catch (InterruptedException ie) {
690	+	threadUnexpectedException(ie);
691	+	} finally {
692	+	if (t.isAlive()) {
693	+	t.interrupt();
694	+	fail("Test timed out");
695	+	}
696	+	}
697	+	}
698	+
699	+	/**
700	+	* Waits for LONG_DELAY_MS milliseconds for the thread to
701	+	* terminate (using {@link Thread#join(long)}), else interrupts
702	+	* the thread (in the hope that it may terminate later) and fails.
703	+	*/
704	+	void awaitTermination(Thread t) {
705	+	awaitTermination(t, LONG_DELAY_MS);
706	+	}
707	+
708		// Some convenient Runnable classes
709
710		public abstract class CheckedRunnable implements Runnable {
#	Line 668 | Line 819 | public class JSR166TestCase extends Test
819
820		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
821		return new CheckedCallable<String>() {
822	<	public String realCall() {
822	>	protected String realCall() {
823		try {
824		latch.await();
825		} catch (InterruptedException quittingTime) {}
#	Line 676 | Line 827 | public class JSR166TestCase extends Test
827		}};
828		}
829
830	+	public Runnable awaiter(final CountDownLatch latch) {
831	+	return new CheckedRunnable() {
832	+	public void realRun() throws InterruptedException {
833	+	latch.await();
834	+	}};
835	+	}
836	+
837		public static class NPETask implements Callable<String> {
838		public String call() { throw new NullPointerException(); }
839		}
#	Line 686 | Line 844 | public class JSR166TestCase extends Test
844
845		public class ShortRunnable extends CheckedRunnable {
846		protected void realRun() throws Throwable {
847	<	Thread.sleep(SHORT_DELAY_MS);
847	>	delay(SHORT_DELAY_MS);
848		}
849		}
850
851		public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
852		protected void realRun() throws InterruptedException {
853	<	Thread.sleep(SHORT_DELAY_MS);
853	>	delay(SHORT_DELAY_MS);
854		}
855		}
856
857		public class SmallRunnable extends CheckedRunnable {
858		protected void realRun() throws Throwable {
859	<	Thread.sleep(SMALL_DELAY_MS);
859	>	delay(SMALL_DELAY_MS);
860		}
861		}
862
863		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
864		protected void realRun() {
865		try {
866	<	Thread.sleep(SMALL_DELAY_MS);
866	>	delay(SMALL_DELAY_MS);
867		} catch (InterruptedException ok) {}
868		}
869		}
870
871		public class SmallCallable extends CheckedCallable {
872		protected Object realCall() throws InterruptedException {
873	<	Thread.sleep(SMALL_DELAY_MS);
873	>	delay(SMALL_DELAY_MS);
874		return Boolean.TRUE;
875		}
876		}
877
720	–	public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
721	–	protected void realRun() throws InterruptedException {
722	–	Thread.sleep(SMALL_DELAY_MS);
723	–	}
724	–	}
725	–
878		public class MediumRunnable extends CheckedRunnable {
879		protected void realRun() throws Throwable {
880	<	Thread.sleep(MEDIUM_DELAY_MS);
880	>	delay(MEDIUM_DELAY_MS);
881		}
882		}
883
884		public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
885		protected void realRun() throws InterruptedException {
886	<	Thread.sleep(MEDIUM_DELAY_MS);
886	>	delay(MEDIUM_DELAY_MS);
887		}
888		}
889
890	+	public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
891	+	return new CheckedRunnable() {
892	+	protected void realRun() {
893	+	try {
894	+	delay(timeoutMillis);
895	+	} catch (InterruptedException ok) {}
896	+	}};
897	+	}
898	+
899		public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
900		protected void realRun() {
901		try {
902	<	Thread.sleep(MEDIUM_DELAY_MS);
902	>	delay(MEDIUM_DELAY_MS);
903		} catch (InterruptedException ok) {}
904		}
905		}
#	Line 746 | Line 907 | public class JSR166TestCase extends Test
907		public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
908		protected void realRun() {
909		try {
910	<	Thread.sleep(LONG_DELAY_MS);
910	>	delay(LONG_DELAY_MS);
911		} catch (InterruptedException ok) {}
912		}
913		}
#	Line 760 | Line 921 | public class JSR166TestCase extends Test
921		}
922		}
923
924	+	public interface TrackedRunnable extends Runnable {
925	+	boolean isDone();
926	+	}
927	+
928	+	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
929	+	return new TrackedRunnable() {
930	+	private volatile boolean done = false;
931	+	public boolean isDone() { return done; }
932	+	public void run() {
933	+	try {
934	+	delay(timeoutMillis);
935	+	done = true;
936	+	} catch (InterruptedException ok) {}
937	+	}
938	+	};
939	+	}
940	+
941		public static class TrackedShortRunnable implements Runnable {
942		public volatile boolean done = false;
943		public void run() {
944		try {
945	<	Thread.sleep(SMALL_DELAY_MS);
945	>	delay(SHORT_DELAY_MS);
946	>	done = true;
947	>	} catch (InterruptedException ok) {}
948	>	}
949	>	}
950	>
951	>	public static class TrackedSmallRunnable implements Runnable {
952	>	public volatile boolean done = false;
953	>	public void run() {
954	>	try {
955	>	delay(SMALL_DELAY_MS);
956		done = true;
957		} catch (InterruptedException ok) {}
958		}
#	Line 774 | Line 962 | public class JSR166TestCase extends Test
962		public volatile boolean done = false;
963		public void run() {
964		try {
965	<	Thread.sleep(MEDIUM_DELAY_MS);
965	>	delay(MEDIUM_DELAY_MS);
966		done = true;
967		} catch (InterruptedException ok) {}
968		}
#	Line 784 | Line 972 | public class JSR166TestCase extends Test
972		public volatile boolean done = false;
973		public void run() {
974		try {
975	<	Thread.sleep(LONG_DELAY_MS);
975	>	delay(LONG_DELAY_MS);
976		done = true;
977		} catch (InterruptedException ok) {}
978		}
#	Line 801 | Line 989 | public class JSR166TestCase extends Test
989		public volatile boolean done = false;
990		public Object call() {
991		try {
992	<	Thread.sleep(SMALL_DELAY_MS);
992	>	delay(SMALL_DELAY_MS);
993		done = true;
994		} catch (InterruptedException ok) {}
995		return Boolean.TRUE;
#	Line 847 | Line 1035 | public class JSR166TestCase extends Test
1035		ThreadPoolExecutor executor) {}
1036		}
1037
1038	+	/**
1039	+	* A CyclicBarrier that fails with AssertionFailedErrors instead
1040	+	* of throwing checked exceptions.
1041	+	*/
1042	+	public class CheckedBarrier extends CyclicBarrier {
1043	+	public CheckedBarrier(int parties) { super(parties); }
1044	+
1045	+	public int await() {
1046	+	try {
1047	+	return super.await();
1048	+	} catch (Exception e) {
1049	+	AssertionFailedError afe =
1050	+	new AssertionFailedError("Unexpected exception: " + e);
1051	+	afe.initCause(e);
1052	+	throw afe;
1053	+	}
1054	+	}
1055	+	}
1056	+
1057	+	public void checkEmpty(BlockingQueue q) {
1058	+	try {
1059	+	assertTrue(q.isEmpty());
1060	+	assertEquals(0, q.size());
1061	+	assertNull(q.peek());
1062	+	assertNull(q.poll());
1063	+	assertNull(q.poll(0, MILLISECONDS));
1064	+	assertEquals(q.toString(), "[]");
1065	+	assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1066	+	assertFalse(q.iterator().hasNext());
1067	+	try {
1068	+	q.element();
1069	+	shouldThrow();
1070	+	} catch (NoSuchElementException success) {}
1071	+	try {
1072	+	q.iterator().next();
1073	+	shouldThrow();
1074	+	} catch (NoSuchElementException success) {}
1075	+	try {
1076	+	q.remove();
1077	+	shouldThrow();
1078	+	} catch (NoSuchElementException success) {}
1079	+	} catch (InterruptedException ie) {
1080	+	threadUnexpectedException(ie);
1081	+	}
1082	+	}
1083	+
1084		}

Diff Legend

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