Remove CachedModelDependencyContainer and OnlinePlayComposite from multiplayer

osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs

@@ -75,7 +75,7 @@ public void TestPlayingUsersUpdatedOnJoin()
                 var newRoom = new Room();
                 newRoom.CopyFrom(SelectedRoom.Value);
 
-                newRoom.RoomID.Value = null;
+                newRoom.RoomID = null;
                 MultiplayerClient.RoomSetupAction = room =>
                 {
                     room.State = MultiplayerRoomState.Playing;

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs

@@ -39,18 +39,18 @@ public void TestDailyChallenge()
         {
             var room = new Room
             {
-                RoomID = { Value = 1234 },
-                Name = { Value = "Daily Challenge: June 4, 2024" },
+                RoomID = 1234,
+                Name = "Daily Challenge: June 4, 2024",
                 Playlist =
-                {
+                [
                     new PlaylistItem(TestResources.CreateTestBeatmapSetInfo().Beatmaps.First())
                     {
                         RequiredMods = [new APIMod(new OsuModTraceable())],
                         AllowedMods = [new APIMod(new OsuModDoubleTime())]
                     }
-                },
-                EndDate = { Value = DateTimeOffset.Now.AddHours(12) },
-                Category = { Value = RoomCategory.DailyChallenge }
+                ],
+                EndDate = DateTimeOffset.Now.AddHours(12),
+                Category = RoomCategory.DailyChallenge
             };
 
             AddStep("add room", () => API.Perform(new CreateRoomRequest(room)));
@@ -62,18 +62,18 @@ public void TestNotifications()
         {
             var room = new Room
             {
-                RoomID = { Value = 1234 },
-                Name = { Value = "Daily Challenge: June 4, 2024" },
+                RoomID = 1234,
+                Name = "Daily Challenge: June 4, 2024",
                 Playlist =
-                {
+                [
                     new PlaylistItem(TestResources.CreateTestBeatmapSetInfo().Beatmaps.First())
                     {
                         RequiredMods = [new APIMod(new OsuModTraceable())],
                         AllowedMods = [new APIMod(new OsuModDoubleTime())]
                     }
-                },
-                EndDate = { Value = DateTimeOffset.Now.AddHours(12) },
-                Category = { Value = RoomCategory.DailyChallenge }
+                ],
+                EndDate = DateTimeOffset.Now.AddHours(12),
+                Category = RoomCategory.DailyChallenge
             };
 
             AddStep("add room", () => API.Perform(new CreateRoomRequest(room)));
@@ -91,18 +91,18 @@ public void TestConclusionNotificationDoesNotFireOnDisconnect()
         {
             var room = new Room
             {
-                RoomID = { Value = 1234 },
-                Name = { Value = "Daily Challenge: June 4, 2024" },
+                RoomID = 1234,
+                Name = "Daily Challenge: June 4, 2024",
                 Playlist =
-                {
+                [
                     new PlaylistItem(TestResources.CreateTestBeatmapSetInfo().Beatmaps.First())
                     {
                         RequiredMods = [new APIMod(new OsuModTraceable())],
                         AllowedMods = [new APIMod(new OsuModDoubleTime())]
                     }
-                },
-                EndDate = { Value = DateTimeOffset.Now.AddHours(12) },
-                Category = { Value = RoomCategory.DailyChallenge }
+                ],
+                EndDate = DateTimeOffset.Now.AddHours(12),
+                Category = RoomCategory.DailyChallenge
             };
 
             AddStep("add room", () => API.Perform(new CreateRoomRequest(room)));

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeCarousel.cs

@@ -26,11 +26,6 @@ public partial class TestSceneDailyChallengeCarousel : OsuTestScene
 
         private readonly Bindable<Room> room = new Bindable<Room>(new Room());
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent))
-        {
-            Model = { BindTarget = room }
-        };
-
         [Test]
         public void TestBasicAppearance()
         {
@@ -98,7 +93,7 @@ public void TestIntegration()
                                 Origin = Anchor.Centre,
                                 Children = new Drawable[]
                                 {
-                                    new DailyChallengeTimeRemainingRing(),
+                                    new DailyChallengeTimeRemainingRing(room.Value),
                                     breakdown = new DailyChallengeScoreBreakdown(),
                                 }
                             }
@@ -125,8 +120,8 @@ public void TestIntegration()
             AddSliderStep("update time remaining", 0f, 1f, 0f, progress =>
             {
                 var startedTimeAgo = TimeSpan.FromHours(24) * progress;
-                room.Value.StartDate.Value = DateTimeOffset.Now - startedTimeAgo;
-                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
+                room.Value.StartDate = DateTimeOffset.Now - startedTimeAgo;
+                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
             });
             AddStep("add normal score", () =>
             {

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeIntro.cs

@@ -68,19 +68,19 @@ private void startChallenge(int roomId)
             {
                 API.Perform(new CreateRoomRequest(room = new Room
                 {
-                    RoomID = { Value = roomId },
-                    Name = { Value = "Daily Challenge: June 4, 2024" },
+                    RoomID = roomId,
+                    Name = "Daily Challenge: June 4, 2024",
                     Playlist =
-                    {
+                    [
                         new PlaylistItem(CreateAPIBeatmap(new OsuRuleset().RulesetInfo))
                         {
                             RequiredMods = [new APIMod(new OsuModTraceable())],
                             AllowedMods = [new APIMod(new OsuModDoubleTime())]
                         }
-                    },
-                    StartDate = { Value = DateTimeOffset.Now },
-                    EndDate = { Value = DateTimeOffset.Now.AddHours(24) },
-                    Category = { Value = RoomCategory.DailyChallenge }
+                    ],
+                    StartDate = DateTimeOffset.Now,
+                    EndDate = DateTimeOffset.Now.AddHours(24),
+                    Category = RoomCategory.DailyChallenge
                 }));
             });
             AddStep("signal client", () => metadataClient.DailyChallengeUpdated(new DailyChallengeInfo { RoomID = roomId }));

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeLeaderboard.cs

@@ -43,7 +43,7 @@ public void TestBasicBehaviour()
                     return false;
                 };
             });
-            AddStep("create leaderboard", () => Child = leaderboard = new DailyChallengeLeaderboard(new Room { RoomID = { Value = 1 } }, new PlaylistItem(Beatmap.Value.BeatmapInfo))
+            AddStep("create leaderboard", () => Child = leaderboard = new DailyChallengeLeaderboard(new Room { RoomID = 1 }, new PlaylistItem(Beatmap.Value.BeatmapInfo))
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
@@ -86,7 +86,7 @@ public void TestLoadingBehaviour()
                     return false;
                 };
             });
-            AddStep("create leaderboard", () => Child = leaderboard = new DailyChallengeLeaderboard(new Room { RoomID = { Value = 1 } }, new PlaylistItem(Beatmap.Value.BeatmapInfo))
+            AddStep("create leaderboard", () => Child = leaderboard = new DailyChallengeLeaderboard(new Room { RoomID = 1 }, new PlaylistItem(Beatmap.Value.BeatmapInfo))
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeTimeRemainingRing.cs

@@ -18,11 +18,6 @@ public partial class TestSceneDailyChallengeTimeRemainingRing : OsuTestScene
     {
         private readonly Bindable<Room> room = new Bindable<Room>(new Room());
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent))
-        {
-            Model = { BindTarget = room }
-        };
-
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
 
@@ -38,7 +33,7 @@ public void TestBasicAppearance()
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background4,
                 },
-                ring = new DailyChallengeTimeRemainingRing
+                ring = new DailyChallengeTimeRemainingRing(room.Value)
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
@@ -59,29 +54,29 @@ public void TestBasicAppearance()
 
             AddStep("just started", () =>
             {
-                room.Value.StartDate.Value = DateTimeOffset.Now.AddMinutes(-1);
-                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
+                room.Value.StartDate = DateTimeOffset.Now.AddMinutes(-1);
+                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
             });
             AddStep("midway through", () =>
             {
-                room.Value.StartDate.Value = DateTimeOffset.Now.AddHours(-12);
-                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
+                room.Value.StartDate = DateTimeOffset.Now.AddHours(-12);
+                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
             });
             AddStep("nearing end", () =>
             {
-                room.Value.StartDate.Value = DateTimeOffset.Now.AddDays(-1).AddMinutes(8);
-                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
+                room.Value.StartDate = DateTimeOffset.Now.AddDays(-1).AddMinutes(8);
+                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
             });
             AddStep("already ended", () =>
             {
-                room.Value.StartDate.Value = DateTimeOffset.Now.AddDays(-2);
-                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
+                room.Value.StartDate = DateTimeOffset.Now.AddDays(-2);
+                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
             });
             AddSliderStep("manual progress", 0f, 1f, 0f, progress =>
             {
                 var startedTimeAgo = TimeSpan.FromHours(24) * progress;
-                room.Value.StartDate.Value = DateTimeOffset.Now - startedTimeAgo;
-                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
+                room.Value.StartDate = DateTimeOffset.Now - startedTimeAgo;
+                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
             });
         }
     }

osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs

