Generate autoplay input frames instead of force perfect judgements

osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneBreakNote.cs

@@ -1,51 +1,51 @@
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Sentakki.Objects;
-using osu.Game.Rulesets.Sentakki.Objects.Drawables;
-using osu.Game.Tests.Visual;
-using osuTK;
-using osuTK.Graphics;
+using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Sentakki.Tests.Objects
 {
-    [TestFixture]
-    public class TestSceneBreakNote : OsuTestScene
+    public class TestSceneBreakNote : TestSceneSentakkiHitObject
     {
-        private readonly Container content;
-        protected override Container<Drawable> Content => content;
-
-        private int depthIndex;
-
-        public TestSceneBreakNote()
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
-            base.Content.Add(content = new SentakkiInputManager(new RulesetInfo { ID = 0 }));
-
-            AddStep("Miss Single", () => testSingle());
-            AddStep("Hit Single", () => testSingle(true));
-            AddUntilStep("Wait for object despawn", () => !Children.Any(h => (h is DrawableSentakkiHitObject) && (h as DrawableSentakkiHitObject).AllJudged == false));
-        }
-
-        private void testSingle(bool auto = false)
-        {
-            var circle = new Tap
+            var beatmap = new Beatmap<SentakkiHitObject>()
             {
-                Break = true,
-                StartTime = Time.Current + 1000,
+                BeatmapInfo =
+                {
+                    Ruleset = CreateRuleset()?.RulesetInfo ?? ruleset
+                },
             };
-
-            circle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { });
-
-            Add(new DrawableTap(circle)
+            for (int i = 0; i < 8; ++i)
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Depth = depthIndex++,
-                Auto = auto
-            });
+                beatmap.HitObjects.Add(new Tap
+                {
+                    Break = true,
+                    StartTime = 500,
+                    Lane = i
+                });
+                beatmap.HitObjects.Add(new Hold
+                {
+                    Break = true,
+                    StartTime = 1000,
+                    Duration = 300,
+                    Lane = (i + 3).NormalizePath()
+                });
+                beatmap.HitObjects.Add(new Slide
+                {
+                    Break = true,
+                    SlideInfoList = new List<SentakkiSlideInfo>
+                    {
+                        new SentakkiSlideInfo {
+                            ID = 1,
+                            Duration = 500,
+                        }
+                    },
+                    StartTime = 1500,
+                    Lane = (i + 7).NormalizePath()
+                });
+            }
+
+            return beatmap;
         }
     }
 }

osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneHitObject.cs

@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using osu.Game.Tests.Visual;
+using System.Linq;
+
+namespace osu.Game.Rulesets.Sentakki.Tests.Objects
+{
+    public abstract class TestSceneSentakkiHitObject : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new SentakkiRuleset();
+
+        protected override bool HasCustomSteps => true;
+
+        private bool auto = false;
+        protected override bool Autoplay => auto;
+
+        [Test]
+        public void TestMisses()
+        {
+            AddStep("Turn off auto", () => auto = false);
+            CreateTest(null);
+            AddUntilStep("Wait until all hitobjects are judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.AllJudged));
+        }
+
+        [Test]
+        public void TestHits()
+        {
+            AddStep("Turn on auto", () => auto = true);
+            CreateTest(null);
+            AddUntilStep("Wait until all hitobjects are judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.AllJudged));
+        }
+    }
+}

osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneHoldNote.cs

@@ -1,59 +1,29 @@
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Sentakki.Objects;
-using osu.Game.Rulesets.Sentakki.Objects.Drawables;
-using osu.Game.Tests.Visual;
-
 namespace osu.Game.Rulesets.Sentakki.Tests.Objects
 {
-    [TestFixture]
-    public class TestSceneHoldNote : OsuTestScene
+    public class TestSceneHoldNote : TestSceneSentakkiHitObject
     {
-        private readonly Container content;
-        protected override Container<Drawable> Content => content;
-
-        private int depthIndex;
-
-        public TestSceneHoldNote()
-        {
-            base.Content.Add(content = new SentakkiInputManager(new RulesetInfo { ID = 0 }));
-
-            AddStep("Miss Insane Short", () => testSingle(100));
-            AddStep("Hit Insane Short", () => testSingle(100, true));
-            AddStep("Miss Very Short", () => testSingle(200));
-            AddStep("Hit Very Short", () => testSingle(200, true));
-            AddStep("Miss Short", () => testSingle(500));
-            AddStep("Hit Short", () => testSingle(500, true));
-            AddStep("Miss Medium", () => testSingle(750));
-            AddStep("Hit Medium", () => testSingle(750, true));
-            AddStep("Miss Long", () => testSingle(1000));
-            AddStep("Hit Long", () => testSingle(1000, true));
-            AddStep("Miss Very Long", () => testSingle(3000));
-            AddStep("Hit Very Long", () => testSingle(3000, true));
-            AddUntilStep("Wait for object despawn", () => !Children.Any(h => (h is DrawableSentakkiHitObject) && (h as DrawableSentakkiHitObject).AllJudged == false));
-        }
-
-        private void testSingle(double duration, bool auto = false)
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
-            var circle = new Hold
+            var beatmap = new Beatmap<SentakkiHitObject>()
             {
-                StartTime = Time.Current + 1000,
-                EndTime = Time.Current + 1000 + duration,
+                BeatmapInfo =
+                {
+                    Ruleset = CreateRuleset()?.RulesetInfo ?? ruleset
+                },
             };
 
-            circle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { });
-
-            Add(new DrawableHold(circle)
+            for (int i = 0; i < 8; ++i)
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Depth = depthIndex++,
-                Auto = auto
-            });
+                beatmap.HitObjects.Add(new Hold
+                {
+                    StartTime = 500 + (200 * i),
+                    Duration = 100 + (200 * i),
+                    Lane = i
+                });
+            }
+            return beatmap;
         }
     }
 }

osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideNote.cs

@@ -1,40 +1,22 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Sentakki.Objects;
-using osu.Game.Rulesets.Sentakki.Objects.Drawables;
-using osu.Game.Tests.Visual;
+using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Sentakki.Tests.Objects
 {
-    [TestFixture]
-    public class TestSceneSlideNote : OsuTestScene
+    public class TestSceneSlideNote : TestSceneSentakkiHitObject
     {
-        private readonly Container content;
-        protected override Container<Drawable> Content => content;
-
-        protected override Ruleset CreateRuleset() => new SentakkiRuleset();
-
-        private int depthIndex;
-
-        public TestSceneSlideNote()
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
-            base.Content.Add(content = new SentakkiInputManager(new RulesetInfo { ID = 0 }));
-
-            AddStep("Miss Single", () => testSingle(2000));
-            AddStep("Hit Single", () => testSingle(2000, true));
-            AddUntilStep("Wait for object despawn", () => !Children.Any(h => (h is DrawableSentakkiHitObject) && (h as DrawableSentakkiHitObject).AllJudged == false));
-        }
-
-        private void testSingle(double duration, bool auto = false)
-        {
-            var slide = new Slide
+            var beatmap = new Beatmap<SentakkiHitObject>()
+            {
+                BeatmapInfo =
+                {
+                    Ruleset = CreateRuleset()?.RulesetInfo ?? ruleset
+                },
+            };
+            beatmap.HitObjects.Add(new Slide
             {
-                //Break = true,
                 SlideInfoList = new List<SentakkiSlideInfo>
                 {
                     new SentakkiSlideInfo {
@@ -50,23 +32,9 @@ private void testSingle(double duration, bool auto = false)
                         Duration = 2000,
                     }
                 },
-                StartTime = Time.Current + 1000,
-            };
-
-            slide.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { });
-
-            DrawableSlide dSlide;
-
-            Add(dSlide = new DrawableSlide(slide)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Depth = depthIndex++,
-                Auto = auto
+                StartTime = 500,
             });
-
-            foreach (DrawableSentakkiHitObject nested in dSlide.NestedHitObjects)
-                nested.Auto = auto;
+            return beatmap;
         }
     }
 }

osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneTapNote.cs

@@ -1,48 +1,27 @@
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Sentakki.Objects;
-using osu.Game.Rulesets.Sentakki.Objects.Drawables;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Sentakki.Tests.Objects
 {
-    [TestFixture]
-    public class TestSceneTapNote : OsuTestScene
+    public class TestSceneTapNote : TestSceneSentakkiHitObject
     {
-        private readonly Container content;
-        protected override Container<Drawable> Content => content;
-
-        private int depthIndex;
-
-        public TestSceneTapNote()
-        {
-            base.Content.Add(content = new SentakkiInputManager(new RulesetInfo { ID = 0 }));
-
-            AddStep("Miss Single", () => testSingle());
-            AddStep("Hit Single", () => testSingle(true));
-            AddUntilStep("Wait for object despawn", () => !Children.Any(h => (h is DrawableSentakkiHitObject) && (h as DrawableSentakkiHitObject).AllJudged == false));
-        }
-
-        private void testSingle(bool auto = false)
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
-            var circle = new Tap
+            var beatmap = new Beatmap<SentakkiHitObject>()
             {
-                StartTime = Time.Current + 1000,
+                BeatmapInfo =
+                {
+                    Ruleset = CreateRuleset()?.RulesetInfo ?? ruleset
+                },
             };
+            for (int i = 0; i < 8; ++i)
+                beatmap.HitObjects.Add(new Tap
+                {
+                    StartTime = 500 + (100 * i),
+                    Lane = i
+                });
 
-            circle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { });
-
-            Add(new DrawableTap(circle)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Depth = depthIndex++,
-                Auto = auto
-            });
+            return beatmap;
         }
     }
 }