--- jsr166/src/test/tck/ScheduledExecutorTest.java 2009/11/20 22:58:48 1.25 +++ jsr166/src/test/tck/ScheduledExecutorTest.java 2009/11/21 02:07:27 1.26 @@ -14,10 +14,10 @@ import java.util.concurrent.atomic.*; public class ScheduledExecutorTest 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(ScheduledExecutorTest.class); + return new TestSuite(ScheduledExecutorTest.class); } @@ -142,12 +142,12 @@ public class ScheduledExecutorTest exten public void testExecuteNull() throws InterruptedException { ScheduledThreadPoolExecutor se = null; try { - se = new ScheduledThreadPoolExecutor(1); - se.execute(null); + se = new ScheduledThreadPoolExecutor(1); + se.execute(null); shouldThrow(); - } catch (NullPointerException success) {} + } catch (NullPointerException success) {} - joinPool(se); + joinPool(se); } /** @@ -155,12 +155,12 @@ public class ScheduledExecutorTest exten */ public void testScheduleNull() throws InterruptedException { ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1); - try { + try { TrackedCallable callable = null; - Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); + Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); shouldThrow(); - } catch (NullPointerException success) {} - joinPool(se); + } catch (NullPointerException success) {} + joinPool(se); } /** @@ -325,7 +325,7 @@ public class ScheduledExecutorTest exten */ public void testGetThreadFactory() throws InterruptedException { ThreadFactory tf = new SimpleThreadFactory(); - ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf); + ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf); assertSame(tf, p.getThreadFactory()); joinPool(p); } @@ -335,7 +335,7 @@ public class ScheduledExecutorTest exten */ public void testSetThreadFactory() throws InterruptedException { ThreadFactory tf = new SimpleThreadFactory(); - ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1); + ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1); p.setThreadFactory(tf); assertSame(tf, p.getThreadFactory()); joinPool(p); @@ -345,7 +345,7 @@ public class ScheduledExecutorTest exten * setThreadFactory(null) throws NPE */ public void testSetThreadFactoryNull() throws InterruptedException { - ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1); + ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1); try { p.setThreadFactory(null); shouldThrow(); @@ -360,14 +360,14 @@ public class ScheduledExecutorTest exten */ public void testIsShutdown() { - ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1); + ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1); try { assertFalse(p1.isShutdown()); } finally { try { p1.shutdown(); } catch (SecurityException ok) { return; } } - assertTrue(p1.isShutdown()); + assertTrue(p1.isShutdown()); } @@ -375,7 +375,7 @@ public class ScheduledExecutorTest exten * isTerminated is false before termination, true after */ public void testIsTerminated() throws InterruptedException { - ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1); + ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1); try { p1.execute(new SmallRunnable()); } finally { @@ -389,7 +389,7 @@ public class ScheduledExecutorTest exten * isTerminating is not true when running or when terminated */ public void testIsTerminating() throws InterruptedException { - ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1); + ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1); assertFalse(p1.isTerminating()); try { p1.execute(new SmallRunnable()); @@ -481,7 +481,7 @@ public class ScheduledExecutorTest exten * shutDownNow returns a list containing tasks that were not run */ public void testShutDownNow() throws InterruptedException { - ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1); + ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1); for (int i = 0; i < 5; i++) p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS); List l; @@ -490,8 +490,8 @@ public class ScheduledExecutorTest exten } catch (SecurityException ok) { return; } - assertTrue(p1.isShutdown()); - assertTrue(l.size() > 0 && l.size() <= 5); + assertTrue(p1.isShutdown()); + assertTrue(l.size() > 0 && l.size() <= 5); joinPool(p1); }