From f7a658450fb2592a171165b57528786d32190d0d Mon Sep 17 00:00:00 2001
From: Aaron Hong <hong.aaron.c@gmail.com>
Date: Wed, 1 Jun 2022 00:54:49 -0700
Subject: [PATCH] Move DrawableTaikoRulesetTestScene's hardcoded beatmap to
 CreateBeatmap(..) method instead of load(..) method, so that the class is
 more extensible and reusable

---
 .../DrawableTaikoRulesetTestScene.cs          | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
index f5e7304c12..2853aa32f4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
@@ -21,13 +21,29 @@ public abstract class DrawableTaikoRulesetTestScene : OsuTestScene
         protected DrawableTaikoRuleset DrawableRuleset { get; private set; }
         protected Container PlayfieldContainer { get; private set; }
 
+        protected ControlPointInfo controlPointInfo { get; private set; } 
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            var controlPointInfo = new ControlPointInfo();
+            controlPointInfo = new ControlPointInfo();
             controlPointInfo.Add(0, new TimingControlPoint());
 
-            IWorkingBeatmap beatmap = CreateWorkingBeatmap(new Beatmap
+            IWorkingBeatmap beatmap = CreateWorkingBeatmap(CreateBeatmap(new TaikoRuleset().RulesetInfo));
+
+            Add(PlayfieldContainer = new Container
+            {
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.X,
+                Height = DEFAULT_PLAYFIELD_CONTAINER_HEIGHT,
+                Children = new[] { DrawableRuleset = new DrawableTaikoRuleset(new TaikoRuleset(), beatmap.GetPlayableBeatmap(beatmap.BeatmapInfo.Ruleset)) }
+            });
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            return new Beatmap
             {
                 HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
                 BeatmapInfo = new BeatmapInfo
@@ -39,19 +55,10 @@ private void load()
                         Title = @"Sample Beatmap",
                         Author = { Username = @"peppy" },
                     },
-                    Ruleset = new TaikoRuleset().RulesetInfo
+                    Ruleset = ruleset
                 },
                 ControlPointInfo = controlPointInfo
-            });
-
-            Add(PlayfieldContainer = new Container
-            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                RelativeSizeAxes = Axes.X,
-                Height = DEFAULT_PLAYFIELD_CONTAINER_HEIGHT,
-                Children = new[] { DrawableRuleset = new DrawableTaikoRuleset(new TaikoRuleset(), beatmap.GetPlayableBeatmap(new TaikoRuleset().RulesetInfo)) }
-            });
+            };
         }
     }
 }