svn commit: r955532 - /ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml

[bo...@apache.org]

Author: bodewig
Date: Thu Jun 17 10:03:15 2010
New Revision: 955532

URL: http://svn.apache.org/viewvc?rev=955532&view=rev
Log:
adapt to modified CDATA section escaping in trunk

Modified:
    ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml

Modified: ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml?rev=955532&r1=955531&r2=955532&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml (original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml Thu Jun 17 10:03:15 2010
@@ -264,13 +264,26 @@ under the License.
     <clean/>
   </target>
   
-  <target name="badcharacters" depends="-createreport">
+  <target name="-readbadcharsreport" depends="-createreport">
     <loadfile property="reportxml" srcFile="${reportfile}" />
+    <condition property="182+">
+      <antversion atleast="1.8.2"/>
+    </condition>
+  </target>
+
+  <target name="badcharacters" depends="badchars181,badchars182">
+    <clean/>
+  </target>
+
+  <target name="badchars181" depends="-readbadcharsreport" unless="182+">
     <au:assertMatches string="${reportxml}" pattern="${systemoutstart}.*&amp;#x5d;&amp;#x5d;&amp;gt;.*${systemoutend}" singleline="true"
         message="Bad characters not escaped" />
-    <clean/>
   </target>
   
+  <target name="badchars182" depends="-readbadcharsreport" if="182+">
+    <au:assertMatches string="${reportxml}" pattern="${systemoutstart}.*]]]]&gt;&lt;!\[CDATA\[&gt;.*${systemoutend}" singleline="true"
+        message="Bad characters not escaped" />
+  </target>
 
   <target name="suiteSetUp">
     <echo>suiteSetUp</echo>