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

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

Author: jaikiran
Date: 2010-04-07 08:56:21 -0400 (Wed, 07 Apr 2010)
New Revision: 103628

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MetricsUnitTestCase.java
Log:
EJBTHREE-2057 Fixed the MetricsUnitTestCase for HornetQ related integration changes

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java	2010-04-07 12:42:56 UTC (rev 103627)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java	2010-04-07 12:56:21 UTC (rev 103628)
@@ -30,16 +30,17 @@
 import javax.jms.TopicConnectionFactory;
 import javax.naming.NamingException;
 
+import junit.extensions.TestSetup;
 import junit.framework.Test;
 
 import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.test.common.EJB3TestCase;
 import org.jboss.ejb3.test.mdb.Stateless;
 import org.jboss.ejb3.test.mdb.TestStatus;
 import org.jboss.embedded.Bootstrap;
 import org.jboss.embedded.junit.EmbeddedTestCase;
 import org.jboss.security.client.SecurityClient;
 import org.jboss.security.client.SecurityClientFactory;
-import org.jboss.test.JBossTestCase;
 
 /**
  * Sample client for the jboss container.
@@ -47,7 +48,7 @@
  * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
  * @version $Id: MDBUnitTestCase.java 59422 2007-01-08 23:18:40Z bdecoste $
  */
-public class MDBUnitEmbeddedTest extends JBossTestCase
+public class MDBUnitEmbeddedTest extends EJB3TestCase
 {
    public MDBUnitEmbeddedTest(String name)
    {
@@ -158,8 +159,50 @@
 
    public static Test suite() throws Exception
    {
-      return EmbeddedTestCase.getAdaptedSetup(MDBUnitEmbeddedTest.class,
-            "mdbtest-service.xml, mdb-test.jar");
+      return new TestSetup(EmbeddedTestCase.getAdaptedSetup(MDBUnitEmbeddedTest.class,"mdb-test.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("cmtmdbtest");
+            deployQueue("mdbtest");
+            deployQueue("defaultedmdbtest");
+            deployQueue("overridedefaultedmdbtest");
+            deployQueue("nondurablemdbtest");
+            deployQueue("bmtmdbtest");
+            deployQueue("overridequeuetest");
+            deployTopic("mdbtest");
+            deployQueue("transactionmdbtest");
+            deployQueue("expirytest");
+            deployQueue("dlqtest");
+            deployQueue("cmttxnotsupmdbtest");
+            deployQueue("expirationmdbtest");
+            deployQueue("rollbackcmtmdbtest");
+            deployQueue("mismatchedmdbtest");
+            
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployQueue("cmtmdbtest");
+            undeployQueue("mdbtest");
+            undeployQueue("defaultedmdbtest");
+            undeployQueue("overridedefaultedmdbtest");
+            undeployQueue("nondurablemdbtest");
+            undeployQueue("bmtmdbtest");
+            undeployQueue("overridequeuetest");
+            undeployTopic("mdbtest");
+            undeployQueue("transactionmdbtest");
+            undeployQueue("expirytest");
+            undeployQueue("dlqtest");
+            undeployQueue("cmttxnotsupmdbtest");
+            undeployQueue("expirationmdbtest");
+            undeployQueue("rollbackcmtmdbtest");
+            undeployQueue("mismatchedmdbtest");
+
+         }  
+      };
    }
 
 }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MetricsUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MetricsUnitTestCase.java	2010-04-07 12:42:56 UTC (rev 103627)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MetricsUnitTestCase.java	2010-04-07 12:56:21 UTC (rev 103628)
@@ -22,18 +22,19 @@
 package org.jboss.ejb3.test.mdb.unit;
 
 import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
 
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
+import junit.extensions.TestSetup;
 import junit.framework.Test;
 
-import javax.management.ObjectName;
+import org.jboss.ejb3.test.common.EJB3TestCase;
+import org.jboss.logging.Logger;
 
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  */
 public class MetricsUnitTestCase
-extends JBossTestCase
+extends EJB3TestCase
 {
    private static final Logger log = Logger.getLogger(MetricsUnitTestCase.class);
 
@@ -76,7 +77,50 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(MetricsUnitTestCase.class, "mdbtest-service.xml, mdb-test.jar");
+      return new TestSetup(getDeploySetup(MetricsUnitTestCase.class, "mdb-test.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("cmtmdbtest");
+            deployQueue("mdbtest");
+            deployQueue("defaultedmdbtest");
+            deployQueue("overridedefaultedmdbtest");
+            deployQueue("nondurablemdbtest");
+            deployQueue("bmtmdbtest");
+            deployQueue("overridequeuetest");
+            deployTopic("mdbtest");
+            deployQueue("transactionmdbtest");
+            deployQueue("expirytest");
+            deployQueue("dlqtest");
+            deployQueue("cmttxnotsupmdbtest");
+            deployQueue("expirationmdbtest");
+            deployQueue("rollbackcmtmdbtest");
+            deployQueue("mismatchedmdbtest");
+            
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployQueue("cmtmdbtest");
+            undeployQueue("mdbtest");
+            undeployQueue("defaultedmdbtest");
+            undeployQueue("overridedefaultedmdbtest");
+            undeployQueue("nondurablemdbtest");
+            undeployQueue("bmtmdbtest");
+            undeployQueue("overridequeuetest");
+            undeployTopic("mdbtest");
+            undeployQueue("transactionmdbtest");
+            undeployQueue("expirytest");
+            undeployQueue("dlqtest");
+            undeployQueue("cmttxnotsupmdbtest");
+            undeployQueue("expirationmdbtest");
+            undeployQueue("rollbackcmtmdbtest");
+            undeployQueue("mismatchedmdbtest");
+
+         } 
+      };
    }
 
 }