Merge pull request #2046 from hironytic/replace-by-add-attribute

Fix: existing attributes are not replaced

Author: millenomi

Foundation/XMLElement.swift

@@ -82,17 +82,15 @@ open class XMLElement: XMLNode {
 
     /*!
         @method addAttribute:
-        @abstract Adds an attribute. Attributes with duplicate names are not added.
+        @abstract Adds an attribute. Attributes with duplicate names replace the old one.
     */
     open func addAttribute(_ attribute: XMLNode) {
         guard let name = _CFXMLNodeCopyName(attribute._xmlNode)?._swiftObject else {
             fatalError("Attributes must have a name!")
         }
 
-        name.cString(using: .utf8)!.withUnsafeBufferPointer() {
-            guard let ptr = $0.baseAddress, _CFXMLNodeHasProp(_xmlNode, ptr) == nil else { return }
-            addChild(attribute)
-        }
+        removeAttribute(forName: name)
+        addChild(attribute)
     }
 
     /*!

TestFoundation/TestXMLDocument.swift

@@ -233,6 +233,9 @@ class TestXMLDocument : LoopbackServerTest {
         XCTAssertEqual(element.xmlString, "<root></root>", element.xmlString)
 
         element.addAttribute(attribute)
+        let attribute2 = XMLNode.attribute(withName: "color", stringValue: "#00ff00") as! XMLNode
+        element.addAttribute(attribute2)
+        XCTAssertEqual(element.attribute(forName: "color")?.stringValue, "#00ff00")
 
         let otherAttribute = XMLNode.attribute(withName: "foo", stringValue: "bar") as! XMLNode
         element.addAttribute(otherAttribute)
@@ -243,7 +246,7 @@ class TestXMLDocument : LoopbackServerTest {
         }
 
         XCTAssertEqual(attributes.count, 2)
-        XCTAssertEqual(attributes.first, attribute)
+        XCTAssertEqual(attributes.first, attribute2)
         XCTAssertEqual(attributes.last, otherAttribute)
 
         let barAttribute = XMLNode.attribute(withName: "bar", stringValue: "buz") as! XMLNode