[jboss-cvs] JBossAS SVN: r101183 - in branches/Branch_Hornet_Temporary_2/testsuite: src/main/org/jboss/test/ejb/lifecycle/test and 2 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2010-02-19 14:28:31 -0500 (Fri, 19 Feb 2010)
New Revision: 101183

Added:
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ejb3/jbas6239/hornetq-jms.xml
Removed:
   branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ejb3/jbas6239/test-destinations-service.xml
Modified:
   branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/invokers.xml
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb/lifecycle/test/InvokersLifeCycleUnitTestCase.java
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb3/jbas6239/QueueTestMDB.java
Log:
Fixing tests

Modified: branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/invokers.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/invokers.xml	2010-02-19 19:09:45 UTC (rev 101182)
+++ branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/invokers.xml	2010-02-19 19:28:31 UTC (rev 101183)
@@ -27,9 +27,7 @@
          <fileset dir="${build.lib}">
             <include name="invokers.sar"/>
          </fileset>
-         <fileset dir="${source.resources}/messaging">
-            <include name="test-destinations-full-service.xml"/>
-         </fileset>
+         <fileset dir="${source.resources}/hornetq"/>
       </jar>
    </target>
 </project>

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb/lifecycle/test/InvokersLifeCycleUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb/lifecycle/test/InvokersLifeCycleUnitTestCase.java	2010-02-19 19:09:45 UTC (rev 101182)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb/lifecycle/test/InvokersLifeCycleUnitTestCase.java	2010-02-19 19:28:31 UTC (rev 101183)
@@ -84,18 +84,19 @@
       String poolJMXName = Container.BASE_EJB_CONTAINER_NAME + ",jndiName=" +  mdbName + ",plugin=pool";
       restart(poolJMXName);
    }
+
+//   TODO: remove the test after merge as it doesn't make sense
+//   public void testRestartQueues() throws Exception
+//   {
+//      String[] queues = new String[] {
+//            "jboss.mq.destination:service=Queue,name=A",
+//            "jboss.mq.destination:service=Queue,name=B",
+//            "jboss.mq.destination:service=Queue,name=C",
+//            "jboss.mq.destination:service=Queue,name=D",
+//            "jboss.mq.destination:service=Queue,name=ex" };
+//      restart(queues);
+//   }
    
-   public void testRestartQueues() throws Exception
-   {
-      String[] queues = new String[] {
-            "jboss.mq.destination:service=Queue,name=A",
-            "jboss.mq.destination:service=Queue,name=B",
-            "jboss.mq.destination:service=Queue,name=C",
-            "jboss.mq.destination:service=Queue,name=D",
-            "jboss.mq.destination:service=Queue,name=ex" };
-      restart(queues);
-   }
-   
    public void testRestartBMPContainer() throws Exception
    {
       restart(simpleBMPName);

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb3/jbas6239/QueueTestMDB.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb3/jbas6239/QueueTestMDB.java	2010-02-19 19:09:45 UTC (rev 101182)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb3/jbas6239/QueueTestMDB.java	2010-02-19 19:28:31 UTC (rev 101183)
@@ -51,7 +51,7 @@
 })
 @RunAs("TestRole")
 @SecurityDomain(value="other",unauthenticatedPrincipal="user")
- at Depends("jboss.mq.destination:name=mdbtest,service=Queue")
+ at Depends("org.hornetq:module=JMS,name=\"mdbtest\",type=DeployedQueue")
 public class QueueTestMDB implements MessageListener
 {
    @Resource(mappedName="java:/ConnectionFactory")

Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ejb3/jbas6239/hornetq-jms.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ejb3/jbas6239/hornetq-jms.xml	                        (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ejb3/jbas6239/hornetq-jms.xml	2010-02-19 19:28:31 UTC (rev 101183)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+
+
+   <queue name="mdbtest">
+      <entry name="/queue/mdbtest"/>
+   </queue>
+
+</configuration>

Deleted: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ejb3/jbas6239/test-destinations-service.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ejb3/jbas6239/test-destinations-service.xml	2010-02-19 19:09:45 UTC (rev 101182)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/ejb3/jbas6239/test-destinations-service.xml	2010-02-19 19:28:31 UTC (rev 101183)
@@ -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=mdbtest">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-</server>
\ No newline at end of file