rubys 02/04/14 18:54:50
Modified: java/test build_functional_tests.xml
Log:
Fix digital signature build timeout
Submitted by: Ted Leung <[EMAIL PROTECTED]>
Revision Changes Path
1.38 +39 -3 xml-axis/java/test/build_functional_tests.xml
Index: build_functional_tests.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/build_functional_tests.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build_functional_tests.xml 17 Mar 2002 16:25:08 -0000 1.37
+++ build_functional_tests.xml 15 Apr 2002 01:54:50 -0000 1.38
@@ -24,7 +24,7 @@
<property name="test.functional.usefile" value="true"/>
<property name="test.functional.reportdir" value="test-reports"/>
<property name="test.functional.SimpleAxisPort" value="8080"/>
- <property name="test.functional.fail" value="yes"/>
+ <property name="test.functional.fail" value="no"/>
<path id="test-classpath">
<pathelement location="${build.dest}" />
@@ -83,7 +83,7 @@
<!-- =================================================================== -->
<!-- Runs the JUnit functional test -->
<!-- =================================================================== -->
- <target name="junit-functional" if="junit.present"
depends="junit-functional-prepare,start-signature-signing-and-verification">
+ <target name="junit-functional" if="junit.present"
depends="junit-functional-prepare">
<java classname="org.apache.axis.client.AdminClient" fork="yes">
<classpath refid="test-classpath" />
<arg line="${deploy.xml.property}"/>
@@ -110,6 +110,22 @@
</java>
</target>
+ <target name="junit-functional-secure" if="junit.present"
depends="junit-functional-prepare,start-signature-signing-and-verification">
+ <!-- now, run the actual test -->
+ <junit dir="." printsummary="yes" haltonfailure="${test.functional.fail}"
fork="yes">
+ <classpath refid="test-classpath" />
+ <formatter type="xml" usefile="${test.functional.usefile}"/>
+ <batchtest todir="${test.functional.reportdir}">
+ <fileset dir="${build.dest}">
+ <!-- Convention: each package that's being tested
+ has its own test class collecting all the tests -->
+ <include name="**/TestBidBuySample.class" />
+ <exclude name="**/Interop3TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<!-- =================================================================== -->
<!-- Start Signature Signing and Verification -->
<!-- =================================================================== -->
@@ -149,7 +165,18 @@
<!-- =================================================================== -->
<!-- Stops the functional test HTTP server -->
<!-- =================================================================== -->
- <target name="stop-functional-test-http-server" if="junit.present"
depends="stop-signature-signing-and-verification">
+ <target name="stop-functional-test-http-server" if="junit.present" >
+ <echo message="Stopping test http server."/>
+ <java classname="org.apache.axis.client.AdminClient" fork="yes">
+ <classpath refid="test-classpath" />
+ <arg line="quit"/>
+ </java>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Stops the functional test HTTP server when testing digital signature -->
+ <!-- =================================================================== -->
+ <target name="stop-functional-test-http-server-secure" if="junit.present"
depends="stop-signature-signing-and-verification">
<echo message="Stopping test http server."/>
<java classname="org.apache.axis.client.AdminClient" fork="yes">
<classpath refid="test-classpath" />
@@ -245,6 +272,15 @@
startTarget2="start-functional-test-http-server"
testTarget="junit-functional"
stopTarget="stop-functional-test-http-server" />
+
+ <!-- now run security test -->
+ <runaxisfunctionaltests
+ url="http://localhost:8088";
+ startTarget1="start-functional-test-tcp-server"
+ startTarget2="start-functional-test-http-server"
+ testTarget="junit-functional-secure"
+ stopTarget="stop-functional-test-http-server-secure" />
+
</target>
<!-- =================================================================== -->
