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.44 by jsr166, Sun Feb 22 19:16:12 2015 UTC vs.
Revision 1.52 by dl, Sat Feb 1 16:45:50 2020 UTC

# Line 28 | Line 28 | 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 38 | 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 61 | 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      }
# Line 70 | 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 93 | 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 102 | 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 {
111 <            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 116 | 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 {
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      }
# Line 158 | Line 164 | public class ExecutorsTest extends JSR16
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);
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      /**
# Line 170 | Line 177 | public class ExecutorsTest extends JSR16
177       */
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 180 | Line 188 | public class ExecutorsTest extends JSR16
188       */
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      }
# Line 189 | Line 198 | public class ExecutorsTest extends JSR16
198       * a newSingleThreadScheduledExecutor successfully runs delayed task
199       */
200      public void testNewSingleThreadScheduledExecutor() throws Exception {
201 <        ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
202 <        try {
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() {
# Line 206 | Line 215 | public class ExecutorsTest extends JSR16
215              assertTrue(f.isDone());
216              assertFalse(f.isCancelled());
217              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
209        } finally {
210            joinPool(p);
218          }
219      }
220  
# Line 215 | Line 222 | public class ExecutorsTest extends JSR16
222       * a newScheduledThreadPool successfully runs delayed task
223       */
224      public void testNewScheduledThreadPool() throws Exception {
225 <        ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
226 <        try {
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() {
# Line 232 | Line 239 | public class ExecutorsTest extends JSR16
239              assertTrue(f.isDone());
240              assertFalse(f.isCancelled());
241              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
235        } finally {
236            joinPool(p);
242          }
243      }
244  
# Line 241 | Line 246 | public class ExecutorsTest extends JSR16
246       * an unconfigurable newScheduledThreadPool successfully runs delayed task
247       */
248      public void testUnconfigurableScheduledExecutorService() throws Exception {
249 <        ScheduledExecutorService p =
249 >        final ScheduledExecutorService p =
250              Executors.unconfigurableScheduledExecutorService
251              (Executors.newScheduledThreadPool(2));
252 <        try {
252 >        try (PoolCleaner cleaner = cleaner(p)) {
253              final CountDownLatch proceed = new CountDownLatch(1);
254              final Runnable task = new CheckedRunnable() {
255                  public void realRun() {
# Line 260 | Line 265 | public class ExecutorsTest extends JSR16
265              assertTrue(f.isDone());
266              assertFalse(f.isCancelled());
267              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
263        } finally {
264            joinPool(p);
268          }
269      }
270  
# Line 276 | Line 279 | public class ExecutorsTest extends JSR16
279              Executors.newScheduledThreadPool(2),
280          };
281  
282 <        final Runnable sleeper = new CheckedInterruptedRunnable() {
282 >        final Runnable sleeper = new CheckedRunnable() {
283              public void realRun() throws InterruptedException {
284 <                delay(LONG_DELAY_MS);
284 >                try {
285 >                    delay(LONG_DELAY_MS);
286 >                } catch(InterruptedException OK) {
287 >                }
288              }};
289  
290 <        List<Thread> threads = new ArrayList<Thread>();
290 >        List<Thread> threads = new ArrayList<>();
291          for (final ExecutorService executor : executors) {
292              threads.add(newStartedThread(new CheckedRunnable() {
293                  public void realRun() {
# Line 292 | Line 298 | public class ExecutorsTest extends JSR16
298          for (Thread thread : threads)
299              awaitTermination(thread);
300          for (ExecutorService executor : executors)
301 +            executor.shutdownNow(); // assumes shutdownNow interrupts threads
302 +        for (ExecutorService executor : executors)
303              joinPool(executor);
304      }
305  
# Line 306 | Line 314 | public class ExecutorsTest extends JSR16
314              public void realRun() {
315                  try {
316                      Thread current = Thread.currentThread();
317 <                    assertTrue(!current.isDaemon());
317 >                    assertFalse(current.isDaemon());
318                      assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311                    ThreadGroup g = current.getThreadGroup();
319                      SecurityManager s = System.getSecurityManager();
320 <                    if (s != null)
321 <                        assertTrue(g == s.getThreadGroup());
322 <                    else
316 <                        assertTrue(g == egroup);
317 <                    String name = current.getName();
318 <                    assertTrue(name.endsWith("thread-1"));
320 >                    assertSame(current.getThreadGroup(),
321 >                               (s == null) ? egroup : s.getThreadGroup());
322 >                    assertTrue(current.getName().endsWith("thread-1"));
323                  } catch (SecurityException ok) {
324                      // Also pass if not allowed to change setting
325                  }
326                  done.countDown();
327              }};
328          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
329 <
330 <        e.execute(r);
331 <        await(done);
328 <
329 <        try {
330 <            e.shutdown();
331 <        } catch (SecurityException ok) {
329 >        try (PoolCleaner cleaner = cleaner(e)) {
330 >            e.execute(r);
331 >            await(done);
332          }
333
334        joinPool(e);
333      }
334  
335      /**
# Line 349 | Line 347 | public class ExecutorsTest extends JSR16
347                  Runnable r = new CheckedRunnable() {
348                      public void realRun() {
349                          Thread current = Thread.currentThread();
350 <                        assertTrue(!current.isDaemon());
350 >                        assertFalse(current.isDaemon());
351                          assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
354                        ThreadGroup g = current.getThreadGroup();
352                          SecurityManager s = System.getSecurityManager();
353 <                        if (s != null)
354 <                            assertTrue(g == s.getThreadGroup());
355 <                        else
359 <                            assertTrue(g == egroup);
360 <                        String name = current.getName();
361 <                        assertTrue(name.endsWith("thread-1"));
353 >                        assertSame(current.getThreadGroup(),
354 >                                   (s == null) ? egroup : s.getThreadGroup());
355 >                        assertTrue(current.getName().endsWith("thread-1"));
356                          assertSame(thisccl, current.getContextClassLoader());
357                          assertEquals(thisacc, AccessController.getContext());
358                          done.countDown();
359                      }};
360                  ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
361 <                e.execute(r);
362 <                await(done);
363 <                e.shutdown();
364 <                joinPool(e);
361 >                try (PoolCleaner cleaner = cleaner(e)) {
362 >                    e.execute(r);
363 >                    await(done);
364 >                }
365              }};
366  
367          runWithPermissions(r,
# Line 564 | Line 558 | public class ExecutorsTest extends JSR16
558       */
559      public void testCallableNPE1() {
560          try {
561 <            Callable c = Executors.callable((Runnable) null);
561 >            Callable unused = Executors.callable((Runnable) null);
562              shouldThrow();
563          } catch (NullPointerException success) {}
564      }
# Line 574 | Line 568 | public class ExecutorsTest extends JSR16
568       */
569      public void testCallableNPE2() {
570          try {
571 <            Callable c = Executors.callable((Runnable) null, one);
571 >            Callable unused = Executors.callable((Runnable) null, one);
572              shouldThrow();
573          } catch (NullPointerException success) {}
574      }
# Line 584 | Line 578 | public class ExecutorsTest extends JSR16
578       */
579      public void testCallableNPE3() {
580          try {
581 <            Callable c = Executors.callable((PrivilegedAction) null);
581 >            Callable unused = Executors.callable((PrivilegedAction) null);
582              shouldThrow();
583          } catch (NullPointerException success) {}
584      }
# Line 594 | Line 588 | public class ExecutorsTest extends JSR16
588       */
589      public void testCallableNPE4() {
590          try {
591 <            Callable c = Executors.callable((PrivilegedExceptionAction) null);
591 >            Callable unused = Executors.callable((PrivilegedExceptionAction) null);
592              shouldThrow();
593          } catch (NullPointerException success) {}
594      }
595  
596 +    /**
597 +     * callable(runnable, x).toString() contains toString of wrapped task
598 +     */
599 +    public void testCallable_withResult_toString() {
600 +        if (testImplementationDetails) {
601 +            Runnable r = () -> {};
602 +            Callable<String> c = Executors.callable(r, "");
603 +            assertEquals(
604 +                identityString(c) + "[Wrapped task = " + r.toString() + "]",
605 +                c.toString());
606 +        }
607 +    }
608 +
609 +    /**
610 +     * callable(runnable).toString() contains toString of wrapped task
611 +     */
612 +    public void testCallable_toString() {
613 +        if (testImplementationDetails) {
614 +            Runnable r = () -> {};
615 +            Callable<Object> c = Executors.callable(r);
616 +            assertEquals(
617 +                identityString(c) + "[Wrapped task = " + r.toString() + "]",
618 +                c.toString());
619 +        }
620 +    }
621 +
622 +    /**
623 +     * privilegedCallable(callable).toString() contains toString of wrapped task
624 +     */
625 +    public void testPrivilegedCallable_toString() {
626 +        if (testImplementationDetails) {
627 +            Callable<String> c = () -> "";
628 +            Callable<String> priv = Executors.privilegedCallable(c);
629 +            assertEquals(
630 +                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
631 +                priv.toString());
632 +        }
633 +    }
634 +
635 +    /**
636 +     * privilegedCallableUsingCurrentClassLoader(callable).toString()
637 +     * contains toString of wrapped task
638 +     */
639 +    public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
640 +        if (testImplementationDetails) {
641 +            Callable<String> c = () -> "";
642 +            Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
643 +            assertEquals(
644 +                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
645 +                priv.toString());
646 +        }
647 +    }
648   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines