[jboss-cvs] JBossAS SVN: r75732 - in trunk/testsuite: src/main/org/jboss/test/cluster/multicfg/test and 1 other directories.

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

Author: galder.zamarreno at jboss.com
Date: 2008-07-12 11:54:45 -0400 (Sat, 12 Jul 2008)
New Revision: 75732

Modified:
   trunk/testsuite/build.sh
   trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/HAJndiTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/testutil/MockHAPartition.java
Log:
[JBAS-5647] MockHAPartition fixed to fulfill new HAPartition API. HAJndiTestCase comments extended with regards to auto discovery test. Finally, added ability for build.sh to read ANT_OPTS defined at the command line, which is handy when you have such a slow laptop like mine where it currently takes around 4 minutes for AS to start! Thanks to this build.sh fix, you can do something like this: export ANT_OPTS="-Djbossas.startup.timeout=240" to give allow 4 minutes for AS to startup.

Modified: trunk/testsuite/build.sh
===================================================================
--- trunk/testsuite/build.sh	2008-07-12 15:50:20 UTC (rev 75731)
+++ trunk/testsuite/build.sh	2008-07-12 15:54:45 UTC (rev 75732)
@@ -145,7 +145,7 @@
     fi
 
     # need to specify planet57/buildmagic protocol handler package
-    ANT_OPTS="-Djava.protocol.handler.pkgs=org.jboss.net.protocol"
+    ANT_OPTS="$ANT_OPTS -Djava.protocol.handler.pkgs=org.jboss.net.protocol"
 
     # setup some build properties
     ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/HAJndiTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/HAJndiTestCase.java	2008-07-12 15:50:20 UTC (rev 75731)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/HAJndiTestCase.java	2008-07-12 15:54:45 UTC (rev 75732)
@@ -38,6 +38,7 @@
  * HA-JNDI clustering tests.
  *
  * @author Jerry Gauthier
+ * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  * @version $Revision$
  */
 public class HAJndiTestCase
@@ -339,8 +340,10 @@
       getLog().debug("HAJndiTestCase.testAutoDiscovery()");
       validateUrls();
       
-      // this test doesn't run properly if node0=localhost
-      if (NODE0 != null && NODE0.equalsIgnoreCase("localhost") )
+      // this test doesn't run properly if node0=localhost or node0=127.0.0.1
+      // because the jndi code would find localhost:1099 server and would use 
+      // that one
+      if (NODE0 != null && (NODE0.equalsIgnoreCase("localhost") || NODE0.equalsIgnoreCase("127.0.0.1")))
       {
          getLog().debug("testAutoDiscovery() - test skipped because node0=localhost");
          return;

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/MockHAPartition.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/MockHAPartition.java	2008-07-12 15:50:20 UTC (rev 75731)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/MockHAPartition.java	2008-07-12 15:54:45 UTC (rev 75732)
@@ -28,6 +28,7 @@
 import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
 import org.jboss.ha.framework.interfaces.DistributedState;
 import org.jboss.ha.framework.interfaces.HAPartition;
+import org.jboss.ha.framework.interfaces.ResponseFilter;
 
 /**
  * Mock implementation of HAPartition intended to support unit testing
@@ -35,6 +36,7 @@
  * JChannel.
  * 
  * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  * @version $Id$
  */
 public class MockHAPartition implements HAPartition
@@ -119,11 +121,16 @@
 
       throw new UnsupportedOperationException("not implemented");
    }
+   
+   public ArrayList callMethodOnCluster(String serviceName, String methodName, Object[] args, Class[] types, 
+         boolean excludeSelf, ResponseFilter filter) throws Exception
+   {
+      throw new UnsupportedOperationException("not implemented");
+   }
 
    public ArrayList callMethodOnCluster(String serviceName, String methodName, Object[] args, boolean excludeSelf)
          throws Exception
    {
-
       throw new UnsupportedOperationException("not implemented");
    }