Author: kevj
Date: Wed Nov 7 22:17:17 2007
New Revision: 593033
URL: http://svn.apache.org/viewvc?rev=593033&view=rev
Log:
-make encoding tests pass on windows
Modified:
ant/core/branches/ANT_17_BRANCH/src/tests/antunit/taskdefs/concat-test.xml
Modified:
ant/core/branches/ANT_17_BRANCH/src/tests/antunit/taskdefs/concat-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/tests/antunit/taskdefs/concat-test.xml?rev=593033&r1=593032&r2=593033&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/tests/antunit/taskdefs/concat-test.xml
(original)
+++ ant/core/branches/ANT_17_BRANCH/src/tests/antunit/taskdefs/concat-test.xml
Wed Nov 7 22:17:17 2007
@@ -3,7 +3,7 @@
<target name="tearDown">
<delete file="binaryAppendDest" />
- <delete file="encodeStringDest" />
+ <!--<delete file="encodeStringDest" />-->
</target>
<target name="testBinaryAppend">
@@ -25,7 +25,7 @@
</au:assertTrue>
</target>
- <target name="testStringEncoding">
+ <target name="testStringEncoding" if="os.unix">
<property name="br" value="${line.separator}" />
<concat destfile="encodeStringDest"
outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat>
@@ -35,6 +35,18 @@
<file file="encodeStringDest" />
</resourcesmatch>
</au:assertTrue>
+ </target>
+
+ <target name="testStringEncodingWindows" if="os.windows">
+ <property name="br" value="${line.separator}" />
+ <concat destfile="encodeStringDest"
+ outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat>
+ <au:assertTrue>
+ <resourcesmatch astext="true">
+ <file file="utf-16.expected.windows" />
+ <file file="encodeStringDest" />
+ </resourcesmatch>
+ </au:assertTrue>
</target>
<target name="testDoNotFixNestedText" description="Bugzilla 42369">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
