bdelacretaz 2004/02/09 23:47:59
Modified: src/blocks/batik/test/anteater samples-mime-types.xml
src/blocks/webdav/test/anteater step3.xml
src/test/anteater all-tests.xml
bug26186InternalRequestMemoryLeak.xml calc.xml
flowscriptReload.xml internalRequest.xml
reader-mime-type.xml sitemapReload.xml
Log:
anteater tests: more specific property names to avoid conflicts
Revision Changes Path
1.4 +3 -3 cocoon-2.1/src/blocks/batik/test/anteater/samples-mime-types.xml
Index: samples-mime-types.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/batik/test/anteater/samples-mime-types.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- samples-mime-types.xml 9 Feb 2004 19:34:24 -0000 1.3
+++ samples-mime-types.xml 10 Feb 2004 07:47:49 -0000 1.4
@@ -17,8 +17,8 @@
</group>
<target name="batik-samples-mime-types">
- <property name="helloWorldBaseUrl" value="${cocoon}/samples/hello-world"/>
- <property name="batikBaseUrl" value="${cocoon}/samples/batik"/>
+ <property name="helloWorldBaseUrl" value="${anteater.env.cocoon}/samples/hello-world"/>
+ <property name="batikBaseUrl" value="${anteater.env.cocoon}/samples/batik"/>
<httpRequest href="${helloWorldBaseUrl}/hello.svg">
<match>
1.2 +9 -7 cocoon-2.1/src/blocks/webdav/test/anteater/step3.xml
Index: step3.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/webdav/test/anteater/step3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- step3.xml 19 Sep 2003 11:41:49 -0000 1.1
+++ step3.xml 10 Feb 2004 07:47:50 -0000 1.2
@@ -7,10 +7,12 @@
</group>
<target name="webdav-step3">
- <property name="samples" value="${cocoon}/samples/webdav"/>
+ <property name="step3.samples" value="${anteater.env.cocoon}/samples/webdav"/>
+
+ <echo>samples=${samples}</echo>
<!-- testing basic TraversableGenerator functionality -->
- <httpRequest href="${samples}/step1/repo/"
+ <httpRequest href="${step3.samples}/step1/repo/"
useTidy="false"
description="Test the 'step1' sample">
<namespace prefix="collection" uri="http://apache.org/cocoon/collection/1.0"/>
@@ -20,7 +22,7 @@
</httpRequest>
<!-- check contents of contentB.xml -->
- <httpRequest href="${samples}/step3/repo/dir2/contentB.xml"
+ <httpRequest href="${step3.samples}/step3/repo/dir2/contentB.xml"
description="Test the 'step3' sample">
<match>
<xpath select="/html/body/form/p/input[@name='title']/@value" pattern="Content
B"/>
@@ -31,7 +33,7 @@
</httpRequest>
<!-- change contents of contentB.xml -->
- <httpRequest href="${cocoon}${action}"
+ <httpRequest href="${anteater.env.cocoon}${action}"
useTidy="false"
description="Test the 'step3' sample">
<parameter name="title" value="Title B"/>
@@ -43,7 +45,7 @@
</httpRequest>
<!-- check changes -->
- <httpRequest href="${samples}/step3/repo/dir2/contentB.xml"
+ <httpRequest href="${step3.samples}/step3/repo/dir2/contentB.xml"
description="Test the 'step3' sample">
<match>
<xpath select="/html/body/form/p/input[@name='title']/@value" pattern="Title
B"/>
@@ -53,7 +55,7 @@
</httpRequest>
<!-- undo changes -->
- <httpRequest href="${cocoon}${action}"
+ <httpRequest href="${anteater.env.cocoon}${action}"
useTidy="false"
description="Test the 'step3' sample">
<parameter name="title" value="Content B"/>
@@ -65,7 +67,7 @@
</httpRequest>
<!-- check success of undo -->
- <httpRequest href="${samples}/step3/repo/dir2/contentB.xml"
+ <httpRequest href="${step3.samples}/step3/repo/dir2/contentB.xml"
description="Test the 'step3' sample">
<match>
<xpath select="/html/body/form/p/input[@name='title']/@value" pattern="Content
B"/>
1.7 +3 -3 cocoon-2.1/src/test/anteater/all-tests.xml
Index: all-tests.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/all-tests.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- all-tests.xml 10 Feb 2004 07:33:24 -0000 1.6
+++ all-tests.xml 10 Feb 2004 07:47:50 -0000 1.7
@@ -39,9 +39,9 @@
<property file="${cocoon.base.dir}/local.build.properties"/>
<property file="${cocoon.base.dir}/build.properties"/>
- <property name="cocoon" value="http://${host}:${port}/${base}"/>
- <property name="src-webapp-dir" value="../../../../src/webapp"/>
- <property name="deploy-dir" value="../../../../build/webapp"/>
+ <property name="anteater.env.cocoon" value="http://${host}:${port}/${base}"/>
+ <property name="anteater.env.src-webapp-dir" value="../../../../src/webapp"/>
+ <property name="anteater.env.deploy-dir" value="../../../../build/webapp"/>
</target>
<target name="all" depends="init">
1.3 +1 -1 cocoon-2.1/src/test/anteater/bug26186InternalRequestMemoryLeak.xml
Index: bug26186InternalRequestMemoryLeak.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/bug26186InternalRequestMemoryLeak.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bug26186InternalRequestMemoryLeak.xml 10 Feb 2004 07:17:46 -0000 1.2
+++ bug26186InternalRequestMemoryLeak.xml 10 Feb 2004 07:47:50 -0000 1.3
@@ -4,7 +4,7 @@
<typedef resource="META-INF/Anteater.types"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
- <property name="url" value="${cocoon}/samples/xsp/java/resolver"/>
+ <property name="url" value="${anteater.env.cocoon}/samples/xsp/java/resolver"/>
<target name="conditional" depends="main,disabled"/>
<target name="disabled" unless="anteater.test.bug26186InternalRequestMemoryLeak.enabled">
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- calc.xml 31 Aug 2003 16:32:34 -0000 1.5
+++ calc.xml 10 Feb 2004 07:47:50 -0000 1.6
@@ -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/calc/"/>
+ <property name="calc" value="${anteater.env.cocoon}/samples/flow/calc/"/>
<httpRequest href="${calc}/"
description="Test the 'calc' JavaScript implementation">
1.6 +5 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- flowscriptReload.xml 6 Feb 2004 12:13:08 -0000 1.5
+++ flowscriptReload.xml 10 Feb 2004 07:47:50 -0000 1.6
@@ -9,15 +9,15 @@
<!-- Check the reloading of the sitemap -->
<target name="flowscriptReload">
<property name="test-dir" value="samples/flow/test"/>
- <property name="url" value="${cocoon}/${test-dir}/showString"/>
+ <property name="url" value="${anteater.env.cocoon}/${test-dir}/showString"/>
<!--+
| 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"
- tofile="${deploy-dir}/${test-dir}/sendpage.js"
+ <copy file="${anteater.env.src-webapp-dir}/${test-dir}/sendpage.js"
+ tofile="${anteater.env.deploy-dir}/${test-dir}/sendpage.js"
overwrite="yes">
<filterset>
<filter token="REPLACEME" value="replaceme-abc"/>
@@ -38,8 +38,8 @@
| 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="${anteater.env.src-webapp-dir}/${test-dir}/sendpage.js"
+ tofile="${anteater.env.deploy-dir}/${test-dir}/sendpage.js"
overwrite="yes">
<filterset>
<filter token="REPLACEME" value="replaceme-123"/>
1.4 +1 -1 cocoon-2.1/src/test/anteater/internalRequest.xml
Index: internalRequest.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/internalRequest.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- internalRequest.xml 6 Feb 2004 12:17:15 -0000 1.3
+++ internalRequest.xml 10 Feb 2004 07:47:50 -0000 1.4
@@ -8,7 +8,7 @@
<!-- test samples/test/simpletest -->
<target name="internal-request-test">
- <property name="internal-request-test" value="${cocoon}/samples/test/internal-request/simpletest"/>
+ <property name="internal-request-test" value="${anteater.env.cocoon}/samples/test/internal-request/simpletest"/>
<httpRequest href="${internal-request-test}"
description="Test the internal request handling">
1.3 +1 -1 cocoon-2.1/src/test/anteater/reader-mime-type.xml
Index: reader-mime-type.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/reader-mime-type.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- reader-mime-type.xml 7 Feb 2004 10:39:11 -0000 1.2
+++ reader-mime-type.xml 10 Feb 2004 07:47:50 -0000 1.3
@@ -8,7 +8,7 @@
<!-- Check mime-types (bugzilla 25212) -->
<target name="reader-mime-type">
- <property name="baseUrl" value="${cocoon}/samples/test/reader-mime-type"/>
+ <property name="baseUrl" value="${anteater.env.cocoon}/samples/test/reader-mime-type"/>
<httpRequest href="${baseUrl}/test10.html" description="Check content-type">
<match>
1.4 +5 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemapReload.xml 31 Aug 2003 16:32:34 -0000 1.3
+++ sitemapReload.xml 10 Feb 2004 07:47:50 -0000 1.4
@@ -9,15 +9,15 @@
<!-- Check the reloading of the sitemap -->
<target name="sitemapReload">
<property name="test-dir" value="samples/flow/test"/>
- <property name="url" value="${cocoon}/${test-dir}/showString"/>
+ <property name="url" value="${anteater.env.cocoon}/${test-dir}/showString"/>
<!--+
| 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="${anteater.env.src-webapp-dir}/${test-dir}/sitemap.xmap"
+ tofile="${anteater.env.deploy-dir}/${test-dir}/sitemap.xmap"
overwrite="yes">
<filterset>
<filter token="PARAMETER" value="abc"/>
@@ -37,8 +37,8 @@
| 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="${anteater.env.src-webapp-dir}/${test-dir}/sitemap.xmap"
+ tofile="${anteater.env.deploy-dir}/${test-dir}/sitemap.xmap"
overwrite="yes">
<filterset>
<filter token="PARAMETER" value="123"/>
|