Author: bodewig
Date: Tue Mar 4 05:17:50 2008
New Revision: 633469
URL: http://svn.apache.org/viewvc?rev=633469&view=rev
Log:
Ensure the line-ends match the platforms expectation in UTF-16 case. I can't
seem to find a way that svn will accept UTF-16 and native eol-style, so I fall
back to the trusted fixcrlf.
Modified:
ant/core/trunk/src/tests/antunit/types/resources/concat-resource-test.xml
ant/core/trunk/src/tests/antunit/types/resources/utf-16.in (props changed)
Modified:
ant/core/trunk/src/tests/antunit/types/resources/concat-resource-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/types/resources/concat-resource-test.xml?rev=633469&r1=633468&r2=633469&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/types/resources/concat-resource-test.xml
(original)
+++ ant/core/trunk/src/tests/antunit/types/resources/concat-resource-test.xml
Tue Mar 4 05:17:50 2008
@@ -8,6 +8,12 @@
<property name="br" value="${line.separator}" />
<property name="world" value="World" />
+ <property name="out.dir" location="tempdir"/>
+
+ <target name="tearDown">
+ <delete dir="${out.dir}" quiet="true"/>
+ </target>
+
<target name="testCountEquals1">
<au:assertTrue>
<resourcecount count="1">
@@ -52,9 +58,15 @@
</target>
<target name="testEncoding">
+ <mkdir dir="${out.dir}"/>
+ <copy file="utf-16.in" toDir="${out.dir}" encoding="utf-16">
+ <filterchain>
+ <fixcrlf/>
+ </filterchain>
+ </copy>
<au:assertTrue>
<resourcesmatch astext="true">
- <file file="utf-16.in" />
+ <file file="${out.dir}/utf-16.in" />
<concat outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat>
<concat outputEncoding="utf-16" fixlastline="true">
<string value="foo" />
Propchange: ant/core/trunk/src/tests/antunit/types/resources/utf-16.in
('svn:executable' removed)
