--- jsr166/src/test/tck/ExecutorsTest.java	2003/09/20 18:20:07	1.4
+++ jsr166/src/test/tck/ExecutorsTest.java	2003/12/10 01:51:12	1.10
@@ -10,48 +10,29 @@ import junit.framework.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.math.BigInteger;
+import java.security.*;
 
 public class ExecutorsTest extends JSR166TestCase{
-   
     public static void main(String[] args) {
-	junit.textui.TestRunner.run (suite());	
+        junit.textui.TestRunner.run (suite());  
     }
     public static Test suite() {
-	return new TestSuite(ExecutorsTest.class);
-    }
-
-    private static final String TEST_STRING = "a test string";
-
-    private static class MyTask implements Runnable {
-        public void run() { completed = true; }
-        public boolean isCompleted() { return completed; }
-        public void reset() { completed = false; }
-        private boolean completed = false;
-    }
-
-    private static class StringTask implements Callable<String> {
-        public String call() { return TEST_STRING; }
-    }
-
-    static class DirectExecutor implements Executor {
-        public void execute(Runnable r) {
-            r.run();
-        }
+        return new TestSuite(ExecutorsTest.class);
     }
 
     static class TimedCallable<T> implements Callable<T> {
-        private final Executor exec;
+        private final ExecutorService exec;
         private final Callable<T> func;
         private final long msecs;
         
-        TimedCallable(Executor exec, Callable<T> func, long msecs) {
+        TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
             this.exec = exec;
             this.func = func;
             this.msecs = msecs;
         }
         
         public T call() throws Exception {
-            Future<T> ftask = Executors.execute(exec, func);
+            Future<T> ftask = exec.submit(func);
             try {
                 return ftask.get(msecs, TimeUnit.MILLISECONDS);
             } finally {
@@ -79,255 +60,122 @@ public class ExecutorsTest extends JSR16
         }
     };
 
-
-
     /**
-     *   execute(Executor, Runnable) will throw
-     *  RejectedExecutionException Attempting to execute a runnable on
-     *  a full ThreadPool will cause such an exception here, up to 5
-     *  runnables are attempted on a pool capable on handling one
-     *  until it throws an exception
+     * A newCachedThreadPool can execute runnables
      */
-    public void testExecute1() {
-        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
-        try {
-            
-            for(int i = 0; i < 5; ++i){
-                Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
-            }
-            shouldThrow();
-        } catch(RejectedExecutionException success){}
-        joinPool(p);
+    public void testNewCachedThreadPool1() {
+        ExecutorService e = Executors.newCachedThreadPool();
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.shutdown();
     }
 
     /**
-     *   execute(Executor, Callable) will throw
-     *  RejectedExecutionException Attempting to execute a callable on
-     *  a full ThreadPool will cause such an exception here, up to 5
-     *  runnables are attempted on a pool capable on handling one
-     *  until it throws an exception
+     * A newCachedThreadPool with given ThreadFactory can execute runnables
      */
-    public void testExecute2() {
-         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
-        try {
-            for(int i = 0; i < 5; ++i) {
-                Executors.execute(p, new SmallCallable());
-            }
-            shouldThrow();
-        } catch(RejectedExecutionException e){}
-        joinPool(p);
+    public void testNewCachedThreadPool2() {
+        ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.shutdown();
     }
 
-
     /**
-     *   invoke(Executor, Runnable) throws InterruptedException
-     *  A single use of invoke starts that will wait long enough
-     *  for the invoking thread to be interrupted
+     * A newCachedThreadPool with null ThreadFactory throws NPE
      */
-    public void testInvoke2() {
-        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        Executors.invoke(p,new Runnable() {
-                                public void run() {
-                                    try {
-                                        Thread.sleep(MEDIUM_DELAY_MS);
-                                        shouldThrow();
-                                    } catch(InterruptedException e){
-                                    }
-                                }
-                            });
-                    } catch(InterruptedException success){
-                    } catch(Exception e) {
-                        unexpectedException();
-                    }
-                    
-                }
-            }); 
+    public void testNewCachedThreadPool3() {
         try {
-            t.start();
-            Thread.sleep(SHORT_DELAY_MS);
-            t.interrupt();
-        } catch(Exception e){
-            unexpectedException();
+            ExecutorService e = Executors.newCachedThreadPool(null);
+            shouldThrow();
+        }
+        catch(NullPointerException success) {
         }
-        joinPool(p);
     }
 
+
     /**
-     *   invoke(Executor, Runnable) will throw
-     *  ExecutionException An ExecutionException occurs when the
-     *  underlying Runnable throws an exception, here the
-     *  DivideByZeroException will cause an ExecutionException
+     * A new SingleThreadExecutor can execute runnables
      */
-    public void testInvoke3() {
-        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        try {
-            Runnable r = new Runnable() {
-                    public void run() {
-                        int i = 5/0;
-                    }
-                };
-            
-            for(int i =0; i < 5; i++){
-                Executors.invoke(p,r);
-            }
-            
-            shouldThrow();
-        } catch(ExecutionException success){
-        } catch(Exception e){
-            unexpectedException();
-        }
-        joinPool(p);
+    public void testNewSingleThreadExecutor1() {
+        ExecutorService e = Executors.newSingleThreadExecutor();
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.shutdown();
     }
 
-
-
     /**
-     *   invoke(Executor, Callable) throws
-     *  InterruptedException A single use of invoke starts that will
-     *  wait long enough for the invoking thread to be interrupted
+     * A new SingleThreadExecutor with given ThreadFactory can execute runnables
      */
-    public void testInvoke5() {
-        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-        
-        final Callable c = new Callable() {
-                public Object call() {
-                    try {
-                        Executors.invoke(p, new SmallCallable());
-                        shouldThrow();
-                    } catch(InterruptedException e){}
-                    catch(RejectedExecutionException e2){}
-                    catch(ExecutionException e3){}
-                    return Boolean.TRUE;
-                }
-            };
-
-
-        
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    try {
-                        c.call();
-                    } catch(Exception e){}
-                }
-          });
-        try {
-            t.start();
-            Thread.sleep(SHORT_DELAY_MS);
-            t.interrupt();
-            t.join();
-        } catch(InterruptedException e){
-            unexpectedException();
-        }
-        
-        joinPool(p);
+    public void testNewSingleThreadExecutor2() {
+        ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.shutdown();
     }
 
     /**
-     *   invoke(Executor, Callable) will throw ExecutionException
-     *  An ExecutionException occurs when the underlying Runnable throws
-     *  an exception, here the DivideByZeroException will cause an ExecutionException
+     * A new SingleThreadExecutor with null ThreadFactory throws NPE
      */
