cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gcas...@apache.org
Subject cvs commit: cocoon-2.1/src/webapp/samples/flow/test sendpage.js sitemap.xmap
Date Sun, 31 Aug 2003 16:32:34 GMT
gcasper     2003/08/31 09:32:34

  Modified:    src/targets test-build.xml
               src/test/anteater all-tests.xml calc.xml
                        flowscriptReload.xml sitemapReload.xml
               src/webapp/samples/flow/test sendpage.js sitemap.xmap
  Log:
  Fixed Anteater functional tests
  
  Revision  Changes    Path
  1.16      +16 -6     cocoon-2.1/src/targets/test-build.xml
  
  Index: test-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/test-build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- test-build.xml	18 May 2003 17:03:06 -0000	1.15
  +++ test-build.xml	31 Aug 2003 16:32:34 -0000	1.16
  @@ -26,13 +26,23 @@
       <property name="port" value="8888"/>
       <property name="base" value="/"/>
   
  -    <!-- FIXME: Anteater invocation is platform specific
  -    <exec executable="cmd">
  -      <arg line="/C C:\Java\anteater-0.9.15\bin\anteater.bat -f src/test/anteater/all-tests.xml
-Dhost=${host} -Dport=${port} -Dbase=${base}"/>
  -    </exec>
  -    <exec executable="anteater">
  +    <!-- adjust anteater.home property and uncomment to enable Anteater functional tests
  +    <property name="anteater.home" value="D:\downloads\anteater-0.9.16"/>
  +    <java classname="org.apache.tools.ant.Main" fork="true">
  +      <classpath>
  +        <fileset dir="${anteater.home}">
  +          <include name="lib/**/*.jar"/>
  +          <include name="tomcat/**/*.jar"/>
  +        </fileset>
  +        <pathelement location="${anteater.home}/resources"/>
  +      </classpath>
  +      <jvmarg value="-Dant.home=${anteater.home}"/>
  +      <jvmarg value="-Danteater.home=${anteater.home}"/>
  +      <jvmarg value="-Danteater.resources=${anteater.home}/resources"/>
  +      <jvmarg value="-Danteater.report=${anteater.home}/resources/scripts/report.xml"/>
  +      <jvmarg value="-Djava.endorsed.dirs=${anteater.home}/lib"/>
         <arg line="-f src/test/anteater/all-tests.xml -Dhost=${host} -Dport=${port} -Dbase=${base}"/>
  -    </exec>
  +    </java>
       -->
     </target>
   
  
  
  
  1.3       +1 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- all-tests.xml	20 May 2003 00:54:12 -0000	1.2
  +++ all-tests.xml	31 Aug 2003 16:32:34 -0000	1.3
  @@ -32,7 +32,7 @@
       <property name="port" value="8100"/>
       <property name="cocoon" value="http://${host}:${port}/${base}"/>
       <property name="src-webapp-dir" value="../../webapp"/>
  -    <property name="deploy-dir" value="../../../build/cocoon/webapp"/>
  +    <property name="deploy-dir" value="../../../build/webapp"/>
     </target>
   
     <target name="deploy">
  
  
  
  1.5       +3 -3      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- calc.xml	20 May 2003 00:54:12 -0000	1.4
  +++ calc.xml	31 Aug 2003 16:32:34 -0000	1.5
  @@ -33,7 +33,7 @@
         <httpRequest href="${calc}/${cont3}">
           <parameter name="operator" value="plus"/>
           <match>
  -          <xpath select="html/body//form/p/font[contains(text(),'Result')]/b"
  +          <xpath select="html/body//form/p[contains(text(),'Result')]/strong"
   		 value="3.0"
   		 assign="result"/>
           </match>
  @@ -50,7 +50,7 @@
         <httpRequest href="${calc}/${cont4}">
           <parameter name="operator" value="minus"/>
           <match>
  -          <xpath select="html/body//form/p/font[contains(text(),'Result')]/b"
  +          <xpath select="html/body//form/p[contains(text(),'Result')]/strong"
   		 value="-3.0"
   		 assign="result"/>
           </match>
  @@ -61,7 +61,7 @@
   		   description="Simulate going back again in the browser">
           <parameter name="operator" value="divide"/>
           <match>
  -          <xpath select="html/body//form/p/font[contains(text(),'Result')]/b"
  +          <xpath select="html/body//form/p[contains(text(),'Result')]/strong"
   		 value="0.25"
   		 assign="result"/>
           </match>
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- flowscriptReload.xml	20 May 2003 00:54:12 -0000	1.3
  +++ flowscriptReload.xml	31 Aug 2003 16:32:34 -0000	1.4
  @@ -17,7 +17,7 @@
           +-->
   
       <copy file="${src-webapp-dir}/${test-dir}/sendpage.js"
  -	  tofile="${deploy-dir}${test-dir}/sendpage.js"
  +	  tofile="${deploy-dir}/${test-dir}/sendpage.js"
   	  overwrite="yes">
         <filterset>
           <filter token="REPLACEME" value="replaceme-abc"/>
  
  
  
  1.3       +4 -0      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemapReload.xml	25 Mar 2003 15:12:09 -0000	1.2
  +++ sitemapReload.xml	31 Aug 2003 16:32:34 -0000	1.3
  @@ -24,6 +24,8 @@
         </filterset>
       </copy>
   
  +    <sleep seconds="1"/>
  +
       <httpRequest href="${url}" description="Send original request">
         <match>
           <xpath select="html/body//p[2]" pattern=".*abc.*"/>
  @@ -42,6 +44,8 @@
   	   <filter token="PARAMETER" value="123"/>
         </filterset>
       </copy>
  +
  +    <sleep seconds="1"/>
   
       <httpRequest href="${url}"
   		 description="Send next request after sitemap was modified">
  
  
  
  1.3       +1 -1      cocoon-2.1/src/webapp/samples/flow/test/sendpage.js
  
  Index: sendpage.js
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/flow/test/sendpage.js,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sendpage.js	20 May 2003 00:54:12 -0000	1.2
  +++ sendpage.js	31 Aug 2003 16:32:34 -0000	1.3
  @@ -1,5 +1,5 @@
   function showString(parameter)
   {
     print ("parameter = " + parameter);
  -  sendPage("page/showString", { "parameter" : parameter, "replaceme" : "@REPLACEME@" });
  +  cocoon.sendPage("page/showString", { "parameter" : parameter, "replaceme" : "@REPLACEME@"
});
   }
  
  
  
  1.4       +1 -1      cocoon-2.1/src/webapp/samples/flow/test/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/flow/test/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	20 May 2003 00:54:12 -0000	1.3
  +++ sitemap.xmap	31 Aug 2003 16:32:34 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   
  -  <map:flow language="JavaScript">
  +  <map:flow language="javascript">
       <map:script src="sendpage.js"/>
     </map:flow>
   
  
  
  

Mime
View raw message