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.10 by jsr166, Sat Nov 21 06:31:05 2009 UTC vs.
Revision 1.20 by jsr166, Sun Feb 22 04:34:44 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 >        junit.textui.TestRunner.run(suite());
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) {}
42      }
# Line 40 | 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) {}
53      }
# Line 112 | Line 119 | public class ExecutorCompletionServiceTe
119      /**
120       * If poll returns non-null, the returned task is completed
121       */
122 <    public void testPoll1() throws InterruptedException {
122 >    public void testPoll1() throws Exception {
123          ExecutorService e = Executors.newCachedThreadPool();
124          ExecutorCompletionService ecs = new ExecutorCompletionService(e);
125          try {
126              assertNull(ecs.poll());
127              Callable c = new StringTask();
128              ecs.submit(c);
129 <            Thread.sleep(SHORT_DELAY_MS);
130 <            for (;;) {
131 <                Future f = ecs.poll();
132 <                if (f != null) {
133 <                    assertTrue(f.isDone());
134 <                    break;
135 <                }
129 >
130 >            long startTime = System.nanoTime();
131 >            Future f;
132 >            while ((f = ecs.poll()) == null) {
133 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
134 >                    fail("timed out");
135 >                Thread.yield();
136              }
137 +            assertTrue(f.isDone());
138 +            assertSame(TEST_STRING, f.get());
139          } finally {
140              joinPool(e);
141          }
# Line 149 | Line 158 | public class ExecutorCompletionServiceTe
158              joinPool(e);
159          }
160      }
161 <     /**
162 <      * Submitting to underlying AES that overrides newTaskFor(Callable)
163 <      * returns and eventually runs Future returned by newTaskFor.
164 <      */
165 <     public void testNewTaskForCallable() throws InterruptedException {
166 <         final AtomicBoolean done = new AtomicBoolean(false);
167 <         class MyCallableFuture<V> extends FutureTask<V> {
168 <             MyCallableFuture(Callable<V> c) { super(c); }
169 <             protected void done() { done.set(true); }
170 <         }
171 <         ExecutorService e = new ThreadPoolExecutor(
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() throws InterruptedException {
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 <         } finally {
191 <             joinPool(e);
192 <         }
193 <     }
194 <
195 <     /**
196 <      * Submitting to underlying AES that overrides newTaskFor(Runnable,T)
197 <      * returns and eventually runs Future returned by newTaskFor.
198 <      */
199 <     public void testNewTaskForRunnable() throws InterruptedException {
200 <         final AtomicBoolean done = new AtomicBoolean(false);
201 <         class MyRunnableFuture<V> extends FutureTask<V> {
202 <             MyRunnableFuture(Runnable t, V r) { super(t, r); }
203 <             protected void done() { done.set(true); }
204 <         }
195 <         ExecutorService e = new ThreadPoolExecutor(
175 >            protected <T> RunnableFuture<T> newTaskFor(Callable<T> c) {
176 >                return new MyCallableFuture<T>(c);
177 >            }};
178 >        ExecutorCompletionService<String> ecs =
179 >            new ExecutorCompletionService<String>(e);
180 >        try {
181 >            assertNull(ecs.poll());
182 >            Callable<String> c = new StringTask();
183 >            Future f1 = ecs.submit(c);
184 >            assertTrue("submit must return MyCallableFuture",
185 >                       f1 instanceof MyCallableFuture);
186 >            Future f2 = ecs.take();
187 >            assertSame("submit and take must return same objects", f1, f2);
188 >            assertTrue("completed task must have set done", done.get());
189 >        } finally {
190 >            joinPool(e);
191 >        }
192 >    }
193 >
194 >    /**
195 >     * Submitting to underlying AES that overrides newTaskFor(Runnable,T)
196 >     * returns and eventually runs Future returned by newTaskFor.
197 >     */
198 >    public void testNewTaskForRunnable() throws InterruptedException {
199 >        final AtomicBoolean done = new AtomicBoolean(false);
200 >        class MyRunnableFuture<V> extends FutureTask<V> {
201 >            MyRunnableFuture(Runnable t, V r) { super(t, r); }
202 >            protected void done() { done.set(true); }
203 >        }
204 >        ExecutorService e = new ThreadPoolExecutor(
205                                   1, 1, 30L, TimeUnit.SECONDS,
206                                   new ArrayBlockingQueue<Runnable>(1)) {
207 <             protected <T> RunnableFuture<T> newTaskFor(Runnable t, T r) {
208 <                 return new MyRunnableFuture<T>(t, r);
209 <             }
210 <         };
211 <         ExecutorCompletionService<String> ecs =
212 <             new ExecutorCompletionService<String>(e);
213 <         try {
214 <             assertNull(ecs.poll());
215 <             Runnable r = new NoOpRunnable();
216 <             Future f1 = ecs.submit(r, null);
217 <             assertTrue("submit must return MyRunnableFuture",
218 <                        f1 instanceof MyRunnableFuture);
219 <             Future f2 = ecs.take();
220 <             assertSame("submit and take must return same objects", f1, f2);
221 <             assertTrue("completed task must have set done", done.get());
222 <         } finally {
223 <             joinPool(e);
224 <         }
216 <     }
207 >            protected <T> RunnableFuture<T> newTaskFor(Runnable t, T r) {
208 >                return new MyRunnableFuture<T>(t, r);
209 >            }};
210 >        ExecutorCompletionService<String> ecs =
211 >            new ExecutorCompletionService<String>(e);
212 >        try {
213 >            assertNull(ecs.poll());
214 >            Runnable r = new NoOpRunnable();
215 >            Future f1 = ecs.submit(r, null);
216 >            assertTrue("submit must return MyRunnableFuture",
217 >                       f1 instanceof MyRunnableFuture);
218 >            Future f2 = ecs.take();
219 >            assertSame("submit and take must return same objects", f1, f2);
220 >            assertTrue("completed task must have set done", done.get());
221 >        } finally {
222 >            joinPool(e);
223 >        }
224 >    }
225  
226   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines