Fix reading of XML data with newlines

soto-project · Mar 2, 2021 · 78e03eb · 78e03eb
1 parent 53b8b1f
commit 78e03eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Sources/SotoXML/XML.swift b/Sources/SotoXML/XML.swift
@@ -269,7 +269,7 @@ public enum XML {
                 }
                 .onCharacterData { characters in
                     // if string with white space removed still has characters, add text node
-                    if characters.split(omittingEmptySubsequences: true, whereSeparator: { $0.isWhitespaceOrNewline }).joined().count > 0 {
+                    if characters.split(omittingEmptySubsequences: true, whereSeparator: { $0.isWhitespace && !$0.isNewline }).joined().count > 0 {
                         currentElement?.addChild(XML.Node.text(stringValue: characters))
                     }
                 }

diff --git a/Tests/SotoXMLTests/XMLTests.swift b/Tests/SotoXMLTests/XMLTests.swift
@@ -117,6 +117,15 @@ class XMLTests: XCTestCase {
         XCTAssertEqual(xml2, "<?xml version=\"1.0\" encoding=\"UTF-8\"?><test><a> before</a><b></b><c>after </c></test>")
     }
 
+    func testNewlines() {
+        let xml = """
+        <?xml version=\"1.0\" encoding=\"UTF-8\"?><test>Hello
+
+        Goodbye</test>
+        """
+        XCTAssertNoThrow(try self.testDecodeEncode(xml: xml))
+    }
+
     func testDecodeRubbish() {
         let xml = "{}"
         XCTAssertThrowsError(try XML.Document(data: Data(xml.utf8)))