Set new room for each test iteration

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

@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Users;
@@ -14,10 +13,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneLoungeRoomInfo : MultiplayerTestScene
     {
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             Child = new RoomInfo
             {
                 Anchor = Anchor.Centre,

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

@@ -24,10 +24,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private RulesetStore rulesetStore { get; set; }
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             Child = new MatchBeatmapDetailArea
             {
                 Anchor = Anchor.Centre,

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.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 NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
@@ -14,7 +15,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         public TestSceneMatchHeader()
         {
-            Room = new Room();
+            Child = new Header();
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
             Room.Playlist.Add(new PlaylistItem
             {
                 Beatmap =
@@ -41,8 +47,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             Room.Name.Value = "A very awesome room";
             Room.Host.Value = new User { Id = 2, Username = "peppy" };
-
+        });
-            Child = new Header();
-        }
     }
 }

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

@@ -3,10 +3,10 @@
 
 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.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
 using osuTK;
@@ -19,8 +19,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMatchLeaderboard()
         {
-            Room = new Room { RoomID = { Value = 3 } };
-
             Add(new MatchLeaderboard
             {
                 Origin = Anchor.Centre,
@@ -40,6 +38,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             api.Queue(req);
         }
 
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 3;
+        });
+
         private class GetRoomScoresRequest : APIRequest<List<RoomScore>>
         {
             protected override string Target => "rooms/3/leaderboard";

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

@@ -23,10 +23,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private TestRoomSettings settings;
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             settings = new TestRoomSettings
             {
                 RelativeSizeAxes = Axes.Both,

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

@@ -14,7 +14,6 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -94,12 +93,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
         }
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room();
-        });
-
         [Test]
         public void TestItemAddedIfEmptyOnStart()
         {

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

@@ -45,12 +45,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait();
         }
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room();
-        });
-
         [SetUpSteps]
         public void SetupSteps()
         {

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

@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
@@ -14,9 +13,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         protected override bool UseOnlineAPI => true;
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room { RoomID = { Value = 7 } };
+            Room.RoomID.Value = 7;
         });
 
         [Test]

osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
@@ -16,7 +17,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneOverlinedPlaylist()
         {
-            Room = new Room { RoomID = { Value = 7 } };
+            Add(new DrawableRoomPlaylist(false, false)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500),
+            });
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 7;
 
             for (int i = 0; i < 10; i++)
             {
@@ -27,13 +39,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     Ruleset = { Value = new OsuRuleset().RulesetInfo }
                 });
             }
-
-            Add(new DrawableRoomPlaylist(false, false)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500),
         });
     }
 }
-}

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

@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -12,15 +11,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room { RoomID = { Value = 7 } };
-        });
-
         public TestSceneParticipantsList()
         {
             Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
         }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 7;
+        });
     }
 }

osu.Game/Tests/Visual/MultiplayerTestScene.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Multiplayer;
@@ -10,13 +11,9 @@ namespace osu.Game.Tests.Visual
     public abstract class MultiplayerTestScene : ScreenTestScene
     {
         [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
+        private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());
 
-        protected Room Room
+        protected Room Room => currentRoom.Value;
-        {
-            get => currentRoom.Value;
-            set => currentRoom.Value = value;
-        }
 
         private CachedModelDependencyContainer<Room> dependencies;
 
@@ -26,5 +23,11 @@ namespace osu.Game.Tests.Visual
             dependencies.Model.BindTo(currentRoom);
             return dependencies;
         }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room.CopyFrom(new Room());
+        });
     }
 }