averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into swift-3-indexing-model

Browse Source
This commit is contained in:
Dmitri Gribenko
2016-04-18 14:40:06 -07:00
parent 0c5933c2c4 c9a67d79e6
commit fc8d62dfbb
156 changed files with 4395 additions and 3644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
validation-test/stdlib/Set.swift
View File

@@ -2103,7 +2103,7 @@ SetTestSuite.test("BridgedFromObjC.Verbatim.ArrayOfSets") {
var nsa = NSMutableArray()
for i in 0..<3 {
nsa.add(
getAsNSSet([ 1 + i, 2 + i, 3 + i ]))
getAsNSSet([1 + i, 2 + i, 3 + i]))
}
var a = nsa as [AnyObject] as! [Set<NSObject>]
@@ -2115,7 +2115,7 @@ SetTestSuite.test("BridgedFromObjC.Verbatim.ArrayOfSets") {
let v = (value as! TestObjCKeyTy).value
items.append(v)
}
var expectedItems = [ 1 + i, 2 + i, 3 + i ]
var expectedItems = [1 + i, 2 + i, 3 + i]
expectTrue(equalsUnordered(items, expectedItems))
}
}
@@ -2124,7 +2124,7 @@ SetTestSuite.test("BridgedFromObjC.Nonverbatim.ArrayOfSets") {
var nsa = NSMutableArray()
for i in 0..<3 {
nsa.add(
getAsNSSet([ 1 + i, 2 + i, 3 + i ]))
getAsNSSet([1 + i, 2 + i, 3 + i]))
}
var a = nsa as [AnyObject] as! [Set<TestBridgedKeyTy>]
@@ -2135,7 +2135,7 @@ SetTestSuite.test("BridgedFromObjC.Nonverbatim.ArrayOfSets") {
while let value = iter.next() {
items.append(value.value)
}
var expectedItems = [ 1 + i, 2 + i, 3 + i ]
var expectedItems = [1 + i, 2 + i, 3 + i]
expectTrue(equalsUnordered(items, expectedItems))
}
}
@@ -2173,7 +2173,7 @@ SetTestSuite.test("BridgingRoundtrip") {
let v = (value as! TestObjCKeyTy).value
items.append(v)
}
expectTrue(equalsUnordered([ 1010, 2020, 3030 ], items))
expectTrue(equalsUnordered([1010, 2020, 3030], items))
}
SetTestSuite.test("BridgedToObjC.Verbatim.ObjectEnumerator.FastEnumeration.UseFromSwift") {
@@ -2336,7 +2336,7 @@ SetTestSuite.test("BridgedToObjC.MemberTypesCustomBridged") {
while let nextObject = enumerator.nextObject() {
members.append((nextObject as! TestObjCKeyTy).value)
}
expectTrue(equalsUnordered([ 1010, 2020, 3030 ], members))
expectTrue(equalsUnordered([1010, 2020, 3030], members))
expectAutoreleasedKeysAndValues(unopt: (3, 0))
}
@@ -3448,7 +3448,7 @@ class MockSetWithCustomCount : NSSet {
override func objectEnumerator() -> NSEnumerator {
expectUnreachable()
return getAsNSSet([ 1010, 1020, 1030 ]).objectEnumerator()
return getAsNSSet([1010, 1020, 1030]).objectEnumerator()
}
override var count: Int {
@@ -3697,37 +3697,37 @@ SetTestSuite.test("Operator.Precedence") {
//===---
SetTestSuite.test("mutationDoesNotAffectIterator/remove,1") {
var set = Set([ 1010, 1020, 1030 ])
var set = Set([1010, 1020, 1030])
var iter = set.makeIterator()
expectOptionalEqual(1010, set.remove(1010))
expectEqualsUnordered([ 1010, 1020, 1030 ], Array(IteratorSequence(iter)))
expectEqualsUnordered([1010, 1020, 1030], Array(IteratorSequence(iter)))
}
SetTestSuite.test("mutationDoesNotAffectIterator/remove,all") {
var set = Set([ 1010, 1020, 1030 ])
var set = Set([1010, 1020, 1030])
var iter = set.makeIterator()
expectOptionalEqual(1010, set.remove(1010))
expectOptionalEqual(1020, set.remove(1020))
expectOptionalEqual(1030, set.remove(1030))
expectEqualsUnordered([ 1010, 1020, 1030 ], Array(IteratorSequence(iter)))
expectEqualsUnordered([1010, 1020, 1030], Array(IteratorSequence(iter)))
}
SetTestSuite.test("mutationDoesNotAffectIterator/removeAll,keepingCapacity=false") {
var set = Set([ 1010, 1020, 1030 ])
var set = Set([1010, 1020, 1030])
var iter = set.makeIterator()
set.removeAll(keepingCapacity: false)
expectEqualsUnordered([ 1010, 1020, 1030 ], Array(IteratorSequence(iter)))
expectEqualsUnordered([1010, 1020, 1030], Array(IteratorSequence(iter)))
}
SetTestSuite.test("mutationDoesNotAffectIterator/removeAll,keepingCapacity=true") {
var set = Set([ 1010, 1020, 1030 ])
var set = Set([1010, 1020, 1030])
var iter = set.makeIterator()
set.removeAll(keepingCapacity: true)
expectEqualsUnordered([ 1010, 1020, 1030 ], Array(IteratorSequence(iter)))
expectEqualsUnordered([1010, 1020, 1030], Array(IteratorSequence(iter)))
}
runAllTests()