fix: resolve IDE0059/IDE0005 build errors and TestFruitColourFallback timeout

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/3401ec3e-61e1-4774-a089-4498dc83cf8e

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>

Author: Copilot

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs

@@ -170,7 +170,7 @@ private void checkHyperDashFruitColour(ISkin skin, Colour4 expectedColour)
                 }, skin);
             });
 
-            AddUntilStep("hyper-dash colour is correct", () => checkLegacyFruitHyperDashColour(drawableFruit, expectedColour));
+            AddAssert("hyper-dash colour is correct", () => checkLegacyFruitHyperDashColour(drawableFruit, expectedColour));
         }
 
         private Drawable setupSkinHierarchy(Drawable child, ISkin skin)

osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs

@@ -749,15 +749,12 @@ static void assertObjectHasBanks(HitObject hitObject, string normalBank, string?
         [Test]
         public void TestFallbackDecoderForCorruptedHeader()
         {
-            Decoder<Beatmap> decoder = null!;
-            Beatmap beatmap = null!;
-
             using (var resStream = TestResources.OpenResource("corrupted-header.osu"))
             using (var stream = new LineBufferedReader(resStream))
             {
-                decoder = Decoder.GetDecoder<Beatmap>(stream);
+                var decoder = Decoder.GetDecoder<Beatmap>(stream);
                 ClassicAssert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
-                beatmap = decoder.Decode(stream);
+                var beatmap = decoder.Decode(stream);
                 ClassicAssert.NotNull(beatmap);
                 ClassicAssert.AreEqual("Beatmap with corrupted header", beatmap.Metadata.Title);
                 ClassicAssert.AreEqual("Evil Hacker", beatmap.Metadata.Author.Username);
@@ -767,15 +764,12 @@ public void TestFallbackDecoderForCorruptedHeader()
         [Test]
         public void TestFallbackDecoderForMissingHeader()
         {
-            Decoder<Beatmap> decoder = null!;
-            Beatmap beatmap = null!;
-
             using (var resStream = TestResources.OpenResource("missing-header.osu"))
             using (var stream = new LineBufferedReader(resStream))
             {
-                decoder = Decoder.GetDecoder<Beatmap>(stream);
+                var decoder = Decoder.GetDecoder<Beatmap>(stream);
                 ClassicAssert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
-                beatmap = decoder.Decode(stream);
+                var beatmap = decoder.Decode(stream);
                 ClassicAssert.NotNull(beatmap);
                 ClassicAssert.AreEqual("Beatmap with no header", beatmap.Metadata.Title);
                 ClassicAssert.AreEqual("Incredibly Evil Hacker", beatmap.Metadata.Author.Username);
@@ -785,15 +779,12 @@ public void TestFallbackDecoderForMissingHeader()
         [Test]
         public void TestDecodeFileWithEmptyLinesAtStart()
         {
-            Decoder<Beatmap> decoder = null!;
-            Beatmap beatmap = null!;
-
             using (var resStream = TestResources.OpenResource("empty-lines-at-start.osu"))
             using (var stream = new LineBufferedReader(resStream))
             {
-                decoder = Decoder.GetDecoder<Beatmap>(stream);
+                var decoder = Decoder.GetDecoder<Beatmap>(stream);
                 ClassicAssert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
-                beatmap = decoder.Decode(stream);
+                var beatmap = decoder.Decode(stream);
                 ClassicAssert.NotNull(beatmap);
                 ClassicAssert.AreEqual("Empty lines at start", beatmap.Metadata.Title);
                 ClassicAssert.AreEqual("Edge Case Hunter", beatmap.Metadata.Author.Username);
@@ -803,15 +794,12 @@ public void TestDecodeFileWithEmptyLinesAtStart()
         [Test]
         public void TestDecodeFileWithEmptyLinesAndNoHeader()
         {
-            Decoder<Beatmap> decoder = null!;
-            Beatmap beatmap = null!;
-
             using (var resStream = TestResources.OpenResource("empty-line-instead-of-header.osu"))
             using (var stream = new LineBufferedReader(resStream))
             {
-                decoder = Decoder.GetDecoder<Beatmap>(stream);
+                var decoder = Decoder.GetDecoder<Beatmap>(stream);
                 ClassicAssert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
-                beatmap = decoder.Decode(stream);
+                var beatmap = decoder.Decode(stream);
                 ClassicAssert.NotNull(beatmap);
                 ClassicAssert.AreEqual("The dog ate the file header", beatmap.Metadata.Title);
                 ClassicAssert.AreEqual("Why does this keep happening", beatmap.Metadata.Author.Username);
@@ -821,15 +809,12 @@ public void TestDecodeFileWithEmptyLinesAndNoHeader()
         [Test]
         public void TestDecodeFileWithContentImmediatelyAfterHeader()
         {
-            Decoder<Beatmap> decoder = null!;
-            Beatmap beatmap = null!;
-
             using (var resStream = TestResources.OpenResource("no-empty-line-after-header.osu"))
             using (var stream = new LineBufferedReader(resStream))
             {
-                decoder = Decoder.GetDecoder<Beatmap>(stream);
+                var decoder = Decoder.GetDecoder<Beatmap>(stream);
                 ClassicAssert.IsInstanceOf<LegacyBeatmapDecoder>(decoder);
-                beatmap = decoder.Decode(stream);
+                var beatmap = decoder.Decode(stream);
                 ClassicAssert.NotNull(beatmap);
                 ClassicAssert.AreEqual("No empty line delimiting header from contents", beatmap.Metadata.Title);
                 ClassicAssert.AreEqual("Edge Case Hunter", beatmap.Metadata.Author.Username);
@@ -847,7 +832,7 @@ public void TestDecodeEmptyFile()
         [Test]
         public void TestAllowFallbackDecoderOverwrite()
         {
-            Decoder<Beatmap> decoder = null!;
+            Decoder<Beatmap> decoder;
 
             using (var resStream = TestResources.OpenResource("corrupted-header.osu"))
             using (var stream = new LineBufferedReader(resStream))

osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Numerics;
 using NUnit.Framework;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;