Return-Path: 
 <notifications-return-12797-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org
Received: (qmail 97395 invoked from network); 17 Jun 2010 12:50:45 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 17 Jun 2010 12:50:45 -0000
Received: (qmail 52919 invoked by uid 500); 17 Jun 2010 10:04:04 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 52837 invoked by uid 500); 17 Jun 2010 10:04:02 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 52828 invoked by uid 99); 17 Jun 2010 10:04:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jun 2010 10:04:01 +0000
X-ASF-Spam-Status: No, hits=-1666.0 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jun 2010 10:04:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5860A23889E5; Thu, 17 Jun 2010 10:03:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r955532 -
 /ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml
Date: Thu, 17 Jun 2010 10:03:15 -0000
To: notifications@ant.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100617100315.5860A23889E5@eris.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>