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.36 by jsr166, Tue Nov 9 15:29:11 2010 UTC vs.
Revision 1.51 by jsr166, Mon Dec 16 22:55:54 2019 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.math.BigInteger;
11 < 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 26 | 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 49 | Line 63 | public class ExecutorsTest extends JSR16
63       */
64      public void testNewCachedThreadPool3() {
65          try {
66 <            ExecutorService e = Executors.newCachedThreadPool(null);
66 >            ExecutorService unused = Executors.newCachedThreadPool(null);
67              shouldThrow();
68          } catch (NullPointerException success) {}
69      }
70  
57
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 <        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 82 | Line 97 | public class ExecutorsTest extends JSR16
97       */
98      public void testNewSingleThreadExecutor3() {
99          try {
100 <            ExecutorService e = Executors.newSingleThreadExecutor(null);
100 >            ExecutorService unused = Executors.newSingleThreadExecutor(null);
101              shouldThrow();
102          } catch (NullPointerException success) {}
103      }
# Line 91 | 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 {
100 <            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  
104
118      /**
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 {
148 <            ExecutorService e = Executors.newFixedThreadPool(2, null);
148 >            ExecutorService unused = Executors.newFixedThreadPool(2, null);
149              shouldThrow();
150          } catch (NullPointerException success) {}
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 {
158 <            ExecutorService e = Executors.newFixedThreadPool(0);
158 >            ExecutorService unused = Executors.newFixedThreadPool(0);
159              shouldThrow();
160          } catch (IllegalArgumentException success) {}
161      }
162  
147
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);
180 >            ExecutorService unused =
181 >                Executors.unconfigurableExecutorService(null);
182              shouldThrow();
183          } catch (NullPointerException success) {}
184      }
# Line 169 | Line 186 | public class ExecutorsTest extends JSR16
186      /**
187       * unconfigurableScheduledExecutorService(null) throws NPE
188       */
189 <    public void testunconfigurableScheduledExecutorServiceNPE() {
189 >    public void testUnconfigurableScheduledExecutorServiceNPE() {
190          try {
191 <            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
191 >            ExecutorService unused =
192 >                Executors.unconfigurableScheduledExecutorService(null);
193              shouldThrow();
194          } catch (NullPointerException success) {}
195      }
196  
179
197      /**
198       * a newSingleThreadScheduledExecutor successfully runs delayed task
199       */
200      public void testNewSingleThreadScheduledExecutor() throws Exception {
201 <        ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
202 <        try {
203 <            final CountDownLatch done = new CountDownLatch(1);
201 >        final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
202 >        try (PoolCleaner cleaner = cleaner(p)) {
203 >            final CountDownLatch proceed = new CountDownLatch(1);
204              final Runnable task = new CheckedRunnable() {
205                  public void realRun() {
206 <                    done.countDown();
206 >                    await(proceed);
207                  }};
208 +            long startTime = System.nanoTime();
209              Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
210 <                                  SHORT_DELAY_MS, MILLISECONDS);
210 >                                  timeoutMillis(), MILLISECONDS);
211              assertFalse(f.isDone());
212 <            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
213 <            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
212 >            proceed.countDown();
213 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
214              assertSame(Boolean.TRUE, f.get());
215              assertTrue(f.isDone());
216 <        } finally {
217 <            joinPool(p);
216 >            assertFalse(f.isCancelled());
217 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
218          }
219      }
220  
221      /**
222       * a newScheduledThreadPool successfully runs delayed task
223       */
224 <    public void testnewScheduledThreadPool() throws Exception {
225 <        ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
226 <        try {
227 <            final CountDownLatch done = new CountDownLatch(1);
224 >    public void testNewScheduledThreadPool() throws Exception {
225 >        final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
226 >        try (PoolCleaner cleaner = cleaner(p)) {
227 >            final CountDownLatch proceed = new CountDownLatch(1);
228              final Runnable task = new CheckedRunnable() {
229                  public void realRun() {
230 <                    done.countDown();
230 >                    await(proceed);
231                  }};
232 +            long startTime = System.nanoTime();
233              Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
234 <                                  SHORT_DELAY_MS, MILLISECONDS);
234 >                                  timeoutMillis(), MILLISECONDS);
235              assertFalse(f.isDone());
236 <            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
237 <            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
236 >            proceed.countDown();
237 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
238              assertSame(Boolean.TRUE, f.get());
239              assertTrue(f.isDone());
240 <        } finally {
241 <            joinPool(p);
240 >            assertFalse(f.isCancelled());
241 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
242          }
243      }
244  
245      /**
246       * an unconfigurable newScheduledThreadPool successfully runs delayed task
247       */
248 <    public void testunconfigurableScheduledExecutorService() throws Exception {
249 <        ScheduledExecutorService p =
248 >    public void testUnconfigurableScheduledExecutorService() throws Exception {
249 >        final ScheduledExecutorService p =
250              Executors.unconfigurableScheduledExecutorService
251              (Executors.newScheduledThreadPool(2));
252 <        try {
253 <            final CountDownLatch done = new CountDownLatch(1);
252 >        try (PoolCleaner cleaner = cleaner(p)) {
253 >            final CountDownLatch proceed = new CountDownLatch(1);
254              final Runnable task = new CheckedRunnable() {
255                  public void realRun() {
256 <                    done.countDown();
256 >                    await(proceed);
257                  }};
258 +            long startTime = System.nanoTime();
259              Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
260 <                                  SHORT_DELAY_MS, MILLISECONDS);
260 >                                  timeoutMillis(), MILLISECONDS);
261              assertFalse(f.isDone());
262 <            assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
263 <            assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
262 >            proceed.countDown();
263 >            assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
264              assertSame(Boolean.TRUE, f.get());
265              assertTrue(f.isDone());
266 <        } finally {
267 <            joinPool(p);
266 >            assertFalse(f.isCancelled());
267 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
268          }
269      }
270  
# Line 252 | Line 272 | public class ExecutorsTest extends JSR16
272       * Future.get on submitted tasks will time out if they compute too long.
273       */
274      public void testTimedCallable() throws Exception {
275 +        final ExecutorService[] executors = {
276 +            Executors.newSingleThreadExecutor(),
277 +            Executors.newCachedThreadPool(),
278 +            Executors.newFixedThreadPool(2),
279 +            Executors.newScheduledThreadPool(2),
280 +        };
281 +
282          final Runnable sleeper = new CheckedInterruptedRunnable() {
283              public void realRun() throws InterruptedException {
284 <                Thread.sleep(LONG_DELAY_MS);
284 >                delay(LONG_DELAY_MS);
285              }};
286 <        for (ExecutorService executor :
287 <                 new ExecutorService[] {
288 <                     Executors.newSingleThreadExecutor(),
289 <                     Executors.newCachedThreadPool(),
290 <                     Executors.newFixedThreadPool(2),
291 <                     Executors.newScheduledThreadPool(2),
292 <                 }) {
293 <            try {
267 <                Future future = executor.submit(sleeper);
268 <                try {
269 <                    future.get(SHORT_DELAY_MS, MILLISECONDS);
270 <                    shouldThrow();
271 <                } catch (TimeoutException success) {
272 <                } finally {
273 <                    future.cancel(true);
274 <                }
275 <            }
276 <            finally {
277 <                joinPool(executor);
278 <            }
286 >
287 >        List<Thread> threads = new ArrayList<>();
288 >        for (final ExecutorService executor : executors) {
289 >            threads.add(newStartedThread(new CheckedRunnable() {
290 >                public void realRun() {
291 >                    Future future = executor.submit(sleeper);
292 >                    assertFutureTimesOut(future);
293 >                }}));
294          }
295 +        for (Thread thread : threads)
296 +            awaitTermination(thread);
297 +        for (ExecutorService executor : executors)
298 +            joinPool(executor);
299      }
300  
282
301      /**
302       * ThreadPoolExecutor using defaultThreadFactory has
303       * specified group, priority, daemon status, and name
304       */
305      public void testDefaultThreadFactory() throws Exception {
306          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
307 +        final CountDownLatch done = new CountDownLatch(1);
308          Runnable r = new CheckedRunnable() {
309              public void realRun() {
310                  try {
311                      Thread current = Thread.currentThread();
312 <                    assertTrue(!current.isDaemon());
312 >                    assertFalse(current.isDaemon());
313                      assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
295                    ThreadGroup g = current.getThreadGroup();
314                      SecurityManager s = System.getSecurityManager();
315 <                    if (s != null)
316 <                        assertTrue(g == s.getThreadGroup());
317 <                    else
300 <                        assertTrue(g == egroup);
301 <                    String name = current.getName();
302 <                    assertTrue(name.endsWith("thread-1"));
315 >                    assertSame(current.getThreadGroup(),
316 >                               (s == null) ? egroup : s.getThreadGroup());
317 >                    assertTrue(current.getName().endsWith("thread-1"));
318                  } catch (SecurityException ok) {
319                      // Also pass if not allowed to change setting
320                  }
321 +                done.countDown();
322              }};
323          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
324 <
325 <        e.execute(r);
326 <        try {
311 <            e.shutdown();
312 <        } catch (SecurityException ok) {
313 <        }
314 <
315 <        try {
316 <            Thread.sleep(SHORT_DELAY_MS);
317 <        } finally {
318 <            joinPool(e);
324 >        try (PoolCleaner cleaner = cleaner(e)) {
325 >            e.execute(r);
326 >            await(done);
327          }
328      }
329  
# Line 325 | Line 333 | public class ExecutorsTest extends JSR16
333       * access control context and context class loader
334       */
335      public void testPrivilegedThreadFactory() throws Exception {
336 +        final CountDownLatch done = new CountDownLatch(1);
337          Runnable r = new CheckedRunnable() {
338              public void realRun() throws Exception {
339                  final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
# Line 333 | Line 342 | public class ExecutorsTest extends JSR16
342                  Runnable r = new CheckedRunnable() {
343                      public void realRun() {
344                          Thread current = Thread.currentThread();
345 <                        assertTrue(!current.isDaemon());
345 >                        assertFalse(current.isDaemon());
346                          assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
338                        ThreadGroup g = current.getThreadGroup();
347                          SecurityManager s = System.getSecurityManager();
348 <                        if (s != null)
349 <                            assertTrue(g == s.getThreadGroup());
350 <                        else
343 <                            assertTrue(g == egroup);
344 <                        String name = current.getName();
345 <                        assertTrue(name.endsWith("thread-1"));
348 >                        assertSame(current.getThreadGroup(),
349 >                                   (s == null) ? egroup : s.getThreadGroup());
350 >                        assertTrue(current.getName().endsWith("thread-1"));
351                          assertSame(thisccl, current.getContextClassLoader());
352                          assertEquals(thisacc, AccessController.getContext());
353 +                        done.countDown();
354                      }};
355                  ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
356 <                e.execute(r);
357 <                e.shutdown();
358 <                Thread.sleep(SHORT_DELAY_MS);
359 <                joinPool(e);
356 >                try (PoolCleaner cleaner = cleaner(e)) {
357 >                    e.execute(r);
358 >                    await(done);
359 >                }
360              }};
361  
362          runWithPermissions(r,
# Line 387 | Line 393 | public class ExecutorsTest extends JSR16
393          }
394      }
395  
390
396      /**
397       * Without class loader permissions, creating
398       * privilegedCallableUsingCurrentClassLoader throws ACE
# Line 410 | Line 415 | public class ExecutorsTest extends JSR16
415       * With class loader permissions, calling
416       * privilegedCallableUsingCurrentClassLoader does not throw ACE
417       */
418 <    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
418 >    public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
419          Runnable r = new CheckedRunnable() {
420              public void realRun() throws Exception {
421                  Executors.privilegedCallableUsingCurrentClassLoader
# Line 426 | Line 431 | public class ExecutorsTest extends JSR16
431      /**
432       * Without permissions, calling privilegedCallable throws ACE
433       */
434 <    public void testprivilegedCallableWithNoPrivs() throws Exception {
434 >    public void testPrivilegedCallableWithNoPrivs() throws Exception {
435          // Avoid classloader-related SecurityExceptions in swingui.TestRunner
436          Executors.privilegedCallable(new CheckCCL());
437  
# Line 498 | Line 503 | public class ExecutorsTest extends JSR16
503      /**
504       * With permissions, calling privilegedCallable succeeds
505       */
506 <    public void testprivilegedCallableWithPrivs() throws Exception {
506 >    public void testPrivilegedCallableWithPrivs() throws Exception {
507          Runnable r = new CheckedRunnable() {
508              public void realRun() throws Exception {
509                  Executors.privilegedCallable(new CheckCCL()).call();
510              }};
511  
512 <         runWithPermissions(r,
512 >        runWithPermissions(r,
513                             new RuntimePermission("getClassLoader"),
514                             new RuntimePermission("setContextClassLoader"));
515      }
# Line 543 | Line 548 | public class ExecutorsTest extends JSR16
548          assertSame(one, c.call());
549      }
550  
546
551      /**
552       * callable(null Runnable) throws NPE
553       */
554      public void testCallableNPE1() {
555          try {
556 <            Callable c = Executors.callable((Runnable) null);
556 >            Callable unused = Executors.callable((Runnable) null);
557              shouldThrow();
558          } catch (NullPointerException success) {}
559      }
# Line 559 | Line 563 | public class ExecutorsTest extends JSR16
563       */
564      public void testCallableNPE2() {
565          try {
566 <            Callable c = Executors.callable((Runnable) null, one);
566 >            Callable unused = Executors.callable((Runnable) null, one);
567              shouldThrow();
568          } catch (NullPointerException success) {}
569      }
# Line 569 | Line 573 | public class ExecutorsTest extends JSR16
573       */
574      public void testCallableNPE3() {
575          try {
576 <            Callable c = Executors.callable((PrivilegedAction) null);
576 >            Callable unused = Executors.callable((PrivilegedAction) null);
577              shouldThrow();
578          } catch (NullPointerException success) {}
579      }
# Line 579 | Line 583 | public class ExecutorsTest extends JSR16
583       */
584      public void testCallableNPE4() {
585          try {
586 <            Callable c = Executors.callable((PrivilegedExceptionAction) null);
586 >            Callable unused = Executors.callable((PrivilegedExceptionAction) null);
587              shouldThrow();
588          } catch (NullPointerException success) {}
589      }
590  
591 +    /**
592 +     * callable(runnable, x).toString() contains toString of wrapped task
593 +     */
594 +    public void testCallable_withResult_toString() {
595 +        if (testImplementationDetails) {
596 +            Runnable r = () -> {};
597 +            Callable<String> c = Executors.callable(r, "");
598 +            assertEquals(
599 +                identityString(c) + "[Wrapped task = " + r.toString() + "]",
600 +                c.toString());
601 +        }
602 +    }
603 +
604 +    /**
605 +     * callable(runnable).toString() contains toString of wrapped task
606 +     */
607 +    public void testCallable_toString() {
608 +        if (testImplementationDetails) {
609 +            Runnable r = () -> {};
610 +            Callable<Object> c = Executors.callable(r);
611 +            assertEquals(
612 +                identityString(c) + "[Wrapped task = " + r.toString() + "]",
613 +                c.toString());
614 +        }
615 +    }
616 +
617 +    /**
618 +     * privilegedCallable(callable).toString() contains toString of wrapped task
619 +     */
620 +    public void testPrivilegedCallable_toString() {
621 +        if (testImplementationDetails) {
622 +            Callable<String> c = () -> "";
623 +            Callable<String> priv = Executors.privilegedCallable(c);
624 +            assertEquals(
625 +                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
626 +                priv.toString());
627 +        }
628 +    }
629  
630 +    /**
631 +     * privilegedCallableUsingCurrentClassLoader(callable).toString()
632 +     * contains toString of wrapped task
633 +     */
634 +    public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
635 +        if (testImplementationDetails) {
636 +            Callable<String> c = () -> "";
637 +            Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
638 +            assertEquals(
639 +                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
640 +                priv.toString());
641 +        }
642 +    }
643   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines