[jboss-svn-commits] JBoss Messaging SVN: r1618 - branches/Branch_HTTP_Experiment/tests

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-11-21 22:46:36 -0500 (Tue, 21 Nov 2006)
New Revision: 1618

Modified:
   branches/Branch_HTTP_Experiment/tests/build.xml
Log:
modified test framework to run crash tests over both socket and http

Modified: branches/Branch_HTTP_Experiment/tests/build.xml
===================================================================
--- branches/Branch_HTTP_Experiment/tests/build.xml	2006-11-22 03:18:49 UTC (rev 1617)
+++ branches/Branch_HTTP_Experiment/tests/build.xml	2006-11-22 03:46:36 UTC (rev 1618)
@@ -305,12 +305,12 @@
    <!-- ======================================================================================== -->
 
    <target name="tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
-      <antcall target="crash-tests"/>
+      <antcall target="crash-tests"/>                                                            <!--
       <antcall target="invm-tests"/>
-      <antcall target="remote-tests"/>  <!-- default remoting configuration (socket) -->
+      <antcall target="remote-tests"/> -->  <!-- default remoting configuration (socket) --> <!--
       <antcall target="remote-tests">
          <param name="test.remoting" value="http"/>
-      </antcall>
+      </antcall>                                                                                 -->
    </target>
 
    <target name="stress-tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
@@ -619,42 +619,136 @@
       description="Runs crash tests">
 
       <antcall target="stop-rmi-server"/>
+
+      <!--
+          ClientCrashTest over "socket"
+      -->
+
       <antcall target="start-rmi-server"/>
 
       <antcall target="crash-test">
          <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashTest"/>
       </antcall>
 
+      <!--
+          ClientCrashTest over "http"
+      -->
+
+      <antcall target="start-rmi-server">
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <antcall target="crash-test">
+         <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashTest"/>
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <!--
+          ClientCrashTwoConnectionsTest over "socket"
+      -->
+
       <antcall target="start-rmi-server"/>
 
       <antcall target="crash-test">
          <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashTwoConnectionsTest"/>
       </antcall>
 
+      <!--
+          ClientCrashTwoConnectionsTest over "http"
+      -->
+
+      <antcall target="start-rmi-server">
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <antcall target="crash-test">
+         <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashTwoConnectionsTest"/>
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <!--
+          ClientCrashNegativeLeaseTest over "socket"
+      -->
+
       <antcall target="start-rmi-server"/>
 
       <antcall target="crash-test">
-          <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashNegativeLeaseTest"/>
+         <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashNegativeLeaseTest"/>
       </antcall>
 
+      <!--
+          ClientCrashNegativeLeaseTest over "http"
+      -->
+
+      <antcall target="start-rmi-server">
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <antcall target="crash-test">
+         <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashNegativeLeaseTest"/>
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <!--
+          ClientCrashZeroLeaseTest over "socket"
+      -->
+
       <antcall target="start-rmi-server"/>
 
       <antcall target="crash-test">
           <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashZeroLeaseTest"/>
       </antcall>
 
+      <!--
+          ClientCrashZeroLeaseTest over "http"
+      -->
+
+      <antcall target="start-rmi-server">
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <antcall target="crash-test">
+         <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashZeroLeaseTest"/>
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <!--
+          ClientCrashLargeLeaseTest over "socket"
+      -->
+
       <antcall target="start-rmi-server"/>
 
       <antcall target="crash-test">
           <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashLargeLeaseTest"/>
       </antcall>
 
+      <!--
+          ClientCrashLargeLeaseTest over "http"
+      -->
+
+      <antcall target="start-rmi-server">
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <antcall target="crash-test">
+          <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashLargeLeaseTest"/>
+         <param name="test.remoting" value="http"/>
+      </antcall>
+
+      <!--
+          CallbackFailureTest over "socket"
+      -->
+
       <antcall target="start-rmi-server"/>
 
       <antcall target="crash-test">
           <param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.CallbackFailureTest"/>
       </antcall>
 
+      <!--
+          CallbackFailureTest over "http" does not make sense
+      -->
+                                                                                                 
    </target>
 
 
@@ -673,6 +767,7 @@
          <sysproperty key="test.bind.address" value="${test.bind.address}"/>
          <sysproperty key="test.database" value="${functional.tests.database}"/>
          <sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
+         <sysproperty key="test.remoting" value="${test.remoting}"/>
          <jvmarg value="-Xmx512M"/>
          <!--
          <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=antjunit"/>
@@ -693,9 +788,9 @@
             usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
          -->
 
-         <sysproperty key="messaging-test-configuration" value="Crash"/>
+         <sysproperty key="messaging-test-configuration" value="Crash-${test.remoting}"/>
          <formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
-                    usefile="${junit.formatter.usefile}" extension="-Crash.xml"/>
+                    usefile="${junit.formatter.usefile}" extension="-Crash-${test.remoting}.xml"/>
 
          <test name="${crash.test.name}"
                fork="true"