Revert usage of OsuGameTestScene for TestSceneOsuGame

Turns out we likely don't want this, as it means the testing user (using
a visual test browser) will not have access to their beatmaps. Can
revisit at a future date if the temporary files are still an issue.
This commit is contained in:
Dean Herbert 2021-08-20 19:45:52 +09:00
parent 2825e15fd4
commit b9ff94485d
5 changed files with 123 additions and 6 deletions

View File

@ -1,11 +1,32 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Platform;
using osu.Game.Tests.Visual; using osu.Game.Tests.Visual;
using osuTK.Graphics;
namespace osu.Game.Rulesets.EmptyFreeform.Tests namespace osu.Game.Rulesets.EmptyFreeform.Tests
{ {
public class TestSceneOsuGame : OsuGameTestScene public class TestSceneOsuGame : OsuTestScene
{ {
[BackgroundDependencyLoader]
private void load(GameHost host, OsuGameBase gameBase)
{
OsuGame game = new OsuGame();
game.SetHost(host);
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
game
};
}
} }
} }

View File

@ -1,11 +1,32 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Platform;
using osu.Game.Tests.Visual; using osu.Game.Tests.Visual;
using osuTK.Graphics;
namespace osu.Game.Rulesets.Pippidon.Tests namespace osu.Game.Rulesets.Pippidon.Tests
{ {
public class TestSceneOsuGame : OsuGameTestScene public class TestSceneOsuGame : OsuTestScene
{ {
[BackgroundDependencyLoader]
private void load(GameHost host, OsuGameBase gameBase)
{
OsuGame game = new OsuGame();
game.SetHost(host);
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
game
};
}
} }
} }

View File

@ -1,11 +1,32 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Platform;
using osu.Game.Tests.Visual; using osu.Game.Tests.Visual;
using osuTK.Graphics;
namespace osu.Game.Rulesets.EmptyScrolling.Tests namespace osu.Game.Rulesets.EmptyScrolling.Tests
{ {
public class TestSceneOsuGame : OsuGameTestScene public class TestSceneOsuGame : OsuTestScene
{ {
[BackgroundDependencyLoader]
private void load(GameHost host, OsuGameBase gameBase)
{
OsuGame game = new OsuGame();
game.SetHost(host);
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
game
};
}
} }
} }

View File

@ -1,11 +1,32 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Platform;
using osu.Game.Tests.Visual; using osu.Game.Tests.Visual;
using osuTK.Graphics;
namespace osu.Game.Rulesets.Pippidon.Tests namespace osu.Game.Rulesets.Pippidon.Tests
{ {
public class TestSceneOsuGame : OsuGameTestScene public class TestSceneOsuGame : OsuTestScene
{ {
[BackgroundDependencyLoader]
private void load(GameHost host, OsuGameBase gameBase)
{
OsuGame game = new OsuGame();
game.SetHost(host);
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
game
};
}
} }
} }

View File

@ -6,7 +6,11 @@ using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Platform;
using osu.Framework.Testing;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
@ -24,11 +28,12 @@ using osu.Game.Scoring;
using osu.Game.Screens.Menu; using osu.Game.Screens.Menu;
using osu.Game.Skinning; using osu.Game.Skinning;
using osu.Game.Utils; using osu.Game.Utils;
using osuTK.Graphics;
namespace osu.Game.Tests.Visual.Navigation namespace osu.Game.Tests.Visual.Navigation
{ {
[TestFixture] [TestFixture]
public class TestSceneOsuGame : OsuGameTestScene public class TestSceneOsuGame : OsuTestScene
{ {
private IReadOnlyList<Type> requiredGameDependencies => new[] private IReadOnlyList<Type> requiredGameDependencies => new[]
{ {
@ -79,9 +84,37 @@ namespace osu.Game.Tests.Visual.Navigation
typeof(PreviewTrackManager), typeof(PreviewTrackManager),
}; };
private OsuGame game;
[Resolved] [Resolved]
private OsuGameBase gameBase { get; set; } private OsuGameBase gameBase { get; set; }
[Resolved]
private GameHost host { get; set; }
[SetUpSteps]
public void SetUpSteps()
{
AddStep("create game", () =>
{
game = new OsuGame();
game.SetHost(host);
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
},
game
};
});
AddUntilStep("wait for load", () => game.IsLoaded);
}
[Test] [Test]
public void TestNullRulesetHandled() public void TestNullRulesetHandled()
{ {
@ -117,7 +150,7 @@ namespace osu.Game.Tests.Visual.Navigation
{ {
foreach (var type in requiredGameDependencies) foreach (var type in requiredGameDependencies)
{ {
if (Game.Dependencies.Get(type) == null) if (game.Dependencies.Get(type) == null)
throw new InvalidOperationException($"{type} has not been cached"); throw new InvalidOperationException($"{type} has not been cached");
} }