[jboss-cvs] JBossAS SVN: r103697 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/jca/inflowmdb/unit and 1 other directories.

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

Author: jaikiran
Date: 2010-04-08 08:47:23 -0400 (Thu, 08 Apr 2010)
New Revision: 103697

Removed:
   projects/ejb3/trunk/testsuite/src/test/resources/test/jca/inflow/jmsmdbtest-service.xml
Modified:
   projects/ejb3/trunk/testsuite/build-test.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java
Log:
EJBTHREE-2057 Fixed the jca inflow tests to take care of HornetQ integration changes

Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml	2010-04-08 12:47:08 UTC (rev 103696)
+++ projects/ejb3/trunk/testsuite/build-test.xml	2010-04-08 12:47:23 UTC (rev 103697)
@@ -752,9 +752,6 @@
             <include name="org/jboss/ejb3/test/jca/inflowmdb/Stateless*.class"/>
             <include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
          </fileset>
-         <fileset dir="${build.resources}/test/jca/inflow">
-            <include name="jmsmdbtest-service.xml"/>
-         </fileset>
       </jar>
 
       <jar jarfile="${build.lib}/jcainflowmdb_dd.jar">

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java	2010-04-08 12:47:08 UTC (rev 103696)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/jca/inflowmdb/unit/InflowUnitTestCase.java	2010-04-08 12:47:23 UTC (rev 103697)
@@ -21,26 +21,25 @@
  */
 package org.jboss.ejb3.test.jca.inflowmdb.unit;
 
-import javax.management.ObjectName;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
 
+import org.jboss.ejb3.ClientKernelAbstraction;
 import org.jboss.ejb3.InitialContextFactory;
-import org.jboss.ejb3.ClientKernelAbstraction;
 import org.jboss.ejb3.KernelAbstractionFactory;
-
+import org.jboss.ejb3.test.common.EJB3TestCase;
 import org.jboss.ejb3.test.jca.inflow.TestResourceAdapter;
 import org.jboss.ejb3.test.jca.inflow.TestResourceAdapterInflowResults;
+import org.jboss.ejb3.test.jca.inflowmdb.JMSTest;
 import org.jboss.ejb3.test.jca.inflowmdb.QuartzTest;
-import org.jboss.ejb3.test.jca.inflowmdb.JMSTest;
 import org.jboss.ejb3.test.jca.inflowmdb.StatelessRemote;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
 
 /**
  * 
  * @version <tt>$Revision$</tt>
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  */
-public class InflowUnitTestCase extends JBossTestCase
+public class InflowUnitTestCase extends EJB3TestCase
 {
 
    public InflowUnitTestCase(String name)
@@ -84,8 +83,21 @@
    
    public static Test suite() throws Exception
    {
-      Test t1 = getDeploySetup(InflowUnitTestCase.class, "quartzmdb.jar, jmsinflowmdb.jar, jcainflowmdb.jar"); 
-      Test t2 = getDeploySetup(t1, "jcainflow.rar");
-      return t2;
+      return new TestSetup(getDeploySetup(InflowUnitTestCase.class, "jcainflow.rar, quartzmdb.jar, jmsinflowmdb.jar, jcainflowmdb.jar"))
+      {
+         @Override
+         protected void setUp() throws Exception
+         {
+            deployQueue("inflowmdbtest");
+         }
+
+         @Override
+         protected void tearDown() throws Exception
+         {
+            undeployQueue("inflowmdbtest");
+         } 
+      };
+      //Test t2 = getDeploySetup(t1, "jcainflow.rar");
+      //return t2;
    }
 }

Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/jca/inflow/jmsmdbtest-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/jca/inflow/jmsmdbtest-service.xml	2010-04-08 12:47:08 UTC (rev 103696)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/jca/inflow/jmsmdbtest-service.xml	2010-04-08 12:47:23 UTC (rev 103697)
@@ -1,8 +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=inflowmdbtest">
-      <attribute name="JNDIName">queue/inflowmdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>