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

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

Author: ron.sigal at jboss.com
Date: 2011-04-13 16:39:04 -0400 (Wed, 13 Apr 2011)
New Revision: 6316

Modified:
   remoting2/branches/2.2/build.xml
Log:
JBREM-1280: Broke out http tests since JBossWeb depends on jdk1.5.

Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml	2011-04-13 20:36:28 UTC (rev 6315)
+++ remoting2/branches/2.2/build.xml	2011-04-13 20:39:04 UTC (rev 6316)
@@ -682,8 +682,10 @@
    </target>
 
    <target name="tests.functional.core" depends="configure">
-      <!--antcall target="tests.functional.serialization.java.core" inheritrefs="true"/-->
+      <antcall target="tests.functional.serialization.java.core" inheritrefs="true"/>
+      <antcall target="tests.functional.serialization.java.http.core" inheritrefs="true"/>
       <antcall target="tests.functional.serialization.jboss.core" inheritrefs="true"/>
+      <antcall target="tests.functional.serialization.jboss.http.core" inheritrefs="true"/>
    </target>
 
    <!-- calls functional main tests and marshall test with both java and jboss (if jdk1.5) serialization -->
@@ -821,6 +823,7 @@
    </target>
 
    <target name="tests.functional.main.core" depends="tests.jars">
+      <echo>bisocket/rmi/socket: ${metadata}</echo>
       <mkdir dir="${output.tests.results}"/>
       <junit printsummary="true" fork="yes" includeantruntime="true">
          <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
@@ -869,6 +872,71 @@
          </batchtest>
       </junit>
    </target>
+	
+   <target name="tests.functional.serialization.java.http.core" unless="isJDK4">
+      <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true">
+         <param name="serialization" value="java"/>
+      </antcall>
+   </target>
+   
+   <target name="tests.functional.serialization.jboss.http.core" unless="isJDK4">
+      <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true">
+         <param name="serialization" value="jboss"/>
+      </antcall>
+   </target>
+         
+   <target name="tests.functional.http.jbossweb.core" unless="isJDK4">
+      <antcall target="tests.functional.main.http.core" inheritrefs="true">
+         <param name="remoting.metadata.key" value="remoting.metadata"/>
+         <param name="metadata" value="serializationtype=${serialization}"/>
+         <param name="jboss-junit-configuration" value="${serialization}_serialization_jbossweb"/>
+         <param name="classpath" value="tests.classpath"/>
+         <param name="version" value="jbossweb"/>
+      </antcall>
+   </target>
+	
+   <target name="tests.functional.main.http.core">
+      <mkdir dir="${output.tests.results}"/>
+      <echo>http with ${version}: ${metadata}</echo>
+      <junit printsummary="true" fork="yes" includeantruntime="true" maxmemory="1024m">
+         <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+         <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <classpath>
+            <path refid="${classpath}"/>
+            <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+         </classpath>
+         <!-- set system properties required by JRunit -->
+         <sysproperty key="jrunit.bind_addr"  value="${bind.address}"/>
+         <sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/>
+         <sysproperty key="jrunit.mcast_port" value="${multicast.port}"/>
+         <sysproperty key="jrunit.receive_on_all_interfaces" value="${receiveOnAllInterfaces}"/>
+         <sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/>
+         <sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/>
+         <sysproperty key="jrunit.logdir" value="${output.tests}"/>
+         <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/>
+         <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+         <sysproperty key="build.home" value="${basedir}"/>
+         <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+                    extension="-${jboss-junit-configuration}.xml"/>
+         <batchtest fork="yes" todir="${output.tests.results}"
+                    haltonfailure="no">
+            <fileset dir="${tests.compile.dir}">
+               <include name="**/remoting/**/http/**/*TestCase.class"/>
+               <include name="**/remoting/**/*HTTP*TestCase.class"/>
+               <include name="**/remoting/**/*Http*TestCase.class"/>
+               <include name="**/remoting/**/*http*TestCase.class"/>
+               <exclude name="**/remoting/**/HTTPSAsynchCallbackTestCase.class"/>
+            	<exclude name="**/remoting/**/HTTPInvokerClientTestCase.class"/>
+               <exclude name="**/remoting/transport/http/compression/*CompressedHTTPInvokerTestCase*"/>
+               <exclude name="**/remoting/**/performance/**"/>
+               <exclude name="**/remoting/**/nonserializable/**"/>
+               <exclude name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/>
+               <exclude name="**/remoting/versioning/**/*TestCase.class"/>
+            </fileset>
+         </batchtest>
+      </junit>
+   </target>
 
    <target name="tests.functional.main.isJDK5" depends="tests.jars" if="isJDK5">
       <mkdir dir="${output.tests.results}"/>
@@ -1045,6 +1113,9 @@
      	      <equals arg1="${ant.java.version}" arg2="1.6"/>
          </or>
       </condition>
+      <condition property="isJDK4">
+         <contains string="${java.runtime.version}" substring="1.4"/>
+      </condition>
    </target>
 
    <!-- This section is for quick smoke test of java vs. jboss serialization -->