diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala
index 0ccbc0767..e4321aa62 100644
--- a/jvm/src/test/scala/scala/xml/XMLTest.scala
+++ b/jvm/src/test/scala/scala/xml/XMLTest.scala
@@ -315,10 +315,7 @@ class XMLTestJVM {
val inputStream = new java.io.ByteArrayInputStream(outputStream.toByteArray)
val streamReader = new java.io.InputStreamReader(inputStream, XML.encoding)
- def unescapeQuotes(str: String) =
- """.r.replaceFirstIn(str, "\"")
- val xmlFixed = unescapeQuotes(xml.toString)
- assertEquals(xmlFixed, XML.load(streamReader).toString)
+ assertEquals(xml.toString, XML.load(streamReader).toString)
}
@UnitTest
diff --git a/shared/src/main/scala/scala/xml/Text.scala b/shared/src/main/scala/scala/xml/Text.scala
index 2136b2462..0232e69b1 100644
--- a/shared/src/main/scala/scala/xml/Text.scala
+++ b/shared/src/main/scala/scala/xml/Text.scala
@@ -27,7 +27,7 @@ class Text(data: String) extends Atom[String](data) {
* specification.
*/
override def buildString(sb: StringBuilder): StringBuilder =
- Utility.escapeText(data, sb)
+ Utility.escape(data, sb)
}
/**
diff --git a/shared/src/main/scala/scala/xml/Utility.scala b/shared/src/main/scala/scala/xml/Utility.scala
index be5ff3e8d..1a5226d69 100755
--- a/shared/src/main/scala/scala/xml/Utility.scala
+++ b/shared/src/main/scala/scala/xml/Utility.scala
@@ -131,20 +131,6 @@ object Utility extends AnyRef with parsing.TokenTests {
}
}
- /**
- * Appends escaped string to `s`, but not ".
- */
- final def escapeText(text: String, s: StringBuilder): StringBuilder = {
- val escTextMap = escMap - '"' // Remove quotes from escMap
- text.iterator.foldLeft(s) { (s, c) =>
- escTextMap.get(c) match {
- case Some(str) => s ++= str
- case _ if c >= ' ' || "\n\r\t".contains(c) => s += c
- case _ => s // noop
- }
- }
- }
-
/**
* Appends unescaped string to `s`, `amp` becomes `&`,
* `lt` becomes `<` etc..
diff --git a/shared/src/test/scala/scala/xml/XMLTest.scala b/shared/src/test/scala/scala/xml/XMLTest.scala
index c00c5aead..8e8e3acb0 100644
--- a/shared/src/test/scala/scala/xml/XMLTest.scala
+++ b/shared/src/test/scala/scala/xml/XMLTest.scala
@@ -256,10 +256,10 @@ class XMLTest {
@UnitTest
def escape =
assertEquals("""
- "Come, come again, whoever you are, come!
+ "Come, come again, whoever you are, come!
Heathen, fire worshipper or idolatrous, come!
Come even if you broke your penitence a hundred times,
-Ours is the portal of hope, come as you are."
+Ours is the portal of hope, come as you are."
Mevlana Celaleddin Rumi""", .attributes)
}
- @UnitTest
- def t5645: Unit = {
-
- val bar = "baz"
- val script =
-
- val expected =
- """|""".stripMargin
-
- assertEquals(expected, script.toString)
- }
-
@UnitTest
def t5843: Unit = {
val foo = scala.xml.Attribute(null, "foo", "1", scala.xml.Null)