Skip to content

Commit 3551d29

Browse files
committed
Fix test warnings and tests
1 parent 1221b4c commit 3551d29

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

SwiftStateTests/HierarchicalStateMachineTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ class HierarchicalStateMachineTests: _TestCase
160160
func testAddHandler()
161161
{
162162
let mainMachine = self.mainMachine!
163-
let sub1Machine = self.sub1Machine!
164163

165164
var didPass = false
166165

SwiftStateTests/StateMachineChainTests.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ class StateMachineChainTests: _TestCase
8080
{
8181
let machine = StateMachine<MyState, String>(state: .State0)
8282

83-
var invokeCount = 0
84-
8583
// add 0 => 1 => 2
8684
machine.addRouteChain(.State0 => .State1 => .State2) { context in
8785
XCTFail("Handler should NOT be performed because 0 => 2 is skipping 1.")
@@ -194,7 +192,7 @@ class StateMachineChainTests: _TestCase
194192
var invokeCount = 0
195193

196194
// add 0 => 1 => 2
197-
let (routeID, handlerID) = machine.addRouteChain(.State0 => .State1 => .State2) { context in
195+
let (routeID, _) = machine.addRouteChain(.State0 => .State1 => .State2) { context in
198196
invokeCount++
199197
return
200198
}
@@ -216,7 +214,7 @@ class StateMachineChainTests: _TestCase
216214
var invokeCount = 0
217215

218216
// add 0 => 1 => 2
219-
let (routeID, handlerID) = machine.addRouteChain(.State0 => .State1 => .State2) { context in
217+
let (_, handlerID) = machine.addRouteChain(.State0 => .State1 => .State2) { context in
220218
invokeCount++
221219
return
222220
}

SwiftStateTests/StateMachineTests.swift

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,14 +389,14 @@ class StateMachineTests: _TestCase
389389
// add 0 => 1
390390
machine.addRoute(.State0 => .State1)
391391

392-
let handlerID = machine.addHandler(.State0 => .State1) { context in
392+
machine.addHandler(.State0 => .State1) { context in
393393
returnedTransition = context.transition
394394
}
395395

396396
// add 0 => 1 once more
397397
machine.addRoute(.State0 => .State1)
398398

399-
let handlerID2 = machine.addHandler(.State0 => .State1) { context in
399+
machine.addHandler(.State0 => .State1) { context in
400400
returnedTransition2 = context.transition
401401
}
402402

@@ -422,6 +422,12 @@ class StateMachineTests: _TestCase
422422
machine.addHandler(.State0 => .State1) { context in
423423
returnedTransition = context.transition
424424
}
425+
426+
XCTAssertTrue(returnedTransition == nil)
427+
428+
machine <- .State1
429+
430+
XCTAssertTrue(returnedTransition != nil)
425431
}
426432

427433
//--------------------------------------------------
@@ -446,7 +452,7 @@ class StateMachineTests: _TestCase
446452
// add 0 => 1 once more
447453
machine.addRoute(.State0 => .State1)
448454

449-
let handlerID2 = machine.addHandler(.State0 => .State1) { context in
455+
machine.addHandler(.State0 => .State1) { context in
450456
returnedTransition2 = context.transition
451457
}
452458

@@ -495,7 +501,7 @@ class StateMachineTests: _TestCase
495501
// add 2 => 1 once more
496502
machine.addRoute(.State2 => .State1)
497503

498-
let handlerID2 = machine.addErrorHandler { context in
504+
machine.addErrorHandler { context in
499505
returnedTransition2 = context.transition
500506
}
501507

SwiftStateTests/StateTransitionChainTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class StateTransitionChainTests: _TestCase
6161
func testPrepend()
6262
{
6363
// 0 => 1
64-
var transition = MyState.State0 => .State1
64+
let transition = MyState.State0 => .State1
6565
var chain = transition.toTransitionChain()
6666

6767
XCTAssertEqual(chain.numberOfTransitions, 1)

0 commit comments

Comments
 (0)