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. |
5 |
> |
* Other contributors include Andrew Wright, Jeffrey Hayes, |
6 |
> |
* Pat Fisher, Mike Judd. |
7 |
|
*/ |
8 |
|
|
9 |
|
import junit.framework.*; |
10 |
< |
import java.util.*; |
10 |
> |
import java.util.PropertyPermission; |
11 |
|
import java.util.concurrent.*; |
12 |
< |
import java.io.*; |
13 |
< |
import java.security.*; |
12 |
> |
import java.util.concurrent.atomic.AtomicReference; |
13 |
> |
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
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, |
24 |
|
* utility methods and classes, as well as a simple framework for |
25 |
|
* helping to make sure that assertions failing in generated threads |
26 |
|
* cause the associated test that generated them to itself fail (which |
27 |
< |
* JUnit doe not otherwise arrange). The rules for creating such |
27 |
> |
* JUnit does not otherwise arrange). The rules for creating such |
28 |
|
* tests are: |
29 |
|
* |
30 |
|
* <ol> |
31 |
|
* |
32 |
|
* <li> All assertions in code running in generated threads must use |
33 |
< |
* the forms {@link #threadFail} , {@link #threadAssertTrue} {@link |
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 |
51 |
|
* is always discriminable as larger than SHORT and smaller than |
52 |
|
* MEDIUM. And so on. These constants are set to conservative values, |
53 |
|
* but even so, if there is ever any doubt, they can all be increased |
54 |
< |
* in one spot to rerun tests on slower platforms</li> |
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> |
70 |
|
* "normal" behaviors differ significantly. And sometimes testcases |
71 |
|
* cover multiple methods when they cannot be tested in |
72 |
|
* isolation.</li> |
73 |
< |
* |
73 |
> |
* |
74 |
|
* <li> The documentation style for testcases is to provide as javadoc |
75 |
|
* a simple sentence or two describing the property that the testcase |
76 |
|
* method purports to test. The javadocs do not say anything about how |
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 |
|
/** |
100 |
|
* Runs all JSR166 unit tests using junit.textui.TestRunner |
101 |
< |
*/ |
102 |
< |
public static void main (String[] args) { |
103 |
< |
int iters = 1; |
104 |
< |
if (args.length > 0) |
105 |
< |
iters = Integer.parseInt(args[0]); |
101 |
> |
*/ |
102 |
> |
public static void main(String[] args) { |
103 |
> |
if (useSecurityManager) { |
104 |
> |
System.err.println("Setting a permissive security manager"); |
105 |
> |
Policy.setPolicy(permissivePolicy()); |
106 |
> |
System.setSecurityManager(new SecurityManager()); |
107 |
> |
} |
108 |
> |
int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]); |
109 |
> |
|
110 |
|
Test s = suite(); |
111 |
|
for (int i = 0; i < iters; ++i) { |
112 |
< |
junit.textui.TestRunner.run (s); |
112 |
> |
junit.textui.TestRunner.run(s); |
113 |
|
System.gc(); |
114 |
|
System.runFinalization(); |
115 |
|
} |
118 |
|
|
119 |
|
/** |
120 |
|
* Collects all JSR166 unit tests as one suite |
121 |
< |
*/ |
122 |
< |
public static Test suite ( ) { |
121 |
> |
*/ |
122 |
> |
public static Test suite() { |
123 |
|
TestSuite suite = new TestSuite("JSR166 Unit Tests"); |
124 |
< |
|
125 |
< |
suite.addTest(new TestSuite(AbstractExecutorServiceTest.class)); |
126 |
< |
suite.addTest(new TestSuite(AbstractQueueTest.class)); |
127 |
< |
suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class)); |
128 |
< |
suite.addTest(new TestSuite(ArrayBlockingQueueTest.class)); |
129 |
< |
suite.addTest(new TestSuite(ArrayDequeTest.class)); |
130 |
< |
suite.addTest(new TestSuite(AtomicBooleanTest.class)); |
131 |
< |
suite.addTest(new TestSuite(AtomicIntegerArrayTest.class)); |
132 |
< |
suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class)); |
133 |
< |
suite.addTest(new TestSuite(AtomicIntegerTest.class)); |
134 |
< |
suite.addTest(new TestSuite(AtomicLongArrayTest.class)); |
135 |
< |
suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class)); |
136 |
< |
suite.addTest(new TestSuite(AtomicLongTest.class)); |
137 |
< |
suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class)); |
138 |
< |
suite.addTest(new TestSuite(AtomicReferenceArrayTest.class)); |
139 |
< |
suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class)); |
140 |
< |
suite.addTest(new TestSuite(AtomicReferenceTest.class)); |
141 |
< |
suite.addTest(new TestSuite(AtomicStampedReferenceTest.class)); |
142 |
< |
suite.addTest(new TestSuite(ConcurrentHashMapTest.class)); |
143 |
< |
suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class)); |
144 |
< |
suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class)); |
145 |
< |
suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class)); |
146 |
< |
suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class)); |
147 |
< |
suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class)); |
148 |
< |
suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class)); |
149 |
< |
suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class)); |
150 |
< |
suite.addTest(new TestSuite(CountDownLatchTest.class)); |
151 |
< |
suite.addTest(new TestSuite(CyclicBarrierTest.class)); |
152 |
< |
suite.addTest(new TestSuite(DelayQueueTest.class)); |
153 |
< |
suite.addTest(new TestSuite(ExchangerTest.class)); |
154 |
< |
suite.addTest(new TestSuite(ExecutorsTest.class)); |
155 |
< |
suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class)); |
156 |
< |
suite.addTest(new TestSuite(FutureTaskTest.class)); |
157 |
< |
suite.addTest(new TestSuite(LinkedBlockingDequeTest.class)); |
158 |
< |
suite.addTest(new TestSuite(LinkedBlockingQueueTest.class)); |
159 |
< |
suite.addTest(new TestSuite(LinkedListTest.class)); |
160 |
< |
suite.addTest(new TestSuite(LockSupportTest.class)); |
161 |
< |
suite.addTest(new TestSuite(PriorityBlockingQueueTest.class)); |
162 |
< |
suite.addTest(new TestSuite(PriorityQueueTest.class)); |
163 |
< |
suite.addTest(new TestSuite(ReentrantLockTest.class)); |
164 |
< |
suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class)); |
165 |
< |
suite.addTest(new TestSuite(ScheduledExecutorTest.class)); |
166 |
< |
suite.addTest(new TestSuite(SemaphoreTest.class)); |
167 |
< |
suite.addTest(new TestSuite(SynchronousQueueTest.class)); |
168 |
< |
suite.addTest(new TestSuite(SystemTest.class)); |
169 |
< |
suite.addTest(new TestSuite(ThreadLocalTest.class)); |
170 |
< |
suite.addTest(new TestSuite(ThreadPoolExecutorTest.class)); |
171 |
< |
suite.addTest(new TestSuite(ThreadTest.class)); |
172 |
< |
suite.addTest(new TestSuite(TreeMapTest.class)); |
173 |
< |
suite.addTest(new TestSuite(TreeSetTest.class)); |
174 |
< |
|
124 |
> |
|
125 |
> |
suite.addTest(ForkJoinPoolTest.suite()); |
126 |
> |
suite.addTest(ForkJoinTaskTest.suite()); |
127 |
> |
suite.addTest(RecursiveActionTest.suite()); |
128 |
> |
suite.addTest(RecursiveTaskTest.suite()); |
129 |
> |
suite.addTest(LinkedTransferQueueTest.suite()); |
130 |
> |
suite.addTest(PhaserTest.suite()); |
131 |
> |
suite.addTest(ThreadLocalRandomTest.suite()); |
132 |
> |
suite.addTest(AbstractExecutorServiceTest.suite()); |
133 |
> |
suite.addTest(AbstractQueueTest.suite()); |
134 |
> |
suite.addTest(AbstractQueuedSynchronizerTest.suite()); |
135 |
> |
suite.addTest(AbstractQueuedLongSynchronizerTest.suite()); |
136 |
> |
suite.addTest(ArrayBlockingQueueTest.suite()); |
137 |
> |
suite.addTest(ArrayDequeTest.suite()); |
138 |
> |
suite.addTest(AtomicBooleanTest.suite()); |
139 |
> |
suite.addTest(AtomicIntegerArrayTest.suite()); |
140 |
> |
suite.addTest(AtomicIntegerFieldUpdaterTest.suite()); |
141 |
> |
suite.addTest(AtomicIntegerTest.suite()); |
142 |
> |
suite.addTest(AtomicLongArrayTest.suite()); |
143 |
> |
suite.addTest(AtomicLongFieldUpdaterTest.suite()); |
144 |
> |
suite.addTest(AtomicLongTest.suite()); |
145 |
> |
suite.addTest(AtomicMarkableReferenceTest.suite()); |
146 |
> |
suite.addTest(AtomicReferenceArrayTest.suite()); |
147 |
> |
suite.addTest(AtomicReferenceFieldUpdaterTest.suite()); |
148 |
> |
suite.addTest(AtomicReferenceTest.suite()); |
149 |
> |
suite.addTest(AtomicStampedReferenceTest.suite()); |
150 |
> |
suite.addTest(ConcurrentHashMapTest.suite()); |
151 |
> |
suite.addTest(ConcurrentLinkedDequeTest.suite()); |
152 |
> |
suite.addTest(ConcurrentLinkedQueueTest.suite()); |
153 |
> |
suite.addTest(ConcurrentSkipListMapTest.suite()); |
154 |
> |
suite.addTest(ConcurrentSkipListSubMapTest.suite()); |
155 |
> |
suite.addTest(ConcurrentSkipListSetTest.suite()); |
156 |
> |
suite.addTest(ConcurrentSkipListSubSetTest.suite()); |
157 |
> |
suite.addTest(CopyOnWriteArrayListTest.suite()); |
158 |
> |
suite.addTest(CopyOnWriteArraySetTest.suite()); |
159 |
> |
suite.addTest(CountDownLatchTest.suite()); |
160 |
> |
suite.addTest(CyclicBarrierTest.suite()); |
161 |
> |
suite.addTest(DelayQueueTest.suite()); |
162 |
> |
suite.addTest(EntryTest.suite()); |
163 |
> |
suite.addTest(ExchangerTest.suite()); |
164 |
> |
suite.addTest(ExecutorsTest.suite()); |
165 |
> |
suite.addTest(ExecutorCompletionServiceTest.suite()); |
166 |
> |
suite.addTest(FutureTaskTest.suite()); |
167 |
> |
suite.addTest(LinkedBlockingDequeTest.suite()); |
168 |
> |
suite.addTest(LinkedBlockingQueueTest.suite()); |
169 |
> |
suite.addTest(LinkedListTest.suite()); |
170 |
> |
suite.addTest(LockSupportTest.suite()); |
171 |
> |
suite.addTest(PriorityBlockingQueueTest.suite()); |
172 |
> |
suite.addTest(PriorityQueueTest.suite()); |
173 |
> |
suite.addTest(ReentrantLockTest.suite()); |
174 |
> |
suite.addTest(ReentrantReadWriteLockTest.suite()); |
175 |
> |
suite.addTest(ScheduledExecutorTest.suite()); |
176 |
> |
suite.addTest(ScheduledExecutorSubclassTest.suite()); |
177 |
> |
suite.addTest(SemaphoreTest.suite()); |
178 |
> |
suite.addTest(SynchronousQueueTest.suite()); |
179 |
> |
suite.addTest(SystemTest.suite()); |
180 |
> |
suite.addTest(ThreadLocalTest.suite()); |
181 |
> |
suite.addTest(ThreadPoolExecutorTest.suite()); |
182 |
> |
suite.addTest(ThreadPoolExecutorSubclassTest.suite()); |
183 |
> |
suite.addTest(ThreadTest.suite()); |
184 |
> |
suite.addTest(TimeUnitTest.suite()); |
185 |
> |
suite.addTest(TreeMapTest.suite()); |
186 |
> |
suite.addTest(TreeSetTest.suite()); |
187 |
> |
suite.addTest(TreeSubMapTest.suite()); |
188 |
> |
suite.addTest(TreeSubSetTest.suite()); |
189 |
> |
|
190 |
|
return suite; |
191 |
|
} |
192 |
|
|
198 |
|
|
199 |
|
|
200 |
|
/** |
201 |
< |
* Return the shortest timed delay. This could |
201 |
> |
* Returns the shortest timed delay. This could |
202 |
|
* be reimplemented to use for example a Property. |
203 |
< |
*/ |
203 |
> |
*/ |
204 |
|
protected long getShortDelay() { |
205 |
|
return 50; |
206 |
|
} |
207 |
|
|
208 |
|
|
209 |
|
/** |
210 |
< |
* Set delays as multiples of SHORT_DELAY. |
210 |
> |
* Sets delays as multiples of SHORT_DELAY. |
211 |
|
*/ |
212 |
< |
protected void setDelays() { |
212 |
> |
protected void setDelays() { |
213 |
|
SHORT_DELAY_MS = getShortDelay(); |
214 |
< |
SMALL_DELAY_MS = SHORT_DELAY_MS * 5; |
214 |
> |
SMALL_DELAY_MS = SHORT_DELAY_MS * 5; |
215 |
|
MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10; |
216 |
< |
LONG_DELAY_MS = SHORT_DELAY_MS * 50; |
216 |
> |
LONG_DELAY_MS = SHORT_DELAY_MS * 50; |
217 |
|
} |
218 |
|
|
219 |
|
/** |
220 |
< |
* Flag set true if any threadAssert methods fail |
220 |
> |
* The first exception encountered if any threadAssertXXX method fails. |
221 |
|
*/ |
222 |
< |
volatile boolean threadFailed; |
222 |
> |
private final AtomicReference<Throwable> threadFailure |
223 |
> |
= new AtomicReference<Throwable>(null); |
224 |
|
|
225 |
|
/** |
226 |
< |
* Initialize test to indicate that no thread assertions have failed |
226 |
> |
* Records an exception so that it can be rethrown later in the test |
227 |
> |
* harness thread, triggering a test case failure. Only the first |
228 |
> |
* failure is recorded; subsequent calls to this method from within |
229 |
> |
* the same test have no effect. |
230 |
|
*/ |
231 |
< |
public void setUp() { |
231 |
> |
public void threadRecordFailure(Throwable t) { |
232 |
> |
threadFailure.compareAndSet(null, t); |
233 |
> |
} |
234 |
> |
|
235 |
> |
public void setUp() { |
236 |
|
setDelays(); |
200 |
– |
threadFailed = false; |
237 |
|
} |
238 |
|
|
239 |
|
/** |
240 |
< |
* Trigger test case failure if any thread assertions have failed |
241 |
< |
*/ |
242 |
< |
public void tearDown() { |
243 |
< |
assertFalse(threadFailed); |
240 |
> |
* Triggers test case failure if any thread assertions have failed, |
241 |
> |
* by rethrowing, in the test harness thread, any exception recorded |
242 |
> |
* earlier by threadRecordFailure. |
243 |
> |
*/ |
244 |
> |
public void tearDown() throws Exception { |
245 |
> |
Throwable t = threadFailure.get(); |
246 |
> |
if (t != null) { |
247 |
> |
if (t instanceof Error) |
248 |
> |
throw (Error) t; |
249 |
> |
else if (t instanceof RuntimeException) |
250 |
> |
throw (RuntimeException) t; |
251 |
> |
else if (t instanceof Exception) |
252 |
> |
throw (Exception) t; |
253 |
> |
else |
254 |
> |
throw new AssertionError(t); |
255 |
> |
} |
256 |
|
} |
257 |
|
|
258 |
|
/** |
259 |
< |
* Fail, also setting status to indicate current testcase should fail |
260 |
< |
*/ |
259 |
> |
* Just like fail(reason), but additionally recording (using |
260 |
> |
* threadRecordFailure) any AssertionError thrown, so that the current |
261 |
> |
* testcase will fail. |
262 |
> |
*/ |
263 |
|
public void threadFail(String reason) { |
264 |
< |
threadFailed = true; |
265 |
< |
fail(reason); |
264 |
> |
try { |
265 |
> |
fail(reason); |
266 |
> |
} catch (Throwable t) { |
267 |
> |
threadRecordFailure(t); |
268 |
> |
fail(reason); |
269 |
> |
} |
270 |
|
} |
271 |
|
|
272 |
|
/** |
273 |
< |
* If expression not true, set status to indicate current testcase |
274 |
< |
* should fail |
275 |
< |
*/ |
273 |
> |
* Just like assertTrue(b), but additionally recording (using |
274 |
> |
* threadRecordFailure) any AssertionError thrown, so that the current |
275 |
> |
* testcase will fail. |
276 |
> |
*/ |
277 |
|
public void threadAssertTrue(boolean b) { |
278 |
< |
if (!b) { |
224 |
< |
threadFailed = true; |
278 |
> |
try { |
279 |
|
assertTrue(b); |
280 |
+ |
} catch (AssertionError t) { |
281 |
+ |
threadRecordFailure(t); |
282 |
+ |
throw t; |
283 |
|
} |
284 |
|
} |
285 |
|
|
286 |
|
/** |
287 |
< |
* If expression not false, set status to indicate current testcase |
288 |
< |
* should fail |
289 |
< |
*/ |
287 |
> |
* Just like assertFalse(b), but additionally recording (using |
288 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
289 |
> |
* current testcase will fail. |
290 |
> |
*/ |
291 |
|
public void threadAssertFalse(boolean b) { |
292 |
< |
if (b) { |
235 |
< |
threadFailed = true; |
292 |
> |
try { |
293 |
|
assertFalse(b); |
294 |
+ |
} catch (AssertionError t) { |
295 |
+ |
threadRecordFailure(t); |
296 |
+ |
throw t; |
297 |
|
} |
298 |
|
} |
299 |
|
|
300 |
|
/** |
301 |
< |
* If argument not null, set status to indicate current testcase |
302 |
< |
* should fail |
303 |
< |
*/ |
301 |
> |
* Just like assertNull(x), but additionally recording (using |
302 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
303 |
> |
* current testcase will fail. |
304 |
> |
*/ |
305 |
|
public void threadAssertNull(Object x) { |
306 |
< |
if (x != null) { |
246 |
< |
threadFailed = true; |
306 |
> |
try { |
307 |
|
assertNull(x); |
308 |
+ |
} catch (AssertionError t) { |
309 |
+ |
threadRecordFailure(t); |
310 |
+ |
throw t; |
311 |
|
} |
312 |
|
} |
313 |
|
|
314 |
|
/** |
315 |
< |
* If arguments not equal, set status to indicate current testcase |
316 |
< |
* should fail |
317 |
< |
*/ |
315 |
> |
* Just like assertEquals(x, y), but additionally recording (using |
316 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
317 |
> |
* current testcase will fail. |
318 |
> |
*/ |
319 |
|
public void threadAssertEquals(long x, long y) { |
320 |
< |
if (x != y) { |
257 |
< |
threadFailed = true; |
320 |
> |
try { |
321 |
|
assertEquals(x, y); |
322 |
+ |
} catch (AssertionError t) { |
323 |
+ |
threadRecordFailure(t); |
324 |
+ |
throw t; |
325 |
|
} |
326 |
|
} |
327 |
|
|
328 |
|
/** |
329 |
< |
* If arguments not equal, set status to indicate current testcase |
330 |
< |
* should fail |
331 |
< |
*/ |
329 |
> |
* Just like assertEquals(x, y), but additionally recording (using |
330 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
331 |
> |
* current testcase will fail. |
332 |
> |
*/ |
333 |
|
public void threadAssertEquals(Object x, Object y) { |
334 |
< |
if (x != y && (x == null || !x.equals(y))) { |
268 |
< |
threadFailed = true; |
334 |
> |
try { |
335 |
|
assertEquals(x, y); |
336 |
+ |
} catch (AssertionError t) { |
337 |
+ |
threadRecordFailure(t); |
338 |
+ |
throw t; |
339 |
|
} |
340 |
|
} |
341 |
|
|
342 |
|
/** |
343 |
< |
* threadFail with message "should throw exception" |
344 |
< |
*/ |
343 |
> |
* Just like assertSame(x, y), but additionally recording (using |
344 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
345 |
> |
* current testcase will fail. |
346 |
> |
*/ |
347 |
> |
public void threadAssertSame(Object x, Object y) { |
348 |
> |
try { |
349 |
> |
assertSame(x, y); |
350 |
> |
} catch (AssertionError t) { |
351 |
> |
threadRecordFailure(t); |
352 |
> |
throw t; |
353 |
> |
} |
354 |
> |
} |
355 |
> |
|
356 |
> |
/** |
357 |
> |
* Calls threadFail with message "should throw exception". |
358 |
> |
*/ |
359 |
|
public void threadShouldThrow() { |
360 |
< |
threadFailed = true; |
278 |
< |
fail("should throw exception"); |
360 |
> |
threadFail("should throw exception"); |
361 |
|
} |
362 |
|
|
363 |
|
/** |
364 |
< |
* threadFail with message "Unexpected exception" |
364 |
> |
* Calls threadFail with message "should throw" + exceptionName. |
365 |
|
*/ |
366 |
< |
public void threadUnexpectedException() { |
367 |
< |
threadFailed = true; |
286 |
< |
fail("Unexpected exception"); |
366 |
> |
public void threadShouldThrow(String exceptionName) { |
367 |
> |
threadFail("should throw " + exceptionName); |
368 |
|
} |
369 |
|
|
370 |
+ |
/** |
371 |
+ |
* Calls threadFail with message "Unexpected exception" + ex. |
372 |
+ |
*/ |
373 |
+ |
public void threadUnexpectedException(Throwable t) { |
374 |
+ |
threadRecordFailure(t); |
375 |
+ |
t.printStackTrace(); |
376 |
+ |
// Rethrow, wrapping in an AssertionError if necessary |
377 |
+ |
if (t instanceof RuntimeException) |
378 |
+ |
throw (RuntimeException) t; |
379 |
+ |
else if (t instanceof Error) |
380 |
+ |
throw (Error) t; |
381 |
+ |
else { |
382 |
+ |
AssertionError ae = new AssertionError("unexpected exception: " + t); |
383 |
+ |
t.initCause(t); |
384 |
+ |
throw ae; |
385 |
+ |
} |
386 |
+ |
} |
387 |
|
|
388 |
|
/** |
389 |
< |
* Wait out termination of a thread pool or fail doing so |
389 |
> |
* Waits out termination of a thread pool or fails doing so. |
390 |
|
*/ |
391 |
|
public void joinPool(ExecutorService exec) { |
392 |
|
try { |
393 |
|
exec.shutdown(); |
394 |
< |
assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS)); |
395 |
< |
} catch(SecurityException ok) { |
394 |
> |
assertTrue("ExecutorService did not terminate in a timely manner", |
395 |
> |
exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
396 |
> |
} catch (SecurityException ok) { |
397 |
|
// Allowed in case test doesn't have privs |
398 |
< |
} catch(InterruptedException ie) { |
399 |
< |
fail("Unexpected exception"); |
398 |
> |
} catch (InterruptedException ie) { |
399 |
> |
fail("Unexpected InterruptedException"); |
400 |
|
} |
401 |
|
} |
402 |
|
|
403 |
|
|
404 |
|
/** |
405 |
< |
* fail with message "should throw exception" |
406 |
< |
*/ |
405 |
> |
* Fails with message "should throw exception". |
406 |
> |
*/ |
407 |
|
public void shouldThrow() { |
408 |
|
fail("Should throw exception"); |
409 |
|
} |
410 |
|
|
411 |
|
/** |
412 |
< |
* fail with message "Unexpected exception" |
412 |
> |
* Fails with message "should throw " + exceptionName. |
413 |
|
*/ |
414 |
< |
public void unexpectedException() { |
415 |
< |
fail("Unexpected exception"); |
414 |
> |
public void shouldThrow(String exceptionName) { |
415 |
> |
fail("Should throw " + exceptionName); |
416 |
> |
} |
417 |
> |
|
418 |
> |
/** |
419 |
> |
* Fails with message "Unexpected exception: " + ex. |
420 |
> |
*/ |
421 |
> |
public void unexpectedException(Throwable ex) { |
422 |
> |
ex.printStackTrace(); |
423 |
> |
fail("Unexpected exception: " + ex); |
424 |
|
} |
425 |
|
|
426 |
|
|
427 |
|
/** |
428 |
|
* The number of elements to place in collections, arrays, etc. |
429 |
|
*/ |
430 |
< |
static final int SIZE = 20; |
430 |
> |
public static final int SIZE = 20; |
431 |
|
|
432 |
|
// Some convenient Integer constants |
433 |
|
|
434 |
< |
static final Integer zero = new Integer(0); |
435 |
< |
static final Integer one = new Integer(1); |
436 |
< |
static final Integer two = new Integer(2); |
437 |
< |
static final Integer three = new Integer(3); |
438 |
< |
static final Integer four = new Integer(4); |
439 |
< |
static final Integer five = new Integer(5); |
440 |
< |
static final Integer six = new Integer(6); |
441 |
< |
static final Integer seven = new Integer(7); |
442 |
< |
static final Integer eight = new Integer(8); |
443 |
< |
static final Integer nine = new Integer(9); |
444 |
< |
static final Integer m1 = new Integer(-1); |
445 |
< |
static final Integer m2 = new Integer(-2); |
446 |
< |
static final Integer m3 = new Integer(-3); |
447 |
< |
static final Integer m4 = new Integer(-4); |
448 |
< |
static final Integer m5 = new Integer(-5); |
449 |
< |
static final Integer m10 = new Integer(-10); |
434 |
> |
public static final Integer zero = new Integer(0); |
435 |
> |
public static final Integer one = new Integer(1); |
436 |
> |
public static final Integer two = new Integer(2); |
437 |
> |
public static final Integer three = new Integer(3); |
438 |
> |
public static final Integer four = new Integer(4); |
439 |
> |
public static final Integer five = new Integer(5); |
440 |
> |
public static final Integer six = new Integer(6); |
441 |
> |
public static final Integer seven = new Integer(7); |
442 |
> |
public static final Integer eight = new Integer(8); |
443 |
> |
public static final Integer nine = new Integer(9); |
444 |
> |
public static final Integer m1 = new Integer(-1); |
445 |
> |
public static final Integer m2 = new Integer(-2); |
446 |
> |
public static final Integer m3 = new Integer(-3); |
447 |
> |
public static final Integer m4 = new Integer(-4); |
448 |
> |
public static final Integer m5 = new Integer(-5); |
449 |
> |
public static final Integer m6 = new Integer(-6); |
450 |
> |
public static final Integer m10 = new Integer(-10); |
451 |
|
|
452 |
|
|
453 |
|
/** |
454 |
+ |
* Runs Runnable r with a security policy that permits precisely |
455 |
+ |
* the specified permissions. If there is no current security |
456 |
+ |
* manager, the runnable is run twice, both with and without a |
457 |
+ |
* security manager. We require that any security manager permit |
458 |
+ |
* getPolicy/setPolicy. |
459 |
+ |
*/ |
460 |
+ |
public void runWithPermissions(Runnable r, Permission... permissions) { |
461 |
+ |
SecurityManager sm = System.getSecurityManager(); |
462 |
+ |
if (sm == null) { |
463 |
+ |
r.run(); |
464 |
+ |
Policy savedPolicy = Policy.getPolicy(); |
465 |
+ |
try { |
466 |
+ |
Policy.setPolicy(permissivePolicy()); |
467 |
+ |
System.setSecurityManager(new SecurityManager()); |
468 |
+ |
runWithPermissions(r, permissions); |
469 |
+ |
} finally { |
470 |
+ |
System.setSecurityManager(null); |
471 |
+ |
Policy.setPolicy(savedPolicy); |
472 |
+ |
} |
473 |
+ |
} else { |
474 |
+ |
Policy savedPolicy = Policy.getPolicy(); |
475 |
+ |
AdjustablePolicy policy = new AdjustablePolicy(permissions); |
476 |
+ |
Policy.setPolicy(policy); |
477 |
+ |
|
478 |
+ |
try { |
479 |
+ |
r.run(); |
480 |
+ |
} finally { |
481 |
+ |
policy.addPermission(new SecurityPermission("setPolicy")); |
482 |
+ |
Policy.setPolicy(savedPolicy); |
483 |
+ |
} |
484 |
+ |
} |
485 |
+ |
} |
486 |
+ |
|
487 |
+ |
/** |
488 |
+ |
* Runs a runnable without any permissions. |
489 |
+ |
*/ |
490 |
+ |
public void runWithoutPermissions(Runnable r) { |
491 |
+ |
runWithPermissions(r); |
492 |
+ |
} |
493 |
+ |
|
494 |
+ |
/** |
495 |
|
* A security policy where new permissions can be dynamically added |
496 |
|
* or all cleared. |
497 |
|
*/ |
498 |
< |
static class AdjustablePolicy extends java.security.Policy { |
498 |
> |
public static class AdjustablePolicy extends java.security.Policy { |
499 |
|
Permissions perms = new Permissions(); |
500 |
< |
AdjustablePolicy() { } |
500 |
> |
AdjustablePolicy(Permission... permissions) { |
501 |
> |
for (Permission permission : permissions) |
502 |
> |
perms.add(permission); |
503 |
> |
} |
504 |
|
void addPermission(Permission perm) { perms.add(perm); } |
505 |
|
void clearPermissions() { perms = new Permissions(); } |
506 |
< |
public PermissionCollection getPermissions(CodeSource cs) { |
507 |
< |
return perms; |
508 |
< |
} |
509 |
< |
public PermissionCollection getPermissions(ProtectionDomain pd) { |
510 |
< |
return perms; |
511 |
< |
} |
512 |
< |
public boolean implies(ProtectionDomain pd, Permission p) { |
513 |
< |
return perms.implies(p); |
514 |
< |
} |
515 |
< |
public void refresh() {} |
506 |
> |
public PermissionCollection getPermissions(CodeSource cs) { |
507 |
> |
return perms; |
508 |
> |
} |
509 |
> |
public PermissionCollection getPermissions(ProtectionDomain pd) { |
510 |
> |
return perms; |
511 |
> |
} |
512 |
> |
public boolean implies(ProtectionDomain pd, Permission p) { |
513 |
> |
return perms.implies(p); |
514 |
> |
} |
515 |
> |
public void refresh() {} |
516 |
|
} |
517 |
|
|
518 |
+ |
/** |
519 |
+ |
* Returns a policy containing all the permissions we ever need. |
520 |
+ |
*/ |
521 |
+ |
public static Policy permissivePolicy() { |
522 |
+ |
return new AdjustablePolicy |
523 |
+ |
// Permissions j.u.c. needs directly |
524 |
+ |
(new RuntimePermission("modifyThread"), |
525 |
+ |
new RuntimePermission("getClassLoader"), |
526 |
+ |
new RuntimePermission("setContextClassLoader"), |
527 |
+ |
// Permissions needed to change permissions! |
528 |
+ |
new SecurityPermission("getPolicy"), |
529 |
+ |
new SecurityPermission("setPolicy"), |
530 |
+ |
new RuntimePermission("setSecurityManager"), |
531 |
+ |
// Permissions needed by the junit test harness |
532 |
+ |
new RuntimePermission("accessDeclaredMembers"), |
533 |
+ |
new PropertyPermission("*", "read"), |
534 |
+ |
new java.io.FilePermission("<<ALL FILES>>", "read")); |
535 |
+ |
} |
536 |
|
|
537 |
< |
// Some convenient Runnable classes |
538 |
< |
|
539 |
< |
static class NoOpRunnable implements Runnable { |
540 |
< |
public void run() {} |
537 |
> |
/** |
538 |
> |
* Sleep until the timeout has elapsed, or interrupted. |
539 |
> |
* Does <em>NOT</em> throw InterruptedException. |
540 |
> |
*/ |
541 |
> |
void sleepTillInterrupted(long timeoutMillis) { |
542 |
> |
try { |
543 |
> |
Thread.sleep(timeoutMillis); |
544 |
> |
} catch (InterruptedException wakeup) {} |
545 |
|
} |
546 |
|
|
547 |
< |
static class NoOpCallable implements Callable { |
548 |
< |
public Object call() { return Boolean.TRUE; } |
547 |
> |
/** |
548 |
> |
* Returns a new started Thread running the given runnable. |
549 |
> |
*/ |
550 |
> |
Thread newStartedThread(Runnable runnable) { |
551 |
> |
Thread t = new Thread(runnable); |
552 |
> |
t.start(); |
553 |
> |
return t; |
554 |
|
} |
555 |
|
|
556 |
< |
static final String TEST_STRING = "a test string"; |
556 |
> |
// Some convenient Runnable classes |
557 |
|
|
558 |
< |
static class StringTask implements Callable<String> { |
559 |
< |
public String call() { return TEST_STRING; } |
381 |
< |
} |
558 |
> |
public abstract class CheckedRunnable implements Runnable { |
559 |
> |
protected abstract void realRun() throws Throwable; |
560 |
|
|
561 |
< |
static class NPETask implements Callable<String> { |
562 |
< |
public String call() { throw new NullPointerException(); } |
561 |
> |
public final void run() { |
562 |
> |
try { |
563 |
> |
realRun(); |
564 |
> |
} catch (Throwable t) { |
565 |
> |
threadUnexpectedException(t); |
566 |
> |
} |
567 |
> |
} |
568 |
|
} |
569 |
|
|
570 |
< |
static class CallableOne implements Callable<Integer> { |
571 |
< |
public Integer call() { return one; } |
389 |
< |
} |
570 |
> |
public abstract class RunnableShouldThrow implements Runnable { |
571 |
> |
protected abstract void realRun() throws Throwable; |
572 |
|
|
573 |
< |
class ShortRunnable implements Runnable { |
574 |
< |
public void run() { |
573 |
> |
final Class<?> exceptionClass; |
574 |
> |
|
575 |
> |
<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) { |
576 |
> |
this.exceptionClass = exceptionClass; |
577 |
> |
} |
578 |
> |
|
579 |
> |
public final void run() { |
580 |
|
try { |
581 |
< |
Thread.sleep(SHORT_DELAY_MS); |
582 |
< |
} |
583 |
< |
catch(Exception e) { |
584 |
< |
threadUnexpectedException(); |
581 |
> |
realRun(); |
582 |
> |
threadShouldThrow(exceptionClass.getSimpleName()); |
583 |
> |
} catch (Throwable t) { |
584 |
> |
if (! exceptionClass.isInstance(t)) |
585 |
> |
threadUnexpectedException(t); |
586 |
|
} |
587 |
|
} |
588 |
|
} |
589 |
|
|
590 |
< |
class ShortInterruptedRunnable implements Runnable { |
591 |
< |
public void run() { |
590 |
> |
public abstract class ThreadShouldThrow extends Thread { |
591 |
> |
protected abstract void realRun() throws Throwable; |
592 |
> |
|
593 |
> |
final Class<?> exceptionClass; |
594 |
> |
|
595 |
> |
<T extends Throwable> ThreadShouldThrow(Class<T> exceptionClass) { |
596 |
> |
this.exceptionClass = exceptionClass; |
597 |
> |
} |
598 |
> |
|
599 |
> |
public final void run() { |
600 |
|
try { |
601 |
< |
Thread.sleep(SHORT_DELAY_MS); |
602 |
< |
threadShouldThrow(); |
603 |
< |
} |
604 |
< |
catch(InterruptedException success) { |
601 |
> |
realRun(); |
602 |
> |
threadShouldThrow(exceptionClass.getSimpleName()); |
603 |
> |
} catch (Throwable t) { |
604 |
> |
if (! exceptionClass.isInstance(t)) |
605 |
> |
threadUnexpectedException(t); |
606 |
|
} |
607 |
|
} |
608 |
|
} |
609 |
|
|
610 |
< |
class SmallRunnable implements Runnable { |
611 |
< |
public void run() { |
610 |
> |
public abstract class CheckedInterruptedRunnable implements Runnable { |
611 |
> |
protected abstract void realRun() throws Throwable; |
612 |
> |
|
613 |
> |
public final void run() { |
614 |
|
try { |
615 |
< |
Thread.sleep(SMALL_DELAY_MS); |
616 |
< |
} |
617 |
< |
catch(Exception e) { |
618 |
< |
threadUnexpectedException(); |
615 |
> |
realRun(); |
616 |
> |
threadShouldThrow("InterruptedException"); |
617 |
> |
} catch (InterruptedException success) { |
618 |
> |
} catch (Throwable t) { |
619 |
> |
threadUnexpectedException(t); |
620 |
|
} |
621 |
|
} |
622 |
|
} |
623 |
|
|
624 |
< |
class SmallPossiblyInterruptedRunnable implements Runnable { |
625 |
< |
public void run() { |
624 |
> |
public abstract class CheckedCallable<T> implements Callable<T> { |
625 |
> |
protected abstract T realCall() throws Throwable; |
626 |
> |
|
627 |
> |
public final T call() { |
628 |
|
try { |
629 |
< |
Thread.sleep(SMALL_DELAY_MS); |
630 |
< |
} |
631 |
< |
catch(Exception e) { |
629 |
> |
return realCall(); |
630 |
> |
} catch (Throwable t) { |
631 |
> |
threadUnexpectedException(t); |
632 |
> |
return null; |
633 |
|
} |
634 |
|
} |
635 |
|
} |
636 |
|
|
637 |
< |
class SmallCallable implements Callable { |
638 |
< |
public Object call() { |
637 |
> |
public abstract class CheckedInterruptedCallable<T> |
638 |
> |
implements Callable<T> { |
639 |
> |
protected abstract T realCall() throws Throwable; |
640 |
> |
|
641 |
> |
public final T call() { |
642 |
|
try { |
643 |
< |
Thread.sleep(SMALL_DELAY_MS); |
643 |
> |
T result = realCall(); |
644 |
> |
threadShouldThrow("InterruptedException"); |
645 |
> |
return result; |
646 |
> |
} catch (InterruptedException success) { |
647 |
> |
} catch (Throwable t) { |
648 |
> |
threadUnexpectedException(t); |
649 |
|
} |
650 |
< |
catch(Exception e) { |
440 |
< |
threadUnexpectedException(); |
441 |
< |
} |
442 |
< |
return Boolean.TRUE; |
650 |
> |
return null; |
651 |
|
} |
652 |
|
} |
653 |
|
|
654 |
< |
class SmallInterruptedRunnable implements Runnable { |
655 |
< |
public void run() { |
654 |
> |
public static class NoOpRunnable implements Runnable { |
655 |
> |
public void run() {} |
656 |
> |
} |
657 |
> |
|
658 |
> |
public static class NoOpCallable implements Callable { |
659 |
> |
public Object call() { return Boolean.TRUE; } |
660 |
> |
} |
661 |
> |
|
662 |
> |
public static final String TEST_STRING = "a test string"; |
663 |
> |
|
664 |
> |
public static class StringTask implements Callable<String> { |
665 |
> |
public String call() { return TEST_STRING; } |
666 |
> |
} |
667 |
> |
|
668 |
> |
public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) { |
669 |
> |
return new CheckedCallable<String>() { |
670 |
> |
public String realCall() { |
671 |
> |
try { |
672 |
> |
latch.await(); |
673 |
> |
} catch (InterruptedException quittingTime) {} |
674 |
> |
return TEST_STRING; |
675 |
> |
}}; |
676 |
> |
} |
677 |
> |
|
678 |
> |
public static class NPETask implements Callable<String> { |
679 |
> |
public String call() { throw new NullPointerException(); } |
680 |
> |
} |
681 |
> |
|
682 |
> |
public static class CallableOne implements Callable<Integer> { |
683 |
> |
public Integer call() { return one; } |
684 |
> |
} |
685 |
> |
|
686 |
> |
public class ShortRunnable extends CheckedRunnable { |
687 |
> |
protected void realRun() throws Throwable { |
688 |
> |
Thread.sleep(SHORT_DELAY_MS); |
689 |
> |
} |
690 |
> |
} |
691 |
> |
|
692 |
> |
public class ShortInterruptedRunnable extends CheckedInterruptedRunnable { |
693 |
> |
protected void realRun() throws InterruptedException { |
694 |
> |
Thread.sleep(SHORT_DELAY_MS); |
695 |
> |
} |
696 |
> |
} |
697 |
> |
|
698 |
> |
public class SmallRunnable extends CheckedRunnable { |
699 |
> |
protected void realRun() throws Throwable { |
700 |
> |
Thread.sleep(SMALL_DELAY_MS); |
701 |
> |
} |
702 |
> |
} |
703 |
> |
|
704 |
> |
public class SmallPossiblyInterruptedRunnable extends CheckedRunnable { |
705 |
> |
protected void realRun() { |
706 |
|
try { |
707 |
|
Thread.sleep(SMALL_DELAY_MS); |
708 |
< |
threadShouldThrow(); |
451 |
< |
} |
452 |
< |
catch(InterruptedException success) { |
453 |
< |
} |
708 |
> |
} catch (InterruptedException ok) {} |
709 |
|
} |
710 |
|
} |
711 |
|
|
712 |
+ |
public class SmallCallable extends CheckedCallable { |
713 |
+ |
protected Object realCall() throws InterruptedException { |
714 |
+ |
Thread.sleep(SMALL_DELAY_MS); |
715 |
+ |
return Boolean.TRUE; |
716 |
+ |
} |
717 |
+ |
} |
718 |
|
|
719 |
< |
class MediumRunnable implements Runnable { |
720 |
< |
public void run() { |
721 |
< |
try { |
461 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
462 |
< |
} |
463 |
< |
catch(Exception e) { |
464 |
< |
threadUnexpectedException(); |
465 |
< |
} |
719 |
> |
public class SmallInterruptedRunnable extends CheckedInterruptedRunnable { |
720 |
> |
protected void realRun() throws InterruptedException { |
721 |
> |
Thread.sleep(SMALL_DELAY_MS); |
722 |
|
} |
723 |
|
} |
724 |
|
|
725 |
< |
class MediumInterruptedRunnable implements Runnable { |
726 |
< |
public void run() { |
727 |
< |
try { |
472 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
473 |
< |
threadShouldThrow(); |
474 |
< |
} |
475 |
< |
catch(InterruptedException success) { |
476 |
< |
} |
725 |
> |
public class MediumRunnable extends CheckedRunnable { |
726 |
> |
protected void realRun() throws Throwable { |
727 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
728 |
|
} |
729 |
|
} |
730 |
|
|
731 |
< |
class MediumPossiblyInterruptedRunnable implements Runnable { |
732 |
< |
public void run() { |
731 |
> |
public class MediumInterruptedRunnable extends CheckedInterruptedRunnable { |
732 |
> |
protected void realRun() throws InterruptedException { |
733 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
734 |
> |
} |
735 |
> |
} |
736 |
> |
|
737 |
> |
public class MediumPossiblyInterruptedRunnable extends CheckedRunnable { |
738 |
> |
protected void realRun() { |
739 |
|
try { |
740 |
|
Thread.sleep(MEDIUM_DELAY_MS); |
741 |
< |
} |
485 |
< |
catch(InterruptedException success) { |
486 |
< |
} |
741 |
> |
} catch (InterruptedException ok) {} |
742 |
|
} |
743 |
|
} |
744 |
|
|
745 |
< |
class LongPossiblyInterruptedRunnable implements Runnable { |
746 |
< |
public void run() { |
745 |
> |
public class LongPossiblyInterruptedRunnable extends CheckedRunnable { |
746 |
> |
protected void realRun() { |
747 |
|
try { |
748 |
|
Thread.sleep(LONG_DELAY_MS); |
749 |
< |
} |
495 |
< |
catch(InterruptedException success) { |
496 |
< |
} |
749 |
> |
} catch (InterruptedException ok) {} |
750 |
|
} |
751 |
|
} |
752 |
|
|
753 |
|
/** |
754 |
|
* For use as ThreadFactory in constructors |
755 |
|
*/ |
756 |
< |
static class SimpleThreadFactory implements ThreadFactory{ |
757 |
< |
public Thread newThread(Runnable r){ |
756 |
> |
public static class SimpleThreadFactory implements ThreadFactory { |
757 |
> |
public Thread newThread(Runnable r) { |
758 |
|
return new Thread(r); |
759 |
< |
} |
759 |
> |
} |
760 |
|
} |
761 |
|
|
762 |
< |
static class TrackedShortRunnable implements Runnable { |
763 |
< |
volatile boolean done = false; |
762 |
> |
public static class TrackedShortRunnable implements Runnable { |
763 |
> |
public volatile boolean done = false; |
764 |
|
public void run() { |
765 |
|
try { |
766 |
|
Thread.sleep(SMALL_DELAY_MS); |
767 |
|
done = true; |
768 |
< |
} catch(Exception e){ |
516 |
< |
} |
768 |
> |
} catch (InterruptedException ok) {} |
769 |
|
} |
770 |
|
} |
771 |
|
|
772 |
< |
static class TrackedMediumRunnable implements Runnable { |
773 |
< |
volatile boolean done = false; |
772 |
> |
public static class TrackedMediumRunnable implements Runnable { |
773 |
> |
public volatile boolean done = false; |
774 |
|
public void run() { |
775 |
|
try { |
776 |
|
Thread.sleep(MEDIUM_DELAY_MS); |
777 |
|
done = true; |
778 |
< |
} catch(Exception e){ |
527 |
< |
} |
778 |
> |
} catch (InterruptedException ok) {} |
779 |
|
} |
780 |
|
} |
781 |
|
|
782 |
< |
static class TrackedLongRunnable implements Runnable { |
783 |
< |
volatile boolean done = false; |
782 |
> |
public static class TrackedLongRunnable implements Runnable { |
783 |
> |
public volatile boolean done = false; |
784 |
|
public void run() { |
785 |
|
try { |
786 |
|
Thread.sleep(LONG_DELAY_MS); |
787 |
|
done = true; |
788 |
< |
} catch(Exception e){ |
538 |
< |
} |
788 |
> |
} catch (InterruptedException ok) {} |
789 |
|
} |
790 |
|
} |
791 |
|
|
792 |
< |
static class TrackedNoOpRunnable implements Runnable { |
793 |
< |
volatile boolean done = false; |
792 |
> |
public static class TrackedNoOpRunnable implements Runnable { |
793 |
> |
public volatile boolean done = false; |
794 |
|
public void run() { |
795 |
|
done = true; |
796 |
|
} |
797 |
|
} |
798 |
|
|
799 |
< |
static class TrackedCallable implements Callable { |
800 |
< |
volatile boolean done = false; |
799 |
> |
public static class TrackedCallable implements Callable { |
800 |
> |
public volatile boolean done = false; |
801 |
|
public Object call() { |
802 |
|
try { |
803 |
|
Thread.sleep(SMALL_DELAY_MS); |
804 |
|
done = true; |
805 |
< |
} catch(Exception e){ |
556 |
< |
} |
805 |
> |
} catch (InterruptedException ok) {} |
806 |
|
return Boolean.TRUE; |
807 |
|
} |
808 |
|
} |
809 |
|
|
810 |
+ |
/** |
811 |
+ |
* Analog of CheckedRunnable for RecursiveAction |
812 |
+ |
*/ |
813 |
+ |
public abstract class CheckedRecursiveAction extends RecursiveAction { |
814 |
+ |
protected abstract void realCompute() throws Throwable; |
815 |
+ |
|
816 |
+ |
public final void compute() { |
817 |
+ |
try { |
818 |
+ |
realCompute(); |
819 |
+ |
} catch (Throwable t) { |
820 |
+ |
threadUnexpectedException(t); |
821 |
+ |
} |
822 |
+ |
} |
823 |
+ |
} |
824 |
+ |
|
825 |
+ |
/** |
826 |
+ |
* Analog of CheckedCallable for RecursiveTask |
827 |
+ |
*/ |
828 |
+ |
public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> { |
829 |
+ |
protected abstract T realCompute() throws Throwable; |
830 |
+ |
|
831 |
+ |
public final T compute() { |
832 |
+ |
try { |
833 |
+ |
return realCompute(); |
834 |
+ |
} catch (Throwable t) { |
835 |
+ |
threadUnexpectedException(t); |
836 |
+ |
return null; |
837 |
+ |
} |
838 |
+ |
} |
839 |
+ |
} |
840 |
|
|
841 |
|
/** |
842 |
|
* For use as RejectedExecutionHandler in constructors |
843 |
|
*/ |
844 |
< |
static class NoOpREHandler implements RejectedExecutionHandler{ |
845 |
< |
public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){} |
844 |
> |
public static class NoOpREHandler implements RejectedExecutionHandler { |
845 |
> |
public void rejectedExecution(Runnable r, |
846 |
> |
ThreadPoolExecutor executor) {} |
847 |
|
} |
848 |
< |
|
569 |
< |
|
848 |
> |
|
849 |
|
} |