Another pass of code quality things

aaaaaaaaaaaaaaa

Author: peppy

osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapRankingsWedge.cs

@@ -27,6 +27,7 @@
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual.SongSelect;
 using osu.Game.Users;
 using osuTK.Input;
 
@@ -97,8 +98,8 @@ public void TestGlobalScoresDisplay()
         {
             setScope(BeatmapLeaderboardScope.Global);
 
-            AddStep(@"New Scores", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo())));
-            AddStep(@"New Scores with teams", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo()).Select(s =>
+            AddStep(@"New Scores", () => leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo())));
+            AddStep(@"New Scores with teams", () => leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo()).Select(s =>
             {
                 s.User.Team = new APITeam();
                 return s;
@@ -134,7 +135,7 @@ public void TestPlaceholderStates()
         [Test]
         public void TestUseTheseModsDoesNotCopySystemMods()
         {
-            AddStep(@"set scores", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
+            AddStep(@"set scores", () => leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo()), new ScoreInfo
             {
                 Position = 999,
                 Rank = ScoreRank.XH,
@@ -261,7 +262,7 @@ public void TestLocalScoresDisplayOnBeatmapEdit()
 
         private void showPersonalBestWithNullPosition()
         {
-            leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
+            leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo()), new ScoreInfo
             {
                 Rank = ScoreRank.XH,
                 Accuracy = 1,
@@ -280,7 +281,7 @@ private void showPersonalBestWithNullPosition()
 
         private void showPersonalBest()
         {
-            leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
+            leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo()), new ScoreInfo
             {
                 Position = 999,
                 Rank = ScoreRank.XH,
@@ -307,7 +308,7 @@ private void importMoreScores(Func<BeatmapInfo> beatmapInfo)
         {
             AddStep(@"Import new scores", () =>
             {
-                foreach (var score in generateSampleScores(beatmapInfo()))
+                foreach (var score in TestSceneBeatmapLeaderboard.GenerateSampleScores(beatmapInfo()))
                     scoreManager.Import(score);
             });
         }
@@ -323,230 +324,6 @@ private void checkDisplayedCount(int expected) =>
         private void checkStoredCount(int expected) =>
             AddUntilStep($"Total scores stored is {expected}", () => Realm.Run(r => r.All<ScoreInfo>().Count(s => !s.DeletePending)), () => Is.EqualTo(expected));
 
-        private static int scoreID = 1001;
-
-        private static ScoreInfo[] generateSampleScores(BeatmapInfo beatmapInfo)
-        {
-            return new[]
-            {
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.XH,
-                    OnlineID = scoreID++,
-                    Accuracy = 1,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now,
-                    Mods = new Mod[]
-                    {
-                        new OsuModHidden(),
-                        new OsuModHardRock(),
-                        new OsuModFlashlight
-                        {
-                            FollowDelay = { Value = 200 },
-                            SizeMultiplier = { Value = 5 },
-                        },
-                        new OsuModDifficultyAdjust
-                        {
-                            CircleSize = { Value = 11 },
-                            ApproachRate = { Value = 10 },
-                            OverallDifficulty = { Value = 10 },
-                            DrainRate = { Value = 10 },
-                            ExtendedLimits = { Value = true }
-                        }
-                    },
-                    Ruleset = new OsuRuleset().RulesetInfo,
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    User = new APIUser
-                    {
-                        Id = 6602580,
-                        Username = @"waaiiru",
-                        CountryCode = CountryCode.ES,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.X,
-                    OnlineID = scoreID++,
-                    Accuracy = 1,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddSeconds(-30),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-                    User = new APIUser
-                    {
-                        Id = 4608074,
-                        Username = @"Skycries",
-                        CountryCode = CountryCode.BR,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.SH,
-                    OnlineID = scoreID++,
-                    Accuracy = 1,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddSeconds(-70),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-
-                    User = new APIUser
-                    {
-                        Id = 1014222,
-                        Username = @"eLy",
-                        CountryCode = CountryCode.JP,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.S,
-                    OnlineID = scoreID++,
-                    Accuracy = 1,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddMinutes(-40),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-
-                    User = new APIUser
-                    {
-                        Id = 1541390,
-                        Username = @"Toukai",
-                        CountryCode = CountryCode.CA,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.A,
-                    OnlineID = scoreID++,
-                    Accuracy = 1,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddHours(-2),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-
-                    User = new APIUser
-                    {
-                        Id = 2243452,
-                        Username = @"Satoruu",
-                        CountryCode = CountryCode.VE,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.B,
-                    OnlineID = scoreID++,
-                    Accuracy = 0.9826,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddHours(-25),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-
-                    User = new APIUser
-                    {
-                        Id = 2705430,
-                        Username = @"Mooha",
-                        CountryCode = CountryCode.FR,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.C,
-                    OnlineID = scoreID++,
-                    Accuracy = 0.9654,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddHours(-50),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-
-                    User = new APIUser
-                    {
-                        Id = 7151382,
-                        Username = @"Mayuri Hana",
-                        CountryCode = CountryCode.TH,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.D,
-                    OnlineID = scoreID++,
-                    Accuracy = 0.6025,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddHours(-72),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-
-                    User = new APIUser
-                    {
-                        Id = 2051389,
-                        Username = @"FunOrange",
-                        CountryCode = CountryCode.CA,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.D,
-                    OnlineID = scoreID++,
-                    Accuracy = 0.5140,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddMonths(-10),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-
-                    User = new APIUser
-                    {
-                        Id = 6169483,
-                        Username = @"-Hebel-",
-                        CountryCode = CountryCode.MX,
-                    },
-                },
-                new ScoreInfo
-                {
-                    Rank = ScoreRank.D,
-                    OnlineID = scoreID++,
-                    Accuracy = 0.4222,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Date = DateTime.Now.AddYears(-2),
-                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
-                    BeatmapInfo = beatmapInfo,
-                    BeatmapHash = beatmapInfo.Hash,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-
-                    User = new APIUser
-                    {
-                        Id = 6702666,
-                        Username = @"prhtnsm",
-                        CountryCode = CountryCode.DE,
-                    },
-                },
-            };
-        }
-
         private partial class TestBeatmapLeaderboardWedge : BeatmapLeaderboardWedge
         {
             public new void SetState(LeaderboardState state) => base.SetState(state);