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.8 by dl, Mon Nov 3 13:50:07 2003 UTC vs.
Revision 1.26 by dl, Thu Mar 31 15:24:29 2005 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by members of JCP JSR-166 Expert Group and released to the
3	<	* public domain. Use, modify, and redistribute this code in any way
4	<	* without acknowledgement. Other contributors include Andrew Wright,
5	<	* Jeffrey Hayes, Pat Fischer, Mike Judd.
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
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
#	Line 22 | Line 23 | import java.security.*;
23		* <ol>
24		*
25		* <li> All assertions in code running in generated threads must use
26	<	* the forms {@link threadFail} , {@link threadAssertTrue} {@link
27	<	* threadAssertEquals}, or {@link threadAssertNull}, (not
26	>	* the forms {@link #threadFail} , {@link #threadAssertTrue} {@link
27	>	* #threadAssertEquals}, or {@link #threadAssertNull}, (not
28		* <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
29		* particularly recommended) for other code to use these forms too.
30		* Only the most typically used JUnit assertion methods are defined
31		* this way, but enough to live with.</li>
32		*
33	<	* <li> If you override {@link setUp} or {@link tearDown}, make sure
33	>	* <li> If you override {@link #setUp} or {@link #tearDown}, make sure
34		* to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
35		* them. These methods are used to clear and check for thread
36		* assertion failures.</li>
#	Line 89 | Line 90 | public class JSR166TestCase extends Test
90		* Runs all JSR166 unit tests using junit.textui.TestRunner
91		*/
92		public static void main (String[] args) {
93	<	junit.textui.TestRunner.run (suite());
93	>	int iters = 1;
94	>	if (args.length > 0)
95	>	iters = Integer.parseInt(args[0]);
96	>	Test s = suite();
97	>	for (int i = 0; i < iters; ++i) {
98	>	junit.textui.TestRunner.run (s);
99	>	System.gc();
100	>	System.runFinalization();
101	>	}
102	>	System.exit(0);
103		}
104
105		/**
#	Line 98 | Line 108 | public class JSR166TestCase extends Test
108		public static Test suite ( ) {
109		TestSuite suite = new TestSuite("JSR166 Unit Tests");
110
111	+	suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
112	+	suite.addTest(new TestSuite(AbstractQueueTest.class));
113	+	suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
114	+	suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
115		suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
116	+	suite.addTest(new TestSuite(ArrayDequeTest.class));
117		suite.addTest(new TestSuite(AtomicBooleanTest.class));
118		suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
119		suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
#	Line 111 | Line 126 | public class JSR166TestCase extends Test
126		suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
127		suite.addTest(new TestSuite(AtomicReferenceTest.class));
128		suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
114	–	suite.addTest(new TestSuite(CancellableTaskTest.class));
129		suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
130		suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
131	+	suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
132	+	suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
133	+	suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
134	+	suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
135		suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
136		suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
137		suite.addTest(new TestSuite(CountDownLatchTest.class));
#	Line 121 | Line 139 | public class JSR166TestCase extends Test
139		suite.addTest(new TestSuite(DelayQueueTest.class));
140		suite.addTest(new TestSuite(ExchangerTest.class));
141		suite.addTest(new TestSuite(ExecutorsTest.class));
142	+	suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
143		suite.addTest(new TestSuite(FutureTaskTest.class));
144	+	suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
145		suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
146		suite.addTest(new TestSuite(LinkedListTest.class));
147		suite.addTest(new TestSuite(LockSupportTest.class));
148		suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
149		suite.addTest(new TestSuite(PriorityQueueTest.class));
130	–	suite.addTest(new TestSuite(PrivilegedFutureTaskTest.class));
150		suite.addTest(new TestSuite(ReentrantLockTest.class));
151		suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
152		suite.addTest(new TestSuite(ScheduledExecutorTest.class));
#	Line 138 | Line 157 | public class JSR166TestCase extends Test
157		suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
158		suite.addTest(new TestSuite(ThreadTest.class));
159		suite.addTest(new TestSuite(TimeUnitTest.class));
160	+	suite.addTest(new TestSuite(TreeMapTest.class));
161	+	suite.addTest(new TestSuite(TreeSetTest.class));
162	+	suite.addTest(new TestSuite(TreeSubMapTest.class));
163	+	suite.addTest(new TestSuite(TreeSubSetTest.class));
164
165		return suite;
166		}
#	Line 151 | Line 174 | public class JSR166TestCase extends Test
174
175		/**
176		* Return the shortest timed delay. This could
177	<	* be reimplmented to use for example a Property.
177	>	* be reimplemented to use for example a Property.
178		*/
179		protected long getShortDelay() {
180	<	return 100;
180	>	return 50;
181		}
182
183
#	Line 275 | Line 298 | public class JSR166TestCase extends Test
298		try {
299		exec.shutdown();
300		assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
301	+	} catch(SecurityException ok) {
302	+	// Allowed in case test doesn't have privs
303		} catch(InterruptedException ie) {
304		fail("Unexpected exception");
305		}
#	Line 353 | Line 378 | public class JSR166TestCase extends Test
378		public Object call() { return Boolean.TRUE; }
379		}
380
381	+	static final String TEST_STRING = "a test string";
382	+
383	+	static class StringTask implements Callable<String> {
384	+	public String call() { return TEST_STRING; }
385	+	}
386	+
387	+	static class NPETask implements Callable<String> {
388	+	public String call() { throw new NullPointerException(); }
389	+	}
390	+
391	+	static class CallableOne implements Callable<Integer> {
392	+	public Integer call() { return one; }
393	+	}
394	+
395		class ShortRunnable implements Runnable {
396		public void run() {
397		try {
#	Line 452 | Line 491 | public class JSR166TestCase extends Test
491		}
492		}
493
494	+	class LongPossiblyInterruptedRunnable implements Runnable {
495	+	public void run() {
496	+	try {
497	+	Thread.sleep(LONG_DELAY_MS);
498	+	}
499	+	catch(InterruptedException success) {
500	+	}
501	+	}
502	+	}
503	+
504		/**
505		* For use as ThreadFactory in constructors
506		*/
#	Line 513 | Line 562 | public class JSR166TestCase extends Test
562		}
563		}
564
565	+
566		/**
567		* For use as RejectedExecutionHandler in constructors
568		*/

Diff Legend

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