diff --git a/src/etc/testcases/taskdefs/fixcrlf/build.xml b/src/etc/testcases/taskdefs/fixcrlf/build.xml index 938f61902..fa9adbd7f 100644 --- a/src/etc/testcases/taskdefs/fixcrlf/build.xml +++ b/src/etc/testcases/taskdefs/fixcrlf/build.xml @@ -121,4 +121,25 @@ /> + + + + + + + + + + + + diff --git a/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.dos b/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.dos new file mode 100644 index 000000000..bd956ea75 --- /dev/null +++ b/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.dos @@ -0,0 +1,2 @@ +1 +2 diff --git a/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.mac b/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.mac new file mode 100644 index 000000000..c359b1033 --- /dev/null +++ b/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.mac @@ -0,0 +1 @@ +1 2 \ No newline at end of file diff --git a/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.unix b/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.unix new file mode 100644 index 000000000..1191247b6 --- /dev/null +++ b/src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.unix @@ -0,0 +1,2 @@ +1 +2 diff --git a/src/etc/testcases/taskdefs/fixcrlf/input/crcrlf b/src/etc/testcases/taskdefs/fixcrlf/input/crcrlf new file mode 100644 index 000000000..31e10f299 --- /dev/null +++ b/src/etc/testcases/taskdefs/fixcrlf/input/crcrlf @@ -0,0 +1,2 @@ +1 +2 diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java index 2408918b1..1be9a8ba2 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java @@ -184,6 +184,24 @@ public class FixCrLfTest extends BuildFileTest { new File("src/etc/testcases/taskdefs/fixcrlf/result/longlines.crlf")); } + public void testCrCrLfSequenceUnix() throws IOException { + executeTarget("testCrCrLfSequence-unix"); + assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.unix"), + new File("src/etc/testcases/taskdefs/fixcrlf/result/crcrlf")); + } + + public void testCrCrLfSequenceDos() throws IOException { + executeTarget("testCrCrLfSequence-dos"); + assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.dos"), + new File("src/etc/testcases/taskdefs/fixcrlf/result/crcrlf")); + } + + public void testCrCrLfSequenceMac() throws IOException { + executeTarget("testCrCrLfSequence-mac"); + assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.mac"), + new File("src/etc/testcases/taskdefs/fixcrlf/result/crcrlf")); + } + public void assertEqualContent(File expect, File result) throws AssertionFailedError, IOException { if (!result.exists()) {