From ffca90779fcc9a781fb6a5c6063c0f1baa927f81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jan 2025 16:48:03 +0900
Subject: [PATCH] Fix sort direction being flipped

---
 .../Visual/SongSelect/BeatmapCarouselV2TestScene.cs    | 10 ++++++----
 .../SongSelect/TestSceneBeatmapCarouselV2Basics.cs     | 10 +++++-----
 .../Screens/SelectV2/BeatmapCarouselFilterSorting.cs   |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
index eaa29abf01..3aa9f60181 100644
--- a/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
+++ b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("reset beatmaps", () => BeatmapSets.Clear());
+            RemoveAllBeatmaps();
 
             CreateCarousel();
 
@@ -146,12 +146,14 @@ namespace osu.Game.Tests.Visual.SongSelect
                 BeatmapSets.Add(TestResources.CreateTestBeatmapSetInfo(fixedDifficultiesPerSet ?? RNG.Next(1, 4)));
         });
 
-        protected void RemoveLastBeatmap() =>
-            AddStep("remove last beatmap", () =>
+        protected void RemoveAllBeatmaps() => AddStep("clear all beatmaps", () => BeatmapSets.Clear());
+
+        protected void RemoveFirstBeatmap() =>
+            AddStep("remove first beatmap", () =>
             {
                 if (BeatmapSets.Count == 0) return;
 
-                BeatmapSets.Remove(BeatmapSets.Last());
+                BeatmapSets.Remove(BeatmapSets.First());
             });
 
         private void updateStats()
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselV2Basics.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselV2Basics.cs
index 8d801930fc..748831bf7b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselV2Basics.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselV2Basics.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             AddBeatmaps(1);
             AddBeatmaps(10);
-            RemoveLastBeatmap();
-            AddStep("remove all beatmaps", () => BeatmapSets.Clear());
+            RemoveFirstBeatmap();
+            RemoveAllBeatmaps();
         }
 
         [Test]
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("save selected screen position", () => positionBefore = Carousel.ChildrenOfType<BeatmapCarouselPanel>().FirstOrDefault(p => p.Selected.Value)!.ScreenSpaceDrawQuad);
 
-            RemoveLastBeatmap();
+            RemoveFirstBeatmap();
             WaitForSorting();
 
             AddAssert("select screen position unchanged", () => Carousel.ChildrenOfType<BeatmapCarouselPanel>().Single(p => p.Selected.Value).ScreenSpaceDrawQuad,
@@ -79,13 +79,13 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("scroll to last item", () => Scroll.ScrollToEnd(false));
 
-            AddStep("select last beatmap", () => Carousel.CurrentSelection = BeatmapSets.First());
+            AddStep("select last beatmap", () => Carousel.CurrentSelection = BeatmapSets.Last());
 
             WaitForScrolling();
 
             AddStep("save selected screen position", () => positionBefore = Carousel.ChildrenOfType<BeatmapCarouselPanel>().FirstOrDefault(p => p.Selected.Value)!.ScreenSpaceDrawQuad);
 
-            RemoveLastBeatmap();
+            RemoveFirstBeatmap();
             WaitForSorting();
             AddAssert("select screen position unchanged", () => Carousel.ChildrenOfType<BeatmapCarouselPanel>().Single(p => p.Selected.Value).ScreenSpaceDrawQuad,
                 () => Is.EqualTo(positionBefore));
diff --git a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterSorting.cs b/osu.Game/Screens/SelectV2/BeatmapCarouselFilterSorting.cs
index dd82bf3495..0298616aa8 100644
--- a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterSorting.cs
+++ b/osu.Game/Screens/SelectV2/BeatmapCarouselFilterSorting.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.SelectV2
         {
             var criteria = getCriteria();
 
-            return items.OrderDescending(Comparer<CarouselItem>.Create((a, b) =>
+            return items.Order(Comparer<CarouselItem>.Create((a, b) =>
             {
                 int comparison;