You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by se...@apache.org on 2002/08/09 21:53:45 UTC
cvs commit: xml-axis/java buildTest.xml buildSamples.xml
seibert 2002/08/09 12:53:45
Modified: java/xmls targets.xml
java buildTest.xml buildSamples.xml
Log:
Changed all of my "Them" tasks to something more meaningful
Revision Changes Path
1.10 +22 -4 xml-axis/java/xmls/targets.xml
Index: targets.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/xmls/targets.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- targets.xml 9 Aug 2002 19:14:36 -0000 1.9
+++ targets.xml 9 Aug 2002 19:53:45 -0000 1.10
@@ -1,17 +1,35 @@
- <target name="echoThem">
+ <!-- ===================================================================
+ This is an accessory function to echo out fileNames
+ =================================================================== -->
+ <target name="echo-file">
<basename property="fileName" file="${file}"/>
<dirname property="dirName" file="${file}"/>
<echo message="Dir: ${dirName} File: ${fileName}"/>
</target>
- <target name="buildThem">
+ <!-- ===================================================================
+ This is an accessory function to compile some given component
+ =================================================================== -->
+ <target name="component-compile">
<echo message="${file}"/>
<ant antfile="${file}" target="compile"/>
</target>
- <target name="runThem">
- <antcall target="echoThem"/>
+ <!-- ===================================================================
+ This is an accessory function to exec JUST the testcase of a
+ component.
+ =================================================================== -->
+ <target name="batch-component-test">
+ <antcall target="echo-file"/>
<ant antfile="${file}" target="component-junit-functional" />
+ </target>
+
+ <!-- ===================================================================
+ This is an accessory function to execs the full component test
+ =================================================================== -->
+ <target name="batch-component-run">
+ <antcall target="echo-file"/>
+ <ant antfile="${file}" target="run" />
</target>
<!-- =================================================================== -->
1.18 +26 -8 xml-axis/java/buildTest.xml
Index: buildTest.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/buildTest.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- buildTest.xml 9 Aug 2002 14:57:10 -0000 1.17
+++ buildTest.xml 9 Aug 2002 19:53:45 -0000 1.18
@@ -119,13 +119,12 @@
<!-- =========================================================================== -->
<target name="compile" depends="printEnv,copy">
<!-- Compile the code -->
- <foreach target="buildThem">
+ <foreach target="component-compile">
<param name="file">
<fileset dir="./" >
<patternset>
<include name="test/**/buildComponent.xml"/>
<exclude name="test/httpunit/buildComponent.xml"/>
- <exclude name="test/wsdl/literal/buildComponent.xml"/>
</patternset>
</fileset>
</param>
@@ -246,7 +245,7 @@
<include name="**/*TestCase.class" />
<exclude name="**/Interop3TestCase.class"/>
<!-- These are failing for WHATEVER reason -->
- <exclude name="**/inout/etailedInoutTestCase.class"/>
+ <exclude name="**/inout/DetailedInoutTestCase.class"/>
<exclude name="**/qualify/Qualify_ServiceTestCase.class"/>
<exclude name="**/inheritance/InheritanceTestCase.class"/>
<exclude name="**/addrNoImplSEI/AddressBookTestCase.class"/>
@@ -317,21 +316,41 @@
stopTarget="stop-functional-test-http-server" />
</target>
-
+ <!-- =================================================================== -->
+ <!-- This simply echos the component files, for sanity checks -->
+ <!-- =================================================================== -->
<target name="echoTest" >
- <foreach target="echoThem">
+ <foreach target="echo-file">
<param name="file">
<fileset dir="." >
<patternset>
<include name="test/wsdl/**/buildComponent.xml"/>
<include name="test/functional/buildComponent.xml"/>
- <exclude name="test/wsdl/inout/buildComponent.xml"/>
</patternset>
</fileset>
</param>
</foreach>
</target>
+ <!-- =================================================================== -->
+ <!-- This runs each test component, instantiating the server each time -->
+ <!-- =================================================================== -->
+ <target name="componentTest" >
+ <foreach target="batch-component-run">
+ <param name="file">
+ <fileset dir="." >
+ <patternset>
+ <include name="test/wsdl/**/buildComponent.xml"/>
+ <include name="test/functional/buildComponent.xml"/>
+ </patternset>
+ </fileset>
+ </param>
+ </foreach>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- This runs all the tests, but only execs the server ONCE -->
+ <!-- =================================================================== -->
<target name="batchTest" depends="transport-layer">
<runaxisfunctionaltests
url="http://localhost:${test.functional.TCPListenerPort}"
@@ -346,7 +365,7 @@
</target>
<target name="batch-junit-functional" depends="start-signature-signing-and-verification">
- <foreach target="runThem">
+ <foreach target="batch-component-test">
<param name="file">
<fileset dir="." >
<patternset>
@@ -356,6 +375,5 @@
</param>
</foreach>
</target>
-
</project>
1.8 +1 -1 xml-axis/java/buildSamples.xml
Index: buildSamples.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/buildSamples.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildSamples.xml 7 Aug 2002 20:24:54 -0000 1.7
+++ buildSamples.xml 9 Aug 2002 19:53:45 -0000 1.8
@@ -113,7 +113,7 @@
<target name="compile" depends="printEnv,copy">
<!-- Compile the sample code -->
- <foreach target="buildThem">
+ <foreach target="component-compile">
<param name="file">
<fileset dir="." includes="samples/**/buildComponent.xml"/>
</param>