axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hawk...@apache.org
Subject cvs commit: ws-axis/c test.xml
Date Tue, 21 Sep 2004 16:09:31 GMT
hawkeye     2004/09/21 09:09:31

  Modified:    c        test.xml
  Log:
  Fixes for Jira defect AXISCPP-167.
  Allow the use of a properties file to specify a subset of tests to run, rather than running
all tests and always having half the tests fail because the service is not available.
  
  Also support for the automation of handler tests has been included.
  
  Done by Andrew Perry, but he's still awainting access to the Axiscpp project.
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.10      +46 -9     ws-axis/c/test.xml
  
  Index: test.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/test.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- test.xml	21 Sep 2004 10:24:56 -0000	1.9
  +++ test.xml	21 Sep 2004 16:09:30 -0000	1.10
  @@ -48,6 +48,8 @@
   	  included within the property files
   	  -->
   	<property name="dir.src" value="${basedir}/tests/auto_build/testcases"/>
  +	<property name="test.list" value="${dir.src}/wsdls/test.properties"/>
  +	<property name="dir.include" value="${dir.package.include}"/>
   
   	<!--
   	  Compiler definitions
  @@ -222,6 +224,7 @@
   		<mkdir dir="${dir.test.generated}/${client.lang}/${testName}"/>
   		<!-- Setup classpath for WSDL2Ws -->
   		<path id ="cp">
  +			<fileset dir="${dir.package.WSDL2Ws}" includes="wsdl2ws.jar"/>
   			<fileset dir="${dir.axisJARs}" includes="*.jar"/>
   		</path>
   		<!-- Run WSDL2Ws -->
  @@ -470,13 +473,14 @@
   
   		<trycatch>
   			<try>
  -				<parallel timeout="120000">
  +				<parallel timeout="30000">
   					<!-- Run Monitor utility to allow validation of message across the wire -->
   					<java classname="org.apache.test.TCPMonitor">
   						<arg line="-l ${monitorPort}"/>
   						<arg line="-p ${testPort}"/>
   						<arg line="-h ${testHost}"/>
   						<arg line="-o ${dir.test.generated}/${client.lang}/${testName}/tcpm.out"/>
  +						<arg line="-r ${dir.test.generated}/${client.lang}/${testName}/tcpm.res"/>
   						<classpath>
   							<pathelement location="${basedir}/tests/utils/monitor/monitor.jar"/>
   						</classpath>
  @@ -496,6 +500,16 @@
   							<env key="LD_LIBRARY_PATH" value="${dir.libraries}${path.separator}${dir.xmlParser}/lib"/>
   							<env key="AXISCPP_DEPLOY" value="${axiscpp_deploy}"/>
   						</exec>
  +
  +						<sleep seconds="2"/>
  +
  +						<java classname="org.apache.test.StopTCPMonitor">
  +							<arg line="-p ${monitorPort}"/>
  +							<arg line="-h localhost"/>
  +							<classpath>
  +								<pathelement location="${basedir}/tests/utils/monitor/monitor.jar"/>
  +							</classpath>
  +						</java>
   					</sequential>
   				</parallel>
   			</try>
  @@ -634,7 +648,7 @@
   		<foreach target="runAllLangTests" param="client.lang" list="${lang.list}" />
   	</target>
   
  -	<target name="runAllLangTests" depends="initialize, setLanguage,runTests,runIndividualTest"
description="Build and run all tests per language"/>
  +	<target name="runAllLangTests" depends="initialize,setLanguage,runTests,runIndividualTest"
description="Build and run all tests per language"/>
   
   	<!--
   	  Need to set a language property for wsdl2ws
  @@ -648,23 +662,46 @@
   		</condition>
   	</target>
   
  -	<!--
  -	  Locates all test WSDL files, and runs test for each
  -	  -->
  -	<target name="runTests" unless="individualTest">
  +	<target name="setWSDLList" depends="checkIfTestList, setFromTestList, setDefaultTestList"/>
  +
  +	<target name="checkIfTestList">
  +		<condition property="testListExists">
  +			<available file="${test.list}"/>
  +		</condition>
  +	</target>
  +
  +	<target name="setFromTestList" if="testListExists">
  +		<path id="testWSDLs">
  +			<fileset dir="${basedir}" includesfile="${test.list}"/>
  +		</path>
  +	</target>
  +
  +	<target name="setDefaultTestList" unless="testListExists">
   		<path id="testWSDLs">
   			<fileset dir="${dir.src}/wsdls" includes="*.wsdl"/>
   		</path>
  +	</target>
  +
  +	<!--
  +	  Locates all test WSDL files, and runs test for each
  +	  -->
  +	<target name="runTests" depends="setWSDLList" unless="individualTest">
   		<foreach target="runTest" param="wsdlFile">
   			<path refid="testWSDLs"/>
   		</foreach>
   	</target>
   
  -	<target name="setIndividualWSDLName">
  -		<property name="wsdlFile" value="${test.name}.wsdl" />
  +	<target name="setIndividualWSDLName" if="individualTest">
  +		<path id="testWSDLs">
  +			<fileset dir="${dir.src}/wsdls" includes="${test.name}.wsdl"/>
  +		</path>
   	</target>
   
  -	<target name="runIndividualTest" depends="setIndividualWSDLName, runTest" if="individualTest"
/>
  +	<target name="runIndividualTest" depends="setIndividualWSDLName" if="individualTest">
  +		<foreach target="runTest" param="wsdlFile">
  +			<path refid="testWSDLs"/>
  +		</foreach>
  +	</target>
   
   	<!--
   	  Display all results
  
  
  

Mime
View raw message