commit 40d950fe3b432e73858a8006d05e41f02327ebbf
author Stefan Bodewig <bodewig@apache.org> Thu Jun 17 10:03:15 2010 +0000
committer Stefan Bodewig <bodewig@apache.org> Thu Jun 17 10:03:15 2010 +0000
tree b417f55f67058d9749ce7d5e7db0b3705fb49d03
parent 048cade8bdf70d9347250ff906d37170cfbf2040

adapt to modified CDATA section escaping in trunk

git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/antunit/trunk@955532 13f79535-47bb-0310-9956-ffa450edef68

src/etc/testcases/listener/xmllistener.xml

diff --git a/src/etc/testcases/listener/xmllistener.xml b/src/etc/testcases/listener/xmllistener.xml
index 566ff39..fe3e964 100644
--- a/src/etc/testcases/listener/xmllistener.xml
+++ b/src/etc/testcases/listener/xmllistener.xml
@@ -264,13 +264,26 @@
     <clean/>
   </target>
   
-  <target name="badcharacters" depends="-createreport">
+  <target name="-readbadcharsreport" depends="-createreport">
     <loadfile property="reportxml" srcFile="${reportfile}" />
-    <au:assertMatches string="${reportxml}" pattern="${systemoutstart}.*&amp;#x5d;&amp;#x5d;&amp;gt;.*${systemoutend}" singleline="true"
-        message="Bad characters not escaped" />
+    <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" />
+  </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>