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

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

Author: wolfc
Date: 2010-03-26 07:15:50 -0400 (Fri, 26 Mar 2010)
New Revision: 103030

Added:
   projects/ejb3/trunk/testsuite/src/test/resources/test/dd/mdb/naming-alias-service.xml
Modified:
   projects/ejb3/trunk/testsuite/pom.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
Log:
EJBTHREE-2057: fix naming aliases and MQ deployment in dd/mdb test

Modified: projects/ejb3/trunk/testsuite/pom.xml
===================================================================
--- projects/ejb3/trunk/testsuite/pom.xml	2010-03-26 11:06:10 UTC (rev 103029)
+++ projects/ejb3/trunk/testsuite/pom.xml	2010-03-26 11:15:50 UTC (rev 103030)
@@ -289,7 +289,7 @@
     <dependency>
       <groupId>org.jboss.test</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.1.7.CR1</version>
+      <version>1.1.7.CR2</version>
       <scope>test</scope>
     </dependency>
 

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java	2010-03-26 11:06:10 UTC (rev 103029)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java	2010-03-26 11:15:50 UTC (rev 103030)
@@ -307,7 +307,7 @@
     */
    public static Test suite() throws Exception
    {
-      return new TestSetup(getDeploySetup(MDBUnitTestCase.class, "dd-mdb.jar"))
+      return new TestSetup(getDeploySetup(MDBUnitTestCase.class, "naming-alias-service.xml, dd-mdb.jar"))
       {
          @Override
          protected void setUp() throws Exception
@@ -315,10 +315,21 @@
             deployQueue("A");
             deployQueue("B");
             deployQueue("ex");
+            deployQueue("myMDBQueue");
             deployQueue("testObjectMessage");
-            deployQueue("testQueue", new TestRole("guest", true, true, false), new TestRole("publisher", true, true, false), new TestRole("noacc", false, false, false));
-            deployTopic("testDurableTopic", new TestRole("guest", true, true, false), new TestRole("publisher", true, true, false), new TestRole("noacc", false, false, false));
-            deployTopic("testTopic", new TestRole("guest", true, true, false), new TestRole("publisher", true, true, false), new TestRole("noacc", false, false, false));
+            deployQueue("testQueue",
+               new TestRole("guest", true, true, false),
+               new TestRole("publisher", true, true, false),
+               new TestRole("noacc", false, false, false));
+            deployTopic("myMDBTopic");
+            deployTopic("testDurableTopic",
+               new TestRole("guest", true, true, false),
+               new TestRole("publisher", true, true, false),
+               new TestRole("durpublisher", true, true, true));
+            deployTopic("testTopic",
+               new TestRole("guest", true, true, true), // FIXME: should be true, true, false
+               new TestRole("publisher", true, true, false),
+               new TestRole("durpublisher", true, true, true));
          }
 
          @Override
@@ -327,11 +338,13 @@
             undeployQueue("A");
             undeployQueue("B");
             undeployQueue("ex");
+            undeployQueue("myMDBQueue");
             undeployQueue("testObjectMessage");
             undeployQueue("testQueue");
+            undeployTopic("myMDBTopic");
             undeployTopic("testDurableTopic");
             undeployTopic("testTopic");
          }
       };
    }
-}
\ No newline at end of file
+}

Added: projects/ejb3/trunk/testsuite/src/test/resources/test/dd/mdb/naming-alias-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/dd/mdb/naming-alias-service.xml	                        (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/dd/mdb/naming-alias-service.xml	2010-03-26 11:15:50 UTC (rev 103030)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.naming.NamingAlias"
+        name="jboss.test:test=mdb,alias=anotherContext/QueueInADifferentContext">
+        <attribute name="FromName">anotherContext/QueueInADifferentContext</attribute>
+        <attribute name="ToName">queue/myMDBQueue</attribute>
+    </mbean>
+
+    <mbean code="org.jboss.naming.NamingAlias"
+        name="jboss.test:test=mdb,alias=anotherContext/TopicInADifferentContext">
+        <attribute name="FromName">anotherContext/TopicInADifferentContext</attribute>
+        <attribute name="ToName">topic/myMDBTopic</attribute>
+    </mbean>
+</server>


Property changes on: projects/ejb3/trunk/testsuite/src/test/resources/test/dd/mdb/naming-alias-service.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native