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.12 by dl, Thu Dec 25 19:48:57 2003 UTC vs.
Revision 1.18 by dl, Fri Jan 9 15:39:10 2004 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		}
100
101		/**
#	Line 99 | Line 105 | public class JSR166TestCase extends Test
105		TestSuite suite = new TestSuite("JSR166 Unit Tests");
106
107		suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
108	+	suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
109		suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
110		suite.addTest(new TestSuite(AtomicBooleanTest.class));
111		suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
#	Line 151 | Line 158 | public class JSR166TestCase extends Test
158
159		/**
160		* Return the shortest timed delay. This could
161	<	* be reimplmented to use for example a Property.
161	>	* be reimplemented to use for example a Property.
162		*/
163		protected long getShortDelay() {
164	<	return 100;
164	>	return 10;
165		}
166
167
#	Line 537 | Line 544 | public class JSR166TestCase extends Test
544		}
545		}
546
547	+
548		/**
549		* For use as RejectedExecutionHandler in constructors
550		*/

Diff Legend

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