h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 18:12:56 +08:00
Code Issues Releases Wiki Activity

Fix dynamic compilation, use slidertick judgements

Browse Source
This commit is contained in:
David Zhao 2019-01-24 18:24:13 +09:00 committed by Dean Herbert
parent 1f93fde246
commit 4353002fde
1 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs
View File

@ -29,19 +29,13 @@ namespace osu.Game.Rulesets.Osu.Tests
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
typeof(Slider),
typeof(SliderCircle),
typeof(SliderBall), typeof(SliderBall),
typeof(SliderBody),
typeof(SliderTick),
typeof(SliderTailCircle),
typeof(DrawableSlider), typeof(DrawableSlider),
typeof(SnakingSliderBody),
typeof(DrawableSliderTick), typeof(DrawableSliderTick),
typeof(DrawableRepeatPoint), typeof(DrawableRepeatPoint),
typeof(DrawableOsuHitObject), typeof(DrawableOsuHitObject),
typeof(DrawableSliderHead), typeof(DrawableSliderHead),
typeof(DrawableSliderTail) typeof(DrawableSliderTail),
}; };
[SetUp] [SetUp]
@ -49,9 +43,14 @@ namespace osu.Game.Rulesets.Osu.Tests
{ {
allJudgedFired = false; allJudgedFired = false;
judgementResults = new List<JudgementResult>(); judgementResults = new List<JudgementResult>();
loadBeatmap();
}); });
public TestCaseSliderInput()
{
loadBeatmap();
}
private List<JudgementResult> judgementResults; private List<JudgementResult> judgementResults;
private bool allJudgedFired; private bool allJudgedFired;
@ -62,34 +61,6 @@ namespace osu.Game.Rulesets.Osu.Tests
private const double time_during_slide_3 = 3500; private const double time_during_slide_3 = 3500;
private const double time_during_slide_4 = 4000; private const double time_during_slide_4 = 4000;
/// <summary>
/// Scenario:
/// - Press a key on the slider head timed correctly
/// - Press the other key in the middle of the slider while holding the original key
/// - Release the original key used to hit the slider
/// Expected Result:
/// A passing test case will have the cursor continue tracking on replay frame 3.
/// </summary>
[Test]
public void TestLeftBeforeSliderThenRightThenLettingGoOfLeft()
{
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Left to both to right test", () =>
{
var frames = new List<ReplayFrame>
{
new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_during_slide_1 },
new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_2 },
};
performTest(frames);
});
AddUntilStep(() => allJudgedFired, "Wait for test 1");
AddAssert("Tracking retained", assertGreatJudge);
}
/// <summary> /// <summary>
/// Scenario: /// Scenario:
/// - Press a key before a slider starts /// - Press a key before a slider starts
@ -114,8 +85,36 @@ namespace osu.Game.Rulesets.Osu.Tests
performTest(frames); performTest(frames);
}); });
AddUntilStep(() => allJudgedFired, "Wait for test 1");
AddAssert("Tracking lost", assertMidSliderJudgementFail);
}
/// <summary>
/// Scenario:
/// - Press a key on the slider head timed correctly
/// - Press the other key in the middle of the slider while holding the original key
/// - Release the original key used to hit the slider
/// Expected Result:
/// A passing test case will have the cursor continue tracking on replay frame 3.
/// </summary>
[Test]
public void TestLeftBeforeSliderThenRightThenLettingGoOfLeft()
{
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Left to both to right test", () =>
{
var frames = new List<ReplayFrame>
{
new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_during_slide_1 },
new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_2 },
};
performTest(frames);
});
AddUntilStep(() => allJudgedFired, "Wait for test 2"); AddUntilStep(() => allJudgedFired, "Wait for test 2");
AddAssert("Tracking lost", assertMehJudge); AddAssert("Tracking retained", assertGreatJudge);
} }
/// <summary> /// <summary>
@ -196,7 +195,7 @@ namespace osu.Game.Rulesets.Osu.Tests
}); });
AddUntilStep(() => allJudgedFired, "Wait for test 5"); AddUntilStep(() => allJudgedFired, "Wait for test 5");
AddAssert("Tracking retained, sliderhead miss", assertHeadMissTailMeh); AddAssert("Tracking retained, sliderhead miss", assertHeadMissTailTracked);
} }
/// <summary> /// <summary>
@ -292,6 +291,7 @@ namespace osu.Game.Rulesets.Osu.Tests
AddAssert("Tracking acquired", assertMidSliderJudgements); AddAssert("Tracking acquired", assertMidSliderJudgements);
} }
/// <summary> /// <summary>
/// Scenario: /// Scenario:
/// - Press a key before the slider starts /// - Press a key before the slider starts
@ -354,19 +354,14 @@ namespace osu.Game.Rulesets.Osu.Tests
AddAssert("Tracking acquired", assertMidSliderJudgements); AddAssert("Tracking acquired", assertMidSliderJudgements);
} }
private bool assertMehJudge()
{
return judgementResults.Last().Type == HitResult.Meh;
}
private bool assertGreatJudge() private bool assertGreatJudge()
{ {
return judgementResults.Last().Type == HitResult.Great; return judgementResults.Last().Type == HitResult.Great;
} }
private bool assertHeadMissTailMeh() private bool assertHeadMissTailTracked()
{ {
return judgementResults.Last().Type == HitResult.Meh && judgementResults.First().Type == HitResult.Miss; return judgementResults[judgementResults.Count - 2].Type == HitResult.Great && judgementResults.First().Type == HitResult.Miss;
} }
private bool assertMidSliderJudgements() private bool assertMidSliderJudgements()
@ -379,6 +374,7 @@ namespace osu.Game.Rulesets.Osu.Tests
return judgementResults[judgementResults.Count - 2].Type == HitResult.Miss; return judgementResults[judgementResults.Count - 2].Type == HitResult.Miss;
} }
private void loadBeatmap() private void loadBeatmap()
{ {
var slider = new Slider var slider = new Slider
@ -392,6 +388,7 @@ namespace osu.Game.Rulesets.Osu.Tests
}, 25), }, 25),
}; };
Beatmap.Value = new TestWorkingBeatmap(new Beatmap<OsuHitObject> Beatmap.Value = new TestWorkingBeatmap(new Beatmap<OsuHitObject>
{ {
HitObjects = { slider }, HitObjects = { slider },