--- jsr166/src/test/tck/ScheduledExecutorTest.java	2003/08/31 19:24:55	1.1
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2003/09/20 18:20:08	1.5
@@ -9,123 +9,117 @@ import junit.framework.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-public class ScheduledExecutorTest extends TestCase{
-    
-    boolean flag = false;
-
+public class ScheduledExecutorTest extends JSR166TestCase {
     public static void main(String[] args) {
 	junit.textui.TestRunner.run (suite());	
     }
-    
-
     public static Test suite() {
 	return new TestSuite(ScheduledExecutorTest.class);
     }
 
-    private static long SHORT_DELAY_MS = 100; 
-    private static long MEDIUM_DELAY_MS = 1000;
-    private static long LONG_DELAY_MS = 10000; 
-
     static class MyRunnable implements Runnable {
-        volatile boolean waiting = true;
         volatile boolean done = false;
-        public void run(){
-            try{
-                Thread.sleep(MEDIUM_DELAY_MS);
-                waiting = false;
+        public void run() {
+            try {
+                Thread.sleep(SMALL_DELAY_MS);
                 done = true;
-            } catch(Exception e){}
+            } catch(Exception e){
+            }
         }
     }
 
     static class MyCallable implements Callable {
-        volatile boolean waiting = true;
         volatile boolean done = false;
-        public Object call(){
-            try{
-                Thread.sleep(MEDIUM_DELAY_MS);
-                waiting = false;
+        public Object call() {
+            try {
+                Thread.sleep(SMALL_DELAY_MS);
                 done = true;
-            }catch(Exception e){}
+            } catch(Exception e){
+            }
             return Boolean.TRUE;
         }
     }
 
     /**
-     *  Test to verify execute successfully runs the given Runnable
+     *
      */
-    public void testExecute(){
-	try{
+    public void testExecute() {
+	try {
             MyRunnable runnable =new MyRunnable();
-            ScheduledExecutor one = new ScheduledExecutor(1);
-	    one.execute(runnable);
-	    Thread.sleep(100);
-	    assertTrue(runnable.waiting);
-	    one.shutdown();
-            // make sure the Runnable has time to complete
-	    try{Thread.sleep(1010);}catch(InterruptedException e){}
-            assertFalse(runnable.waiting);
+            ScheduledExecutor p1 = new ScheduledExecutor(1);
+	    p1.execute(runnable);
+	    assertFalse(runnable.done);
+	    Thread.sleep(SHORT_DELAY_MS);
+	    p1.shutdown();
+	    try {
+                Thread.sleep(MEDIUM_DELAY_MS);
+            } catch(InterruptedException e){
+                unexpectedException();
+            }
 	    assertTrue(runnable.done);
-            one.shutdown();
+            p1.shutdown();
+            joinPool(p1);
         }
 	catch(Exception e){
-            fail("unexpected exception");
+            unexpectedException();
         }
+        
     }
 
     /**
-     *  Test to verify schedule successfully runs the given Callable.
-     *  The waiting flag shows that the Callable is not started until
-     *  immediately.
+     *
      */
-    public void testSchedule1(){
-	try{
+    public void testSchedule1() {
+	try {
             MyCallable callable = new MyCallable();
-            ScheduledExecutor one = new ScheduledExecutor(1);
-	    Future f = one.schedule(callable, 500, TimeUnit.MILLISECONDS);
-            //	    Thread.sleep(505);
-	    assertTrue(callable.waiting);
-	    Thread.sleep(2000);
+            ScheduledExecutor p1 = new ScheduledExecutor(1);
+	    Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+	    assertFalse(callable.done);
+	    Thread.sleep(MEDIUM_DELAY_MS);
 	    assertTrue(callable.done);
 	    assertEquals(Boolean.TRUE, f.get());
-            one.shutdown();
-	}catch(RejectedExecutionException e){}
-	catch(Exception e){}
+            p1.shutdown();
+            joinPool(p1);
+	} catch(RejectedExecutionException e){}
+	catch(Exception e){
+            unexpectedException();
+        }
     }
 
     /**
-     *  Another version of schedule, only using Runnable instead of Callable
+     *  
      */
-    public void testSchedule3(){
-	try{
+    public void testSchedule3() {
+	try {
             MyRunnable runnable = new MyRunnable();
-            ScheduledExecutor one = new ScheduledExecutor(1);
-	    one.schedule(runnable, 500, TimeUnit.MILLISECONDS);
-	    Thread.sleep(50);
-	    assertTrue(runnable.waiting);
-	    Thread.sleep(2000);
+            ScheduledExecutor p1 = new ScheduledExecutor(1);
+	    p1.schedule(runnable, SMALL_DELAY_MS, TimeUnit.MILLISECONDS);
+	    Thread.sleep(SHORT_DELAY_MS);
+	    assertFalse(runnable.done);
+	    Thread.sleep(MEDIUM_DELAY_MS);
 	    assertTrue(runnable.done);
-            one.shutdown();
+            p1.shutdown();
+            joinPool(p1);
         } catch(Exception e){
-            fail("unexpected exception");
+            unexpectedException();
         }
     }
     
     /**
-     *  The final version of schedule, using both long, TimeUnit and Runnable
+     *
      */
-    public void testSchedule4(){
-	try{
+    public void testSchedule4() {
+	try {
             MyRunnable runnable = new MyRunnable();
-            ScheduledExecutor one = new ScheduledExecutor(1);
-	    one.schedule(runnable, 500, TimeUnit.MILLISECONDS);
-            //	    Thread.sleep(505);
-	    assertTrue(runnable.waiting);
-	    Thread.sleep(2000);
+            ScheduledExecutor p1 = new ScheduledExecutor(1);
+	    p1.schedule(runnable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+	    assertFalse(runnable.done);
+	    Thread.sleep(MEDIUM_DELAY_MS);
 	    assertTrue(runnable.done);
-            one.shutdown();
+            p1.shutdown();
+            joinPool(p1);
         } catch(Exception e){
-            fail("unexpected exception");
+            unexpectedException();
         }
     }
     
@@ -133,131 +127,414 @@ public class ScheduledExecutorTest exten
     // exception tests
 
     /**
-     *  Test to verify schedule(Runnable, long) throws RejectedExecutionException
+     *   schedule(Runnable, long) throws RejectedExecutionException
      *  This occurs on an attempt to schedule a task on a shutdown executor
      */
-    public void testSchedule1_RejectedExecutionException(){
-        try{
-            ScheduledExecutor se = new ScheduledExecutor(1);
+    public void testSchedule1_RejectedExecutionException() {
+        ScheduledExecutor se = new ScheduledExecutor(1);
+        try {
             se.shutdown();
-            se.schedule(new Runnable(){
-                    public void run(){}
-                }, 10000, TimeUnit.MILLISECONDS);
-            fail("shoud throw");
-        }catch(RejectedExecutionException e){}    
+            se.schedule(new NoOpRunnable(),
+                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
+            shouldThrow();
+        } catch(RejectedExecutionException success){
+        }
+        joinPool(se);
+
     }
 
     /**
-     *  Test to verify schedule(Callable, long, TimeUnit) throws RejectedExecutionException
+     *   schedule(Callable, long, TimeUnit) throws RejectedExecutionException
      *  This occurs on an attempt to schedule a task on a shutdown executor
      */
-    public void testSchedule2_RejectedExecutionException(){
-        try{
-            ScheduledExecutor se = new ScheduledExecutor(1);
+    public void testSchedule2_RejectedExecutionException() {
+        ScheduledExecutor se = new ScheduledExecutor(1);
+        try {
             se.shutdown();
-            se.schedule(new Callable(){
-                    public Object call(){ 
-                        return Boolean.TRUE;
-                    }
-                }, (long)100, TimeUnit.SECONDS);
-            fail("should throw");
-        }catch(RejectedExecutionException e){}    
+            se.schedule(new NoOpCallable(),
+                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
+            shouldThrow();
+        } catch(RejectedExecutionException success){
+        }
+        joinPool(se);
     }
 
     /**
-     *  Test to verify schedule(Callable, long) throws RejectedExecutionException
+     *   schedule(Callable, long) throws RejectedExecutionException
      *  This occurs on an attempt to schedule a task on a shutdown executor
      */
-     public void testSchedule3_RejectedExecutionException(){
-        try{
-            ScheduledExecutor se = new ScheduledExecutor(1);
+     public void testSchedule3_RejectedExecutionException() {
+         ScheduledExecutor se = new ScheduledExecutor(1);
+         try {
             se.shutdown();
-            se.schedule(new Callable(){
-                    public Object call(){ 
-                        return Boolean.TRUE;
-                    }
-                },  10000, TimeUnit.MILLISECONDS);
-            fail("should throw");
-        }catch(RejectedExecutionException e){}    
+            se.schedule(new NoOpCallable(),
+                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
+            shouldThrow();
+        } catch(RejectedExecutionException success){
+        } 
+         joinPool(se);
     }
 
     /**
-     *  Test to verify scheduleAtFixedRate(Runnable, long, long, TimeUnit) throws 
+     *   scheduleAtFixedRate(Runnable, long, long, TimeUnit) throws 
      *  RejectedExecutionException.
      *  This occurs on an attempt to schedule a task on a shutdown executor
      */
-    public void testScheduleAtFixedRate1_RejectedExecutionException(){
-        try{
-            ScheduledExecutor se = new ScheduledExecutor(1);
+    public void testScheduleAtFixedRate1_RejectedExecutionException() {
+        ScheduledExecutor se = new ScheduledExecutor(1);
+        try {
             se.shutdown();
-            se.scheduleAtFixedRate(new Runnable(){
-                    public void run(){}
-                }, 100, 100, TimeUnit.SECONDS);
-            fail("should throw");
-        }catch(RejectedExecutionException e){}    
+            se.scheduleAtFixedRate(new NoOpRunnable(),
+                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
+            shouldThrow();
+        } catch(RejectedExecutionException success){
+        } 
+        joinPool(se);
     }
     
     /**
-     *  Test to verify scheduleAtFixedRate(Runnable, long, long, TimeUnit) throws 
+     *   scheduleAtFixedRate(Runnable, long, long, TimeUnit) throws 
      *  RejectedExecutionException.
      *  This occurs on an attempt to schedule a task on a shutdown executor
      */
-    public void testScheduleAtFixedRate2_RejectedExecutionException(){
-        try{
-            ScheduledExecutor se = new ScheduledExecutor(1);
+    public void testScheduleAtFixedRate2_RejectedExecutionException() {
+        ScheduledExecutor se = new ScheduledExecutor(1);
+        try {
             se.shutdown();
-            se.scheduleAtFixedRate(new Runnable(){
-                    public void run(){}
-                },  1, 100, TimeUnit.SECONDS);
-            fail("should throw");
-        }catch(RejectedExecutionException e){}    
+            se.scheduleAtFixedRate(new NoOpRunnable(),
+                                   1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
+            shouldThrow();
+        } catch(RejectedExecutionException success){
+        } 
+        joinPool(se);
     }
 
     /**
-     *  Test to verify scheduleWithFixedDelay(Runnable, long, long, TimeUnit) throws 
+     *   scheduleWithFixedDelay(Runnable, long, long, TimeUnit) throws 
      *  RejectedExecutionException.
      *  This occurs on an attempt to schedule a task on a shutdown executor
      */
-    public void testScheduleWithFixedDelay1_RejectedExecutionException(){
-        try{
-            ScheduledExecutor se = new ScheduledExecutor(1);
+    public void testScheduleWithFixedDelay1_RejectedExecutionException() {
+        ScheduledExecutor se = new ScheduledExecutor(1);
+        try {
             se.shutdown();
-            se.scheduleWithFixedDelay(new Runnable(){
-                    public void run(){}
-                }, 100, 100, TimeUnit.SECONDS);
-            fail("should throw");
-        }catch(RejectedExecutionException e){}    
+            se.scheduleWithFixedDelay(new NoOpRunnable(),
+                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
+            shouldThrow();
+        } catch(RejectedExecutionException success){
+        } 
+        joinPool(se);
     }
 
     /**
-     *  Test to verify scheduleWithFixedDelay(Runnable, long, long, TimeUnit) throws 
+     *   scheduleWithFixedDelay(Runnable, long, long, TimeUnit) throws 
      *  RejectedExecutionException.
      *  This occurs on an attempt to schedule a task on a shutdown executor
      */
-     public void testScheduleWithFixedDelay2_RejectedExecutionException(){
-        try{
-            ScheduledExecutor se = new ScheduledExecutor(1);
+     public void testScheduleWithFixedDelay2_RejectedExecutionException() {
+         ScheduledExecutor se = new ScheduledExecutor(1);
+        try {
             se.shutdown();
-            se.scheduleWithFixedDelay(new Runnable(){
-                    public void run(){}
-                },  1, 100, TimeUnit.SECONDS);
-            fail("should throw");
-        }catch(RejectedExecutionException e){}    
+            se.scheduleWithFixedDelay(new NoOpRunnable(),
+                                      1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
+            shouldThrow();
+        } catch(RejectedExecutionException success){
+        } 
+        joinPool(se);
     }
 
     /**
-     *  Test to verify execute throws RejectedExecutionException
+     *   execute throws RejectedExecutionException
      *  This occurs on an attempt to schedule a task on a shutdown executor
      */
-    public void testExecute_RejectedExecutionException(){
-        try{
-            ScheduledExecutor se = new ScheduledExecutor(1);
+    public void testExecute_RejectedExecutionException() {
+        ScheduledExecutor se = new ScheduledExecutor(1);
+        try {
             se.shutdown();
-            se.execute(new Runnable(){
-                    public void run(){}
-                });
-            fail("should throw");
-        }catch(RejectedExecutionException e){}    
+            se.execute(new NoOpRunnable());
+            shouldThrow();
+        } catch(RejectedExecutionException success){
+        } 
+        joinPool(se);
+    }
+
+    /**
+     *   getActiveCount gives correct values
+     */
+    public void testGetActiveCount() {
+        ScheduledExecutor p2 = new ScheduledExecutor(2);
+        assertEquals(0, p2.getActiveCount());
+        p2.execute(new SmallRunnable());
+        try {
+            Thread.sleep(SHORT_DELAY_MS);
+        } catch(Exception e){
+            unexpectedException();
+        }
+        assertEquals(1, p2.getActiveCount());
+        joinPool(p2);
+    }
+    
+    /**
+     *   getCompleteTaskCount gives correct values
+     */
+    public void testGetCompletedTaskCount() {
+        ScheduledExecutor p2 = new ScheduledExecutor(2);
+        assertEquals(0, p2.getCompletedTaskCount());
+        p2.execute(new SmallRunnable());
+        try {
+            Thread.sleep(MEDIUM_DELAY_MS);
+        } catch(Exception e){
+            unexpectedException();
+        }
+        assertEquals(1, p2.getCompletedTaskCount());
+        joinPool(p2);
+    }
+    
+    /**
+     *   getCorePoolSize gives correct values
+     */
+    public void testGetCorePoolSize() {
+        ScheduledExecutor p1 = new ScheduledExecutor(1);
+        assertEquals(1, p1.getCorePoolSize());
+        joinPool(p1);
+    }
+    
+    /**
+     *   getLargestPoolSize gives correct values
+     */
+    public void testGetLargestPoolSize() {
+        ScheduledExecutor p2 = new ScheduledExecutor(2);
+        assertEquals(0, p2.getLargestPoolSize());
+        p2.execute(new SmallRunnable());
+        p2.execute(new SmallRunnable());
+        try {
+            Thread.sleep(SHORT_DELAY_MS);
+        } catch(Exception e){
+            unexpectedException();
+        }
+        assertEquals(2, p2.getLargestPoolSize());
+        joinPool(p2);
+    }
+    
+    /**
+     *   getPoolSize gives correct values
+     */
+    public void testGetPoolSize() {
+        ScheduledExecutor p1 = new ScheduledExecutor(1);
+        assertEquals(0, p1.getPoolSize());
+        p1.execute(new SmallRunnable());
+        assertEquals(1, p1.getPoolSize());
+        joinPool(p1);
+    }
+    
+    /**
+     *   getTaskCount gives correct values
+     */
+    public void testGetTaskCount() {
+        ScheduledExecutor p1 = new ScheduledExecutor(1);
+        assertEquals(0, p1.getTaskCount());
+        for(int i = 0; i < 5; i++)
+            p1.execute(new SmallRunnable());
+        try {
+            Thread.sleep(SHORT_DELAY_MS);
+        } catch(Exception e){
+            unexpectedException();
+        }
+        assertEquals(5, p1.getTaskCount());
+        joinPool(p1);
+    }
+    
+    /**
+     *   isShutDown gives correct values
+     */
+    public void testIsShutdown() {
+        
+	ScheduledExecutor p1 = new ScheduledExecutor(1);
+        try {
+            assertFalse(p1.isShutdown());
+        }
+        finally {
+            p1.shutdown();
+        }
+	assertTrue(p1.isShutdown());
+    }
+
+        
+    /**
+     *  isTerminated gives correct values
+     */
+    public void testIsTerminated() {
+	ScheduledExecutor p1 = new ScheduledExecutor(1);
+        try {
+            p1.execute(new SmallRunnable());
+        } finally {
+            p1.shutdown();
+        }
+        try {
+	    assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
+            assertTrue(p1.isTerminated());
+	} catch(Exception e){
+            unexpectedException();
+        }	
+    }
+
+    /**
+     *  isTerminating gives correct values
+     */
+    public void testIsTerminating() {
+	ScheduledExecutor p1 = new ScheduledExecutor(1);
+        assertFalse(p1.isTerminating());
+        try {
+            p1.execute(new SmallRunnable());
+            assertFalse(p1.isTerminating());
+        } finally {
+            p1.shutdown();
+        }
+        try {
+	    assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
+            assertTrue(p1.isTerminated());
+            assertFalse(p1.isTerminating());
+	} catch(Exception e){
+            unexpectedException();
+        }	
+    }
+
+    /**
+     *   that purge correctly removes cancelled tasks
+     *  from the queue
+     */
+    public void testPurge() {
+        ScheduledExecutor p1 = new ScheduledExecutor(1);
+        ScheduledCancellable[] tasks = new ScheduledCancellable[5];
+        for(int i = 0; i < 5; i++){
+            tasks[i] = p1.schedule(new SmallRunnable(), 1, TimeUnit.MILLISECONDS);
+        }
+        int max = 5;
+        if (tasks[4].cancel(true)) --max;
+        if (tasks[3].cancel(true)) --max;
+        p1.purge();
+        long count = p1.getTaskCount();
+        assertTrue(count > 0 && count <= max);
+        joinPool(p1);
+    }
+
+    /**
+     *   shutDownNow returns a list
+     *  containing the correct number of elements
+     */
+    public void testShutDownNow() {
+	ScheduledExecutor p1 = new ScheduledExecutor(1);
+        for(int i = 0; i < 5; i++)
+            p1.schedule(new SmallRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+        List l = p1.shutdownNow();
+	assertTrue(p1.isShutdown());
+	assertTrue(l.size() > 0 && l.size() <= 5);
+        joinPool(p1);
+    }
+
+    /**
+     *
+     */
+    public void testShutDown1() {
+        try {
+            ScheduledExecutor p1 = new ScheduledExecutor(1);
+            assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
+            assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
+
+            ScheduledCancellable[] tasks = new ScheduledCancellable[5];
+            for(int i = 0; i < 5; i++)
+                tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+            p1.shutdown();
+            BlockingQueue q = p1.getQueue();
+            for (Iterator it = q.iterator(); it.hasNext();) {
+                ScheduledCancellable t = (ScheduledCancellable)it.next();
+                assertFalse(t.isCancelled());
+            }
+            assertTrue(p1.isShutdown());
+            Thread.sleep(SMALL_DELAY_MS);
+            for (int i = 0; i < 5; ++i) {
+                assertTrue(tasks[i].isDone());
+                assertFalse(tasks[i].isCancelled());
+            }
+            
+        }
+        catch(Exception ex) {
+            unexpectedException();
+        }
+    }
+
+
+    /**
+     *
+     */
+    public void testShutDown2() {
+        try {
+            ScheduledExecutor p1 = new ScheduledExecutor(1);
+            p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+            ScheduledCancellable[] tasks = new ScheduledCancellable[5];
+            for(int i = 0; i < 5; i++)
+                tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+            p1.shutdown();
+            assertTrue(p1.isShutdown());
+            BlockingQueue q = p1.getQueue();
+            assertTrue(q.isEmpty());
+            Thread.sleep(SMALL_DELAY_MS);
+            assertTrue(p1.isTerminated());
+        }
+        catch(Exception ex) {
+            unexpectedException();
+        }
+    }
+
+
+    /**
+     *
+     */
+    public void testShutDown3() {
+        try {
+            ScheduledExecutor p1 = new ScheduledExecutor(1);
+            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
+            ScheduledCancellable task =
+                p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
+            p1.shutdown();
+            assertTrue(p1.isShutdown());
+            BlockingQueue q = p1.getQueue();
+            assertTrue(q.isEmpty());
+            Thread.sleep(SHORT_DELAY_MS);
+            assertTrue(p1.isTerminated());
+        }
+        catch(Exception ex) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     *
+     */
+    public void testShutDown4() {
+        ScheduledExecutor p1 = new ScheduledExecutor(1);
+        try {
+            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
+            ScheduledCancellable task =
+                p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
+            assertFalse(task.isCancelled());
+            p1.shutdown();
+            assertFalse(task.isCancelled());
+            assertFalse(p1.isTerminated());
+            assertTrue(p1.isShutdown());
+            Thread.sleep(SHORT_DELAY_MS);
+            assertFalse(task.isCancelled());
+            task.cancel(true);
+            assertTrue(task.isCancelled());
+            Thread.sleep(SHORT_DELAY_MS);
+            assertTrue(p1.isTerminated());
+        }
+        catch(Exception ex) {
+            unexpectedException();
+        }
+        finally {
+            p1.shutdownNow();
+        }
     }
 
 }