Fix handling entity references (in Android context they are exposed). The

Android parser is relatively stupid and exposes these. This fixes
bug #44

Author: pdvrieze

core/src/commonMain/kotlin/nl/adaptivity/xmlutil/EventType.kt

@@ -73,6 +73,8 @@ enum class EventType {
             writer.comment(reader.text)
     },
     TEXT {
+        override val isTextElement: Boolean get() = true
+
         override fun createEvent(reader: XmlReader) = reader.run {
             XmlEvent.TextEvent(locationInfo, TEXT, text)
         }
@@ -83,6 +85,8 @@ enum class EventType {
             writer.text(reader.text)
     },
     CDSECT {
+        override val isTextElement: Boolean get() = true
+
         override fun createEvent(reader: XmlReader) = reader.run {
             XmlEvent.TextEvent(locationInfo, CDSECT, text)
         }
@@ -115,6 +119,8 @@ enum class EventType {
             writer.endDocument()
     },
     ENTITY_REF {
+        override val isTextElement: Boolean get() = true
+
         override fun createEvent(reader: XmlReader) = reader.run {
             XmlEvent.TextEvent(locationInfo, ENTITY_REF, text)
         }
@@ -162,6 +168,7 @@ enum class EventType {
     };
 
     open val isIgnorable: Boolean get() = false
+    open val isTextElement: Boolean get() = false
 
     open fun writeEvent(writer: XmlWriter, textEvent: XmlEvent.TextEvent): Unit = throw UnsupportedOperationException(
         "This is not generally supported, only by text types"

core/src/commonMain/kotlin/nl/adaptivity/xmlutil/XmlReader.kt

@@ -198,6 +198,7 @@ fun XmlReader.isPrefixDeclaredInElement(prefix: String): Boolean {
 @JvmOverloads
 internal fun XmlReader.unhandledEvent(message: String? = null) {
     val actualMessage = when (eventType) {
+        EventType.ENTITY_REF,
         EventType.CDSECT,
         EventType.TEXT          -> if (!isWhitespace()) message
             ?: "Content found where not expected [$locationInfo] Text:'$text'" else null
@@ -231,7 +232,7 @@ fun XmlReader.isElement(elementname: QName): Boolean {
 fun XmlReader.allText(): String {
     val t = this
     return buildString {
-        if (eventType == EventType.TEXT || eventType == EventType.CDSECT) {
+        if (eventType.isTextElement) {
             append(text)
         }
 
@@ -247,6 +248,7 @@ fun XmlReader.allText(): String {
                 EventType.IGNORABLE_WHITESPACE
                      -> if (length != 0) append(t.text)
 
+                EventType.ENTITY_REF,
                 EventType.TEXT,
                 EventType.CDSECT
                      -> append(t.text)
@@ -276,7 +278,7 @@ fun XmlBufferedReader.consecutiveTextContent(): String {
     val whiteSpace = StringBuilder()
     val t = this
     return buildString {
-        if (eventType == EventType.TEXT || eventType == EventType.CDSECT) {
+        if (eventType.isTextElement) {
             append(text)
         }
 
@@ -293,6 +295,7 @@ fun XmlBufferedReader.consecutiveTextContent(): String {
                      -> { t.next(); whiteSpace.append(t.text) }
 
                 EventType.TEXT,
+                EventType.ENTITY_REF,
                 EventType.CDSECT
                      -> {
                     t.next()

serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/XMLDecoder.kt

@@ -452,6 +452,7 @@ internal open class XmlDecoderBase internal constructor(
                     when (eventType) {
                         EventType.END_ELEMENT -> return readElementEnd(descriptor)
 
+                        EventType.ENTITY_REF,
                         EventType.CDSECT,
                         EventType.TEXT -> {
                             // The android reader doesn't check whitespaceness. This code should throw

serialization/src/commonTest/kotlin/nl/adaptivity/xml/serialization/TestCommon.kt

@@ -39,7 +39,9 @@ import nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy.XmlEncodeDefau
 import nl.adaptivity.xmlutil.util.CompactFragment
 import kotlin.test.*
 
-private fun String.normalize() = replace(" />", "/>").replace("\r\n", "\n")
+private fun String.normalize() = replace(" />", "/>")
+    .replace("\r\n", "\n")
+    .replace(">", ">")
 
 fun JsonBuilder.defaultJsonTestConfiguration() {
     isLenient = true
@@ -167,15 +169,15 @@ class TestCommon {
     }
 
     class ValueContainerTest : TestBase<ValueContainer>(
-        ValueContainer("foobar"),
+        ValueContainer("<foo&bar>"),
         ValueContainer.serializer()
                                                        ) {
-        override val expectedXML: String = "<valueContainer>foobar</valueContainer>"
-        override val expectedJson: String = "{\"content\":\"foobar\"}"
+        override val expectedXML: String = "<valueContainer>&lt;foo&amp;bar></valueContainer>"
+        override val expectedJson: String = "{\"content\":\"<foo&bar>\"}"
 
         @Test
         fun testAlternativeXml() {
-            val alternativeXml = "<valueContainer><![CDATA[foo]]>bar</valueContainer>"
+            val alternativeXml = "<valueContainer><![CDATA[<foo&]]>bar&gt;</valueContainer>"
             assertEquals(value, baseXmlFormat.decodeFromString(serializer, alternativeXml))
         }