@@ -248,13 +248,13 @@ func getAsImmutableNSArray(_ a: Array<Int>) -> NSArray {
248
248
return NSArray(objects: &elements, count: elements.count)
249
249
}
250
250
251
- func getAsNSArray (_ a: Array<Int>) -> NSArray {
251
+ func copyToNewNSArray (_ a: Array<Int>) -> NSArray {
252
252
// Return an `NSMutableArray` to make sure that it has a unique
253
253
// pointer identity.
254
- return getAsNSMutableArray (a)
254
+ return copyToNewNSMutableArray (a)
255
255
}
256
256
257
- func getAsNSMutableArray (_ a: Array<Int>) -> NSMutableArray {
257
+ func copyToNewNSMutableArray (_ a: Array<Int>) -> NSMutableArray {
258
258
let result = NSMutableArray()
259
259
for element in a {
260
260
result.add(TestObjCValueTy(element))
@@ -327,7 +327,7 @@ class CustomImmutableNSArray : NSArray {
327
327
ArrayTestSuite.test("BridgedFromObjC.Verbatim.BridgeUsingAs") {
328
328
do {
329
329
let source = [ 10, 20, 30 ]
330
- let nsa = getAsNSArray (source)
330
+ let nsa = copyToNewNSArray (source)
331
331
var result = nsa as Array
332
332
expectFalse(isCocoaArray(result))
333
333
expectType(Array<AnyObject>.self, &result)
@@ -337,7 +337,7 @@ ArrayTestSuite.test("BridgedFromObjC.Verbatim.BridgeUsingAs") {
337
337
}
338
338
do {
339
339
let source = [ 10, 20, 30 ]
340
- let nsa = getAsNSArray (source)
340
+ let nsa = copyToNewNSArray (source)
341
341
var result = nsa as! Array<TestObjCValueTy>
342
342
expectFalse(isCocoaArray(result))
343
343
expectType(Array<TestObjCValueTy>.self, &result)
@@ -349,7 +349,7 @@ ArrayTestSuite.test("BridgedFromObjC.Verbatim.BridgeUsingAs") {
349
349
350
350
ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.BridgeUsingAs") {
351
351
let source = [ 10, 20, 30 ]
352
- let nsa = getAsNSArray (source)
352
+ let nsa = copyToNewNSArray (source)
353
353
var result = nsa as! Array<TestBridgedValueTy>
354
354
expectTrue(isNativeArray(result))
355
355
expectType(Array<TestBridgedValueTy>.self, &result)
@@ -361,7 +361,7 @@ ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.BridgeUsingAs") {
361
361
362
362
ArrayTestSuite.test("BridgedFromObjC.Verbatim.ArrayIsCopied") {
363
363
let source = [ 10, 20, 30 ]
364
- let nsa = getAsNSMutableArray (source)
364
+ let nsa = copyToNewNSMutableArray (source)
365
365
let result = nsa as Array<AnyObject>
366
366
expectFalse(isCocoaArray(result))
367
367
@@ -376,7 +376,7 @@ ArrayTestSuite.test("BridgedFromObjC.Verbatim.ArrayIsCopied") {
376
376
377
377
ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.ArrayIsCopied") {
378
378
let source = [ 10, 20, 30 ]
379
- let nsa = getAsNSMutableArray (source)
379
+ let nsa = copyToNewNSMutableArray (source)
380
380
var result = nsa as AnyObject as! Array<TestBridgedValueTy>
381
381
expectTrue(isNativeArray(result))
382
382
@@ -391,7 +391,7 @@ ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.ArrayIsCopied") {
391
391
392
392
393
393
ArrayTestSuite.test("BridgedFromObjC.Verbatim.NSArrayIsRetained") {
394
- let nsa = NSArray(array: getAsNSArray ([ 10, 20, 30 ]))
394
+ let nsa = NSArray(array: copyToNewNSArray ([ 10, 20, 30 ]))
395
395
var a: Array<AnyObject> = convertNSArrayToArray(nsa)
396
396
var bridgedBack: NSArray = convertArrayToNSArray(a)
397
397
@@ -405,7 +405,7 @@ ArrayTestSuite.test("BridgedFromObjC.Verbatim.NSArrayIsRetained") {
405
405
}
406
406
407
407
ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.NSArrayIsCopied") {
408
- let nsa = NSArray(array: getAsNSArray ([ 10, 20, 30 ]))
408
+ let nsa = NSArray(array: copyToNewNSArray ([ 10, 20, 30 ]))
409
409
var a: Array<TestBridgedValueTy> = convertNSArrayToArray(nsa)
410
410
var bridgedBack: NSArray = convertArrayToNSArray(a)
411
411
0 commit comments