Browse Source

Add explicit tests for <fixcrlf>'s CRCRLF handling.

PR: 12219


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273290 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
0ee75128d8
6 changed files with 46 additions and 0 deletions
  1. +21
    -0
      src/etc/testcases/taskdefs/fixcrlf/build.xml
  2. +2
    -0
      src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.dos
  3. +1
    -0
      src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.mac
  4. +2
    -0
      src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.unix
  5. +2
    -0
      src/etc/testcases/taskdefs/fixcrlf/input/crcrlf
  6. +18
    -0
      src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java

+ 21
- 0
src/etc/testcases/taskdefs/fixcrlf/build.xml View File

@@ -121,4 +121,25 @@
/> />
</target> </target>


<target name="testCrCrLfSequence-unix" depends="init">
<fixcrlf srcdir="input" destdir="result"
includes="crcrlf"
eol="lf"
/>
</target>

<target name="testCrCrLfSequence-dos" depends="init">
<fixcrlf srcdir="input" destdir="result"
includes="crcrlf"
eol="crlf"
/>
</target>

<target name="testCrCrLfSequence-mac" depends="init">
<fixcrlf srcdir="input" destdir="result"
includes="crcrlf"
eol="cr"
/>
</target>

</project> </project>

+ 2
- 0
src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.dos View File

@@ -0,0 +1,2 @@
1
2

+ 1
- 0
src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.mac View File

@@ -0,0 +1 @@
1 2

+ 2
- 0
src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.unix View File

@@ -0,0 +1,2 @@
1
2

+ 2
- 0
src/etc/testcases/taskdefs/fixcrlf/input/crcrlf View File

@@ -0,0 +1,2 @@
1
2

+ 18
- 0
src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java View File

@@ -184,6 +184,24 @@ public class FixCrLfTest extends BuildFileTest {
new File("src/etc/testcases/taskdefs/fixcrlf/result/longlines.crlf")); 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) public void assertEqualContent(File expect, File result)
throws AssertionFailedError, IOException { throws AssertionFailedError, IOException {
if (!result.exists()) { if (!result.exists()) {


Loading…
Cancel
Save