Skip to content

Commit 4944c6c

Browse files
guFalconguFalcon
committed
Merging projects part 2
1 parent 1a1f542 commit 4944c6c

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

‎NUnitTests/FluentTests.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
// For more information, please refer to <http://unlicense.org>
2626
// ***************************************************************************
2727

28+
using System;
2829
using NUnit.Framework;
2930
using StateMachine;
3031

@@ -95,7 +96,7 @@ public void WhenStateChangesOnEnterAndOnExitHooksShouldTrigger()
9596
})
9697
.Build();
9798

98-
m.Update(2F); // Should do nothing.
99+
m.Update(TimeSpan.FromMilliseconds(2f)); // Should do nothing.
99100
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
100101
m.Trigger(Trigger.MOUSE_CLICKED);
101102
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
@@ -120,11 +121,11 @@ public void WhenStateChangesOnEnterAndOnExitHooksShouldTrigger()
120121
Assert.That(m.Current.Identifier, Is.EqualTo(State.REFRESHING));
121122
Assert.That(button.BtnState, Is.EqualTo(State.REFRESHING));
122123
Assert.That(button.OldState, Is.EqualTo(State.PRESSED));
123-
m.Update(.5F); // No transition yet...
124+
m.Update(TimeSpan.FromMilliseconds(0.5f)); // No transition yet...
124125
Assert.That(m.Current.Identifier, Is.EqualTo(State.REFRESHING));
125126
Assert.That(button.BtnState, Is.EqualTo(State.REFRESHING));
126127
Assert.That(button.OldState, Is.EqualTo(State.PRESSED));
127-
m.Update(.5F); // But now.
128+
m.Update(TimeSpan.FromMilliseconds(0.5f)); // But now.
128129
Assert.That(m.Current.Identifier, Is.EqualTo(State.OVER));
129130
Assert.That(button.BtnState, Is.EqualTo(State.OVER));
130131
Assert.That(button.OldState, Is.EqualTo(State.REFRESHING));

‎NUnitTests/MonoGame/FluentTests.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void WhenAfterConditionFiresOnEnterAndOnExitHooksShouldTrigger()
8787
.GlobalTransitionTo(State.IDLE).AfterGlobal(10, TimeUnit.SECONDS)
8888
.Build();
8989

90-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(16))); // Should do nothing.
90+
m.Update(TimeSpan.FromMilliseconds(16)); // Should do nothing.
9191
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
9292
m.Trigger(Trigger.MOUSE_CLICKED);
9393
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
@@ -96,8 +96,8 @@ public void WhenAfterConditionFiresOnEnterAndOnExitHooksShouldTrigger()
9696
m.Trigger(Trigger.MOUSE_RELEASED);
9797
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
9898
m.Trigger(Trigger.MOUSE_OVER);
99-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(16)));
100-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(16)));
99+
m.Update(TimeSpan.FromMilliseconds(16));
100+
m.Update(TimeSpan.FromMilliseconds(16));
101101
Assert.That(m.Current.Identifier, Is.EqualTo(State.OVER));
102102
Assert.That(button.BtnState, Is.EqualTo(State.OVER));
103103
Assert.That(button.OldState, Is.EqualTo(State.IDLE));
@@ -114,15 +114,15 @@ public void WhenAfterConditionFiresOnEnterAndOnExitHooksShouldTrigger()
114114
Assert.That(m.Current.Identifier, Is.EqualTo(State.REFRESHING));
115115
Assert.That(button.BtnState, Is.EqualTo(State.REFRESHING));
116116
Assert.That(button.OldState, Is.EqualTo(State.PRESSED));
117-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(500))); // No transition yet...
117+
m.Update(TimeSpan.FromMilliseconds(500)); // No transition yet...
118118
Assert.That(m.Current.Identifier, Is.EqualTo(State.REFRESHING));
119119
Assert.That(button.BtnState, Is.EqualTo(State.REFRESHING));
120120
Assert.That(button.OldState, Is.EqualTo(State.PRESSED));
121-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(600))); // But now.
121+
m.Update(TimeSpan.FromMilliseconds(600)); // But now.
122122
Assert.That(m.Current.Identifier, Is.EqualTo(State.OVER));
123123
Assert.That(button.BtnState, Is.EqualTo(State.OVER));
124124
Assert.That(button.OldState, Is.EqualTo(State.REFRESHING));
125-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(10000)));
125+
m.Update(TimeSpan.FromMilliseconds(10000));
126126
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
127127
Assert.That(button.BtnState, Is.EqualTo(State.IDLE));
128128
Assert.That(button.OldState, Is.EqualTo(State.OVER));
@@ -147,7 +147,7 @@ public void WhenMultipleAfterConditionsFireOnASingleUpdateAdvanceStateCorrectly(
147147
.Build();
148148

149149
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
150-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(40)));
150+
m.Update(TimeSpan.FromMilliseconds(40));
151151
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
152152
}
153153

@@ -177,7 +177,7 @@ public void WhenMultipleAfterConditionsFireOnASingleUpdateOnEnterAndOnExitShoudF
177177
.Build();
178178

179179
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
180-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(40)));
180+
m.Update(TimeSpan.FromMilliseconds(40));
181181
Assert.That(enterCount, Is.EqualTo(4));
182182
Assert.That(exitCount, Is.EqualTo(4));
183183
}
@@ -195,13 +195,13 @@ public void WhenAnAfterConditionDoesNotFiresAndATransitionHappensTheTimerIsReset
195195
.Build();
196196

197197
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
198-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(5)));
198+
m.Update(TimeSpan.FromMilliseconds(5));
199199
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
200200
m.Trigger(Trigger.MOUSE_CLICKED);
201201
Assert.That(m.Current.Identifier, Is.EqualTo(State.OVER));
202202
m.Trigger(Trigger.MOUSE_CLICKED);
203203
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
204-
m.Update(new GameTime(TimeSpan.FromDays(1), TimeSpan.FromMilliseconds(5)));
204+
m.Update(TimeSpan.FromMilliseconds(5));
205205
Assert.That(m.Current.Identifier, Is.EqualTo(State.IDLE));
206206
}
207207
}

‎StateMachine/Fsm.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public void Trigger(TT input)
206206
return;
207207
}
208208

209-
Model.Current.RaiseUpdated(new UpdateArgs<TS, TT, TimeSpan>(this, Current, elapsedTime));
209+
Model.Current.RaiseUpdated(new UpdateArgs<TS, TT, TD>(this, Current, elapsedTime));
210210
}
211211

212212
private bool CheckAfterEntries(List<Timer<TS>> afterEntries,

0 commit comments

Comments
 (0)