ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.9 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.12 by jsr166, Sat Nov 21 19:44:50 2009 UTC

# Line 1018 | Line 1018 | public class ThreadPoolExecutorSubclassT
1018       *  given a value less the core pool size
1019       */
1020      public void testMaximumPoolSizeIllegalArgumentException() {
1021 <        ThreadPoolExecutor tpe = null;
1022 <        try {
1023 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1024 <        } catch (Exception e) {}
1021 >        ThreadPoolExecutor tpe =
1022 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1023          try {
1024              tpe.setMaximumPoolSize(1);
1025              shouldThrow();
# Line 1037 | Line 1035 | public class ThreadPoolExecutorSubclassT
1035       *  if given a negative value
1036       */
1037      public void testMaximumPoolSizeIllegalArgumentException2() {
1038 <        ThreadPoolExecutor tpe = null;
1039 <        try {
1042 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1043 <        } catch (Exception e) {}
1038 >        ThreadPoolExecutor tpe =
1039 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1040          try {
1041              tpe.setMaximumPoolSize(-1);
1042              shouldThrow();
# Line 1057 | Line 1053 | public class ThreadPoolExecutorSubclassT
1053       *  when given a negative value
1054       */
1055      public void testKeepAliveTimeIllegalArgumentException() {
1056 <        ThreadPoolExecutor tpe = null;
1057 <        try {
1062 <            tpe = new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1063 <        } catch (Exception e) {}
1056 >        ThreadPoolExecutor tpe =
1057 >            new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1058  
1059          try {
1060              tpe.setKeepAliveTime(-1,MILLISECONDS);
# Line 1359 | Line 1353 | public class ThreadPoolExecutorSubclassT
1353       * timed invokeAny(c) throws NPE if c has null elements
1354       */
1355      public void testTimedInvokeAny3() throws Exception {
1356 +        final CountDownLatch latch = new CountDownLatch(1);
1357          ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1358          try {
1359              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1360 <            l.add(new StringTask());
1360 >            l.add(new Callable<String>() {
1361 >                      public String call() {
1362 >                          try {
1363 >                              latch.await();
1364 >                          } catch (InterruptedException ok) {}
1365 >                          return TEST_STRING;
1366 >                      }});
1367              l.add(null);
1368              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1369              shouldThrow();
1370          } catch (NullPointerException success) {
1371          } finally {
1372 +            latch.countDown();
1373              joinPool(e);
1374          }
1375      }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines