Enable previously disabled head-tail tests.

Make StripJavaComments recognize and retain Mac line endings.

PR: 18476

Submitted by: peter.reilly@corvil.com (peter reilly)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274506 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -277,7 +277,6 @@
   <patternset id="teststhatfail">
     <exclude name="${optional.package}/BeanShellScriptTest.java"/>
     <exclude name="${ant.package}/taskdefs/ImportTest.java"/>
-<!--    <exclude name="${ant.package}/filters/HeadTailTest.java"/> -->
   </patternset>
 
   <!--

src/etc/testcases/filters/head-tail.xml

@@ -43,6 +43,18 @@
     </copy>
   </target>
 
+  <target name="testFilterReaderHeadLinesSkip" depends="init">
+    <copy file="input/head-tail.test" 
+          tofile="result/head-tail.filterReaderHeadLinesSkip.test">
+      <filterchain>
+        <filterreader classname="org.apache.tools.ant.filters.HeadFilter">
+          <param name="lines" value="2"/>
+          <param name="skip" value="2"/>
+        </filterreader>
+      </filterchain>
+    </copy>
+  </target>
+
   <target name="testHeadAllSkip" depends="init">
     <copy file="input/head-tail.test" tofile="result/head-tail.headAllSkip.test">
       <filterchain>
@@ -85,6 +97,18 @@
     </copy>
   </target>
 
+  <target name="testFilterReaderTailLinesSkip" depends="init">
+    <copy file="input/head-tail.test" 
+          tofile="result/head-tail.filterReaderTailLinesSkip.test">
+      <filterchain>
+        <filterreader classname="org.apache.tools.ant.filters.TailFilter">
+          <param name="lines" value="2"/>
+          <param name="skip" value="2"/>
+        </filterreader>
+      </filterchain>
+    </copy>
+  </target>
+
   <target name="testTailAllSkip" depends="init">
     <copy file="input/head-tail.test" tofile="result/head-tail.tailAllSkip.test">
       <filterchain>

src/main/org/apache/tools/ant/filters/StripJavaComments.java

@@ -132,15 +132,9 @@ public final class StripJavaComments
                     if (ch == '/') {
                         ch = in.read();
                         if (ch == '/') {
-                            int prevCh = -1;
-                            while (ch != '\n' && ch != -1) {
-                                prevCh = ch;
+                            while (ch != '\n' && ch != -1 && ch != '\r') {
                                 ch = in.read();
                             }
-                            if ( ch == '\n' && prevCh == '\r' ) {
-                                readAheadCh = ch;
-                                ch = prevCh;
-                            }
                         } else if (ch == '*') {
                             while (ch != -1) {
                                 ch = in.read();

src/testcases/org/apache/tools/ant/filters/HeadTailTest.java

@@ -112,19 +112,17 @@ public class HeadTailTest extends BuildFileTest {
         assertTrue("testHeadLinesSkip: Result not like expected", fu.contentEquals(expected, result));
     }
 
-/*
     public void testFilterReaderHeadLinesSkip() throws IOException {
         executeTarget("testFilterReaderHeadLinesSkip");
         File expected = getProject().resolveFile(
-            "expected/head-tail.filterReaderHeadLinesSkip.test");
+            "expected/head-tail.headLinesSkip.test");
         File result = getProject().resolveFile(
-            "result/head-tail.headLinesSkip.test");
+            "result/head-tail.filterReaderHeadLinesSkip.test");
         FileUtils fu = FileUtils.newFileUtils();
         assertTrue("testFilterReaderHeadLinesSkip: Result not like expected",
                    fu.contentEquals(expected, result));
     }
 
-*/
     public void testTail() throws IOException {
         executeTarget("testTail");
         File expected = getProject().resolveFile("expected/head-tail.tail.test");
@@ -157,18 +155,16 @@ public class HeadTailTest extends BuildFileTest {
         assertTrue("testTailLinesSkip: Result not like expected", fu.contentEquals(expected, result));
     }
 
-/*
     public void testFilterReaderTailLinesSkip() throws IOException {
         executeTarget("testFilterReaderTailLinesSkip");
         File expected = getProject().resolveFile(
-            "expected/head-tail.filterReaderTailLinesSkip.test");
+            "expected/head-tail.tailLinesSkip.test");
         File result = getProject().resolveFile(
-            "result/head-tail.tailLinesSkip.test");
+            "result/head-tail.filterReaderTailLinesSkip.test");
         FileUtils fu = FileUtils.newFileUtils();
         assertTrue("testFilterReaderTailLinesSkip: Result not like expected",
                    fu.contentEquals(expected, result));
     }
-*/
 
     public void testHeadTail() throws IOException {
         executeTarget("testHeadTail");