--- jsr166/src/test/tck/ExecutorsTest.java 2003/08/31 19:24:55 1.1 +++ jsr166/src/test/tck/ExecutorsTest.java 2003/09/14 20:42:40 1.3 @@ -9,8 +9,9 @@ import junit.framework.*; import java.util.*; import java.util.concurrent.*; +import java.math.BigInteger; -public class ExecutorsTest extends TestCase{ +public class ExecutorsTest extends JSR166TestCase{ public static void main(String[] args) { junit.textui.TestRunner.run (suite()); @@ -21,79 +22,51 @@ public class ExecutorsTest extends TestC return new TestSuite(ExecutorsTest.class); } - private static long SHORT_DELAY_MS = 100; - private static long MEDIUM_DELAY_MS = 1000; - private static long LONG_DELAY_MS = 10000; - - class SleepRun implements Runnable { - public void run() { - try{ - Thread.sleep(MEDIUM_DELAY_MS); - } catch(InterruptedException e){ - fail("unexpected exception"); - } - } - } - - - class SleepCall implements Callable { - public Object call(){ - try{ - Thread.sleep(MEDIUM_DELAY_MS); - }catch(InterruptedException e){ - fail("unexpected exception"); - } - return Boolean.TRUE; - } - } - - - /** - * Test to verify execute(Executor, Runnable) will throw + * 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 */ public void testExecute1(){ - ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(1)); + ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(1)); try{ for(int i = 0; i < 5; ++i){ - Executors.execute(p, new SleepRun(), Boolean.TRUE); + Executors.execute(p, new MediumRunnable(), Boolean.TRUE); } fail("should throw"); } catch(RejectedExecutionException success){} - p.shutdownNow(); + joinPool(p); } /** - * Test to verify execute(Executor, Callable) will throw + * 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 */ public void testExecute2(){ - ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(1)); + ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(1)); try{ for(int i = 0; i < 5; ++i) { - Executors.execute(p, new SleepCall()); + Executors.execute(p, new SmallCallable()); } fail("should throw"); }catch(RejectedExecutionException e){} - p.shutdownNow(); + joinPool(p); } /** - * Test to verify invoke(Executor, Runnable) throws InterruptedException + * invoke(Executor, Runnable) throws InterruptedException * A single use of invoke starts that will wait long enough * for the invoking thread to be interrupted */ public void testInvoke2(){ - final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); + final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); Thread t = new Thread(new Runnable() { public void run(){ try{ @@ -120,17 +93,17 @@ public class ExecutorsTest extends TestC }catch(Exception e){ fail("unexpected exception"); } - p.shutdownNow(); + joinPool(p); } /** - * Test to verify invoke(Executor, Runnable) will throw + * invoke(Executor, Runnable) will throw * ExecutionException An ExecutionException occurs when the * underlying Runnable throws an exception, here the * DivideByZeroException will cause an ExecutionException */ public void testInvoke3(){ - ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); + ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); try{ Runnable r = new Runnable(){ public void run(){ @@ -147,23 +120,23 @@ public class ExecutorsTest extends TestC } catch(Exception e){ fail("should throw EE"); } - p.shutdownNow(); + joinPool(p); } /** - * Test to verify invoke(Executor, Callable) throws + * invoke(Executor, Callable) throws * InterruptedException A single use of invoke starts that will * wait long enough for the invoking thread to be interrupted */ public void testInvoke5(){ - final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); + final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); final Callable c = new Callable(){ public Object call(){ try{ - Executors.invoke(p, new SleepCall()); + Executors.invoke(p, new SmallCallable()); fail("should throw"); }catch(InterruptedException e){} catch(RejectedExecutionException e2){} @@ -190,16 +163,16 @@ public class ExecutorsTest extends TestC fail("unexpected exception"); } - p.shutdownNow(); + joinPool(p); } /** - * Test to verify invoke(Executor, Callable) will throw ExecutionException + * invoke(Executor, Callable) will throw ExecutionException * An ExecutionException occurs when the underlying Runnable throws * an exception, here the DivideByZeroException will cause an ExecutionException */ public void testInvoke6(){ - ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,100L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); + ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); try{ Callable c = new Callable(){ @@ -217,7 +190,7 @@ public class ExecutorsTest extends TestC }catch(RejectedExecutionException e){} catch(InterruptedException e2){} catch(ExecutionException e3){} - p.shutdownNow(); + joinPool(p); } public void testExecuteRunnable () { @@ -310,5 +283,89 @@ public class ExecutorsTest extends TestC } } + /** + * Check that timeouts from execute will time out if they compute + * too long. + */ + + public void testTimedCallable() { + int N = 10000; + ExecutorService executor = Executors.newSingleThreadExecutor(); + List> tasks = new ArrayList>(N); + try { + long startTime = System.currentTimeMillis(); + + long i = 0; + while (tasks.size() < N) { + tasks.add(new TimedCallable(executor, new Fib(i), 1)); + i += 10; + } + + int iters = 0; + BigInteger sum = BigInteger.ZERO; + for (Iterator> it = tasks.iterator(); it.hasNext();) { + try { + ++iters; + sum = sum.add(it.next().call()); + } + catch (TimeoutException success) { + assertTrue(iters > 0); + return; + } + catch (Exception e) { + fail("unexpected exception: " + e); + } + } + // if by chance we didn't ever time out, total time must be small + long elapsed = System.currentTimeMillis() - startTime; + assertTrue(elapsed < N); + } + finally { + joinPool(executor); + } + } + + + static class TimedCallable implements Callable { + private final Executor exec; + private final Callable func; + private final long msecs; + + TimedCallable(Executor exec, Callable func, long msecs) { + this.exec = exec; + this.func = func; + this.msecs = msecs; + } + + public T call() throws Exception { + Future ftask = Executors.execute(exec, func); + try { + return ftask.get(msecs, TimeUnit.MILLISECONDS); + } finally { + ftask.cancel(true); + } + } + } + + + private static class Fib implements Callable { + private final BigInteger n; + Fib(long n) { + if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n); + this.n = BigInteger.valueOf(n); + } + public BigInteger call() { + BigInteger f1 = BigInteger.ONE; + BigInteger f2 = f1; + for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) { + BigInteger t = f1.add(f2); + f1 = f2; + f2 = t; + } + return f1; + } + }; + + }