ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/FutureTaskTest.java
(Generate patch)

Comparing jsr166/src/test/tck/FutureTaskTest.java (file contents):
Revision 1.7 by dl, Fri Sep 26 15:33:13 2003 UTC vs.
Revision 1.9 by dl, Mon Dec 22 16:25:38 2003 UTC

# Line 23 | Line 23 | public class FutureTaskTest extends JSR1
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(); }
28 <        public void setDone() { super.setDone(); }
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      }
# Line 65 | Line 63 | public class FutureTaskTest extends JSR1
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();
73 <        assertTrue(task.isDone());
74 <        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());
87 –        assertFalse(task.reset());
83      }
84  
90 –    /**
91 –     * setDone of new task causes isDone to be true
92 –     */
93 –    public void testSetDone() {
94 –        PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
95 –        task.setDone();
96 –        assertTrue(task.isDone());
97 –        assertFalse(task.isCancelled());
98 –    }
85  
100 –    /**
101 –     * setCancelled of a new task causes isCancelled to be true
102 –     */
103 –    public void testSetCancelled() {
104 –        PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
105 –        assertTrue(task.cancel(false));
106 –        task.setCancelled();
107 –        assertTrue(task.isDone());
108 –        assertTrue(task.isCancelled());
109 –    }
86  
87      /**
88       * setting value gauses get to return it

Diff Legend

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