RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-24 15:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply minimal changes to make framework compile

Browse Source
This commit is contained in:
Dean Herbert 2019-05-14 18:39:56 +09:00
parent f2e5beec11
commit 4c221e43a9
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/UserInterface/TestCaseLoadingAnimation.cs
View File

@ -9,7 +9,7 @@ using osuTK.Graphics;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
public class TestCaseLoadingAnimation : GridTestCase public class TestCaseLoadingAnimation : GridTestScene //todo: this should be an OsuTestCase
{ {
public TestCaseLoadingAnimation() public TestCaseLoadingAnimation()
: base(2, 2) : base(2, 2)

3
osu.Game.Tests/Visual/UserInterface/TestCaseOsuIcon.cs
View File

@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Testing;
using osu.Game.Graphics; using osu.Game.Graphics;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
@ -17,7 +16,7 @@ using osuTK.Graphics;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
[TestFixture] [TestFixture]
public class TestCaseOsuIcon : TestCase public class TestCaseOsuIcon : OsuTestCase
{ {
public TestCaseOsuIcon() public TestCaseOsuIcon()
{ {

12
osu.Game/Tests/Visual/OsuTestCase.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Rulesets.Mods;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public abstract class OsuTestCase : TestCase public abstract class OsuTestCase : TestScene
{ {
[Cached(typeof(Bindable<WorkingBeatmap>))] [Cached(typeof(Bindable<WorkingBeatmap>))]
[Cached(typeof(IBindable<WorkingBeatmap>))] [Cached(typeof(IBindable<WorkingBeatmap>))]
@ -76,21 +76,21 @@ namespace osu.Game.Tests.Visual
} }
} }
protected override ITestCaseTestRunner CreateRunner() => new OsuTestCaseTestRunner(); protected override ITestSceneTestRunner CreateRunner() => new OsuTestCaseTestRunner();
public class OsuTestCaseTestRunner : OsuGameBase, ITestCaseTestRunner public class OsuTestCaseTestRunner : OsuGameBase, ITestSceneTestRunner
{ {
private TestCaseTestRunner.TestRunner runner; private TestSceneTestRunner.TestRunner runner;
protected override void LoadAsyncComplete() protected override void LoadAsyncComplete()
{ {
// this has to be run here rather than LoadComplete because // this has to be run here rather than LoadComplete because
// TestCase.cs is checking the IsLoaded state (on another thread) and expects // TestCase.cs is checking the IsLoaded state (on another thread) and expects
// the runner to be loaded at that point. // the runner to be loaded at that point.
Add(runner = new TestCaseTestRunner.TestRunner()); Add(runner = new TestSceneTestRunner.TestRunner());
} }
public void RunTestBlocking(TestCase test) => runner.RunTestBlocking(test); public void RunTestBlocking(TestScene test) => runner.RunTestBlocking(test);
} }
private class OsuTestBeatmap : BindableBeatmap private class OsuTestBeatmap : BindableBeatmap