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.57 by jsr166, Mon Oct 4 05:45:19 2010 UTC vs.
Revision 1.83 by jsr166, Fri May 27 19:29:59 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.io.ByteArrayInputStream;
11	+	import java.io.ByteArrayOutputStream;
12	+	import java.io.ObjectInputStream;
13	+	import java.io.ObjectOutputStream;
14	+	import java.util.Arrays;
15	+	import java.util.Date;
16	+	import java.util.NoSuchElementException;
17		import java.util.PropertyPermission;
18		import java.util.concurrent.*;
19	+	import java.util.concurrent.atomic.AtomicBoolean;
20		import java.util.concurrent.atomic.AtomicReference;
21		import static java.util.concurrent.TimeUnit.MILLISECONDS;
22	+	import static java.util.concurrent.TimeUnit.NANOSECONDS;
23		import java.security.CodeSource;
24		import java.security.Permission;
25		import java.security.PermissionCollection;
#	Line 96 | Line 105 | public class JSR166TestCase extends Test
105		private static final boolean useSecurityManager =
106		Boolean.getBoolean("jsr166.useSecurityManager");
107
108	+	protected static final boolean expensiveTests =
109	+	Boolean.getBoolean("jsr166.expensiveTests");
110	+
111	+	/**
112	+	* If true, report on stdout all "slow" tests, that is, ones that
113	+	* take more than profileThreshold milliseconds to execute.
114	+	*/
115	+	private static final boolean profileTests =
116	+	Boolean.getBoolean("jsr166.profileTests");
117	+
118	+	/**
119	+	* The number of milliseconds that tests are permitted for
120	+	* execution without being reported, when profileTests is set.
121	+	*/
122	+	private static final long profileThreshold =
123	+	Long.getLong("jsr166.profileThreshold", 100);
124	+
125	+	protected void runTest() throws Throwable {
126	+	if (profileTests)
127	+	runTestProfiled();
128	+	else
129	+	super.runTest();
130	+	}
131	+
132	+	protected void runTestProfiled() throws Throwable {
133	+	long t0 = System.nanoTime();
134	+	try {
135	+	super.runTest();
136	+	} finally {
137	+	long elapsedMillis =
138	+	(System.nanoTime() - t0) / (1000L * 1000L);
139	+	if (elapsedMillis >= profileThreshold)
140	+	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
141	+	}
142	+	}
143	+
144		/**
145		* Runs all JSR166 unit tests using junit.textui.TestRunner
146		*/
#	Line 116 | Line 161 | public class JSR166TestCase extends Test
161		System.exit(0);
162		}
163
164	+	public static TestSuite newTestSuite(Object... suiteOrClasses) {
165	+	TestSuite suite = new TestSuite();
166	+	for (Object suiteOrClass : suiteOrClasses) {
167	+	if (suiteOrClass instanceof TestSuite)
168	+	suite.addTest((TestSuite) suiteOrClass);
169	+	else if (suiteOrClass instanceof Class)
170	+	suite.addTest(new TestSuite((Class<?>) suiteOrClass));
171	+	else
172	+	throw new ClassCastException("not a test suite or class");
173	+	}
174	+	return suite;
175	+	}
176	+
177		/**
178	<	* Collects all JSR166 unit tests as one suite
178	>	* Collects all JSR166 unit tests as one suite.
179		*/
180		public static Test suite() {
181	<	TestSuite suite = new TestSuite("JSR166 Unit Tests");
182	<
183	<	suite.addTest(ForkJoinPoolTest.suite());
184	<	suite.addTest(ForkJoinTaskTest.suite());
185	<	suite.addTest(RecursiveActionTest.suite());
186	<	suite.addTest(RecursiveTaskTest.suite());
187	<	suite.addTest(LinkedTransferQueueTest.suite());
188	<	suite.addTest(PhaserTest.suite());
189	<	suite.addTest(ThreadLocalRandomTest.suite());
190	<	suite.addTest(AbstractExecutorServiceTest.suite());
191	<	suite.addTest(AbstractQueueTest.suite());
192	<	suite.addTest(AbstractQueuedSynchronizerTest.suite());
193	<	suite.addTest(AbstractQueuedLongSynchronizerTest.suite());
194	<	suite.addTest(ArrayBlockingQueueTest.suite());
195	<	suite.addTest(ArrayDequeTest.suite());
196	<	suite.addTest(AtomicBooleanTest.suite());
197	<	suite.addTest(AtomicIntegerArrayTest.suite());
198	<	suite.addTest(AtomicIntegerFieldUpdaterTest.suite());
199	<	suite.addTest(AtomicIntegerTest.suite());
200	<	suite.addTest(AtomicLongArrayTest.suite());
201	<	suite.addTest(AtomicLongFieldUpdaterTest.suite());
202	<	suite.addTest(AtomicLongTest.suite());
203	<	suite.addTest(AtomicMarkableReferenceTest.suite());
204	<	suite.addTest(AtomicReferenceArrayTest.suite());
205	<	suite.addTest(AtomicReferenceFieldUpdaterTest.suite());
206	<	suite.addTest(AtomicReferenceTest.suite());
207	<	suite.addTest(AtomicStampedReferenceTest.suite());
208	<	suite.addTest(ConcurrentHashMapTest.suite());
209	<	suite.addTest(ConcurrentLinkedDequeTest.suite());
210	<	suite.addTest(ConcurrentLinkedQueueTest.suite());
211	<	suite.addTest(ConcurrentSkipListMapTest.suite());
212	<	suite.addTest(ConcurrentSkipListSubMapTest.suite());
213	<	suite.addTest(ConcurrentSkipListSetTest.suite());
214	<	suite.addTest(ConcurrentSkipListSubSetTest.suite());
215	<	suite.addTest(CopyOnWriteArrayListTest.suite());
216	<	suite.addTest(CopyOnWriteArraySetTest.suite());
217	<	suite.addTest(CountDownLatchTest.suite());
218	<	suite.addTest(CyclicBarrierTest.suite());
219	<	suite.addTest(DelayQueueTest.suite());
220	<	suite.addTest(EntryTest.suite());
221	<	suite.addTest(ExchangerTest.suite());
222	<	suite.addTest(ExecutorsTest.suite());
223	<	suite.addTest(ExecutorCompletionServiceTest.suite());
224	<	suite.addTest(FutureTaskTest.suite());
225	<	suite.addTest(LinkedBlockingDequeTest.suite());
226	<	suite.addTest(LinkedBlockingQueueTest.suite());
227	<	suite.addTest(LinkedListTest.suite());
228	<	suite.addTest(LockSupportTest.suite());
229	<	suite.addTest(PriorityBlockingQueueTest.suite());
230	<	suite.addTest(PriorityQueueTest.suite());
231	<	suite.addTest(ReentrantLockTest.suite());
232	<	suite.addTest(ReentrantReadWriteLockTest.suite());
233	<	suite.addTest(ScheduledExecutorTest.suite());
234	<	suite.addTest(ScheduledExecutorSubclassTest.suite());
235	<	suite.addTest(SemaphoreTest.suite());
236	<	suite.addTest(SynchronousQueueTest.suite());
237	<	suite.addTest(SystemTest.suite());
238	<	suite.addTest(ThreadLocalTest.suite());
239	<	suite.addTest(ThreadPoolExecutorTest.suite());
240	<	suite.addTest(ThreadPoolExecutorSubclassTest.suite());
241	<	suite.addTest(ThreadTest.suite());
242	<	suite.addTest(TimeUnitTest.suite());
243	<	suite.addTest(TreeMapTest.suite());
244	<	suite.addTest(TreeSetTest.suite());
245	<	suite.addTest(TreeSubMapTest.suite());
188	<	suite.addTest(TreeSubSetTest.suite());
189	<
190	<	return suite;
181	>	return newTestSuite(
182	>	ForkJoinPoolTest.suite(),
183	>	ForkJoinTaskTest.suite(),
184	>	RecursiveActionTest.suite(),
185	>	RecursiveTaskTest.suite(),
186	>	LinkedTransferQueueTest.suite(),
187	>	PhaserTest.suite(),
188	>	ThreadLocalRandomTest.suite(),
189	>	AbstractExecutorServiceTest.suite(),
190	>	AbstractQueueTest.suite(),
191	>	AbstractQueuedSynchronizerTest.suite(),
192	>	AbstractQueuedLongSynchronizerTest.suite(),
193	>	ArrayBlockingQueueTest.suite(),
194	>	ArrayDequeTest.suite(),
195	>	AtomicBooleanTest.suite(),
196	>	AtomicIntegerArrayTest.suite(),
197	>	AtomicIntegerFieldUpdaterTest.suite(),
198	>	AtomicIntegerTest.suite(),
199	>	AtomicLongArrayTest.suite(),
200	>	AtomicLongFieldUpdaterTest.suite(),
201	>	AtomicLongTest.suite(),
202	>	AtomicMarkableReferenceTest.suite(),
203	>	AtomicReferenceArrayTest.suite(),
204	>	AtomicReferenceFieldUpdaterTest.suite(),
205	>	AtomicReferenceTest.suite(),
206	>	AtomicStampedReferenceTest.suite(),
207	>	ConcurrentHashMapTest.suite(),
208	>	ConcurrentLinkedDequeTest.suite(),
209	>	ConcurrentLinkedQueueTest.suite(),
210	>	ConcurrentSkipListMapTest.suite(),
211	>	ConcurrentSkipListSubMapTest.suite(),
212	>	ConcurrentSkipListSetTest.suite(),
213	>	ConcurrentSkipListSubSetTest.suite(),
214	>	CopyOnWriteArrayListTest.suite(),
215	>	CopyOnWriteArraySetTest.suite(),
216	>	CountDownLatchTest.suite(),
217	>	CyclicBarrierTest.suite(),
218	>	DelayQueueTest.suite(),
219	>	EntryTest.suite(),
220	>	ExchangerTest.suite(),
221	>	ExecutorsTest.suite(),
222	>	ExecutorCompletionServiceTest.suite(),
223	>	FutureTaskTest.suite(),
224	>	LinkedBlockingDequeTest.suite(),
225	>	LinkedBlockingQueueTest.suite(),
226	>	LinkedListTest.suite(),
227	>	LockSupportTest.suite(),
228	>	PriorityBlockingQueueTest.suite(),
229	>	PriorityQueueTest.suite(),
230	>	ReentrantLockTest.suite(),
231	>	ReentrantReadWriteLockTest.suite(),
232	>	ScheduledExecutorTest.suite(),
233	>	ScheduledExecutorSubclassTest.suite(),
234	>	SemaphoreTest.suite(),
235	>	SynchronousQueueTest.suite(),
236	>	SystemTest.suite(),
237	>	ThreadLocalTest.suite(),
238	>	ThreadPoolExecutorTest.suite(),
239	>	ThreadPoolExecutorSubclassTest.suite(),
240	>	ThreadTest.suite(),
241	>	TimeUnitTest.suite(),
242	>	TreeMapTest.suite(),
243	>	TreeSetTest.suite(),
244	>	TreeSubMapTest.suite(),
245	>	TreeSubSetTest.suite());
246		}
247
248
#	Line 205 | Line 260 | public class JSR166TestCase extends Test
260		return 50;
261		}
262
208	–
263		/**
264		* Sets delays as multiples of SHORT_DELAY.
265		*/
#	Line 213 | Line 267 | public class JSR166TestCase extends Test
267		SHORT_DELAY_MS = getShortDelay();
268		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
269		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
270	<	LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
270	>	LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
271	>	}
272	>
273	>	/**
274	>	* Returns a timeout in milliseconds to be used in tests that
275	>	* verify that operations block or time out.
276	>	*/
277	>	long timeoutMillis() {
278	>	return SHORT_DELAY_MS / 4;
279	>	}
280	>
281	>	/**
282	>	* Returns a new Date instance representing a time delayMillis
283	>	* milliseconds in the future.
284	>	*/
285	>	Date delayedDate(long delayMillis) {
286	>	return new Date(new Date().getTime() + delayMillis);
287		}
288
289		/**
#	Line 242 | Line 312 | public class JSR166TestCase extends Test
312		* earlier by threadRecordFailure.
313		*/
314		public void tearDown() throws Exception {
315	<	Throwable t = threadFailure.get();
315	>	Throwable t = threadFailure.getAndSet(null);
316		if (t != null) {
317		if (t instanceof Error)
318		throw (Error) t;
#	Line 388 | Line 458 | public class JSR166TestCase extends Test
458		else {
459		AssertionFailedError afe =
460		new AssertionFailedError("unexpected exception: " + t);
461	<	t.initCause(t);
461	>	afe.initCause(t);
462		throw afe;
463		}
464		}
465
466		/**
467	+	* Delays, via Thread.sleep, for the given millisecond delay, but
468	+	* if the sleep is shorter than specified, may re-sleep or yield
469	+	* until time elapses.
470	+	*/
471	+	static void delay(long millis) throws InterruptedException {
472	+	long startTime = System.nanoTime();
473	+	long ns = millis * 1000 * 1000;
474	+	for (;;) {
475	+	if (millis > 0L)
476	+	Thread.sleep(millis);
477	+	else // too short to sleep
478	+	Thread.yield();
479	+	long d = ns - (System.nanoTime() - startTime);
480	+	if (d > 0L)
481	+	millis = d / (1000 * 1000);
482	+	else
483	+	break;
484	+	}
485	+	}
486	+
487	+	/**
488		* Waits out termination of a thread pool or fails doing so.
489		*/
490	<	public void joinPool(ExecutorService exec) {
490	>	void joinPool(ExecutorService exec) {
491		try {
492		exec.shutdown();
493		assertTrue("ExecutorService did not terminate in a timely manner",
494	<	exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
494	>	exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
495		} catch (SecurityException ok) {
496		// Allowed in case test doesn't have privs
497		} catch (InterruptedException ie) {
#	Line 408 | Line 499 | public class JSR166TestCase extends Test
499		}
500		}
501
502	+	/**
503	+	* Checks that thread does not terminate within the default
504	+	* millisecond delay of {@code timeoutMillis()}.
505	+	*/
506	+	void assertThreadStaysAlive(Thread thread) {
507	+	assertThreadStaysAlive(thread, timeoutMillis());
508	+	}
509	+
510	+	/**
511	+	* Checks that thread does not terminate within the given millisecond delay.
512	+	*/
513	+	void assertThreadStaysAlive(Thread thread, long millis) {
514	+	try {
515	+	// No need to optimize the failing case via Thread.join.
516	+	delay(millis);
517	+	assertTrue(thread.isAlive());
518	+	} catch (InterruptedException ie) {
519	+	fail("Unexpected InterruptedException");
520	+	}
521	+	}
522	+
523	+	/**
524	+	* Checks that future.get times out, with the default timeout of
525	+	* {@code timeoutMillis()}.
526	+	*/
527	+	void assertFutureTimesOut(Future future) {
528	+	assertFutureTimesOut(future, timeoutMillis());
529	+	}
530	+
531	+	/**
532	+	* Checks that future.get times out, with the given millisecond timeout.
533	+	*/
534	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
535	+	long startTime = System.nanoTime();
536	+	try {
537	+	future.get(timeoutMillis, MILLISECONDS);
538	+	shouldThrow();
539	+	} catch (TimeoutException success) {
540	+	} catch (Exception e) {
541	+	threadUnexpectedException(e);
542	+	} finally { future.cancel(true); }
543	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
544	+	}
545
546		/**
547		* Fails with message "should throw exception".
#	Line 534 | Line 668 | public class JSR166TestCase extends Test
668		}
669
670		/**
671	<	* Sleep until the timeout has elapsed, or interrupted.
672	<	* Does <em>NOT</em> throw InterruptedException.
671	>	* Sleeps until the given time has elapsed.
672	>	* Throws AssertionFailedError if interrupted.
673		*/
674	<	void sleepTillInterrupted(long timeoutMillis) {
674	>	void sleep(long millis) {
675		try {
676	<	Thread.sleep(timeoutMillis);
677	<	} catch (InterruptedException wakeup) {}
676	>	delay(millis);
677	>	} catch (InterruptedException ie) {
678	>	AssertionFailedError afe =
679	>	new AssertionFailedError("Unexpected InterruptedException");
680	>	afe.initCause(ie);
681	>	throw afe;
682	>	}
683	>	}
684	>
685	>	/**
686	>	* Waits up to the specified number of milliseconds for the given
687	>	* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
688	>	*/
689	>	void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
690	>	long timeoutNanos = timeoutMillis * 1000L * 1000L;
691	>	long t0 = System.nanoTime();
692	>	for (;;) {
693	>	Thread.State s = thread.getState();
694	>	if (s == Thread.State.BLOCKED ||
695	>	s == Thread.State.WAITING ||
696	>	s == Thread.State.TIMED_WAITING)
697	>	return;
698	>	else if (s == Thread.State.TERMINATED)
699	>	fail("Unexpected thread termination");
700	>	else if (System.nanoTime() - t0 > timeoutNanos) {
701	>	threadAssertTrue(thread.isAlive());
702	>	return;
703	>	}
704	>	Thread.yield();
705	>	}
706	>	}
707	>
708	>	/**
709	>	* Waits up to LONG_DELAY_MS for the given thread to enter a wait
710	>	* state: BLOCKED, WAITING, or TIMED_WAITING.
711	>	*/
712	>	void waitForThreadToEnterWaitState(Thread thread) {
713	>	waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
714		}
715
716		/**
717	<	* Returns a new started Thread running the given runnable.
717	>	* Returns the number of milliseconds since time given by
718	>	* startNanoTime, which must have been previously returned from a
719	>	* call to {@link System.nanoTime()}.
720	>	*/
721	>	long millisElapsedSince(long startNanoTime) {
722	>	return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
723	>	}
724	>
725	>	/**
726	>	* Returns a new started daemon Thread running the given runnable.
727		*/
728		Thread newStartedThread(Runnable runnable) {
729		Thread t = new Thread(runnable);
730	+	t.setDaemon(true);
731		t.start();
732		return t;
733		}
734
735	+	/**
736	+	* Waits for the specified time (in milliseconds) for the thread
737	+	* to terminate (using {@link Thread#join(long)}), else interrupts
738	+	* the thread (in the hope that it may terminate later) and fails.
739	+	*/
740	+	void awaitTermination(Thread t, long timeoutMillis) {
741	+	try {
742	+	t.join(timeoutMillis);
743	+	} catch (InterruptedException ie) {
744	+	threadUnexpectedException(ie);
745	+	} finally {
746	+	if (t.getState() != Thread.State.TERMINATED) {
747	+	t.interrupt();
748	+	fail("Test timed out");
749	+	}
750	+	}
751	+	}
752	+
753	+	/**
754	+	* Waits for LONG_DELAY_MS milliseconds for the thread to
755	+	* terminate (using {@link Thread#join(long)}), else interrupts
756	+	* the thread (in the hope that it may terminate later) and fails.
757	+	*/
758	+	void awaitTermination(Thread t) {
759	+	awaitTermination(t, LONG_DELAY_MS);
760	+	}
761	+
762		// Some convenient Runnable classes
763
764		public abstract class CheckedRunnable implements Runnable {
#	Line 614 | Line 821 | public class JSR166TestCase extends Test
821		realRun();
822		threadShouldThrow("InterruptedException");
823		} catch (InterruptedException success) {
824	+	threadAssertFalse(Thread.interrupted());
825		} catch (Throwable t) {
826		threadUnexpectedException(t);
827		}
#	Line 643 | Line 851 | public class JSR166TestCase extends Test
851		threadShouldThrow("InterruptedException");
852		return result;
853		} catch (InterruptedException success) {
854	+	threadAssertFalse(Thread.interrupted());
855		} catch (Throwable t) {
856		threadUnexpectedException(t);
857		}
#	Line 666 | Line 875 | public class JSR166TestCase extends Test
875
876		public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
877		return new CheckedCallable<String>() {
878	<	public String realCall() {
878	>	protected String realCall() {
879		try {
880		latch.await();
881		} catch (InterruptedException quittingTime) {}
#	Line 674 | Line 883 | public class JSR166TestCase extends Test
883		}};
884		}
885
886	+	public Runnable awaiter(final CountDownLatch latch) {
887	+	return new CheckedRunnable() {
888	+	public void realRun() throws InterruptedException {
889	+	await(latch);
890	+	}};
891	+	}
892	+
893	+	public void await(CountDownLatch latch) {
894	+	try {
895	+	assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
896	+	} catch (Throwable t) {
897	+	threadUnexpectedException(t);
898	+	}
899	+	}
900	+
901	+	//     /**
902	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
903	+	//      */
904	+	//     public void await(AtomicBoolean flag) {
905	+	//         await(flag, LONG_DELAY_MS);
906	+	//     }
907	+
908	+	//     /**
909	+	//      * Spin-waits up to the specified timeout until flag becomes true.
910	+	//      */
911	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
912	+	//         long startTime = System.nanoTime();
913	+	//         while (!flag.get()) {
914	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
915	+	//                 throw new AssertionFailedError("timed out");
916	+	//             Thread.yield();
917	+	//         }
918	+	//     }
919	+
920		public static class NPETask implements Callable<String> {
921		public String call() { throw new NullPointerException(); }
922		}
#	Line 684 | Line 927 | public class JSR166TestCase extends Test
927
928		public class ShortRunnable extends CheckedRunnable {
929		protected void realRun() throws Throwable {
930	<	Thread.sleep(SHORT_DELAY_MS);
930	>	delay(SHORT_DELAY_MS);
931		}
932		}
933
934		public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
935		protected void realRun() throws InterruptedException {
936	<	Thread.sleep(SHORT_DELAY_MS);
936	>	delay(SHORT_DELAY_MS);
937		}
938		}
939
940		public class SmallRunnable extends CheckedRunnable {
941		protected void realRun() throws Throwable {
942	<	Thread.sleep(SMALL_DELAY_MS);
942	>	delay(SMALL_DELAY_MS);
943		}
944		}
945
946		public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
947		protected void realRun() {
948		try {
949	<	Thread.sleep(SMALL_DELAY_MS);
949	>	delay(SMALL_DELAY_MS);
950		} catch (InterruptedException ok) {}
951		}
952		}
953
954		public class SmallCallable extends CheckedCallable {
955		protected Object realCall() throws InterruptedException {
956	<	Thread.sleep(SMALL_DELAY_MS);
956	>	delay(SMALL_DELAY_MS);
957		return Boolean.TRUE;
958		}
959		}
960
961		public class MediumRunnable extends CheckedRunnable {
962		protected void realRun() throws Throwable {
963	<	Thread.sleep(MEDIUM_DELAY_MS);
963	>	delay(MEDIUM_DELAY_MS);
964		}
965		}
966
967		public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
968		protected void realRun() throws InterruptedException {
969	<	Thread.sleep(MEDIUM_DELAY_MS);
969	>	delay(MEDIUM_DELAY_MS);
970		}
971		}
972
973	+	public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
974	+	return new CheckedRunnable() {
975	+	protected void realRun() {
976	+	try {
977	+	delay(timeoutMillis);
978	+	} catch (InterruptedException ok) {}
979	+	}};
980	+	}
981	+
982		public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
983		protected void realRun() {
984		try {
985	<	Thread.sleep(MEDIUM_DELAY_MS);
985	>	delay(MEDIUM_DELAY_MS);
986		} catch (InterruptedException ok) {}
987		}
988		}
#	Line 738 | Line 990 | public class JSR166TestCase extends Test
990		public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
991		protected void realRun() {
992		try {
993	<	Thread.sleep(LONG_DELAY_MS);
993	>	delay(LONG_DELAY_MS);
994		} catch (InterruptedException ok) {}
995		}
996		}
#	Line 752 | Line 1004 | public class JSR166TestCase extends Test
1004		}
1005		}
1006
1007	+	public interface TrackedRunnable extends Runnable {
1008	+	boolean isDone();
1009	+	}
1010	+
1011	+	public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1012	+	return new TrackedRunnable() {
1013	+	private volatile boolean done = false;
1014	+	public boolean isDone() { return done; }
1015	+	public void run() {
1016	+	try {
1017	+	delay(timeoutMillis);
1018	+	done = true;
1019	+	} catch (InterruptedException ok) {}
1020	+	}
1021	+	};
1022	+	}
1023	+
1024		public static class TrackedShortRunnable implements Runnable {
1025		public volatile boolean done = false;
1026		public void run() {
1027		try {
1028	<	Thread.sleep(SMALL_DELAY_MS);
1028	>	delay(SHORT_DELAY_MS);
1029	>	done = true;
1030	>	} catch (InterruptedException ok) {}
1031	>	}
1032	>	}
1033	>
1034	>	public static class TrackedSmallRunnable implements Runnable {
1035	>	public volatile boolean done = false;
1036	>	public void run() {
1037	>	try {
1038	>	delay(SMALL_DELAY_MS);
1039		done = true;
1040		} catch (InterruptedException ok) {}
1041		}
#	Line 766 | Line 1045 | public class JSR166TestCase extends Test
1045		public volatile boolean done = false;
1046		public void run() {
1047		try {
1048	<	Thread.sleep(MEDIUM_DELAY_MS);
1048	>	delay(MEDIUM_DELAY_MS);
1049		done = true;
1050		} catch (InterruptedException ok) {}
1051		}
#	Line 776 | Line 1055 | public class JSR166TestCase extends Test
1055		public volatile boolean done = false;
1056		public void run() {
1057		try {
1058	<	Thread.sleep(LONG_DELAY_MS);
1058	>	delay(LONG_DELAY_MS);
1059		done = true;
1060		} catch (InterruptedException ok) {}
1061		}
#	Line 793 | Line 1072 | public class JSR166TestCase extends Test
1072		public volatile boolean done = false;
1073		public Object call() {
1074		try {
1075	<	Thread.sleep(SMALL_DELAY_MS);
1075	>	delay(SMALL_DELAY_MS);
1076		done = true;
1077		} catch (InterruptedException ok) {}
1078		return Boolean.TRUE;
#	Line 839 | Line 1118 | public class JSR166TestCase extends Test
1118		ThreadPoolExecutor executor) {}
1119		}
1120
1121	+	/**
1122	+	* A CyclicBarrier that fails with AssertionFailedErrors instead
1123	+	* of throwing checked exceptions.
1124	+	*/
1125	+	public class CheckedBarrier extends CyclicBarrier {
1126	+	public CheckedBarrier(int parties) { super(parties); }
1127	+
1128	+	public int await() {
1129	+	try {
1130	+	return super.await();
1131	+	} catch (Exception e) {
1132	+	AssertionFailedError afe =
1133	+	new AssertionFailedError("Unexpected exception: " + e);
1134	+	afe.initCause(e);
1135	+	throw afe;
1136	+	}
1137	+	}
1138	+	}
1139	+
1140	+	void checkEmpty(BlockingQueue q) {
1141	+	try {
1142	+	assertTrue(q.isEmpty());
1143	+	assertEquals(0, q.size());
1144	+	assertNull(q.peek());
1145	+	assertNull(q.poll());
1146	+	assertNull(q.poll(0, MILLISECONDS));
1147	+	assertEquals(q.toString(), "[]");
1148	+	assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1149	+	assertFalse(q.iterator().hasNext());
1150	+	try {
1151	+	q.element();
1152	+	shouldThrow();
1153	+	} catch (NoSuchElementException success) {}
1154	+	try {
1155	+	q.iterator().next();
1156	+	shouldThrow();
1157	+	} catch (NoSuchElementException success) {}
1158	+	try {
1159	+	q.remove();
1160	+	shouldThrow();
1161	+	} catch (NoSuchElementException success) {}
1162	+	} catch (InterruptedException ie) {
1163	+	threadUnexpectedException(ie);
1164	+	}
1165	+	}
1166	+
1167	+	@SuppressWarnings("unchecked")
1168	+	<T> T serialClone(T o) {
1169	+	try {
1170	+	ByteArrayOutputStream bos = new ByteArrayOutputStream();
1171	+	ObjectOutputStream oos = new ObjectOutputStream(bos);
1172	+	oos.writeObject(o);
1173	+	oos.flush();
1174	+	oos.close();
1175	+	ByteArrayInputStream bin =
1176	+	new ByteArrayInputStream(bos.toByteArray());
1177	+	ObjectInputStream ois = new ObjectInputStream(bin);
1178	+	return (T) ois.readObject();
1179	+	} catch (Throwable t) {
1180	+	threadUnexpectedException(t);
1181	+	return null;
1182	+	}
1183	+	}
1184		}

Diff Legend

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