Update tests in line with new structure

peppy · May 14, 2024 · 636e200 · 636e200
1 parent 5c9a90c
commit 636e200
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/...nia.Tests/Mods/TestSceneModTouchDevice.cs → ...nia.Tests/TestSceneManiaTouchInputArea.cs b/...nia.Tests/Mods/TestSceneModTouchDevice.cs → ...nia.Tests/TestSceneManiaTouchInputArea.cs
@@ -3,42 +3,28 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Mania.Tests.Mods
+namespace osu.Game.Rulesets.Mania.Tests
 {
-    public partial class TestSceneModTouchDevice : ModTestScene
+    public partial class TestSceneManiaTouchInputArea : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
 
         [Test]
-        public void TestOverlayVisibleWithMod() => CreateModTest(new ModTestData
+        public void TestTouchAreaNotInitiallyVisible()
         {
-            Mod = new ModTouchDevice(),
-            Autoplay = false,
-            PassCondition = () => getTouchOverlay()?.IsPresent == true
-        });
-
-        [Test]
-        public void TestOverlayNotVisibleWithoutMod() => CreateModTest(new ModTestData
-        {
-            Autoplay = false,
-            PassCondition = () => getTouchOverlay()?.IsPresent == false
-        });
+            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
+        }
 
         [Test]
         public void TestPressReceptors()
         {
-            CreateModTest(new ModTestData
-            {
-                Mod = new ModTouchDevice(),
-                Autoplay = false,
-                PassCondition = () => true
-            });
+            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
 
             for (int i = 0; i < 4; i++)
             {
@@ -51,6 +37,8 @@ public void TestPressReceptors()
                     () => Does.Contain(getReceptor(index).Action.Value));
 
                 AddStep($"release receptor {index}", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
+
+                AddAssert("touch area visible", () => getTouchOverlay()?.State.Value == Visibility.Visible);
             }
         }