From 685acd90c6da0860f5ff742de313f82e006bfd82 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 25 Jan 2011 09:17:12 +0000
Subject: [PATCH] make tests pass on Windows where each pathelement gets the
 drive letter added to the front

git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/antunit/trunk@1063177 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/antunit/reference-mapper.xml |  8 ++++++--
 src/etc/testcases/antunit/reference-regex.xml  |  8 ++++++--
 src/etc/testcases/antunit/reference-set.xml    |  8 ++++++--
 src/etc/testcases/antunit/reference.xml        | 12 ++++++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/etc/testcases/antunit/reference-mapper.xml b/src/etc/testcases/antunit/reference-mapper.xml
index 269dc74..c815bff 100644
--- a/src/etc/testcases/antunit/reference-mapper.xml
+++ b/src/etc/testcases/antunit/reference-mapper.xml
@@ -28,10 +28,14 @@ under the License.
 
   <target name="testReferenceMapper">
     <property name="ref.one" refid="first.mapped"/>
-    <au:assertEquals expected="${file.separator}first" actual="${ref.one}" />
+    <au:assertTrue>
+      <contains substring="${file.separator}first" string="${ref.one}"/>
+    </au:assertTrue>
 
     <property name="ref.two" refid="second.mapped"/>
-    <au:assertEquals expected="${file.separator}second" actual="${ref.two}" />
+    <au:assertTrue>
+      <contains substring="${file.separator}second" string="${ref.two}"/>
+    </au:assertTrue>
   </target>
 
 </project>
\ No newline at end of file
diff --git a/src/etc/testcases/antunit/reference-regex.xml b/src/etc/testcases/antunit/reference-regex.xml
index 498d720..62281a1 100644
--- a/src/etc/testcases/antunit/reference-regex.xml
+++ b/src/etc/testcases/antunit/reference-regex.xml
@@ -28,10 +28,14 @@ under the License.
 
   <target name="testReferenceRegex">
       <property name="ref.one" refid="first.ref"/>
-      <au:assertEquals expected="${file.separator}first" actual="${ref.one}" />
+      <au:assertTrue>
+        <contains substring="${file.separator}first" string="${ref.one}"/>
+      </au:assertTrue>
 
       <property name="ref.two" refid="second.ref"/>
-      <au:assertEquals expected="${file.separator}second" actual="${ref.two}" />
+      <au:assertTrue>
+        <contains substring="${file.separator}second" string="${ref.two}"/>
+      </au:assertTrue>
 
       <condition property="uninherited.is.set" value="true">
         <isreference refid="third.missing"/>
diff --git a/src/etc/testcases/antunit/reference-set.xml b/src/etc/testcases/antunit/reference-set.xml
index 5d7644f..86f09e8 100644
--- a/src/etc/testcases/antunit/reference-set.xml
+++ b/src/etc/testcases/antunit/reference-set.xml
@@ -28,10 +28,14 @@ under the License.
 
   <target name="testReferenceSet">
     <property name="ref.one" refid="first.ref"/>
-    <au:assertEquals expected="${file.separator}first" actual="${ref.one}" />
+    <au:assertTrue>
+      <contains substring="${file.separator}first" string="${ref.one}"/>
+    </au:assertTrue>
 
     <property name="ref.three" refid="third.ref"/>
-    <au:assertEquals expected="${file.separator}third" actual="${ref.three}" />
+    <au:assertTrue>
+      <contains substring="${file.separator}third" string="${ref.three}"/>
+    </au:assertTrue>
 
     <condition property="uninherited.is.set" value="true">
       <isreference refid="second.ref"/>
diff --git a/src/etc/testcases/antunit/reference.xml b/src/etc/testcases/antunit/reference.xml
index 98e9199..eba8085 100644
--- a/src/etc/testcases/antunit/reference.xml
+++ b/src/etc/testcases/antunit/reference.xml
@@ -28,8 +28,16 @@ under the License.
 
   <target name="testReference">
     <property name="ref.string" refid="inherited.ref"/>
-    <au:assertEquals expected="${file.separator}some${path.separator}${file.separator}path${path.separator}${file.separator}value" actual="${ref.string}" />
-
+    <au:assertTrue>
+      <and>
+        <contains substring="${file.separator}some${path.separator}"
+                  string="${ref.string}"/>
+        <contains substring="${file.separator}path${path.separator}"
+                  string="${ref.string}"/>
+        <contains substring="${file.separator}value"
+                  string="${ref.string}"/>
+      </and>
+    </au:assertTrue>
     <condition property="uninherited.is.set" value="true">
       <isreference refid="uninherited.ref"/>
     </condition>