[jboss-cvs] JBossAS SVN: r64069 - in branches/Branch_4_2/ejb3: src/test/org/jboss/ejb3/test/clusteredjms/unit and 1 other directory.

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

Author: bdecoste
Date: 2007-07-16 12:10:36 -0400 (Mon, 16 Jul 2007)
New Revision: 64069

Modified:
   branches/Branch_4_2/ejb3/build-test.xml
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
Log:
[EJBTHREE-975] fixed bug in test, replaced node1 config with clusteredjms2

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-07-16 14:56:07 UTC (rev 64068)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-07-16 16:10:36 UTC (rev 64069)
@@ -4105,7 +4105,7 @@
    </target>
    
    <target name="clustered-jms-test">
-      <create-config baseconf="all" newconf="clusteredjms" jboss.dist="${ejb3.dist}">
+      <create-config baseconf="all" newconf="clusteredjms">
          <patternset>
 	        <include name="conf/**"/>
 	        <include name="deploy*/**"/>
@@ -4113,7 +4113,7 @@
             <include name="deploy-hasingleton/**"/>
          </patternset>
       </create-config>
-      <create-config baseconf="all" newconf="node1" jboss.dist="${ejb3.dist}">
+      <create-config baseconf="all" newconf="clusteredjms2">
          <patternset>
 	        <include name="conf/**"/>
 	        <include name="deploy*/**"/>
@@ -4123,8 +4123,8 @@
          </patternset>
       </create-config>
       
-      <start-jboss conf="node1" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-	  <start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>	  
+      <start-jboss conf="clusteredjms" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+	  <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="${ejb3.jboss.jvmargs}"/>
 	  
 	  <antcall target="tests-clustering-wait"/> 
 	

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java	2007-07-16 14:56:07 UTC (rev 64068)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java	2007-07-16 16:10:36 UTC (rev 64069)
@@ -81,7 +81,7 @@
       Thread.sleep(2000);
       assertEquals(5, status.queueFired());
       
-      assertEquals("mdbtest", status.testInjection());
+      assertEquals("queuetest", status.testInjection());
    }
 
    protected QueueConnectionFactory getQueueConnectionFactory()