Skip to content

Commit e551dfa

Browse files
author
Reed Es
committed
addChild now has value parameter to match init
1 parent 2c54d99 commit e551dfa

File tree

3 files changed

+62
-62
lines changed

3 files changed

+62
-62
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ _SwiftSimpleTree_ is part of the [OpenAlloc](https://github.com/openalloc) famil
1010

1111
```swift
1212
let foo = SimpleTree(value: "foo")
13-
let bar = foo.addChild(for: "bar")
14-
let baz = bar.addChild(for: "baz")
13+
let bar = foo.addChild(value: "bar")
14+
let baz = bar.addChild(value: "baz")
1515

1616
print(foo.getFirst(for: "baz")?.value)
1717

@@ -53,7 +53,7 @@ public enum Traversal {
5353

5454
- `init(value: T)`: Initialize a new tree (containing the specified value at the root)
5555

56-
- `func addChild(for: T) -> Node`: Append a new node (containing the specified value) to our list of children
56+
- `func addChild(value: T) -> Node`: Append a new node (containing the specified value) to our list of children
5757

5858
#### Node Retrieval
5959

‎Sources/SimpleTree.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class SimpleTree<T> where T: Equatable & Hashable {
3737
extension SimpleTree {
3838

3939
/// Append a new node (containing the specified value) to our list of children
40-
public func addChild(for value: T) -> Node {
40+
public func addChild(value: T) -> Node {
4141
let nuChild = Node(value: value)
4242
children.append(nuChild)
4343
nuChild.parent = self

‎Tests/SimpleTreeTests.swift

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ final class SimpleTreeTests: XCTestCase {
3232

3333
public func testExample() {
3434
let foo = SimpleTree(value: "foo")
35-
let bar = foo.addChild(for: "bar")
36-
let baz = bar.addChild(for: "baz")
35+
let bar = foo.addChild(value: "bar")
36+
let baz = bar.addChild(value: "baz")
3737

3838
XCTAssertEqual("baz", foo.getFirst(for: "baz")?.value)
3939
XCTAssertEqual(["bar", "foo"], baz.getParentValues())
@@ -43,10 +43,10 @@ final class SimpleTreeTests: XCTestCase {
4343

4444
public func testGetParentValues() throws {
4545
let foo = SST(value: "foo")
46-
let bar = foo.addChild(for: "bar")
47-
let baz2 = foo.addChild(for: "bar2")
48-
let baz = bar.addChild(for: "baz")
49-
let blah = bar.addChild(for: "blah")
46+
let bar = foo.addChild(value: "bar")
47+
let baz2 = foo.addChild(value: "bar2")
48+
let baz = bar.addChild(value: "baz")
49+
let blah = bar.addChild(value: "blah")
5050

5151
XCTAssertEqual(blah.getParentValues(), ["bar", "foo"])
5252
XCTAssertEqual(blah.getParentValues(maxDepth: 0), [])
@@ -69,10 +69,10 @@ final class SimpleTreeTests: XCTestCase {
6969

7070
public func testMakeParentIterator() throws {
7171
let foo = SST(value: "foo")
72-
let bar = foo.addChild(for: "bar")
73-
let baz2 = foo.addChild(for: "baz2")
74-
let baz = bar.addChild(for: "baz")
75-
let blah = bar.addChild(for: "blah")
72+
let bar = foo.addChild(value: "bar")
73+
let baz2 = foo.addChild(value: "baz2")
74+
let baz = bar.addChild(value: "baz")
75+
let blah = bar.addChild(value: "blah")
7676

7777
let blahIt = blah.makeParentIterator()
7878
XCTAssertEqual("bar", blahIt.next()?.value)
@@ -98,12 +98,12 @@ final class SimpleTreeTests: XCTestCase {
9898

9999
public func testMakeChildIterator() throws {
100100
let foo = SST(value: "foo")
101-
let bar = foo.addChild(for: "bar")
102-
let baz2 = foo.addChild(for: "baz2")
103-
let bleep = baz2.addChild(for: "bleep")
104-
let blort = bleep.addChild(for: "blort")
105-
let baz = bar.addChild(for: "baz")
106-
let blah = bar.addChild(for: "blah")
101+
let bar = foo.addChild(value: "bar")
102+
let baz2 = foo.addChild(value: "baz2")
103+
let bleep = baz2.addChild(value: "bleep")
104+
let blort = bleep.addChild(value: "blort")
105+
let baz = bar.addChild(value: "baz")
106+
let blah = bar.addChild(value: "blah")
107107

108108
let blahIt = blah.makeChildIterator()
109109
XCTAssertNil(blahIt.next()?.value)
@@ -140,8 +140,8 @@ final class SimpleTreeTests: XCTestCase {
140140

141141
public func testGetFirst() throws {
142142
let foo = SST(value: "foo")
143-
let bar = foo.addChild(for: "bar")
144-
let baz = bar.addChild(for: "baz")
143+
let bar = foo.addChild(value: "bar")
144+
let baz = bar.addChild(value: "baz")
145145

146146
XCTAssertNil(foo.getFirstChild(for: "foo"))
147147
XCTAssertEqual(foo.getFirstChild(for: "bar"), bar)
@@ -161,25 +161,25 @@ final class SimpleTreeTests: XCTestCase {
161161

162162
public func testGetChildValuesOneChild() throws {
163163
let foo = SST(value: "foo")
164-
_ = foo.addChild(for: "bar")
164+
_ = foo.addChild(value: "bar")
165165
XCTAssertEqual(foo.getChildValues(), ["bar"])
166166
}
167167

168168
public func testGetChildValuesOneGrandChild() throws {
169169
let foo = SST(value: "foo")
170-
let bar = foo.addChild(for: "bar")
171-
_ = bar.addChild(for: "baz")
170+
let bar = foo.addChild(value: "bar")
171+
_ = bar.addChild(value: "baz")
172172
XCTAssertEqual(foo.getChildValues(), ["bar", "baz"])
173173
}
174174

175175
public func testGetChildValues() throws {
176176
let foo = SST(value: "foo")
177-
let bar = foo.addChild(for: "bar")
178-
let bar2 = foo.addChild(for: "bar2")
179-
_ = bar2.addChild(for: "bar3")
180-
let baz = bar.addChild(for: "baz")
181-
let blah = bar.addChild(for: "blah")
182-
_ = blah.addChild(for: "bleh")
177+
let bar = foo.addChild(value: "bar")
178+
let bar2 = foo.addChild(value: "bar2")
179+
_ = bar2.addChild(value: "bar3")
180+
let baz = bar.addChild(value: "baz")
181+
let blah = bar.addChild(value: "blah")
182+
_ = blah.addChild(value: "bleh")
183183

184184
for traversal in [SST.Traversal.depthFirst, SST.Traversal.breadthFirst] {
185185
XCTAssertEqual(foo.getChildValues(traversal: traversal).sorted(), ["bar", "bar2", "bar3", "baz", "blah", "bleh"].sorted())
@@ -198,12 +198,12 @@ final class SimpleTreeTests: XCTestCase {
198198

199199
public func testGetSelfAndChildValues() throws {
200200
let foo = SST(value: "foo")
201-
let bar = foo.addChild(for: "bar")
202-
let bar2 = foo.addChild(for: "bar2")
203-
_ = bar2.addChild(for: "bar3")
204-
let baz = bar.addChild(for: "baz")
205-
let blah = bar.addChild(for: "blah")
206-
_ = blah.addChild(for: "bleh")
201+
let bar = foo.addChild(value: "bar")
202+
let bar2 = foo.addChild(value: "bar2")
203+
_ = bar2.addChild(value: "bar3")
204+
let baz = bar.addChild(value: "baz")
205+
let blah = bar.addChild(value: "blah")
206+
_ = blah.addChild(value: "bleh")
207207

208208
for traversal in [SST.Traversal.depthFirst, SST.Traversal.breadthFirst] {
209209
XCTAssertEqual(foo.getSelfAndChildValues(traversal: traversal).sorted(), ["bar", "bar2", "bar3", "baz", "blah", "bleh", "foo"].sorted())
@@ -222,12 +222,12 @@ final class SimpleTreeTests: XCTestCase {
222222

223223
public func testGetAllChildValues() throws {
224224
let foo = SST(value: "foo")
225-
let bar = foo.addChild(for: "bar")
226-
let bar2 = foo.addChild(for: "bar2")
227-
_ = bar2.addChild(for: "bar3")
228-
let baz = bar.addChild(for: "baz")
229-
let blah = bar.addChild(for: "blah")
230-
_ = blah.addChild(for: "bleh")
225+
let bar = foo.addChild(value: "bar")
226+
let bar2 = foo.addChild(value: "bar2")
227+
_ = bar2.addChild(value: "bar3")
228+
let baz = bar.addChild(value: "baz")
229+
let blah = bar.addChild(value: "blah")
230+
_ = blah.addChild(value: "bleh")
231231

232232
XCTAssertEqual(foo.getChildValues().sorted(), ["bar", "bar2", "bar3", "baz", "blah", "bleh"].sorted())
233233
XCTAssertEqual(bar.getChildValues().sorted(), ["baz", "blah", "bleh"].sorted())
@@ -238,11 +238,11 @@ final class SimpleTreeTests: XCTestCase {
238238

239239
public func testGetChildValuesExclude() throws {
240240
let foo = SST(value: "foo")
241-
let bar = foo.addChild(for: "bar")
242-
let bar2 = foo.addChild(for: "bar2")
243-
_ = bar2.addChild(for: "bar3")
244-
_ = bar.addChild(for: "baz")
245-
_ = bar.addChild(for: "blah")
241+
let bar = foo.addChild(value: "bar")
242+
let bar2 = foo.addChild(value: "bar2")
243+
_ = bar2.addChild(value: "bar3")
244+
_ = bar.addChild(value: "baz")
245+
_ = bar.addChild(value: "blah")
246246

247247
XCTAssertEqual(foo.getChildValues(excludeValues: ["bar"]).sorted(), ["bar2", "bar3"].sorted())
248248
XCTAssertEqual(foo.getChildValues(excludeValues: ["bar2"]).sorted(), ["bar", "baz", "blah"].sorted())
@@ -252,11 +252,11 @@ final class SimpleTreeTests: XCTestCase {
252252

253253
public func testGetChildValues2Exclude() throws {
254254
let foo = SST(value: "foo")
255-
let bar = foo.addChild(for: "bar")
256-
let bar2 = foo.addChild(for: "bar2")
257-
_ = bar2.addChild(for: "bar3")
258-
_ = bar.addChild(for: "baz")
259-
_ = bar.addChild(for: "blah")
255+
let bar = foo.addChild(value: "bar")
256+
let bar2 = foo.addChild(value: "bar2")
257+
_ = bar2.addChild(value: "bar3")
258+
_ = bar.addChild(value: "baz")
259+
_ = bar.addChild(value: "blah")
260260

261261
//XCTAssertEqual(foo.getChildValues2(excludeValues: ["bar"]), [])
262262
XCTAssertEqual(foo.getChildValues(excludeValues: ["bar2"]), ["bar", "baz", "blah"])
@@ -267,8 +267,8 @@ final class SimpleTreeTests: XCTestCase {
267267

268268
public func testGetAllValues() throws {
269269
let foo = SST(value: "foo")
270-
let bar = foo.addChild(for: "bar")
271-
let baz = bar.addChild(for: "baz")
270+
let bar = foo.addChild(value: "bar")
271+
let baz = bar.addChild(value: "baz")
272272

273273
XCTAssertTrue(foo.getSelfAndChildValues().contains("foo"))
274274
XCTAssertTrue(foo.getSelfAndChildValues().contains("bar"))
@@ -288,7 +288,7 @@ final class SimpleTreeTests: XCTestCase {
288288

289289
public func testGetAllValuesExcludeRoot() throws {
290290
let foo = SST(value: "foo")
291-
_ = foo.addChild(for: "bar")
291+
_ = foo.addChild(value: "bar")
292292

293293
let actual = foo.getSelfAndChildValues(excludeValues: Set(["foo"]))
294294
XCTAssertFalse(actual.contains("foo"))
@@ -297,8 +297,8 @@ final class SimpleTreeTests: XCTestCase {
297297

298298
public func testGetAllValuesExcludeChild() throws {
299299
let foo = SST(value: "foo")
300-
let bar = foo.addChild(for: "bar")
301-
_ = bar.addChild(for: "baz")
300+
let bar = foo.addChild(value: "bar")
301+
_ = bar.addChild(value: "baz")
302302

303303
let actual = foo.getSelfAndChildValues(excludeValues: Set(["bar"]))
304304
XCTAssertTrue(actual.contains("foo"))
@@ -308,11 +308,11 @@ final class SimpleTreeTests: XCTestCase {
308308
public func testGetAllValuesExcludeSibling() throws {
309309
let foo = SST(value: "foo")
310310

311-
let blah = foo.addChild(for: "blah")
312-
_ = blah.addChild(for: "bleh")
311+
let blah = foo.addChild(value: "blah")
312+
_ = blah.addChild(value: "bleh")
313313

314-
let bar = foo.addChild(for: "bar")
315-
_ = bar.addChild(for: "baz")
314+
let bar = foo.addChild(value: "bar")
315+
_ = bar.addChild(value: "baz")
316316

317317
let actual = foo.getSelfAndChildValues(excludeValues: Set(["blah"]))
318318
XCTAssertTrue(actual.contains("foo"))

0 commit comments

Comments
 (0)