--- jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java 2010/08/25 00:07:03 1.18 +++ jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java 2010/10/09 19:30:35 1.19 @@ -192,7 +192,7 @@ public class ThreadPoolExecutorSubclassT /** - * execute successfully executes a runnable + * execute successfully executes a runnable */ public void testExecute() throws InterruptedException { ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -205,8 +205,8 @@ public class ThreadPoolExecutorSubclassT } /** - * getActiveCount increases but doesn't overestimate, when a - * thread becomes active + * getActiveCount increases but doesn't overestimate, when a + * thread becomes active */ public void testGetActiveCount() throws InterruptedException { ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -218,7 +218,7 @@ public class ThreadPoolExecutorSubclassT } /** - * prestartCoreThread starts a thread if under corePoolSize, else doesn't + * prestartCoreThread starts a thread if under corePoolSize, else doesn't */ public void testPrestartCoreThread() { ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -233,7 +233,7 @@ public class ThreadPoolExecutorSubclassT } /** - * prestartAllCoreThreads starts all corePoolSize threads + * prestartAllCoreThreads starts all corePoolSize threads */ public void testPrestartAllCoreThreads() { ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -246,8 +246,8 @@ public class ThreadPoolExecutorSubclassT } /** - * getCompletedTaskCount increases, but doesn't overestimate, - * when tasks complete + * getCompletedTaskCount increases, but doesn't overestimate, + * when tasks complete */ public void testGetCompletedTaskCount() throws InterruptedException { ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -260,7 +260,7 @@ public class ThreadPoolExecutorSubclassT } /** - * getCorePoolSize returns size given in constructor if not otherwise set + * getCorePoolSize returns size given in constructor if not otherwise set */ public void testGetCorePoolSize() { ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -269,7 +269,7 @@ public class ThreadPoolExecutorSubclassT } /** - * getKeepAliveTime returns value given in constructor if not otherwise set + * getKeepAliveTime returns value given in constructor if not otherwise set */ public void testGetKeepAliveTime() { ThreadPoolExecutor p2 = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -353,8 +353,8 @@ public class ThreadPoolExecutorSubclassT /** - * getLargestPoolSize increases, but doesn't overestimate, when - * multiple threads active + * getLargestPoolSize increases, but doesn't overestimate, when + * multiple threads active */ public void testGetLargestPoolSize() throws InterruptedException { ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -367,8 +367,8 @@ public class ThreadPoolExecutorSubclassT } /** - * getMaximumPoolSize returns value given in constructor if not - * otherwise set + * getMaximumPoolSize returns value given in constructor if not + * otherwise set */ public void testGetMaximumPoolSize() { ThreadPoolExecutor p2 = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -377,8 +377,8 @@ public class ThreadPoolExecutorSubclassT } /** - * getPoolSize increases, but doesn't overestimate, when threads - * become active + * getPoolSize increases, but doesn't overestimate, when threads + * become active */ public void testGetPoolSize() { ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -389,7 +389,7 @@ public class ThreadPoolExecutorSubclassT } /** - * getTaskCount increases, but doesn't overestimate, when tasks submitted + * getTaskCount increases, but doesn't overestimate, when tasks submitted */ public void testGetTaskCount() throws InterruptedException { ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -401,7 +401,7 @@ public class ThreadPoolExecutorSubclassT } /** - * isShutDown is false before shutdown, true after + * isShutDown is false before shutdown, true after */ public void testIsShutdown() { @@ -414,7 +414,7 @@ public class ThreadPoolExecutorSubclassT /** - * isTerminated is false before termination, true after + * isTerminated is false before termination, true after */ public void testIsTerminated() throws InterruptedException { ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -429,7 +429,7 @@ public class ThreadPoolExecutorSubclassT } /** - * isTerminating is not true when running or when terminated + * isTerminating is not true when running or when terminated */ public void testIsTerminating() throws InterruptedException { ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -498,7 +498,7 @@ public class ThreadPoolExecutorSubclassT } /** - * purge removes cancelled tasks from the queue + * purge removes cancelled tasks from the queue */ public void testPurge() { ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -516,7 +516,7 @@ public class ThreadPoolExecutorSubclassT } /** - * shutDownNow returns a list containing tasks that were not run + * shutDownNow returns a list containing tasks that were not run */ public void testShutDownNow() { ThreadPoolExecutor p1 = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(10)); @@ -827,8 +827,7 @@ public class ThreadPoolExecutorSubclassT /** - * execute throws RejectedExecutionException - * if saturated. + * execute throws RejectedExecutionException if saturated. */ public void testSaturatedExecute() { ThreadPoolExecutor p = new CustomTPE(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue(1)); @@ -843,7 +842,7 @@ public class ThreadPoolExecutorSubclassT } /** - * executor using CallerRunsPolicy runs task if saturated. + * executor using CallerRunsPolicy runs task if saturated. */ public void testSaturatedExecute2() { RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy(); @@ -869,7 +868,7 @@ public class ThreadPoolExecutorSubclassT } /** - * executor using DiscardPolicy drops task if saturated. + * executor using DiscardPolicy drops task if saturated. */ public void testSaturatedExecute3() { RejectedExecutionHandler h = new CustomTPE.DiscardPolicy(); @@ -894,7 +893,7 @@ public class ThreadPoolExecutorSubclassT } /** - * executor using DiscardOldestPolicy drops oldest task if saturated. + * executor using DiscardOldestPolicy drops oldest task if saturated. */ public void testSaturatedExecute4() { RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy(); @@ -915,7 +914,7 @@ public class ThreadPoolExecutorSubclassT } /** - * execute throws RejectedExecutionException if shutdown + * execute throws RejectedExecutionException if shutdown */ public void testRejectedExecutionExceptionOnShutdown() { ThreadPoolExecutor tpe = @@ -930,7 +929,7 @@ public class ThreadPoolExecutorSubclassT } /** - * execute using CallerRunsPolicy drops task on shutdown + * execute using CallerRunsPolicy drops task on shutdown */ public void testCallerRunsOnShutdown() { RejectedExecutionHandler h = new CustomTPE.CallerRunsPolicy(); @@ -947,7 +946,7 @@ public class ThreadPoolExecutorSubclassT } /** - * execute using DiscardPolicy drops task on shutdown + * execute using DiscardPolicy drops task on shutdown */ public void testDiscardOnShutdown() { RejectedExecutionHandler h = new CustomTPE.DiscardPolicy(); @@ -965,7 +964,7 @@ public class ThreadPoolExecutorSubclassT /** - * execute using DiscardOldestPolicy drops task on shutdown + * execute using DiscardOldestPolicy drops task on shutdown */ public void testDiscardOldestOnShutdown() { RejectedExecutionHandler h = new CustomTPE.DiscardOldestPolicy(); @@ -997,7 +996,7 @@ public class ThreadPoolExecutorSubclassT } /** - * setCorePoolSize of negative value throws IllegalArgumentException + * setCorePoolSize of negative value throws IllegalArgumentException */ public void testCorePoolSizeIllegalArgumentException() { ThreadPoolExecutor tpe = @@ -1013,8 +1012,8 @@ public class ThreadPoolExecutorSubclassT } /** - * setMaximumPoolSize(int) throws IllegalArgumentException if - * given a value less the core pool size + * setMaximumPoolSize(int) throws IllegalArgumentException + * if given a value less the core pool size */ public void testMaximumPoolSizeIllegalArgumentException() { ThreadPoolExecutor tpe = @@ -1030,8 +1029,8 @@ public class ThreadPoolExecutorSubclassT } /** - * setMaximumPoolSize throws IllegalArgumentException - * if given a negative value + * setMaximumPoolSize throws IllegalArgumentException + * if given a negative value */ public void testMaximumPoolSizeIllegalArgumentException2() { ThreadPoolExecutor tpe = @@ -1048,8 +1047,8 @@ public class ThreadPoolExecutorSubclassT /** - * setKeepAliveTime throws IllegalArgumentException - * when given a negative value + * setKeepAliveTime throws IllegalArgumentException + * when given a negative value */ public void testKeepAliveTimeIllegalArgumentException() { ThreadPoolExecutor tpe =