ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.4 by jsr166, Mon Nov 16 05:30:08 2009 UTC vs.
Revision 1.10 by jsr166, Sat Nov 21 17:38:05 2009 UTC

# Line 7 | Line 7
7   */
8  
9   import java.util.concurrent.*;
10 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
11   import java.util.concurrent.locks.*;
12  
13   import junit.framework.*;
# Line 14 | Line 15 | import java.util.*;
15  
16   public class ThreadPoolExecutorSubclassTest extends JSR166TestCase {
17      public static void main(String[] args) {
18 <        junit.textui.TestRunner.run (suite());
18 >        junit.textui.TestRunner.run(suite());
19      }
20      public static Test suite() {
21 <        return new TestSuite(ThreadPoolExecutorTest.class);
21 >        return new TestSuite(ThreadPoolExecutorSubclassTest.class);
22      }
23  
24      static class CustomTask<V> implements RunnableFuture<V> {
# Line 29 | Line 30 | public class ThreadPoolExecutorSubclassT
30          V result;
31          Thread thread;
32          Exception exception;
33 <        CustomTask(Callable<V> c) { callable = c; }
34 <        CustomTask(final Runnable r, final V res) { callable = new Callable<V>() {
33 >        CustomTask(Callable<V> c) {
34 >            if (c == null) throw new NullPointerException();
35 >            callable = c;
36 >        }
37 >        CustomTask(final Runnable r, final V res) {
38 >            if (r == null) throw new NullPointerException();
39 >            callable = new Callable<V>() {
40              public V call() throws Exception { r.run(); return res; }};
41          }
42          public boolean isDone() {
# Line 162 | Line 168 | public class ThreadPoolExecutorSubclassT
168          volatile boolean afterCalled = false;
169          volatile boolean terminatedCalled = false;
170          public CustomTPE() {
171 <            super(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new SynchronousQueue<Runnable>());
171 >            super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
172          }
173          protected void beforeExecute(Thread t, Runnable r) {
174              beforeCalled = true;
# Line 188 | Line 194 | public class ThreadPoolExecutorSubclassT
194      /**
195       *  execute successfully executes a runnable
196       */
197 <    public void testExecute() {
198 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
197 >    public void testExecute() throws InterruptedException {
198 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
199          try {
200 <            p1.execute(new Runnable() {
201 <                    public void run() {
202 <                        try {
203 <                            Thread.sleep(SHORT_DELAY_MS);
198 <                        } catch (InterruptedException e) {
199 <                            threadUnexpectedException();
200 <                        }
201 <                    }
202 <                });
203 <            Thread.sleep(SMALL_DELAY_MS);
204 <        } catch (InterruptedException e) {
205 <            unexpectedException();
200 >            p1.execute(new ShortRunnable());
201 >            Thread.sleep(SMALL_DELAY_MS);
202 >        } finally {
203 >            joinPool(p1);
204          }
207        joinPool(p1);
205      }
206  
207      /**
208       *  getActiveCount increases but doesn't overestimate, when a
209       *  thread becomes active
210       */
211 <    public void testGetActiveCount() {
212 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
211 >    public void testGetActiveCount() throws InterruptedException {
212 >        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
213          assertEquals(0, p2.getActiveCount());
214          p2.execute(new MediumRunnable());
215 <        try {
219 <            Thread.sleep(SHORT_DELAY_MS);
220 <        } catch (Exception e) {
221 <            unexpectedException();
222 <        }
215 >        Thread.sleep(SHORT_DELAY_MS);
216          assertEquals(1, p2.getActiveCount());
217          joinPool(p2);
218      }
# Line 228 | Line 221 | public class ThreadPoolExecutorSubclassT
221       *  prestartCoreThread starts a thread if under corePoolSize, else doesn't
222       */
223      public void testPrestartCoreThread() {
224 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
224 >        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
225          assertEquals(0, p2.getPoolSize());
226          assertTrue(p2.prestartCoreThread());
227          assertEquals(1, p2.getPoolSize());
# Line 243 | Line 236 | public class ThreadPoolExecutorSubclassT
236       *  prestartAllCoreThreads starts all corePoolSize threads
237       */
238      public void testPrestartAllCoreThreads() {
239 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
239 >        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
240          assertEquals(0, p2.getPoolSize());
241          p2.prestartAllCoreThreads();
242          assertEquals(2, p2.getPoolSize());
# Line 256 | Line 249 | public class ThreadPoolExecutorSubclassT
249       *   getCompletedTaskCount increases, but doesn't overestimate,
250       *   when tasks complete
251       */
252 <    public void testGetCompletedTaskCount() {
253 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
252 >    public void testGetCompletedTaskCount() throws InterruptedException {
253 >        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
254          assertEquals(0, p2.getCompletedTaskCount());
255          p2.execute(new ShortRunnable());
256 <        try {
264 <            Thread.sleep(SMALL_DELAY_MS);
265 <        } catch (Exception e) {
266 <            unexpectedException();
267 <        }
256 >        Thread.sleep(SMALL_DELAY_MS);
257          assertEquals(1, p2.getCompletedTaskCount());
258          try { p2.shutdown(); } catch (SecurityException ok) { return; }
259          joinPool(p2);
# Line 274 | Line 263 | public class ThreadPoolExecutorSubclassT
263       *   getCorePoolSize returns size given in constructor if not otherwise set
264       */
265      public void testGetCorePoolSize() {
266 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
266 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
267          assertEquals(1, p1.getCorePoolSize());
268          joinPool(p1);
269      }
# Line 283 | Line 272 | public class ThreadPoolExecutorSubclassT
272       *   getKeepAliveTime returns value given in constructor if not otherwise set
273       */
274      public void testGetKeepAliveTime() {
275 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, 1000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
275 >        ThreadPoolExecutor p2 = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276          assertEquals(1, p2.getKeepAliveTime(TimeUnit.SECONDS));
277          joinPool(p2);
278      }
# Line 294 | Line 283 | public class ThreadPoolExecutorSubclassT
283       */
284      public void testGetThreadFactory() {
285          ThreadFactory tf = new SimpleThreadFactory();
286 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler());
286 >        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler());
287          assertSame(tf, p.getThreadFactory());
288          joinPool(p);
289      }
# Line 303 | Line 292 | public class ThreadPoolExecutorSubclassT
292       * setThreadFactory sets the thread factory returned by getThreadFactory
293       */
294      public void testSetThreadFactory() {
295 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
295 >        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
296          ThreadFactory tf = new SimpleThreadFactory();
297          p.setThreadFactory(tf);
298          assertSame(tf, p.getThreadFactory());
# Line 315 | Line 304 | public class ThreadPoolExecutorSubclassT
304       * setThreadFactory(null) throws NPE
305       */
306      public void testSetThreadFactoryNull() {
307 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
307 >        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
308          try {
309              p.setThreadFactory(null);
310              shouldThrow();
# Line 330 | Line 319 | public class ThreadPoolExecutorSubclassT
319       */
320      public void testGetRejectedExecutionHandler() {
321          RejectedExecutionHandler h = new NoOpREHandler();
322 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h);
322 >        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h);
323          assertSame(h, p.getRejectedExecutionHandler());
324          joinPool(p);
325      }
# Line 340 | Line 329 | public class ThreadPoolExecutorSubclassT
329       * getRejectedExecutionHandler
330       */
331      public void testSetRejectedExecutionHandler() {
332 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
332 >        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
333          RejectedExecutionHandler h = new NoOpREHandler();
334          p.setRejectedExecutionHandler(h);
335          assertSame(h, p.getRejectedExecutionHandler());
# Line 352 | Line 341 | public class ThreadPoolExecutorSubclassT
341       * setRejectedExecutionHandler(null) throws NPE
342       */
343      public void testSetRejectedExecutionHandlerNull() {
344 <        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
344 >        ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
345          try {
346              p.setRejectedExecutionHandler(null);
347              shouldThrow();
# Line 367 | Line 356 | public class ThreadPoolExecutorSubclassT
356       *   getLargestPoolSize increases, but doesn't overestimate, when
357       *   multiple threads active
358       */
359 <    public void testGetLargestPoolSize() {
360 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
361 <        try {
362 <            assertEquals(0, p2.getLargestPoolSize());
363 <            p2.execute(new MediumRunnable());
364 <            p2.execute(new MediumRunnable());
365 <            Thread.sleep(SHORT_DELAY_MS);
377 <            assertEquals(2, p2.getLargestPoolSize());
378 <        } catch (Exception e) {
379 <            unexpectedException();
380 <        }
359 >    public void testGetLargestPoolSize() throws InterruptedException {
360 >        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
361 >        assertEquals(0, p2.getLargestPoolSize());
362 >        p2.execute(new MediumRunnable());
363 >        p2.execute(new MediumRunnable());
364 >        Thread.sleep(SHORT_DELAY_MS);
365 >        assertEquals(2, p2.getLargestPoolSize());
366          joinPool(p2);
367      }
368  
# Line 386 | Line 371 | public class ThreadPoolExecutorSubclassT
371       *   otherwise set
372       */
373      public void testGetMaximumPoolSize() {
374 <        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
374 >        ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
375          assertEquals(2, p2.getMaximumPoolSize());
376          joinPool(p2);
377      }
# Line 396 | Line 381 | public class ThreadPoolExecutorSubclassT
381       *   become active
382       */
383      public void testGetPoolSize() {
384 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
384 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
385          assertEquals(0, p1.getPoolSize());
386          p1.execute(new MediumRunnable());
387          assertEquals(1, p1.getPoolSize());
# Line 406 | Line 391 | public class ThreadPoolExecutorSubclassT
391      /**
392       *  getTaskCount increases, but doesn't overestimate, when tasks submitted
393       */
394 <    public void testGetTaskCount() {
395 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
396 <        try {
397 <            assertEquals(0, p1.getTaskCount());
398 <            p1.execute(new MediumRunnable());
399 <            Thread.sleep(SHORT_DELAY_MS);
415 <            assertEquals(1, p1.getTaskCount());
416 <        } catch (Exception e) {
417 <            unexpectedException();
418 <        }
394 >    public void testGetTaskCount() throws InterruptedException {
395 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
396 >        assertEquals(0, p1.getTaskCount());
397 >        p1.execute(new MediumRunnable());
398 >        Thread.sleep(SHORT_DELAY_MS);
399 >        assertEquals(1, p1.getTaskCount());
400          joinPool(p1);
401      }
402  
# Line 424 | Line 405 | public class ThreadPoolExecutorSubclassT
405       */
406      public void testIsShutdown() {
407  
408 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
408 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
409          assertFalse(p1.isShutdown());
410          try { p1.shutdown(); } catch (SecurityException ok) { return; }
411 <        assertTrue(p1.isShutdown());
411 >        assertTrue(p1.isShutdown());
412          joinPool(p1);
413      }
414  
# Line 435 | Line 416 | public class ThreadPoolExecutorSubclassT
416      /**
417       *  isTerminated is false before termination, true after
418       */
419 <    public void testIsTerminated() {
420 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
419 >    public void testIsTerminated() throws InterruptedException {
420 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
421          assertFalse(p1.isTerminated());
422          try {
423              p1.execute(new MediumRunnable());
424          } finally {
425              try { p1.shutdown(); } catch (SecurityException ok) { return; }
426          }
427 <        try {
428 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
448 <            assertTrue(p1.isTerminated());
449 <        } catch (Exception e) {
450 <            unexpectedException();
451 <        }
427 >        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
428 >        assertTrue(p1.isTerminated());
429      }
430  
431      /**
432       *  isTerminating is not true when running or when terminated
433       */
434 <    public void testIsTerminating() {
435 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
434 >    public void testIsTerminating() throws InterruptedException {
435 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
436          assertFalse(p1.isTerminating());
437          try {
438              p1.execute(new SmallRunnable());
# Line 463 | Line 440 | public class ThreadPoolExecutorSubclassT
440          } finally {
441              try { p1.shutdown(); } catch (SecurityException ok) { return; }
442          }
443 <        try {
444 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
445 <            assertTrue(p1.isTerminated());
469 <            assertFalse(p1.isTerminating());
470 <        } catch (Exception e) {
471 <            unexpectedException();
472 <        }
443 >        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
444 >        assertTrue(p1.isTerminated());
445 >        assertFalse(p1.isTerminating());
446      }
447  
448      /**
449       * getQueue returns the work queue, which contains queued tasks
450       */
451 <    public void testGetQueue() {
451 >    public void testGetQueue() throws InterruptedException {
452          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
453 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, q);
453 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
454          FutureTask[] tasks = new FutureTask[5];
455          for (int i = 0; i < 5; i++) {
456              tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
# Line 492 | Line 465 | public class ThreadPoolExecutorSubclassT
465              for (int i = 1; i < 5; ++i)
466                  tasks[i].cancel(true);
467              p1.shutdownNow();
495        } catch (Exception e) {
496            unexpectedException();
468          } finally {
469              joinPool(p1);
470          }
# Line 502 | Line 473 | public class ThreadPoolExecutorSubclassT
473      /**
474       * remove(task) removes queued task, and fails to remove active task
475       */
476 <    public void testRemove() {
476 >    public void testRemove() throws InterruptedException {
477          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
478 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, q);
478 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
479          FutureTask[] tasks = new FutureTask[5];
480          for (int i = 0; i < 5; i++) {
481              tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
# Line 521 | Line 492 | public class ThreadPoolExecutorSubclassT
492              assertTrue(q.contains(tasks[3]));
493              assertTrue(p1.remove(tasks[3]));
494              assertFalse(q.contains(tasks[3]));
524        } catch (Exception e) {
525            unexpectedException();
495          } finally {
496              joinPool(p1);
497          }
# Line 532 | Line 501 | public class ThreadPoolExecutorSubclassT
501       *   purge removes cancelled tasks from the queue
502       */
503      public void testPurge() {
504 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
504 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
505          FutureTask[] tasks = new FutureTask[5];
506          for (int i = 0; i < 5; i++) {
507              tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
# Line 550 | Line 519 | public class ThreadPoolExecutorSubclassT
519       *  shutDownNow returns a list containing tasks that were not run
520       */
521      public void testShutDownNow() {
522 <        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
522 >        ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
523          List l;
524          try {
525              for (int i = 0; i < 5; i++)
# Line 562 | Line 531 | public class ThreadPoolExecutorSubclassT
531              } catch (SecurityException ok) { return; }
532  
533          }
534 <        assertTrue(p1.isShutdown());
535 <        assertTrue(l.size() <= 4);
534 >        assertTrue(p1.isShutdown());
535 >        assertTrue(l.size() <= 4);
536      }
537  
538      // Exception Tests
# Line 574 | Line 543 | public class ThreadPoolExecutorSubclassT
543       */
544      public void testConstructor1() {
545          try {
546 <            new CustomTPE(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
546 >            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
547              shouldThrow();
548 <        }
580 <        catch (IllegalArgumentException success) {}
548 >        } catch (IllegalArgumentException success) {}
549      }
550  
551      /**
# Line 585 | Line 553 | public class ThreadPoolExecutorSubclassT
553       */
554      public void testConstructor2() {
555          try {
556 <            new CustomTPE(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
556 >            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
557              shouldThrow();
558 <        }
591 <        catch (IllegalArgumentException success) {}
558 >        } catch (IllegalArgumentException success) {}
559      }
560  
561      /**
# Line 596 | Line 563 | public class ThreadPoolExecutorSubclassT
563       */
564      public void testConstructor3() {
565          try {
566 <            new CustomTPE(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
566 >            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
567              shouldThrow();
568 <        }
602 <        catch (IllegalArgumentException success) {}
568 >        } catch (IllegalArgumentException success) {}
569      }
570  
571      /**
# Line 607 | Line 573 | public class ThreadPoolExecutorSubclassT
573       */
574      public void testConstructor4() {
575          try {
576 <            new CustomTPE(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
576 >            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
577              shouldThrow();
578 <        }
613 <        catch (IllegalArgumentException success) {}
578 >        } catch (IllegalArgumentException success) {}
579      }
580  
581      /**
# Line 618 | Line 583 | public class ThreadPoolExecutorSubclassT
583       */
584      public void testConstructor5() {
585          try {
586 <            new CustomTPE(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
586 >            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
587              shouldThrow();
588 <        }
624 <        catch (IllegalArgumentException success) {}
588 >        } catch (IllegalArgumentException success) {}
589      }
590  
591      /**
# Line 629 | Line 593 | public class ThreadPoolExecutorSubclassT
593       */
594      public void testConstructorNullPointerException() {
595          try {
596 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null);
596 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
597              shouldThrow();
598 <        }
635 <        catch (NullPointerException success) {}
598 >        } catch (NullPointerException success) {}
599      }
600  
601  
# Line 642 | Line 605 | public class ThreadPoolExecutorSubclassT
605       */
606      public void testConstructor6() {
607          try {
608 <            new CustomTPE(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
608 >            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
609              shouldThrow();
610          } catch (IllegalArgumentException success) {}
611      }
# Line 652 | Line 615 | public class ThreadPoolExecutorSubclassT
615       */
616      public void testConstructor7() {
617          try {
618 <            new CustomTPE(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
618 >            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
619              shouldThrow();
620 <        }
658 <        catch (IllegalArgumentException success) {}
620 >        } catch (IllegalArgumentException success) {}
621      }
622  
623      /**
# Line 663 | Line 625 | public class ThreadPoolExecutorSubclassT
625       */
626      public void testConstructor8() {
627          try {
628 <            new CustomTPE(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
628 >            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
629              shouldThrow();
630 <        }
669 <        catch (IllegalArgumentException success) {}
630 >        } catch (IllegalArgumentException success) {}
631      }
632  
633      /**
# Line 674 | Line 635 | public class ThreadPoolExecutorSubclassT
635       */
636      public void testConstructor9() {
637          try {
638 <            new CustomTPE(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
638 >            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
639              shouldThrow();
640 <        }
680 <        catch (IllegalArgumentException success) {}
640 >        } catch (IllegalArgumentException success) {}
641      }
642  
643      /**
# Line 685 | Line 645 | public class ThreadPoolExecutorSubclassT
645       */
646      public void testConstructor10() {
647          try {
648 <            new CustomTPE(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
648 >            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
649              shouldThrow();
650 <        }
691 <        catch (IllegalArgumentException success) {}
650 >        } catch (IllegalArgumentException success) {}
651      }
652  
653      /**
# Line 696 | Line 655 | public class ThreadPoolExecutorSubclassT
655       */
656      public void testConstructorNullPointerException2() {
657          try {
658 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new SimpleThreadFactory());
658 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
659              shouldThrow();
660 <        }
702 <        catch (NullPointerException success) {}
660 >        } catch (NullPointerException success) {}
661      }
662  
663      /**
# Line 708 | Line 666 | public class ThreadPoolExecutorSubclassT
666      public void testConstructorNullPointerException3() {
667          try {
668              ThreadFactory f = null;
669 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
669 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
670              shouldThrow();
671 <        }
714 <        catch (NullPointerException success) {}
671 >        } catch (NullPointerException success) {}
672      }
673  
674  
# Line 720 | Line 677 | public class ThreadPoolExecutorSubclassT
677       */
678      public void testConstructor11() {
679          try {
680 <            new CustomTPE(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
680 >            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
681              shouldThrow();
682 <        }
726 <        catch (IllegalArgumentException success) {}
682 >        } catch (IllegalArgumentException success) {}
683      }
684  
685      /**
# Line 731 | Line 687 | public class ThreadPoolExecutorSubclassT
687       */
688      public void testConstructor12() {
689          try {
690 <            new CustomTPE(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
690 >            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
691              shouldThrow();
692 <        }
737 <        catch (IllegalArgumentException success) {}
692 >        } catch (IllegalArgumentException success) {}
693      }
694  
695      /**
# Line 742 | Line 697 | public class ThreadPoolExecutorSubclassT
697       */
698      public void testConstructor13() {
699          try {
700 <            new CustomTPE(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
700 >            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
701              shouldThrow();
702 <        }
748 <        catch (IllegalArgumentException success) {}
702 >        } catch (IllegalArgumentException success) {}
703      }
704  
705      /**
# Line 753 | Line 707 | public class ThreadPoolExecutorSubclassT
707       */
708      public void testConstructor14() {
709          try {
710 <            new CustomTPE(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
710 >            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
711              shouldThrow();
712 <        }
759 <        catch (IllegalArgumentException success) {}
712 >        } catch (IllegalArgumentException success) {}
713      }
714  
715      /**
# Line 764 | Line 717 | public class ThreadPoolExecutorSubclassT
717       */
718      public void testConstructor15() {
719          try {
720 <            new CustomTPE(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
720 >            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
721              shouldThrow();
722 <        }
770 <        catch (IllegalArgumentException success) {}
722 >        } catch (IllegalArgumentException success) {}
723      }
724  
725      /**
# Line 775 | Line 727 | public class ThreadPoolExecutorSubclassT
727       */
728      public void testConstructorNullPointerException4() {
729          try {
730 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new NoOpREHandler());
730 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
731              shouldThrow();
732 <        }
781 <        catch (NullPointerException success) {}
732 >        } catch (NullPointerException success) {}
733      }
734  
735      /**
# Line 787 | Line 738 | public class ThreadPoolExecutorSubclassT
738      public void testConstructorNullPointerException5() {
739          try {
740              RejectedExecutionHandler r = null;
741 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
741 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
742              shouldThrow();
743 <        }
793 <        catch (NullPointerException success) {}
743 >        } catch (NullPointerException success) {}
744      }
745  
746  
# Line 799 | Line 749 | public class ThreadPoolExecutorSubclassT
749       */
750      public void testConstructor16() {
751          try {
752 <            new CustomTPE(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
752 >            new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
753              shouldThrow();
754 <        }
805 <        catch (IllegalArgumentException success) {}
754 >        } catch (IllegalArgumentException success) {}
755      }
756  
757      /**
# Line 810 | Line 759 | public class ThreadPoolExecutorSubclassT
759       */
760      public void testConstructor17() {
761          try {
762 <            new CustomTPE(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
762 >            new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
763              shouldThrow();
764 <        }
816 <        catch (IllegalArgumentException success) {}
764 >        } catch (IllegalArgumentException success) {}
765      }
766  
767      /**
# Line 821 | Line 769 | public class ThreadPoolExecutorSubclassT
769       */
770      public void testConstructor18() {
771          try {
772 <            new CustomTPE(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
772 >            new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
773              shouldThrow();
774 <        }
827 <        catch (IllegalArgumentException success) {}
774 >        } catch (IllegalArgumentException success) {}
775      }
776  
777      /**
# Line 832 | Line 779 | public class ThreadPoolExecutorSubclassT
779       */
780      public void testConstructor19() {
781          try {
782 <            new CustomTPE(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
782 >            new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
783              shouldThrow();
784 <        }
838 <        catch (IllegalArgumentException success) {}
784 >        } catch (IllegalArgumentException success) {}
785      }
786  
787      /**
# Line 843 | Line 789 | public class ThreadPoolExecutorSubclassT
789       */
790      public void testConstructor20() {
791          try {
792 <            new CustomTPE(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
792 >            new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
793              shouldThrow();
794 <        }
849 <        catch (IllegalArgumentException success) {}
794 >        } catch (IllegalArgumentException success) {}
795      }
796  
797      /**
# Line 854 | Line 799 | public class ThreadPoolExecutorSubclassT
799       */
800      public void testConstructorNullPointerException6() {
801          try {
802 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
802 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
803              shouldThrow();
804 <        }
860 <        catch (NullPointerException success) {}
804 >        } catch (NullPointerException success) {}
805      }
806  
807      /**
# Line 866 | Line 810 | public class ThreadPoolExecutorSubclassT
810      public void testConstructorNullPointerException7() {
811          try {
812              RejectedExecutionHandler r = null;
813 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
813 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
814              shouldThrow();
815 <        }
872 <        catch (NullPointerException success) {}
815 >        } catch (NullPointerException success) {}
816      }
817  
818      /**
# Line 878 | Line 821 | public class ThreadPoolExecutorSubclassT
821      public void testConstructorNullPointerException8() {
822          try {
823              ThreadFactory f = null;
824 <            new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
824 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
825              shouldThrow();
826 <        }
884 <        catch (NullPointerException successdn8) {}
826 >        } catch (NullPointerException success) {}
827      }
828  
829  
# Line 890 | Line 832 | public class ThreadPoolExecutorSubclassT
832       *  if saturated.
833       */
834      public void testSaturatedExecute() {
835 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
835 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
836          try {
837  
838              for (int i = 0; i < 5; ++i) {
# Line 906 | Line 848 | public class ThreadPoolExecutorSubclassT
848       */
849      public void testSaturatedExecute2() {
850          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
851 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
851 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
852          try {
853  
854              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
# Line 922 | Line 864 | public class ThreadPoolExecutorSubclassT
864                  assertTrue(tasks[i].done);
865              }
866              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
925        } catch (RejectedExecutionException ex) {
926            unexpectedException();
867          } finally {
868              joinPool(p);
869          }
# Line 934 | Line 874 | public class ThreadPoolExecutorSubclassT
874       */
875      public void testSaturatedExecute3() {
876          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
877 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
877 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
878          try {
879  
880              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
# Line 949 | Line 889 | public class ThreadPoolExecutorSubclassT
889                  assertFalse(tasks[i].done);
890              }
891              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
952        } catch (RejectedExecutionException ex) {
953            unexpectedException();
892          } finally {
893              joinPool(p);
894          }
# Line 961 | Line 899 | public class ThreadPoolExecutorSubclassT
899       */
900      public void testSaturatedExecute4() {
901          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
902 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
902 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
903          try {
904              p.execute(new TrackedLongRunnable());
905              TrackedLongRunnable r2 = new TrackedLongRunnable();
# Line 972 | Line 910 | public class ThreadPoolExecutorSubclassT
910              assertFalse(p.getQueue().contains(r2));
911              assertTrue(p.getQueue().contains(r3));
912              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
975        } catch (RejectedExecutionException ex) {
976            unexpectedException();
913          } finally {
914              joinPool(p);
915          }
# Line 984 | Line 920 | public class ThreadPoolExecutorSubclassT
920       */
921      public void testRejectedExecutionExceptionOnShutdown() {
922          ThreadPoolExecutor tpe =
923 <            new CustomTPE(1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
923 >            new CustomTPE(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
924          try { tpe.shutdown(); } catch (SecurityException ok) { return; }
925 <        try {
926 <            tpe.execute(new NoOpRunnable());
927 <            shouldThrow();
928 <        } catch (RejectedExecutionException success) {}
925 >        try {
926 >            tpe.execute(new NoOpRunnable());
927 >            shouldThrow();
928 >        } catch (RejectedExecutionException success) {}
929  
930 <        joinPool(tpe);
930 >        joinPool(tpe);
931      }
932  
933      /**
# Line 999 | Line 935 | public class ThreadPoolExecutorSubclassT
935       */
936      public void testCallerRunsOnShutdown() {
937          RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy();
938 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
938 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
939  
940          try { p.shutdown(); } catch (SecurityException ok) { return; }
941 <        try {
941 >        try {
942              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
943 <            p.execute(r);
943 >            p.execute(r);
944              assertFalse(r.done);
1009        } catch (RejectedExecutionException success) {
1010            unexpectedException();
945          } finally {
946              joinPool(p);
947          }
# Line 1018 | Line 952 | public class ThreadPoolExecutorSubclassT
952       */
953      public void testDiscardOnShutdown() {
954          RejectedExecutionHandler h = new CustomTPE.DiscardPolicy();
955 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
955 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
956  
957          try { p.shutdown(); } catch (SecurityException ok) { return; }
958 <        try {
958 >        try {
959              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
960 <            p.execute(r);
960 >            p.execute(r);
961              assertFalse(r.done);
1028        } catch (RejectedExecutionException success) {
1029            unexpectedException();
962          } finally {
963              joinPool(p);
964          }
# Line 1038 | Line 970 | public class ThreadPoolExecutorSubclassT
970       */
971      public void testDiscardOldestOnShutdown() {
972          RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy();
973 <        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
973 >        ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
974  
975          try { p.shutdown(); } catch (SecurityException ok) { return; }
976 <        try {
976 >        try {
977              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
978 <            p.execute(r);
978 >            p.execute(r);
979              assertFalse(r.done);
1048        } catch (RejectedExecutionException success) {
1049            unexpectedException();
980          } finally {
981              joinPool(p);
982          }
# Line 1059 | Line 989 | public class ThreadPoolExecutorSubclassT
989      public void testExecuteNull() {
990          ThreadPoolExecutor tpe = null;
991          try {
992 <            tpe = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
993 <            tpe.execute(null);
992 >            tpe = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
993 >            tpe.execute(null);
994              shouldThrow();
995 <        } catch (NullPointerException success) {}
995 >        } catch (NullPointerException success) {}
996  
997 <        joinPool(tpe);
997 >        joinPool(tpe);
998      }
999  
1000      /**
1001       *  setCorePoolSize of negative value throws IllegalArgumentException
1002       */
1003      public void testCorePoolSizeIllegalArgumentException() {
1004 <        ThreadPoolExecutor tpe = null;
1005 <        try {
1006 <            tpe = new CustomTPE(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1007 <        } catch (Exception e) {}
1008 <        try {
1009 <            tpe.setCorePoolSize(-1);
1080 <            shouldThrow();
1081 <        } catch (IllegalArgumentException success) {
1004 >        ThreadPoolExecutor tpe =
1005 >            new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1006 >        try {
1007 >            tpe.setCorePoolSize(-1);
1008 >            shouldThrow();
1009 >        } catch (IllegalArgumentException success) {
1010          } finally {
1011              try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1012          }
# Line 1090 | Line 1018 | public class ThreadPoolExecutorSubclassT
1018       *  given a value less the core pool size
1019       */
1020      public void testMaximumPoolSizeIllegalArgumentException() {
1021 <        ThreadPoolExecutor tpe = null;
1022 <        try {
1095 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1096 <        } catch (Exception e) {}
1021 >        ThreadPoolExecutor tpe =
1022 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1023          try {
1024              tpe.setMaximumPoolSize(1);
1025              shouldThrow();
# Line 1109 | Line 1035 | public class ThreadPoolExecutorSubclassT
1035       *  if given a negative value
1036       */
1037      public void testMaximumPoolSizeIllegalArgumentException2() {
1038 <        ThreadPoolExecutor tpe = null;
1039 <        try {
1114 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1115 <        } catch (Exception e) {}
1038 >        ThreadPoolExecutor tpe =
1039 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1040          try {
1041              tpe.setMaximumPoolSize(-1);
1042              shouldThrow();
# Line 1129 | Line 1053 | public class ThreadPoolExecutorSubclassT
1053       *  when given a negative value
1054       */
1055      public void testKeepAliveTimeIllegalArgumentException() {
1056 <        ThreadPoolExecutor tpe = null;
1057 <        try {
1134 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1135 <        } catch (Exception e) {}
1056 >        ThreadPoolExecutor tpe =
1057 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1058  
1059 <        try {
1060 <            tpe.setKeepAliveTime(-1,TimeUnit.MILLISECONDS);
1059 >        try {
1060 >            tpe.setKeepAliveTime(-1,MILLISECONDS);
1061              shouldThrow();
1062          } catch (IllegalArgumentException success) {
1063          } finally {
# Line 1157 | Line 1079 | public class ThreadPoolExecutorSubclassT
1079      /**
1080       * beforeExecute and afterExecute are called when executing task
1081       */
1082 <    public void testBeforeAfter() {
1082 >    public void testBeforeAfter() throws InterruptedException {
1083          CustomTPE tpe = new CustomTPE();
1084          try {
1085              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
# Line 1167 | Line 1089 | public class ThreadPoolExecutorSubclassT
1089              assertTrue(tpe.beforeCalled);
1090              assertTrue(tpe.afterCalled);
1091              try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1170        }
1171        catch (Exception ex) {
1172            unexpectedException();
1092          } finally {
1093              joinPool(tpe);
1094          }
# Line 1178 | Line 1097 | public class ThreadPoolExecutorSubclassT
1097      /**
1098       * completed submit of callable returns result
1099       */
1100 <    public void testSubmitCallable() {
1101 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1100 >    public void testSubmitCallable() throws Exception {
1101 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1102          try {
1103              Future<String> future = e.submit(new StringTask());
1104              String result = future.get();
1105              assertSame(TEST_STRING, result);
1187        }
1188        catch (ExecutionException ex) {
1189            unexpectedException();
1190        }
1191        catch (InterruptedException ex) {
1192            unexpectedException();
1106          } finally {
1107              joinPool(e);
1108          }
# Line 1198 | Line 1111 | public class ThreadPoolExecutorSubclassT
1111      /**
1112       * completed submit of runnable returns successfully
1113       */
1114 <    public void testSubmitRunnable() {
1115 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1114 >    public void testSubmitRunnable() throws Exception {
1115 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1116          try {
1117              Future<?> future = e.submit(new NoOpRunnable());
1118              future.get();
1119              assertTrue(future.isDone());
1207        }
1208        catch (ExecutionException ex) {
1209            unexpectedException();
1210        }
1211        catch (InterruptedException ex) {
1212            unexpectedException();
1120          } finally {
1121              joinPool(e);
1122          }
# Line 1218 | Line 1125 | public class ThreadPoolExecutorSubclassT
1125      /**
1126       * completed submit of (runnable, result) returns result
1127       */
1128 <    public void testSubmitRunnable2() {
1129 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1128 >    public void testSubmitRunnable2() throws Exception {
1129 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1130          try {
1131              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1132              String result = future.get();
1133              assertSame(TEST_STRING, result);
1227        }
1228        catch (ExecutionException ex) {
1229            unexpectedException();
1230        }
1231        catch (InterruptedException ex) {
1232            unexpectedException();
1134          } finally {
1135              joinPool(e);
1136          }
1137      }
1138  
1139  
1239
1240
1241
1140      /**
1141       * invokeAny(null) throws NPE
1142       */
1143 <    public void testInvokeAny1() {
1144 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1143 >    public void testInvokeAny1() throws Exception {
1144 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1145          try {
1146              e.invokeAny(null);
1147 +            shouldThrow();
1148          } catch (NullPointerException success) {
1250        } catch (Exception ex) {
1251            unexpectedException();
1149          } finally {
1150              joinPool(e);
1151          }
# Line 1257 | Line 1154 | public class ThreadPoolExecutorSubclassT
1154      /**
1155       * invokeAny(empty collection) throws IAE
1156       */
1157 <    public void testInvokeAny2() {
1158 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1157 >    public void testInvokeAny2() throws Exception {
1158 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1159          try {
1160              e.invokeAny(new ArrayList<Callable<String>>());
1161 +            shouldThrow();
1162          } catch (IllegalArgumentException success) {
1265        } catch (Exception ex) {
1266            unexpectedException();
1163          } finally {
1164              joinPool(e);
1165          }
# Line 1272 | Line 1168 | public class ThreadPoolExecutorSubclassT
1168      /**
1169       * invokeAny(c) throws NPE if c has null elements
1170       */
1171 <    public void testInvokeAny3() {
1172 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1171 >    public void testInvokeAny3() throws Exception {
1172 >        final CountDownLatch latch = new CountDownLatch(1);
1173 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1174          try {
1175              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1176 <            l.add(new StringTask());
1176 >            l.add(new Callable<String>() {
1177 >                      public String call() {
1178 >                          try {
1179 >                              latch.await();
1180 >                          } catch (InterruptedException ok) {}
1181 >                          return TEST_STRING;
1182 >                      }});
1183              l.add(null);
1184              e.invokeAny(l);
1185 +            shouldThrow();
1186          } catch (NullPointerException success) {
1283        } catch (Exception ex) {
1284            unexpectedException();
1187          } finally {
1188 +            latch.countDown();
1189              joinPool(e);
1190          }
1191      }
# Line 1290 | Line 1193 | public class ThreadPoolExecutorSubclassT
1193      /**
1194       * invokeAny(c) throws ExecutionException if no task completes
1195       */
1196 <    public void testInvokeAny4() {
1197 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1196 >    public void testInvokeAny4() throws Exception {
1197 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1198          try {
1199              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1200              l.add(new NPETask());
1201              e.invokeAny(l);
1202 +            shouldThrow();
1203          } catch (ExecutionException success) {
1300        } catch (Exception ex) {
1301            unexpectedException();
1204          } finally {
1205              joinPool(e);
1206          }
# Line 1307 | Line 1209 | public class ThreadPoolExecutorSubclassT
1209      /**
1210       * invokeAny(c) returns result of some task
1211       */
1212 <    public void testInvokeAny5() {
1213 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1212 >    public void testInvokeAny5() throws Exception {
1213 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1214          try {
1215              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1216              l.add(new StringTask());
1217              l.add(new StringTask());
1218              String result = e.invokeAny(l);
1219              assertSame(TEST_STRING, result);
1318        } catch (ExecutionException success) {
1319        } catch (Exception ex) {
1320            unexpectedException();
1220          } finally {
1221              joinPool(e);
1222          }
# Line 1326 | Line 1225 | public class ThreadPoolExecutorSubclassT
1225      /**
1226       * invokeAll(null) throws NPE
1227       */
1228 <    public void testInvokeAll1() {
1229 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1228 >    public void testInvokeAll1() throws Exception {
1229 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1230          try {
1231              e.invokeAll(null);
1232 +            shouldThrow();
1233          } catch (NullPointerException success) {
1334        } catch (Exception ex) {
1335            unexpectedException();
1234          } finally {
1235              joinPool(e);
1236          }
# Line 1341 | Line 1239 | public class ThreadPoolExecutorSubclassT
1239      /**
1240       * invokeAll(empty collection) returns empty collection
1241       */
1242 <    public void testInvokeAll2() {
1243 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1242 >    public void testInvokeAll2() throws Exception {
1243 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1244          try {
1245              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1246              assertTrue(r.isEmpty());
1349        } catch (Exception ex) {
1350            unexpectedException();
1247          } finally {
1248              joinPool(e);
1249          }
# Line 1356 | Line 1252 | public class ThreadPoolExecutorSubclassT
1252      /**
1253       * invokeAll(c) throws NPE if c has null elements
1254       */
1255 <    public void testInvokeAll3() {
1256 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1255 >    public void testInvokeAll3() throws Exception {
1256 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1257          try {
1258              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1259              l.add(new StringTask());
1260              l.add(null);
1261              e.invokeAll(l);
1262 +            shouldThrow();
1263          } catch (NullPointerException success) {
1367        } catch (Exception ex) {
1368            unexpectedException();
1264          } finally {
1265              joinPool(e);
1266          }
# Line 1374 | Line 1269 | public class ThreadPoolExecutorSubclassT
1269      /**
1270       * get of element of invokeAll(c) throws exception on failed task
1271       */
1272 <    public void testInvokeAll4() {
1273 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1272 >    public void testInvokeAll4() throws Exception {
1273 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1274          try {
1275              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1276              l.add(new NPETask());
1277              List<Future<String>> result = e.invokeAll(l);
1278              assertEquals(1, result.size());
1279 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1280 <                it.next().get();
1279 >            for (Future<String> future : result)
1280 >                future.get();
1281 >            shouldThrow();
1282          } catch (ExecutionException success) {
1387        } catch (Exception ex) {
1388            unexpectedException();
1283          } finally {
1284              joinPool(e);
1285          }
# Line 1394 | Line 1288 | public class ThreadPoolExecutorSubclassT
1288      /**
1289       * invokeAll(c) returns results of all completed tasks
1290       */
1291 <    public void testInvokeAll5() {
1292 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1291 >    public void testInvokeAll5() throws Exception {
1292 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1293          try {
1294              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1295              l.add(new StringTask());
1296              l.add(new StringTask());
1297              List<Future<String>> result = e.invokeAll(l);
1298              assertEquals(2, result.size());
1299 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1300 <                assertSame(TEST_STRING, it.next().get());
1407 <        } catch (ExecutionException success) {
1408 <        } catch (Exception ex) {
1409 <            unexpectedException();
1299 >            for (Future<String> future : result)
1300 >                assertSame(TEST_STRING, future.get());
1301          } finally {
1302              joinPool(e);
1303          }
# Line 1417 | Line 1308 | public class ThreadPoolExecutorSubclassT
1308      /**
1309       * timed invokeAny(null) throws NPE
1310       */
1311 <    public void testTimedInvokeAny1() {
1312 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1311 >    public void testTimedInvokeAny1() throws Exception {
1312 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1313          try {
1314 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1314 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1315 >            shouldThrow();
1316          } catch (NullPointerException success) {
1425        } catch (Exception ex) {
1426            unexpectedException();
1317          } finally {
1318              joinPool(e);
1319          }
# Line 1432 | Line 1322 | public class ThreadPoolExecutorSubclassT
1322      /**
1323       * timed invokeAny(,,null) throws NPE
1324       */
1325 <    public void testTimedInvokeAnyNullTimeUnit() {
1326 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1325 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1326 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1327          try {
1328              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1329              l.add(new StringTask());
1330              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1331 +            shouldThrow();
1332          } catch (NullPointerException success) {
1442        } catch (Exception ex) {
1443            unexpectedException();
1333          } finally {
1334              joinPool(e);
1335          }
# Line 1449 | Line 1338 | public class ThreadPoolExecutorSubclassT
1338      /**
1339       * timed invokeAny(empty collection) throws IAE
1340       */
1341 <    public void testTimedInvokeAny2() {
1342 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1341 >    public void testTimedInvokeAny2() throws Exception {
1342 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1343          try {
1344 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1344 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1345 >            shouldThrow();
1346          } catch (IllegalArgumentException success) {
1457        } catch (Exception ex) {
1458            unexpectedException();
1347          } finally {
1348              joinPool(e);
1349          }
# Line 1464 | Line 1352 | public class ThreadPoolExecutorSubclassT
1352      /**
1353       * timed invokeAny(c) throws NPE if c has null elements
1354       */
1355 <    public void testTimedInvokeAny3() {
1356 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1355 >    public void testTimedInvokeAny3() throws Exception {
1356 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1357          try {
1358              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1359              l.add(new StringTask());
1360              l.add(null);
1361 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1361 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1362 >            shouldThrow();
1363          } catch (NullPointerException success) {
1475        } catch (Exception ex) {
1476            ex.printStackTrace();
1477            unexpectedException();
1364          } finally {
1365              joinPool(e);
1366          }
# Line 1483 | Line 1369 | public class ThreadPoolExecutorSubclassT
1369      /**
1370       * timed invokeAny(c) throws ExecutionException if no task completes
1371       */
1372 <    public void testTimedInvokeAny4() {
1373 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1372 >    public void testTimedInvokeAny4() throws Exception {
1373 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1374          try {
1375              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1376              l.add(new NPETask());
1377 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1377 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1378 >            shouldThrow();
1379          } catch (ExecutionException success) {
1493        } catch (Exception ex) {
1494            unexpectedException();
1380          } finally {
1381              joinPool(e);
1382          }
# Line 1500 | Line 1385 | public class ThreadPoolExecutorSubclassT
1385      /**
1386       * timed invokeAny(c) returns result of some task
1387       */
1388 <    public void testTimedInvokeAny5() {
1389 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1388 >    public void testTimedInvokeAny5() throws Exception {
1389 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1390          try {
1391              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1392              l.add(new StringTask());
1393              l.add(new StringTask());
1394 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1394 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1395              assertSame(TEST_STRING, result);
1511        } catch (ExecutionException success) {
1512        } catch (Exception ex) {
1513            unexpectedException();
1396          } finally {
1397              joinPool(e);
1398          }
# Line 1519 | Line 1401 | public class ThreadPoolExecutorSubclassT
1401      /**
1402       * timed invokeAll(null) throws NPE
1403       */
1404 <    public void testTimedInvokeAll1() {
1405 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1404 >    public void testTimedInvokeAll1() throws Exception {
1405 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1406          try {
1407 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1407 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1408 >            shouldThrow();
1409          } catch (NullPointerException success) {
1527        } catch (Exception ex) {
1528            unexpectedException();
1410          } finally {
1411              joinPool(e);
1412          }
# Line 1534 | Line 1415 | public class ThreadPoolExecutorSubclassT
1415      /**
1416       * timed invokeAll(,,null) throws NPE
1417       */
1418 <    public void testTimedInvokeAllNullTimeUnit() {
1419 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1418 >    public void testTimedInvokeAllNullTimeUnit() throws Exception {
1419 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1420          try {
1421              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1422              l.add(new StringTask());
1423              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1424 +            shouldThrow();
1425          } catch (NullPointerException success) {
1544        } catch (Exception ex) {
1545            unexpectedException();
1426          } finally {
1427              joinPool(e);
1428          }
# Line 1551 | Line 1431 | public class ThreadPoolExecutorSubclassT
1431      /**
1432       * timed invokeAll(empty collection) returns empty collection
1433       */
1434 <    public void testTimedInvokeAll2() {
1435 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1434 >    public void testTimedInvokeAll2() throws Exception {
1435 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1436          try {
1437 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1437 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1438              assertTrue(r.isEmpty());
1559        } catch (Exception ex) {
1560            unexpectedException();
1439          } finally {
1440              joinPool(e);
1441          }
# Line 1566 | Line 1444 | public class ThreadPoolExecutorSubclassT
1444      /**
1445       * timed invokeAll(c) throws NPE if c has null elements
1446       */
1447 <    public void testTimedInvokeAll3() {
1448 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1447 >    public void testTimedInvokeAll3() throws Exception {
1448 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1449          try {
1450              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1451              l.add(new StringTask());
1452              l.add(null);
1453 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1453 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1454 >            shouldThrow();
1455          } catch (NullPointerException success) {
1577        } catch (Exception ex) {
1578            unexpectedException();
1456          } finally {
1457              joinPool(e);
1458          }
# Line 1584 | Line 1461 | public class ThreadPoolExecutorSubclassT
1461      /**
1462       * get of element of invokeAll(c) throws exception on failed task
1463       */
1464 <    public void testTimedInvokeAll4() {
1465 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1464 >    public void testTimedInvokeAll4() throws Exception {
1465 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1466          try {
1467              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1468              l.add(new NPETask());
1469 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1469 >            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1470              assertEquals(1, result.size());
1471 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1472 <                it.next().get();
1471 >            for (Future<String> future : result)
1472 >                future.get();
1473 >            shouldThrow();
1474          } catch (ExecutionException success) {
1475 <        } catch (Exception ex) {
1598 <            unexpectedException();
1475 >            assertTrue(success.getCause() instanceof NullPointerException);
1476          } finally {
1477              joinPool(e);
1478          }
# Line 1604 | Line 1481 | public class ThreadPoolExecutorSubclassT
1481      /**
1482       * timed invokeAll(c) returns results of all completed tasks
1483       */
1484 <    public void testTimedInvokeAll5() {
1485 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1484 >    public void testTimedInvokeAll5() throws Exception {
1485 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1486          try {
1487              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1488              l.add(new StringTask());
1489              l.add(new StringTask());
1490 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1490 >            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1491              assertEquals(2, result.size());
1492 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1493 <                assertSame(TEST_STRING, it.next().get());
1492 >            for (Future<String> future : result)
1493 >                assertSame(TEST_STRING, future.get());
1494          } catch (ExecutionException success) {
1618        } catch (Exception ex) {
1619            unexpectedException();
1495          } finally {
1496              joinPool(e);
1497          }
# Line 1625 | Line 1500 | public class ThreadPoolExecutorSubclassT
1500      /**
1501       * timed invokeAll(c) cancels tasks not completed by timeout
1502       */
1503 <    public void testTimedInvokeAll6() {
1504 <        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1503 >    public void testTimedInvokeAll6() throws Exception {
1504 >        ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1505          try {
1506              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1507              l.add(new StringTask());
1508              l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1509              l.add(new StringTask());
1510 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1510 >            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1511              assertEquals(3, result.size());
1512              Iterator<Future<String>> it = result.iterator();
1513              Future<String> f1 = it.next();
# Line 1643 | Line 1518 | public class ThreadPoolExecutorSubclassT
1518              assertTrue(f3.isDone());
1519              assertFalse(f1.isCancelled());
1520              assertTrue(f2.isCancelled());
1646        } catch (Exception ex) {
1647            unexpectedException();
1521          } finally {
1522              joinPool(e);
1523          }
# Line 1654 | Line 1527 | public class ThreadPoolExecutorSubclassT
1527       * Execution continues if there is at least one thread even if
1528       * thread factory fails to create more
1529       */
1530 <    public void testFailingThreadFactory() {
1531 <        ExecutorService e = new CustomTPE(100, 100, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1530 >    public void testFailingThreadFactory() throws InterruptedException {
1531 >        ExecutorService e = new CustomTPE(100, 100, LONG_DELAY_MS, MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1532          try {
1660            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1533              for (int k = 0; k < 100; ++k) {
1534                  e.execute(new NoOpRunnable());
1535              }
1536              Thread.sleep(LONG_DELAY_MS);
1665        } catch (Exception ex) {
1666            unexpectedException();
1537          } finally {
1538              joinPool(e);
1539          }
# Line 1673 | Line 1543 | public class ThreadPoolExecutorSubclassT
1543       * allowsCoreThreadTimeOut is by default false.
1544       */
1545      public void testAllowsCoreThreadTimeOut() {
1546 <        ThreadPoolExecutor tpe = new CustomTPE(2, 2, 1000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1546 >        ThreadPoolExecutor tpe = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1547          assertFalse(tpe.allowsCoreThreadTimeOut());
1548          joinPool(tpe);
1549      }
# Line 1681 | Line 1551 | public class ThreadPoolExecutorSubclassT
1551      /**
1552       * allowCoreThreadTimeOut(true) causes idle threads to time out
1553       */
1554 <    public void testAllowCoreThreadTimeOut_true() {
1555 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1554 >    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
1555 >        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1556          tpe.allowCoreThreadTimeOut(true);
1557          tpe.execute(new NoOpRunnable());
1558          try {
1559              Thread.sleep(MEDIUM_DELAY_MS);
1560              assertEquals(0, tpe.getPoolSize());
1691        } catch (InterruptedException e) {
1692            unexpectedException();
1561          } finally {
1562              joinPool(tpe);
1563          }
# Line 1698 | Line 1566 | public class ThreadPoolExecutorSubclassT
1566      /**
1567       * allowCoreThreadTimeOut(false) causes idle threads not to time out
1568       */
1569 <    public void testAllowCoreThreadTimeOut_false() {
1570 <        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1569 >    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
1570 >        ThreadPoolExecutor tpe = new CustomTPE(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1571          tpe.allowCoreThreadTimeOut(false);
1572          tpe.execute(new NoOpRunnable());
1573          try {
1574              Thread.sleep(MEDIUM_DELAY_MS);
1575              assertTrue(tpe.getPoolSize() >= 1);
1708        } catch (InterruptedException e) {
1709            unexpectedException();
1576          } finally {
1577              joinPool(tpe);
1578          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines