sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-15 00:08:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix TestSceneMultiplayer resolving the wrong client

Browse Source
This commit is contained in:
smoogipoo 2021-06-25 19:16:54 +09:00
parent a27a647ae7
commit 04cc390c41
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
View File

@ -18,6 +18,7 @@ using osu.Game.Overlays.Mods;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Mods; using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Screens;
using osu.Game.Screens.OnlinePlay.Components; using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Screens.OnlinePlay.Match.Components; using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Screens.OnlinePlay.Multiplayer; using osu.Game.Screens.OnlinePlay.Multiplayer;
@ -30,14 +31,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
public class TestSceneMultiplayer : ScreenTestScene public class TestSceneMultiplayer : ScreenTestScene
{ {
private TestMultiplayer multiplayerScreen;
private BeatmapManager beatmaps; private BeatmapManager beatmaps;
private RulesetStore rulesets; private RulesetStore rulesets;
private BeatmapSetInfo importedSet; private BeatmapSetInfo importedSet;
private TestMultiplayerClient client => multiplayerScreen.Client; private DependenciesScreen dependenciesScreen;
private Room room => client.APIRoom; private TestMultiplayer multiplayerScreen;
private TestMultiplayerClient client;
public TestSceneMultiplayer() public TestSceneMultiplayer()
{ {
@ -229,30 +229,43 @@ namespace osu.Game.Tests.Visual.Multiplayer
private void loadMultiplayer() private void loadMultiplayer()
{ {
AddStep("show", () => AddStep("create multiplayer screen", () => multiplayerScreen = new TestMultiplayer());
AddStep("load dependencies", () =>
{ {
multiplayerScreen = new TestMultiplayer(); client = new TestMultiplayerClient(multiplayerScreen.RoomManager);
// Needs to be added at a higher level since the multiplayer screen becomes non-current. // The screen gets suspended so it stops receiving updates.
Child = multiplayerScreen.Client; Child = client;
LoadScreen(multiplayerScreen); LoadScreen(dependenciesScreen = new DependenciesScreen(client));
}); });
AddUntilStep("wait for loaded", () => multiplayerScreen.IsLoaded); AddUntilStep("wait for dependencies to load", () => dependenciesScreen.IsLoaded);
AddStep("load multiplayer", () => LoadScreen(multiplayerScreen));
AddUntilStep("wait for multiplayer to load", () => multiplayerScreen.IsLoaded);
} }
private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer /// <summary>
/// Used for the sole purpose of adding <see cref="TestMultiplayerClient"/> as a resolvable dependency.
/// </summary>
private class DependenciesScreen : OsuScreen
{ {
[Cached(typeof(MultiplayerClient))] [Cached(typeof(MultiplayerClient))]
public readonly TestMultiplayerClient Client; public readonly TestMultiplayerClient Client;
public TestMultiplayer() public DependenciesScreen(TestMultiplayerClient client)
{ {
Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager); Client = client;
}
} }
protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager(); private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
{
public new TestMultiplayerRoomManager RoomManager { get; private set; }
protected override RoomManager CreateRoomManager() => RoomManager = new TestMultiplayerRoomManager();
} }
} }
} }