[jboss-cvs] JBossAS SVN: r109787 - projects/test/trunk/src/main/java/org/jboss/test.

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

Author: rachmatowicz at jboss.com
Date: 2010-12-08 15:05:35 -0500 (Wed, 08 Dec 2010)
New Revision: 109787

Modified:
   projects/test/trunk/src/main/java/org/jboss/test/JBossClusteredTestCase.java
   projects/test/trunk/src/main/java/org/jboss/test/JBossTestClusteredServices.java
   projects/test/trunk/src/main/java/org/jboss/test/JBossTestServices.java
Log:
Provide method JBossClusteredTestcase.getServersForURL() to match JBossTestCase.getServerHostForURL() (JBAS-8540)

Modified: projects/test/trunk/src/main/java/org/jboss/test/JBossClusteredTestCase.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/JBossClusteredTestCase.java	2010-12-08 18:26:01 UTC (rev 109786)
+++ projects/test/trunk/src/main/java/org/jboss/test/JBossClusteredTestCase.java	2010-12-08 20:05:35 UTC (rev 109787)
@@ -83,6 +83,16 @@
       return clusterServices.getServers();
    }
 
+   /**
+    * Get the JBoss servers as above, but in a form suitable for 
+    * embedding in URLs - IPv6 literals will be enclosed in square 
+    * brackets (see RFC 2732). For JBAS-8540.
+    */
+   public String[] getServersForURL() throws Exception 
+   {
+      return clusterServices.getServersForURL();
+   }
+   
    public String[] getNamingURLs() throws Exception
    {
       return clusterServices.getNamingURLs();

Modified: projects/test/trunk/src/main/java/org/jboss/test/JBossTestClusteredServices.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/JBossTestClusteredServices.java	2010-12-08 18:26:01 UTC (rev 109786)
+++ projects/test/trunk/src/main/java/org/jboss/test/JBossTestClusteredServices.java	2010-12-08 20:05:35 UTC (rev 109787)
@@ -95,6 +95,17 @@
       servers.toArray(tmp);
       return tmp;
    }
+   
+   public String[] getServersForURL() throws Exception
+   {
+	  String[] servers = getServers() ;
+      String[] result = new String[servers.length];
+      for (int i=0; i < servers.length; i++) {
+    	  result[i] = JBossTestUtil.fixHostnameForURL(servers[i]);
+      }
+      return result;
+   }
+
    public String getServer(int index) throws Exception
    {
 //      init();

Modified: projects/test/trunk/src/main/java/org/jboss/test/JBossTestServices.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/JBossTestServices.java	2010-12-08 18:26:01 UTC (rev 109786)
+++ projects/test/trunk/src/main/java/org/jboss/test/JBossTestServices.java	2010-12-08 20:05:35 UTC (rev 109787)
@@ -484,14 +484,6 @@
    public String getServerHostForURL()
    {
       String hostName = getServerHost() ;
-      
-      if (hostName == null)
-    	  return hostName;	
-      
-      // check for IPv6 literal
-      if (hostName.indexOf(":") != -1)
-    	  return "[" + hostName + "]" ;
-      else 
-    	  return hostName ;
+      return JBossTestUtil.fixHostnameForURL(hostName);
    }   
 }