more tests (#2)

fsm.go

@@ -178,15 +178,19 @@ func (f *FSM) Current() State {
 // true is returned if a transition is applied.
 func (f *FSM) Event(e Event) bool {
 	for i := range f.transitions {
-		if res := f.transitions[i].match(e, f.times+1, f); res != resultNOK {
+		times := f.times
+		if i != f.previous {
+			times = 0
+		}
+		if res := f.transitions[i].match(e, times+1, f); res != resultNOK {
 			if res == resultOK {
 				f.transitions[i].apply(f)
 			}
 			if i == f.previous {
 				f.times++
 			} else {
 				f.previous = i
-				f.times = 0
+				f.times = 1
 			}
 			return res == resultOK
 		}

fsm_test.go

@@ -14,6 +14,7 @@ const (
 
 const (
 	EventFoo fsm.Event = iota
+	EventBar
 )
 
 func TestFSM(t *testing.T) {
@@ -29,6 +30,10 @@ func TestFSM(t *testing.T) {
 	if f.Current() != StateBar {
 		t.Error("Bad destination state")
 	}
+	f.Reset()
+	if f.Current() != StateFoo {
+		t.Error("Bad state after Reset")
+	}
 }
 
 func TestCheck(t *testing.T) {
@@ -47,7 +52,7 @@ func TestCheck(t *testing.T) {
 	check = true
 	res = f.Event(EventFoo)
 	if !res && f.Current() != StateBar {
-		t.Error("Transition should happen because of Check")
+		t.Error("Transition should happen thanks to Check")
 	}
 }
 
@@ -61,6 +66,26 @@ func ExampleCheck() {
 	)
 }
 
+func TestNotCheck(t *testing.T) {
+	check := true
+	f := fsm.New(StateFoo)
+	f.Transition(
+		fsm.On(EventFoo), fsm.Src(StateFoo), fsm.NotCheck(func() bool {
+			return check
+		}),
+		fsm.Dst(StateBar),
+	)
+	res := f.Event(EventFoo)
+	if res || f.Current() == StateBar {
+		t.Error("Transition should not happen because of NotCheck")
+	}
+	check = false
+	res = f.Event(EventFoo)
+	if !res && f.Current() != StateBar {
+		t.Error("Transition should happen thanks to NotCheck")
+	}
+}
+
 func TestCall(t *testing.T) {
 	call := false
 	f := fsm.New(StateFoo)
@@ -92,15 +117,31 @@ func TestTimes(t *testing.T) {
 		fsm.On(EventFoo), fsm.Src(StateFoo), fsm.Times(2),
 		fsm.Dst(StateBar),
 	)
+	f.Transition(
+		fsm.On(EventBar), fsm.Src(StateBar),
+		fsm.Dst(StateFoo),
+	)
 
 	res := f.Event(EventFoo)
 	if res || f.Current() == StateBar {
 		t.Error("Transition should not happen the first time")
 	}
-	res = f.Event(EventFoo) // transition to StateBar
+	res = f.Event(EventFoo)
 	if !res || f.Current() != StateBar {
 		t.Error("Transition should happen the second time")
 	}
+	res = f.Event(EventBar)
+	if !res || f.Current() != StateFoo {
+		t.Error("FSM should have returned to StateFoo")
+	}
+	res = f.Event(EventFoo)
+	if res || f.Current() == StateBar {
+		t.Error("Transition should not happen the first time of the second run")
+	}
+	res = f.Event(EventFoo)
+	if !res || f.Current() != StateBar {
+		t.Error("Transition should happen the second time of the second run")
+	}
 }
 
 func ExampleTimes() {