[jboss-cvs] JBossAS SVN: r66624 - in branches/JBPAPP_4_2/ejb3/src: test/org/jboss/ejb3/test/consumer/unit and 1 other directory.

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

Author: wolfc
Date: 2007-10-31 14:22:35 -0400 (Wed, 31 Oct 2007)
New Revision: 66624

Added:
   branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-jbm-service.xml
   branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-mq-service.xml
Removed:
   branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml
Modified:
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java
Log:
JBPAPP-347: Fixed consumer test

Added: branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-jbm-service.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-jbm-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-jbm-service.xml	2007-10-31 18:22:35 UTC (rev 66624)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.jms.server.destination.QueueService"
+      name="jboss.messaging.destination:service=Queue,name=mdbtest"
+      xmbean-dd="xmdesc/Queue-xmbean.xml">
+      <attribute name="JNDIName">queue/mdbtest</attribute>
+      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+      <depends>jboss.messaging:service=PostOffice</depends>
+   </mbean>
+
+   <mbean code="org.jboss.jms.server.destination.QueueService"
+      name="jboss.messaging.destination:service=Queue,name=consumerqueuetest"
+      xmbean-dd="xmdesc/Queue-xmbean.xml">
+      <attribute name="JNDIName">queue/consumerqueuetest</attribute>
+      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+      <depends>jboss.messaging:service=PostOffice</depends>
+   </mbean>
+
+   <mbean code="org.jboss.jms.server.destination.TopicService"
+      name="jboss.messaging.destination:service=Topic,name=mdbtest"
+      xmbean-dd="xmdesc/Queue-xmbean.xml">
+      <attribute name="JNDIName">topic/mdbtest</attribute>
+      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+      <depends>jboss.messaging:service=PostOffice</depends>
+   </mbean>
+
+</server>


Property changes on: branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-jbm-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-mq-service.xml (from rev 66569, branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-mq-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-mq-service.xml	2007-10-31 18:22:35 UTC (rev 66624)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=queuetest">
+      <attribute name="JNDIName">queue/mdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=consumerqueuetest">
+      <attribute name="JNDIName">queue/consumertest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Topic"
+      name="jboss.mq.destination:service=Topic,name=topictest">
+      <attribute name="JNDIName">topic/mdbtest</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+</server>

Deleted: branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml	2007-10-31 18:21:09 UTC (rev 66623)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/consumer/consumertest-service.xml	2007-10-31 18:22:35 UTC (rev 66624)
@@ -1,21 +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=queuetest">
-      <attribute name="JNDIName">queue/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=consumerqueuetest">
-      <attribute name="JNDIName">queue/consumertest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Topic"
-      name="jboss.mq.destination:service=Topic,name=topictest">
-      <attribute name="JNDIName">topic/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-</server>

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java	2007-10-31 18:21:09 UTC (rev 66623)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/consumer/unit/ConsumerUnitTestCase.java	2007-10-31 18:22:35 UTC (rev 66624)
@@ -213,7 +213,7 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(ConsumerUnitTestCase.class, "consumertest-service.xml, consumer-test.jar");
+      return getDeploySetup(ConsumerUnitTestCase.class, "consumertest-${jboss.jms.provider}-service.xml, consumer-test.jar");
    }
 
 }