From 002c84be0af421aecdf14f6e32d332b3f9948145 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sun, 16 Mar 2014 14:34:11 +0000
Subject: [PATCH] another attempt to make tests pass on Windows

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1578086 13f79535-47bb-0310-9956-ffa450edef68
---
 .../types/resources/multirootfileset-test.xml    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tests/antunit/types/resources/multirootfileset-test.xml b/src/tests/antunit/types/resources/multirootfileset-test.xml
index 6d01906af..2549d6c83 100644
--- a/src/tests/antunit/types/resources/multirootfileset-test.xml
+++ b/src/tests/antunit/types/resources/multirootfileset-test.xml
@@ -79,10 +79,10 @@
   </target>
 
   <target name="test-dirs" depends="setUp">
-    <pathconvert property="dirs" pathsep=":" dirsep="/">
+    <pathconvert property="dirs" pathsep=":">
       <multirootfileset basedirs="${input}/a,${input}/b" type="dir"/>
     </pathconvert>
-    <au:assertPropertyEquals value="${input}/a:${input}/a/1:${input}/b:${input}/b/2"
+    <au:assertPropertyEquals value="${input}${file.separator}a:${input}${file.separator}a${file.separator}1:${input}${file.separator}b:${input}${file.separator}b${file.separator}2"
                              name="dirs"/>
   </target>
 
@@ -96,12 +96,12 @@
     <au:assertFileExists file="${output}/1/3.txt"/>
     <au:assertFileExists file="${output}/2/3.txt"/>
     <au:assertFileDoesntExist file="${output}/2/4.txt"/>
-    <pathconvert property="dirs" pathsep=":" dirsep="/">
+    <pathconvert property="dirs" pathsep=":">
       <multirootfileset basedirs="${input}/a,${input}/b" type="dir">
         <include name="1/"/>
       </multirootfileset>
     </pathconvert>
-    <au:assertPropertyEquals value="${input}/a/1" name="dirs"/>
+    <au:assertPropertyEquals value="${input}${file.separator}a${file.separator}1" name="dirs"/>
   </target>
 
   <target name="test-exclude-pattern" depends="setUp">
@@ -114,12 +114,12 @@
     <au:assertFileDoesntExist file="${output}/1/3.txt"/>
     <au:assertFileDoesntExist file="${output}/2/3.txt"/>
     <au:assertFileExists file="${output}/2/4.txt"/>
-    <pathconvert property="dirs" pathsep=":" dirsep="/">
+    <pathconvert property="dirs" pathsep=":">
       <multirootfileset basedirs="${input}/a,${input}/b" type="dir">
         <exclude name="1/"/>
       </multirootfileset>
     </pathconvert>
-    <au:assertPropertyEquals value="${input}/a:${input}/b:${input}/b/2"
+    <au:assertPropertyEquals value="${input}${file.separator}a:${input}${file.separator}b:${input}${file.separator}b${file.separator}2"
                              name="dirs"/>
   </target>
 
@@ -133,12 +133,12 @@
     <au:assertFileExists file="${output}/1/3.txt"/>
     <au:assertFileExists file="${output}/2/3.txt"/>
     <au:assertFileDoesntExist file="${output}/2/4.txt"/>
-    <pathconvert property="dirs" pathsep=":" dirsep="/">
+    <pathconvert property="dirs" pathsep=":">
       <multirootfileset basedirs="${input}/a,${input}/b" type="dir">
         <filename regex="1"/>
       </multirootfileset>
     </pathconvert>
-    <au:assertPropertyEquals value="${input}/a/1" name="dirs"/>
+    <au:assertPropertyEquals value="${input}${file.separator}a${file.separator}1" name="dirs"/>
   </target>
 
 </project>