-    public void testInvoke6() {
-        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-
+    public void testNewSingleThreadExecutor3() {
         try {
-            Callable c = new Callable() {
-                    public Object call() {
-                        int i = 5/0;
-                        return Boolean.TRUE;
-                    }
-                };
-            
-            for(int i =0; i < 5; i++){
-                Executors.invoke(p,c);
-            }
-            
+            ExecutorService e = Executors.newSingleThreadExecutor(null);
             shouldThrow();
-        } catch(RejectedExecutionException e){}
-        catch(InterruptedException e2){}
-        catch(ExecutionException e3){}
-        joinPool(p);
+        }
+        catch(NullPointerException success) {
+        }
     }
 
     /**
-     *
+     * A new newFixedThreadPool can execute runnables
      */
-    public void testExecuteRunnable () {
-        try {
-            Executor e = new DirectExecutor();
-            MyTask task = new MyTask();
-            assertFalse(task.isCompleted());
-            Future<String> future = Executors.execute(e, task, TEST_STRING);
-            String result = future.get();
-            assertTrue(task.isCompleted());
-            assertSame(TEST_STRING, result);
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
+    public void testNewFixedThreadPool1() {
+        ExecutorService e = Executors.newFixedThreadPool(2);
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.shutdown();
     }
 
     /**
-     *
+     * A new newFixedThreadPool with given ThreadFactory can execute runnables
      */
-    public void testInvokeRunnable () {
-        try {
-            Executor e = new DirectExecutor();
-            MyTask task = new MyTask();
-            assertFalse(task.isCompleted());
-            Executors.invoke(e, task);
-            assertTrue(task.isCompleted());
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
+    public void testNewFixedThreadPool2() {
+        ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.execute(new NoOpRunnable());
+        e.shutdown();
     }
 
     /**
-     *
+     * A new newFixedThreadPool with null ThreadFactory throws NPE
      */
-    public void testExecuteCallable () {
+    public void testNewFixedThreadPool3() {
         try {
-            Executor e = new DirectExecutor();
-            Future<String> future = Executors.execute(e, new StringTask());
-            String result = future.get();
-            assertSame(TEST_STRING, result);
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
+            ExecutorService e = Executors.newFixedThreadPool(2, null);
+            shouldThrow();
         }
-        catch (InterruptedException ex) {
-            unexpectedException();
+        catch(NullPointerException success) {
         }
     }
 
     /**
-     *
+     * A new newFixedThreadPool with 0 threads throws IAE
      */
-    public void testInvokeCallable () {
+    public void testNewFixedThreadPool4() {
         try {
-            Executor e = new DirectExecutor();
-            String result = Executors.invoke(e, new StringTask());
-
-            assertSame(TEST_STRING, result);
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
+            ExecutorService e = Executors.newFixedThreadPool(0);
+            shouldThrow();
         }
-        catch (InterruptedException ex) {
-            unexpectedException();
+        catch(IllegalArgumentException success) {
         }
     }
 
+
     /**
      *  timeouts from execute will time out if they compute too long.
      */
@@ -369,6 +217,84 @@ public class ExecutorsTest extends JSR16
     }
 
     
+    /**
+     * ThreadPoolExecutor using defaultThreadFactory has
+     * specified group, priority, daemon status, and name
+     */
+    public void testDefaultThreadFactory() {
+        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
+        Runnable r = new Runnable() {
+                public void run() {
+                    Thread current = Thread.currentThread();
+                    threadAssertTrue(!current.isDaemon());
+                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
+                    ThreadGroup g = current.getThreadGroup();
+                    SecurityManager s = System.getSecurityManager();
+                    if (s != null)
+                        threadAssertTrue(g == s.getThreadGroup());
+                    else
+                        threadAssertTrue(g == egroup);
+                    String name = current.getName();
+                    threadAssertTrue(name.endsWith("thread-1"));
+                }
+            };
+        ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
+        
+        e.execute(r);
+        e.shutdown();
+        try {
+            Thread.sleep(SHORT_DELAY_MS);
+        } catch (Exception eX) {
+            unexpectedException();
+        } finally {
+            joinPool(e);
+        }
+    }
 
+    /**
+     * ThreadPoolExecutor using privilegedThreadFactory has
+     * specified group, priority, daemon status, name,
+     * access control context and context class loader
+     */
+    public void testPrivilegedThreadFactory() {
+        Policy savedPolicy = Policy.getPolicy();
+        AdjustablePolicy policy = new AdjustablePolicy();
+        policy.addPermission(new RuntimePermission("getContextClassLoader"));
+        policy.addPermission(new RuntimePermission("setContextClassLoader"));
+        Policy.setPolicy(policy);
+        final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
+        final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
+        final AccessControlContext thisacc = AccessController.getContext();
+        Runnable r = new Runnable() {
+                public void run() {
+                    Thread current = Thread.currentThread();
+                    threadAssertTrue(!current.isDaemon());
+                    threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
+                    ThreadGroup g = current.getThreadGroup();
+                    SecurityManager s = System.getSecurityManager();
+                    if (s != null)
+                        threadAssertTrue(g == s.getThreadGroup());
+                    else
+                        threadAssertTrue(g == egroup);
+                    String name = current.getName();
+                    threadAssertTrue(name.endsWith("thread-1"));
+                    threadAssertTrue(thisccl == current.getContextClassLoader());
+                    threadAssertTrue(thisacc.equals(AccessController.getContext()));
+                }
+            };
+        ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
+        
+        Policy.setPolicy(savedPolicy);
+        e.execute(r);
+        e.shutdown();
+        try {
+            Thread.sleep(SHORT_DELAY_MS);
+        } catch (Exception ex) {
+            unexpectedException();
+        } finally {
+            joinPool(e);
+        }
+
+    }
 
 }