axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From perr...@apache.org
Subject cvs commit: ws-axis/c test.xml
Date Fri, 15 Oct 2004 15:10:02 GMT
perryan     2004/10/15 08:10:02

  Modified:    c        test.xml
  Log:
  Added support to have a properties file to specify alternative endpoints for the auto_build
tests. This is an optional file.
  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.14      +78 -26    ws-axis/c/test.xml
  
  Index: test.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/test.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- test.xml	1 Oct 2004 20:29:47 -0000	1.13
  +++ test.xml	15 Oct 2004 15:10:02 -0000	1.14
  @@ -49,6 +49,7 @@
   	  -->
   	<property name="dir.src" value="${basedir}/tests/auto_build/testcases"/>
   	<property name="test.list" value="${dir.src}/test.list"/>
  +	<property name="test.endpoints" value="${dir.src}/test.endpoints"/>
   
   	<!--
   	  Compiler definitions
  @@ -143,11 +144,11 @@
   			<os family="windows"/>
   		</condition>
   		<condition property="aix">
  -            <os name="AIX"/>
  -        </condition>
  -        <condition property="linux">
  -            <os name="Linux"/>
  -        </condition>
  +			<os name="AIX"/>
  +		</condition>
  +		<condition property="linux">
  +			<os name="Linux"/>
  +		</condition>
   	</target>
   
   	<!--
  @@ -446,12 +447,22 @@
   	  and convert these files to the OS specific format so the filesmatch
   	  comparison later in this script works on all platforms.
   	  -->
  -	<target name="setExpectations">
  +	<target name="setExpectations" unless="buildOnly">
   		<property name="expected.file" value="${dir.test.generated}/${client.lang}/${testName}/${testName}.cpp.expected"/>
   		<property name="r_expected.file" value="${dir.test.generated}/${client.lang}/${testName}/${testName}Request.expected"/>
  -
  +		<condition property="requestFileExists">
  +			<available file="${dir.src}/output/${testName}Request.out"/>
  +		</condition>
   		<copy file="${dir.src}/output/${testName}.cpp.out" tofile="${expected.file}"/>
   		<!--
  +		  Convert to OS specific format
  +		  -->
  +		<fixcrlf srcdir="${dir.test.generated}/${client.lang}/${testName}" includes="${testName}.cpp.expected"/>
  +	</target>
  +
  +	<!-- Only copy expected request file if it exists -->
  +	<target name="copyRequestExpectedOutput" if="requestFileExists" unless="buildOnly">
  +		<!--
   		  This is an optional file and might not exist so don't fail if
   		  it doesn't.
   		  -->
  @@ -460,19 +471,19 @@
   		<!--
   		  Convert to OS specific format
   		  -->
  -		<fixcrlf srcdir="${dir.test.generated}/${client.lang}/${testName}" includes="${testName}.expected"/>
  -
  +		<fixcrlf srcdir="${dir.test.generated}/${client.lang}/${testName}" includes="${testName}Request.expected"/>
   	</target>
   
   	<!--
   	  Execute the test
   	  -->
  -	<target name="executeTest" depends="setExpectations" if="successfulClientCompilation"
unless="buildOnly">
  +	<target name="executeTest" depends="setExpectations,copyRequestExpectedOutput" if="successfulClientCompilation"
unless="buildOnly">
   		<property name="results.file" value="${dir.test.generated}/${client.lang}/${testName}/${testName}.out"/>
   
   		<trycatch>
   			<try>
  -				<parallel timeout="30000">
  +				<parallel timeout="40000" failonany="false">
  +					<echo message="RUNNING TEST ${testName} ${clientArgs}"/>
   					<!-- Run Monitor utility to allow validation of message across the wire -->
   					<java classname="org.apache.test.TCPMonitor">
   						<arg line="-l ${monitorPort}"/>
  @@ -486,33 +497,40 @@
   					</java>
   		
   					<sequential>
  +						<echo message="EXEC Starts in 3 secs"/>
   						<!-- Wait for jvm to start monitor program -->
  -						<sleep seconds="5"/>
  +						<sleep seconds="3"/>
   						<!-- Run the client test -->
   						<exec executable="${dir.test.generated}/${client.lang}/${testName}/${testName}"
   						 dir="${dir.test.generated}/${client.lang}/${testName}" output="${results.file}"
   						 error="${dir.test.generated}/${client.lang}/${testName}/${testName}.err"
   						 failifexecutionfails="false" vmlauncher="false">
  -							<arg line="-p ${monitorPort}"/>
  -							<arg line="-s localhost"/>
  +							<!-- <arg line="-p ${monitorPort}"/>
  +							<arg line="-s localhost"/> -->
  +							<arg line="${clientArgs}"/>
   							<env key="PATH" value="${java.library.path}${path.separator}${dir.libraries}${path.separator}${dir.xmlParser}/bin${path.separator}${dir.xmlParser}"/>
   							<env key="LD_LIBRARY_PATH" value="${dir.libraries}${path.separator}${dir.xmlParser}/lib${path.separator}${dir.xmlParser}"/>
   							<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>
  +						<echo message="EXEC FINISHED"/>
   					</sequential>
   				</parallel>
   			</try>
  -			<catch/>
  +			<catch>
  +				<echo message="IN CATCH"/>
  +			</catch>
  +			<finally>
  +				<echo message="TELLING MONITOR TO STOP"/>
  +				<sleep seconds="3"/>
  +				<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>
  +				<echo message="MONITOR STOPPED"/>
  +			</finally>
   		</trycatch>
   	</target>
   	
  @@ -625,9 +643,43 @@
   	<target name="validateTestRun" depends="validateTestClient, validateMessageOnWire"/>
   
   	<!--
  +	  See if an endpoint has been specified for this test, otherwise set the
  +	  server and port arguments
  +	  -->
  +	<target name="setTestArgs" depends="getTestProperties,setTestProperties"/>
  +
  +	<target name="getTestProperties">
  +		<property file="${test.endpoints}"/>
  +	</target>
  +
  +	<target name="setTestProperties" depends="setEPName,setURI,setEP"/>
  +
  +	<target name="setEPName">
  +		<property name="EPName" value="${testName}EP"/>
  +	</target>
  +
  +	<target name="setURI" if="${EPName}">
  +		<propertycopy property="EP" from="${EPName}"/>
  +	</target>
  +
  +	<target name="setEP">
  +		<condition property="clientArgs" value="-p ${monitorPort} -s localhost">
  +			<not>
  +				<isset property="EP"/>
  +			</not>
  +		</condition>
  +		<condition property="endpoint" value="http://localhost:${monitorPort}/${EP}">
  +			<isset property="EP"/>
  +		</condition>
  +		<condition property="clientArgs" value="${endpoint}">
  +			<isset property="endpoint"/>
  +		</condition>
  +	</target>
  +
  +	<!--
   	  Runs test for a given WSDL file
   	  -->
  -	<target name="runTest" depends="initialize, stripTestName, buildTest, executeTest,
validateTestRun"/>
  +	<target name="runTest" depends="initialize,stripTestName,buildTest,setTestArgs,executeTest,validateTestRun"/>
   
   	<target name="setLangList">
   		<condition property="lang.list" value="${target.lang}">
  
  
  

Mime
View raw message