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.*; |
10 |
|
import java.util.*; |
11 |
|
import java.util.concurrent.*; |
12 |
+ |
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
13 |
|
import java.io.*; |
14 |
|
import java.security.*; |
15 |
|
|
18 |
|
* utility methods and classes, as well as a simple framework for |
19 |
|
* helping to make sure that assertions failing in generated threads |
20 |
|
* cause the associated test that generated them to itself fail (which |
21 |
< |
* JUnit doe not otherwise arrange). The rules for creating such |
21 |
> |
* JUnit does not otherwise arrange). The rules for creating such |
22 |
|
* tests are: |
23 |
|
* |
24 |
|
* <ol> |
25 |
|
* |
26 |
|
* <li> All assertions in code running in generated threads must use |
27 |
< |
* the forms {@link threadFail} , {@link threadAssertTrue} {@link |
28 |
< |
* threadAssertEquals}, or {@link threadAssertNull}, (not |
27 |
> |
* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link |
28 |
> |
* #threadAssertEquals}, or {@link #threadAssertNull}, (not |
29 |
|
* <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not |
30 |
|
* particularly recommended) for other code to use these forms too. |
31 |
|
* Only the most typically used JUnit assertion methods are defined |
32 |
|
* this way, but enough to live with.</li> |
33 |
|
* |
34 |
< |
* <li> If you override {@link setUp} or {@link tearDown}, make sure |
34 |
> |
* <li> If you override {@link #setUp} or {@link #tearDown}, make sure |
35 |
|
* to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within |
36 |
|
* them. These methods are used to clear and check for thread |
37 |
|
* assertion failures.</li> |
45 |
|
* is always discriminable as larger than SHORT and smaller than |
46 |
|
* MEDIUM. And so on. These constants are set to conservative values, |
47 |
|
* but even so, if there is ever any doubt, they can all be increased |
48 |
< |
* in one spot to rerun tests on slower platforms</li> |
48 |
> |
* in one spot to rerun tests on slower platforms.</li> |
49 |
|
* |
50 |
|
* <li> All threads generated must be joined inside each test case |
51 |
|
* method (or <tt>fail</tt> to do so) before returning from the |
64 |
|
* "normal" behaviors differ significantly. And sometimes testcases |
65 |
|
* cover multiple methods when they cannot be tested in |
66 |
|
* isolation.</li> |
67 |
< |
* |
67 |
> |
* |
68 |
|
* <li> The documentation style for testcases is to provide as javadoc |
69 |
|
* a simple sentence or two describing the property that the testcase |
70 |
|
* method purports to test. The javadocs do not say anything about how |
89 |
|
public class JSR166TestCase extends TestCase { |
90 |
|
/** |
91 |
|
* Runs all JSR166 unit tests using junit.textui.TestRunner |
92 |
< |
*/ |
93 |
< |
public static void main (String[] args) { |
94 |
< |
junit.textui.TestRunner.run (suite()); |
92 |
> |
*/ |
93 |
> |
public static void main(String[] args) { |
94 |
> |
int iters = 1; |
95 |
> |
if (args.length > 0) |
96 |
> |
iters = Integer.parseInt(args[0]); |
97 |
> |
Test s = suite(); |
98 |
> |
for (int i = 0; i < iters; ++i) { |
99 |
> |
junit.textui.TestRunner.run(s); |
100 |
> |
System.gc(); |
101 |
> |
System.runFinalization(); |
102 |
> |
} |
103 |
> |
System.exit(0); |
104 |
|
} |
105 |
|
|
106 |
|
/** |
107 |
|
* Collects all JSR166 unit tests as one suite |
108 |
< |
*/ |
109 |
< |
public static Test suite ( ) { |
108 |
> |
*/ |
109 |
> |
public static Test suite() { |
110 |
|
TestSuite suite = new TestSuite("JSR166 Unit Tests"); |
111 |
< |
|
111 |
> |
|
112 |
> |
suite.addTest(new TestSuite(ForkJoinPoolTest.class)); |
113 |
> |
suite.addTest(new TestSuite(ForkJoinTaskTest.class)); |
114 |
> |
suite.addTest(new TestSuite(RecursiveActionTest.class)); |
115 |
> |
suite.addTest(new TestSuite(RecursiveTaskTest.class)); |
116 |
> |
suite.addTest(new TestSuite(LinkedTransferQueueTest.class)); |
117 |
> |
suite.addTest(new TestSuite(PhaserTest.class)); |
118 |
> |
suite.addTest(new TestSuite(ThreadLocalRandomTest.class)); |
119 |
> |
suite.addTest(new TestSuite(AbstractExecutorServiceTest.class)); |
120 |
> |
suite.addTest(new TestSuite(AbstractQueueTest.class)); |
121 |
> |
suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class)); |
122 |
> |
suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class)); |
123 |
|
suite.addTest(new TestSuite(ArrayBlockingQueueTest.class)); |
124 |
< |
suite.addTest(new TestSuite(AtomicBooleanTest.class)); |
125 |
< |
suite.addTest(new TestSuite(AtomicIntegerArrayTest.class)); |
126 |
< |
suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class)); |
127 |
< |
suite.addTest(new TestSuite(AtomicIntegerTest.class)); |
128 |
< |
suite.addTest(new TestSuite(AtomicLongArrayTest.class)); |
129 |
< |
suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class)); |
130 |
< |
suite.addTest(new TestSuite(AtomicLongTest.class)); |
131 |
< |
suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class)); |
132 |
< |
suite.addTest(new TestSuite(AtomicReferenceArrayTest.class)); |
133 |
< |
suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class)); |
134 |
< |
suite.addTest(new TestSuite(AtomicReferenceTest.class)); |
135 |
< |
suite.addTest(new TestSuite(AtomicStampedReferenceTest.class)); |
136 |
< |
suite.addTest(new TestSuite(CancellableTaskTest.class)); |
124 |
> |
suite.addTest(new TestSuite(ArrayDequeTest.class)); |
125 |
> |
suite.addTest(new TestSuite(AtomicBooleanTest.class)); |
126 |
> |
suite.addTest(new TestSuite(AtomicIntegerArrayTest.class)); |
127 |
> |
suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class)); |
128 |
> |
suite.addTest(new TestSuite(AtomicIntegerTest.class)); |
129 |
> |
suite.addTest(new TestSuite(AtomicLongArrayTest.class)); |
130 |
> |
suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class)); |
131 |
> |
suite.addTest(new TestSuite(AtomicLongTest.class)); |
132 |
> |
suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class)); |
133 |
> |
suite.addTest(new TestSuite(AtomicReferenceArrayTest.class)); |
134 |
> |
suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class)); |
135 |
> |
suite.addTest(new TestSuite(AtomicReferenceTest.class)); |
136 |
> |
suite.addTest(new TestSuite(AtomicStampedReferenceTest.class)); |
137 |
|
suite.addTest(new TestSuite(ConcurrentHashMapTest.class)); |
138 |
|
suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class)); |
139 |
+ |
suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class)); |
140 |
+ |
suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class)); |
141 |
+ |
suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class)); |
142 |
+ |
suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class)); |
143 |
|
suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class)); |
144 |
|
suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class)); |
145 |
|
suite.addTest(new TestSuite(CountDownLatchTest.class)); |
146 |
|
suite.addTest(new TestSuite(CyclicBarrierTest.class)); |
147 |
|
suite.addTest(new TestSuite(DelayQueueTest.class)); |
148 |
+ |
suite.addTest(new TestSuite(EntryTest.class)); |
149 |
|
suite.addTest(new TestSuite(ExchangerTest.class)); |
150 |
|
suite.addTest(new TestSuite(ExecutorsTest.class)); |
151 |
< |
suite.addTest(new TestSuite(FairSemaphoreTest.class)); |
151 |
> |
suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class)); |
152 |
|
suite.addTest(new TestSuite(FutureTaskTest.class)); |
153 |
+ |
suite.addTest(new TestSuite(LinkedBlockingDequeTest.class)); |
154 |
|
suite.addTest(new TestSuite(LinkedBlockingQueueTest.class)); |
155 |
|
suite.addTest(new TestSuite(LinkedListTest.class)); |
156 |
|
suite.addTest(new TestSuite(LockSupportTest.class)); |
157 |
|
suite.addTest(new TestSuite(PriorityBlockingQueueTest.class)); |
158 |
|
suite.addTest(new TestSuite(PriorityQueueTest.class)); |
131 |
– |
suite.addTest(new TestSuite(PrivilegedFutureTaskTest.class)); |
159 |
|
suite.addTest(new TestSuite(ReentrantLockTest.class)); |
160 |
|
suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class)); |
161 |
|
suite.addTest(new TestSuite(ScheduledExecutorTest.class)); |
162 |
+ |
suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class)); |
163 |
|
suite.addTest(new TestSuite(SemaphoreTest.class)); |
164 |
|
suite.addTest(new TestSuite(SynchronousQueueTest.class)); |
165 |
|
suite.addTest(new TestSuite(SystemTest.class)); |
166 |
|
suite.addTest(new TestSuite(ThreadLocalTest.class)); |
167 |
|
suite.addTest(new TestSuite(ThreadPoolExecutorTest.class)); |
168 |
+ |
suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class)); |
169 |
|
suite.addTest(new TestSuite(ThreadTest.class)); |
170 |
|
suite.addTest(new TestSuite(TimeUnitTest.class)); |
171 |
< |
|
171 |
> |
suite.addTest(new TestSuite(TreeMapTest.class)); |
172 |
> |
suite.addTest(new TestSuite(TreeSetTest.class)); |
173 |
> |
suite.addTest(new TestSuite(TreeSubMapTest.class)); |
174 |
> |
suite.addTest(new TestSuite(TreeSubSetTest.class)); |
175 |
> |
|
176 |
|
return suite; |
177 |
|
} |
178 |
|
|
184 |
|
|
185 |
|
|
186 |
|
/** |
187 |
< |
* Return the shortest timed delay. This could |
188 |
< |
* be reimplmented to use for example a Property. |
189 |
< |
*/ |
187 |
> |
* Returns the shortest timed delay. This could |
188 |
> |
* be reimplemented to use for example a Property. |
189 |
> |
*/ |
190 |
|
protected long getShortDelay() { |
191 |
< |
return 100; |
191 |
> |
return 50; |
192 |
|
} |
193 |
|
|
194 |
|
|
195 |
|
/** |
196 |
< |
* Set delays as multiples of SHORT_DELAY. |
196 |
> |
* Sets delays as multiples of SHORT_DELAY. |
197 |
|
*/ |
198 |
|
protected void setDelays() { |
199 |
|
SHORT_DELAY_MS = getShortDelay(); |
208 |
|
volatile boolean threadFailed; |
209 |
|
|
210 |
|
/** |
211 |
< |
* Initialize test to indicate that no thread assertions have failed |
211 |
> |
* Initializes test to indicate that no thread assertions have failed |
212 |
|
*/ |
213 |
< |
public void setUp() { |
213 |
> |
public void setUp() { |
214 |
|
setDelays(); |
215 |
< |
threadFailed = false; |
215 |
> |
threadFailed = false; |
216 |
|
} |
217 |
|
|
218 |
|
/** |
219 |
< |
* Trigger test case failure if any thread assertions have failed |
219 |
> |
* Triggers test case failure if any thread assertions have failed |
220 |
|
*/ |
221 |
< |
public void tearDown() { |
222 |
< |
assertFalse(threadFailed); |
221 |
> |
public void tearDown() { |
222 |
> |
assertFalse(threadFailed); |
223 |
|
} |
224 |
|
|
225 |
|
/** |
226 |
|
* Fail, also setting status to indicate current testcase should fail |
227 |
< |
*/ |
227 |
> |
*/ |
228 |
|
public void threadFail(String reason) { |
229 |
|
threadFailed = true; |
230 |
|
fail(reason); |
233 |
|
/** |
234 |
|
* If expression not true, set status to indicate current testcase |
235 |
|
* should fail |
236 |
< |
*/ |
236 |
> |
*/ |
237 |
|
public void threadAssertTrue(boolean b) { |
238 |
|
if (!b) { |
239 |
|
threadFailed = true; |
244 |
|
/** |
245 |
|
* If expression not false, set status to indicate current testcase |
246 |
|
* should fail |
247 |
< |
*/ |
247 |
> |
*/ |
248 |
|
public void threadAssertFalse(boolean b) { |
249 |
|
if (b) { |
250 |
|
threadFailed = true; |
255 |
|
/** |
256 |
|
* If argument not null, set status to indicate current testcase |
257 |
|
* should fail |
258 |
< |
*/ |
258 |
> |
*/ |
259 |
|
public void threadAssertNull(Object x) { |
260 |
|
if (x != null) { |
261 |
|
threadFailed = true; |
266 |
|
/** |
267 |
|
* If arguments not equal, set status to indicate current testcase |
268 |
|
* should fail |
269 |
< |
*/ |
269 |
> |
*/ |
270 |
|
public void threadAssertEquals(long x, long y) { |
271 |
|
if (x != y) { |
272 |
|
threadFailed = true; |
277 |
|
/** |
278 |
|
* If arguments not equal, set status to indicate current testcase |
279 |
|
* should fail |
280 |
< |
*/ |
280 |
> |
*/ |
281 |
|
public void threadAssertEquals(Object x, Object y) { |
282 |
|
if (x != y && (x == null || !x.equals(y))) { |
283 |
|
threadFailed = true; |
287 |
|
|
288 |
|
/** |
289 |
|
* threadFail with message "should throw exception" |
290 |
< |
*/ |
290 |
> |
*/ |
291 |
|
public void threadShouldThrow() { |
292 |
|
threadFailed = true; |
293 |
|
fail("should throw exception"); |
294 |
|
} |
295 |
|
|
296 |
|
/** |
297 |
+ |
* threadFail with message "should throw" + exceptionName |
298 |
+ |
*/ |
299 |
+ |
public void threadShouldThrow(String exceptionName) { |
300 |
+ |
threadFailed = true; |
301 |
+ |
fail("should throw " + exceptionName); |
302 |
+ |
} |
303 |
+ |
|
304 |
+ |
/** |
305 |
|
* threadFail with message "Unexpected exception" |
306 |
|
*/ |
307 |
|
public void threadUnexpectedException() { |
309 |
|
fail("Unexpected exception"); |
310 |
|
} |
311 |
|
|
312 |
+ |
/** |
313 |
+ |
* threadFail with message "Unexpected exception", with argument |
314 |
+ |
*/ |
315 |
+ |
public void threadUnexpectedException(Throwable ex) { |
316 |
+ |
threadFailed = true; |
317 |
+ |
ex.printStackTrace(); |
318 |
+ |
fail("Unexpected exception: " + ex); |
319 |
+ |
} |
320 |
|
|
321 |
|
/** |
322 |
|
* Wait out termination of a thread pool or fail doing so |
324 |
|
public void joinPool(ExecutorService exec) { |
325 |
|
try { |
326 |
|
exec.shutdown(); |
327 |
< |
assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS)); |
328 |
< |
} catch(InterruptedException ie) { |
327 |
> |
assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
328 |
> |
} catch (SecurityException ok) { |
329 |
> |
// Allowed in case test doesn't have privs |
330 |
> |
} catch (InterruptedException ie) { |
331 |
|
fail("Unexpected exception"); |
332 |
|
} |
333 |
|
} |
335 |
|
|
336 |
|
/** |
337 |
|
* fail with message "should throw exception" |
338 |
< |
*/ |
338 |
> |
*/ |
339 |
|
public void shouldThrow() { |
340 |
|
fail("Should throw exception"); |
341 |
|
} |
342 |
|
|
343 |
|
/** |
344 |
+ |
* fail with message "should throw " + exceptionName |
345 |
+ |
*/ |
346 |
+ |
public void shouldThrow(String exceptionName) { |
347 |
+ |
fail("Should throw " + exceptionName); |
348 |
+ |
} |
349 |
+ |
|
350 |
+ |
/** |
351 |
|
* fail with message "Unexpected exception" |
352 |
|
*/ |
353 |
|
public void unexpectedException() { |
354 |
|
fail("Unexpected exception"); |
355 |
|
} |
356 |
|
|
357 |
+ |
/** |
358 |
+ |
* fail with message "Unexpected exception", with argument |
359 |
+ |
*/ |
360 |
+ |
public void unexpectedException(Throwable ex) { |
361 |
+ |
ex.printStackTrace(); |
362 |
+ |
fail("Unexpected exception: " + ex); |
363 |
+ |
} |
364 |
+ |
|
365 |
|
|
366 |
|
/** |
367 |
|
* The number of elements to place in collections, arrays, etc. |
385 |
|
static final Integer m3 = new Integer(-3); |
386 |
|
static final Integer m4 = new Integer(-4); |
387 |
|
static final Integer m5 = new Integer(-5); |
388 |
+ |
static final Integer m6 = new Integer(-6); |
389 |
|
static final Integer m10 = new Integer(-10); |
390 |
|
|
391 |
|
|
410 |
|
public void refresh() {} |
411 |
|
} |
412 |
|
|
413 |
+ |
/** |
414 |
+ |
* Sleep until the timeout has elapsed, or interrupted. |
415 |
+ |
* Does <em>NOT</em> throw InterruptedException. |
416 |
+ |
*/ |
417 |
+ |
void sleepTillInterrupted(long timeoutMillis) { |
418 |
+ |
try { |
419 |
+ |
Thread.sleep(timeoutMillis); |
420 |
+ |
} catch (InterruptedException wakeup) { |
421 |
+ |
} |
422 |
+ |
} |
423 |
+ |
|
424 |
+ |
/** |
425 |
+ |
* Returns a new started Thread running the given runnable. |
426 |
+ |
*/ |
427 |
+ |
Thread newStartedThread(Runnable runnable) { |
428 |
+ |
Thread t = new Thread(runnable); |
429 |
+ |
t.start(); |
430 |
+ |
return t; |
431 |
+ |
} |
432 |
|
|
433 |
|
// Some convenient Runnable classes |
434 |
|
|
435 |
< |
static class NoOpRunnable implements Runnable { |
436 |
< |
public void run() {} |
351 |
< |
} |
435 |
> |
abstract class CheckedRunnable implements Runnable { |
436 |
> |
abstract void realRun() throws Throwable; |
437 |
|
|
438 |
< |
static class NoOpCallable implements Callable { |
439 |
< |
public Object call() { return Boolean.TRUE; } |
438 |
> |
public final void run() { |
439 |
> |
try { |
440 |
> |
realRun(); |
441 |
> |
} catch (Throwable t) { |
442 |
> |
threadUnexpectedException(t); |
443 |
> |
} |
444 |
> |
} |
445 |
|
} |
446 |
|
|
447 |
< |
class ShortRunnable implements Runnable { |
448 |
< |
public void run() { |
447 |
> |
abstract class RunnableShouldThrow implements Runnable { |
448 |
> |
abstract void realRun() throws Throwable; |
449 |
> |
|
450 |
> |
final Class<?> exceptionClass; |
451 |
> |
|
452 |
> |
<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) { |
453 |
> |
this.exceptionClass = exceptionClass; |
454 |
> |
} |
455 |
> |
|
456 |
> |
public final void run() { |
457 |
|
try { |
458 |
< |
Thread.sleep(SHORT_DELAY_MS); |
459 |
< |
} |
460 |
< |
catch(Exception e) { |
461 |
< |
threadUnexpectedException(); |
458 |
> |
realRun(); |
459 |
> |
threadShouldThrow(exceptionClass.getSimpleName()); |
460 |
> |
} catch (InterruptedException success) { |
461 |
> |
} catch (Throwable t) { |
462 |
> |
if (! exceptionClass.isInstance(t)) |
463 |
> |
threadUnexpectedException(t); |
464 |
|
} |
465 |
|
} |
466 |
|
} |
467 |
|
|
468 |
< |
class ShortInterruptedRunnable implements Runnable { |
469 |
< |
public void run() { |
468 |
> |
abstract class ThreadShouldThrow extends Thread { |
469 |
> |
abstract void realRun() throws Throwable; |
470 |
> |
|
471 |
> |
final Class<?> exceptionClass; |
472 |
> |
|
473 |
> |
<T extends Throwable> ThreadShouldThrow(Class<T> exceptionClass) { |
474 |
> |
this.exceptionClass = exceptionClass; |
475 |
> |
} |
476 |
> |
|
477 |
> |
public final void run() { |
478 |
|
try { |
479 |
< |
Thread.sleep(SHORT_DELAY_MS); |
480 |
< |
threadShouldThrow(); |
481 |
< |
} |
482 |
< |
catch(InterruptedException success) { |
479 |
> |
realRun(); |
480 |
> |
threadShouldThrow(exceptionClass.getSimpleName()); |
481 |
> |
} catch (InterruptedException success) { |
482 |
> |
} catch (Throwable t) { |
483 |
> |
if (! exceptionClass.isInstance(t)) |
484 |
> |
threadUnexpectedException(t); |
485 |
|
} |
486 |
|
} |
487 |
|
} |
488 |
|
|
489 |
< |
class SmallRunnable implements Runnable { |
490 |
< |
public void run() { |
489 |
> |
abstract class CheckedInterruptedRunnable implements Runnable { |
490 |
> |
abstract void realRun() throws Throwable; |
491 |
> |
|
492 |
> |
public final void run() { |
493 |
|
try { |
494 |
< |
Thread.sleep(SMALL_DELAY_MS); |
495 |
< |
} |
496 |
< |
catch(Exception e) { |
497 |
< |
threadUnexpectedException(); |
494 |
> |
realRun(); |
495 |
> |
threadShouldThrow("InterruptedException"); |
496 |
> |
} catch (InterruptedException success) { |
497 |
> |
} catch (Throwable t) { |
498 |
> |
threadUnexpectedException(t); |
499 |
|
} |
500 |
|
} |
501 |
|
} |
502 |
|
|
503 |
< |
class SmallPossiblyInterruptedRunnable implements Runnable { |
504 |
< |
public void run() { |
503 |
> |
abstract class CheckedCallable<T> implements Callable<T> { |
504 |
> |
abstract T realCall() throws Throwable; |
505 |
> |
|
506 |
> |
public final T call() { |
507 |
|
try { |
508 |
< |
Thread.sleep(SMALL_DELAY_MS); |
509 |
< |
} |
510 |
< |
catch(Exception e) { |
508 |
> |
return realCall(); |
509 |
> |
} catch (Throwable t) { |
510 |
> |
threadUnexpectedException(t); |
511 |
|
} |
512 |
+ |
return null; |
513 |
|
} |
514 |
|
} |
515 |
|
|
516 |
< |
class SmallCallable implements Callable { |
517 |
< |
public Object call() { |
516 |
> |
abstract class CheckedInterruptedCallable<T> implements Callable<T> { |
517 |
> |
abstract T realCall() throws Throwable; |
518 |
> |
|
519 |
> |
public final T call() { |
520 |
|
try { |
521 |
< |
Thread.sleep(SMALL_DELAY_MS); |
521 |
> |
T result = realCall(); |
522 |
> |
threadShouldThrow("InterruptedException"); |
523 |
> |
return result; |
524 |
> |
} catch (InterruptedException success) { |
525 |
> |
} catch (Throwable t) { |
526 |
> |
threadUnexpectedException(t); |
527 |
|
} |
528 |
< |
catch(Exception e) { |
406 |
< |
threadUnexpectedException(); |
407 |
< |
} |
408 |
< |
return Boolean.TRUE; |
528 |
> |
return null; |
529 |
|
} |
530 |
|
} |
531 |
|
|
532 |
< |
class SmallInterruptedRunnable implements Runnable { |
533 |
< |
public void run() { |
532 |
> |
static class NoOpRunnable implements Runnable { |
533 |
> |
public void run() {} |
534 |
> |
} |
535 |
> |
|
536 |
> |
static class NoOpCallable implements Callable { |
537 |
> |
public Object call() { return Boolean.TRUE; } |
538 |
> |
} |
539 |
> |
|
540 |
> |
static final String TEST_STRING = "a test string"; |
541 |
> |
|
542 |
> |
static class StringTask implements Callable<String> { |
543 |
> |
public String call() { return TEST_STRING; } |
544 |
> |
} |
545 |
> |
|
546 |
> |
static class NPETask implements Callable<String> { |
547 |
> |
public String call() { throw new NullPointerException(); } |
548 |
> |
} |
549 |
> |
|
550 |
> |
static class CallableOne implements Callable<Integer> { |
551 |
> |
public Integer call() { return one; } |
552 |
> |
} |
553 |
> |
|
554 |
> |
class ShortRunnable extends CheckedRunnable { |
555 |
> |
void realRun() throws Throwable { |
556 |
> |
Thread.sleep(SHORT_DELAY_MS); |
557 |
> |
} |
558 |
> |
} |
559 |
> |
|
560 |
> |
class ShortInterruptedRunnable extends CheckedInterruptedRunnable { |
561 |
> |
void realRun() throws InterruptedException { |
562 |
> |
Thread.sleep(SHORT_DELAY_MS); |
563 |
> |
} |
564 |
> |
} |
565 |
> |
|
566 |
> |
class SmallRunnable extends CheckedRunnable { |
567 |
> |
void realRun() throws Throwable { |
568 |
> |
Thread.sleep(SMALL_DELAY_MS); |
569 |
> |
} |
570 |
> |
} |
571 |
> |
|
572 |
> |
class SmallPossiblyInterruptedRunnable extends CheckedRunnable { |
573 |
> |
void realRun() { |
574 |
|
try { |
575 |
|
Thread.sleep(SMALL_DELAY_MS); |
416 |
– |
threadShouldThrow(); |
576 |
|
} |
577 |
< |
catch(InterruptedException success) { |
577 |
> |
catch (InterruptedException ok) { |
578 |
|
} |
579 |
|
} |
580 |
|
} |
581 |
|
|
582 |
+ |
class SmallCallable extends CheckedCallable { |
583 |
+ |
Object realCall() throws Throwable { |
584 |
+ |
Thread.sleep(SMALL_DELAY_MS); |
585 |
+ |
return Boolean.TRUE; |
586 |
+ |
} |
587 |
+ |
} |
588 |
|
|
589 |
< |
class MediumRunnable implements Runnable { |
590 |
< |
public void run() { |
591 |
< |
try { |
427 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
428 |
< |
} |
429 |
< |
catch(Exception e) { |
430 |
< |
threadUnexpectedException(); |
431 |
< |
} |
589 |
> |
class SmallInterruptedRunnable extends CheckedInterruptedRunnable { |
590 |
> |
void realRun() throws InterruptedException { |
591 |
> |
Thread.sleep(SMALL_DELAY_MS); |
592 |
|
} |
593 |
|
} |
594 |
|
|
595 |
< |
class MediumInterruptedRunnable implements Runnable { |
596 |
< |
public void run() { |
595 |
> |
class MediumRunnable extends CheckedRunnable { |
596 |
> |
void realRun() throws Throwable { |
597 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
598 |
> |
} |
599 |
> |
} |
600 |
> |
|
601 |
> |
class MediumInterruptedRunnable extends CheckedInterruptedRunnable { |
602 |
> |
void realRun() throws InterruptedException { |
603 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
604 |
> |
} |
605 |
> |
} |
606 |
> |
|
607 |
> |
class MediumPossiblyInterruptedRunnable extends CheckedRunnable { |
608 |
> |
void realRun() { |
609 |
|
try { |
610 |
|
Thread.sleep(MEDIUM_DELAY_MS); |
439 |
– |
threadShouldThrow(); |
611 |
|
} |
612 |
< |
catch(InterruptedException success) { |
612 |
> |
catch (InterruptedException ok) { |
613 |
|
} |
614 |
|
} |
615 |
|
} |
616 |
|
|
617 |
< |
class MediumPossiblyInterruptedRunnable implements Runnable { |
618 |
< |
public void run() { |
617 |
> |
class LongPossiblyInterruptedRunnable extends CheckedRunnable { |
618 |
> |
void realRun() { |
619 |
|
try { |
620 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
620 |
> |
Thread.sleep(LONG_DELAY_MS); |
621 |
|
} |
622 |
< |
catch(InterruptedException success) { |
622 |
> |
catch (InterruptedException ok) { |
623 |
|
} |
624 |
|
} |
625 |
|
} |
627 |
|
/** |
628 |
|
* For use as ThreadFactory in constructors |
629 |
|
*/ |
630 |
< |
static class SimpleThreadFactory implements ThreadFactory{ |
631 |
< |
public Thread newThread(Runnable r){ |
630 |
> |
static class SimpleThreadFactory implements ThreadFactory { |
631 |
> |
public Thread newThread(Runnable r) { |
632 |
|
return new Thread(r); |
633 |
< |
} |
633 |
> |
} |
634 |
|
} |
635 |
|
|
636 |
|
static class TrackedShortRunnable implements Runnable { |
639 |
|
try { |
640 |
|
Thread.sleep(SMALL_DELAY_MS); |
641 |
|
done = true; |
642 |
< |
} catch(Exception e){ |
642 |
> |
} catch (InterruptedException ok) { |
643 |
|
} |
644 |
|
} |
645 |
|
} |
650 |
|
try { |
651 |
|
Thread.sleep(MEDIUM_DELAY_MS); |
652 |
|
done = true; |
653 |
< |
} catch(Exception e){ |
653 |
> |
} catch (InterruptedException ok) { |
654 |
|
} |
655 |
|
} |
656 |
|
} |
661 |
|
try { |
662 |
|
Thread.sleep(LONG_DELAY_MS); |
663 |
|
done = true; |
664 |
< |
} catch(Exception e){ |
664 |
> |
} catch (InterruptedException ok) { |
665 |
|
} |
666 |
|
} |
667 |
|
} |
679 |
|
try { |
680 |
|
Thread.sleep(SMALL_DELAY_MS); |
681 |
|
done = true; |
682 |
< |
} catch(Exception e){ |
682 |
> |
} catch (InterruptedException ok) { |
683 |
|
} |
684 |
|
return Boolean.TRUE; |
685 |
|
} |
686 |
|
} |
687 |
|
|
688 |
+ |
|
689 |
|
/** |
690 |
|
* For use as RejectedExecutionHandler in constructors |
691 |
|
*/ |
692 |
< |
static class NoOpREHandler implements RejectedExecutionHandler{ |
693 |
< |
public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){} |
692 |
> |
static class NoOpREHandler implements RejectedExecutionHandler { |
693 |
> |
public void rejectedExecution(Runnable r, |
694 |
> |
ThreadPoolExecutor executor) {} |
695 |
|
} |
696 |
< |
|
524 |
< |
|
696 |
> |
|
697 |
|
} |