stefano 2003/03/25 07:12:09
Modified: src/test/anteater flowscriptReload.xml calc.xml
sitemapReload.xml
Log:
updated anteater tests that tested that flow samples
Revision Changes Path
1.2 +17 -15 cocoon-2.1/src/test/anteater/flowscriptReload.xml
Index: flowscriptReload.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/flowscriptReload.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flowscriptReload.xml 9 Mar 2003 00:10:36 -0000 1.1
+++ flowscriptReload.xml 25 Mar 2003 15:12:09 -0000 1.2
@@ -8,40 +8,42 @@
<!-- Check the reloading of the sitemap -->
<target name="flowscriptReload">
- <property name="test-dir" value="/samples/flow/examples/test"/>
- <property name="url" value="${cocoon}${test-dir}/showString"/>
+ <property name="test-dir" value="samples/flow/test"/>
+ <property name="url" value="${cocoon}/${test-dir}/showString"/>
- <!-- Copy the sitemap from its source directory to the destination
- area, and replace the parameter value with 'abc' -->
+ <!--+
+ | Copy the flowscript from its source directory to the destination
+ | area, and replace the parameter value with 'abc'
+ +-->
- <copy file="${src-webapp-dir}${test-dir}/sendpage.js"
+ <copy file="${src-webapp-dir}/${test-dir}/sendpage.js"
tofile="${deploy-dir}${test-dir}/sendpage.js"
overwrite="yes">
<filterset>
- <filter token="REPLACEME" value="replaceme-abc"/>
+ <filter token="REPLACEME" value="replaceme-abc"/>
</filterset>
</copy>
- <httpRequest href="${url}"
- description="Send original request">
+ <httpRequest href="${url}" description="Send original request">
<match>
<xpath select="html/body//p[1]" pattern=".*replaceme-abc.*"/>
</match>
</httpRequest>
- <!-- Copy the sitemap from its source directory to the destination
- area, and replace the parameter value with '123' -->
+ <!--+
+ | Copy the flowscript from its source directory to the destination
+ | area, and replace the parameter value with '123'
+ +-->
- <copy file="${src-webapp-dir}${test-dir}/sendpage.js"
- tofile="${deploy-dir}${test-dir}/sendpage.js"
+ <copy file="${src-webapp-dir}/${test-dir}/sendpage.js"
+ tofile="${deploy-dir}/${test-dir}/sendpage.js"
overwrite="yes">
<filterset>
- <filter token="REPLACEME" value="replaceme-123"/>
+ <filter token="REPLACEME" value="replaceme-123"/>
</filterset>
</copy>
- <httpRequest href="${url}"
- description="Send next request after sitemap was modified">
+ <httpRequest href="${url}" description="Send next request after flowscript was
modified">
<match>
<xpath select="html/body//p[1]" pattern=".*replaceme-123.*"/>
</match>
1.3 +1 -1 cocoon-2.1/src/test/anteater/calc.xml
Index: calc.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/calc.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- calc.xml 18 Mar 2003 02:17:20 -0000 1.2
+++ calc.xml 25 Mar 2003 15:12:09 -0000 1.3
@@ -10,7 +10,7 @@
the calculator example, and goes back in the processing several
times. -->
<target name="calc">
- <property name="calc" value="${cocoon}/samples/flow/examples/calc/"/>
+ <property name="calc" value="${cocoon}/samples/flow/calc/"/>
<httpRequest href="${calc}/"
description="Test the 'calc' JavaScript implementation">
1.2 +17 -14 cocoon-2.1/src/test/anteater/sitemapReload.xml
Index: sitemapReload.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/sitemapReload.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemapReload.xml 9 Mar 2003 00:10:36 -0000 1.1
+++ sitemapReload.xml 25 Mar 2003 15:12:09 -0000 1.2
@@ -8,35 +8,38 @@
<!-- Check the reloading of the sitemap -->
<target name="sitemapReload">
- <property name="test-dir" value="/samples/flow/examples/test"/>
- <property name="url" value="${cocoon}${test-dir}/showString"/>
+ <property name="test-dir" value="samples/flow/test"/>
+ <property name="url" value="${cocoon}/${test-dir}/showString"/>
- <!-- Copy the sitemap from its source directory to the destination
- area, and replace the parameter value with 'abc' -->
+ <!--+
+ | Copy the sitemap from its source directory to the destination
+ | area, and replace the parameter value with 'abc'
+ +-->
- <copy file="${src-webapp-dir}${test-dir}/sitemap.xmap"
- tofile="${deploy-dir}${test-dir}/sitemap.xmap"
+ <copy file="${src-webapp-dir}/${test-dir}/sitemap.xmap"
+ tofile="${deploy-dir}/${test-dir}/sitemap.xmap"
overwrite="yes">
<filterset>
- <filter token="PARAMETER" value="abc"/>
+ <filter token="PARAMETER" value="abc"/>
</filterset>
</copy>
- <httpRequest href="${url}"
- description="Send original request">
+ <httpRequest href="${url}" description="Send original request">
<match>
<xpath select="html/body//p[2]" pattern=".*abc.*"/>
</match>
</httpRequest>
- <!-- Copy the sitemap from its source directory to the destination
- area, and replace the parameter value with '123' -->
+ <!--+
+ | Copy the sitemap from its source directory to the destination
+ | area, and replace the parameter value with '123'
+ +-->
- <copy file="${src-webapp-dir}${test-dir}/sitemap.xmap"
- tofile="${deploy-dir}${test-dir}/sitemap.xmap"
+ <copy file="${src-webapp-dir}/${test-dir}/sitemap.xmap"
+ tofile="${deploy-dir}/${test-dir}/sitemap.xmap"
overwrite="yes">
<filterset>
- <filter token="PARAMETER" value="123"/>
+ <filter token="PARAMETER" value="123"/>
</filterset>
</copy>
