From 99220408f63044dbe85b22dda6c0e5630981237d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 1 Jul 2025 17:34:52 +0900 Subject: [PATCH] Remove duplicated test method --- .../Navigation/TestSceneScreenNavigation.cs | 47 +------------------ 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs index bcab3c7672..d50fc69823 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs @@ -251,51 +251,6 @@ namespace osu.Game.Tests.Visual.Navigation SoloSongSelect songSelect = null; double scrollPosition = 0; - AddStep("set game volume to max", () => Game.Dependencies.Get().SetValue(FrameworkSetting.VolumeUniversal, 1d)); - AddUntilStep("wait for volume overlay to hide", () => Game.ChildrenOfType().SingleOrDefault()?.State.Value, () => Is.EqualTo(Visibility.Hidden)); - PushAndConfirm(() => songSelect = new SoloSongSelect()); - AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented); - AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely()); - AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault); - - AddUntilStep("store scroll position", () => - { - double s = getCarouselScrollPosition(); - - // TODO: this logic can likely be removed when we fix https://github.com/ppy/osu/issues/33379 - if (scrollPosition == s) - return true; - - scrollPosition = s; - return false; - }); - - AddStep("move to left side", () => InputManager.MoveMouseTo( - songSelect.ChildrenOfType().Single().ScreenSpaceDrawQuad.Centre)); - AddStep("scroll down", () => InputManager.ScrollVerticalBy(-1)); - AddAssert("carousel didn't move", getCarouselScrollPosition, () => Is.EqualTo(scrollPosition)); - - AddRepeatStep("alt-scroll down", () => - { - InputManager.PressKey(Key.AltLeft); - InputManager.ScrollVerticalBy(-1); - InputManager.ReleaseKey(Key.AltLeft); - }, 5); - AddAssert("game volume decreased", () => Game.Dependencies.Get().Get(FrameworkSetting.VolumeUniversal), () => Is.LessThan(1)); - - AddStep("move to carousel", () => InputManager.MoveMouseTo(songSelect.ChildrenOfType().Single())); - AddStep("scroll down", () => InputManager.ScrollVerticalBy(-1)); - AddAssert("carousel moved", getCarouselScrollPosition, () => Is.Not.EqualTo(scrollPosition)); - - double getCarouselScrollPosition() => Game.ChildrenOfType.CarouselScrollContainer>().Single().Current; - } - - [Test] - public void TestNewSongSelectScrollHandling() - { - SoloSongSelect songSelect = null; - double scrollPosition = 0; - AddStep("set game volume to max", () => Game.Dependencies.Get().SetValue(FrameworkSetting.VolumeUniversal, 1d)); AddUntilStep("wait for volume overlay to hide", () => Game.ChildrenOfType().SingleOrDefault()?.State.Value, () => Is.EqualTo(Visibility.Hidden)); PushAndConfirm(() => songSelect = new SoloSongSelect()); @@ -303,6 +258,8 @@ namespace osu.Game.Tests.Visual.Navigation AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely()); AddUntilStep("wait for beatmap", () => Game.ChildrenOfType().Any()); + // TODO: this logic can likely be removed when we fix https://github.com/ppy/osu/issues/33379 + // It should be probably be immediate in this case. AddWaitStep("wait for scroll", 10); AddStep("store scroll position", () => scrollPosition = getCarouselScrollPosition());