Merge pull request #665 from alblue/sr2792
diff --git a/TestFoundation/TestNSArray.swift b/TestFoundation/TestNSArray.swift
index 7d3f91a..132747b 100644
--- a/TestFoundation/TestNSArray.swift
+++ b/TestFoundation/TestNSArray.swift
@@ -483,13 +483,12 @@
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")
diff --git a/TestFoundation/TestNSDictionary.swift b/TestFoundation/TestNSDictionary.swift
index 4e602e0..002a119 100644
--- a/TestFoundation/TestNSDictionary.swift
+++ b/TestFoundation/TestNSDictionary.swift
@@ -168,16 +168,15 @@
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")
