[jboss-cvs] JBossAS SVN: r96491 - in branches/JBPAPP_4_2_0_GA_CP_IPV6: testsuite/src/main/org/jboss/test/hellojrmpiiop/test and 1 other directory.

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

Author: rachmatowicz at jboss.com
Date: 2009-11-18 10:41:46 -0500 (Wed, 18 Nov 2009)
New Revision: 96491

Modified:
   branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossIIOPTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestCase.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestServices.java
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java
Log:
Apply fixes to IIOP tests where corbaloc URL was incorrectly specified(JBPAPP-2997).

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossIIOPTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossIIOPTestCase.java	2009-11-18 15:28:23 UTC (rev 96490)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossIIOPTestCase.java	2009-11-18 15:41:46 UTC (rev 96491)
@@ -53,8 +53,8 @@
          URL url  = ClassLoader.getSystemResource("cosnaming.jndi.properties");
          jndiProps = new java.util.Properties();
          jndiProps.load(url.openStream());
-         String host = System.getProperty("jbosstest.server.host", "localhost");
-         String corbaloc = "corbaloc::"+host+":3528/JBoss/Naming/root";
+         // String host = System.getProperty("jbosstest.server.host", "localhost");
+         String corbaloc = "corbaloc::"+getServerHostForURL()+":3528/JBoss/Naming/root";
          jndiProps.setProperty("java.naming.provider.url", corbaloc);
       }
 

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestCase.java	2009-11-18 15:28:23 UTC (rev 96490)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestCase.java	2009-11-18 15:41:46 UTC (rev 96491)
@@ -371,6 +371,16 @@
       return delegate.getServerHost();
    }
 
+   /**
+    * Get the JBoss server host from system property "jbosstest.server.host"
+    * in a form suitable for use in URLs (IPv6 literals must be enclosed in
+    * square brackets). This defaults to localhost.
+    */
+   public String getServerHostForURL()
+   {
+      return delegate.getServerHostForURL();
+   }
+  
    protected void flushAuthCache() throws Exception
    {
       flushAuthCache("other");

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestServices.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestServices.java	2009-11-18 15:28:23 UTC (rev 96490)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/test/src/main/org/jboss/test/JBossTestServices.java	2009-11-18 15:41:46 UTC (rev 96491)
@@ -452,4 +452,23 @@
       String hostName = System.getProperty("jbosstest.server.host", "localhost");
       return hostName;
    }
+   
+   /**
+    * Returns the JBoss server host from system property "jbosstest.server.host"
+    * in a form suitable for includion in URLs.This defaults to "localhost"
+    */
+   public String getServerHostForURL()
+   {
+      String hostName = getServerHost() ;
+      
+      if (hostName == null)
+    	  return hostName;	
+      
+      // check for IPv6 literal
+      if (hostName.indexOf(":") != -1)
+    	  return "[" + hostName + "]" ;
+      else 
+    	  return hostName ;
+   }
+
 }

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java	2009-11-18 15:28:23 UTC (rev 96490)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/src/main/org/jboss/test/hellojrmpiiop/test/HelloTimingStressTestCase.java	2009-11-18 15:41:46 UTC (rev 96491)
@@ -57,8 +57,9 @@
    {
       super(name);
       URL url;
-      String host = System.getProperty("jbosstest.server.host", "localhost");
-
+      // String host = System.getProperty("jbosstest.server.host", "localhost");
+      String host = getServerHostForURL() ; 
+      
       url = ClassLoader.getSystemResource("iiop.jndi.properties");
       iiopJndiProps = new java.util.Properties();
       iiopJndiProps.load(url.openStream());