h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-21 06:42:54 +08:00
Code Issues Releases Wiki Activity

Test KeyCounter.RestoreState

Browse Source
This commit is contained in:
Roman Kapustin 2018-07-28 23:24:03 +03:00
parent 8bb83a8fd9
commit 3134e14b37
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game.Tests/Visual/TestCaseKeyCounter.cs
View File

@ -3,7 +3,9 @@
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input.EventArgs;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Framework.Timing;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using OpenTK.Input; using OpenTK.Input;
@ -12,15 +14,18 @@ namespace osu.Game.Tests.Visual
[TestFixture] [TestFixture]
public class TestCaseKeyCounter : OsuTestCase public class TestCaseKeyCounter : OsuTestCase
{ {
private const Key rewind_test_key = Key.Z;
public TestCaseKeyCounter() public TestCaseKeyCounter()
{ {
KeyCounterKeyboard rewindTestKeyCounterKeyboard;
KeyCounterCollection kc = new KeyCounterCollection KeyCounterCollection kc = new KeyCounterCollection
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Children = new KeyCounter[] Children = new KeyCounter[]
{ {
new KeyCounterKeyboard(Key.Z), rewindTestKeyCounterKeyboard = new KeyCounterKeyboard(rewind_test_key),
new KeyCounterKeyboard(Key.X), new KeyCounterKeyboard(Key.X),
new KeyCounterMouse(MouseButton.Left), new KeyCounterMouse(MouseButton.Left),
new KeyCounterMouse(MouseButton.Right), new KeyCounterMouse(MouseButton.Right),
@ -34,6 +39,28 @@ namespace osu.Game.Tests.Visual
}); });
AddSliderStep("Fade time", 0, 200, 50, v => kc.FadeTime = v); AddSliderStep("Fade time", 0, 200, 50, v => kc.FadeTime = v);
var expectedCountPresses = rewindTestKeyCounterKeyboard.CountPresses + 1;
AddStep($"Press {rewind_test_key} key", () =>
{
rewindTestKeyCounterKeyboard.TriggerOnKeyDown(null, new KeyDownEventArgs { Key = rewind_test_key, Repeat = false });
rewindTestKeyCounterKeyboard.TriggerOnKeyUp(null, new KeyUpEventArgs { Key = rewind_test_key });
});
AddAssert($"Check {rewind_test_key} counter after keypress", () => rewindTestKeyCounterKeyboard.CountPresses == expectedCountPresses);
IFrameBasedClock counterClock = null;
AddStep($"Rewind {rewind_test_key} counter", () =>
{
counterClock = rewindTestKeyCounterKeyboard.Clock;
rewindTestKeyCounterKeyboard.Clock = new DecoupleableInterpolatingFramedClock();
});
AddAssert($"Check {rewind_test_key} counter after rewind", () =>
{
rewindTestKeyCounterKeyboard.Clock = counterClock;
return rewindTestKeyCounterKeyboard.CountPresses == 0;
});
Add(kc); Add(kc);
} }
} }

7
osu.Game/Screens/Play/KeyCounter.cs
View File

@ -152,11 +152,6 @@ namespace osu.Game.Screens.Play
RestoreState(Clock.CurrentTime); RestoreState(Clock.CurrentTime);
} }
public void RestoreState(double time) public void RestoreState(double time) => CountPresses = states.LastOrDefault(state => state.Time <= time)?.Count ?? 0;
{
var targetState = states.LastOrDefault(state => state.Time <= time) ?? states.LastOrDefault();
var targetCount = targetState?.Count ?? 0;
CountPresses = targetCount;
}
} }
} }