From 61ade34e4368c6bbdce9903ffdaa8fa0d769d71b Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Wed, 9 Nov 2011 19:41:59 +0000
Subject: [PATCH] #51049: <junitreport> mishandled ${line.separator}.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1199931 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                      | 3 +++
 src/etc/junit-frames-xalan1.xsl                               | 4 +++-
 src/etc/junit-frames.xsl                                      | 4 +++-
 src/etc/junit-noframes.xsl                                    | 4 +++-
 .../junitreport/TEST-sampleproject.coins.CoinTest.xml         | 3 +--
 .../tools/ant/taskdefs/optional/junit/JUnitReportTest.java    | 3 +++
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index a3dd34db3..ac0abd2a0 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -13,6 +13,9 @@ Changes that could break older environments:
 Fixed bugs:
 -----------
 
+ * <junitreport> mishandled ${line.separator}.
+   Bugzilla Report 51049.
+
  * <junitreport> did not work in embedded environments on JDK 7.
    Bugzilla Report 51668.
 
diff --git a/src/etc/junit-frames-xalan1.xsl b/src/etc/junit-frames-xalan1.xsl
index 0efb75873..9a017b969 100644
--- a/src/etc/junit-frames-xalan1.xsl
+++ b/src/etc/junit-frames-xalan1.xsl
@@ -707,7 +707,9 @@ h6 {
     <xsl:param name="string"/>
     <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
     <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),&quot;'&quot;,&quot;\&apos;&quot;)"/>
-    <xsl:value-of select="$tmp2"/>
+    <xsl:param name="tmp3" select="stringutils:replace(string($tmp2),&quot;&#10;&quot;,'\n')"/>
+    <xsl:param name="tmp4" select="stringutils:replace(string($tmp3),&quot;&#13;&quot;,'\r')"/>
+    <xsl:value-of select="$tmp4"/>
 </xsl:template>
 
 
diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index 535ba827e..d5d248f0f 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -866,7 +866,9 @@ h6 {
     <xsl:param name="string"/>
     <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
     <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),&quot;'&quot;,&quot;\&apos;&quot;)"/>
-    <xsl:value-of select="$tmp2"/>
+    <xsl:param name="tmp3" select="stringutils:replace(string($tmp2),&quot;&#10;&quot;,'\n')"/>
+    <xsl:param name="tmp4" select="stringutils:replace(string($tmp3),&quot;&#13;&quot;,'\r')"/>
+    <xsl:value-of select="$tmp4"/>
 </xsl:template>
 
 
diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl
index 18177a113..203671f9c 100644
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -441,7 +441,9 @@
     <xsl:param name="string"/>
     <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
     <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),&quot;'&quot;,&quot;\&apos;&quot;)"/>
-    <xsl:value-of select="$tmp2"/>
+    <xsl:param name="tmp3" select="stringutils:replace(string($tmp2),&quot;&#10;&quot;,'\n')"/>
+    <xsl:param name="tmp4" select="stringutils:replace(string($tmp3),&quot;&#13;&quot;,'\r')"/>
+    <xsl:value-of select="$tmp4"/>
 </xsl:template>
 
 
diff --git a/src/etc/testcases/taskdefs/optional/junitreport/TEST-sampleproject.coins.CoinTest.xml b/src/etc/testcases/taskdefs/optional/junitreport/TEST-sampleproject.coins.CoinTest.xml
index f4ce4984e..6bc99f292 100644
--- a/src/etc/testcases/taskdefs/optional/junitreport/TEST-sampleproject.coins.CoinTest.xml
+++ b/src/etc/testcases/taskdefs/optional/junitreport/TEST-sampleproject.coins.CoinTest.xml
@@ -36,8 +36,7 @@
     <property name="basedir" value="/home/jkf/programming/gretant_sourceforge/sampleproject"></property>
     <property name="os.arch" value="i386"></property>
     <property name="java.io.tmpdir" value="/tmp"></property>
-    <property name="line.separator" value="
-"></property>
+    <property name="line.separator" value="&#xd;&#xa;"></property>
     <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."></property>
     <property name="java.awt.fonts" value=""></property>
     <property name="os.name" value="Linux"></property>
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
index ebae8fae9..fe9a25b15 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
@@ -104,6 +104,9 @@ public class JUnitReportTest extends BuildFileTest {
             assertTrue("output must contain <br>:\n" + report,
                        report.indexOf("junit.framework.AssertionFailedError: DOEG<br>")
                    > -1);
+            assertTrue("#51049: output must translate line breaks:\n" + report,
+                       report.indexOf("cur['line.separator'] = '\\r\\n';")
+                   > -1);
         } finally {
             FileUtils.close(r);
         }