From 15e423157b4c49db9764ad99162341f11a37110c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Sep 2020 14:01:29 +0900
Subject: [PATCH] Fix tests that access LocalStorage before BDL

---
 .../TestSceneManageCollectionsDialog.cs       | 27 +++++++------------
 .../SongSelect/TestSceneFilterControl.cs      | 22 +++++----------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 54ab20af7f..55b61bc54a 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -22,44 +22,35 @@ namespace osu.Game.Tests.Visual.Collections
 {
     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 readonly DialogOverlay dialogOverlay;
-        private readonly CollectionManager manager;
+        private DialogOverlay dialogOverlay;
+        private CollectionManager manager;
 
         private RulesetStore rulesets;
         private BeatmapManager beatmapManager;
 
         private ManageCollectionsDialog dialog;
 
-        public TestSceneManageCollectionsDialog()
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
         {
             base.Content.AddRange(new Drawable[]
             {
                 manager = new CollectionManager(LocalStorage),
-                content = new Container { RelativeSizeAxes = Axes.Both },
+                Content,
                 dialogOverlay = new DialogOverlay()
             });
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(GameHost host)
-        {
+            Dependencies.Cache(manager);
+            Dependencies.Cache(dialogOverlay);
+
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
 
             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]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 7cd4791acb..0f03368296 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -23,41 +23,31 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneFilterControl : OsuManualInputManagerTestScene
     {
-        protected override Container<Drawable> Content => content;
-        private readonly Container content;
+        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
-        private readonly CollectionManager collectionManager;
+        private CollectionManager collectionManager;
 
         private RulesetStore rulesets;
         private BeatmapManager beatmapManager;
 
         private FilterControl control;
 
-        public TestSceneFilterControl()
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
         {
             base.Content.AddRange(new Drawable[]
             {
                 collectionManager = new CollectionManager(LocalStorage),
-                content = new Container { RelativeSizeAxes = Axes.Both }
+                Content
             });
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(GameHost host)
-        {
+            Dependencies.Cache(collectionManager);
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
 
             beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.Cache(collectionManager);
-            return dependencies;
-        }
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {