h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 08:49:57 +08:00
Code Issues Releases Wiki Activity

Re-privatise PlaylistItem.Beatmap, adjust tests

Browse Source
This commit is contained in:
Dan Balasescu
2025-07-14 21:19:20 +09:00
Unverified
parent bd922e2888
commit 13fc37b2de
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+16 -6
View File
@@ -1154,10 +1154,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddStep("open user style selection", () => this.ChildrenOfType<MultiplayerMatchSubScreen>().Single().ShowUserStyleSelect());
AddUntilStep("style selection screen opened", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelect>().SingleOrDefault()?.IsCurrentScreen() == true);
AddStep("change beatmap", () => multiplayerClient.EditPlaylistItem(new MultiplayerPlaylistItem(new PlaylistItem(multiplayerClient.ServerRoom!.Playlist[0])
AddStep("change beatmap", () =>
{
Beatmap = importedSet.Beatmaps.Last(),
})));
var newItem = multiplayerClient.ServerRoom!.Playlist[0].Clone();
var newBeatmap = importedSet.Beatmaps.Last();
newItem.BeatmapID = newBeatmap.OnlineID;
newItem.BeatmapChecksum = newBeatmap.MD5Hash;
multiplayerClient.EditPlaylistItem(newItem);
});
AddWaitStep("wait for potential beatmap change", 2);
AddAssert("style selection screen still open", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelect>().SingleOrDefault()?.IsCurrentScreen() == true);
@@ -1186,10 +1191,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddStep("open user style selection", () => this.ChildrenOfType<MultiplayerMatchSubScreen>().Single().ShowUserStyleSelect());
AddUntilStep("style selection screen opened", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelect>().SingleOrDefault()?.IsCurrentScreen() == true);
AddStep("change beatmap set", () => multiplayerClient.EditPlaylistItem(new MultiplayerPlaylistItem(new PlaylistItem(multiplayerClient.ServerRoom!.Playlist[0])
AddStep("change beatmap set", () =>
{
Beatmap = importedSet2.Beatmaps.First(),
})));
var newItem = multiplayerClient.ServerRoom!.Playlist[0].Clone();
var newBeatmap = importedSet2.Beatmaps.Last();
newItem.BeatmapID = newBeatmap.OnlineID;
newItem.BeatmapChecksum = newBeatmap.MD5Hash;
multiplayerClient.EditPlaylistItem(newItem);
});
AddUntilStep("selected beatmap changed", () => Beatmap.Value.BeatmapInfo.Equals(importedSet2.Beatmaps.First()));
AddUntilStep("style selection screen closed", () => this.ChildrenOfType<MultiplayerMatchFreestyleSelect>().SingleOrDefault()?.IsCurrentScreen() != true);
osu.Game/Online/Rooms/PlaylistItem.cs
+1 -1
View File
@@ -90,7 +90,7 @@ namespace osu.Game.Online.Rooms
/// In many cases, this will *not* contain any usable information apart from OnlineID.
/// </summary>
[JsonIgnore]
public IBeatmapInfo Beatmap { get; set; }
public IBeatmapInfo Beatmap { get; private set; }
[JsonIgnore]
public IBindable<bool> Valid => valid;