Skip to content

Commit a68b860

Browse files
lorenteylorentey
committed
[test] Use the public capacity in tests, not the internal bucket count.
1 parent de2add8 commit a68b860

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

‎validation-test/stdlib/Dictionary.swift

+22-22
Original file line numberDiff line numberDiff line change
@@ -1081,15 +1081,15 @@ DictionaryTestSuite.test("COW.Slow.RemoveValueForKeyDoesNotReallocate")
10811081
DictionaryTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
10821082
do {
10831083
var d = getCOWFastDictionary()
1084-
let originalCapacity = d._variantBuffer.asNative.capacity
1084+
let originalCapacity = d.capacity
10851085
assert(d.count == 3)
10861086
assert(d[10]! == 1010)
10871087

10881088
d.removeAll()
10891089
// We cannot assert that identity changed, since the new buffer of smaller
10901090
// size can be allocated at the same address as the old one.
10911091
var identity1 = d._rawIdentifier()
1092-
assert(d._variantBuffer.asNative.capacity < originalCapacity)
1092+
assert(d.capacity < originalCapacity)
10931093
assert(d.count == 0)
10941094
assert(d[10] == nil)
10951095

@@ -1102,19 +1102,19 @@ DictionaryTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
11021102
do {
11031103
var d = getCOWFastDictionary()
11041104
var identity1 = d._rawIdentifier()
1105-
let originalCapacity = d._variantBuffer.asNative.capacity
1105+
let originalCapacity = d.capacity
11061106
assert(d.count == 3)
11071107
assert(d[10]! == 1010)
11081108

11091109
d.removeAll(keepingCapacity: true)
11101110
assert(identity1 == d._rawIdentifier())
1111-
assert(d._variantBuffer.asNative.capacity == originalCapacity)
1111+
assert(d.capacity == originalCapacity)
11121112
assert(d.count == 0)
11131113
assert(d[10] == nil)
11141114

11151115
d.removeAll(keepingCapacity: true)
11161116
assert(identity1 == d._rawIdentifier())
1117-
assert(d._variantBuffer.asNative.capacity == originalCapacity)
1117+
assert(d.capacity == originalCapacity)
11181118
assert(d.count == 0)
11191119
assert(d[10] == nil)
11201120
}
@@ -1143,7 +1143,7 @@ DictionaryTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
11431143
do {
11441144
var d1 = getCOWFastDictionary()
11451145
var identity1 = d1._rawIdentifier()
1146-
let originalCapacity = d1._variantBuffer.asNative.capacity
1146+
let originalCapacity = d1.capacity
11471147
assert(d1.count == 3)
11481148
assert(d1[10] == 1010)
11491149

@@ -1154,7 +1154,7 @@ DictionaryTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
11541154
assert(identity2 != identity1)
11551155
assert(d1.count == 3)
11561156
assert(d1[10]! == 1010)
1157-
assert(d2._variantBuffer.asNative.capacity == originalCapacity)
1157+
assert(d2.capacity == originalCapacity)
11581158
assert(d2.count == 0)
11591159
assert(d2[10] == nil)
11601160

@@ -1167,15 +1167,15 @@ DictionaryTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
11671167
DictionaryTestSuite.test("COW.Slow.RemoveAllDoesNotReallocate") {
11681168
do {
11691169
var d = getCOWSlowDictionary()
1170-
let originalCapacity = d._variantBuffer.asNative.capacity
1170+
let originalCapacity = d.capacity
11711171
assert(d.count == 3)
11721172
assert(d[TestKeyTy(10)]!.value == 1010)
11731173

11741174
d.removeAll()
11751175
// We cannot assert that identity changed, since the new buffer of smaller
11761176
// size can be allocated at the same address as the old one.
11771177
var identity1 = d._rawIdentifier()
1178-
assert(d._variantBuffer.asNative.capacity < originalCapacity)
1178+
assert(d.capacity < originalCapacity)
11791179
assert(d.count == 0)
11801180
assert(d[TestKeyTy(10)] == nil)
11811181

@@ -1188,19 +1188,19 @@ DictionaryTestSuite.test("COW.Slow.RemoveAllDoesNotReallocate") {
11881188
do {
11891189
var d = getCOWSlowDictionary()
11901190
var identity1 = d._rawIdentifier()
1191-
let originalCapacity = d._variantBuffer.asNative.capacity
1191+
let originalCapacity = d.capacity
11921192
assert(d.count == 3)
11931193
assert(d[TestKeyTy(10)]!.value == 1010)
11941194

11951195
d.removeAll(keepingCapacity: true)
11961196
assert(identity1 == d._rawIdentifier())
1197-
assert(d._variantBuffer.asNative.capacity == originalCapacity)
1197+
assert(d.capacity == originalCapacity)
11981198
assert(d.count == 0)
11991199
assert(d[TestKeyTy(10)] == nil)
12001200

12011201
d.removeAll(keepingCapacity: true)
12021202
assert(identity1 == d._rawIdentifier())
1203-
assert(d._variantBuffer.asNative.capacity == originalCapacity)
1203+
assert(d.capacity == originalCapacity)
12041204
assert(d.count == 0)
12051205
assert(d[TestKeyTy(10)] == nil)
12061206
}
@@ -1229,7 +1229,7 @@ DictionaryTestSuite.test("COW.Slow.RemoveAllDoesNotReallocate") {
12291229
do {
12301230
var d1 = getCOWSlowDictionary()
12311231
var identity1 = d1._rawIdentifier()
1232-
let originalCapacity = d1._variantBuffer.asNative.capacity
1232+
let originalCapacity = d1.capacity
12331233
assert(d1.count == 3)
12341234
assert(d1[TestKeyTy(10)]!.value == 1010)
12351235

@@ -1240,7 +1240,7 @@ DictionaryTestSuite.test("COW.Slow.RemoveAllDoesNotReallocate") {
12401240
assert(identity2 != identity1)
12411241
assert(d1.count == 3)
12421242
assert(d1[TestKeyTy(10)]!.value == 1010)
1243-
assert(d2._variantBuffer.asNative.capacity == originalCapacity)
1243+
assert(d2.capacity == originalCapacity)
12441244
assert(d2.count == 0)
12451245
assert(d2[TestKeyTy(10)] == nil)
12461246

@@ -2644,7 +2644,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Verbatim.RemoveAll") {
26442644

26452645
d.removeAll()
26462646
assert(identity1 != d._rawIdentifier())
2647-
assert(d._variantBuffer.asNative.capacity < originalCapacity)
2647+
assert(d.capacity < originalCapacity)
26482648
assert(d.count == 0)
26492649
assert(d[TestObjCKeyTy(10)] == nil)
26502650
}
@@ -2659,7 +2659,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Verbatim.RemoveAll") {
26592659

26602660
d.removeAll(keepingCapacity: true)
26612661
assert(identity1 != d._rawIdentifier())
2662-
assert(d._variantBuffer.asNative.capacity >= originalCapacity)
2662+
assert(d.capacity >= originalCapacity)
26632663
assert(d.count == 0)
26642664
assert(d[TestObjCKeyTy(10)] == nil)
26652665
}
@@ -2679,7 +2679,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Verbatim.RemoveAll") {
26792679
assert(identity2 != identity1)
26802680
assert(d1.count == 3)
26812681
assert((d1[TestObjCKeyTy(10)] as! TestObjCValueTy).value == 1010)
2682-
assert(d2._variantBuffer.asNative.capacity < originalCapacity)
2682+
assert(d2.capacity < originalCapacity)
26832683
assert(d2.count == 0)
26842684
assert(d2[TestObjCKeyTy(10)] == nil)
26852685
}
@@ -2699,7 +2699,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Verbatim.RemoveAll") {
26992699
assert(identity2 != identity1)
27002700
assert(d1.count == 3)
27012701
assert((d1[TestObjCKeyTy(10)] as! TestObjCValueTy).value == 1010)
2702-
assert(d2._variantBuffer.asNative.capacity >= originalCapacity)
2702+
assert(d2.capacity >= originalCapacity)
27032703
assert(d2.count == 0)
27042704
assert(d2[TestObjCKeyTy(10)] == nil)
27052705
}
@@ -2727,7 +2727,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAll") {
27272727

27282728
d.removeAll()
27292729
assert(identity1 != d._rawIdentifier())
2730-
assert(d._variantBuffer.asNative.capacity < originalCapacity)
2730+
assert(d.capacity < originalCapacity)
27312731
assert(d.count == 0)
27322732
assert(d[TestBridgedKeyTy(10)] == nil)
27332733
}
@@ -2742,7 +2742,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAll") {
27422742

27432743
d.removeAll(keepingCapacity: true)
27442744
assert(identity1 == d._rawIdentifier())
2745-
assert(d._variantBuffer.asNative.capacity >= originalCapacity)
2745+
assert(d.capacity >= originalCapacity)
27462746
assert(d.count == 0)
27472747
assert(d[TestBridgedKeyTy(10)] == nil)
27482748
}
@@ -2762,7 +2762,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAll") {
27622762
assert(identity2 != identity1)
27632763
assert(d1.count == 3)
27642764
assert(d1[TestBridgedKeyTy(10)]!.value == 1010)
2765-
assert(d2._variantBuffer.asNative.capacity < originalCapacity)
2765+
assert(d2.capacity < originalCapacity)
27662766
assert(d2.count == 0)
27672767
assert(d2[TestBridgedKeyTy(10)] == nil)
27682768
}
@@ -2782,7 +2782,7 @@ DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAll") {
27822782
assert(identity2 != identity1)
27832783
assert(d1.count == 3)
27842784
assert(d1[TestBridgedKeyTy(10)]!.value == 1010)
2785-
assert(d2._variantBuffer.asNative.capacity >= originalCapacity)
2785+
assert(d2.capacity >= originalCapacity)
27862786
assert(d2.count == 0)
27872787
assert(d2[TestBridgedKeyTy(10)] == nil)
27882788
}

