From 8e09c66cbb6fd21758079c9948e431e0f12c058b Mon Sep 17 00:00:00 2001 From: David Zhao Date: Thu, 24 Jan 2019 14:42:09 +0900 Subject: [PATCH] Split out testcase player for use in slider input tests --- .../TestCaseSliderInput.cs | 2 +- osu.Game/Tests/Visual/TestCasePlayer.cs | 10 +--------- osu.Game/Tests/Visual/TestCasePlayerBase.cs | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 osu.Game/Tests/Visual/TestCasePlayerBase.cs diff --git a/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs index 5232fbfa7f..cc97947dc3 100644 --- a/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs +++ b/osu.Game.Rulesets.Osu.Tests/TestCaseSliderInput.cs @@ -25,7 +25,7 @@ using osuTK; namespace osu.Game.Rulesets.Osu.Tests { - public class TestCaseSliderInput : OsuTestCase + public class TestCaseSliderInput : TestCasePlayerBase { public override IReadOnlyList RequiredTypes => new[] { diff --git a/osu.Game/Tests/Visual/TestCasePlayer.cs b/osu.Game/Tests/Visual/TestCasePlayer.cs index 60b630513a..34f0bfab8c 100644 --- a/osu.Game/Tests/Visual/TestCasePlayer.cs +++ b/osu.Game/Tests/Visual/TestCasePlayer.cs @@ -16,7 +16,7 @@ using osuTK.Graphics; namespace osu.Game.Tests.Visual { - public abstract class TestCasePlayer : ScreenTestCase + public abstract class TestCasePlayer : TestCasePlayerBase { private readonly Ruleset ruleset; @@ -121,14 +121,6 @@ namespace osu.Game.Tests.Visual return player; } - protected override void Update() - { - base.Update(); - - // note that this will override any mod rate application - Beatmap.Value.Track.Rate = Clock.Rate; - } - protected virtual Player CreatePlayer(Ruleset ruleset) => new Player { AllowPause = false, diff --git a/osu.Game/Tests/Visual/TestCasePlayerBase.cs b/osu.Game/Tests/Visual/TestCasePlayerBase.cs new file mode 100644 index 0000000000..cf5f733d20 --- /dev/null +++ b/osu.Game/Tests/Visual/TestCasePlayerBase.cs @@ -0,0 +1,16 @@ +// Copyright (c) 2007-2019 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +namespace osu.Game.Tests.Visual +{ + public class TestCasePlayerBase : ScreenTestCase + { + protected override void Update() + { + base.Update(); + + // note that this will override any mod rate application + Beatmap.Value.Track.Rate = Clock.Rate; + } + } +}