svn commit: r1578086 - /ant/core/trunk/src/tests/antunit/types/resources/multirootfileset-test.xml

[bodewig]

Author: bodewig
Date: Sun Mar 16 14:34:11 2014
New Revision: 1578086

URL: http://svn.apache.org/r1578086
Log:
another attempt to make tests pass on Windows

Modified:
    ant/core/trunk/src/tests/antunit/types/resources/multirootfileset-test.xml

Modified: 
ant/core/trunk/src/tests/antunit/types/resources/multirootfileset-test.xml
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/types/resources/multirootfileset-test.xml?rev=1578086&r1=1578085&r2=1578086&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/types/resources/multirootfileset-test.xml 
(original)
+++ ant/core/trunk/src/tests/antunit/types/resources/multirootfileset-test.xml 
Sun Mar 16 14:34:11 2014
@@ -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>