From 654b47c7ecd67272038672a9f468059f667b0247 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Dec 2021 16:41:29 +0900
Subject: [PATCH] Move "excess mods" test behaviour to local usages

There were only two of these, so it doesn't make sense to add extra
complexity in the test resources class.
---
 osu.Game.Tests/Resources/TestResources.cs            | 12 ++++--------
 .../Ranking/TestSceneContractedPanelMiddleContent.cs |  8 +++++++-
 .../Ranking/TestSceneExpandedPanelMiddleContent.cs   | 10 ++++++++--
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index 7535f6769f..445394fc77 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -147,18 +147,16 @@ namespace osu.Game.Tests.Resources
         /// Create a test score model.
         /// </summary>
         /// <param name="ruleset">The ruleset for which the score was set against.</param>
-        /// <param name="excessMods">Whether to include an excessive number of mods. If <c>false</c>, only two will be added.</param>
         /// <returns></returns>
-        public static ScoreInfo CreateTestScoreInfo(RulesetInfo ruleset = null, bool excessMods = false) =>
-            CreateTestScoreInfo(CreateTestBeatmapSetInfo(1, new[] { ruleset ?? new OsuRuleset().RulesetInfo }).Beatmaps.First(), excessMods);
+        public static ScoreInfo CreateTestScoreInfo(RulesetInfo ruleset = null) =>
+            CreateTestScoreInfo(CreateTestBeatmapSetInfo(1, new[] { ruleset ?? new OsuRuleset().RulesetInfo }).Beatmaps.First());
 
         /// <summary>
         /// Create a test score model.
         /// </summary>
         /// <param name="beatmap">The beatmap for which the score was set against.</param>
-        /// <param name="excessMods">Whether to include an excessive number of mods. If <c>false</c>, only two will be added.</param>
         /// <returns></returns>
-        public static ScoreInfo CreateTestScoreInfo(BeatmapInfo beatmap, bool excessMods = false) => new ScoreInfo
+        public static ScoreInfo CreateTestScoreInfo(BeatmapInfo beatmap) => new ScoreInfo
         {
             User = new APIUser
             {
@@ -169,9 +167,7 @@ namespace osu.Game.Tests.Resources
             BeatmapInfo = beatmap,
             Ruleset = beatmap.Ruleset,
             RulesetID = beatmap.Ruleset.ID ?? 0,
-            Mods = excessMods
-                ? beatmap.Ruleset.CreateInstance().CreateAllMods().ToArray()
-                : new Mod[] { new TestModHardRock(), new TestModDoubleTime() },
+            Mods = new Mod[] { new TestModHardRock(), new TestModDoubleTime() },
             TotalScore = 2845370,
             Accuracy = 0.95,
             MaxCombo = 999,
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
index a84a7b3993..85306b9354 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
@@ -1,6 +1,7 @@
 // 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 System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -29,7 +30,12 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestExcessMods()
         {
-            AddStep("show excess mods score", () => showPanel(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), TestResources.CreateTestScoreInfo(excessMods: true)));
+            AddStep("show excess mods score", () =>
+            {
+                var score = TestResources.CreateTestScoreInfo();
+                score.Mods = score.BeatmapInfo.Ruleset.CreateInstance().CreateAllMods().ToArray();
+                showPanel(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), score);
+            });
         }
 
         private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score)
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 1f34606fcb..2cb4fb6b6b 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -41,9 +41,15 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestExcessMods()
         {
-            var author = new APIUser { Username = "mapper_name" };
+            AddStep("show excess mods score", () =>
+            {
+                var author = new APIUser { Username = "mapper_name" };
 
-            AddStep("show excess mods score", () => showPanel(TestResources.CreateTestScoreInfo(createTestBeatmap(author), true)));
+                var score = TestResources.CreateTestScoreInfo(createTestBeatmap(author));
+                score.Mods = score.BeatmapInfo.Ruleset.CreateInstance().CreateAllMods().ToArray();
+
+                showPanel(score);
+            });
 
             AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Current.Value == "mapper_name"));
         }