sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move setting up the ruleset bindable to top-base test scene

Browse Source
This commit is contained in:
Salman Ahmed
2020-06-10 18:23:31 +03:00
parent efd5e14410
commit 4fb71eeb20
4 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Tests/Visual/EditorTestScene.cs
View File

@ -19,7 +19,6 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Ruleset.Value = CreateEditorRuleset().RulesetInfo;
Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value); Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
} }

2
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(RulesetStore rulesets) private void load(RulesetStore rulesets)
{ {
Ruleset.Value = rulesets.AvailableRulesets.First(); Ruleset.Value = CreateRuleset()?.RulesetInfo ?? rulesets.AvailableRulesets.First();
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)

14
osu.Game/Tests/Visual/PlayerTestScene.cs
View File

@ -24,20 +24,9 @@ namespace osu.Game.Tests.Visual
protected OsuConfigManager LocalConfig; protected OsuConfigManager LocalConfig;
private readonly Ruleset ruleset;
protected PlayerTestScene()
{
ruleset = CreatePlayerRuleset();
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
// There are test scenes using current value of the ruleset bindable
// on their BDLs (example in TestSceneSliderSnaking's BDL)
Ruleset.Value = ruleset.RulesetInfo;
Dependencies.Cache(LocalConfig = new OsuConfigManager(LocalStorage)); Dependencies.Cache(LocalConfig = new OsuConfigManager(LocalStorage));
LocalConfig.GetBindable<double>(OsuSetting.DimLevel).Value = 1.0; LocalConfig.GetBindable<double>(OsuSetting.DimLevel).Value = 1.0;
} }
@ -58,7 +47,7 @@ namespace osu.Game.Tests.Visual
action?.Invoke(); action?.Invoke();
AddStep(ruleset.Description, LoadPlayer); AddStep(CreatePlayerRuleset().Description, LoadPlayer);
AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1); AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
} }
@ -68,6 +57,7 @@ namespace osu.Game.Tests.Visual
protected void LoadPlayer() protected void LoadPlayer()
{ {
var ruleset = Ruleset.Value.CreateInstance();
var beatmap = CreateBeatmap(ruleset.RulesetInfo); var beatmap = CreateBeatmap(ruleset.RulesetInfo);
Beatmap.Value = CreateWorkingBeatmap(beatmap); Beatmap.Value = CreateWorkingBeatmap(beatmap);

7
osu.Game/Tests/Visual/SkinnableTestScene.cs
View File

@ -23,8 +23,6 @@ namespace osu.Game.Tests.Visual
{ {
public abstract class SkinnableTestScene : OsuGridTestScene public abstract class SkinnableTestScene : OsuGridTestScene
{ {
private readonly Ruleset ruleset;
private Skin metricsSkin; private Skin metricsSkin;
private Skin defaultSkin; private Skin defaultSkin;
private Skin specialSkin; private Skin specialSkin;
@ -33,14 +31,11 @@ namespace osu.Game.Tests.Visual
protected SkinnableTestScene() protected SkinnableTestScene()
: base(2, 3) : base(2, 3)
{ {
ruleset = CreateRulesetForSkinProvider();
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, SkinManager skinManager) private void load(AudioManager audio, SkinManager skinManager)
{ {
Ruleset.Value = ruleset.RulesetInfo;
var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly); var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true); metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
@ -110,7 +105,7 @@ namespace osu.Game.Tests.Visual
{ {
new OutlineBox { Alpha = autoSize ? 1 : 0 }, new OutlineBox { Alpha = autoSize ? 1 : 0 },
mainProvider.WithChild( mainProvider.WithChild(
new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(mainProvider, beatmap)) new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
{ {
Child = created, Child = created,
RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None, RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,