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

Comparing jsr166/src/test/tck/ExecutorCompletionServiceTest.java (file contents):
Revision 1.9 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.22 by jsr166, Sun Oct 4 18:28:51 2015 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
10 import junit.framework.*;
11 import java.util.*;
12 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.concurrent.atomic.*;
11 < import java.math.BigInteger;
12 < import java.security.*;
10 >
11 > import java.util.concurrent.ArrayBlockingQueue;
12 > import java.util.concurrent.Callable;
13 > import java.util.concurrent.ExecutorCompletionService;
14 > import java.util.concurrent.Executors;
15 > import java.util.concurrent.ExecutorService;
16 > import java.util.concurrent.Future;
17 > import java.util.concurrent.FutureTask;
18 > import java.util.concurrent.RunnableFuture;
19 > import java.util.concurrent.ThreadPoolExecutor;
20 > import java.util.concurrent.TimeUnit;
21 > import java.util.concurrent.atomic.AtomicBoolean;
22 >
23 > import junit.framework.Test;
24 > import junit.framework.TestSuite;
25  
26   public class ExecutorCompletionServiceTest extends JSR166TestCase {
27      public static void main(String[] args) {
28 <        junit.textui.TestRunner.run (suite());
28 >        main(suite(), args);
29      }
30      public static Test suite() {
31          return new TestSuite(ExecutorCompletionServiceTest.class);
32      }
33  
26
34      /**
35       * Creating a new ECS with null Executor throw NPE
36       */
37      public void testConstructorNPE() {
38          try {
39 <            ExecutorCompletionService ecs = new ExecutorCompletionService(null);
39 >            new ExecutorCompletionService(null);
40              shouldThrow();
41 <        } catch (NullPointerException success) {
35 <        }
41 >        } catch (NullPointerException success) {}
42      }
43  
44      /**
# Line 41 | Line 47 | public class ExecutorCompletionServiceTe
47      public void testConstructorNPE2() {
48          try {
49              ExecutorService e = Executors.newCachedThreadPool();
50 <            ExecutorCompletionService ecs = new ExecutorCompletionService(e, null);
50 >            new ExecutorCompletionService(e, null);
51              shouldThrow();
52 <        } catch (NullPointerException success) {
47 <        }
52 >        } catch (NullPointerException success) {}
53      }
54  
55      /**
56       * Submitting a null callable throws NPE
57       */
58      public void testSubmitNPE() {
59 <        ExecutorService e = Executors.newCachedThreadPool();
60 <        ExecutorCompletionService ecs = new ExecutorCompletionService(e);
61 <        try {
59 >        final ExecutorService e = Executors.newCachedThreadPool();
60 >        final ExecutorCompletionService ecs = new ExecutorCompletionService(e);
61 >        try (PoolCleaner cleaner = cleaner(e)) {
62              Callable c = null;
63 <            ecs.submit(c);
64 <            shouldThrow();
65 <        } catch (NullPointerException success) {
66 <        } finally {
62 <            joinPool(e);
63 >            try {
64 >                ecs.submit(c);
65 >                shouldThrow();
66 >            } catch (NullPointerException success) {}
67          }
68      }
69  
# Line 67 | Line 71 | public class ExecutorCompletionServiceTe
71       * Submitting a null runnable throws NPE
72       */
73      public void testSubmitNPE2() {
74 <        ExecutorService e = Executors.newCachedThreadPool();
75 <        ExecutorCompletionService ecs = new ExecutorCompletionService(e);
76 <        try {
74 >        final ExecutorService e = Executors.newCachedThreadPool();
75 >        final ExecutorCompletionService ecs = new ExecutorCompletionService(e);
76 >        try (PoolCleaner cleaner = cleaner(e)) {
77              Runnable r = null;
78 <            ecs.submit(r, Boolean.TRUE);
79 <            shouldThrow();
80 <        } catch (NullPointerException success) {
81 <        } finally {
78 <            joinPool(e);
78 >            try {
79 >                ecs.submit(r, Boolean.TRUE);
80 >                shouldThrow();
81 >            } catch (NullPointerException success) {}
82          }
83      }
84  
85      /**
86       * A taken submitted task is completed
87       */
88 <    public void testTake() {
89 <        ExecutorService e = Executors.newCachedThreadPool();
90 <        ExecutorCompletionService ecs = new ExecutorCompletionService(e);
91 <        try {
88 >    public void testTake() throws InterruptedException {
89 >        final ExecutorService e = Executors.newCachedThreadPool();
90 >        final ExecutorCompletionService ecs = new ExecutorCompletionService(e);
91 >        try (PoolCleaner cleaner = cleaner(e)) {
92              Callable c = new StringTask();
93              ecs.submit(c);
94              Future f = ecs.take();
95              assertTrue(f.isDone());
93        } catch (Exception ex) {
94            unexpectedException();
95        } finally {
96            joinPool(e);
96          }
97      }
98  
99      /**
100       * Take returns the same future object returned by submit
101       */
102 <    public void testTake2() {
103 <        ExecutorService e = Executors.newCachedThreadPool();
104 <        ExecutorCompletionService ecs = new ExecutorCompletionService(e);
105 <        try {
102 >    public void testTake2() throws InterruptedException {
103 >        final ExecutorService e = Executors.newCachedThreadPool();
104 >        final ExecutorCompletionService ecs = new ExecutorCompletionService(e);
105 >        try (PoolCleaner cleaner = cleaner(e)) {
106              Callable c = new StringTask();
107              Future f1 = ecs.submit(c);
108              Future f2 = ecs.take();
109              assertSame(f1, f2);
111        } catch (Exception ex) {
112            unexpectedException();
113        } finally {
114            joinPool(e);
110          }
111      }
112  
113      /**
114       * If poll returns non-null, the returned task is completed
115       */
116 <    public void testPoll1() {
117 <        ExecutorService e = Executors.newCachedThreadPool();
118 <        ExecutorCompletionService ecs = new ExecutorCompletionService(e);
119 <        try {
116 >    public void testPoll1() throws Exception {
117 >        final ExecutorService e = Executors.newCachedThreadPool();
118 >        final ExecutorCompletionService ecs = new ExecutorCompletionService(e);
119 >        try (PoolCleaner cleaner = cleaner(e)) {
120              assertNull(ecs.poll());
121              Callable c = new StringTask();
122              ecs.submit(c);
123 <            Thread.sleep(SHORT_DELAY_MS);
124 <            for (;;) {
125 <                Future f = ecs.poll();
126 <                if (f != null) {
127 <                    assertTrue(f.isDone());
128 <                    break;
129 <                }
123 >
124 >            long startTime = System.nanoTime();
125 >            Future f;
126 >            while ((f = ecs.poll()) == null) {
127 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
128 >                    fail("timed out");
129 >                Thread.yield();
130              }
131 <        } catch (Exception ex) {
132 <            unexpectedException();
138 <        } finally {
139 <            joinPool(e);
131 >            assertTrue(f.isDone());
132 >            assertSame(TEST_STRING, f.get());
133          }
134      }
135  
136      /**
137       * If timed poll returns non-null, the returned task is completed
138       */
139 <    public void testPoll2() {
140 <        ExecutorService e = Executors.newCachedThreadPool();
141 <        ExecutorCompletionService ecs = new ExecutorCompletionService(e);
142 <        try {
139 >    public void testPoll2() throws InterruptedException {
140 >        final ExecutorService e = Executors.newCachedThreadPool();
141 >        final ExecutorCompletionService ecs = new ExecutorCompletionService(e);
142 >        try (PoolCleaner cleaner = cleaner(e)) {
143              assertNull(ecs.poll());
144              Callable c = new StringTask();
145              ecs.submit(c);
146              Future f = ecs.poll(SHORT_DELAY_MS, MILLISECONDS);
147              if (f != null)
148                  assertTrue(f.isDone());
149 <        } catch (Exception ex) {
150 <            unexpectedException();
158 <        } finally {
159 <            joinPool(e);
160 <        }
161 <    }
162 <     /**
163 <      * Submitting to underlying AES that overrides newTaskFor(Callable)
164 <      * returns and eventually runs Future returned by newTaskFor.
165 <      */
166 <     public void testNewTaskForCallable() {
167 <         final AtomicBoolean done = new AtomicBoolean(false);
168 <         class MyCallableFuture<V> extends FutureTask<V> {
169 <             MyCallableFuture(Callable<V> c) { super(c); }
170 <             protected void done() { done.set(true); }
171 <         }
172 <         ExecutorService e = new ThreadPoolExecutor(
173 <                                 1, 1, 30L, TimeUnit.SECONDS,
174 <                                 new ArrayBlockingQueue<Runnable>(1)) {
175 <             protected <T> RunnableFuture<T> newTaskFor(Callable<T> c) {
176 <                 return new MyCallableFuture<T>(c);
177 <             }
178 <         };
179 <         ExecutorCompletionService<String> ecs =
180 <             new ExecutorCompletionService<String>(e);
181 <         try {
182 <             assertNull(ecs.poll());
183 <             Callable<String> c = new StringTask();
184 <             Future f1 = ecs.submit(c);
185 <             assertTrue("submit must return MyCallableFuture",
186 <                        f1 instanceof MyCallableFuture);
187 <             Future f2 = ecs.take();
188 <             assertSame("submit and take must return same objects", f1, f2);
189 <             assertTrue("completed task must have set done", done.get());
190 <         } catch (Exception ex) {
191 <             unexpectedException();
192 <         } finally {
193 <             joinPool(e);
194 <         }
195 <     }
196 <
197 <     /**
198 <      * Submitting to underlying AES that overrides newTaskFor(Runnable,T)
199 <      * returns and eventually runs Future returned by newTaskFor.
200 <      */
201 <     public void testNewTaskForRunnable() {
202 <         final AtomicBoolean done = new AtomicBoolean(false);
203 <         class MyRunnableFuture<V> extends FutureTask<V> {
204 <             MyRunnableFuture(Runnable t, V r) { super(t, r); }
205 <             protected void done() { done.set(true); }
206 <         }
207 <         ExecutorService e = new ThreadPoolExecutor(
208 <                                 1, 1, 30L, TimeUnit.SECONDS,
209 <                                 new ArrayBlockingQueue<Runnable>(1)) {
210 <             protected <T> RunnableFuture<T> newTaskFor(Runnable t, T r) {
211 <                 return new MyRunnableFuture<T>(t, r);
212 <             }
213 <         };
214 <         ExecutorCompletionService<String> ecs =
215 <             new ExecutorCompletionService<String>(e);
216 <         try {
217 <             assertNull(ecs.poll());
218 <             Runnable r = new NoOpRunnable();
219 <             Future f1 = ecs.submit(r, null);
220 <             assertTrue("submit must return MyRunnableFuture",
221 <                        f1 instanceof MyRunnableFuture);
222 <             Future f2 = ecs.take();
223 <             assertSame("submit and take must return same objects", f1, f2);
224 <             assertTrue("completed task must have set done", done.get());
225 <         } catch (Exception ex) {
226 <             unexpectedException();
227 <         } finally {
228 <             joinPool(e);
229 <         }
230 <     }
149 >        }
150 >    }
151  
152 +    /**
153 +     * Submitting to underlying AES that overrides newTaskFor(Callable)
154 +     * returns and eventually runs Future returned by newTaskFor.
155 +     */
156 +    public void testNewTaskForCallable() throws InterruptedException {
157 +        final AtomicBoolean done = new AtomicBoolean(false);
158 +        class MyCallableFuture<V> extends FutureTask<V> {
159 +            MyCallableFuture(Callable<V> c) { super(c); }
160 +            protected void done() { done.set(true); }
161 +        }
162 +        final ExecutorService e =
163 +            new ThreadPoolExecutor(1, 1,
164 +                                   30L, TimeUnit.SECONDS,
165 +                                   new ArrayBlockingQueue<Runnable>(1)) {
166 +                protected <T> RunnableFuture<T> newTaskFor(Callable<T> c) {
167 +                    return new MyCallableFuture<T>(c);
168 +                }};
169 +        ExecutorCompletionService<String> ecs =
170 +            new ExecutorCompletionService<String>(e);
171 +        try (PoolCleaner cleaner = cleaner(e)) {
172 +            assertNull(ecs.poll());
173 +            Callable<String> c = new StringTask();
174 +            Future f1 = ecs.submit(c);
175 +            assertTrue("submit must return MyCallableFuture",
176 +                       f1 instanceof MyCallableFuture);
177 +            Future f2 = ecs.take();
178 +            assertSame("submit and take must return same objects", f1, f2);
179 +            assertTrue("completed task must have set done", done.get());
180 +        }
181 +    }
182  
183 +    /**
184 +     * Submitting to underlying AES that overrides newTaskFor(Runnable,T)
185 +     * returns and eventually runs Future returned by newTaskFor.
186 +     */
187 +    public void testNewTaskForRunnable() throws InterruptedException {
188 +        final AtomicBoolean done = new AtomicBoolean(false);
189 +        class MyRunnableFuture<V> extends FutureTask<V> {
190 +            MyRunnableFuture(Runnable t, V r) { super(t, r); }
191 +            protected void done() { done.set(true); }
192 +        }
193 +        final ExecutorService e =
194 +            new ThreadPoolExecutor(1, 1,
195 +                                   30L, TimeUnit.SECONDS,
196 +                                   new ArrayBlockingQueue<Runnable>(1)) {
197 +                protected <T> RunnableFuture<T> newTaskFor(Runnable t, T r) {
198 +                    return new MyRunnableFuture<T>(t, r);
199 +                }};
200 +        final ExecutorCompletionService<String> ecs =
201 +            new ExecutorCompletionService<String>(e);
202 +        try (PoolCleaner cleaner = cleaner(e)) {
203 +            assertNull(ecs.poll());
204 +            Runnable r = new NoOpRunnable();
205 +            Future f1 = ecs.submit(r, null);
206 +            assertTrue("submit must return MyRunnableFuture",
207 +                       f1 instanceof MyRunnableFuture);
208 +            Future f2 = ecs.take();
209 +            assertSame("submit and take must return same objects", f1, f2);
210 +            assertTrue("completed task must have set done", done.get());
211 +        }
212 +    }
213  
214   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines