[jboss-cvs] JBossAS SVN: r108915 - in branches/JBPAPP_5_1_datagrid/testsuite: src/main/org/jboss/test/cluster/datagrid/test and 1 other directory.

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

Author: rachmatowicz at jboss.com
Date: 2010-10-25 17:32:03 -0400 (Mon, 25 Oct 2010)
New Revision: 108915

Modified:
   branches/JBPAPP_5_1_datagrid/testsuite/imports/server-config.xml
   branches/JBPAPP_5_1_datagrid/testsuite/src/main/org/jboss/test/cluster/datagrid/test/HotRodClientTestCase.java
Log:
Revert changes for test case framework for datagrid tests to be based on JBossTestCase. Instead, add in separate server configurations for SBM based testing, datagrid-sbm-0 and datagrid-sbm-1.

Modified: branches/JBPAPP_5_1_datagrid/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/imports/server-config.xml	2010-10-25 20:41:41 UTC (rev 108914)
+++ branches/JBPAPP_5_1_datagrid/testsuite/imports/server-config.xml	2010-10-25 21:32:03 UTC (rev 108915)
@@ -1396,33 +1396,60 @@
        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
        <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
     </server>
-    <server name="datagrid-0" host="${node0}" httpPort="8180" rmiPort="1199">
+   	<!-- datagrid configs not based on SBM -->
+    <!-- <server name="datagrid-0" host="${node0}" hasWebServer="false"> -->
+    <server name="datagrid-0" host="${node0}">
        <jvmarg value="-Xms128m" />
        <jvmarg value="-Xmx512m" />
        <jvmarg value="-XX:MaxPermSize=512m" />
        <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
        <jvmarg value="-XX:-UseGCOverheadLimit" />
-       <sysproperty key="jboss.service.binding.set" value="ports-01" />
        <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
        <sysproperty key="java.net.preferIPv4Stack" value="true" />
-       <!-- most JGroups properties provided by SBM -->
        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
        <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
     </server>
-    <server name="datagrid-1" host="${node0}" httpPort="8280" rmiPort="1299">
+    <!-- <server name="datagrid-1" host="${node1}"  hasWebServer="false"> -->
+    <server name="datagrid-1" host="${node1}">
        <jvmarg value="-Xms128m" />
        <jvmarg value="-Xmx512m" />
        <jvmarg value="-XX:MaxPermSize=512m" />
        <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
        <jvmarg value="-XX:-UseGCOverheadLimit" />
-       <sysproperty key="jboss.service.binding.set" value="ports-02" />
        <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
        <sysproperty key="java.net.preferIPv4Stack" value="true" />
-       <!-- most JGroups properties provided by SBM -->
        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
        <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
     </server>
    	
+   	<!-- datagrid configs based on SBM -->
+   	<server name="datagrid-sbm-0" host="${node0}" httpPort="8180" rmiPort="1199">
+   	   <jvmarg value="-Xms128m" />
+   	   <jvmarg value="-Xmx512m" />
+   	   <jvmarg value="-XX:MaxPermSize=512m" />
+   	   <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+   	   <jvmarg value="-XX:-UseGCOverheadLimit" />
+   	   <sysproperty key="jboss.service.binding.set" value="ports-01" />
+   	   <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+   	   <sysproperty key="java.net.preferIPv4Stack" value="true" />
+   	   <!-- most JGroups properties provided by SBM -->
+   	   <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+   	   <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+   	</server>
+   	<server name="datagrid-sbm-1" host="${node0}" httpPort="8280" rmiPort="1299">
+   	   <jvmarg value="-Xms128m" />
+   	   <jvmarg value="-Xmx512m" />
+   	   <jvmarg value="-XX:MaxPermSize=512m" />
+   	   <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+   	   <jvmarg value="-XX:-UseGCOverheadLimit" />
+   	   <sysproperty key="jboss.service.binding.set" value="ports-02" />
+   	   <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+   	   <sysproperty key="java.net.preferIPv4Stack" value="true" />
+   	   <!-- most JGroups properties provided by SBM -->
+   	   <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+   	   <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+   	</server>
+   	
    </server:config>
 
     <!-- A macro for printing sleep before going into sleep

Modified: branches/JBPAPP_5_1_datagrid/testsuite/src/main/org/jboss/test/cluster/datagrid/test/HotRodClientTestCase.java
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/main/org/jboss/test/cluster/datagrid/test/HotRodClientTestCase.java	2010-10-25 20:41:41 UTC (rev 108914)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/main/org/jboss/test/cluster/datagrid/test/HotRodClientTestCase.java	2010-10-25 21:32:03 UTC (rev 108915)
@@ -22,7 +22,7 @@
 package org.jboss.test.cluster.datagrid.test;
 
 import java.util.Properties;
-import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossClusteredTestCase;
 import junit.framework.Test;
 
 /**
@@ -32,7 +32,7 @@
  * @version $Revision: $
  */
 public class HotRodClientTestCase
-   extends JBossTestCase
+   extends JBossClusteredTestCase
 {
    
    public HotRodClientTestCase(String name)