diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselDifficultyPanel.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselDifficultyPanel.cs index c0ecb06085..a9f73759f7 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselDifficultyPanel.cs +++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselDifficultyPanel.cs @@ -30,18 +30,20 @@ namespace osu.Game.Tests.Visual.SongSelectV2 { } + [SetUp] + public void SetUp() => Schedule(() => + { + var beatmapSet = beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => b.OnlineID == 241526) + ?? beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => !b.Protected) + ?? TestResources.CreateTestBeatmapSetInfo(); + + beatmap = beatmapSet.Beatmaps.First(); + }); + [Test] public void TestDisplay() { - AddStep("set beatmap", () => - { - var beatmapSet = beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => b.OnlineID == 241526) - ?? beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => !b.Protected) - ?? TestResources.CreateTestBeatmapSetInfo(); - - beatmap = beatmapSet.Beatmaps.First(); - CreateThemedContent(OverlayColourScheme.Aquamarine); - }); + AddStep("display", () => CreateThemedContent(OverlayColourScheme.Aquamarine)); } [Test] @@ -49,8 +51,10 @@ namespace osu.Game.Tests.Visual.SongSelectV2 { AddStep("random beatmap", () => { - beatmap = beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()) - .First().Beatmaps.OrderBy(_ => RNG.Next()).First(); + var randomSet = beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()).FirstOrDefault(); + randomSet ??= TestResources.CreateTestBeatmapSetInfo(); + beatmap = randomSet.Beatmaps.OrderBy(_ => RNG.Next()).First(); + CreateThemedContent(OverlayColourScheme.Aquamarine); }); } diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselSetPanel.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselSetPanel.cs index 6b981d7b33..8f7cac2b58 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselSetPanel.cs +++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselSetPanel.cs @@ -28,16 +28,18 @@ namespace osu.Game.Tests.Visual.SongSelectV2 { } + [SetUp] + public void SetUp() => Schedule(() => + { + beatmapSet = beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => b.OnlineID == 241526) + ?? beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => !b.Protected) + ?? TestResources.CreateTestBeatmapSetInfo(); + }); + [Test] public void TestDisplay() { - AddStep("set beatmap", () => - { - beatmapSet = beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => b.OnlineID == 241526) - ?? beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => !b.Protected) - ?? TestResources.CreateTestBeatmapSetInfo(); - CreateThemedContent(OverlayColourScheme.Aquamarine); - }); + AddStep("display", () => CreateThemedContent(OverlayColourScheme.Aquamarine)); } [Test] @@ -45,7 +47,10 @@ namespace osu.Game.Tests.Visual.SongSelectV2 { AddStep("random beatmap", () => { - beatmapSet = beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()).First(); + var randomSet = beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()).FirstOrDefault(); + randomSet ??= TestResources.CreateTestBeatmapSetInfo(); + beatmapSet = randomSet; + CreateThemedContent(OverlayColourScheme.Aquamarine); }); } diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselStandalonePanel.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselStandalonePanel.cs index 76dcfc9507..a34ac31d5d 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselStandalonePanel.cs +++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselStandalonePanel.cs @@ -30,18 +30,20 @@ namespace osu.Game.Tests.Visual.SongSelectV2 { } + [SetUp] + public void SetUp() => Schedule(() => + { + var beatmapSet = beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => b.OnlineID == 241526) + ?? beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => !b.Protected) + ?? TestResources.CreateTestBeatmapSetInfo(); + + beatmap = beatmapSet.Beatmaps.First(); + }); + [Test] public void TestDisplay() { - AddStep("set beatmap", () => - { - var beatmapSet = beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => b.OnlineID == 241526) - ?? beatmaps.GetAllUsableBeatmapSets().FirstOrDefault(b => !b.Protected) - ?? TestResources.CreateTestBeatmapSetInfo(); - - beatmap = beatmapSet.Beatmaps.First(); - CreateThemedContent(OverlayColourScheme.Aquamarine); - }); + AddStep("display", () => CreateThemedContent(OverlayColourScheme.Aquamarine)); } [Test] @@ -49,8 +51,10 @@ namespace osu.Game.Tests.Visual.SongSelectV2 { AddStep("random beatmap", () => { - beatmap = beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()) - .First().Beatmaps.OrderBy(_ => RNG.Next()).First(); + var randomSet = beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()).FirstOrDefault(); + randomSet ??= TestResources.CreateTestBeatmapSetInfo(); + beatmap = randomSet.Beatmaps.OrderBy(_ => RNG.Next()).First(); + CreateThemedContent(OverlayColourScheme.Aquamarine); }); }