@@ -42,14 +42,14 @@ public void TestDailyChallenge()
                         beatmap.OnlineID = 1001;
                         getRoomRequest.TriggerSuccess(new Room
                         {
-                            RoomID = { Value = 1234 },
-                            Name = { Value = "Aug 8, 2024" },
+                            RoomID = 1234,
+                            Name = "Aug 8, 2024",
                             Playlist =
-                            {
+                            [
                                 new PlaylistItem(beatmap)
-                            },
-                            StartDate = { Value = DateTimeOffset.Now.AddMinutes(-30) },
-                            EndDate = { Value = DateTimeOffset.Now.AddSeconds(60) }
+                            ],
+                            StartDate = DateTimeOffset.Now.AddMinutes(-30),
+                            EndDate = DateTimeOffset.Now.AddSeconds(60)
                         });
                         return true;
 

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

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -30,16 +28,16 @@ public abstract partial class QueueModeTestScene : ScreenTestScene
     {
         protected abstract QueueMode Mode { get; }
 
-        protected BeatmapInfo InitialBeatmap { get; private set; }
-        protected BeatmapInfo OtherBeatmap { get; private set; }
+        protected BeatmapInfo InitialBeatmap { get; private set; } = null!;
+        protected BeatmapInfo OtherBeatmap { get; private set; } = null!;
 
         protected IScreen CurrentScreen => multiplayerComponents.CurrentScreen;
         protected IScreen CurrentSubScreen => multiplayerComponents.MultiplayerScreen.CurrentSubScreen;
 
-        private BeatmapManager beatmaps;
-        private BeatmapSetInfo importedSet;
+        private BeatmapManager beatmaps = null!;
+        private BeatmapSetInfo importedSet = null!;
 
-        private TestMultiplayerComponents multiplayerComponents;
+        private TestMultiplayerComponents multiplayerComponents = null!;
 
         protected TestMultiplayerClient MultiplayerClient => multiplayerComponents.MultiplayerClient;
 
@@ -75,15 +73,15 @@ public override void SetUpSteps()
             AddUntilStep("wait for lounge", () => multiplayerComponents.ChildrenOfType<LoungeSubScreen>().SingleOrDefault()?.IsLoaded == true);
             AddStep("open room", () => multiplayerComponents.ChildrenOfType<LoungeSubScreen>().Single().Open(new Room
             {
-                Name = { Value = "Test Room" },
-                QueueMode = { Value = Mode },
+                Name = "Test Room",
+                QueueMode = Mode,
                 Playlist =
-                {
+                [
                     new PlaylistItem(InitialBeatmap)
                     {
                         RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
-                }
+                ]
             }));
 
             AddUntilStep("wait for room open", () => this.ChildrenOfType<MultiplayerMatchSubScreen>().FirstOrDefault()?.IsLoaded == true);
@@ -98,7 +96,7 @@ public override void SetUpSteps()
         [Test]
         public void TestCreatedWithCorrectMode()
         {
-            AddUntilStep("room created with correct mode", () => MultiplayerClient.ClientAPIRoom?.QueueMode.Value == Mode);
+            AddUntilStep("room created with correct mode", () => MultiplayerClient.ClientAPIRoom?.QueueMode == Mode);
         }
 
         protected void RunGameplay()

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

@@ -1,15 +1,14 @@
 // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Moq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
@@ -25,14 +24,14 @@ public partial class TestSceneDrawableLoungeRoom : OsuManualInputManagerTestScen
     {
         private readonly Room room = new Room
         {
-            HasPassword = { Value = true }
+            Password = "*"
         };
 
         [Cached]
         protected readonly OverlayColourProvider ColourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
 
-        private DrawableLoungeRoom drawableRoom;
-        private SearchTextBox searchTextBox;
+        private DrawableLoungeRoom drawableRoom = null!;
+        private SearchTextBox searchTextBox = null!;
 
         private readonly ManualResetEventSlim allowResponseCallback = new ManualResetEventSlim();
 
@@ -78,6 +77,7 @@ public void SetUpSteps()
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
+                            SelectedRoom = new Bindable<Room?>()
                         }
                     }
                 };
@@ -87,7 +87,7 @@ public void SetUpSteps()
         [Test]
         public void TestFocusViaKeyboardCommit()
         {
-            DrawableLoungeRoom.PasswordEntryPopover popover = null;
+            DrawableLoungeRoom.PasswordEntryPopover? popover = null;
 
             AddAssert("search textbox has focus", () => checkFocus(searchTextBox));
             AddStep("click room twice", () =>
@@ -103,11 +103,11 @@ public void TestFocusViaKeyboardCommit()
             AddStep("enter password", () => popover.ChildrenOfType<OsuPasswordTextBox>().Single().Text = "password");
             AddStep("commit via enter", () => InputManager.Key(Key.Enter));
 
-            AddAssert("popover has focus", () => checkFocus(popover));
+            AddAssert("popover has focus", () => checkFocus(popover!));
 
             AddStep("attempt another enter", () => InputManager.Key(Key.Enter));
 
-            AddAssert("popover still has focus", () => checkFocus(popover));
+            AddAssert("popover still has focus", () => checkFocus(popover!));
 
             AddStep("unblock response", () => allowResponseCallback.Set());
 
@@ -122,7 +122,7 @@ public void TestFocusViaKeyboardCommit()
         [Test]
         public void TestFocusViaMouseCommit()
         {
-            DrawableLoungeRoom.PasswordEntryPopover popover = null;
+            DrawableLoungeRoom.PasswordEntryPopover? popover = null;
 
             AddAssert("search textbox has focus", () => checkFocus(searchTextBox));
             AddStep("click room twice", () =>
@@ -144,11 +144,11 @@ public void TestFocusViaMouseCommit()
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("popover has focus", () => checkFocus(popover));
+            AddAssert("popover has focus", () => checkFocus(popover!));
 
             AddStep("attempt another click", () => InputManager.Click(MouseButton.Left));
 
-            AddAssert("popover still has focus", () => checkFocus(popover));
+            AddAssert("popover still has focus", () => checkFocus(popover!));
 
             AddStep("unblock response", () => allowResponseCallback.Set());