From 2f2dc158e0353aa5ba27108980a1bed1466a2f36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Feb 2025 17:44:59 +0900
Subject: [PATCH 1/2] Ensure test step doesn't consider pooled instances of
 drawables

---
 osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
index 0a9719423c..2e67e625f9 100644
--- a/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
+++ b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
@@ -175,7 +175,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             AddStep($"click panel at index {index}", () =>
             {
-                Carousel.ChildrenOfType<T>()
+                Carousel.ChildrenOfType<UserTrackingScrollContainer>().Single()
+                        .ChildrenOfType<T>()
                         .Where(p => ((ICarouselPanel)p).Item?.IsVisible == true)
                         .Reverse()
                         .ElementAt(index)

From ccdb6e4c4870ef64b3a2e549716c4bf7b412b646 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Feb 2025 17:50:14 +0900
Subject: [PATCH 2/2] Fix carousel tests failing due to dependency on depth
 ordering

---
 osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
index 2e67e625f9..f7be5f12e8 100644
--- a/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
+++ b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Carousel.ChildrenOfType<UserTrackingScrollContainer>().Single()
                         .ChildrenOfType<T>()
                         .Where(p => ((ICarouselPanel)p).Item?.IsVisible == true)
-                        .Reverse()
+                        .OrderBy(p => p.Y)
                         .ElementAt(index)
                         .TriggerClick();
             });