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

Comparing jsr166/src/test/tck/AbstractExecutorServiceTest.java (file contents):
Revision 1.30 by jsr166, Tue Mar 15 19:47:06 2011 UTC vs.
Revision 1.33 by jsr166, Mon Jan 14 22:05:39 2013 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9
9   import junit.framework.*;
10   import java.util.*;
11   import java.util.concurrent.*;
12 + import java.util.concurrent.atomic.AtomicBoolean;
13   import static java.util.concurrent.TimeUnit.MILLISECONDS;
14 import java.math.BigInteger;
14   import java.security.*;
15  
16   public class AbstractExecutorServiceTest extends JSR166TestCase {
# Line 46 | Line 45 | public class AbstractExecutorServiceTest
45       */
46      public void testExecuteRunnable() throws Exception {
47          ExecutorService e = new DirectExecutorService();
48 <        TrackedShortRunnable task = new TrackedShortRunnable();
49 <        assertFalse(task.done);
48 >        final AtomicBoolean done = new AtomicBoolean(false);
49 >        CheckedRunnable task = new CheckedRunnable() {
50 >            public void realRun() {
51 >                done.set(true);
52 >            }};
53          Future<?> future = e.submit(task);
54 <        future.get();
55 <        assertTrue(task.done);
54 >        assertNull(future.get());
55 >        assertNull(future.get(0, MILLISECONDS));
56 >        assertTrue(done.get());
57 >        assertTrue(future.isDone());
58 >        assertFalse(future.isCancelled());
59      }
60  
56
61      /**
62       * Completed submit(callable) returns result
63       */
# Line 84 | Line 88 | public class AbstractExecutorServiceTest
88          assertSame(TEST_STRING, result);
89      }
90  
87
91      /**
92       * A submitted privileged action runs to completion
93       */
# Line 157 | Line 160 | public class AbstractExecutorServiceTest
160          } catch (NullPointerException success) {}
161      }
162  
160
163      /**
164       * submit(null callable) throws NPE
165       */
# Line 211 | Line 213 | public class AbstractExecutorServiceTest
213                                     new ArrayBlockingQueue<Runnable>(10));
214  
215          Callable c = new Callable() {
216 <            public Object call() { return 5/0; }};
216 >            public Object call() { throw new ArithmeticException(); }};
217  
218          try {
219              p.submit(c).get();
# Line 255 | Line 257 | public class AbstractExecutorServiceTest
257       */
258      public void testInvokeAny3() throws Exception {
259          ExecutorService e = new DirectExecutorService();
260 <        List<Callable<Integer>> l = new ArrayList<Callable<Integer>>();
261 <        l.add(new Callable<Integer>() {
262 <                  public Integer call() { return 5/0; }});
260 >        List<Callable<Long>> l = new ArrayList<Callable<Long>>();
261 >        l.add(new Callable<Long>() {
262 >            public Long call() { throw new ArithmeticException(); }});
263          l.add(null);
264          try {
265              e.invokeAny(l);
# Line 384 | Line 386 | public class AbstractExecutorServiceTest
386          }
387      }
388  
387
389      /**
390       * timed invokeAny(null) throws NPE
391       */
# Line 434 | Line 435 | public class AbstractExecutorServiceTest
435       */
436      public void testTimedInvokeAny3() throws Exception {
437          ExecutorService e = new DirectExecutorService();
438 <        List<Callable<Integer>> l = new ArrayList<Callable<Integer>>();
439 <        l.add(new Callable<Integer>() {
440 <                  public Integer call() { return 5/0; }});
438 >        List<Callable<Long>> l = new ArrayList<Callable<Long>>();
439 >        l.add(new Callable<Long>() {
440 >            public Long call() { throw new ArithmeticException(); }});
441          l.add(null);
442          try {
443              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 593 | Line 594 | public class AbstractExecutorServiceTest
594              l.add(new StringTask());
595              List<Future<String>> futures =
596                  e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
597 <            assertEquals(3, futures.size());
598 <            Iterator<Future<String>> it = futures.iterator();
599 <            Future<String> f1 = it.next();
600 <            Future<String> f2 = it.next();
601 <            Future<String> f3 = it.next();
602 <            assertTrue(f1.isDone());
602 <            assertFalse(f1.isCancelled());
603 <            assertTrue(f2.isDone());
604 <            assertFalse(f2.isCancelled());
605 <            assertTrue(f3.isDone());
606 <            assertTrue(f3.isCancelled());
597 >            assertEquals(l.size(), futures.size());
598 >            for (Future future : futures)
599 >                assertTrue(future.isDone());
600 >            assertFalse(futures.get(0).isCancelled());
601 >            assertFalse(futures.get(1).isCancelled());
602 >            assertTrue(futures.get(2).isCancelled());
603          } finally {
604              joinPool(e);
605          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines