Merge pull request #8476 from bdach/fix-loader-tests

Improve robustness of loader tests
Modify assert to avoid false failures
2024-12-05 10:33:22 +08:00 · 2020-03-28 11:20:19 +09:00 · 2020-03-28 00:43:57 +01:00
1 changed files with 6 additions and 3 deletions
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
@ -36,8 +36,6 @@ namespace osu.Game.Tests.Visual.Menus
        [Test]
        public void TestInstantLoad()
        {
-            // visual only, very impossible to test this using asserts.
-
            AddStep("load immediately", () =>
            {
                loader = new TestLoader();
@ -46,12 +44,17 @@ namespace osu.Game.Tests.Visual.Menus
                LoadScreen(loader);
            });

-            AddAssert("spinner did not display", () => loader.LoadingSpinner?.Alpha == 0);
+            spinnerNotPresentOrHidden();

            AddUntilStep("loaded", () => loader.ScreenLoaded);
            AddUntilStep("not current", () => !loader.IsCurrentScreen());
+
+            spinnerNotPresentOrHidden();
        }

+        private void spinnerNotPresentOrHidden() =>
+            AddAssert("spinner did not display", () => loader.LoadingSpinner == null || loader.LoadingSpinner.Alpha == 0);
+
        [Test]
        public void TestDelayedLoad()
        {