[jboss-cvs] JBossAS SVN: r73176 - in branches/JBPAPP_4_2_0_GA_CP/ejb3: src/test/org/jboss/ejb3/test/ejbthree994/unit and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2008-05-08 16:33:42 -0400 (Thu, 08 May 2008)
New Revision: 73176

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java
Log:
JBPAPP-830 - resolve failure for MultiBindingsUnitTestCase and add props for one-test target

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2008-05-08 20:15:31 UTC (rev 73175)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2008-05-08 20:33:42 UTC (rev 73176)
@@ -3825,6 +3825,10 @@
          <!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
          <sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
 
+	 <!-- MultiUnitBindTestCase needs to know the bind address to correctly
+		test the assertion -->
+         <sysproperty key="jboss.bind.address" value="${node0}"/>
+
          <jvmarg line="${jvmargs}" />
 
          <classpath>
@@ -3918,21 +3922,28 @@
          <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
          <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
 
+	 <!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
+	 <sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
 
-         <jvmarg line="${jvmargs}" />
+	 <!-- MultiUnitBindTestCase needs to know the bind address to correctly
+		test the assertion -->
+         <sysproperty key="jboss.bind.address" value="${node0}"/>
 
+         <jvmarg line="${ejb3.jboss.jvmargs}" />
+
          <classpath>
             <!--path refid="asm.asm.classpath"/-->
             <path refid="hibernate.hibernate.classpath"/>
             <pathelement location="${build.classes}"/>
             <pathelement location="${resources}/test"/>
-            <path refid="${client.run.classpath}"/>
+	     <path refid="${client.run.classpath}"/>
             <path refid="jboss.jbossws.classpath"/>
             <path refid="apache.xerces.classpath"/>
             <path refid="sun.jaf.classpath"/>
             <path refid="sun.javamail.classpath"/>
             <path refid="apache.httpclient.classpath"/>
             <path refid="hsqldb.hsqldb.classpath"/>
+            <path refid="jboss.aop.classpath"/>
          </classpath>
 
          <formatter type="plain" usefile="true"/>

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java	2008-05-08 20:15:31 UTC (rev 73175)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ejbthree994/unit/MultiBindingsTestCase.java	2008-05-08 20:33:42 UTC (rev 73176)
@@ -54,6 +54,16 @@
       InvokerLocator locator = (InvokerLocator) f.get(handler);
       return locator.getOriginalURI();
    }
+
+   private static String getBindingName()
+   {
+      String bindingName = System.getProperty("jboss.bind.address");
+      if (bindingName == null)
+      {
+         bindingName = "127.0.0.1";
+      }
+      return bindingName;
+   }
    
    public void test1() throws Exception
    {
@@ -63,7 +73,7 @@
          assertEquals(actual, "*** 123 ***");
          
          String proxyUri = getProxyUri(bean);
-         assertEquals(proxyUri, "socket://127.0.0.1:3873/");
+         assertEquals(proxyUri, "socket://" + getBindingName() + ":3873/");
       }
 
       {
@@ -72,7 +82,7 @@
          assertEquals(actual, "*** 456 ***");
          
          String proxyUri = getProxyUri(bean);
-         assertEquals(proxyUri, "socket://127.0.0.1:3874/");
+         assertEquals(proxyUri, "socket://" + getBindingName() + ":3874/");
       }
       
       {
@@ -81,7 +91,7 @@
          assertEquals(actual, "*** 789 ***");
          
          String proxyUri = getProxyUri(bean);
-         assertEquals(proxyUri, "socket://127.0.0.1:3875/");
+         assertEquals(proxyUri, "socket://" + getBindingName() + ":3875/");
       }
    }