diff --git a/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs index 9ce1599fb4..6e5afe4774 100644 --- a/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs +++ b/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs @@ -61,33 +61,6 @@ namespace osu.Game.Rulesets.Osu.Tests private const double time_during_slide_3 = 3500; private const double time_during_slide_4 = 4000; - /// - /// Scenario: - /// - Press a key before a slider starts - /// - Press the other key on the slider head timed correctly while holding the original key - /// - Release the latter pressed key - /// Expected Result: - /// A passing test case will have the cursor lose tracking on replay frame 3. - /// - [Test] - public void TestLeftBeforeSliderThenRight() - { - AddStep("Invalid key transfer test", () => - { - var frames = new List - { - new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_before_slider }, - new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start }, - new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_during_slide_1 }, - }; - - performTest(frames); - }); - - AddUntilStep(() => allJudgedFired, "Wait for test 2"); - AddAssert("Tracking lost", assertMehJudge); - } - /// /// Scenario: /// - Press a key on the slider head timed correctly @@ -115,6 +88,33 @@ namespace osu.Game.Rulesets.Osu.Tests AddAssert("Tracking retained", assertGreatJudge); } + /// + /// Scenario: + /// - Press a key before a slider starts + /// - Press the other key on the slider head timed correctly while holding the original key + /// - Release the latter pressed key + /// Expected Result: + /// A passing test case will have the cursor lose tracking on replay frame 3. + /// + [Test] + public void TestLeftBeforeSliderThenRight() + { + AddStep("Invalid key transfer test", () => + { + var frames = new List + { + new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_before_slider }, + new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start }, + new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_during_slide_1 }, + }; + + performTest(frames); + }); + + AddUntilStep(() => allJudgedFired, "Wait for test 2"); + AddAssert("Tracking lost", assertMehJudge); + } + /// /// Scenario: /// - Press a key on the slider head timed correctly @@ -410,7 +410,6 @@ namespace osu.Game.Rulesets.Osu.Tests LoadComponentAsync(player, p => { Child = p; - p.ScoreProcessor.NewJudgement += result => judgementResults.Add(result); p.ScoreProcessor.AllJudged += () => { allJudgedFired = true; }; });