--- jsr166/src/test/tck/ExecutorsTest.java	2003/11/01 18:37:02	1.8
+++ jsr166/src/test/tck/ExecutorsTest.java	2003/12/10 01:51:12	1.10
@@ -14,37 +14,25 @@ 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 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 {
@@ -187,420 +175,6 @@ public class ExecutorsTest extends JSR16
         }
     }
 
-    /**
-     * execute of runnable runs it to completion 
-     */
-    public void testExecuteRunnable() {
-        try {
-            Executor e = new DirectExecutor();
-            TrackedShortRunnable task = new TrackedShortRunnable();
-            assertFalse(task.done);
-            Future<String> future = Executors.execute(e, task, TEST_STRING);
-            String result = future.get();
-            assertTrue(task.done);
-            assertSame(TEST_STRING, result);
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
-    }
-
-    /**
-     * invoke of a runnable runs it to completion 
-     */
-    public void testInvokeRunnable() {
-        try {
-            Executor e = new DirectExecutor();
-            TrackedShortRunnable task = new TrackedShortRunnable();
-            assertFalse(task.done);
-            Executors.invoke(e, task);
-            assertTrue(task.done);
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
-    }
-
-    /**
-     * execute of a callable runs it to completion
-     */
-    public void testExecuteCallable() {
-        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();
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
-    }
-
-
-    /**
-     * execute of a privileged action runs it to completion
-     */
-    public void testExecutePrivilegedAction() {
-	Policy savedPolicy = Policy.getPolicy();
-        AdjustablePolicy policy = new AdjustablePolicy();
-        policy.addPermission(new RuntimePermission("getContextClassLoader"));
-        policy.addPermission(new RuntimePermission("setContextClassLoader"));
-	Policy.setPolicy(policy);
-        try {
-            Executor e = new DirectExecutor();
-            Future future = Executors.execute(e, new PrivilegedAction() {
-		    public Object run() {
-			return TEST_STRING;
-		    }});
-
-            Object result = future.get();
-            assertSame(TEST_STRING, result);
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
-	finally {
-	    Policy.setPolicy(savedPolicy);
-	}
-    }
-
-    /**
-     * execute of a privileged exception action runs it to completion
-     */
-    public void testExecutePrivilegedExceptionAction() {
-	Policy savedPolicy = Policy.getPolicy();
-        AdjustablePolicy policy = new AdjustablePolicy();
-        policy.addPermission(new RuntimePermission("getContextClassLoader"));
-        policy.addPermission(new RuntimePermission("setContextClassLoader"));
-	Policy.setPolicy(policy);
-        try {
-            Executor e = new DirectExecutor();
-            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
-		    public Object run() {
-			return TEST_STRING;
-		    }});
-
-            Object result = future.get();
-            assertSame(TEST_STRING, result);
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
-	finally {
-	    Policy.setPolicy(savedPolicy);
-	}
-    }
-
-    /**
-     * execute of a failed privileged exception action reports exception
-     */
-    public void testExecuteFailedPrivilegedExceptionAction() {
-	Policy savedPolicy = Policy.getPolicy();
-        AdjustablePolicy policy = new AdjustablePolicy();
-        policy.addPermission(new RuntimePermission("getContextClassLoader"));
-        policy.addPermission(new RuntimePermission("setContextClassLoader"));
-	Policy.setPolicy(policy);
-        try {
-            Executor e = new DirectExecutor();
-            Future future = Executors.execute(e, new PrivilegedExceptionAction() {
-		    public Object run() throws Exception {
-			throw new IndexOutOfBoundsException();
-		    }});
-
-            Object result = future.get();
-            shouldThrow();
-        }
-        catch (ExecutionException success) {
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
-	finally {
-	    Policy.setPolicy(savedPolicy);
-	}
-    }
-
-    /**
-     * invoke of a collable runs it to completion
-     */
-    public void testInvokeCallable() {
-        try {
-            Executor e = new DirectExecutor();
-            String result = Executors.invoke(e, new StringTask());
-
-            assertSame(TEST_STRING, result);
-        }
-        catch (ExecutionException ex) {
-            unexpectedException();
-        }
-        catch (InterruptedException ex) {
-            unexpectedException();
-        }
-    }
-
-    /**
-     * execute with null executor throws NPE
-     */
-    public void testNullExecuteRunnable() {
-        try {
-            TrackedShortRunnable task = new TrackedShortRunnable();
-            assertFalse(task.done);
-            Future<String> future = Executors.execute(null, task, TEST_STRING);
-            shouldThrow();
-        }
-        catch (NullPointerException success) {
-        }
-        catch (Exception ex) {
-            unexpectedException();
-        }
-    }
-
-    /**
-     * execute with a null runnable throws NPE
-     */
-    public void testExecuteNullRunnable() {
-        try {
-            Executor e = new DirectExecutor();
-            TrackedShortRunnable task = null;
-            Future<String> future = Executors.execute(e, task, TEST_STRING);
-            shouldThrow();
-        }
-        catch (NullPointerException success) {
-        }
-        catch (Exception ex) {
-            unexpectedException();
-        }
-    }
-
-    /**
-     * invoke of a null runnable throws NPE
-     */
-    public void testInvokeNullRunnable() {
-        try {
-            Executor e = new DirectExecutor();
-            TrackedShortRunnable task = null;
-            Executors.invoke(e, task);
-            shouldThrow();
-        }
-        catch (NullPointerException success) {
-        }
-        catch (Exception ex) {
-            unexpectedException();
-        }
-    }
-
-    /**
-     * execute of a null callable throws NPE
-     */
-    public void testExecuteNullCallable() {
-        try {
-            Executor e = new DirectExecutor();
-            StringTask t = null;
-            Future<String> future = Executors.execute(e, t);
-            shouldThrow();
-        }
-        catch (NullPointerException success) {
-        }
-        catch (Exception ex) {
-            unexpectedException();
-        }
-    }
-
-    /**
-     * invoke of a null callable throws NPE
-     */
-    public void testInvokeNullCallable() {
-        try {
-            Executor e = new DirectExecutor();
-            StringTask t = null;
-            String result = Executors.invoke(e, t);
-            shouldThrow();
-        }
-        catch (NullPointerException success) {
-        }
-        catch (Exception ex) {
-            unexpectedException();
-        }
-    }
-
-    /**
-     *  execute(Executor, Runnable) throws RejectedExecutionException
-     *  if saturated.
-     */
-    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);
-    }
-
-    /**
-     *  execute(Executor, Callable)throws RejectedExecutionException
-     *  if saturated.
-     */
-    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);
-    }
-
-
-    /**
-     *  invoke(Executor, Runnable) throws InterruptedException if
-     *  caller interrupted.
-     */
-    public void testInterruptedInvoke() {
-        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();
-                    }
-                    
-                }
-            }); 
-        try {
-            t.start();
-            Thread.sleep(SHORT_DELAY_MS);
-            t.interrupt();
-        } catch(Exception e){
-            unexpectedException();
-        }
-        joinPool(p);
-    }
-
-    /**
-     *  invoke(Executor, Runnable) throws ExecutionException if
-     *  runnable throws exception.
-     */
-    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);
-    }
-
-
-
-    /**
-     *  invoke(Executor, Callable) throws InterruptedException if
-     *  callable throws exception
-     */
-    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);
-    }
-
-    /**
-     *  invoke(Executor, Callable) will throw ExecutionException
-     *  if callable throws exception
-     */
-    public void testInvoke6() {
-        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
-
-        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);
-            }
-            
-            shouldThrow();
-        } 
-        catch(ExecutionException success){
-        } catch(Exception e) {
-            unexpectedException();
-        }
-        joinPool(p);
-    }
-
-
 
     /**
      *  timeouts from execute will time out if they compute too long.
@@ -648,33 +222,33 @@ public class ExecutorsTest extends JSR16
      * 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);
-	}
+        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);
+        }
     }
 
     /**
@@ -683,43 +257,43 @@ public class ExecutorsTest extends JSR16
      * access control context and context class loader
      */
     public void testPrivilegedThreadFactory() {
-	Policy savedPolicy = Policy.getPolicy();
+        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();
+        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);
-	}
+        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);
+        }
 
     }