--- jsr166/src/test/tck/ThreadPoolExecutorTest.java	2003/09/07 20:39:11	1.2
+++ jsr166/src/test/tck/ThreadPoolExecutorTest.java	2003/09/20 18:20:08	1.5
@@ -9,623 +9,606 @@ import java.util.concurrent.*;
 import junit.framework.*;
 import java.util.List;
 
-public class ThreadPoolExecutorTest extends TestCase{
+public class ThreadPoolExecutorTest extends JSR166TestCase {
     public static void main(String[] args) {
 	junit.textui.TestRunner.run (suite());	
     }
-
-
     public static Test suite() {
         return new TestSuite(ThreadPoolExecutorTest.class);
     }
     
-    private static long SHORT_DELAY_MS = 100; 
-    private static long MEDIUM_DELAY_MS = 1000;
-    private static long LONG_DELAY_MS = 10000; 
-
-//---- testThread class to implement ThreadFactory for use in constructors
-    static class testThread implements ThreadFactory{
+    /**
+     * For use as ThreadFactory in constructors
+     */
+    static class MyThreadFactory implements ThreadFactory{
         public Thread newThread(Runnable r){
             return new Thread(r);
         }   
     }
 
-//---- testReject class to implement RejectedExecutionHandler for use in the constructors
-    static class testReject implements RejectedExecutionHandler{
+    /**
+     * For use as RejectedExecutionHandler in constructors
+     */
+    static class MyREHandler implements RejectedExecutionHandler{
         public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){} 
     }
-
-    public Runnable newRunnable(){
-	return new Runnable(){
-		public void run(){
-		    try{Thread.sleep(MEDIUM_DELAY_MS);
-                    } catch(Exception e){
-                    }
-		}
-	    };
-    }
-
  
     /**
-     *  Test to verify that execute successfully executes a runnable
+     *   execute successfully executes a runnable
      */
-    public void testExecute(){
-        ThreadPoolExecutor one = new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testExecute() {
+        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         try {
-            one.execute(new Runnable(){
-                    public void run(){
-                        try{
+            p1.execute(new Runnable() {
+                    public void run() {
+                        try {
                             Thread.sleep(SHORT_DELAY_MS);
                         } catch(InterruptedException e){
-                            fail("unexpected exception");
+                            threadUnexpectedException();
                         }
                     }
                 });
-	    Thread.sleep(SHORT_DELAY_MS * 2);
+	    Thread.sleep(SMALL_DELAY_MS);
         } catch(InterruptedException e){
-            fail("unexpected exception");
-        } finally {
-            one.shutdown();
-        }
+            unexpectedException();
+        } 
+        joinPool(p1);
     }
 
     /**
-     *  Test to verify getActiveCount gives correct values
+     *   getActiveCount gives correct values
      */
-    public void testGetActiveCount(){
-        ThreadPoolExecutor two = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testGetActiveCount() {
+        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(0, p2.getActiveCount());
+        p2.execute(new MediumRunnable());
         try {
-            assertEquals(0, two.getActiveCount());
-            two.execute(newRunnable());
-            try{Thread.sleep(10);} catch(Exception e){}
-            assertEquals(1, two.getActiveCount());
-        } finally {
-            two.shutdown();
+            Thread.sleep(SHORT_DELAY_MS);
+        } catch(Exception e){
+            unexpectedException();
         }
+        assertEquals(1, p2.getActiveCount());
+        joinPool(p2);
     }
     
     /**
-     *  Test to verify getCompleteTaskCount gives correct values
+     *   getCompleteTaskCount gives correct values
      */
-    public void testGetCompletedTaskCount(){
-        ThreadPoolExecutor two = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testGetCompletedTaskCount() {
+        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(0, p2.getCompletedTaskCount());
+        p2.execute(new ShortRunnable());
         try {
-            assertEquals(0, two.getCompletedTaskCount());
-            two.execute(newRunnable());
-            try{Thread.sleep(2000);} catch(Exception e){}
-            assertEquals(1, two.getCompletedTaskCount());
-        } finally {
-            two.shutdown();
+            Thread.sleep(MEDIUM_DELAY_MS);
+        } catch(Exception e){
+            unexpectedException();
         }
+        assertEquals(1, p2.getCompletedTaskCount());
+        p2.shutdown();
+        joinPool(p2);
     }
     
     /**
-     *  Test to verify getCorePoolSize gives correct values
+     *   getCorePoolSize gives correct values
      */
-    public void testGetCorePoolSize(){
-        ThreadPoolExecutor one = new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-        try {
-            assertEquals(1, one.getCorePoolSize());
-        } finally {
-            one.shutdown();
-        }
+    public void testGetCorePoolSize() {
+        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(1, p1.getCorePoolSize());
+        joinPool(p1);
     }
     
     /**
-     *  Test to verify getKeepAliveTime gives correct values
+     *   getKeepAliveTime gives correct values
      */
-    public void testGetKeepAliveTime(){
-        ThreadPoolExecutor two = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-        try {
-            assertEquals(1, two.getKeepAliveTime(TimeUnit.SECONDS));
-        } finally {
-            two.shutdown();
-        }
+    public void testGetKeepAliveTime() {
+        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, 1000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(1, p2.getKeepAliveTime(TimeUnit.SECONDS));
+        joinPool(p2);
     }
     
     /**
-     *  Test to verify getLargestPoolSize gives correct values
+     *   getLargestPoolSize gives correct values
      */
-    public void testGetLargestPoolSize(){
-        ThreadPoolExecutor two = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testGetLargestPoolSize() {
+        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         try {
-            assertEquals(0, two.getLargestPoolSize());
-            two.execute(newRunnable());
-            two.execute(newRunnable());
-            try{Thread.sleep(SHORT_DELAY_MS);} catch(Exception e){}
-            assertEquals(2, two.getLargestPoolSize());
-        } finally {
-            two.shutdown();
-        }
+            assertEquals(0, p2.getLargestPoolSize());
+            p2.execute(new MediumRunnable());
+            p2.execute(new MediumRunnable());
+            Thread.sleep(SHORT_DELAY_MS);
+            assertEquals(2, p2.getLargestPoolSize());
+        } catch(Exception e){
+            unexpectedException();
+        } 
+        joinPool(p2);
     }
     
     /**
-     *  Test to verify getMaximumPoolSize gives correct values
+     *   getMaximumPoolSize gives correct values
      */
-    public void testGetMaximumPoolSize(){
-        ThreadPoolExecutor two = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-        try {
-            assertEquals(2, two.getMaximumPoolSize());
-        } finally {
-            two.shutdown();
-        }
+    public void testGetMaximumPoolSize() {
+        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(2, p2.getMaximumPoolSize());
+        joinPool(p2);
     }
     
     /**
-     *  Test to verify getPoolSize gives correct values
+     *   getPoolSize gives correct values
      */
-    public void testGetPoolSize(){
-        ThreadPoolExecutor one = new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-        try { 
-            assertEquals(0, one.getPoolSize());
-            one.execute(newRunnable());
-            assertEquals(1, one.getPoolSize());
-        } finally {
-            one.shutdown();
-        }
+    public void testGetPoolSize() {
+        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertEquals(0, p1.getPoolSize());
+        p1.execute(new MediumRunnable());
+        assertEquals(1, p1.getPoolSize());
+        joinPool(p1);
     }
     
     /**
-     *  Test to verify getTaskCount gives correct values
+     *   getTaskCount gives correct values
      */
-    public void testGetTaskCount(){
-        ThreadPoolExecutor one = new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testGetTaskCount() {
+        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         try {
-            assertEquals(0, one.getTaskCount());
-            for(int i = 0; i < 5; i++)
-                one.execute(newRunnable());
-            try{Thread.sleep(SHORT_DELAY_MS);} catch(Exception e){}
-            assertEquals(5, one.getTaskCount());
-        } finally {
-            one.shutdown();
-        }
+            assertEquals(0, p1.getTaskCount());
+            p1.execute(new MediumRunnable());
+            Thread.sleep(SHORT_DELAY_MS);
+            assertEquals(1, p1.getTaskCount());
+        } catch(Exception e){
+            unexpectedException();
+        } 
+        joinPool(p1);
     }
     
     /**
-     *  Test to verify isShutDown gives correct values
+     *   isShutDown gives correct values
      */
-    public void testIsShutdown(){
+    public void testIsShutdown() {
         
-	ThreadPoolExecutor one = new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-        try {
-            assertFalse(one.isShutdown());
-        }
-        finally {
-            one.shutdown();
-        }
-	assertTrue(one.isShutdown());
+	ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertFalse(p1.isShutdown());
+        p1.shutdown();
+	assertTrue(p1.isShutdown());
+        joinPool(p1);
     }
 
         
     /**
-     *  Test to verify isTerminated gives correct values
+     *   isTerminated gives correct values
      *  Makes sure termination does not take an innapropriate
      *  amount of time
      */
-    public void testIsTerminated(){
-	ThreadPoolExecutor one = new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testIsTerminated() {
+	ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         try {
-            one.execute(newRunnable());
+            p1.execute(new MediumRunnable());
         } finally {
-            one.shutdown();
+            p1.shutdown();
         }
-	boolean flag = false;
-	try{
-	    flag = one.awaitTermination(10, TimeUnit.SECONDS);
-	} catch(Exception e){}	
-	assertTrue(one.isTerminated());
-	if(!flag)
-	    fail("ThreadPoolExecutor - thread pool did not terminate within suitable timeframe");
+	try {
+	    assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
+            assertTrue(p1.isTerminated());
+	} catch(Exception e){
+            unexpectedException();
+        }	
     }
 
     /**
-     *  Test to verify that purge correctly removes cancelled tasks
-     *  from the queue
+     *  isTerminating gives correct values
      */
-    public void testPurge(){
-        ThreadPoolExecutor one = new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testIsTerminating() {
+	ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        assertFalse(p1.isTerminating());
         try {
-            CancellableTask[] tasks = new CancellableTask[5];
-            for(int i = 0; i < 5; i++){
-                tasks[i] = new CancellableTask(newRunnable());
-                one.execute(tasks[i]);
-            }
-            tasks[4].cancel(true);
-            tasks[3].cancel(true);
-            one.purge();
-            long count = one.getTaskCount();
-            assertTrue(count >= 2 && count < 5);
+            p1.execute(new SmallRunnable());
+            assertFalse(p1.isTerminating());
         } finally {
-            one.shutdown();
+            p1.shutdown();
         }
+        try {
+	    assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
+            assertTrue(p1.isTerminated());
+            assertFalse(p1.isTerminating());
+	} catch(Exception e){
+            unexpectedException();
+        }	
+    }
+
+    /**
+     *   purge correctly removes cancelled tasks
+     *  from the queue
+     */
+    public void testPurge() {
+        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+        CancellableTask[] tasks = new CancellableTask[5];
+        for(int i = 0; i < 5; i++){
+            tasks[i] = new CancellableTask(new MediumPossiblyInterruptedRunnable());
+            p1.execute(tasks[i]);
+        }
+        tasks[4].cancel(true);
+        tasks[3].cancel(true);
+        p1.purge();
+        long count = p1.getTaskCount();
+        assertTrue(count >= 2 && count < 5);
+        joinPool(p1);
     }
 
     /**
-     *  Test to verify shutDownNow returns a list
+     *   shutDownNow returns a list
      *  containing the correct number of elements
      */
-    public void testShutDownNow(){
-	ThreadPoolExecutor one = new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
+    public void testShutDownNow() {
+	ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
         List l;
         try {
             for(int i = 0; i < 5; i++)
-                one.execute(newRunnable());
+                p1.execute(new MediumPossiblyInterruptedRunnable());
         }
         finally {
-            l = one.shutdownNow();
+            l = p1.shutdownNow();
         }
-	assertTrue(one.isShutdown());
+	assertTrue(p1.isShutdown());
 	assertTrue(l.size() <= 4);
     }
 
-    
- 
-    
-    
-      
     // Exception Tests
     
 
-    //---- Tests if corePoolSize argument is less than zero
+    /** Throws if corePoolSize argument is less than zero */
     public void testConstructor1() {
-        try{
-            new ThreadPoolExecutor(-1,1,100L,TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+            shouldThrow();
         }
-        catch (IllegalArgumentException i){}
+        catch (IllegalArgumentException success){}
     }
     
-    //---- Tests if maximumPoolSize is less than zero
+    /** Throws if maximumPoolSize is less than zero */
     public void testConstructor2() {
-        try{
-            new ThreadPoolExecutor(1,-1,100L,TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+            shouldThrow();
         }
-        catch (IllegalArgumentException i2){}
+        catch (IllegalArgumentException success){}
     }
     
-    //---- Tests if maximumPoolSize is equal to zero
+    /** Throws if maximumPoolSize is equal to zero */
     public void testConstructor3() {
-        try{
-            new ThreadPoolExecutor(1,0,100L,TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+            shouldThrow();
         }
-        catch (IllegalArgumentException i3){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if keepAliveTime is less than zero
+    /** Throws if keepAliveTime is less than zero */
     public void testConstructor4() {
-        try{
+        try {
             new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+            shouldThrow();
         }
-        catch (IllegalArgumentException i4){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if corePoolSize is greater than the maximumPoolSize
+    /** Throws if corePoolSize is greater than the maximumPoolSize */
     public void testConstructor5() {
-        try{
-            new ThreadPoolExecutor(2,1,100L,TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
+            shouldThrow();
         }
-        catch (IllegalArgumentException i5){}
+        catch (IllegalArgumentException success){}
     }
 	
-    //---- Tests if workQueue is set to null
+    /** Throws if workQueue is set to null */
     public void testNullPointerException() {
-        try{
-            new ThreadPoolExecutor(1,2,100L,TimeUnit.MILLISECONDS,null);
-            fail("ThreadPoolExecutor constructor should throw a NullPointerException");		
+        try {
+            new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,null);
+            shouldThrow();
         }
-        catch (NullPointerException n){}  
+        catch (NullPointerException success){}  
     }
     
 
     
-    //---- Tests if corePoolSize argument is less than zero
+    /** Throws if corePoolSize argument is less than zero */
     public void testConstructor6() {
-        try{
-            new ThreadPoolExecutor(-1,1,100L,TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
-        } catch (IllegalArgumentException i6){}
+        try {
+            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory());
+            shouldThrow();
+        } catch (IllegalArgumentException success){}
     }
     
-    //---- Tests if maximumPoolSize is less than zero
+    /** Throws if maximumPoolSize is less than zero */
     public void testConstructor7() {
-        try{
-            new ThreadPoolExecutor(1,-1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,-1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i7){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if maximumPoolSize is equal to zero
+    /** Throws if maximumPoolSize is equal to zero */
     public void testConstructor8() {
-        try{
-            new ThreadPoolExecutor(1,0,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,0,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i8){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if keepAliveTime is less than zero
+    /** Throws if keepAliveTime is less than zero */
     public void testConstructor9() {
-        try{
-            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i9){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if corePoolSize is greater than the maximumPoolSize
+    /** Throws if corePoolSize is greater than the maximumPoolSize */
     public void testConstructor10() {
-        try{
-            new ThreadPoolExecutor(2,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(2,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i10){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if workQueue is set to null
+    /** Throws if workQueue is set to null */
     public void testNullPointerException2() {
-        try{
-            new ThreadPoolExecutor(1,2,100L,TimeUnit.MILLISECONDS,null,new testThread());
-            fail("ThreadPoolExecutor constructor should throw a NullPointerException");		
+        try {
+            new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,null,new MyThreadFactory());
+            shouldThrow();
         }
-        catch (NullPointerException n2){}  
+        catch (NullPointerException success){}  
     }
 
-    //---- Tests if threadFactory is set to null
+    /** Throws if threadFactory is set to null */
     public void testNullPointerException3() {
-        try{
+        try {
             ThreadFactory f = null;
-            new ThreadPoolExecutor(1,2,100L,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
-            fail("ThreadPoolExecutor constructor should throw a NullPointerException");		
+            new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
+            shouldThrow();
         }
-        catch (NullPointerException n3){}  
+        catch (NullPointerException success){}  
     }
  
     
-    //---- Tests if corePoolSize argument is less than zero
+    /** Throws if corePoolSize argument is less than zero */
     public void testConstructor11() {
-        try{
-            new ThreadPoolExecutor(-1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(-1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i11){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if maximumPoolSize is less than zero
+    /** Throws if maximumPoolSize is less than zero */
     public void testConstructor12() {
-        try{
-            new ThreadPoolExecutor(1,-1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,-1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i12){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if maximumPoolSize is equal to zero
+    /** Throws if maximumPoolSize is equal to zero */
     public void testConstructor13() {
-        try{
-            new ThreadPoolExecutor(1,0,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,0,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i13){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if keepAliveTime is less than zero
+    /** Throws if keepAliveTime is less than zero */
     public void testConstructor14() {
-        try{
-            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i14){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if corePoolSize is greater than the maximumPoolSize
+    /** Throws if corePoolSize is greater than the maximumPoolSize */
     public void testConstructor15() {
-        try{
-            new ThreadPoolExecutor(2,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(2,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i15){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if workQueue is set to null
+    /** Throws if workQueue is set to null */
     public void testNullPointerException4() {
-        try{
-            new ThreadPoolExecutor(1,2,100L,TimeUnit.MILLISECONDS,null,new testReject());
-            fail("ThreadPoolExecutor constructor should throw a NullPointerException");		
+        try {
+            new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,null,new MyREHandler());
+            shouldThrow();
         }
-        catch (NullPointerException n4){}  
+        catch (NullPointerException success){}  
     }
 
-    //---- Tests if handler is set to null
+    /** Throws if handler is set to null */
     public void testNullPointerException5() {
-        try{
+        try {
             RejectedExecutionHandler r = null;
-            new ThreadPoolExecutor(1,2,100L,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
-            fail("ThreadPoolExecutor constructor should throw a NullPointerException");		
+            new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
+            shouldThrow();
         }
-        catch (NullPointerException n5){}  
+        catch (NullPointerException success){}  
     }
 
     
-    //---- Tests if corePoolSize argument is less than zero
+    /** Throws if corePoolSize argument is less than zero */
     public void testConstructor16() {
-        try{
-            new ThreadPoolExecutor(-1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread(),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(-1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory(),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i16){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if maximumPoolSize is less than zero
+    /** Throws if maximumPoolSize is less than zero */
     public void testConstructor17() {
-        try{
-            new ThreadPoolExecutor(1,-1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread(),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,-1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory(),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i17){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if maximumPoolSize is equal to zero
+    /** Throws if maximumPoolSize is equal to zero */
     public void testConstructor18() {
-        try{
-            new ThreadPoolExecutor(1,0,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread(),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,0,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory(),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i18){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if keepAliveTime is less than zero
+    /** Throws if keepAliveTime is less than zero */
     public void testConstructor19() {
-        try{
-            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread(),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory(),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i19){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if corePoolSize is greater than the maximumPoolSize
+    /** Throws if corePoolSize is greater than the maximumPoolSize */
     public void testConstructor20() {
-        try{
-            new ThreadPoolExecutor(2,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new testThread(),new testReject());
-            fail("ThreadPoolExecutor constructor should throw an IllegalArgumentException");		
+        try {
+            new ThreadPoolExecutor(2,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory(),new MyREHandler());
+            shouldThrow();
         }
-        catch (IllegalArgumentException i20){}
+        catch (IllegalArgumentException success){}
     }
 
-    //---- Tests if workQueue is set to null
+    /** Throws if workQueue is set to null */
     public void testNullPointerException6() {
-        try{
-            new ThreadPoolExecutor(1,2,100L,TimeUnit.MILLISECONDS,null,new testThread(),new testReject());
-            fail("ThreadPoolExecutor constructor should throw a NullPointerException");		
+        try {
+            new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,null,new MyThreadFactory(),new MyREHandler());
+            shouldThrow();
         }
-        catch (NullPointerException n6){}  
+        catch (NullPointerException success){}  
     }
 
-    //---- Tests if handler is set to null
+    /** Throws if handler is set to null */
     public void testNullPointerException7() {
-        try{
+        try {
             RejectedExecutionHandler r = null;
-            new ThreadPoolExecutor(1,2,100L,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new testThread(),r);
-            fail("ThreadPoolExecutor constructor should throw a NullPointerException");		
+            new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new MyThreadFactory(),r);
+            shouldThrow();
         }
-        catch (NullPointerException n7){}  
+        catch (NullPointerException success){}  
     }
 
-    //---- Tests if ThradFactory is set top null
+    /** Throws if ThreadFactory is set top null */
     public void testNullPointerException8() {
-        try{
+        try {
             ThreadFactory f = null;
-            new ThreadPoolExecutor(1,2,100L,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new testReject());
-            fail("ThreadPoolExecutor constructor should throw a NullPointerException");		
+            new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new MyREHandler());
+            shouldThrow();
         }
-        catch (NullPointerException n8){}  
+        catch (NullPointerException successdn8){}  
     }
     
 
     /**
-     *  Test to verify execute will throw RejectedExcutionException
+     *   execute will throw RejectedExcutionException
      *  ThreadPoolExecutor will throw one when more runnables are
      *  executed then will fit in the Queue.
      */
-    public void testRejectedExecutedException(){
+    public void testRejectedExecutionException() {
         ThreadPoolExecutor tpe = null;
-        try{
-	    tpe = new ThreadPoolExecutor(1,1,100,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
+        try {
+	    tpe = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
         } catch(Exception e){}
         tpe.shutdown();
-	try{
-	    tpe.execute(new Runnable(){
-		    public void run(){
-			try{
-			    Thread.sleep(1000);
-			} catch(InterruptedException e){}
-		    }
-		});
-	    fail("ThreadPoolExecutor - void execute(Runnable) should throw RejectedExecutionException");
+	try {
+	    tpe.execute(new NoOpRunnable());
+	    shouldThrow();
 	} catch(RejectedExecutionException success){}
 	
-	
+	joinPool(tpe);
     }
     
     /**
-     *  Test to verify setCorePoolSize will throw IllegalArgumentException
+     *   setCorePoolSize will throw IllegalArgumentException
      *  when given a negative 
      */
-    public void testIllegalArgumentException1(){
+    public void testCorePoolSizeIllegalArgumentException() {
 	ThreadPoolExecutor tpe = null;
-	try{
-	    tpe = new ThreadPoolExecutor(1,2,100,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
+	try {
+	    tpe = new ThreadPoolExecutor(1,2,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
 	} catch(Exception e){}
-	try{
+	try {
 	    tpe.setCorePoolSize(-1);
-	    fail("ThreadPoolExecutor - void setCorePoolSize(int) should throw IllegalArgumentException");
+	    shouldThrow();
 	} catch(IllegalArgumentException success){
         } finally {
             tpe.shutdown();
         }
+        joinPool(tpe);
     }   
 
     
     /**
-     *  Test to verify setMaximumPoolSize(int) will throw IllegalArgumentException
+     *   setMaximumPoolSize(int) will throw IllegalArgumentException
      *  if given a value less the it's actual core pool size
      */  
-    public void testIllegalArgumentException2(){
+    public void testMaximumPoolSizeIllegalArgumentException() {
         ThreadPoolExecutor tpe = null;
-        try{
-            tpe = new ThreadPoolExecutor(2,3,100,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
+        try {
+            tpe = new ThreadPoolExecutor(2,3,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
         } catch(Exception e){}
-        try{
+        try {
             tpe.setMaximumPoolSize(1);
-            fail("ThreadPoolExecutor - void setMaximumPoolSize(int) should throw IllegalArgumentException");
+            shouldThrow();
         } catch(IllegalArgumentException success){
         } finally {
             tpe.shutdown();
         }
+        joinPool(tpe);
     }
     
     /**
-     *  Test to verify that setMaximumPoolSize will throw IllegalArgumentException
+     *   setMaximumPoolSize will throw IllegalArgumentException
      *  if given a negative number
      */
-    public void testIllegalArgumentException2SP(){
+    public void testMaximumPoolSizeIllegalArgumentException2() {
         ThreadPoolExecutor tpe = null;
-        try{
-            tpe = new ThreadPoolExecutor(2,3,100,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
+        try {
+            tpe = new ThreadPoolExecutor(2,3,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
         } catch(Exception e){}
-        try{
+        try {
             tpe.setMaximumPoolSize(-1);
-            fail("ThreadPoolExecutor - void setMaximumPoolSize(int) should throw IllegalArgumentException");
+            shouldThrow();
         } catch(IllegalArgumentException success){
         } finally {
             tpe.shutdown();
         }
+        joinPool(tpe);
     }
     
 
     /**
-     *  Test to verify setKeepAliveTime will throw IllegalArgumentException
+     *   setKeepAliveTime will throw IllegalArgumentException
      *  when given a negative value
      */
-    public void testIllegalArgumentException3(){
+    public void testKeepAliveTimeIllegalArgumentException() {
 	ThreadPoolExecutor tpe = null;
-        try{
-            tpe = new ThreadPoolExecutor(2,3,100,TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
+        try {
+            tpe = new ThreadPoolExecutor(2,3,SHORT_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
         } catch(Exception e){}
         
-	try{
+	try {
             tpe.setKeepAliveTime(-1,TimeUnit.MILLISECONDS);
-            fail("ThreadPoolExecutor - void setKeepAliveTime(long, TimeUnit) should throw IllegalArgumentException");
+            shouldThrow();
         } catch(IllegalArgumentException success){
         } finally {
             tpe.shutdown();
         }
+        joinPool(tpe);
     }
   
-    
-  
 }