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.8 by dl, Sat Nov 1 18:37:02 2003 UTC vs.
Revision 1.48 by jsr166, Sat Mar 18 20:42:20 2017 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
10  
11 < import junit.framework.*;
12 < import java.util.*;
13 < import java.util.concurrent.*;
14 < import java.math.BigInteger;
15 < import java.security.*;
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 < public class ExecutorsTest extends JSR166TestCase{
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);
21 <    }
22 <
23 <    private static final String TEST_STRING = "a test string";
24 <
25 <    private static class StringTask implements Callable<String> {
26 <        public String call() { return TEST_STRING; }
34 >        return new TestSuite(ExecutorsTest.class);
35      }
36  
29    static class DirectExecutor implements Executor {
30        public void execute(Runnable r) {
31            r.run();
32        }
33    }
34
35    static class TimedCallable<T> implements Callable<T> {
36        private final Executor exec;
37        private final Callable<T> func;
38        private final long msecs;
39        
40        TimedCallable(Executor exec, Callable<T> func, long msecs) {
41            this.exec = exec;
42            this.func = func;
43            this.msecs = msecs;
44        }
45        
46        public T call() throws Exception {
47            Future<T> ftask = Executors.execute(exec, func);
48            try {
49                return ftask.get(msecs, TimeUnit.MILLISECONDS);
50            } finally {
51                ftask.cancel(true);
52            }
53        }
54    }
55
56
57    private static class Fib implements Callable<BigInteger> {
58        private final BigInteger n;
59        Fib(long n) {
60            if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
61            this.n = BigInteger.valueOf(n);
62        }
63        public BigInteger call() {
64            BigInteger f1 = BigInteger.ONE;
65            BigInteger f2 = f1;
66            for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
67                BigInteger t = f1.add(f2);
68                f1 = f2;
69                f2 = t;
70            }
71            return f1;
72        }
73    };
74
37      /**
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 <        e.shutdown();
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 <        e.shutdown();
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 101 | Line 65 | public class ExecutorsTest extends JSR16
65          try {
66              ExecutorService e = Executors.newCachedThreadPool(null);
67              shouldThrow();
68 <        }
105 <        catch(NullPointerException success) {
106 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
109
71      /**
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 <        e.shutdown();
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 <        e.shutdown();
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 136 | Line 99 | public class ExecutorsTest extends JSR16
99          try {
100              ExecutorService e = Executors.newSingleThreadExecutor(null);
101              shouldThrow();
102 <        }
103 <        catch(NullPointerException success) {
102 >        } catch (NullPointerException success) {}
103 >    }
104 >
105 >    /**
106 >     * A new SingleThreadExecutor cannot be casted to concrete implementation
107 >     */
108 >    public void testCastNewSingleThreadExecutor() {
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 145 | 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 <        e.shutdown();
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 <        e.shutdown();
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      /**
# Line 170 | Line 146 | public class ExecutorsTest extends JSR16
146          try {
147              ExecutorService e = Executors.newFixedThreadPool(2, null);
148              shouldThrow();
149 <        }
174 <        catch(NullPointerException success) {
175 <        }
149 >        } catch (NullPointerException success) {}
150      }
151  
152      /**
# Line 182 | Line 156 | public class ExecutorsTest extends JSR16
156          try {
157              ExecutorService e = Executors.newFixedThreadPool(0);
158              shouldThrow();
159 <        }
186 <        catch(IllegalArgumentException success) {
187 <        }
159 >        } catch (IllegalArgumentException success) {}
160      }
161  
162      /**
163 <     * execute of runnable runs it to completion
163 >     * An unconfigurable newFixedThreadPool can execute runnables
164       */
165 <    public void testExecuteRunnable() {
166 <        try {
167 <            Executor e = new DirectExecutor();
168 <            TrackedShortRunnable task = new TrackedShortRunnable();
169 <            assertFalse(task.done);
170 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
199 <            String result = future.get();
200 <            assertTrue(task.done);
201 <            assertSame(TEST_STRING, result);
202 <        }
203 <        catch (ExecutionException ex) {
204 <            unexpectedException();
205 <        }
206 <        catch (InterruptedException ex) {
207 <            unexpectedException();
165 >    public void testUnconfigurableExecutorService() {
166 >        final ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
167 >        try (PoolCleaner cleaner = cleaner(e)) {
168 >            e.execute(new NoOpRunnable());
169 >            e.execute(new NoOpRunnable());
170 >            e.execute(new NoOpRunnable());
171          }
172      }
173  
174      /**
175 <     * invoke of a runnable runs it to completion
175 >     * unconfigurableExecutorService(null) throws NPE
176       */
177 <    public void testInvokeRunnable() {
177 >    public void testUnconfigurableExecutorServiceNPE() {
178          try {
179 <            Executor e = new DirectExecutor();
180 <            TrackedShortRunnable task = new TrackedShortRunnable();
181 <            assertFalse(task.done);
219 <            Executors.invoke(e, task);
220 <            assertTrue(task.done);
221 <        }
222 <        catch (ExecutionException ex) {
223 <            unexpectedException();
224 <        }
225 <        catch (InterruptedException ex) {
226 <            unexpectedException();
227 <        }
179 >            ExecutorService e = Executors.unconfigurableExecutorService(null);
180 >            shouldThrow();
181 >        } catch (NullPointerException success) {}
182      }
183  
184      /**
185 <     * execute of a callable runs it to completion
185 >     * unconfigurableScheduledExecutorService(null) throws NPE
186       */
187 <    public void testExecuteCallable() {
187 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
188          try {
189 <            Executor e = new DirectExecutor();
190 <            Future<String> future = Executors.execute(e, new StringTask());
191 <            String result = future.get();
238 <            assertSame(TEST_STRING, result);
239 <        }
240 <        catch (ExecutionException ex) {
241 <            unexpectedException();
242 <        }
243 <        catch (InterruptedException ex) {
244 <            unexpectedException();
245 <        }
189 >            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
190 >            shouldThrow();
191 >        } catch (NullPointerException success) {}
192      }
193  
248
194      /**
195 <     * execute of a privileged action runs it to completion
195 >     * a newSingleThreadScheduledExecutor successfully runs delayed task
196       */
197 <    public void testExecutePrivilegedAction() {
198 <        Policy savedPolicy = Policy.getPolicy();
199 <        AdjustablePolicy policy = new AdjustablePolicy();
200 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
201 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
202 <        Policy.setPolicy(policy);
203 <        try {
204 <            Executor e = new DirectExecutor();
205 <            Future future = Executors.execute(e, new PrivilegedAction() {
206 <                    public Object run() {
207 <                        return TEST_STRING;
208 <                    }});
209 <
210 <            Object result = future.get();
211 <            assertSame(TEST_STRING, result);
212 <        }
213 <        catch (ExecutionException ex) {
214 <            unexpectedException();
197 >    public void testNewSingleThreadScheduledExecutor() throws Exception {
198 >        final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
199 >        try (PoolCleaner cleaner = cleaner(p)) {
200 >            final CountDownLatch proceed = new CountDownLatch(1);
201 >            final Runnable task = new CheckedRunnable() {
202 >                public void realRun() {
203 >                    await(proceed);
204 >                }};
205 >            long startTime = System.nanoTime();
206 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
207 >                                  timeoutMillis(), MILLISECONDS);
208 >            assertFalse(f.isDone());
209 >            proceed.countDown();
210 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
211 >            assertSame(Boolean.TRUE, f.get());
212 >            assertTrue(f.isDone());
213 >            assertFalse(f.isCancelled());
214 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
215          }
271        catch (InterruptedException ex) {
272            unexpectedException();
273        }
274        finally {
275            Policy.setPolicy(savedPolicy);
276        }
216      }
217  
218      /**
219 <     * execute of a privileged exception action runs it to completion
219 >     * a newScheduledThreadPool successfully runs delayed task
220       */
221 <    public void testExecutePrivilegedExceptionAction() {
222 <        Policy savedPolicy = Policy.getPolicy();
223 <        AdjustablePolicy policy = new AdjustablePolicy();
224 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
225 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
226 <        Policy.setPolicy(policy);
227 <        try {
228 <            Executor e = new DirectExecutor();
229 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
230 <                    public Object run() {
231 <                        return TEST_STRING;
232 <                    }});
233 <
234 <            Object result = future.get();
235 <            assertSame(TEST_STRING, result);
236 <        }
237 <        catch (ExecutionException ex) {
238 <            unexpectedException();
300 <        }
301 <        catch (InterruptedException ex) {
302 <            unexpectedException();
221 >    public void testNewScheduledThreadPool() throws Exception {
222 >        final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
223 >        try (PoolCleaner cleaner = cleaner(p)) {
224 >            final CountDownLatch proceed = new CountDownLatch(1);
225 >            final Runnable task = new CheckedRunnable() {
226 >                public void realRun() {
227 >                    await(proceed);
228 >                }};
229 >            long startTime = System.nanoTime();
230 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
231 >                                  timeoutMillis(), MILLISECONDS);
232 >            assertFalse(f.isDone());
233 >            proceed.countDown();
234 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
235 >            assertSame(Boolean.TRUE, f.get());
236 >            assertTrue(f.isDone());
237 >            assertFalse(f.isCancelled());
238 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
239          }
304        finally {
305            Policy.setPolicy(savedPolicy);
306        }
240      }
241  
242      /**
243 <     * execute of a failed privileged exception action reports exception
243 >     * an unconfigurable newScheduledThreadPool successfully runs delayed task
244       */
245 <    public void testExecuteFailedPrivilegedExceptionAction() {
246 <        Policy savedPolicy = Policy.getPolicy();
247 <        AdjustablePolicy policy = new AdjustablePolicy();
248 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
249 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
250 <        Policy.setPolicy(policy);
251 <        try {
252 <            Executor e = new DirectExecutor();
253 <            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
254 <                    public Object run() throws Exception {
255 <                        throw new IndexOutOfBoundsException();
256 <                    }});
257 <
258 <            Object result = future.get();
259 <            shouldThrow();
260 <        }
261 <        catch (ExecutionException success) {
262 <        }
263 <        catch (InterruptedException ex) {
264 <            unexpectedException();
245 >    public void testUnconfigurableScheduledExecutorService() throws Exception {
246 >        final ScheduledExecutorService p =
247 >            Executors.unconfigurableScheduledExecutorService
248 >            (Executors.newScheduledThreadPool(2));
249 >        try (PoolCleaner cleaner = cleaner(p)) {
250 >            final CountDownLatch proceed = new CountDownLatch(1);
251 >            final Runnable task = new CheckedRunnable() {
252 >                public void realRun() {
253 >                    await(proceed);
254 >                }};
255 >            long startTime = System.nanoTime();
256 >            Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
257 >                                  timeoutMillis(), MILLISECONDS);
258 >            assertFalse(f.isDone());
259 >            proceed.countDown();
260 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
261 >            assertSame(Boolean.TRUE, f.get());
262 >            assertTrue(f.isDone());
263 >            assertFalse(f.isCancelled());
264 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
265          }
333        finally {
334            Policy.setPolicy(savedPolicy);
335        }
266      }
267  
268      /**
269 <     * invoke of a collable runs it to completion
269 >     * Future.get on submitted tasks will time out if they compute too long.
270       */
271 <    public void testInvokeCallable() {
272 <        try {
273 <            Executor e = new DirectExecutor();
274 <            String result = Executors.invoke(e, new StringTask());
271 >    public void testTimedCallable() throws Exception {
272 >        final ExecutorService[] executors = {
273 >            Executors.newSingleThreadExecutor(),
274 >            Executors.newCachedThreadPool(),
275 >            Executors.newFixedThreadPool(2),
276 >            Executors.newScheduledThreadPool(2),
277 >        };
278  
279 <            assertSame(TEST_STRING, result);
280 <        }
281 <        catch (ExecutionException ex) {
282 <            unexpectedException();
283 <        }
284 <        catch (InterruptedException ex) {
285 <            unexpectedException();
279 >        final Runnable sleeper = new CheckedInterruptedRunnable() {
280 >            public void realRun() throws InterruptedException {
281 >                delay(LONG_DELAY_MS);
282 >            }};
283 >
284 >        List<Thread> threads = new ArrayList<>();
285 >        for (final ExecutorService executor : executors) {
286 >            threads.add(newStartedThread(new CheckedRunnable() {
287 >                public void realRun() {
288 >                    Future future = executor.submit(sleeper);
289 >                    assertFutureTimesOut(future);
290 >                }}));
291          }
292 +        for (Thread thread : threads)
293 +            awaitTermination(thread);
294 +        for (ExecutorService executor : executors)
295 +            joinPool(executor);
296      }
297  
298      /**
299 <     * execute with null executor throws NPE
299 >     * ThreadPoolExecutor using defaultThreadFactory has
300 >     * specified group, priority, daemon status, and name
301       */
302 <    public void testNullExecuteRunnable() {
303 <        try {
304 <            TrackedShortRunnable task = new TrackedShortRunnable();
305 <            assertFalse(task.done);
306 <            Future<String> future = Executors.execute(null, task, TEST_STRING);
307 <            shouldThrow();
308 <        }
309 <        catch (NullPointerException success) {
310 <        }
311 <        catch (Exception ex) {
312 <            unexpectedException();
302 >    public void testDefaultThreadFactory() throws Exception {
303 >        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
304 >        final CountDownLatch done = new CountDownLatch(1);
305 >        Runnable r = new CheckedRunnable() {
306 >            public void realRun() {
307 >                try {
308 >                    Thread current = Thread.currentThread();
309 >                    assertFalse(current.isDaemon());
310 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311 >                    SecurityManager s = System.getSecurityManager();
312 >                    assertSame(current.getThreadGroup(),
313 >                               (s == null) ? egroup : s.getThreadGroup());
314 >                    assertTrue(current.getName().endsWith("thread-1"));
315 >                } catch (SecurityException ok) {
316 >                    // Also pass if not allowed to change setting
317 >                }
318 >                done.countDown();
319 >            }};
320 >        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
321 >        try (PoolCleaner cleaner = cleaner(e)) {
322 >            e.execute(r);
323 >            await(done);
324          }
325      }
326  
327      /**
328 <     * execute with a null runnable throws NPE
328 >     * ThreadPoolExecutor using privilegedThreadFactory has
329 >     * specified group, priority, daemon status, name,
330 >     * access control context and context class loader
331       */
332 <    public void testExecuteNullRunnable() {
333 <        try {
334 <            Executor e = new DirectExecutor();
335 <            TrackedShortRunnable task = null;
336 <            Future<String> future = Executors.execute(e, task, TEST_STRING);
337 <            shouldThrow();
332 >    public void testPrivilegedThreadFactory() throws Exception {
333 >        final CountDownLatch done = new CountDownLatch(1);
334 >        Runnable r = new CheckedRunnable() {
335 >            public void realRun() throws Exception {
336 >                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
337 >                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
338 >                final AccessControlContext thisacc = AccessController.getContext();
339 >                Runnable r = new CheckedRunnable() {
340 >                    public void realRun() {
341 >                        Thread current = Thread.currentThread();
342 >                        assertFalse(current.isDaemon());
343 >                        assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
344 >                        SecurityManager s = System.getSecurityManager();
345 >                        assertSame(current.getThreadGroup(),
346 >                                   (s == null) ? egroup : s.getThreadGroup());
347 >                        assertTrue(current.getName().endsWith("thread-1"));
348 >                        assertSame(thisccl, current.getContextClassLoader());
349 >                        assertEquals(thisacc, AccessController.getContext());
350 >                        done.countDown();
351 >                    }};
352 >                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
353 >                try (PoolCleaner cleaner = cleaner(e)) {
354 >                    e.execute(r);
355 >                    await(done);
356 >                }
357 >            }};
358 >
359 >        runWithPermissions(r,
360 >                           new RuntimePermission("getClassLoader"),
361 >                           new RuntimePermission("setContextClassLoader"),
362 >                           new RuntimePermission("modifyThread"));
363 >    }
364 >
365 >    boolean haveCCLPermissions() {
366 >        SecurityManager sm = System.getSecurityManager();
367 >        if (sm != null) {
368 >            try {
369 >                sm.checkPermission(new RuntimePermission("setContextClassLoader"));
370 >                sm.checkPermission(new RuntimePermission("getClassLoader"));
371 >            } catch (AccessControlException e) {
372 >                return false;
373 >            }
374          }
375 <        catch (NullPointerException success) {
375 >        return true;
376 >    }
377 >
378 >    void checkCCL() {
379 >        SecurityManager sm = System.getSecurityManager();
380 >        if (sm != null) {
381 >            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
382 >            sm.checkPermission(new RuntimePermission("getClassLoader"));
383          }
384 <        catch (Exception ex) {
385 <            unexpectedException();
384 >    }
385 >
386 >    class CheckCCL implements Callable<Object> {
387 >        public Object call() {
388 >            checkCCL();
389 >            return null;
390          }
391      }
392  
393      /**
394 <     * invoke of a null runnable throws NPE
394 >     * Without class loader permissions, creating
395 >     * privilegedCallableUsingCurrentClassLoader throws ACE
396       */
397 <    public void testInvokeNullRunnable() {
398 <        try {
399 <            Executor e = new DirectExecutor();
400 <            TrackedShortRunnable task = null;
401 <            Executors.invoke(e, task);
402 <            shouldThrow();
403 <        }
404 <        catch (NullPointerException success) {
405 <        }
406 <        catch (Exception ex) {
407 <            unexpectedException();
408 <        }
397 >    public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
398 >        Runnable r = new CheckedRunnable() {
399 >            public void realRun() throws Exception {
400 >                if (System.getSecurityManager() == null)
401 >                    return;
402 >                try {
403 >                    Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
404 >                    shouldThrow();
405 >                } catch (AccessControlException success) {}
406 >            }};
407 >
408 >        runWithoutPermissions(r);
409      }
410  
411      /**
412 <     * execute of a null callable throws NPE
412 >     * With class loader permissions, calling
413 >     * privilegedCallableUsingCurrentClassLoader does not throw ACE
414       */
415 <    public void testExecuteNullCallable() {
416 <        try {
417 <            Executor e = new DirectExecutor();
418 <            StringTask t = null;
419 <            Future<String> future = Executors.execute(e, t);
420 <            shouldThrow();
421 <        }
422 <        catch (NullPointerException success) {
423 <        }
424 <        catch (Exception ex) {
425 <            unexpectedException();
421 <        }
415 >    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
416 >        Runnable r = new CheckedRunnable() {
417 >            public void realRun() throws Exception {
418 >                Executors.privilegedCallableUsingCurrentClassLoader
419 >                    (new NoOpCallable())
420 >                    .call();
421 >            }};
422 >
423 >        runWithPermissions(r,
424 >                           new RuntimePermission("getClassLoader"),
425 >                           new RuntimePermission("setContextClassLoader"));
426      }
427  
428      /**
429 <     * invoke of a null callable throws NPE
429 >     * Without permissions, calling privilegedCallable throws ACE
430       */
431 <    public void testInvokeNullCallable() {
432 <        try {
433 <            Executor e = new DirectExecutor();
434 <            StringTask t = null;
435 <            String result = Executors.invoke(e, t);
436 <            shouldThrow();
437 <        }
438 <        catch (NullPointerException success) {
439 <        }
440 <        catch (Exception ex) {
441 <            unexpectedException();
442 <        }
431 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
432 >        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
433 >        Executors.privilegedCallable(new CheckCCL());
434 >
435 >        Runnable r = new CheckedRunnable() {
436 >            public void realRun() throws Exception {
437 >                if (System.getSecurityManager() == null)
438 >                    return;
439 >                Callable task = Executors.privilegedCallable(new CheckCCL());
440 >                try {
441 >                    task.call();
442 >                    shouldThrow();
443 >                } catch (AccessControlException success) {}
444 >            }};
445 >
446 >        runWithoutPermissions(r);
447 >
448 >        // It seems rather difficult to test that the
449 >        // AccessControlContext of the privilegedCallable is used
450 >        // instead of its caller.  Below is a failed attempt to do
451 >        // that, which does not work because the AccessController
452 >        // cannot capture the internal state of the current Policy.
453 >        // It would be much more work to differentiate based on,
454 >        // e.g. CodeSource.
455 >
456 > //         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
457 > //         final Callable[] task = new Callable[1];
458 >
459 > //         runWithPermissions
460 > //             (new CheckedRunnable() {
461 > //                 public void realRun() {
462 > //                     if (System.getSecurityManager() == null)
463 > //                         return;
464 > //                     noprivAcc[0] = AccessController.getContext();
465 > //                     task[0] = Executors.privilegedCallable(new CheckCCL());
466 > //                     try {
467 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
468 > //                                                           public Void run() {
469 > //                                                               checkCCL();
470 > //                                                               return null;
471 > //                                                           }}, noprivAcc[0]);
472 > //                         shouldThrow();
473 > //                     } catch (AccessControlException success) {}
474 > //                 }});
475 >
476 > //         runWithPermissions
477 > //             (new CheckedRunnable() {
478 > //                 public void realRun() throws Exception {
479 > //                     if (System.getSecurityManager() == null)
480 > //                         return;
481 > //                     // Verify that we have an underprivileged ACC
482 > //                     try {
483 > //                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
484 > //                                                           public Void run() {
485 > //                                                               checkCCL();
486 > //                                                               return null;
487 > //                                                           }}, noprivAcc[0]);
488 > //                         shouldThrow();
489 > //                     } catch (AccessControlException success) {}
490 >
491 > //                     try {
492 > //                         task[0].call();
493 > //                         shouldThrow();
494 > //                     } catch (AccessControlException success) {}
495 > //                 }},
496 > //              new RuntimePermission("getClassLoader"),
497 > //              new RuntimePermission("setContextClassLoader"));
498      }
499  
500      /**
501 <     *  execute(Executor, Runnable) throws RejectedExecutionException
443 <     *  if saturated.
501 >     * With permissions, calling privilegedCallable succeeds
502       */
503 <    public void testExecute1() {
504 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
505 <        try {
506 <            
507 <            for(int i = 0; i < 5; ++i){
508 <                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
509 <            }
510 <            shouldThrow();
511 <        } catch(RejectedExecutionException success){}
454 <        joinPool(p);
503 >    public void testPrivilegedCallableWithPrivs() throws Exception {
504 >        Runnable r = new CheckedRunnable() {
505 >            public void realRun() throws Exception {
506 >                Executors.privilegedCallable(new CheckCCL()).call();
507 >            }};
508 >
509 >        runWithPermissions(r,
510 >                           new RuntimePermission("getClassLoader"),
511 >                           new RuntimePermission("setContextClassLoader"));
512      }
513  
514      /**
515 <     *  execute(Executor, Callable)throws RejectedExecutionException
459 <     *  if saturated.
515 >     * callable(Runnable) returns null when called
516       */
517 <    public void testExecute2() {
518 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
519 <        try {
464 <            for(int i = 0; i < 5; ++i) {
465 <                Executors.execute(p, new SmallCallable());
466 <            }
467 <            shouldThrow();
468 <        } catch(RejectedExecutionException e){}
469 <        joinPool(p);
517 >    public void testCallable1() throws Exception {
518 >        Callable c = Executors.callable(new NoOpRunnable());
519 >        assertNull(c.call());
520      }
521  
472
522      /**
523 <     *  invoke(Executor, Runnable) throws InterruptedException if
475 <     *  caller interrupted.
523 >     * callable(Runnable, result) returns result when called
524       */
525 <    public void testInterruptedInvoke() {
526 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
527 <        Thread t = new Thread(new Runnable() {
480 <                public void run() {
481 <                    try {
482 <                        Executors.invoke(p,new Runnable() {
483 <                                public void run() {
484 <                                    try {
485 <                                        Thread.sleep(MEDIUM_DELAY_MS);
486 <                                        shouldThrow();
487 <                                    } catch(InterruptedException e){
488 <                                    }
489 <                                }
490 <                            });
491 <                    } catch(InterruptedException success){
492 <                    } catch(Exception e) {
493 <                        unexpectedException();
494 <                    }
495 <                    
496 <                }
497 <            });
498 <        try {
499 <            t.start();
500 <            Thread.sleep(SHORT_DELAY_MS);
501 <            t.interrupt();
502 <        } catch(Exception e){
503 <            unexpectedException();
504 <        }
505 <        joinPool(p);
525 >    public void testCallable2() throws Exception {
526 >        Callable c = Executors.callable(new NoOpRunnable(), one);
527 >        assertSame(one, c.call());
528      }
529  
530      /**
531 <     *  invoke(Executor, Runnable) throws ExecutionException if
510 <     *  runnable throws exception.
531 >     * callable(PrivilegedAction) returns its result when called
532       */
533 <    public void testInvoke3() {
534 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
535 <        try {
536 <            Runnable r = new Runnable() {
516 <                    public void run() {
517 <                        int i = 5/0;
518 <                    }
519 <                };
520 <            
521 <            for(int i =0; i < 5; i++){
522 <                Executors.invoke(p,r);
523 <            }
524 <            
525 <            shouldThrow();
526 <        } catch(ExecutionException success){
527 <        } catch(Exception e){
528 <            unexpectedException();
529 <        }
530 <        joinPool(p);
533 >    public void testCallable3() throws Exception {
534 >        Callable c = Executors.callable(new PrivilegedAction() {
535 >                public Object run() { return one; }});
536 >        assertSame(one, c.call());
537      }
538  
533
534
539      /**
540 <     *  invoke(Executor, Callable) throws InterruptedException if
537 <     *  callable throws exception
540 >     * callable(PrivilegedExceptionAction) returns its result when called
541       */
542 <    public void testInvoke5() {
543 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
544 <        
545 <        final Callable c = new Callable() {
543 <                public Object call() {
544 <                    try {
545 <                        Executors.invoke(p, new SmallCallable());
546 <                        shouldThrow();
547 <                    } catch(InterruptedException e){}
548 <                    catch(RejectedExecutionException e2){}
549 <                    catch(ExecutionException e3){}
550 <                    return Boolean.TRUE;
551 <                }
552 <            };
553 <
554 <
555 <        
556 <        Thread t = new Thread(new Runnable() {
557 <                public void run() {
558 <                    try {
559 <                        c.call();
560 <                    } catch(Exception e){}
561 <                }
562 <          });
563 <        try {
564 <            t.start();
565 <            Thread.sleep(SHORT_DELAY_MS);
566 <            t.interrupt();
567 <            t.join();
568 <        } catch(InterruptedException e){
569 <            unexpectedException();
570 <        }
571 <        
572 <        joinPool(p);
542 >    public void testCallable4() throws Exception {
543 >        Callable c = Executors.callable(new PrivilegedExceptionAction() {
544 >                public Object run() { return one; }});
545 >        assertSame(one, c.call());
546      }
547  
548      /**
549 <     *  invoke(Executor, Callable) will throw ExecutionException
577 <     *  if callable throws exception
549 >     * callable(null Runnable) throws NPE
550       */
551 <    public void testInvoke6() {
580 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
581 <
551 >    public void testCallableNPE1() {
552          try {
553 <            Callable c = new Callable() {
584 <                    public Object call() {
585 <                        int i = 5/0;
586 <                        return Boolean.TRUE;
587 <                    }
588 <                };
589 <            
590 <            for(int i =0; i < 5; i++){
591 <                Executors.invoke(p,c);
592 <            }
593 <            
553 >            Callable c = Executors.callable((Runnable) null);
554              shouldThrow();
555 <        }
596 <        catch(ExecutionException success){
597 <        } catch(Exception e) {
598 <            unexpectedException();
599 <        }
600 <        joinPool(p);
555 >        } catch (NullPointerException success) {}
556      }
557  
603
604
558      /**
559 <     *  timeouts from execute will time out if they compute too long.
559 >     * callable(null, result) throws NPE
560       */
561 <    public void testTimedCallable() {
609 <        int N = 10000;
610 <        ExecutorService executor = Executors.newSingleThreadExecutor();
611 <        List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
561 >    public void testCallableNPE2() {
562          try {
563 <            long startTime = System.currentTimeMillis();
564 <            
565 <            long i = 0;
616 <            while (tasks.size() < N) {
617 <                tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
618 <                i += 10;
619 <            }
620 <            
621 <            int iters = 0;
622 <            BigInteger sum = BigInteger.ZERO;
623 <            for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
624 <                try {
625 <                    ++iters;
626 <                    sum = sum.add(it.next().call());
627 <                }
628 <                catch (TimeoutException success) {
629 <                    assertTrue(iters > 0);
630 <                    return;
631 <                }
632 <                catch (Exception e) {
633 <                    unexpectedException();
634 <                }
635 <            }
636 <            // if by chance we didn't ever time out, total time must be small
637 <            long elapsed = System.currentTimeMillis() - startTime;
638 <            assertTrue(elapsed < N);
639 <        }
640 <        finally {
641 <            joinPool(executor);
642 <        }
563 >            Callable c = Executors.callable((Runnable) null, one);
564 >            shouldThrow();
565 >        } catch (NullPointerException success) {}
566      }
567  
645    
568      /**
569 <     * ThreadPoolExecutor using defaultThreadFactory has
648 <     * specified group, priority, daemon status, and name
569 >     * callable(null PrivilegedAction) throws NPE
570       */
571 <    public void testDefaultThreadFactory() {
572 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
573 <        Runnable r = new Runnable() {
574 <                public void run() {
575 <                    Thread current = Thread.currentThread();
655 <                    threadAssertTrue(!current.isDaemon());
656 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
657 <                    ThreadGroup g = current.getThreadGroup();
658 <                    SecurityManager s = System.getSecurityManager();
659 <                    if (s != null)
660 <                        threadAssertTrue(g == s.getThreadGroup());
661 <                    else
662 <                        threadAssertTrue(g == egroup);
663 <                    String name = current.getName();
664 <                    threadAssertTrue(name.endsWith("thread-1"));
665 <                }
666 <            };
667 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
668 <        
669 <        e.execute(r);
670 <        e.shutdown();
671 <        try {
672 <            Thread.sleep(SHORT_DELAY_MS);
673 <        } catch (Exception eX) {
674 <            unexpectedException();
675 <        } finally {
676 <            joinPool(e);
677 <        }
571 >    public void testCallableNPE3() {
572 >        try {
573 >            Callable c = Executors.callable((PrivilegedAction) null);
574 >            shouldThrow();
575 >        } catch (NullPointerException success) {}
576      }
577  
578      /**
579 <     * ThreadPoolExecutor using privilegedThreadFactory has
682 <     * specified group, priority, daemon status, name,
683 <     * access control context and context class loader
579 >     * callable(null PrivilegedExceptionAction) throws NPE
580       */
581 <    public void testPrivilegedThreadFactory() {
582 <        Policy savedPolicy = Policy.getPolicy();
583 <        AdjustablePolicy policy = new AdjustablePolicy();
584 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
585 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
690 <        Policy.setPolicy(policy);
691 <        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
692 <        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
693 <        final AccessControlContext thisacc = AccessController.getContext();
694 <        Runnable r = new Runnable() {
695 <                public void run() {
696 <                    Thread current = Thread.currentThread();
697 <                    threadAssertTrue(!current.isDaemon());
698 <                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
699 <                    ThreadGroup g = current.getThreadGroup();
700 <                    SecurityManager s = System.getSecurityManager();
701 <                    if (s != null)
702 <                        threadAssertTrue(g == s.getThreadGroup());
703 <                    else
704 <                        threadAssertTrue(g == egroup);
705 <                    String name = current.getName();
706 <                    threadAssertTrue(name.endsWith("thread-1"));
707 <                    threadAssertTrue(thisccl == current.getContextClassLoader());
708 <                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
709 <                }
710 <            };
711 <        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
712 <        
713 <        Policy.setPolicy(savedPolicy);
714 <        e.execute(r);
715 <        e.shutdown();
716 <        try {
717 <            Thread.sleep(SHORT_DELAY_MS);
718 <        } catch (Exception ex) {
719 <            unexpectedException();
720 <        } finally {
721 <            joinPool(e);
722 <        }
723 <
581 >    public void testCallableNPE4() {
582 >        try {
583 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
584 >            shouldThrow();
585 >        } catch (NullPointerException success) {}
586      }
587  
588   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines