Adds tests.

Updates README.md.

Author: guFalcon

MonoGameStateMachine/Fsm.cs

@@ -96,16 +96,17 @@ private bool CheckAfterEntries(List<Timer<TS>> afterEntries,
                 {
                     if (t.ConditionsMet(Current.Identifier))
                     {
+                        double timerMax = e.Time;
                         double? r = e.Tick(g.ElapsedGameTime.TotalMilliseconds);
                         afterEntries[i] = e;
                         if (r.HasValue)
                         {
                             // It triggered.
                             DoTransition(e.Target, default(TT), t.Pop);
                             gt.IsRunningSlowly = g.IsRunningSlowly;
-                            gt.TotalGameTime = g.TotalGameTime.Subtract(TimeSpan.FromMilliseconds(r.Value));
+                            gt.TotalGameTime = g.TotalGameTime.Subtract(TimeSpan.FromMilliseconds(timerMax));
                             gt.ElapsedGameTime =
-                                g.ElapsedGameTime.Subtract(TimeSpan.FromMilliseconds(r.Value));
+                                g.ElapsedGameTime.Subtract(TimeSpan.FromMilliseconds(timerMax));
                             Update(gt);
                             return true;
                         }

MonoGameStateMachine/NUnitTests/FluentTests.cs

@@ -59,8 +59,8 @@ private class Button
         }
 
         [Test]
-        [Category("MonoGameStateMachine.FluentTests.OnMethods")]
-        public void OnMethodTests()
+        [Category("MonoGameStateMachine.FluentTests")]
+        public void OnMethodHooksShouldBeTriggeredCorrectly()
         {
             var button = new Button();
 
@@ -130,5 +130,56 @@ public void OnMethodTests()
             // Update was triggered twice over all states.
             Assert.That(button.UpdateCounter, Is.EqualTo(3F));
         }
+
+        [Test]
+        [Category("MonoGameStateMachine.FluentTests")]
+        public void WhenMultipleAfterConditionsFireOnASingleUpdateAdvanceStateCorrectly()
+        {
+            var m = Fsm<State, Trigger>.Builder(State.IDLE)
+                .State(State.IDLE)
+                    .TransitionTo(State.OVER).After(10, TimeUnit.MILLISECONDS)
+                .State(State.OVER)
+                    .TransitionTo(State.PRESSED).After(10, TimeUnit.MILLISECONDS)
+                .State(State.PRESSED)
+                    .TransitionTo(State.REFRESHING).After(10, TimeUnit.MILLISECONDS)
+                .State(State.REFRESHING)
+                    .TransitionTo(State.IDLE).After(10, TimeUnit.MILLISECONDS)
+                .Build();
+
+            Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
+            m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(40)));
+            Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
+        }
+
+        [Test]
+        [Category("MonoGameStateMachine.FluentTests")]
+        public void WhenMultipleAfterConditionsFireOnASingleUpdateOnEnterAndOnExitShoudFire()
+        {
+            int enterCount = 0;
+            int exitCount = 0;
+            var m = Fsm<State, Trigger>.Builder(State.IDLE)
+                .State(State.IDLE)
+                    .OnEnter(t => enterCount++)
+                    .OnExit(t => exitCount++)
+                    .TransitionTo(State.OVER).After(10, TimeUnit.MILLISECONDS)
+                .State(State.OVER)
+                    .OnEnter(t => enterCount++)
+                    .OnExit(t => exitCount++)
+                    .TransitionTo(State.PRESSED).After(10, TimeUnit.MILLISECONDS)
+                .State(State.PRESSED)
+                    .OnEnter(t => enterCount++)
+                    .OnExit(t => exitCount++)
+                    .TransitionTo(State.REFRESHING).After(10, TimeUnit.MILLISECONDS)
+                .State(State.REFRESHING)
+                    .OnEnter(t => enterCount++)
+                    .OnExit(t => exitCount++)
+                    .TransitionTo(State.IDLE).After(10, TimeUnit.MILLISECONDS)
+                .Build();
+
+            Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
+            m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(40)));
+            Assert.That(enterCount, Is.EqualTo(4));
+            Assert.That(exitCount, Is.EqualTo(4));
+        }
     }
 }

README.md

@@ -1,6 +1,9 @@
-StateMachine:[![NuGet](https://img.shields.io/nuget/v/StateMachine.svg?maxAge=2592000)](https://www.nuget.org/packages/StateMachine/)
- MonoGameStateMachine:[![NuGet](https://img.shields.io/nuget/v/MonoGameStateMachine.svg?maxAge=2592000)](https://www.nuget.org/packages/MonoGameStateMachine/)
-[![license](https://img.shields.io/github/license/unterrainerinformatik/FiniteStateMachine.svg?maxAge=2592000)](http://unlicense.org)  [![Twitter Follow](https://img.shields.io/twitter/follow/throbax.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/throbax)  
+[![license](https://img.shields.io/github/license/unterrainerinformatik/FiniteStateMachine.svg?maxAge=2592000)](http://unlicense.org)  [![Twitter Follow](https://img.shields.io/twitter/follow/throbax.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/throbax)
+
+| Project              |                 Package                  |
+| -------------------- | :--------------------------------------: |
+| StateMachine         | [![NuGet](https://img.shields.io/nuget/v/StateMachine.svg?maxAge=2592000)](https://www.nuget.org/packages/StateMachine/) |
+| MonoGameStateMachine | [![NuGet](https://img.shields.io/nuget/v/MonoGameStateMachine.svg?maxAge=2592000)](https://www.nuget.org/packages/MonoGameStateMachine/) |
 
 # Finite-State-Machine