From 303941db31d67d38674a4e92d77b354a680dc251 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Thu, 18 Jan 2007 10:56:42 +0000
Subject: [PATCH] fix the tests. the problem is some double expansion going on
 in antunit's assertions

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@497394 13f79535-47bb-0310-9956-ffa450edef68
---
 .../antunit/taskdefs/xmlproperty-test.xml     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/tests/antunit/taskdefs/xmlproperty-test.xml b/src/tests/antunit/taskdefs/xmlproperty-test.xml
index 0b744b9c0..ae1c50a5f 100644
--- a/src/tests/antunit/taskdefs/xmlproperty-test.xml
+++ b/src/tests/antunit/taskdefs/xmlproperty-test.xml
@@ -15,7 +15,7 @@
     </au:assertTrue>
   </target>
 
-  <target name="testInlineExpansion">
+  <target name="load">
     <xmlproperty
         file="xmlproperty.inline-expansion.xml"
         collapseAttributes="true"
@@ -28,16 +28,23 @@
     o            n        ${app.o}
     m            n        ${app.m}
     </echo>
-    <au:assertPropertyEquals name="app.p" value="${app.n}"/>
+  </target>
+
+  <target name="testInlineExpansion" depends="load">
+    <au:assertPropertyEquals name="app.m" value="n"/>
     <au:assertPropertyEquals name="app.n" value="n"/>
     <au:assertPropertyEquals name="app.o" value="n"/>
-    <au:assertPropertyEquals name="app.m" value="n"/>
-    <au:assertEquals actual="${app.n}" expected="n"/>
-    <au:assertEquals actual="${app.o}" expected="n"/>
-    <au:assertEquals actual="${app.m}" expected="n"/>
+    <au:assertPropertyEquals name="app.p" value="$${app.n}"/>
+    <property name="sequence" value="${app.m}${app.n}${app.o}${app.p}"/>
     <fail>
-      <not> 
-      </not>
+      xml attributes are not expanding correctly
+      expected: mnop=nnn$${app.n}
+      actual    mnop=${sequence}
+      <condition>
+        <not>
+          <equals arg1="${sequence}" arg2="nnn${app.n}"/>
+        </not>
+      </condition>
     </fail>
   </target>
 </project>