[jboss-cvs] JBossAS SVN: r103259 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/jms/managed/unit and 2 other directories.

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

Author: jaikiran
Date: 2010-03-30 09:06:46 -0400 (Tue, 30 Mar 2010)
New Revision: 103259

Removed:
   projects/ejb3/trunk/testsuite/src/test/resources/test/jms/jms-jbossmq-destinations-service.xml
Modified:
   projects/ejb3/trunk/testsuite/build-test.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java
Log:
EJBTHREE-2057 Fixed the jms testcase to take care of HornetQ integration changes

Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml	2010-03-30 12:55:59 UTC (rev 103258)
+++ projects/ejb3/trunk/testsuite/build-test.xml	2010-03-30 13:06:46 UTC (rev 103259)
@@ -1658,9 +1658,6 @@
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/jms/*.class"/>
          </fileset>
-         <fileset dir="${resources}/test/jms">
-            <include name="*.xml"/>
-         </fileset>
       </jar>
    </target>
 

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java	2010-03-30 12:55:59 UTC (rev 103258)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jms/managed/unit/ManagedTestCase.java	2010-03-30 13:06:46 UTC (rev 103259)
@@ -22,14 +22,17 @@
 package org.jboss.ejb3.test.jms.managed.unit;
 
 import javax.naming.InitialContext;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.common.EJB3TestCase;
 import org.jboss.ejb3.test.jms.managed.JMSTest;
 import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
 
 
 public class ManagedTestCase
-   extends JBossTestCase
+   extends EJB3TestCase
 {   
    protected InitialContext initialContext;
    
@@ -40,16 +43,14 @@
       super(name);
    }
    
+   @Override
    public void setUp() throws Exception
    {
+      super.setUp();
       initialContext = new InitialContext();
    }
    
-   public void tearDown() throws Exception
-   {
-   }
    
-   
    public void test1() throws Exception
    {   
       JMSTest testBean = (JMSTest)initialContext.lookup("jms-test-ejbs/JMSTest");
@@ -60,6 +61,19 @@
    
    public static Test suite() throws Exception
    {
-      return getDeploySetup(ManagedTestCase.class, "jms-managed.jar");
+      return new TestSetup(getDeploySetup(ManagedTestCase.class, "jms-managed.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("testQueue");
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployQueue("testQueue");
+         } 
+      };
    }
 }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java	2010-03-30 12:55:59 UTC (rev 103258)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jms/unit/JMSUnitTestCase.java	2010-03-30 13:06:46 UTC (rev 103259)
@@ -21,14 +21,16 @@
  */
 package org.jboss.ejb3.test.jms.unit;
 
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.common.EJB3TestCase;
 import org.jboss.ejb3.test.jms.QueueStateless;
 import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
 
 
 public class JMSUnitTestCase
-   extends JBossTestCase
+   extends EJB3TestCase
 {
    private static final Logger log = Logger.getLogger(JMSUnitTestCase.class);
     
@@ -52,7 +54,20 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(JMSUnitTestCase.class, "jms.jar");
+      return new TestSetup(getDeploySetup(JMSUnitTestCase.class, "jms.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("testQueue");
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployQueue("testQueue");
+         } 
+      };
    }
 }
 

Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/jms/jms-jbossmq-destinations-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/jms/jms-jbossmq-destinations-service.xml	2010-03-30 12:55:59 UTC (rev 103258)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/jms/jms-jbossmq-destinations-service.xml	2010-03-30 13:06:46 UTC (rev 103259)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=testQueue">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-</server>