Skip to content

Commit 53fa261

Browse files
Dave AbrahamsAlexis Beingessner
authored andcommitted
Rename some test helpers so tests make sense.
1 parent a54806e commit 53fa261

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

validation-test/stdlib/ArrayNew.swift.gyb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,13 @@ func getAsImmutableNSArray(_ a: Array<Int>) -> NSArray {
248248
return NSArray(objects: &elements, count: elements.count)
249249
}
250250

251-
func getAsNSArray(_ a: Array<Int>) -> NSArray {
251+
func copyToNewNSArray(_ a: Array<Int>) -> NSArray {
252252
// Return an `NSMutableArray` to make sure that it has a unique
253253
// pointer identity.
254-
return getAsNSMutableArray(a)
254+
return copyToNewNSMutableArray(a)
255255
}
256256

257-
func getAsNSMutableArray(_ a: Array<Int>) -> NSMutableArray {
257+
func copyToNewNSMutableArray(_ a: Array<Int>) -> NSMutableArray {
258258
let result = NSMutableArray()
259259
for element in a {
260260
result.add(TestObjCValueTy(element))
@@ -327,7 +327,7 @@ class CustomImmutableNSArray : NSArray {
327327
ArrayTestSuite.test("BridgedFromObjC.Verbatim.BridgeUsingAs") {
328328
do {
329329
let source = [ 10, 20, 30 ]
330-
let nsa = getAsNSArray(source)
330+
let nsa = copyToNewNSArray(source)
331331
var result = nsa as Array
332332
expectFalse(isCocoaArray(result))
333333
expectType(Array<AnyObject>.self, &result)
@@ -337,7 +337,7 @@ ArrayTestSuite.test("BridgedFromObjC.Verbatim.BridgeUsingAs") {
337337
}
338338
do {
339339
let source = [ 10, 20, 30 ]
340-
let nsa = getAsNSArray(source)
340+
let nsa = copyToNewNSArray(source)
341341
var result = nsa as! Array<TestObjCValueTy>
342342
expectFalse(isCocoaArray(result))
343343
expectType(Array<TestObjCValueTy>.self, &result)
@@ -349,7 +349,7 @@ ArrayTestSuite.test("BridgedFromObjC.Verbatim.BridgeUsingAs") {
349349

350350
ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.BridgeUsingAs") {
351351
let source = [ 10, 20, 30 ]
352-
let nsa = getAsNSArray(source)
352+
let nsa = copyToNewNSArray(source)
353353
var result = nsa as! Array<TestBridgedValueTy>
354354
expectTrue(isNativeArray(result))
355355
expectType(Array<TestBridgedValueTy>.self, &result)
@@ -361,7 +361,7 @@ ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.BridgeUsingAs") {
361361

362362
ArrayTestSuite.test("BridgedFromObjC.Verbatim.ArrayIsCopied") {
363363
let source = [ 10, 20, 30 ]
364-
let nsa = getAsNSMutableArray(source)
364+
let nsa = copyToNewNSMutableArray(source)
365365
let result = nsa as Array<AnyObject>
366366
expectFalse(isCocoaArray(result))
367367

@@ -376,7 +376,7 @@ ArrayTestSuite.test("BridgedFromObjC.Verbatim.ArrayIsCopied") {
376376

377377
ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.ArrayIsCopied") {
378378
let source = [ 10, 20, 30 ]
379-
let nsa = getAsNSMutableArray(source)
379+
let nsa = copyToNewNSMutableArray(source)
380380
var result = nsa as AnyObject as! Array<TestBridgedValueTy>
381381
expectTrue(isNativeArray(result))
382382

@@ -391,7 +391,7 @@ ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.ArrayIsCopied") {
391391

392392

393393
ArrayTestSuite.test("BridgedFromObjC.Verbatim.NSArrayIsRetained") {
394-
let nsa = NSArray(array: getAsNSArray([ 10, 20, 30 ]))
394+
let nsa = NSArray(array: copyToNewNSArray([ 10, 20, 30 ]))
395395
var a: Array<AnyObject> = convertNSArrayToArray(nsa)
396396
var bridgedBack: NSArray = convertArrayToNSArray(a)
397397

@@ -405,7 +405,7 @@ ArrayTestSuite.test("BridgedFromObjC.Verbatim.NSArrayIsRetained") {
405405
}
406406

407407
ArrayTestSuite.test("BridgedFromObjC.Nonverbatim.NSArrayIsCopied") {
408-
let nsa = NSArray(array: getAsNSArray([ 10, 20, 30 ]))
408+
let nsa = NSArray(array: copyToNewNSArray([ 10, 20, 30 ]))
409409
var a: Array<TestBridgedValueTy> = convertNSArrayToArray(nsa)
410410
var bridgedBack: NSArray = convertArrayToNSArray(a)
411411

0 commit comments

Comments
 (0)