From 026fc2023b9d47352ce302f5a1dff3747cec6245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Sep 2020 18:10:44 +0200
Subject: [PATCH] Add visual tests for strong hit explosions

---
 .../DrawableTestStrongHit.cs                  | 44 +++++++++++++++++++
 .../Skinning/TestSceneHitExplosion.cs         | 25 +++++++----
 2 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
new file mode 100644
index 0000000000..7cb984b254
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestStrongHit.cs
@@ -0,0 +1,44 @@
+// 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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class DrawableTestStrongHit : DrawableHit
+    {
+        private readonly HitResult type;
+        private readonly bool hitBoth;
+
+        public DrawableTestStrongHit(double startTime, HitResult type = HitResult.Great, bool hitBoth = true)
+            : base(new Hit
+            {
+                IsStrong = true,
+                StartTime = startTime,
+            })
+        {
+            // in order to create nested strong hit
+            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            this.type = type;
+            this.hitBoth = hitBoth;
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
+
+            Result.Type = type;
+
+            var nestedStrongHit = (DrawableStrongNestedHit)NestedHitObjects.Single();
+            nestedStrongHit.Result.Type = hitBoth ? type : HitResult.Miss;
+        }
+
+        public override bool OnPressed(TaikoAction action) => false;
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index 2b5efec7f9..48969e0f5a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Scoring;
@@ -15,24 +14,29 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneHitExplosion : TaikoSkinnableTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        [Test]
+        public void TestNormalHit()
         {
-            AddStep("Great", () => SetContents(() => getContentFor(HitResult.Great)));
-            AddStep("Good", () => SetContents(() => getContentFor(HitResult.Good)));
-            AddStep("Miss", () => SetContents(() => getContentFor(HitResult.Miss)));
+            AddStep("Great", () => SetContents(() => getContentFor(createHit(HitResult.Great))));
+            AddStep("Good", () => SetContents(() => getContentFor(createHit(HitResult.Good))));
+            AddStep("Miss", () => SetContents(() => getContentFor(createHit(HitResult.Miss))));
         }
 
-        private Drawable getContentFor(HitResult type)
+        [Test]
+        public void TestStrongHit([Values(false, true)] bool hitBoth)
         {
-            DrawableTaikoHitObject hit;
+            AddStep("Great", () => SetContents(() => getContentFor(createStrongHit(HitResult.Great, hitBoth))));
+            AddStep("Good", () => SetContents(() => getContentFor(createStrongHit(HitResult.Good, hitBoth))));
+        }
 
+        private Drawable getContentFor(DrawableTaikoHitObject hit)
+        {
             return new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    hit = createHit(type),
+                    hit,
                     new HitExplosion(hit)
                     {
                         Anchor = Anchor.Centre,
@@ -43,5 +47,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         }
 
         private DrawableTaikoHitObject createHit(HitResult type) => new DrawableTestHit(new Hit { StartTime = Time.Current }, type);
+
+        private DrawableTaikoHitObject createStrongHit(HitResult type, bool hitBoth)
+            => new DrawableTestStrongHit(Time.Current, type, hitBoth);
     }
 }