[jboss-cvs] JBoss Messaging SVN: r1723 - in branches/Branch_Client_Failover_Experiment/tests: . src/org/jboss/test/messaging/jms/clustering

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-12-07 20:08:12 -0500 (Thu, 07 Dec 2006)
New Revision: 1723

Modified:
   branches/Branch_Client_Failover_Experiment/tests/build.xml
   branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/SimpleClusteringTest.java
Log:
fixed ant clustering-tests. Now clustering tests can be run from and, not only with runtest

Modified: branches/Branch_Client_Failover_Experiment/tests/build.xml
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/build.xml	2006-12-08 00:49:15 UTC (rev 1722)
+++ branches/Branch_Client_Failover_Experiment/tests/build.xml	2006-12-08 01:08:12 UTC (rev 1723)
@@ -283,10 +283,11 @@
       <java classname="org.jboss.test.messaging.tools.jmx.rmi.RMITestServer" fork="true" spawn="true">
          <sysproperty key="test.server.index" value="${test.server.index}"/>
          <sysproperty key="module.output" value="${tests.output}"/>
-         <sysproperty key="remote.test.suffix" value="-remote"/>
+         <sysproperty key="remote.test.suffix" value="-remote-${test.server.index}"/>
          <sysproperty key="test.bind.address" value="${test.bind.address}"/>
          <sysproperty key="test.database" value="${clustering.tests.database}"/>
          <sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
+         <sysproperty key="test.clustered" value="true"/>
          <!--
          <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=rmiserver"/>
          -->
@@ -662,6 +663,13 @@
       <echo message="Running clustering tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
       <echo message=""/>
 
+      <!--
+
+           By default, clustered tests are run in a "remote" configuration (the clustered
+           nodes physically live in different VMs. If you want to test a co-located clustered
+           configuration, use bin/runtest -clustered
+      -->
+
       <junit printsummary="${junit.printsummary}"
              fork="${junit.fork}"
              includeantruntime="yes"
@@ -675,21 +683,23 @@
          <sysproperty key="test.bind.address" value="${test.bind.address}"/>
          <sysproperty key="test.database" value="${clustering.tests.database}"/>
          <sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
+         <sysproperty key="test.clustered" value="true"/>
          <jvmarg value="-Xmx512M"/>
-         <!--
-         <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=antjunit"/>
-         -->
+
          <classpath>
             <path refid="test.execution.classpath"/>
-
-            <!-- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
             <!--
-            <path refid="jboss.test.classpath"/>
+                Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done
             -->
+            <!--
+                 <path refid="jboss.test.classpath"/>
+            -->
          </classpath>
 
-         <!-- Use this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
          <!--
+              Use this when http://jira.jboss.org/jira/browse/JBAS-2554 is done
+         -->
+         <!--
          <sysproperty key="jboss-junit-configuration" value="Remote"/>
          <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
             usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
@@ -706,18 +716,27 @@
             <formatter type="plain" usefile="${junit.formatter.usefile}"/>
             <fileset dir="${build.tests.classes}">
                <include name="**/jms/clustering/ManualClusteringTest.class"/>
+               <!--
+               <include name="**/jms/clustering/SimpleClusteringTest.class"/>
+               -->
             </fileset>
          </batchtest>
       </junit>
 
+      <!--
+          Stop the servers in the reverse order, so the VM that runs the RMI registry dies last.
+      -->
+
       <antcall target="stop-rmi-server-clustering">
-         <param name="test.server.index" value="0"/>
+         <param name="test.server.index" value="2"/>
       </antcall>
+
       <antcall target="stop-rmi-server-clustering">
          <param name="test.server.index" value="1"/>
       </antcall>
+
       <antcall target="stop-rmi-server-clustering">
-         <param name="test.server.index" value="2"/>
+         <param name="test.server.index" value="0"/>
       </antcall>
 
    </target>

Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/SimpleClusteringTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/SimpleClusteringTest.java	2006-12-08 00:49:15 UTC (rev 1722)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/SimpleClusteringTest.java	2006-12-08 01:08:12 UTC (rev 1723)
@@ -10,7 +10,6 @@
 
 import javax.jms.Connection;
 import javax.jms.Session;
-import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.Message;
 import javax.jms.TextMessage;