[jboss-cvs] JBossAS SVN: r108914 - in branches/JBPAPP_5_1_datagrid/testsuite: src/main/org/jboss/test/cluster/datagrid/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 25 16:41:41 EDT 2010
Author: rachmatowicz at jboss.com
Date: 2010-10-25 16:41:41 -0400 (Mon, 25 Oct 2010)
New Revision: 108914
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
branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/infinispan-configuration.xml
branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/jgroups-udp.xml
branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/infinispan-configuration.xml
branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/jgroups-udp.xml
Log:
Update test case framework for datagrid tests to be based on JBossTestCase.
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:27:55 UTC (rev 108913)
+++ branches/JBPAPP_5_1_datagrid/testsuite/imports/server-config.xml 2010-10-25 20:41:41 UTC (rev 108914)
@@ -1396,27 +1396,29 @@
<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}" hasWebServer="false"> -->
- <server name="datagrid-0" host="${node0}">
+ <server name="datagrid-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-1" host="${node1}" hasWebServer="false"> -->
- <server name="datagrid-1" host="${node1}">
+ <server name="datagrid-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>
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:27:55 UTC (rev 108913)
+++ 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)
@@ -22,7 +22,7 @@
package org.jboss.test.cluster.datagrid.test;
import java.util.Properties;
-import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.test.JBossTestCase;
import junit.framework.Test;
/**
@@ -32,7 +32,7 @@
* @version $Revision: $
*/
public class HotRodClientTestCase
- extends JBossClusteredTestCase
+ extends JBossTestCase
{
public HotRodClientTestCase(String name)
Modified: branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/infinispan-configuration.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/infinispan-configuration.xml 2010-10-25 20:27:55 UTC (rev 108913)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/infinispan-configuration.xml 2010-10-25 20:41:41 UTC (rev 108914)
@@ -44,11 +44,12 @@
There is no added cost to defining a transport but not creating a cache that uses one, since the transport
is created and initialized lazily.
-->
- <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000" nodeName="Jalapeno"
- transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport">
+ <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000" nodeName="Jalapeno">
+ <!-- Comment this specification out until it is fixed.
<properties>
<property name="configurationFile" value="jgroups-udp.xml"/>
</properties>
+ -->
</transport>
Modified: branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/jgroups-udp.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/jgroups-udp.xml 2010-10-25 20:27:55 UTC (rev 108913)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-0/deploy/datagrid.sar/META-INF/jgroups-udp.xml 2010-10-25 20:41:41 UTC (rev 108914)
@@ -4,6 +4,7 @@
<UDP
mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}"
mcast_port="${jgroups.udp.mcast_port:46655}"
+ bind_port="${jboss.jgroups.udp.bind_port:55200}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -38,7 +39,7 @@
<PING timeout="3000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
+ <FD_SOCK start_port="${jboss.jgroups.udp.fd_sock_port:54200}"/>
<FD_ALL/>
<BARRIER />
<pbcast.NAKACK use_stats_for_retransmission="false"
Modified: branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/infinispan-configuration.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/infinispan-configuration.xml 2010-10-25 20:27:55 UTC (rev 108913)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/infinispan-configuration.xml 2010-10-25 20:41:41 UTC (rev 108914)
@@ -44,11 +44,12 @@
There is no added cost to defining a transport but not creating a cache that uses one, since the transport
is created and initialized lazily.
-->
- <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000" nodeName="Jalapeno"
- transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport">
+ <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000" nodeName="Jalapeno">
+ <!-- Connet this specification out until it is fixed
<properties>
<property name="configurationFile" value="jgroups-udp.xml"/>
</properties>
+ -->
</transport>
<!-- Again, sensible defaults are used here if this is omitted. -->
Modified: branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/jgroups-udp.xml
===================================================================
--- branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/jgroups-udp.xml 2010-10-25 20:27:55 UTC (rev 108913)
+++ branches/JBPAPP_5_1_datagrid/testsuite/src/resources/test-configs/datagrid-1/deploy/datagrid.sar/META-INF/jgroups-udp.xml 2010-10-25 20:41:41 UTC (rev 108914)
@@ -4,6 +4,7 @@
<UDP
mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}"
mcast_port="${jgroups.udp.mcast_port:46655}"
+ bind_port="${jboss.jgroups.udp.bind_port:55200}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -38,7 +39,7 @@
<PING timeout="3000" num_initial_members="3"/>
<MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
+ <FD_SOCK start_port="${jboss.jgroups.udp.fd_sock_port:54200}"/>
<FD_ALL/>
<BARRIER />
<pbcast.NAKACK use_stats_for_retransmission="false"
@@ -54,4 +55,4 @@
<pbcast.STREAMING_STATE_TRANSFER/>
<!-- <pbcast.STATE_TRANSFER/> -->
<pbcast.FLUSH timeout="0"/>
-</config>
+</config>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list