Skip to content

Commit ebc8a6d

Browse files
daniel-jonathandaniel-jonathan
committed
development: updated tests to reflect API changes
1 parent a784adb commit ebc8a6d

10 files changed

+198
-198
lines changed

‎Sources/RedBlackTree.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,16 +255,16 @@ public struct RedBlackTree<Key: Comparable, Value>: Probable, Collection, Custom
255255
:description: Inserts a list of (Key, Value?) pairs.
256256
- parameter nodes: (Key, Value?)... Elements to insert.
257257
*/
258-
mutating public func insert(nodes: (Key, Value?)...) {
259-
insert(nodes: nodes)
258+
mutating public func insert(_ nodes: (Key, Value?)...) {
259+
insert(nodes)
260260
}
261261

262262
/**
263263
:name: insert
264264
:description: Inserts an array of (Key, Value?) pairs.
265265
- parameter nodes: [(Key, Value?)] Elements to insert.
266266
*/
267-
mutating public func insert(nodes: [(Key, Value?)]) {
267+
mutating public func insert(_ nodes: [(Key, Value?)]) {
268268
for (k, v) in nodes {
269269
insert(value: v, for: k)
270270
}

‎Sources/SortedDictionary.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public struct SortedDictionary<Key: Comparable, Value>: Probable, Collection, Eq
124124
*/
125125
public init(elements: [(Key, Value?)]) {
126126
self.init()
127-
insert(elements: elements)
127+
insert(elements)
128128
}
129129

130130
public func makeIterator() -> SortedDictionary.Iterator {
@@ -267,16 +267,16 @@ public struct SortedDictionary<Key: Comparable, Value>: Probable, Collection, Eq
267267
Inserts a list of key / value pairs.
268268
- Parameter elements: A list of (Key, Value?) tuples.
269269
*/
270-
mutating public func insert(elements: (Key, Value?)...) {
271-
insert(elements: elements)
270+
mutating public func insert(_ elements: (Key, Value?)...) {
271+
insert(elements)
272272
}
273273

274274
/**
275275
Inserts an Array of key / value pairs.
276276
- Parameter elements: An Array of (Key, Value?) tuples.
277277
*/
278-
mutating public func insert(elements: [(Key, Value?)]) {
279-
tree.insert(nodes: elements)
278+
mutating public func insert(_ elements: [(Key, Value?)]) {
279+
tree.insert(elements)
280280
count = tree.count
281281
}
282282

‎Sources/SortedMultiDictionary.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public struct SortedMultiDictionary<Key: Comparable, Value>: Probable, Collectio
124124
*/
125125
public init(elements: [(Key, Value?)]) {
126126
self.init()
127-
insert(elements: elements)
127+
insert(elements)
128128
}
129129

130130
public func makeIterator() -> SortedMultiDictionary.Iterator {
@@ -267,16 +267,16 @@ public struct SortedMultiDictionary<Key: Comparable, Value>: Probable, Collectio
267267
Inserts a list of key / value pairs.
268268
- Parameter elements: A list of (Key, Value?) tuples.
269269
*/
270-
mutating public func insert(elements: (Key, Value?)...) {
271-
insert(elements: elements)
270+
mutating public func insert(_ elements: (Key, Value?)...) {
271+
insert(elements)
272272
}
273273

274274
/**
275275
Inserts an Array of key / value pairs.
276276
- Parameter elements: An Array of (Key, Value?) tuples.
277277
*/
278-
mutating public func insert(elements: [(Key, Value?)]) {
279-
tree.insert(nodes: elements)
278+
mutating public func insert(_ elements: [(Key, Value?)]) {
279+
tree.insert(elements)
280280
count = tree.count
281281
}
282282

‎Sources/SortedMultiSet.swift‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ public struct SortedMultiSet<T: Comparable>: Probable, Collection, Equatable, Cu
350350
}
351351

352352
/**
353-
:name: intersectInPlace
353+
:name: formIntersection
354354
:description: Insert elements of a finite sequence of Sets.
355355
*/
356356
mutating public func formIntersection(_ other: SortedMultiSet<Element>) {
@@ -472,7 +472,7 @@ public struct SortedMultiSet<T: Comparable>: Probable, Collection, Equatable, Cu
472472
}
473473

474474
/**
475-
:name: subtractInPlace
475+
:name: subtract
476476
:description: Remove all elements in the set that occur in a finite sequence of Sets.
477477
*/
478478
mutating public func subtract(_ other: SortedMultiSet<Element>) {
@@ -564,7 +564,7 @@ public struct SortedMultiSet<T: Comparable>: Probable, Collection, Equatable, Cu
564564
:description: Returns true if no elements in the set are in a finite sequence of Sets.
565565
- returns: Bool
566566
*/
567-
public func isDisjointWith(_ other: SortedMultiSet<Element>) -> Bool {
567+
public func isDisjoint(with other: SortedMultiSet<Element>) -> Bool {
568568
var i: Int = count - 1
569569
var j: Int = other.count - 1
570570
while 0 <= i && 0 <= j {
@@ -586,7 +586,7 @@ public struct SortedMultiSet<T: Comparable>: Probable, Collection, Equatable, Cu
586586
:description: Returns true if the set is a subset of a finite sequence as a Set.
587587
- returns: Bool
588588
*/
589-
public func isSubsetOf(_ other: SortedMultiSet<Element>) -> Bool {
589+
public func isSubset(of other: SortedMultiSet<Element>) -> Bool {
590590
if count > other.count {
591591
return false
592592
}
@@ -603,16 +603,16 @@ public struct SortedMultiSet<T: Comparable>: Probable, Collection, Equatable, Cu
603603
:description: Returns true if the set is a subset of a finite sequence as a Set but not equal.
604604
- returns: Bool
605605
*/
606-
public func isStrictSubsetOf(_ other: SortedMultiSet<Element>) -> Bool {
607-
return count < other.count && isSubsetOf(other)
606+
public func isStrictSubset(of other: SortedMultiSet<Element>) -> Bool {
607+
return count < other.count && isSubset(of: other)
608608
}
609609

610610
/**
611611
:name: isSupersetOf
612612
:description: Returns true if the set is a superset of a finite sequence as a Set.
613613
- returns: Bool
614614
*/
615-
public func isSupersetOf(_ other: SortedMultiSet<Element>) -> Bool {
615+
public func isSuperset(of other: SortedMultiSet<Element>) -> Bool {
616616
if count < other.count {
617617
return false
618618
}
@@ -629,8 +629,8 @@ public struct SortedMultiSet<T: Comparable>: Probable, Collection, Equatable, Cu
629629
:description: Returns true if the set is a superset of a finite sequence as a Set but not equal.
630630
- returns: Bool
631631
*/
632-
public func isStrictSupersetOf(_ other: SortedMultiSet<Element>) -> Bool {
633-
return count > other.count && isSupersetOf(other)
632+
public func isStrictSuperset(of other: SortedMultiSet<Element>) -> Bool {
633+
return count > other.count && isSuperset(of: other)
634634
}
635635
}
636636

@@ -667,17 +667,17 @@ public func -=<Element : Comparable>(lhs: inout SortedMultiSet<Element>, rhs: So
667667
}
668668

669669
public func <=<Element : Comparable>(lhs: SortedMultiSet<Element>, rhs: SortedMultiSet<Element>) -> Bool {
670-
return lhs.isSubsetOf(rhs)
670+
return lhs.isSubset(of: rhs)
671671
}
672672

673673
public func >=<Element : Comparable>(lhs: SortedMultiSet<Element>, rhs: SortedMultiSet<Element>) -> Bool {
674-
return lhs.isSupersetOf(rhs)
674+
return lhs.isSuperset(of: rhs)
675675
}
676676

677677
public func ><Element : Comparable>(lhs: SortedMultiSet<Element>, rhs: SortedMultiSet<Element>) -> Bool {
678-
return lhs.isStrictSupersetOf(rhs)
678+
return lhs.isStrictSuperset(of: rhs)
679679
}
680680

681681
public func <<Element : Comparable>(lhs: SortedMultiSet<Element>, rhs: SortedMultiSet<Element>) -> Bool {
682-
return lhs.isStrictSubsetOf(rhs)
682+
return lhs.isStrictSubset(of: rhs)
683683
}

‎Sources/SortedSet.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS
342342
}
343343

344344
/**
345-
:name: intersectInPlace
345+
:name: formIntersection
346346
:description: Insert elements of a finite sequence of Sets.
347347
*/
348348
mutating public func formIntersection(_ other: SortedSet<Element>) {
@@ -448,7 +448,7 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS
448448
}
449449

450450
/**
451-
:name: subtractInPlace
451+
:name: subtract
452452
:description: Remove all elements in the set that occur in a finite sequence of Sets.
453453
*/
454454
mutating public func subtract(_ other: SortedSet<Element>) {

‎Tests/RedBlackTreeTests.swift‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ class RedBlackTreeTests: XCTestCase {
4747
XCTAssert(0 == s.count, "Test failed, got \(s.count).")
4848

4949
for _ in 0..<1000 {
50-
s.insert(1, value: 1)
51-
s.insert(2, value: 2)
52-
s.insert(3, value: 3)
50+
s.insert(value: 1, for: 1)
51+
s.insert(value: 2, for: 2)
52+
s.insert(value: 3, for: 3)
5353
}
5454

5555
XCTAssert(3 == s.count, "Test failed.\(s)")
@@ -58,24 +58,24 @@ class RedBlackTreeTests: XCTestCase {
5858
XCTAssert(3 == s[2].value, "Test failed.")
5959

6060
for _ in 0..<500 {
61-
s.removeValueForKeys(1)
62-
s.removeValueForKeys(3)
61+
s.removeValue(for: 1)
62+
s.removeValue(for: 3)
6363
}
6464

6565
XCTAssert(1 == s.count, "Test failed.")
66-
s.removeValueForKeys(2)
66+
s.removeValue(for: 2)
6767

68-
XCTAssert(true == s.insert(2, value: 10), "Test failed.")
68+
XCTAssert(true == s.insert(value: 2, for: 10), "Test failed.")
6969
XCTAssert(1 == s.count, "Test failed.")
70-
XCTAssert(10 == s.findValueForKey(2), "Test failed.")
70+
XCTAssert(10 == s.findValue(for: 2), "Test failed.")
7171
XCTAssert(10 == s[0].value, "Test failed.")
7272

73-
s.removeValueForKeys(2)
73+
s.removeValue(for: 2)
7474
XCTAssert(0 == s.count, "Test failed.")
7575

76-
s.insert(1, value: 1)
77-
s.insert(2, value: 2)
78-
s.insert(3, value: 3)
76+
s.insert(value: 1, for: 1)
77+
s.insert(value: 2, for: 2)
78+
s.insert(value: 3, for: 3)
7979

8080
for i in s.startIndex..<s.endIndex {
8181
s[i] = (s[i].key, 100)
@@ -88,7 +88,7 @@ class RedBlackTreeTests: XCTestCase {
8888

8989
func testPropertyKey() {
9090
var s = RedBlackTree<String, Array<Int>>(uniqueKeys: false)
91-
s.insert("friends", value: [1, 2, 3])
91+
s.insert(value: [1, 2, 3], for: "friends")
9292
s["menu"] = [11, 22, 33]
9393

9494
XCTAssert(s["friends"]! == s[0].value!, "Test failed.")
@@ -102,54 +102,54 @@ class RedBlackTreeTests: XCTestCase {
102102

103103
func testValue() {
104104
var t1 = RedBlackTree<Int, Int>()
105-
t1.insert(1, value: 1)
106-
t1.insert(2, value: 2)
107-
t1.insert(3, value: 3)
105+
t1.insert(value: 1, for: 1)
106+
t1.insert(value: 2, for: 2)
107+
t1.insert(value: 3, for: 3)
108108

109109
var t2 = RedBlackTree<Int, Int>()
110-
t2.insert(4, value: 4)
111-
t2.insert(5, value: 5)
112-
t2.insert(6, value: 6)
110+
t2.insert(value: 4, for: 4)
111+
t2.insert(value: 5, for: 5)
112+
t2.insert(value: 6, for: 6)
113113

114-
var t3 = t1 + t2
114+
let t3 = t1 + t2
115115

116116
for i in 0..<t1.count {
117-
XCTAssert(t1[i].value == t3.findValueForKey(t1[i].value!), "Test failed.")
117+
XCTAssert(t1[i].value == t3.findValue(for: t1[i].value!), "Test failed.")
118118
}
119119

120120
for i in 0..<t2.count {
121-
XCTAssert(t2[i].value == t3.findValueForKey(t2[i].value!), "Test failed.")
121+
XCTAssert(t2[i].value == t3.findValue(for: t2[i].value!), "Test failed.")
122122
}
123123
}
124124

125125
func testIndexOfUniqueKeys() {
126126
var t1 = RedBlackTree<Int, Int>(uniqueKeys: true)
127-
t1.insert(1, value: 1)
128-
t1.insert(2, value: 2)
129-
t1.insert(3, value: 3)
130-
t1.insert(4, value: 4)
131-
t1.insert(5, value: 5)
132-
t1.insert(5, value: 5)
133-
t1.insert(6, value: 6)
134-
135-
XCTAssert(0 == t1.indexOf(1), "Test failed.")
136-
XCTAssert(5 == t1.indexOf(6), "Test failed.")
137-
XCTAssert(-1 == t1.indexOf(100), "Test failed.")
127+
t1.insert(value: 1, for: 1)
128+
t1.insert(value: 2, for: 2)
129+
t1.insert(value: 3, for: 3)
130+
t1.insert(value: 4, for: 4)
131+
t1.insert(value: 5, for: 5)
132+
t1.insert(value: 5, for: 5)
133+
t1.insert(value: 6, for: 6)
134+
135+
XCTAssert(0 == t1.index(of: 1), "Test failed.")
136+
XCTAssert(5 == t1.index(of: 6), "Test failed.")
137+
XCTAssert(-1 == t1.index(of: 100), "Test failed.")
138138
}
139139

140140
func testIndexOfNonUniqueKeys() {
141141
var t1 = RedBlackTree<Int, Int>()
142-
t1.insert(1, value: 1)
143-
t1.insert(2, value: 2)
144-
t1.insert(3, value: 3)
145-
t1.insert(4, value: 4)
146-
t1.insert(5, value: 5)
147-
t1.insert(5, value: 5)
148-
t1.insert(6, value: 6)
149-
150-
XCTAssert(0 == t1.indexOf(1), "Test failed.")
151-
XCTAssert(6 == t1.indexOf(6), "Test failed.")
152-
XCTAssert(-1 == t1.indexOf(100), "Test failed.")
142+
t1.insert(value: 1, for: 1)
143+
t1.insert(value: 2, for: 2)
144+
t1.insert(value: 3, for: 3)
145+
t1.insert(value: 4, for: 4)
146+
t1.insert(value: 5, for: 5)
147+
t1.insert(value: 5, for: 5)
148+
t1.insert(value: 6, for: 6)
149+
150+
XCTAssert(0 == t1.index(of: 1), "Test failed.")
151+
XCTAssert(6 == t1.index(of: 6), "Test failed.")
152+
XCTAssert(-1 == t1.index(of: 100), "Test failed.")
153153
}
154154

155155
func testOperands() {
@@ -161,7 +161,7 @@ class RedBlackTreeTests: XCTestCase {
161161
t2.insert((5, 5), (6, 6), (7, 7), (8, 8))
162162
XCTAssert(4 == t2.count, "Test failed.")
163163

164-
var t3 = t1 + t2
164+
let t3 = t1 + t2
165165
XCTAssert(8 == t3.count, "Test failed.")
166166

167167
XCTAssert(t1 != t2, "Test failed.")

‎Tests/SortedDictionaryTests.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class SortedDictionaryTests: XCTestCase {
4747
XCTAssert(0 == s.count, "Test failed, got \(s.count).")
4848

4949
for _ in 0..<1000 {
50-
s.insert((1, 1))
50+
s.insert((1, 1))
5151
s.insert((2, 2))
5252
s.insert((3, 3))
5353
}
@@ -58,31 +58,31 @@ class SortedDictionaryTests: XCTestCase {
5858
XCTAssert(3 == s[2].value, "Test failed.")
5959

6060
for _ in 0..<500 {
61-
s.removeValueForKeys(1)
62-
s.removeValueForKeys(3)
61+
s.removeValue(for: 1)
62+
s.removeValue(for: 3)
6363
}
6464

6565
XCTAssert(1 == s.count, "Test failed.")
66-
s.removeValueForKeys(2)
66+
s.removeValue(for: 2)
6767

6868
s.insert((2, 10))
6969
XCTAssert(1 == s.count, "Test failed.")
70-
XCTAssert(10 == s.findValueForKey(2), "Test failed.")
70+
XCTAssert(10 == s.findValue(for: 2), "Test failed.")
7171
XCTAssert(10 == s[0].value!, "Test failed.")
7272

73-
s.removeValueForKeys(2)
73+
s.removeValue(for: 2)
7474
XCTAssert(0 == s.count, "Test failed.")
7575

7676
s.insert((1, 1))
7777
s.insert((2, 2))
7878
s.insert((3, 3))
7979
s.insert((3, 3))
80-
s.updateValue(5, forKey: 3)
80+
s.update(value: 5, for: 3)
8181

82-
let subs: SortedDictionary<Int, Int> = s.search(3)
82+
let subs: SortedDictionary<Int, Int> = s.search(for: 3)
8383
XCTAssert(1 == subs.count, "Test failed.")
8484

85-
let generator: SortedDictionary<Int, Int>.Generator = subs.makeIterator()
85+
let generator = subs.makeIterator()
8686
while let x = generator.next() {
8787
XCTAssert(5 == x.value, "Test failed.")
8888
}
@@ -106,9 +106,9 @@ class SortedDictionaryTests: XCTestCase {
106106
d1.insert(value: 5, for: 5)
107107
d1.insert(value: 6, for: 6)
108108

109-
XCTAssert(0 == d1.indexOf(1), "Test failed.")
110-
XCTAssert(5 == d1.indexOf(6), "Test failed.")
111-
XCTAssert(-1 == d1.indexOf(100), "Test failed.")
109+
XCTAssert(0 == d1.index(of: 1), "Test failed.")
110+
XCTAssert(5 == d1.index(of: 6), "Test failed.")
111+
XCTAssert(-1 == d1.index(of: 100), "Test failed.")
112112
}
113113

114114
func testKeys() {

0 commit comments

Comments
 (0)