cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r156514 - in cocoon/branches/BRANCH_2_1_X/src: test/anteater/reader-mime-type.xml webapp/samples/test/reader-mime-type/sitemap.xmap
Date Tue, 08 Mar 2005 09:39:11 GMT
Author: cziegeler
Date: Tue Mar  8 01:39:09 2005
New Revision: 156514

URL: http://svn.apache.org/viewcvs?view=rev&rev=156514
Log:
Apply additional patch to fix anteater tests

Modified:
    cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/sitemap.xmap

Modified: cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml?view=diff&r1=156513&r2=156514
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml Tue Mar  8 01:39:09
2005
@@ -38,15 +38,17 @@
                 <echo message="Ignore following message text:  message doesn't match because
header 'content-type' is not present"/>
                 <header name="Content-type" pattern=".*"/>
             </match>
+            <match assign="test10-passed-1"/>
         </httpRequest>
-        <fail if="test10-failed-1"/>
+        <fail if="test10-failed-1" message="Content-type header expected to be absent"/>
         <httpRequest href="${baseUrl}/test10.xml" description="Check content-type (cached)">
             <match assign="test10-failed-2">
                 <echo message="Ignore following message text:  message doesn't match because
header 'content-type' is not present"/>
                 <header name="Content-type" pattern=".*"/>
             </match>
+            <match assign="test10-passed-2"/>
         </httpRequest>
-        <fail if="test10-failed-2"/>
+        <fail if="test10-failed-2" message="Content-type header expected to be absent"/>
 
         <!-- Check content-type derived from map:read/@src -->
         <httpRequest href="${baseUrl}/test20.x20" description="Check content-type">
@@ -93,15 +95,15 @@
             </match>
             <match assign="test50-passed-1"/>
         </httpRequest>
-        <fail if="test50-failed-1"/>
+        <fail if="test50-failed-1" message="Content-type header expected to be absent"/>
         <httpRequest href="${baseUrl}/test50.xml" description="Check content-type (cached)">
             <match assign="test50-failed-2">
                 <echo message="Ignore following message text:  message doesn't match because
header 'content-type' is not present"/>
                 <header name="Content-type" pattern=".*"/>
             </match>
-            <match/>
+            <match assign="test50-passed-2"/>
         </httpRequest>
-        <fail if="test50-failed-2"/>
+        <fail if="test50-failed-2" message="Content-type header expected to be absent"/>
 
         <!-- Check content-type derived from map:read/@src -->
         <httpRequest href="${baseUrl}/test60.x60" description="Check content-type">

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/sitemap.xmap?view=diff&r1=156513&r2=156514
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/sitemap.xmap Tue
Mar  8 01:39:09 2005
@@ -26,7 +26,7 @@
   <map:pipelines>
     <map:pipeline type="caching">
       <map:match pattern="test10.*">
-        <map:read src="test.xzy"/>
+        <map:read src="test.foo"/>
       </map:match>
       <map:match pattern="test20.*">
         <map:read src="test.xml"/>



Mime
View raw message