23 |
|
*/ |
24 |
|
static class PublicFutureTask extends FutureTask { |
25 |
|
public PublicFutureTask(Callable r) { super(r); } |
26 |
< |
public boolean reset() { return super.reset(); } |
27 |
< |
public void setCancelled() { super.setCancelled(); } |
26 |
> |
public boolean runAndReset() { return super.runAndReset(); } |
27 |
|
public void set(Object x) { super.set(x); } |
28 |
|
public void setException(Throwable t) { super.setException(t); } |
29 |
|
} |
63 |
|
} |
64 |
|
|
65 |
|
/** |
66 |
< |
* reset of a done task succeeds and changes status to not done |
66 |
> |
* runAndReset of a non-cancelled task succeeds |
67 |
|
*/ |
68 |
< |
public void testReset() { |
68 |
> |
public void testRunAndReset() { |
69 |
|
PublicFutureTask task = new PublicFutureTask(new NoOpCallable()); |
70 |
< |
task.run(); |
72 |
< |
assertTrue(task.isDone()); |
73 |
< |
assertTrue(task.reset()); |
70 |
> |
assertTrue(task.runAndReset()); |
71 |
|
assertFalse(task.isDone()); |
72 |
|
} |
73 |
|
|
74 |
|
/** |
75 |
< |
* Resetting after cancellation fails |
75 |
> |
* runAndReset after cancellation fails |
76 |
|
*/ |
77 |
|
public void testResetAfterCancel() { |
78 |
|
PublicFutureTask task = new PublicFutureTask(new NoOpCallable()); |
79 |
|
assertTrue(task.cancel(false)); |
80 |
< |
task.run(); |
80 |
> |
assertFalse(task.runAndReset()); |
81 |
|
assertTrue(task.isDone()); |
82 |
|
assertTrue(task.isCancelled()); |
86 |
– |
assertFalse(task.reset()); |
83 |
|
} |
84 |
|
|
85 |
|
|
90 |
– |
/** |
91 |
– |
* setCancelled of a new task causes isCancelled to be true |
92 |
– |
*/ |
93 |
– |
public void testSetCancelled() { |
94 |
– |
PublicFutureTask task = new PublicFutureTask(new NoOpCallable()); |
95 |
– |
assertTrue(task.cancel(false)); |
96 |
– |
task.setCancelled(); |
97 |
– |
assertTrue(task.isDone()); |
98 |
– |
assertTrue(task.isCancelled()); |
99 |
– |
} |
86 |
|
|
87 |
|
/** |
88 |
|
* setting value gauses get to return it |