sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-04 21:27:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests that access LocalStorage before BDL

Browse Source
This commit is contained in:
Dean Herbert 2020-09-15 14:01:29 +09:00
parent 75d0797cf8
commit 15e423157b
2 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
View File

@ -22,44 +22,35 @@ namespace osu.Game.Tests.Visual.Collections
{ {
public class TestSceneManageCollectionsDialog : OsuManualInputManagerTestScene public class TestSceneManageCollectionsDialog : OsuManualInputManagerTestScene
{ {
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
private readonly Container content; private DialogOverlay dialogOverlay;
private readonly DialogOverlay dialogOverlay; private CollectionManager manager;
private readonly CollectionManager manager;
private RulesetStore rulesets; private RulesetStore rulesets;
private BeatmapManager beatmapManager; private BeatmapManager beatmapManager;
private ManageCollectionsDialog dialog; private ManageCollectionsDialog dialog;
public TestSceneManageCollectionsDialog() [BackgroundDependencyLoader]
private void load(GameHost host)
{ {
base.Content.AddRange(new Drawable[] base.Content.AddRange(new Drawable[]
{ {
manager = new CollectionManager(LocalStorage), manager = new CollectionManager(LocalStorage),
content = new Container { RelativeSizeAxes = Axes.Both }, Content,
dialogOverlay = new DialogOverlay() dialogOverlay = new DialogOverlay()
}); });
}
[BackgroundDependencyLoader] Dependencies.Cache(manager);
private void load(GameHost host) Dependencies.Cache(dialogOverlay);
{
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default)); Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait(); beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
} }
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
dependencies.Cache(manager);
dependencies.Cache(dialogOverlay);
return dependencies;
}
[SetUp] [SetUp]
public void SetUp() => Schedule(() => public void SetUp() => Schedule(() =>
{ {

22
osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
View File

@ -23,41 +23,31 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
public class TestSceneFilterControl : OsuManualInputManagerTestScene public class TestSceneFilterControl : OsuManualInputManagerTestScene
{ {
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
private readonly Container content;
private readonly CollectionManager collectionManager; private CollectionManager collectionManager;
private RulesetStore rulesets; private RulesetStore rulesets;
private BeatmapManager beatmapManager; private BeatmapManager beatmapManager;
private FilterControl control; private FilterControl control;
public TestSceneFilterControl() [BackgroundDependencyLoader]
private void load(GameHost host)
{ {
base.Content.AddRange(new Drawable[] base.Content.AddRange(new Drawable[]
{ {
collectionManager = new CollectionManager(LocalStorage), collectionManager = new CollectionManager(LocalStorage),
content = new Container { RelativeSizeAxes = Axes.Both } Content
}); });
}
[BackgroundDependencyLoader] Dependencies.Cache(collectionManager);
private void load(GameHost host)
{
Dependencies.Cache(rulesets = new RulesetStore(ContextFactory)); Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default)); Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait(); beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
} }
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
dependencies.Cache(collectionManager);
return dependencies;
}
[SetUp] [SetUp]
public void SetUp() => Schedule(() => public void SetUp() => Schedule(() =>
{ {