From e33c3fcdbf9940e864ebdd53f70f812021b0e76f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 23 Aug 2021 13:53:03 +0300
Subject: [PATCH] Add test coverage for new changes

---
 .../Visual/Online/TestSceneRankingsOverlay.cs | 36 +++++++++----------
 .../TestSceneOverlayRulesetSelector.cs        | 22 ------------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index aff510dd95..342ae76377 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -1,12 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
-using osu.Game.Overlays;
 using NUnit.Framework;
-using osu.Game.Users;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Rankings;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -14,25 +15,20 @@ namespace osu.Game.Tests.Visual.Online
     {
         protected override bool UseOnlineAPI => true;
 
-        [Cached(typeof(RankingsOverlay))]
-        private readonly RankingsOverlay rankingsOverlay;
+        private TestRankingsOverlay rankingsOverlay;
 
         private readonly Bindable<Country> countryBindable = new Bindable<Country>();
         private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>();
 
-        public TestSceneRankingsOverlay()
-        {
-            Add(rankingsOverlay = new TestRankingsOverlay
-            {
-                Country = { BindTarget = countryBindable },
-                Header = { Current = { BindTarget = scope } },
-            });
-        }
+        [SetUp]
+        public void SetUp() => Schedule(loadRankingsOverlay);
 
         [Test]
-        public void TestShow()
+        public void TestParentRulesetCopiedOnInitialShow()
         {
-            AddStep("Show", rankingsOverlay.Show);
+            AddStep("set ruleset", () => Ruleset.Value = new CatchRuleset().RulesetInfo);
+            AddStep("reload rankings overlay", loadRankingsOverlay);
+            AddAssert("catch ruleset selected", () => Ruleset.Value.Equals(new CatchRuleset().RulesetInfo));
         }
 
         [Test]
@@ -50,10 +46,14 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Show US", () => rankingsOverlay.ShowCountry(us_country));
         }
 
-        [Test]
-        public void TestHide()
+        private void loadRankingsOverlay()
         {
-            AddStep("Hide", rankingsOverlay.Hide);
+            Child = rankingsOverlay = new TestRankingsOverlay
+            {
+                Country = { BindTarget = countryBindable },
+                Header = { Current = { BindTarget = scope } },
+                State = { Value = Visibility.Visible },
+            };
         }
 
         private static readonly Country us_country = new Country
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
index de55914fa8..f4fa41a3b7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
@@ -70,27 +70,5 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Select catch", () => ruleset.Value = new CatchRuleset().RulesetInfo);
             AddAssert("Check catch selected", () => selector.Current.Value.Equals(new CatchRuleset().RulesetInfo));
         }
-
-        [Test]
-        public void TestUserPreferredRuleset()
-        {
-            OverlayRulesetSelector localSelector = null;
-
-            AddStep("Set osu! preferred ruleset", () => API.LocalUser.Value.PlayMode = OsuRuleset.SHORT_NAME);
-            AddStep("load overlay ruleset selector", () => Child = new ColourProvidedContainer(OverlayColourScheme.Red, localSelector = new OverlayRulesetSelector()));
-            AddAssert("Check osu! selected", () => localSelector.Current.Value.Equals(new OsuRuleset().RulesetInfo));
-
-            AddStep("Set osu!taiko preferred ruleset", () => API.LocalUser.Value.PlayMode = TaikoRuleset.SHORT_NAME);
-            AddStep("load overlay ruleset selector", () => Child = new ColourProvidedContainer(OverlayColourScheme.Red, localSelector = new OverlayRulesetSelector()));
-            AddAssert("Check osu!taiko selected", () => localSelector.Current.Value.Equals(new TaikoRuleset().RulesetInfo));
-
-            AddStep("Set osu!catch preferred ruleset", () => API.LocalUser.Value.PlayMode = CatchRuleset.SHORT_NAME);
-            AddStep("load overlay ruleset selector", () => Child = new ColourProvidedContainer(OverlayColourScheme.Red, localSelector = new OverlayRulesetSelector()));
-            AddAssert("Check osu!catch selected", () => localSelector.Current.Value.Equals(new CatchRuleset().RulesetInfo));
-
-            AddStep("Set osu!mania preferred ruleset", () => API.LocalUser.Value.PlayMode = ManiaRuleset.SHORT_NAME);
-            AddStep("load overlay ruleset selector", () => Child = new ColourProvidedContainer(OverlayColourScheme.Red, localSelector = new OverlayRulesetSelector()));
-            AddAssert("Check osu!mania selected", () => localSelector.Current.Value.Equals(new ManiaRuleset().RulesetInfo));
-        }
     }
 }