Merge pull request #486 from xwu/migrate-for-se-0134

atrick · web-flow · commit d1a3d8023017 · 2016-07-28T10:05:20.000-07:00
Use utf8CString instead of nulTerminatedUTF8
diff --git a/TestFoundation/TestNSXMLParser.swift b/TestFoundation/TestNSXMLParser.swift
@@ -26,9 +26,9 @@ class TestNSXMLParser : XCTestCase {
     }
     
     func test_data() {
-        let xml = Array("<test><foo>bar</foo></test>".nulTerminatedUTF8)
-        let data = xml.withUnsafeBufferPointer { (buffer: UnsafeBufferPointer<UInt8>) -> Data in
-            return Data(bytes:UnsafeRawPointer(buffer.baseAddress!), count: buffer.count)
+        let xml = Array("<test><foo>bar</foo></test>".utf8CString)
+        let data = xml.withUnsafeBufferPointer { (buffer: UnsafeBufferPointer<CChar>) -> Data in
+            return Data(bytes: UnsafeRawPointer(buffer.baseAddress!), count: buffer.count)
         }
         let parser = XMLParser(data: data)
         let res = parser.parse()

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ class TestNSXMLParser : XCTestCase {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func test_data() {`
`29`		`- let xml = Array("<test><foo>bar</foo></test>".nulTerminatedUTF8)`
`30`		`- let data = xml.withUnsafeBufferPointer { (buffer: UnsafeBufferPointer<UInt8>) -> Data in`
`31`		`- return Data(bytes:UnsafeRawPointer(buffer.baseAddress!), count: buffer.count)`
	`29`	`+ let xml = Array("<test><foo>bar</foo></test>".utf8CString)`
	`30`	`+ let data = xml.withUnsafeBufferPointer { (buffer: UnsafeBufferPointer<CChar>) -> Data in`
	`31`	`+ return Data(bytes: UnsafeRawPointer(buffer.baseAddress!), count: buffer.count)`
`32`	`32`	`}`
`33`	`33`	`let parser = XMLParser(data: data)`
`34`	`34`	`let res = parser.parse()`