From 32fd713a9d4c4d40a5066e155efc463c207e3701 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 17:57:25 +0900
Subject: [PATCH 1/2] Use test beatmap instead of beatmap manager

---
 .../Multiplayer/TestSceneDrawableRoomPlaylist.cs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index c93d59acdf..4ba802730f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -9,14 +9,15 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Input;
 
@@ -218,22 +219,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Size = new Vector2(500, 300)
             };
 
-            var beatmapSets = beatmapManager.GetAllUsableBeatmapSets();
-            var rulesets = rulesetStore.AvailableRulesets.ToList();
-
             for (int i = 0; i < 20; i++)
             {
-                var set = beatmapSets[RNG.Next(0, beatmapSets.Count)];
-                var beatmap = set.Beatmaps[RNG.Next(0, set.Beatmaps.Count)];
-
-                beatmap.BeatmapSet = set;
-                beatmap.Metadata = set.Metadata;
-
                 playlist.Items.Add(new PlaylistItem
                 {
                     ID = i,
-                    Beatmap = { Value = beatmap },
-                    Ruleset = { Value = rulesets[RNG.Next(0, rulesets.Count)] },
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
                     RequiredMods =
                     {
                         new OsuModHardRock(),

From fbc5ffbadbd27e5856b8c94c6d046a3513b5df16 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 17:59:47 +0900
Subject: [PATCH 2/2] Remove now unused members

---
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 4ba802730f..d2d02412cd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -5,15 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi;
@@ -31,12 +28,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             typeof(DrawableRoomPlaylistItem)
         };
 
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
-        [Resolved]
-        private RulesetStore rulesetStore { get; set; }
-
         private DrawableRoomPlaylist playlist;
 
         [Test]