From 84002aefae779efefc9602215716e43542a9d0ac Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jul 2022 20:18:50 +0300
Subject: [PATCH] Update file/directory selector tests to use
 `ThemeComparisonTestScene`

---
 .../Settings/TestSceneDirectorySelector.cs    | 11 +++---
 .../Visual/Settings/TestSceneFileSelector.cs  | 34 +++++++++++++++----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
index 4f05194e08..16110e5595 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
@@ -3,18 +3,17 @@
 
 #nullable disable
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Tests.Visual.UserInterface;
 
 namespace osu.Game.Tests.Visual.Settings
 {
-    public class TestSceneDirectorySelector : OsuTestScene
+    public class TestSceneDirectorySelector : ThemeComparisonTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override Drawable CreateContent() => new OsuDirectorySelector
         {
-            Add(new OsuDirectorySelector { RelativeSizeAxes = Axes.Both });
-        }
+            RelativeSizeAxes = Axes.Both
+        };
     }
 }
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs b/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
index 6f25012bfa..97bf0d212a 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
@@ -4,23 +4,43 @@
 #nullable disable
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Tests.Visual.UserInterface;
 
 namespace osu.Game.Tests.Visual.Settings
 {
-    public class TestSceneFileSelector : OsuTestScene
+    public class TestSceneFileSelector : ThemeComparisonTestScene
     {
-        [Test]
-        public void TestAllFiles()
-        {
-            AddStep("create", () => Child = new OsuFileSelector { RelativeSizeAxes = Axes.Both });
-        }
+        [Resolved]
+        private OsuColour colours { get; set; }
 
         [Test]
         public void TestJpgFilesOnly()
         {
-            AddStep("create", () => Child = new OsuFileSelector(validFileExtensions: new[] { ".jpg" }) { RelativeSizeAxes = Axes.Both });
+            AddStep("create", () =>
+            {
+                Cell(0, 0).Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colours.GreySeaFoam
+                    },
+                    new OsuFileSelector(validFileExtensions: new[] { ".jpg" })
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                };
+            });
         }
+
+        protected override Drawable CreateContent() => new OsuFileSelector
+        {
+            RelativeSizeAxes = Axes.Both,
+        };
     }
 }