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.25 by jsr166, Thu Sep 16 02:54:10 2010 UTC vs.
Revision 1.33 by jsr166, Mon Jan 14 22:05:39 2013 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   */
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 29 | Line 28 | public class AbstractExecutorServiceTest
28      static class DirectExecutorService extends AbstractExecutorService {
29          public void execute(Runnable r) { r.run(); }
30          public void shutdown() { shutdown = true; }
31 <        public List<Runnable> shutdownNow() { shutdown = true; return Collections.EMPTY_LIST; }
31 >        public List<Runnable> shutdownNow() {
32 >            shutdown = true;
33 >            return Collections.EMPTY_LIST;
34 >        }
35          public boolean isShutdown() { return shutdown; }
36          public boolean isTerminated() { return isShutdown(); }
37 <        public boolean awaitTermination(long timeout, TimeUnit unit) { return isShutdown(); }
37 >        public boolean awaitTermination(long timeout, TimeUnit unit) {
38 >            return isShutdown();
39 >        }
40          private volatile boolean shutdown = false;
41      }
42  
# Line 41 | 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  
51 –
61      /**
62       * Completed submit(callable) returns result
63       */
# Line 79 | Line 88 | public class AbstractExecutorServiceTest
88          assertSame(TEST_STRING, result);
89      }
90  
82 –
91      /**
92       * A submitted privileged action runs to completion
93       */
# Line 152 | Line 160 | public class AbstractExecutorServiceTest
160          } catch (NullPointerException success) {}
161      }
162  
155 –
163      /**
164       * submit(null callable) throws NPE
165       */
# Line 165 | Line 172 | public class AbstractExecutorServiceTest
172      }
173  
174      /**
168 –     * submit(runnable) throws RejectedExecutionException if
169 –     * executor is saturated.
170 –     */
171 –    public void testExecute1() {
172 –        ThreadPoolExecutor p =
173 –            new ThreadPoolExecutor(1, 1,
174 –                                   60, TimeUnit.SECONDS,
175 –                                   new ArrayBlockingQueue<Runnable>(1));
176 –        try {
177 –            for (int i = 0; i < 2; ++i)
178 –                p.submit(new MediumRunnable());
179 –            for (int i = 0; i < 2; ++i) {
180 –                try {
181 –                    p.submit(new MediumRunnable());
182 –                    shouldThrow();
183 –                } catch (RejectedExecutionException success) {}
184 –            }
185 –        } finally {
186 –            joinPool(p);
187 –        }
188 –    }
189 –
190 –    /**
191 –     * submit(callable) throws RejectedExecutionException
192 –     * if executor is saturated.
193 –     */
194 –    public void testExecute2() {
195 –        ThreadPoolExecutor p =
196 –            new ThreadPoolExecutor(1, 1,
197 –                                   60, TimeUnit.SECONDS,
198 –                                   new ArrayBlockingQueue<Runnable>(1));
199 –        try {
200 –            for (int i = 0; i < 2; ++i)
201 –                p.submit(new MediumRunnable());
202 –            for (int i = 0; i < 2; ++i) {
203 –                try {
204 –                    p.submit(new SmallCallable());
205 –                    shouldThrow();
206 –                } catch (RejectedExecutionException success) {}
207 –            }
208 –        } finally {
209 –            joinPool(p);
210 –        }
211 –    }
212 –
213 –
214 –    /**
175       * submit(callable).get() throws InterruptedException if interrupted
176       */
177      public void testInterruptedSubmit() throws InterruptedException {
# Line 243 | Line 203 | public class AbstractExecutorServiceTest
203      }
204  
205      /**
206 <     *  get of submitted callable throws InterruptedException if callable
207 <     *  interrupted
248 <     */
249 <    public void testSubmitIE() throws InterruptedException {
250 <        final ThreadPoolExecutor p =
251 <            new ThreadPoolExecutor(1, 1,
252 <                                   60, TimeUnit.SECONDS,
253 <                                   new ArrayBlockingQueue<Runnable>(10));
254 <
255 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
256 <            public void realRun() throws Exception {
257 <                p.submit(new SmallCallable()).get();
258 <            }});
259 <
260 <        t.start();
261 <        Thread.sleep(SHORT_DELAY_MS);
262 <        t.interrupt();
263 <        t.join();
264 <        joinPool(p);
265 <    }
266 <
267 <    /**
268 <     *  get of submit(callable) throws ExecutionException if callable
269 <     *  throws exception
206 >     * get of submit(callable) throws ExecutionException if callable
207 >     * throws exception
208       */
209      public void testSubmitEE() throws InterruptedException {
210          ThreadPoolExecutor p =
# Line 275 | 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 289 | Line 227 | public class AbstractExecutorServiceTest
227      /**
228       * invokeAny(null) throws NPE
229       */
230 <    public void testInvokeAny1()
293 <        throws InterruptedException, ExecutionException {
230 >    public void testInvokeAny1() throws Exception {
231          ExecutorService e = new DirectExecutorService();
232          try {
233              e.invokeAny(null);
# Line 304 | Line 241 | public class AbstractExecutorServiceTest
241      /**
242       * invokeAny(empty collection) throws IAE
243       */
244 <    public void testInvokeAny2()
308 <        throws InterruptedException, ExecutionException {
244 >    public void testInvokeAny2() throws Exception {
245          ExecutorService e = new DirectExecutorService();
246          try {
247              e.invokeAny(new ArrayList<Callable<String>>());
# Line 321 | 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 450 | Line 386 | public class AbstractExecutorServiceTest
386          }
387      }
388  
453 –
389      /**
390       * timed invokeAny(null) throws NPE
391       */
# Line 500 | 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 655 | Line 590 | public class AbstractExecutorServiceTest
590          try {
591              List<Callable<String>> l = new ArrayList<Callable<String>>();
592              l.add(new StringTask());
593 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
593 >            l.add(Executors.callable(possiblyInterruptedRunnable(2 * SHORT_DELAY_MS), TEST_STRING));
594              l.add(new StringTask());
595              List<Future<String>> futures =
596 <                e.invokeAll(l, SMALL_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());
668 <            assertFalse(f1.isCancelled());
669 <            assertTrue(f2.isDone());
670 <            assertTrue(f3.isDone());
671 <            assertTrue(f3.isCancelled());
596 >                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
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