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.41 by jsr166, Sun May 29 06:54:23 2011 UTC vs.
Revision 1.49 by jsr166, Mon May 29 22:44:26 2017 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.*;
11 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.security.*;
10 >
11 > import java.security.AccessControlContext;
12 > import java.security.AccessControlException;
13 > import java.security.AccessController;
14 > import java.security.PrivilegedAction;
15 > import java.security.PrivilegedExceptionAction;
16 > import java.util.ArrayList;
17 > import java.util.List;
18 > import java.util.concurrent.Callable;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.Future;
23 > import java.util.concurrent.ScheduledExecutorService;
24 > import java.util.concurrent.ThreadPoolExecutor;
25 >
26 > import junit.framework.Test;
27 > import junit.framework.TestSuite;
28  
29   public class ExecutorsTest extends JSR166TestCase {
30      public static void main(String[] args) {
31 <        junit.textui.TestRunner.run(suite());
31 >        main(suite(), args);
32      }
33      public static Test suite() {
34          return new TestSuite(ExecutorsTest.class);
# Line 24 | Line 38 | public class ExecutorsTest extends JSR16
38       * A newCachedThreadPool can execute runnables
39       */
40      public void testNewCachedThreadPool1() {
41 <        ExecutorService e = Executors.newCachedThreadPool();
42 <        e.execute(new NoOpRunnable());
43 <        e.execute(new NoOpRunnable());
44 <        e.execute(new NoOpRunnable());
45 <        joinPool(e);
41 >        final ExecutorService e = Executors.newCachedThreadPool();
42 >        try (PoolCleaner cleaner = cleaner(e)) {
43 >            e.execute(new NoOpRunnable());
44 >            e.execute(new NoOpRunnable());
45 >            e.execute(new NoOpRunnable());
46 >        }
47      }
48  
49      /**
50       * A newCachedThreadPool with given ThreadFactory can execute runnables
51       */
52      public void testNewCachedThreadPool2() {
53 <        ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
54 <        e.execute(new NoOpRunnable());
55 <        e.execute(new NoOpRunnable());
56 <        e.execute(new NoOpRunnable());
57 <        joinPool(e);
53 >        final ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
54 >        try (PoolCleaner cleaner = cleaner(e)) {
55 >            e.execute(new NoOpRunnable());
56 >            e.execute(new NoOpRunnable());
57 >            e.execute(new NoOpRunnable());
58 >        }
59      }
60  
61      /**
# Line 56 | Line 72 | public class ExecutorsTest extends JSR16
72       * A new SingleThreadExecutor can execute runnables
73       */
74      public void testNewSingleThreadExecutor1() {
75 <        ExecutorService e = Executors.newSingleThreadExecutor();
76 <        e.execute(new NoOpRunnable());
77 <        e.execute(new NoOpRunnable());
78 <        e.execute(new NoOpRunnable());
79 <        joinPool(e);
75 >        final ExecutorService e = Executors.newSingleThreadExecutor();
76 >        try (PoolCleaner cleaner = cleaner(e)) {
77 >            e.execute(new NoOpRunnable());
78 >            e.execute(new NoOpRunnable());
79 >            e.execute(new NoOpRunnable());
80 >        }
81      }
82  
83      /**
84       * A new SingleThreadExecutor with given ThreadFactory can execute runnables
85       */
86      public void testNewSingleThreadExecutor2() {
87 <        ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
88 <        e.execute(new NoOpRunnable());
89 <        e.execute(new NoOpRunnable());
90 <        e.execute(new NoOpRunnable());
91 <        joinPool(e);
87 >        final ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
88 >        try (PoolCleaner cleaner = cleaner(e)) {
89 >            e.execute(new NoOpRunnable());
90 >            e.execute(new NoOpRunnable());
91 >            e.execute(new NoOpRunnable());
92 >        }
93      }
94  
95      /**
# Line 88 | Line 106 | public class ExecutorsTest extends JSR16
106       * A new SingleThreadExecutor cannot be casted to concrete implementation
107       */
108      public void testCastNewSingleThreadExecutor() {
109 <        ExecutorService e = Executors.newSingleThreadExecutor();
110 <        try {
111 <            ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
112 <            shouldThrow();
113 <        } catch (ClassCastException success) {
114 <        } finally {
97 <            joinPool(e);
109 >        final ExecutorService e = Executors.newSingleThreadExecutor();
110 >        try (PoolCleaner cleaner = cleaner(e)) {
111 >            try {
112 >                ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
113 >                shouldThrow();
114 >            } catch (ClassCastException success) {}
115          }
116      }
117  
# Line 102 | Line 119 | public class ExecutorsTest extends JSR16
119       * A new newFixedThreadPool can execute runnables
120       */
121      public void testNewFixedThreadPool1() {
122 <        ExecutorService e = Executors.newFixedThreadPool(2);
123 <        e.execute(new NoOpRunnable());
124 <        e.execute(new NoOpRunnable());
125 <        e.execute(new NoOpRunnable());
126 <        joinPool(e);
122 >        final ExecutorService e = Executors.newFixedThreadPool(2);
123 >        try (PoolCleaner cleaner = cleaner(e)) {
124 >            e.execute(new NoOpRunnable());
125 >            e.execute(new NoOpRunnable());
126 >            e.execute(new NoOpRunnable());
127 >        }
128      }
129  
130      /**
131       * A new newFixedThreadPool with given ThreadFactory can execute runnables
132       */
133      public void testNewFixedThreadPool2() {
134 <        ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
135 <        e.execute(new NoOpRunnable());
136 <        e.execute(new NoOpRunnable());
137 <        e.execute(new NoOpRunnable());
138 <        joinPool(e);
134 >        final ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
135 >        try (PoolCleaner cleaner = cleaner(e)) {
136 >            e.execute(new NoOpRunnable());
137 >            e.execute(new NoOpRunnable());
138 >            e.execute(new NoOpRunnable());
139 >        }
140      }
141  
142      /**
143 <     * A new newFixedThreadPool with null ThreadFactory throws NPE
143 >     * A new newFixedThreadPool with null ThreadFactory throws
144 >     * NullPointerException
145       */
146      public void testNewFixedThreadPool3() {
147          try {
# Line 131 | Line 151 | public class ExecutorsTest extends JSR16
151      }
152  
153      /**
154 <     * A new newFixedThreadPool with 0 threads throws IAE
154 >     * A new newFixedThreadPool with 0 threads throws IllegalArgumentException
155       */
156      public void testNewFixedThreadPool4() {
157          try {
# Line 143 | Line 163 | public class ExecutorsTest extends JSR16
163      /**
164       * An unconfigurable newFixedThreadPool can execute runnables
165       */
166 <    public void testunconfigurableExecutorService() {
167 <        ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
168 <        e.execute(new NoOpRunnable());
169 <        e.execute(new NoOpRunnable());
170 <        e.execute(new NoOpRunnable());
171 <        joinPool(e);
166 >    public void testUnconfigurableExecutorService() {
167 >        final ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
168 >        try (PoolCleaner cleaner = cleaner(e)) {
169 >            e.execute(new NoOpRunnable());
170 >            e.execute(new NoOpRunnable());
171 >            e.execute(new NoOpRunnable());
172 >        }
173      }
174  
175      /**
176       * unconfigurableExecutorService(null) throws NPE
177       */
178 <    public void testunconfigurableExecutorServiceNPE() {
178 >    public void testUnconfigurableExecutorServiceNPE() {
179          try {
180              ExecutorService e = Executors.unconfigurableExecutorService(null);
181              shouldThrow();
# Line 164 | Line 185 | public class ExecutorsTest extends JSR16
185      /**
186       * unconfigurableScheduledExecutorService(null) throws NPE
187       */
188 <    public void testunconfigurableScheduledExecutorServiceNPE() {
188 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
189          try {
190              ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
191              shouldThrow();
# Line 175 | Line 196 | public class ExecutorsTest extends JSR16
196       * a newSingleThreadScheduledExecutor successfully runs delayed task
197       */
198      public void testNewSingleThreadScheduledExecutor() throws Exception {
199 <        ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
200 <        try {
201 <            final CountDownLatch done = new CountDownLatch(1);
199 >        final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
200 >        try (PoolCleaner cleaner = cleaner(p)) {
201 >            final CountDownLatch proceed = new CountDownLatch(1);
202              final Runnable task = new CheckedRunnable() {
203                  public void realRun() {
204 <                    done.countDown();
204 >                    await(proceed);
205                  }};
206 +            long startTime = System.nanoTime();
207              Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
208 <                                  SHORT_DELAY_MS, MILLISECONDS);
208 >                                  timeoutMillis(), MILLISECONDS);
209              assertFalse(f.isDone());
210 <            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
211 <            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
210 >            proceed.countDown();
211 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
212              assertSame(Boolean.TRUE, f.get());
213              assertTrue(f.isDone());
214 <        } finally {
215 <            joinPool(p);
214 >            assertFalse(f.isCancelled());
215 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
216          }
217      }
218  
219      /**
220       * a newScheduledThreadPool successfully runs delayed task
221       */
222 <    public void testnewScheduledThreadPool() throws Exception {
223 <        ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
224 <        try {
225 <            final CountDownLatch done = new CountDownLatch(1);
222 >    public void testNewScheduledThreadPool() throws Exception {
223 >        final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
224 >        try (PoolCleaner cleaner = cleaner(p)) {
225 >            final CountDownLatch proceed = new CountDownLatch(1);
226              final Runnable task = new CheckedRunnable() {
227                  public void realRun() {
228 <                    done.countDown();
228 >                    await(proceed);
229                  }};
230 +            long startTime = System.nanoTime();
231              Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
232 <                                  SHORT_DELAY_MS, MILLISECONDS);
232 >                                  timeoutMillis(), MILLISECONDS);
233              assertFalse(f.isDone());
234 <            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
235 <            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
234 >            proceed.countDown();
235 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
236              assertSame(Boolean.TRUE, f.get());
237              assertTrue(f.isDone());
238 <        } finally {
239 <            joinPool(p);
238 >            assertFalse(f.isCancelled());
239 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
240          }
241      }
242  
243      /**
244       * an unconfigurable newScheduledThreadPool successfully runs delayed task
245       */
246 <    public void testunconfigurableScheduledExecutorService() throws Exception {
247 <        ScheduledExecutorService p =
246 >    public void testUnconfigurableScheduledExecutorService() throws Exception {
247 >        final ScheduledExecutorService p =
248              Executors.unconfigurableScheduledExecutorService
249              (Executors.newScheduledThreadPool(2));
250 <        try {
251 <            final CountDownLatch done = new CountDownLatch(1);
250 >        try (PoolCleaner cleaner = cleaner(p)) {
251 >            final CountDownLatch proceed = new CountDownLatch(1);
252              final Runnable task = new CheckedRunnable() {
253                  public void realRun() {
254 <                    done.countDown();
254 >                    await(proceed);
255                  }};
256 +            long startTime = System.nanoTime();
257              Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
258 <                                  SHORT_DELAY_MS, MILLISECONDS);
258 >                                  timeoutMillis(), MILLISECONDS);
259              assertFalse(f.isDone());
260 <            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
261 <            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
260 >            proceed.countDown();
261 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
262              assertSame(Boolean.TRUE, f.get());
263              assertTrue(f.isDone());
264 <        } finally {
265 <            joinPool(p);
264 >            assertFalse(f.isCancelled());
265 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266          }
267      }
268  
# Line 258 | Line 282 | public class ExecutorsTest extends JSR16
282                  delay(LONG_DELAY_MS);
283              }};
284  
285 <        List<Thread> threads = new ArrayList<Thread>();
285 >        List<Thread> threads = new ArrayList<>();
286          for (final ExecutorService executor : executors) {
287              threads.add(newStartedThread(new CheckedRunnable() {
288                  public void realRun() {
265                    long startTime = System.nanoTime();
289                      Future future = executor.submit(sleeper);
290                      assertFutureTimesOut(future);
291                  }}));
# Line 279 | Line 302 | public class ExecutorsTest extends JSR16
302       */
303      public void testDefaultThreadFactory() throws Exception {
304          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
305 +        final CountDownLatch done = new CountDownLatch(1);
306          Runnable r = new CheckedRunnable() {
307              public void realRun() {
308                  try {
309                      Thread current = Thread.currentThread();
310 <                    assertTrue(!current.isDaemon());
310 >                    assertFalse(current.isDaemon());
311                      assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
288                    ThreadGroup g = current.getThreadGroup();
312                      SecurityManager s = System.getSecurityManager();
313 <                    if (s != null)
314 <                        assertTrue(g == s.getThreadGroup());
315 <                    else
293 <                        assertTrue(g == egroup);
294 <                    String name = current.getName();
295 <                    assertTrue(name.endsWith("thread-1"));
313 >                    assertSame(current.getThreadGroup(),
314 >                               (s == null) ? egroup : s.getThreadGroup());
315 >                    assertTrue(current.getName().endsWith("thread-1"));
316                  } catch (SecurityException ok) {
317                      // Also pass if not allowed to change setting
318                  }
319 +                done.countDown();
320              }};
321          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
322 <
323 <        e.execute(r);
324 <        try {
304 <            e.shutdown();
305 <        } catch (SecurityException ok) {
306 <        }
307 <
308 <        try {
309 <            delay(SHORT_DELAY_MS);
310 <        } finally {
311 <            joinPool(e);
322 >        try (PoolCleaner cleaner = cleaner(e)) {
323 >            e.execute(r);
324 >            await(done);
325          }
326      }
327  
# Line 318 | Line 331 | public class ExecutorsTest extends JSR16
331       * access control context and context class loader
332       */
333      public void testPrivilegedThreadFactory() throws Exception {
334 +        final CountDownLatch done = new CountDownLatch(1);
335          Runnable r = new CheckedRunnable() {
336              public void realRun() throws Exception {
337                  final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
# Line 326 | Line 340 | public class ExecutorsTest extends JSR16
340                  Runnable r = new CheckedRunnable() {
341                      public void realRun() {
342                          Thread current = Thread.currentThread();
343 <                        assertTrue(!current.isDaemon());
343 >                        assertFalse(current.isDaemon());
344                          assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
331                        ThreadGroup g = current.getThreadGroup();
345                          SecurityManager s = System.getSecurityManager();
346 <                        if (s != null)
347 <                            assertTrue(g == s.getThreadGroup());
348 <                        else
336 <                            assertTrue(g == egroup);
337 <                        String name = current.getName();
338 <                        assertTrue(name.endsWith("thread-1"));
346 >                        assertSame(current.getThreadGroup(),
347 >                                   (s == null) ? egroup : s.getThreadGroup());
348 >                        assertTrue(current.getName().endsWith("thread-1"));
349                          assertSame(thisccl, current.getContextClassLoader());
350                          assertEquals(thisacc, AccessController.getContext());
351 +                        done.countDown();
352                      }};
353                  ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
354 <                e.execute(r);
355 <                e.shutdown();
356 <                delay(SHORT_DELAY_MS);
357 <                joinPool(e);
354 >                try (PoolCleaner cleaner = cleaner(e)) {
355 >                    e.execute(r);
356 >                    await(done);
357 >                }
358              }};
359  
360          runWithPermissions(r,
# Line 402 | Line 413 | public class ExecutorsTest extends JSR16
413       * With class loader permissions, calling
414       * privilegedCallableUsingCurrentClassLoader does not throw ACE
415       */
416 <    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
416 >    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
417          Runnable r = new CheckedRunnable() {
418              public void realRun() throws Exception {
419                  Executors.privilegedCallableUsingCurrentClassLoader
# Line 418 | Line 429 | public class ExecutorsTest extends JSR16
429      /**
430       * Without permissions, calling privilegedCallable throws ACE
431       */
432 <    public void testprivilegedCallableWithNoPrivs() throws Exception {
432 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
433          // Avoid classloader-related SecurityExceptions in swingui.TestRunner
434          Executors.privilegedCallable(new CheckCCL());
435  
# Line 490 | Line 501 | public class ExecutorsTest extends JSR16
501      /**
502       * With permissions, calling privilegedCallable succeeds
503       */
504 <    public void testprivilegedCallableWithPrivs() throws Exception {
504 >    public void testPrivilegedCallableWithPrivs() throws Exception {
505          Runnable r = new CheckedRunnable() {
506              public void realRun() throws Exception {
507                  Executors.privilegedCallable(new CheckCCL()).call();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines