[jboss-remoting-commits] JBoss Remoting SVN: r5399 - remoting2/branches/2.2.

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

Author: ron.sigal at jboss.com
Date: 2009-08-29 20:36:17 -0400 (Sat, 29 Aug 2009)
New Revision: 5399

Modified:
   remoting2/branches/2.2/build.xml
Log:
JBREM-1145: Added unit tests for servlet transport.

Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml	2009-08-27 14:36:59 UTC (rev 5398)
+++ remoting2/branches/2.2/build.xml	2009-08-30 00:36:17 UTC (rev 5399)
@@ -952,7 +952,6 @@
          <env key="Path" path="${env.Path}${path.separator}c:/cygwin/usr/bin"/>
          <env key="JBOSS_HOME" value="${jboss.home}"/>
          <arg file="${jboss.home}/bin/run.sh"/>
-         <arg value="-c default"/>
       </exec>
       <echo>Going to sleep for ${as.startup.time} seconds</echo>
       <sleep seconds="${as.startup.time}"/>
@@ -989,6 +988,7 @@
      <antcall target="AS.start"/>
      <antcall target="tests.servlet" inheritrefs="true"/>
      <antcall target="tests.servlet.callback" inheritrefs="true"/>
+     <antcall target="tests.servlet.marshal" inheritrefs="true"/>
      <antcall target="tests.servlet.marshal.config" inheritrefs="true"/>
      <antcall target="tests.servlet.marshal.noconfig" inheritrefs="true"/>
      <antcall target="tests.servlet.nopreservelines" inheritrefs="true"/>
@@ -1057,6 +1057,36 @@
      <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
    </target>
 
+   <target name="tests.servlet.marshal" depends="tests.servlet.config">
+     <copy file="${servlet.tests.dir}/marshal/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+     <sleep seconds="2"/>
+     <copy todir="${jboss.deploy.dir}">
+       <fileset dir="${output.lib.dir}">
+         <include name="servlet-invoker.war/**"/>
+       </fileset>
+     </copy>
+     <copy file="${servlet.tests.dir}/marshal/WEB-INF/web.xml"
+           todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/>  
+     <sleep seconds="4"/>
+     <junit printsummary="true" fork="yes" includeantruntime="true">
+        <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+        <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+        <classpath>
+           <path refid="tests.classpath"/>
+           <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+        </classpath>
+        <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+                   extension="-java_serialization.xml"/>
+        <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
+           <fileset dir="${tests.compile.dir}">
+             <include name="**/remoting/transport/servlet/marshal/*TestClient.class"/>
+           </fileset>
+        </batchtest>
+     </junit>
+     <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+     <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+   </target>
+	
    <target name="tests.servlet.marshal.config">
      <copy file="${servlet.tests.dir}/marshal/config/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
      <sleep seconds="4"/>