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

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.34 by jsr166, Sat Oct 9 19:30:35 2010 UTC vs.
Revision 1.37 by jsr166, Tue Mar 15 19:47:06 2011 UTC

# Line 1 | Line 1
1   /*
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
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
# Line 181 | Line 181 | public class ExecutorsTest extends JSR16
181       * a newSingleThreadScheduledExecutor successfully runs delayed task
182       */
183      public void testNewSingleThreadScheduledExecutor() throws Exception {
184 <        TrackedCallable callable = new TrackedCallable();
185 <        ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
186 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
187 <        assertFalse(callable.done);
188 <        Thread.sleep(MEDIUM_DELAY_MS);
189 <        assertTrue(callable.done);
190 <        assertEquals(Boolean.TRUE, f.get());
191 <        joinPool(p1);
184 >        ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
185 >        try {
186 >            final CountDownLatch done = new CountDownLatch(1);
187 >            final Runnable task = new CheckedRunnable() {
188 >                public void realRun() {
189 >                    done.countDown();
190 >                }};
191 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
192 >                                  SHORT_DELAY_MS, MILLISECONDS);
193 >            assertFalse(f.isDone());
194 >            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
195 >            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
196 >            assertSame(Boolean.TRUE, f.get());
197 >            assertTrue(f.isDone());
198 >        } finally {
199 >            joinPool(p);
200 >        }
201      }
202  
203      /**
204       * a newScheduledThreadPool successfully runs delayed task
205       */
206      public void testnewScheduledThreadPool() throws Exception {
207 <        TrackedCallable callable = new TrackedCallable();
208 <        ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
209 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
210 <        assertFalse(callable.done);
211 <        Thread.sleep(MEDIUM_DELAY_MS);
212 <        assertTrue(callable.done);
213 <        assertEquals(Boolean.TRUE, f.get());
214 <        joinPool(p1);
207 >        ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
208 >        try {
209 >            final CountDownLatch done = new CountDownLatch(1);
210 >            final Runnable task = new CheckedRunnable() {
211 >                public void realRun() {
212 >                    done.countDown();
213 >                }};
214 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
215 >                                  SHORT_DELAY_MS, MILLISECONDS);
216 >            assertFalse(f.isDone());
217 >            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
218 >            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
219 >            assertSame(Boolean.TRUE, f.get());
220 >            assertTrue(f.isDone());
221 >        } finally {
222 >            joinPool(p);
223 >        }
224      }
225  
226      /**
227       * an unconfigurable newScheduledThreadPool successfully runs delayed task
228       */
229      public void testunconfigurableScheduledExecutorService() throws Exception {
230 <        TrackedCallable callable = new TrackedCallable();
231 <        ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
232 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
233 <        assertFalse(callable.done);
234 <        Thread.sleep(MEDIUM_DELAY_MS);
235 <        assertTrue(callable.done);
236 <        assertEquals(Boolean.TRUE, f.get());
237 <        joinPool(p1);
230 >        ScheduledExecutorService p =
231 >            Executors.unconfigurableScheduledExecutorService
232 >            (Executors.newScheduledThreadPool(2));
233 >        try {
234 >            final CountDownLatch done = new CountDownLatch(1);
235 >            final Runnable task = new CheckedRunnable() {
236 >                public void realRun() {
237 >                    done.countDown();
238 >                }};
239 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
240 >                                  SHORT_DELAY_MS, MILLISECONDS);
241 >            assertFalse(f.isDone());
242 >            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
243 >            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
244 >            assertSame(Boolean.TRUE, f.get());
245 >            assertTrue(f.isDone());
246 >        } finally {
247 >            joinPool(p);
248 >        }
249      }
250  
251      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines