[jboss-cvs] JBossAS SVN: r103245 - projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/strictpool/unit.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2010-03-30 05:55:51 -0400 (Tue, 30 Mar 2010)
New Revision: 103245

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
Log:
EJBTHREE-2057: fixed strictpool (except for JMS_JBOSS_REDELIVERY_LIMIT)

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java	2010-03-30 09:55:47 UTC (rev 103244)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java	2010-03-30 09:55:51 UTC (rev 103245)
@@ -21,13 +21,12 @@
  */
 package org.jboss.ejb3.test.strictpool.unit;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import org.jboss.ejb3.test.common.EJB3TestCase;
+import org.jboss.ejb3.test.strictpool.Counter;
+import org.jboss.ejb3.test.strictpool.SessionInvoker;
+import org.jboss.ejb3.test.strictpool.StrictlyPooledSession;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -38,14 +37,14 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.strictpool.Counter;
-import org.jboss.ejb3.test.strictpool.SessionInvoker;
-import org.jboss.ejb3.test.strictpool.StrictlyPooledSession;
-import org.jboss.test.JBossTestCase;
-
 /**
  * Adapted from the EJB 2.1 tests (org.jboss.test.cts.test.StatefulSessionUnitTestCase and
  * org.jboss.test.cts.test.MDBUnitTestCase)
@@ -53,7 +52,7 @@
  * @version $Revision$
  */
 public class StrictPoolUnitTestCase
-      extends JBossTestCase
+      extends EJB3TestCase
 {
    static final int MAX_SIZE = 20;
    static String QUEUE_FACTORY = "ConnectionFactory";
@@ -151,8 +150,22 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(StrictPoolUnitTestCase.class, "strictpool_mdbtest-service.xml, strictpool-test.jar");
+      return new TestSetup(getDeploySetup(StrictPoolUnitTestCase.class, "strictpool-test.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("queueA");
+            deployQueue("queueB");
+            deployQueue("queueC");
+         }
 
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployDestinations();
+         }
+      };
    }
 
 }