‎validation-test/stdlib/Set.swift

+14-14
Original file line numberDiff line numberDiff line change
@@ -843,15 +843,15 @@ SetTestSuite.test("COW.Fast.UnionInPlaceSmallSetDoesNotReallocate") {
843843
SetTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
844844
do {
845845
var s = getCOWFastSet()
846-
let originalCapacity = s._variantBuffer.asNative.capacity
846+
let originalCapacity = s.capacity
847847
expectEqual(3, s.count)
848848
expectTrue(s.contains(1010))
849849

850850
s.removeAll()
851851
// We cannot expectTrue that identity changed, since the new buffer of
852852
// smaller size can be allocated at the same address as the old one.
853853
var identity1 = s._rawIdentifier()
854-
expectTrue(s._variantBuffer.asNative.capacity < originalCapacity)
854+
expectTrue(s.capacity < originalCapacity)
855855
expectEqual(0, s.count)
856856
expectFalse(s.contains(1010))
857857

@@ -864,19 +864,19 @@ SetTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
864864
do {
865865
var s = getCOWFastSet()
866866
var identity1 = s._rawIdentifier()
867-
let originalCapacity = s._variantBuffer.asNative.capacity
867+
let originalCapacity = s.capacity
868868
expectEqual(3, s.count)
869869
expectTrue(s.contains(1010))
870870

871871
s.removeAll(keepingCapacity: true)
872872
expectEqual(identity1, s._rawIdentifier())
873-
expectEqual(originalCapacity, s._variantBuffer.asNative.capacity)
873+
expectEqual(originalCapacity, s.capacity)
874874
expectEqual(0, s.count)
875875
expectFalse(s.contains(1010))
876876

877877
s.removeAll(keepingCapacity: true)
878878
expectEqual(identity1, s._rawIdentifier())
879-
expectEqual(originalCapacity, s._variantBuffer.asNative.capacity)
879+
expectEqual(originalCapacity, s.capacity)
880880
expectEqual(0, s.count)
881881
expectFalse(s.contains(1010))
882882
}
@@ -905,7 +905,7 @@ SetTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
905905
do {
906906
var s1 = getCOWFastSet()
907907
var identity1 = s1._rawIdentifier()
908-
let originalCapacity = s1._variantBuffer.asNative.capacity
908+
let originalCapacity = s1.capacity
909909
expectEqual(3, s1.count)
910910
expectTrue(s1.contains(1010))
911911

@@ -916,7 +916,7 @@ SetTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
916916
expectNotEqual(identity1, identity2)
917917
expectEqual(3, s1.count)
918918
expectTrue(s1.contains(1010))
919-
expectEqual(originalCapacity, s2._variantBuffer.asNative.capacity)
919+
expectEqual(originalCapacity, s2.capacity)
920920
expectEqual(0, s2.count)
921921
expectFalse(s2.contains(1010))
922922

@@ -929,15 +929,15 @@ SetTestSuite.test("COW.Fast.RemoveAllDoesNotReallocate") {
929929
SetTestSuite.test("COW.Slow.RemoveAllDoesNotReallocate") {
930930
do {
931931
var s = getCOWSlowSet()
932-
let originalCapacity = s._variantBuffer.asNative.capacity
932+
let originalCapacity = s.capacity
933933
expectEqual(3, s.count)
934934
expectTrue(s.contains(TestKeyTy(1010)))
935935

936936
s.removeAll()
937937
// We cannot expectTrue that identity changed, since the new buffer of
938938
// smaller size can be allocated at the same address as the old one.
939939
var identity1 = s._rawIdentifier()
940-
expectTrue(s._variantBuffer.asNative.capacity < originalCapacity)
940+
expectTrue(s.capacity < originalCapacity)
941941
expectEqual(0, s.count)
942942
expectFalse(s.contains(TestKeyTy(1010)))
943943

@@ -950,19 +950,19 @@ SetTestSuite.test("COW.Slow.RemoveAllDoesNotReallocate") {
950950
do {
951951
var s = getCOWSlowSet()
952952
var identity1 = s._rawIdentifier()
953-
let originalCapacity = s._variantBuffer.asNative.capacity
953+
let originalCapacity = s.capacity
954954
expectEqual(3, s.count)
955955
expectTrue(s.contains(TestKeyTy(1010)))
956956

957957
s.removeAll(keepingCapacity: true)
958958
expectEqual(identity1, s._rawIdentifier())
959-
expectEqual(originalCapacity, s._variantBuffer.asNative.capacity)
959+
expectEqual(originalCapacity, s.capacity)
960960
expectEqual(0, s.count)
961961
expectFalse(s.contains(TestKeyTy(1010)))
962962

963963
s.removeAll(keepingCapacity: true)
964964
expectEqual(identity1, s._rawIdentifier())
965-
expectEqual(originalCapacity, s._variantBuffer.asNative.capacity)
965+
expectEqual(originalCapacity, s.capacity)
966966
expectEqual(0, s.count)
967967
expectFalse(s.contains(TestKeyTy(1010)))
968968
}
@@ -991,7 +991,7 @@ SetTestSuite.test("COW.Slow.RemoveAllDoesNotReallocate") {
991991
do {
992992
var s1 = getCOWSlowSet()
993993
var identity1 = s1._rawIdentifier()
994-
let originalCapacity = s1._variantBuffer.asNative.capacity
994+
let originalCapacity = s1.capacity
995995
expectEqual(3, s1.count)
996996
expectTrue(s1.contains(TestKeyTy(1010)))
997997

@@ -1002,7 +1002,7 @@ SetTestSuite.test("COW.Slow.RemoveAllDoesNotReallocate") {
10021002
expectNotEqual(identity1, identity2)
10031003
expectEqual(3, s1.count)
10041004
expectTrue(s1.contains(TestKeyTy(1010)))
1005-
expectEqual(originalCapacity, s2._variantBuffer.asNative.capacity)
1005+
expectEqual(originalCapacity, s2.capacity)
10061006
expectEqual(0, s2.count)
10071007
expectFalse(s2.contains(TestKeyTy(1010)))
10081008

0 commit comments

Comments
 (0)