Remove RoomTestScene inheritance from simple test scenes

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs

@@ -2,72 +2,75 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchLeaderboard : RoomTestScene
+    public class TestSceneMatchLeaderboard : OsuTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
-        public TestSceneMatchLeaderboard()
-        {
-            Add(new MatchLeaderboard
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Size = new Vector2(550f, 450f),
-                Scope = MatchLeaderboardScope.Overall,
-            });
-        }
-
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        private void load()
         {
-            var req = new GetRoomScoresRequest();
-            req.Success += v => { };
-            req.Failure += _ => { };
+            ((DummyAPIAccess)API).HandleRequest = r =>
+            {
+                switch (r)
+                {
+                    case GetRoomLeaderboardRequest leaderboardRequest:
+                        leaderboardRequest.TriggerSuccess(new APILeaderboard
+                        {
+                            Leaderboard = new List<APIUserScoreAggregate>
+                            {
+                                new APIUserScoreAggregate
+                                {
+                                    UserID = 2,
+                                    User = new User { Id = 2, Username = "peppy" },
+                                    TotalScore = 995533,
+                                    RoomID = 3,
+                                    CompletedBeatmaps = 1,
+                                    TotalAttempts = 6,
+                                    Accuracy = 0.9851
+                                },
+                                new APIUserScoreAggregate
+                                {
+                                    UserID = 1040328,
+                                    User = new User { Id = 1040328, Username = "smoogipoo" },
+                                    TotalScore = 981100,
+                                    RoomID = 3,
+                                    CompletedBeatmaps = 1,
+                                    TotalAttempts = 9,
+                                    Accuracy = 0.937
+                                }
+                            }
+                        });
+                        return true;
+                }
 
-            api.Queue(req);
+                return false;
+            };
         }
 
         [SetUp]
-        public new void Setup() => Schedule(() =>
+        public void Setup() => Schedule(() =>
         {
-            Room.RoomID.Value = 3;
+            Child = new TestRoomContainer
+            {
+                Room = { RoomID = { Value = 3 } },
+                Child = new MatchLeaderboard
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Size = new Vector2(550f, 450f),
+                    Scope = MatchLeaderboardScope.Overall,
+                }
+            };
         });
-
-        private class GetRoomScoresRequest : APIRequest<List<RoomScore>>
-        {
-            protected override string Target => "rooms/3/leaderboard";
-        }
-
-        private class RoomScore
-        {
-            [JsonProperty("user")]
-            public User User { get; set; }
-
-            [JsonProperty("accuracy")]
-            public double Accuracy { get; set; }
-
-            [JsonProperty("total_score")]
-            public int TotalScore { get; set; }
-
-            [JsonProperty("pp")]
-            public double PP { get; set; }
-
-            [JsonProperty("attempts")]
-            public int TotalAttempts { get; set; }
-
-            [JsonProperty("completed")]
-            public int CompletedAttempts { get; set; }
-        }
     }
 }