Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shared/src/main/scala/scala/xml/PCData.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class PCData(data: String) extends Atom[String](data) {
* @return the input string buffer with the formatted CDATA section
*/
override def buildString(sb: StringBuilder): StringBuilder =
sb append "<![CDATA[%s]]>".format(data)
sb append "<![CDATA[%s]]>".format(data.replaceAll("]]>", "]]]]><![CDATA[>"))
}

/**
Expand Down
37 changes: 37 additions & 0 deletions shared/src/test/scala/scala/xml/PCDataTest.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package scala.xml

import org.junit.Test
import org.junit.Assert.assertEquals

class PCDataTest {

@Test
def emptyTest = {
val pcdata = new PCData("")
assertEquals("<![CDATA[]]>", pcdata.toString)
}

@Test
def bracketTest = {
val pcdata = new PCData("[]")
assertEquals("<![CDATA[[]]]>", pcdata.toString)
}

@Test
def hellaBracketingTest = {
val pcdata = new PCData("[[[[[[[[]]]]]]]]")
assertEquals("<![CDATA[[[[[[[[[]]]]]]]]]]>", pcdata.toString)
}

@Test
def simpleNestingTest = {
val pcdata = new PCData("]]>")
assertEquals("<![CDATA[]]]]><![CDATA[>]]>", pcdata.toString)
}

@Test
def recursiveNestingTest = {
val pcdata = new PCData("<![CDATA[]]>")
assertEquals("<![CDATA[<![CDATA[]]]]><![CDATA[>]]>", pcdata.toString)
}
}