--- jsr166/src/test/tck/ExecutorsTest.java 2003/09/14 20:42:40 1.3 +++ jsr166/src/test/tck/ExecutorsTest.java 2003/09/20 18:20:07 1.4 @@ -12,16 +12,75 @@ import java.util.concurrent.*; import java.math.BigInteger; public class ExecutorsTest extends JSR166TestCase{ - + public static void main(String[] args) { 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 { + public String call() { return TEST_STRING; } + } + + static class DirectExecutor implements Executor { + public void execute(Runnable r) { + r.run(); + } + } + + 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; + } + }; + + + /** * execute(Executor, Runnable) will throw * RejectedExecutionException Attempting to execute a runnable on @@ -29,14 +88,14 @@ public class ExecutorsTest extends JSR16 * runnables are attempted on a pool capable on handling one * until it throws an exception */ - public void testExecute1(){ + public void testExecute1() { ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(1)); - try{ + try { for(int i = 0; i < 5; ++i){ Executors.execute(p, new MediumRunnable(), Boolean.TRUE); } - fail("should throw"); + shouldThrow(); } catch(RejectedExecutionException success){} joinPool(p); } @@ -48,14 +107,14 @@ public class ExecutorsTest extends JSR16 * runnables are attempted on a pool capable on handling one * until it throws an exception */ - public void testExecute2(){ + public void testExecute2() { ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(1)); - try{ + try { for(int i = 0; i < 5; ++i) { Executors.execute(p, new SmallCallable()); } - fail("should throw"); - }catch(RejectedExecutionException e){} + shouldThrow(); + } catch(RejectedExecutionException e){} joinPool(p); } @@ -65,33 +124,33 @@ public class ExecutorsTest extends JSR16 * A single use of invoke starts that will wait long enough * for the invoking thread to be interrupted */ - public void testInvoke2(){ + public void testInvoke2() { 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{ - Executors.invoke(p,new Runnable(){ - public void run(){ - try{ + public void run() { + try { + Executors.invoke(p,new Runnable() { + public void run() { + try { Thread.sleep(MEDIUM_DELAY_MS); - fail("should throw"); - }catch(InterruptedException e){ + shouldThrow(); + } catch(InterruptedException e){ } } }); } catch(InterruptedException success){ } catch(Exception e) { - fail("unexpected exception"); + unexpectedException(); } } }); - try{ + try { t.start(); Thread.sleep(SHORT_DELAY_MS); t.interrupt(); - }catch(Exception e){ - fail("unexpected exception"); + } catch(Exception e){ + unexpectedException(); } joinPool(p); } @@ -102,11 +161,11 @@ public class ExecutorsTest extends JSR16 * underlying Runnable throws an exception, here the * DivideByZeroException will cause an ExecutionException */ - public void testInvoke3(){ + public void testInvoke3() { ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); - try{ - Runnable r = new Runnable(){ - public void run(){ + try { + Runnable r = new Runnable() { + public void run() { int i = 5/0; } }; @@ -115,10 +174,10 @@ public class ExecutorsTest extends JSR16 Executors.invoke(p,r); } - fail("should throw"); + shouldThrow(); } catch(ExecutionException success){ } catch(Exception e){ - fail("should throw EE"); + unexpectedException(); } joinPool(p); } @@ -130,15 +189,15 @@ public class ExecutorsTest extends JSR16 * InterruptedException A single use of invoke starts that will * wait long enough for the invoking thread to be interrupted */ - public void testInvoke5(){ + public void testInvoke5() { final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); - final Callable c = new Callable(){ - public Object call(){ - try{ + final Callable c = new Callable() { + public Object call() { + try { Executors.invoke(p, new SmallCallable()); - fail("should throw"); - }catch(InterruptedException e){} + shouldThrow(); + } catch(InterruptedException e){} catch(RejectedExecutionException e2){} catch(ExecutionException e3){} return Boolean.TRUE; @@ -147,20 +206,20 @@ public class ExecutorsTest extends JSR16 - Thread t = new Thread(new Runnable(){ - public void run(){ - try{ + Thread t = new Thread(new Runnable() { + public void run() { + try { c.call(); - }catch(Exception e){} + } catch(Exception e){} } }); - try{ + try { t.start(); Thread.sleep(SHORT_DELAY_MS); t.interrupt(); t.join(); - }catch(InterruptedException e){ - fail("unexpected exception"); + } catch(InterruptedException e){ + unexpectedException(); } joinPool(p); @@ -171,12 +230,12 @@ public class ExecutorsTest extends JSR16 * An ExecutionException occurs when the underlying Runnable throws * an exception, here the DivideByZeroException will cause an ExecutionException */ - public void testInvoke6(){ + public void testInvoke6() { ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10)); - try{ - Callable c = new Callable(){ - public Object call(){ + try { + Callable c = new Callable() { + public Object call() { int i = 5/0; return Boolean.TRUE; } @@ -186,108 +245,92 @@ public class ExecutorsTest extends JSR16 Executors.invoke(p,c); } - fail("should throw"); - }catch(RejectedExecutionException e){} + shouldThrow(); + } catch(RejectedExecutionException e){} catch(InterruptedException e2){} catch(ExecutionException e3){} joinPool(p); } + /** + * + */ public void testExecuteRunnable () { try { Executor e = new DirectExecutor(); - Task task = new Task(); - - assertFalse("task should not be complete", task.isCompleted()); - + MyTask task = new MyTask(); + assertFalse(task.isCompleted()); Future future = Executors.execute(e, task, TEST_STRING); String result = future.get(); - - assertTrue("task should be complete", task.isCompleted()); - assertSame("should return test string", TEST_STRING, result); + assertTrue(task.isCompleted()); + assertSame(TEST_STRING, result); } catch (ExecutionException ex) { - fail("Unexpected exception"); + unexpectedException(); } catch (InterruptedException ex) { - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testInvokeRunnable () { try { Executor e = new DirectExecutor(); - Task task = new Task(); - - assertFalse("task should not be complete", task.isCompleted()); - + MyTask task = new MyTask(); + assertFalse(task.isCompleted()); Executors.invoke(e, task); - - assertTrue("task should be complete", task.isCompleted()); + assertTrue(task.isCompleted()); } catch (ExecutionException ex) { - fail("Unexpected exception"); + unexpectedException(); } catch (InterruptedException ex) { - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testExecuteCallable () { try { Executor e = new DirectExecutor(); Future future = Executors.execute(e, new StringTask()); String result = future.get(); - - assertSame("should return test string", TEST_STRING, result); + assertSame(TEST_STRING, result); } catch (ExecutionException ex) { - fail("Unexpected exception"); + unexpectedException(); } catch (InterruptedException ex) { - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testInvokeCallable () { try { Executor e = new DirectExecutor(); String result = Executors.invoke(e, new StringTask()); - assertSame("should return test string", TEST_STRING, result); + assertSame(TEST_STRING, result); } catch (ExecutionException ex) { - fail("Unexpected exception" ); + unexpectedException(); } catch (InterruptedException ex) { - fail("Unexpected exception"); - } - } - - private static final String TEST_STRING = "a test string"; - - private static class Task 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 { - public String call() { return TEST_STRING; } - } - - static class DirectExecutor implements Executor { - public void execute(Runnable r) { - r.run(); + unexpectedException(); } } /** - * Check that timeouts from execute will time out if they compute - * too long. + * timeouts from execute will time out if they compute too long. */ - public void testTimedCallable() { int N = 10000; ExecutorService executor = Executors.newSingleThreadExecutor(); @@ -313,7 +356,7 @@ public class ExecutorsTest extends JSR16 return; } catch (Exception e) { - fail("unexpected exception: " + e); + unexpectedException(); } } // if by chance we didn't ever time out, total time must be small @@ -326,46 +369,6 @@ public class ExecutorsTest extends JSR16 } - 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; - } - }; - }