diff --git a/osu.Game/Tests/Visual/AllPlayersTestScene.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
similarity index 59%
rename from osu.Game/Tests/Visual/AllPlayersTestScene.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
index dd65c8c382..83a7b896d2 100644
--- a/osu.Game/Tests/Visual/AllPlayersTestScene.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
@@ -2,49 +2,66 @@
// See the LICENCE file in the repository root for full licence text.
using System.Linq;
+using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Screens;
using osu.Game.Configuration;
using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
using osu.Game.Screens.Play;
-namespace osu.Game.Tests.Visual
+namespace osu.Game.Tests.Visual.Gameplay
{
///
/// A base class which runs test for all available rulesets.
/// Steps to be run for each ruleset should be added via .
///
- public abstract class AllPlayersTestScene : RateAdjustedBeatmapTestScene
+ public abstract class TestSceneAllRulesetPlayers : RateAdjustedBeatmapTestScene
{
protected Player Player;
[BackgroundDependencyLoader]
private void load(RulesetStore rulesets)
{
- foreach (var r in rulesets.AvailableRulesets)
- {
- Player p = null;
- AddStep(r.Name, () => p = loadPlayerFor(r));
- AddUntilStep("player loaded", () =>
- {
- if (p?.IsLoaded == true)
- {
- p = null;
- return true;
- }
-
- return false;
- });
-
- AddCheckSteps();
- }
-
OsuConfigManager manager;
Dependencies.Cache(manager = new OsuConfigManager(LocalStorage));
manager.GetBindable(OsuSetting.DimLevel).Value = 1.0;
}
+ [Test]
+ public void TestOsu() => runForRuleset(new OsuRuleset().RulesetInfo);
+
+ [Test]
+ public void TestTaiko() => runForRuleset(new TaikoRuleset().RulesetInfo);
+
+ [Test]
+ public void TestCatch() => runForRuleset(new CatchRuleset().RulesetInfo);
+
+ [Test]
+ public void TestMania() => runForRuleset(new ManiaRuleset().RulesetInfo);
+
+ private void runForRuleset(RulesetInfo ruleset)
+ {
+ Player p = null;
+ AddStep($"load {ruleset.Name} player", () => p = loadPlayerFor(ruleset));
+ AddUntilStep("player loaded", () =>
+ {
+ if (p?.IsLoaded == true)
+ {
+ p = null;
+ return true;
+ }
+
+ return false;
+ });
+
+ AddCheckSteps();
+ }
+
protected abstract void AddCheckSteps();
private Player loadPlayerFor(RulesetInfo rulesetInfo)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 069b965d9b..4daab8d137 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -12,7 +12,7 @@
namespace osu.Game.Tests.Visual.Gameplay
{
[Description("Player instantiated with an autoplay mod.")]
- public class TestSceneAutoplay : AllPlayersTestScene
+ public class TestSceneAutoplay : TestSceneAllRulesetPlayers
{
private ClockBackedTestWorkingBeatmap.TrackVirtualManual track;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
index 81050b1637..de257c9e53 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
@@ -10,7 +10,7 @@
namespace osu.Game.Tests.Visual.Gameplay
{
- public class TestSceneFailAnimation : AllPlayersTestScene
+ public class TestSceneFailAnimation : TestSceneAllRulesetPlayers
{
protected override Player CreatePlayer(Ruleset ruleset)
{
@@ -20,7 +20,7 @@ protected override Player CreatePlayer(Ruleset ruleset)
public override IReadOnlyList RequiredTypes => new[]
{
- typeof(AllPlayersTestScene),
+ typeof(TestSceneAllRulesetPlayers),
typeof(TestPlayer),
typeof(Player),
};
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
index 2045072c79..d80efb2c6e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
@@ -10,7 +10,7 @@
namespace osu.Game.Tests.Visual.Gameplay
{
- public class TestSceneFailJudgement : AllPlayersTestScene
+ public class TestSceneFailJudgement : TestSceneAllRulesetPlayers
{
protected override Player CreatePlayer(Ruleset ruleset)
{
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1a83e35e4f..ad5bab4681 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -36,6 +36,7 @@ public TestScenePause()
public override void SetUpSteps()
{
base.SetUpSteps();
+
AddStep("resume player", () => Player.GameplayClockContainer.Start());
confirmClockRunning(true);
}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs
index 4d701f56a9..8f767659c6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs
@@ -10,7 +10,7 @@
namespace osu.Game.Tests.Visual.Gameplay
{
- public class TestScenePlayerReferenceLeaking : AllPlayersTestScene
+ public class TestScenePlayerReferenceLeaking : TestSceneAllRulesetPlayers
{
private readonly WeakList workingWeakReferences = new WeakList();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index 36335bc54a..e82722e7a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -13,7 +13,7 @@
namespace osu.Game.Tests.Visual.Gameplay
{
[Description("Player instantiated with a replay.")]
- public class TestSceneReplay : AllPlayersTestScene
+ public class TestSceneReplay : TestSceneAllRulesetPlayers
{
protected override Player CreatePlayer(Ruleset ruleset)
{
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index fc06780431..189420dcef 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -79,12 +79,17 @@ private void load(GameHost host, AudioManager audio)
private OsuConfigManager config;
- [SetUp]
- public virtual void SetUp() => Schedule(() =>
+ [SetUpSteps]
+ public override void SetUpSteps()
{
- Ruleset.Value = new OsuRuleset().RulesetInfo;
- manager?.Delete(manager.GetAllUsableBeatmapSets());
- });
+ base.SetUpSteps();
+
+ AddStep("delete all beatmaps", () =>
+ {
+ Ruleset.Value = new OsuRuleset().RulesetInfo;
+ manager?.Delete(manager.GetAllUsableBeatmapSets());
+ });
+ }
[Test]
public void TestSingleFilterOnEnter()
@@ -120,9 +125,6 @@ public void TestChangeBeatmapBeforeEnter()
AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
AddAssert("ensure selection changed", () => selected != Beatmap.Value);
-
- AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
- AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
}
[Test]
@@ -148,9 +150,6 @@ public void TestChangeBeatmapAfterEnter()
AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
-
- AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
- AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
}
[Test]
@@ -180,9 +179,6 @@ public void TestChangeBeatmapViaMouseBeforeEnter()
AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
AddAssert("ensure selection changed", () => selected != Beatmap.Value);
-
- AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
- AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
}
[Test]
@@ -213,9 +209,6 @@ public void TestChangeBeatmapViaMouseAfterEnter()
AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
-
- AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
- AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
}
[Test]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7228e22382..8a288f8299 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -39,6 +39,8 @@ public class Player : ScreenWithBeatmapBackground
public override float BackgroundParallaxAmount => 0.1f;
+ public override bool DisallowExternalBeatmapRulesetChanges => true;
+
public override bool HideOverlaysOnEnter => true;
public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 3ed65bee61..7c5ba7d30f 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -33,8 +33,10 @@ private void load()
}
[SetUpSteps]
- public virtual void SetUpSteps()
+ public override void SetUpSteps()
{
+ base.SetUpSteps();
+
AddStep(ruleset.RulesetInfo.Name, loadPlayer);
AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
}
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index 707aa61283..e501aa33b3 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -3,6 +3,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
using osu.Game.Screens;
namespace osu.Game.Tests.Visual
@@ -27,11 +28,24 @@ protected ScreenTestScene()
});
}
- protected void LoadScreen(OsuScreen screen)
+ protected void LoadScreen(OsuScreen screen) => Stack.Push(screen);
+
+ [SetUpSteps]
+ public virtual void SetUpSteps() => addExitAllScreensStep();
+
+ // pending framework update.
+ //[TearDownSteps]
+ //public void TearDownSteps() => addExitAllScreensStep();
+
+ private void addExitAllScreensStep()
{
- if (Stack.CurrentScreen != null)
+ AddUntilStep("exit all screens", () =>
+ {
+ if (Stack.CurrentScreen == null) return true;
+
Stack.Exit();
- Stack.Push(screen);
+ return false;
+ });
}
}
}