Avoid clobbering values with an empty element.

LiveUI · Aug 1, 2018 · 057ea72 · 057ea72
1 parent 52b68dd
commit 057ea72
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Sources/XMLCoding/XMLStackParser.swift b/Sources/XMLCoding/XMLStackParser.swift
@@ -183,7 +183,8 @@ internal class _XMLElement {
                     } else {
                         node[childElement.key] = newValue
                     }
-                } else {
+                // if the node is empty and there is no existing value
+                } else if node[childElement.key] == nil {
                     // an empty node can be treated as an empty dictionary
                     node[childElement.key] = [:]
                 }

diff --git a/Tests/XMLCodingTests/XMLParsingTests.swift b/Tests/XMLCodingTests/XMLParsingTests.swift
@@ -48,6 +48,27 @@ class XMLParsingTests: XCTestCase {
         XCTAssertNil(response.result.message)
     }
 
+    func testEmptyElementNotEffectingPreviousElement() throws {
+        let inputString = """
+            <Response>
+                <Result>
+                    <Message>message</Message>
+                </Result>
+                <Result/>
+                <Metadata>
+                    <Id>id</Id>
+                </Metadata>
+            </Response>
+            """
+
+        guard let inputData = inputString.data(using: .utf8) else {
+            return XCTFail()
+        }
+
+        let response = try XMLDecoder().decode(Response.self, from: inputData)
+
+        XCTAssertEqual("message", response.result.message)
+    }
 
     static var allTests = [
         ("testEmptyElement", testEmptyElement),