Author: kevj Date: Wed Nov 7 22:16:55 2007 New Revision: 593032 URL: http://svn.apache.org/viewvc?rev=593032&view=rev Log: -make encoding tests pass on windows
Modified: ant/core/trunk/src/tests/antunit/taskdefs/concat-test.xml Modified: ant/core/trunk/src/tests/antunit/taskdefs/concat-test.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/concat-test.xml?rev=593032&r1=593031&r2=593032&view=diff ============================================================================== --- ant/core/trunk/src/tests/antunit/taskdefs/concat-test.xml (original) +++ ant/core/trunk/src/tests/antunit/taskdefs/concat-test.xml Wed Nov 7 22:16:55 2007 @@ -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]