From fb92b3da3b44485a06236ae66e6a62b6069aa426 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 16 Sep 2002 16:19:30 +0000
Subject: [PATCH] Don't add extra linefeed in <replaceregexp>

PR: 12407
Submitted by:	Stefan Moebius <stmoebius at yahoo.com>

Note that the byline="true" case is still broken (and a commented-out
test confirms this) - I'll look into it later this week.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273330 13f79535-47bb-0310-9956-ffa450edef68
---
 .../taskdefs/optional/replaceregexp.xml       | 18 +++++++++++++
 .../optional/replaceregexp2.properties        |  1 +
 .../optional/replaceregexp2.result.properties |  1 +
 .../ant/taskdefs/optional/ReplaceRegExp.java  |  2 +-
 .../taskdefs/optional/ReplaceRegExpTest.java  | 26 ++++++++++++++++++-
 5 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 src/etc/testcases/taskdefs/optional/replaceregexp2.properties
 create mode 100644 src/etc/testcases/taskdefs/optional/replaceregexp2.result.properties

diff --git a/src/etc/testcases/taskdefs/optional/replaceregexp.xml b/src/etc/testcases/taskdefs/optional/replaceregexp.xml
index 2c61475c5..cb7130a53 100644
--- a/src/etc/testcases/taskdefs/optional/replaceregexp.xml
+++ b/src/etc/testcases/taskdefs/optional/replaceregexp.xml
@@ -8,6 +8,10 @@
     <copy file="replaceregexp.properties" tofile="test.properties" />
   </target>
 
+  <target name="setup-nl">
+    <copy file="replaceregexp2.properties" tofile="test.properties" />
+  </target>
+
   <target name="testReplace" depends="setup">
     <replaceregexp file="test.properties" byline="true">
       <regexp pattern="Old(.*)=(.*)" />
@@ -15,6 +19,20 @@
     </replaceregexp>
   </target>
 
+  <target name="testDontAddNewline1" depends="setup-nl">
+    <replaceregexp file="test.properties" byline="false">
+      <regexp pattern="Old(.*)=(.*)" />
+      <substitution expression="NewProp=\1\2" />
+    </replaceregexp>
+  </target>
+
+  <target name="testDontAddNewline2" depends="setup-nl">
+    <replaceregexp file="test.properties" byline="true">
+      <regexp pattern="Old(.*)=(.*)" />
+      <substitution expression="NewProp=\1\2" />
+    </replaceregexp>
+  </target>
+
   <target name="cleanup">
     <delete file="test.properties" />
   </target>
diff --git a/src/etc/testcases/taskdefs/optional/replaceregexp2.properties b/src/etc/testcases/taskdefs/optional/replaceregexp2.properties
new file mode 100644
index 000000000..e0c2a4807
--- /dev/null
+++ b/src/etc/testcases/taskdefs/optional/replaceregexp2.properties
@@ -0,0 +1 @@
+OldAbc=Def
\ No newline at end of file
diff --git a/src/etc/testcases/taskdefs/optional/replaceregexp2.result.properties b/src/etc/testcases/taskdefs/optional/replaceregexp2.result.properties
new file mode 100644
index 000000000..9a469c785
--- /dev/null
+++ b/src/etc/testcases/taskdefs/optional/replaceregexp2.result.properties
@@ -0,0 +1 @@
+NewProp=AbcDef
\ No newline at end of file
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
index 0bd67b380..bfcf81c65 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
@@ -354,7 +354,7 @@ public class ReplaceRegExp extends Task {
                     changes = true;
                 }
 
-                pw.println(res);
+                pw.print(res);
                 pw.flush();
             }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java
index a46c5d272..101bac3f8 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java
@@ -1,7 +1,7 @@
 /*
  *  The Apache Software License, Version 1.1
  *
- *  Copyright (c) 2001 The Apache Software Foundation.  All rights
+ *  Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  *  reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -54,8 +54,10 @@
 package org.apache.tools.ant.taskdefs.optional;
 
 import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
 
 import java.util.Properties;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
@@ -111,4 +113,26 @@ public class ReplaceRegExpTest extends BuildFileTest {
         assertEquals("AbcDef", after.get("NewProp"));
     }
 
+    public void testDontAddNewline1() throws IOException {
+        executeTarget("testDontAddNewline1");
+        assertTrue("Files match",
+                   FileUtils.newFileUtils()
+                   .contentEquals(new File("src/etc/testcases/taskdefs/optional/test.properties"),
+                                  new File("src/etc/testcases/taskdefs/optional/replaceregexp2.result.properties")));
+    }
+
+    /**
+     * FIXME
+     *
+     * will be fixed this week, just running out of time and
+     * committing a partly fixed version now -- Stefan
+    public void testDontAddNewline2() throws IOException {
+        executeTarget("testDontAddNewline2");
+        assertTrue("Files match",
+                   FileUtils.newFileUtils()
+                   .contentEquals(new File("src/etc/testcases/taskdefs/optional/test.properties"),
+                                  new File("src/etc/testcases/taskdefs/optional/replaceregexp2.result.properties")));
+    }
+     */
+
 }// ReplaceRegExpTest