Skip to content

Commit c717221

Browse files
mbvreddyparkera
mbvreddy
authored and
parkera
committed
Change API name of NSData to match with Darwin version (#323)
1 parent d67a289 commit c717221

File tree

9 files changed

+100
-100
lines changed

9 files changed

+100
-100
lines changed

‎Foundation/NSData.swift

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

‎Foundation/NSFileHandle.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public class NSFileHandle : NSObject, NSSecureCoding {
111111
}
112112

113113
public func writeData(_ data: NSData) {
114-
data.enumerateByteRangesUsingBlock() { (bytes, range, stop) in
114+
data.enumerateBytes() { (bytes, range, stop) in
115115
do {
116116
try NSData.writeToFileDescriptor(self._fd, path: nil, buf: bytes, length: range.length)
117117
} catch {

‎Foundation/NSFileManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ public class NSFileManager : NSObject {
680680

681681
public func createFile(atPath path: String, contents data: NSData?, attributes attr: [String : AnyObject]? = [:]) -> Bool {
682682
do {
683-
try (data ?? NSData()).writeToFile(path, options: .DataWritingAtomic)
683+
try (data ?? NSData()).write(toFile: path, options: .dataWritingAtomic)
684684
return true
685685
} catch _ {
686686
return false

‎Foundation/NSJSONSerialization.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public class NSJSONSerialization : NSObject {
109109
pretty: opt.contains(.PrettyPrinted),
110110
writer: { (str: String?) in
111111
if let str = str {
112-
result.appendBytes(str.bridge().cStringUsingEncoding(NSUTF8StringEncoding)!, length: str.lengthOfBytesUsingEncoding(NSUTF8StringEncoding))
112+
result.append(str.bridge().cStringUsingEncoding(NSUTF8StringEncoding)!, length: str.lengthOfBytesUsingEncoding(NSUTF8StringEncoding))
113113
}
114114
}
115115
)

‎Foundation/NSKeyedArchiver.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public class NSKeyedArchiver : NSCoder {
188188

189189
xml = _CFPropertyListCreateXMLDataWithExtras(kCFAllocatorSystemDefault, plist)
190190
if let unwrappedXml = xml {
191-
data.appendData(unwrappedXml._nsObject)
191+
data.append(unwrappedXml._nsObject)
192192
success = true
193193
}
194194
} else {

‎Foundation/NSString.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,10 +1158,10 @@ extension NSString {
11581158
try _getExternalRepresentation(&data, url, enc)
11591159

11601160
if url.fileURL {
1161-
try data.writeToURL(url, options: useAuxiliaryFile ? .DataWritingAtomic : [])
1161+
try data.write(to: url, options: useAuxiliaryFile ? .dataWritingAtomic : [])
11621162
} else {
11631163
if let path = url.path {
1164-
try data.writeToFile(path, options: useAuxiliaryFile ? .DataWritingAtomic : [])
1164+
try data.write(toFile: path, options: useAuxiliaryFile ? .dataWritingAtomic : [])
11651165
} else {
11661166
throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [
11671167
NSURLErrorKey: url,

‎Foundation/NSXMLDocument.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class NSXMLDocument : NSXMLNode {
7474
@abstract Returns a document created from the contents of an XML or HTML URL. Connection problems such as 404, parse errors are returned in <tt>error</tt>.
7575
*/
7676
public convenience init(contentsOfURL url: NSURL, options mask: Int) throws {
77-
let data = try NSData(contentsOfURL: url, options: .DataReadingMappedIfSafe)
77+
let data = try NSData(contentsOfURL: url, options: .dataReadingMappedIfSafe)
7878

7979
try self.init(data: data, options: mask)
8080
}

‎Foundation/NSXMLParser.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ public class NSXMLParser : NSObject {
492492
if (totalLength < 4) {
493493
if let chunk = _bomChunk {
494494
let newData = NSMutableData()
495-
newData.appendData(chunk)
496-
newData.appendData(data)
495+
newData.append(chunk)
496+
newData.append(data)
497497
_bomChunk = newData
498498
} else {
499499
_bomChunk = data
@@ -502,8 +502,8 @@ public class NSXMLParser : NSObject {
502502
var allExistingData: NSData
503503
if let chunk = _bomChunk {
504504
let newData = NSMutableData()
505-
newData.appendData(chunk)
506-
newData.appendData(data)
505+
newData.append(chunk)
506+
newData.append(data)
507507
allExistingData = newData
508508
} else {
509509
allExistingData = data

‎TestFoundation/TestNSData.swift

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class TestNSData: XCTestCase {
4747
let saveData = NSData(contentsOfURL: NSBundle.mainBundle().URLForResource("Test", withExtension: "plist")!)
4848
let savePath = "/var/tmp/Test.plist"
4949
do {
50-
try saveData!.writeToFile(savePath, options: NSDataWritingOptions.DataWritingAtomic)
50+
try saveData!.write(toFile: savePath, options: NSDataWritingOptions.dataWritingAtomic)
5151
let fileManager = NSFileManager.defaultManager()
5252
XCTAssertTrue(fileManager.fileExists(atPath: savePath))
5353
try! fileManager.removeItem(atPath: savePath)
@@ -129,7 +129,7 @@ class TestNSData: XCTestCase {
129129
XCTFail("Could not get UTF-8 data")
130130
return
131131
}
132-
guard let decodedData = NSData(base64EncodedData: encodedData, options: []) else {
132+
guard let decodedData = NSData(base64Encoded: encodedData, options: []) else {
133133
XCTFail("Could not Base-64 decode data")
134134
return
135135
}
@@ -139,15 +139,15 @@ class TestNSData: XCTestCase {
139139
}
140140

141141
XCTAssertEqual(decodedText, plainText)
142-
XCTAssertTrue(decodedData.isEqualToData(plainText.bridge().dataUsingEncoding(NSUTF8StringEncoding)!)) }
142+
XCTAssertTrue(decodedData.isEqual(to: plainText.bridge().dataUsingEncoding(NSUTF8StringEncoding)!)) }
143143

144144
func test_initializeWithBase64EncodedDataWithNonBase64CharacterIsNil() {
145145
let encodedText = "QVJNQSB2aXJ1bXF1ZSBjYW5vLCBUcm9pYWUgcXVpIHBya$W11cyBhYiBvcmlzCkl0YWxpYW0sIGZhdG8gcHJvZnVndXMsIExhdmluaWFxdWUgdmVuaXQ="
146146
guard let encodedData = encodedText.bridge().dataUsingEncoding(NSUTF8StringEncoding) else {
147147
XCTFail("Could not get UTF-8 data")
148148
return
149149
}
150-
let decodedData = NSData(base64EncodedData: encodedData, options: [])
150+
let decodedData = NSData(base64Encoded: encodedData, options: [])
151151
XCTAssertNil(decodedData)
152152
}
153153

@@ -158,7 +158,7 @@ class TestNSData: XCTestCase {
158158
XCTFail("Could not get UTF-8 data")
159159
return
160160
}
161-
guard let decodedData = NSData(base64EncodedData: encodedData, options: [.IgnoreUnknownCharacters]) else {
161+
guard let decodedData = NSData(base64Encoded: encodedData, options: [.ignoreUnknownCharacters]) else {
162162
XCTFail("Could not Base-64 decode data")
163163
return
164164
}
@@ -168,13 +168,13 @@ class TestNSData: XCTestCase {
168168
}
169169

170170
XCTAssertEqual(decodedText, plainText)
171-
XCTAssertTrue(decodedData.isEqualToData(plainText.bridge().dataUsingEncoding(NSUTF8StringEncoding)!))
171+
XCTAssertTrue(decodedData.isEqual(to: plainText.bridge().dataUsingEncoding(NSUTF8StringEncoding)!))
172172
}
173173

174174
func test_initializeWithBase64EncodedStringGetsDecodedData() {
175175
let plainText = "ARMA virumque cano, Troiae qui primus ab oris\nItaliam, fato profugus, Laviniaque venit"
176176
let encodedText = "QVJNQSB2aXJ1bXF1ZSBjYW5vLCBUcm9pYWUgcXVpIHByaW11cyBhYiBvcmlzCkl0YWxpYW0sIGZhdG8gcHJvZnVndXMsIExhdmluaWFxdWUgdmVuaXQ="
177-
guard let decodedData = NSData(base64EncodedString: encodedText, options: []) else {
177+
guard let decodedData = NSData(base64Encoded: encodedText, options: []) else {
178178
XCTFail("Could not Base-64 decode data")
179179
return
180180
}
@@ -193,7 +193,7 @@ class TestNSData: XCTestCase {
193193
XCTFail("Could not encode UTF-8 string")
194194
return
195195
}
196-
let encodedData = data.base64EncodedDataWithOptions([])
196+
let encodedData = data.base64EncodedData([])
197197
guard let encodedTextResult = NSString(data: encodedData, encoding: NSASCIIStringEncoding)?.bridge() else {
198198
XCTFail("Could not convert encoded data to an ASCII String")
199199
return
@@ -208,7 +208,7 @@ class TestNSData: XCTestCase {
208208
XCTFail("Could not encode UTF-8 string")
209209
return
210210
}
211-
let encodedData = data.base64EncodedDataWithOptions([.Encoding64CharacterLineLength, .EncodingEndLineWithLineFeed])
211+
let encodedData = data.base64EncodedData([.encoding64CharacterLineLength, .encodingEndLineWithLineFeed])
212212
guard let encodedTextResult = NSString(data: encodedData, encoding: NSASCIIStringEncoding)?.bridge() else {
213213
XCTFail("Could not convert encoded data to an ASCII String")
214214
return
@@ -223,7 +223,7 @@ class TestNSData: XCTestCase {
223223
XCTFail("Could not encode UTF-8 string")
224224
return
225225
}
226-
let encodedData = data.base64EncodedDataWithOptions([.Encoding76CharacterLineLength, .EncodingEndLineWithCarriageReturn])
226+
let encodedData = data.base64EncodedData([.encoding76CharacterLineLength, .encodingEndLineWithCarriageReturn])
227227
guard let encodedTextResult = NSString(data: encodedData, encoding: NSASCIIStringEncoding)?.bridge() else {
228228
XCTFail("Could not convert encoded data to an ASCII String")
229229
return
@@ -238,7 +238,7 @@ class TestNSData: XCTestCase {
238238
XCTFail("Could not encode UTF-8 string")
239239
return
240240
}
241-
let encodedData = data.base64EncodedDataWithOptions([.Encoding76CharacterLineLength, .EncodingEndLineWithCarriageReturn, .EncodingEndLineWithLineFeed])
241+
let encodedData = data.base64EncodedData([.encoding76CharacterLineLength, .encodingEndLineWithCarriageReturn, .encodingEndLineWithLineFeed])
242242
guard let encodedTextResult = NSString(data: encodedData, encoding: NSASCIIStringEncoding)?.bridge() else {
243243
XCTFail("Could not convert encoded data to an ASCII String")
244244
return
@@ -253,7 +253,7 @@ class TestNSData: XCTestCase {
253253
XCTFail("Could not encode UTF-8 string")
254254
return
255255
}
256-
let encodedTextResult = data.base64EncodedStringWithOptions([])
256+
let encodedTextResult = data.base64EncodedString([])
257257
XCTAssertEqual(encodedTextResult, encodedText)
258258

259259
}
@@ -263,23 +263,23 @@ class TestNSData: XCTestCase {
263263
let dataPadding1 = NSData(bytes: dataPadding1Bytes, length: dataPadding1Bytes.count)
264264

265265

266-
guard let decodedPadding1 = NSData(base64EncodedString:encodedPadding1, options: []) else {
266+
guard let decodedPadding1 = NSData(base64Encoded:encodedPadding1, options: []) else {
267267
XCTFail("Could not Base-64 decode data")
268268
return
269269
}
270-
XCTAssert(dataPadding1.isEqualToData(decodedPadding1))
270+
XCTAssert(dataPadding1.isEqual(to: decodedPadding1))
271271
}
272272
func test_base64DecodeWithPadding2() {
273273
let encodedPadding2 = "Ao=="
274274
let dataPadding2Bytes : [UInt8] = [0x02]
275275
let dataPadding2 = NSData(bytes: dataPadding2Bytes, length: dataPadding2Bytes.count)
276276

277277

278-
guard let decodedPadding2 = NSData(base64EncodedString:encodedPadding2, options: []) else {
278+
guard let decodedPadding2 = NSData(base64Encoded:encodedPadding2, options: []) else {
279279
XCTFail("Could not Base-64 decode data")
280280
return
281281
}
282-
XCTAssert(dataPadding2.isEqualToData(decodedPadding2))
282+
XCTAssert(dataPadding2.isEqual(to: decodedPadding2))
283283
}
284284
func test_rangeOfData() {
285285
let baseData : [UInt8] = [0x00,0x01,0x02,0x03,0x04]
@@ -294,46 +294,46 @@ class TestNSData: XCTestCase {
294294
let prefix = NSData(bytes: prefixData, length: prefixData.count)
295295
let prefixRange = NSMakeRange(0, prefixData.count)
296296

297-
XCTAssert(NSEqualRanges(base.rangeOfData(prefix, options: [], range: baseFullRange),prefixRange))
298-
XCTAssert(NSEqualRanges(base.rangeOfData(prefix, options: [.Anchored], range: baseFullRange),prefixRange))
299-
XCTAssert(NSEqualRanges(base.rangeOfData(prefix, options: [.Backwards], range: baseFullRange),prefixRange))
300-
XCTAssert(NSEqualRanges(base.rangeOfData(prefix, options: [.Backwards,.Anchored], range: baseFullRange),notFoundRange))
297+
XCTAssert(NSEqualRanges(base.range(of: prefix, options: [], in: baseFullRange),prefixRange))
298+
XCTAssert(NSEqualRanges(base.range(of: prefix, options: [.anchored], in: baseFullRange),prefixRange))
299+
XCTAssert(NSEqualRanges(base.range(of: prefix, options: [.backwards], in: baseFullRange),prefixRange))
300+
XCTAssert(NSEqualRanges(base.range(of: prefix, options: [.backwards,.anchored], in: baseFullRange),notFoundRange))
301301

302-
XCTAssert(NSEqualRanges(base.rangeOfData(prefix, options: [], range: noPrefixRange),notFoundRange))
303-
XCTAssert(NSEqualRanges(base.rangeOfData(prefix, options: [.Backwards], range: noPrefixRange),notFoundRange))
304-
XCTAssert(NSEqualRanges(base.rangeOfData(prefix, options: [], range: noSuffixRange),prefixRange))
305-
XCTAssert(NSEqualRanges(base.rangeOfData(prefix, options: [.Backwards], range: noSuffixRange),prefixRange))
302+
XCTAssert(NSEqualRanges(base.range(of: prefix, options: [], in: noPrefixRange),notFoundRange))
303+
XCTAssert(NSEqualRanges(base.range(of: prefix, options: [.backwards], in: noPrefixRange),notFoundRange))
304+
XCTAssert(NSEqualRanges(base.range(of: prefix, options: [], in: noSuffixRange),prefixRange))
305+
XCTAssert(NSEqualRanges(base.range(of: prefix, options: [.backwards], in: noSuffixRange),prefixRange))
306306

307307

308308
let suffixData : [UInt8] = [0x03,0x04]
309309
let suffix = NSData(bytes: suffixData, length: suffixData.count)
310310
let suffixRange = NSMakeRange(3, suffixData.count)
311311

312-
XCTAssert(NSEqualRanges(base.rangeOfData(suffix, options: [], range: baseFullRange),suffixRange))
313-
XCTAssert(NSEqualRanges(base.rangeOfData(suffix, options: [.Anchored], range: baseFullRange),notFoundRange))
314-
XCTAssert(NSEqualRanges(base.rangeOfData(suffix, options: [.Backwards], range: baseFullRange),suffixRange))
315-
XCTAssert(NSEqualRanges(base.rangeOfData(suffix, options: [.Backwards,.Anchored], range: baseFullRange),suffixRange))
312+
XCTAssert(NSEqualRanges(base.range(of: suffix, options: [], in: baseFullRange),suffixRange))
313+
XCTAssert(NSEqualRanges(base.range(of: suffix, options: [.anchored], in: baseFullRange),notFoundRange))
314+
XCTAssert(NSEqualRanges(base.range(of: suffix, options: [.backwards], in: baseFullRange),suffixRange))
315+
XCTAssert(NSEqualRanges(base.range(of: suffix, options: [.backwards,.anchored], in: baseFullRange),suffixRange))
316316

317-
XCTAssert(NSEqualRanges(base.rangeOfData(suffix, options: [], range: noPrefixRange),suffixRange))
318-
XCTAssert(NSEqualRanges(base.rangeOfData(suffix, options: [.Backwards], range: noPrefixRange),suffixRange))
319-
XCTAssert(NSEqualRanges(base.rangeOfData(suffix, options: [], range: noSuffixRange),notFoundRange))
320-
XCTAssert(NSEqualRanges(base.rangeOfData(suffix, options: [.Backwards], range: noSuffixRange),notFoundRange))
317+
XCTAssert(NSEqualRanges(base.range(of: suffix, options: [], in: noPrefixRange),suffixRange))
318+
XCTAssert(NSEqualRanges(base.range(of: suffix, options: [.backwards], in: noPrefixRange),suffixRange))
319+
XCTAssert(NSEqualRanges(base.range(of: suffix, options: [], in: noSuffixRange),notFoundRange))
320+
XCTAssert(NSEqualRanges(base.range(of: suffix, options: [.backwards], in: noSuffixRange),notFoundRange))
321321

322322

323323
let sliceData : [UInt8] = [0x02,0x03]
324324
let slice = NSData(bytes: sliceData, length: sliceData.count)
325325
let sliceRange = NSMakeRange(2, sliceData.count)
326326

327-
XCTAssert(NSEqualRanges(base.rangeOfData(slice, options: [], range: baseFullRange),sliceRange))
328-
XCTAssert(NSEqualRanges(base.rangeOfData(slice, options: [.Anchored], range: baseFullRange),notFoundRange))
329-
XCTAssert(NSEqualRanges(base.rangeOfData(slice, options: [.Backwards], range: baseFullRange),sliceRange))
330-
XCTAssert(NSEqualRanges(base.rangeOfData(slice, options: [.Backwards,.Anchored], range: baseFullRange),notFoundRange))
327+
XCTAssert(NSEqualRanges(base.range(of: slice, options: [], in: baseFullRange),sliceRange))
328+
XCTAssert(NSEqualRanges(base.range(of: slice, options: [.anchored], in: baseFullRange),notFoundRange))
329+
XCTAssert(NSEqualRanges(base.range(of: slice, options: [.backwards], in: baseFullRange),sliceRange))
330+
XCTAssert(NSEqualRanges(base.range(of: slice, options: [.backwards,.anchored], in: baseFullRange),notFoundRange))
331331

332332
let empty = NSData()
333-
XCTAssert(NSEqualRanges(base.rangeOfData(empty, options: [], range: baseFullRange),notFoundRange))
334-
XCTAssert(NSEqualRanges(base.rangeOfData(empty, options: [.Anchored], range: baseFullRange),notFoundRange))
335-
XCTAssert(NSEqualRanges(base.rangeOfData(empty, options: [.Backwards], range: baseFullRange),notFoundRange))
336-
XCTAssert(NSEqualRanges(base.rangeOfData(empty, options: [.Backwards,.Anchored], range: baseFullRange),notFoundRange))
333+
XCTAssert(NSEqualRanges(base.range(of: empty, options: [], in: baseFullRange),notFoundRange))
334+
XCTAssert(NSEqualRanges(base.range(of: empty, options: [.anchored], in: baseFullRange),notFoundRange))
335+
XCTAssert(NSEqualRanges(base.range(of: empty, options: [.backwards], in: baseFullRange),notFoundRange))
336+
XCTAssert(NSEqualRanges(base.range(of: empty, options: [.backwards,.anchored], in: baseFullRange),notFoundRange))
337337

338338
}
339339

0 commit comments

Comments
 (0)