From 0ee75128d83afe4ccb7b1934b20ad3273bb46ba7 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 3 Sep 2002 15:51:53 +0000
Subject: [PATCH] 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
---
 src/etc/testcases/taskdefs/fixcrlf/build.xml  | 21 +++++++++++++++++++
 .../taskdefs/fixcrlf/expected/crcrlf.dos      |  2 ++
 .../taskdefs/fixcrlf/expected/crcrlf.mac      |  1 +
 .../taskdefs/fixcrlf/expected/crcrlf.unix     |  2 ++
 .../testcases/taskdefs/fixcrlf/input/crcrlf   |  2 ++
 .../tools/ant/taskdefs/FixCrLfTest.java       | 18 ++++++++++++++++
 6 files changed, 46 insertions(+)
 create mode 100644 src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.dos
 create mode 100644 src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.mac
 create mode 100644 src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.unix
 create mode 100644 src/etc/testcases/taskdefs/fixcrlf/input/crcrlf

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 @@
              />
   </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>
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()) {