unconditionally encode & as & in DOMElementWriter. PR 49404

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

WHATSNEW

@@ -16,6 +16,14 @@ Changes that could break older environments:
 
  * Removed ant-nodeps.jar; it is now merged into ant.jar.
 
+ * DOMElementWriter#encode used to employ special code before encoding
+   ampersands so that { remained { rather than being turned
+   into {.  This is no longer the case, ampersands will now
+   be encoded unconditionally.
+   This affects <echoxml> task as well as the XML logger or JUnit
+   formatter where ampersands will now always get encoded.
+   Bugzilla Report 49404.
+
 Fixed bugs:
 -----------
 

src/main/org/apache/tools/ant/util/DOMElementWriter.java

@@ -429,13 +429,7 @@ public class DOMElementWriter {
                 sb.append(""");
                 break;
             case '&':
-                int nextSemi = value.indexOf(";", i);
-                if (nextSemi < 0
-                    || !isReference(value.substring(i, nextSemi + 1))) {
-                    sb.append("&amp;");
-                } else {
-                    sb.append('&');
-                }
+                sb.append("&amp;");
                 break;
             default:
                 if (isLegalCharacter(c)) {

src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml

@@ -79,14 +79,12 @@ public class A extends TestCase {
     </junit>
     <xmlvalidate file="${output}/TEST-org.example.A.xml"
                  lenient="true"/>
-    <!--
     <au:assertResourceContains
         resource="${output}/TEST-org.example.A.xml"
         value="message=&quot;&amp;amp;amp;&amp;amp;"/>
     <au:assertResourceContains
         resource="${output}/TEST-org.example.A.xml"
-        value="message=AssertionFailedError: &amp;amp;&amp;"/>
-    -->
+        value="AssertionFailedError: &amp;amp;amp;&amp;"/>
   </target>
 
 </project>

src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java

@@ -53,17 +53,17 @@ public class DOMElementWriterTest extends TestCase {
     }
 
     public void testEncode() {
-        assertEquals("", w.encode(""));
-        assertEquals(" ", w.encode(" "));
-        assertEquals(" ", w.encode(" "));
+        assertEquals("", w.encode(""));
+        assertEquals(" ", w.encode(" "));
+        assertEquals(" ", w.encode(" "));
         assertEquals("&#A0;", w.encode("&#A0;"));
         assertEquals("20;", w.encode("20;"));
         assertEquals("&#20", w.encode("&#20"));
-        assertEquals(""", w.encode("""));
-        assertEquals("'", w.encode("'"));
-        assertEquals(">", w.encode(">"));
-        assertEquals("<", w.encode("<"));
-        assertEquals("&", w.encode("&"));
+        assertEquals(""", w.encode("""));
+        assertEquals("'", w.encode("'"));
+        assertEquals(">", w.encode(">"));
+        assertEquals("<", w.encode("<"));
+        assertEquals("&", w.encode("&"));
         assertEquals(""", w.encode("\""));
         assertEquals("&lt;", w.encode("<"));
         assertEquals("&amp;", w.encode("&"));