ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1063177 - in /ant/antlibs/antunit/trunk/src/etc/testcases/antunit: reference-mapper.xml reference-regex.xml reference-set.xml reference.xml
Date Tue, 25 Jan 2011 09:17:14 GMT
Author: bodewig
Date: Tue Jan 25 09:17:12 2011
New Revision: 1063177

URL: http://svn.apache.org/viewvc?rev=1063177&view=rev
Log:
make tests pass on Windows where each pathelement gets the drive letter added to the front

Modified:
    ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-mapper.xml
    ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-regex.xml
    ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-set.xml
    ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference.xml

Modified: ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-mapper.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-mapper.xml?rev=1063177&r1=1063176&r2=1063177&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-mapper.xml (original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-mapper.xml Tue Jan 25 09:17:12
2011
@@ -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

Modified: ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-regex.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-regex.xml?rev=1063177&r1=1063176&r2=1063177&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-regex.xml (original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-regex.xml Tue Jan 25 09:17:12
2011
@@ -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"/>

Modified: ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-set.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-set.xml?rev=1063177&r1=1063176&r2=1063177&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-set.xml (original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference-set.xml Tue Jan 25 09:17:12
2011
@@ -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"/>

Modified: ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference.xml?rev=1063177&r1=1063176&r2=1063177&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference.xml (original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/antunit/reference.xml Tue Jan 25 09:17:12
2011
@@ -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>



Mime
View raw message