Merge pull request #665 from alblue/sr2792

Author: swift-ci

TestFoundation/TestNSArray.swift

@@ -483,13 +483,12 @@ class TestNSArray : XCTestCase {
             if isWritten {
                 do {
                     let plistDoc = try XMLDocument(contentsOf: URL(fileURLWithPath: testFilePath!, isDirectory: false), options: [])
-                    try plistDoc.validate()
                     XCTAssert(plistDoc.rootElement()?.name == "plist")
                     let plist = try PropertyListSerialization.propertyList(from: plistDoc.xmlData, options: [], format: nil) as! [Any]
                     XCTAssert((plist[0] as? String) == d1[0] as? String)
                     XCTAssert((plist[1] as? String) == d1[1] as? String)
                 } catch {
-                    XCTFail("XMLDocument failes to read / validate contenets")
+                    XCTFail("Failed to read and parse XMLDocument")
                 }
             } else {
                 XCTFail("Write to file failed")

TestFoundation/TestNSDictionary.swift

@@ -168,16 +168,15 @@ class TestNSDictionary : XCTestCase {
         if let _ = testFilePath {
             let d1: NSDictionary = [ "foo": "bar", "baz": "qux"]
             let isWritten = d1.write(toFile: testFilePath!, atomically: true)
-            if(isWritten){
-                do{
+            if isWritten {
+                do {
                     let plistDoc = try XMLDocument(contentsOf: URL(fileURLWithPath: testFilePath!, isDirectory: false), options: [])
-                    try plistDoc.validate()
                     XCTAssert(plistDoc.rootElement()?.name == "plist")
                     let plist = try PropertyListSerialization.propertyList(from: plistDoc.xmlData, options: [], format: nil) as! [String: Any]
                     XCTAssert((plist["foo"] as? String) == d1["foo"] as? String)
                     XCTAssert((plist["baz"] as? String) == d1["baz"] as? String)
                 } catch {
-                    XCTFail("XMLDocument failes to read / validate contenets")
+                    XCTFail("Failed to read and parse XMLDocument")
                 }
             } else {
                 XCTFail("Write to file failed")