From 44c34ca7b2473d65e24dffde56ca2270724267dd Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 24 Nov 2021 14:32:18 +0900 Subject: [PATCH] Revert changes causing `BeatmapSet.Metadata` to be expectedly null in some tests --- ...stSceneOnlinePlayBeatmapAvailabilityTracker.cs | 1 + .../TestSceneMultiplayerMatchSongSelect.cs | 15 ++++++++------- .../Multiplayer/TestScenePlaylistsSongSelect.cs | 1 + .../Visual/SongSelect/TestSceneBeatmapCarousel.cs | 3 +++ .../SongSelect/TestSceneBeatmapRecommendations.cs | 1 + .../Visual/SongSelect/TestScenePlaySongSelect.cs | 15 ++++++++------- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs index 748de6c9a8..0fba0eb7a9 100644 --- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs +++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs @@ -148,6 +148,7 @@ namespace osu.Game.Tests.Online Debug.Assert(info.BeatmapSet != null); info.BeatmapSet.Beatmaps.Add(info); + info.BeatmapSet.Metadata = info.Metadata; info.MD5Hash = stream.ComputeMD5Hash(); info.Hash = stream.ComputeSHA2Hash(); } diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs index f308886bf4..6b67a979e5 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs @@ -47,10 +47,18 @@ namespace osu.Game.Tests.Visual.Multiplayer beatmaps = new List(); + var metadata = new BeatmapMetadata + { + Artist = "Some Artist", + Title = "Some Beatmap", + AuthorString = "Some Author" + }; + var beatmapSetInfo = new BeatmapSetInfo { OnlineID = 10, Hash = Guid.NewGuid().ToString().ComputeMD5Hash(), + Metadata = metadata, DateAdded = DateTimeOffset.UtcNow }; @@ -61,13 +69,6 @@ namespace osu.Game.Tests.Visual.Multiplayer int length = RNG.Next(30000, 200000); double bpm = RNG.NextSingle(80, 200); - var metadata = new BeatmapMetadata - { - Artist = "Some Artist", - Title = "Some Beatmap", - AuthorString = "Some Author" - }; - var beatmap = new BeatmapInfo { Ruleset = rulesets.GetRuleset(i % 4), diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs index 04e47e17e5..3e24b7a1d0 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs @@ -53,6 +53,7 @@ namespace osu.Game.Tests.Visual.Multiplayer { OnlineID = 10, Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(), + Metadata = metadata, DateAdded = DateTimeOffset.UtcNow, }; diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs index 512e34975e..1808f98c23 100644 --- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs @@ -846,8 +846,10 @@ namespace osu.Game.Tests.Visual.SongSelect var beatmapSet = new BeatmapSetInfo { + ID = id, OnlineID = id, Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(), + Metadata = metadata, }; foreach (var b in getBeatmaps(randomDifficultyCount ? RNG.Next(1, 20) : 3, metadata)) @@ -899,6 +901,7 @@ namespace osu.Game.Tests.Visual.SongSelect { OnlineID = id, Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(), + Metadata = metadata, }; for (int b = 1; b < 101; b++) diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs index 73144b584f..7d855a88e2 100644 --- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs @@ -182,6 +182,7 @@ namespace osu.Game.Tests.Visual.SongSelect { Hash = Guid.NewGuid().ToString(), OnlineID = importID, + Metadata = metadata, }; beatmapSet.Beatmaps.AddRange(difficultyRulesets.Select((ruleset, difficultyIndex) => new BeatmapInfo diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs index 025c7f0dfd..c89b7e858b 100644 --- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs @@ -907,13 +907,6 @@ namespace osu.Game.Tests.Visual.SongSelect int setId = getImportId(); - var beatmapSet = new BeatmapSetInfo - { - OnlineID = setId, - Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(), - DateAdded = DateTimeOffset.UtcNow, - }; - var metadata = new BeatmapMetadata { // Create random metadata, then we can check if sorting works based on these @@ -922,6 +915,14 @@ namespace osu.Game.Tests.Visual.SongSelect AuthorString = "Some Guy " + RNG.Next(0, 9), }; + var beatmapSet = new BeatmapSetInfo + { + OnlineID = setId, + Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(), + DateAdded = DateTimeOffset.UtcNow, + Metadata = metadata + }; + for (int i = 0; i < countPerRuleset; i++) { int beatmapId = setId * 1000 + i;