From c4e707b38e33d2f1edaa21bdd43eb601c7f59d63 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 21 Dec 2020 21:47:01 +0900
Subject: [PATCH 1/6] Add time-tag assert to test time-tag comparsion.

---
 .../Asserts/TimeTagAssert.cs                  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 osu.Game.Rulesets.Karaoke.Tests/Asserts/TimeTagAssert.cs

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Asserts/TimeTagAssert.cs b/osu.Game.Rulesets.Karaoke.Tests/Asserts/TimeTagAssert.cs
new file mode 100644
index 000000000..3dc5614bf
--- /dev/null
+++ b/osu.Game.Rulesets.Karaoke.Tests/Asserts/TimeTagAssert.cs
@@ -0,0 +1,25 @@
+// Copyright (c) andy840119 <andy840119@gmail.com>. Licensed under the GPL Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Rulesets.Karaoke.Objects;
+
+namespace osu.Game.Rulesets.Karaoke.Tests.Asserts
+{
+    public class TimeTagAssert : Assert
+    {
+        public static void AreEqual(IReadOnlyList<TimeTag> expect, IReadOnlyList<TimeTag> actually)
+        {
+            AreEqual(expect?.Count, actually?.Count);
+            if (expect == null || actually == null)
+                return;
+
+            for (int i = 0; i < expect.Count; i++)
+            {
+                AreEqual(expect[i].Index, actually[i].Index);
+                AreEqual(expect[i].Time, actually[i].Time);
+            }
+        }
+    }
+}

From 9dcbaa36aa8eec51fd4648c0651b5c836c7823b5 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 21 Dec 2020 21:47:46 +0900
Subject: [PATCH 2/6] should throw exception if actual tag format are not
 right.

---
 .../Helper/TestCaseTagHelper.cs                            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs b/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs
index eaca9c3ff..f3a168611 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Helper/TestCaseTagHelper.cs
@@ -1,6 +1,7 @@
 // Copyright (c) andy840119 <andy840119@gmail.com>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using osu.Framework.Graphics.Sprites;
@@ -26,7 +27,7 @@ public static RubyTag ParseRubyTag(string str)
             var regex = new Regex("(?<start>[-0-9]+),(?<end>[-0-9]+)]:(?<ruby>.*$)");
             var result = regex.Match(str);
             if (!result.Success)
-                return new RubyTag();
+                throw new ArgumentException(nameof(str));
 
             var startIndex = int.Parse(result.Groups["start"]?.Value);
             var endIndex = int.Parse(result.Groups["end"]?.Value);
@@ -56,7 +57,7 @@ public static RomajiTag ParseRomajiTag(string str)
             var regex = new Regex("(?<start>[-0-9]+),(?<end>[-0-9]+)]:(?<romaji>.*$)");
             var result = regex.Match(str);
             if (!result.Success)
-                return new RomajiTag();
+                throw new ArgumentException(nameof(str));
 
             var startIndex = int.Parse(result.Groups["start"]?.Value);
             var endIndex = int.Parse(result.Groups["end"]?.Value);
@@ -86,7 +87,7 @@ public static TimeTag ParseTimeTag(string str)
             var regex = new Regex("(?<index>[-0-9]+),(?<state>start|end)]:(?<time>[-0-9]+|s*|)");
             var result = regex.Match(str);
             if (!result.Success)
-                return new TimeTag(new TimeTagIndex());
+                throw new ArgumentException(nameof(str));
 
             var index = int.Parse(result.Groups["index"]?.Value);
             var state = result.Groups["state"]?.Value == "start" ? TimeTagIndex.IndexState.Start : TimeTagIndex.IndexState.End;

From 6dbec78975b6ad8243a2d1c9eab46442bdeaf0b0 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 21 Dec 2020 21:48:13 +0900
Subject: [PATCH 3/6] Use new created time tag assert.

---
 .../Utils/LyricUtilsTest.cs                   | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Utils/LyricUtilsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Utils/LyricUtilsTest.cs
index 1e8bf4702..9e9f33fab 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Utils/LyricUtilsTest.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Utils/LyricUtilsTest.cs
@@ -6,6 +6,7 @@
 using System.Globalization;
 using NUnit.Framework;
 using osu.Game.Rulesets.Karaoke.Objects;
+using osu.Game.Rulesets.Karaoke.Tests.Asserts;
 using osu.Game.Rulesets.Karaoke.Tests.Helper;
 using osu.Game.Rulesets.Karaoke.Utils;
 
@@ -52,8 +53,8 @@ public void TestSeparateLyricTimeTag(string text, string[] timeTags, int splitIn
 
             var (firstLyric, secondLyric) = LyricUtils.SplitLyric(lyric, splitIndex);
 
-            testTimeTags(firstLyric.TimeTags, TestCaseTagHelper.ParseTimeTags(firstTimeTags));
-            testTimeTags(secondLyric.TimeTags, TestCaseTagHelper.ParseTimeTags(secondTimeTags));
+            TimeTagAssert.AreEqual(firstLyric.TimeTags, TestCaseTagHelper.ParseTimeTags(firstTimeTags));
+            TimeTagAssert.AreEqual(secondLyric.TimeTags, TestCaseTagHelper.ParseTimeTags(secondTimeTags));
         }
 
         [TestCase("カラオケ", new[] { "[0,1]:か", "[1,2]:ら", "[2,3]:お", "[3,4]:け" }, 2,
@@ -238,7 +239,7 @@ public void TestRemoveTextTimeTag(string[] timeTags, int position, int count, st
                 TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags),
             };
             LyricUtils.RemoveText(lyric, position, count);
-            testTimeTags(lyric.TimeTags, TestCaseTagHelper.ParseTimeTags(actualTimeTags));
+            TimeTagAssert.AreEqual(lyric.TimeTags, TestCaseTagHelper.ParseTimeTags(actualTimeTags));
         }
 
         [TestCase("kake", 2, "rao", "karaoke")]
@@ -296,7 +297,7 @@ public void TestAddTextTimeTag(string[] timeTags, int position, string addedText
                 TimeTags = TestCaseTagHelper.ParseTimeTags(timeTags),
             };
             LyricUtils.AddText(lyric, position, addedText);
-            testTimeTags(lyric.TimeTags, TestCaseTagHelper.ParseTimeTags(actualTimeTags));
+            TimeTagAssert.AreEqual(lyric.TimeTags, TestCaseTagHelper.ParseTimeTags(actualTimeTags));
         }
 
         #endregion
@@ -467,22 +468,5 @@ public void TestCombineLayoutLanguage(int? firstLcid, int? secondLcid, int? actu
         }
 
         #endregion
-
-        #region helper
-
-        private void testTimeTags(IReadOnlyList<TimeTag> expect, IReadOnlyList<TimeTag> actually)
-        {
-            Assert.AreEqual(expect?.Count, actually?.Count);
-            if (expect == null || actually == null)
-                return;
-
-            for (int i = 0; i < expect.Count; i++)
-            {
-                Assert.AreEqual(expect[i].Index, actually[i].Index);
-                Assert.AreEqual(expect[i].Time, actually[i].Time);
-            }
-        }
-
-        #endregion
     }
 }

From be6d174af3d1f4cdbd33bcefa41e3382855405a6 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 21 Dec 2020 21:48:41 +0900
Subject: [PATCH 4/6] Re-write test case source.

---
 .../TimeTags/BaseTimeTagGeneratorTest.cs      | 37 ++------
 .../TimeTags/Ja/JaTimeTagGeneratorTest.cs     | 95 +++++++++++--------
 .../TimeTags/Zh/ZhTimeTagGeneratorTest.cs     |  8 +-
 3 files changed, 68 insertions(+), 72 deletions(-)

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/BaseTimeTagGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/BaseTimeTagGeneratorTest.cs
index b47246a3c..f4177efd2 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/BaseTimeTagGeneratorTest.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/BaseTimeTagGeneratorTest.cs
@@ -2,33 +2,32 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Karaoke.Edit.Generator.TimeTags;
 using osu.Game.Rulesets.Karaoke.Objects;
+using osu.Game.Rulesets.Karaoke.Tests.Asserts;
+using osu.Game.Rulesets.Karaoke.Tests.Helper;
 
 namespace osu.Game.Rulesets.Karaoke.Tests.Edit.Generator.TimeTags
 {
     public abstract class BaseTimeTagGeneratorTest<TTimeTagGenerator, TConfig>
         where TTimeTagGenerator : TimeTagGenerator<TConfig> where TConfig : TimeTagGeneratorConfig, new()
     {
-        protected void RunTimeTagCheckTest(string lyricText, double[] index, TConfig config)
+        protected void RunTimeTagCheckTest(string text, string[] actualTimeTags, TConfig config)
         {
-            var lyric = generateLyric(lyricText);
-            RunTimeTagCheckTest(lyric, index, config);
+            var lyric = new Lyric { Text = text };
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
-        protected void RunTimeTagCheckTest(Lyric lyric, double[] index, TConfig config)
+        protected void RunTimeTagCheckTest(Lyric lyric, string[] actualTimeTags, TConfig config)
         {
             var generator = Activator.CreateInstance(typeof(TTimeTagGenerator), config) as TTimeTagGenerator;
 
             // create time tag and actually time tag.
-            var timeTags = getTimeTagIndex(generator?.CreateTimeTags(lyric));
-            var actualIndexed = getTimeTagIndexByArray(index);
+            var timeTags = generator?.CreateTimeTags(lyric);
+            var actualIndexed = TestCaseTagHelper.ParseTimeTags(actualTimeTags);
 
             // check should be equal
-            Assert.AreEqual(timeTags, actualIndexed);
+            TimeTagAssert.AreEqual(timeTags, actualIndexed);
         }
 
         protected TConfig GeneratorConfig(params string[] properties)
@@ -51,23 +50,5 @@ protected TConfig GeneratorConfig(params string[] properties)
 
             return config;
         }
-
-        #region test helper
-
-        private TimeTagIndex[] getTimeTagIndex(TimeTag[] timeTags)
-            => timeTags.Select((v, i) => v.Index).ToArray();
-
-        private TimeTagIndex[] getTimeTagIndexByArray(double[] timeTags)
-            => timeTags.Select(timeTag =>
-            {
-                var state = Math.Abs(timeTag) % 1 == 0.5 ? TimeTagIndex.IndexState.End : TimeTagIndex.IndexState.Start;
-                var index = (int)timeTag;
-                return new TimeTagIndex(index, state);
-            }).ToArray();
-
-        private Lyric generateLyric(string text)
-            => new Lyric { Text = text };
-
-        #endregion
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/Ja/JaTimeTagGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/Ja/JaTimeTagGeneratorTest.cs
index c9533d645..ab41ad029 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/Ja/JaTimeTagGeneratorTest.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/Ja/JaTimeTagGeneratorTest.cs
@@ -11,87 +11,87 @@ namespace osu.Game.Rulesets.Karaoke.Tests.Edit.Generator.TimeTags.Ja
     public class JaTimeTagGeneratorTest : BaseTimeTagGeneratorTest<JaTimeTagGenerator, JaTimeTagGeneratorConfig>
     {
         [Ignore("This feature has not been implemented")]
-        public void TestLyricWithCheckLineEnd(string lyric, double[] index, bool applyConfig)
+        public void TestLyricWithCheckLineEnd(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(applyConfig ? nameof(JaTimeTagGeneratorConfig.CheckLineEnd) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
-        [TestCase("か", new double[] { 0 }, false)]
-        [TestCase("か", new[] { 0, 0.5 }, true)]
-        public void TestLyricWithCheckLineEndKeyUp(string lyric, double[] index, bool applyConfig)
+        [TestCase("か", new[] { "[0,start]:" }, false)]
+        [TestCase("か", new[] { "[0,start]:", "[0,end]:" }, true)]
+        public void TestLyricWithCheckLineEndKeyUp(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(applyConfig ? nameof(JaTimeTagGeneratorConfig.CheckLineEndKeyUp) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
         [Ignore("This feature has not been implemented")]
-        public void TestLyricWithCheckBlankLine(string lyric, double[] index, bool applyConfig)
+        public void TestLyricWithCheckBlankLine(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(applyConfig ? nameof(JaTimeTagGeneratorConfig.CheckBlankLine) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
-        [TestCase("     ", new double[] { 0, 1, 2, 3, 4 }, false)]
-        [TestCase("     ", new double[] { 0 }, true)]
-        public void TestLyricWithCheckWhiteSpace(string lyric, double[] index, bool applyConfig)
+        [TestCase("     ", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[3,start]:", "[4,start]:" }, false)]
+        [TestCase("     ", new[] { "[0,start]:" }, true)]
+        public void TestLyricWithCheckWhiteSpace(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(applyConfig ? nameof(JaTimeTagGeneratorConfig.CheckWhiteSpace) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
         [Ignore("This feature has not been implemented")]
-        public void TestLyricWithCheckWhiteSpaceKeyUp(string lyric, double[] index, bool applyConfig)
+        public void TestLyricWithCheckWhiteSpaceKeyUp(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(applyConfig ? nameof(JaTimeTagGeneratorConfig.CheckWhiteSpaceKeyUp) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
-        [TestCase("a　b　c　d　e", new double[] { 0, 2, 4, 6, 8 }, false)]
-        [TestCase("a　b　c　d　e", new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, true)]
-        [TestCase("Ａ　Ｂ　Ｃ　Ｄ　Ｅ", new double[] { 0, 2, 4, 6, 8 }, false)]
-        [TestCase("Ａ　Ｂ　Ｃ　Ｄ　Ｅ", new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, true)]
-        public void TestLyricWithCheckWhiteSpaceAlphabet(string lyric, double[] index, bool applyConfig)
+        [TestCase("a　b　c　d　e", new[] { "[0,start]:", "[2,start]:", "[4,start]:", "[6,start]:", "[8,start]:" }, false)]
+        [TestCase("a　b　c　d　e", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[3,start]:", "[4,start]:", "[5,start]:", "[6,start]:", "[7,start]:", "[8,start]:" }, true)]
+        [TestCase("Ａ　Ｂ　Ｃ　Ｄ　Ｅ", new[] { "[0,start]:", "[2,start]:", "[4,start]:", "[6,start]:", "[8,start]:" }, false)]
+        [TestCase("Ａ　Ｂ　Ｃ　Ｄ　Ｅ", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[3,start]:", "[4,start]:", "[5,start]:", "[6,start]:", "[7,start]:", "[8,start]:" }, true)]
+        public void TestLyricWithCheckWhiteSpaceAlphabet(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(nameof(JaTimeTagGeneratorConfig.CheckWhiteSpace),
                 applyConfig ? nameof(JaTimeTagGeneratorConfig.CheckWhiteSpaceAlphabet) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
-        [TestCase("0　1　2　3　4", new double[] { 0, 2, 4, 6, 8 }, false)]
-        [TestCase("0　1　2　3　4", new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, true)]
-        [TestCase("０　１　２　３　４", new double[] { 0, 2, 4, 6, 8 }, false)]
-        [TestCase("０　１　２　３　４", new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, true)]
-        public void TestLyricWithCheckWhiteSpaceDigit(string lyric, double[] index, bool applyConfig)
+        [TestCase("0　1　2　3　4", new[] { "[0,start]:", "[2,start]:", "[4,start]:", "[6,start]:", "[8,start]:" }, false)]
+        [TestCase("0　1　2　3　4", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[3,start]:", "[4,start]:", "[5,start]:", "[6,start]:", "[7,start]:", "[8,start]:" }, true)]
+        [TestCase("０　１　２　３　４", new[] { "[0,start]:", "[2,start]:", "[4,start]:", "[6,start]:", "[8,start]:" }, false)]
+        [TestCase("０　１　２　３　４", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[3,start]:", "[4,start]:", "[5,start]:", "[6,start]:", "[7,start]:", "[8,start]:" }, true)]
+        public void TestLyricWithCheckWhiteSpaceDigit(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(nameof(JaTimeTagGeneratorConfig.CheckWhiteSpace),
                 applyConfig ? nameof(JaTimeTagGeneratorConfig.CheckWhiteSpaceDigit) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
-        [TestCase("!　!　!　!　！", new double[] { 0, 2, 4, 6, 8 }, false)]
-        [TestCase("!　!　!　!　！", new double[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, true)]
-        public void TestLyricWitCheckWhiteSpaceAsciiSymbol(string lyric, double[] index, bool applyConfig)
+        [TestCase("!　!　!　!　！", new[] { "[0,start]:", "[2,start]:", "[4,start]:", "[6,start]:", "[8,start]:" }, false)]
+        [TestCase("!　!　!　!　！", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[3,start]:", "[4,start]:", "[5,start]:", "[6,start]:", "[7,start]:", "[8,start]:" }, true)]
+        public void TestLyricWitCheckWhiteSpaceAsciiSymbol(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(nameof(JaTimeTagGeneratorConfig.CheckWhiteSpace),
                 applyConfig ? nameof(JaTimeTagGeneratorConfig.CheckWhiteSpaceAsciiSymbol) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
-        [TestCase("がんばって", new double[] { 0, 2, 4 }, false)]
-        [TestCase("がんばって", new double[] { 0, 1, 2, 4 }, true)]
-        public void TestLyricWithCheckWhiteCheckん(string lyric, double[] index, bool applyConfig)
+        [TestCase("がんばって", new[] { "[0,start]:", "[2,start]:", "[4,start]:" }, false)]
+        [TestCase("がんばって", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[4,start]:" }, true)]
+        public void TestLyricWithCheckWhiteCheckん(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(applyConfig ? nameof(JaTimeTagGeneratorConfig.Checkん) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
-        [TestCase("買って", new double[] { 0, 2 }, false)]
-        [TestCase("買って", new double[] { 0, 1, 2 }, true)]
-        public void TestLyricWithCheckっ(string lyric, double[] index, bool applyConfig)
+        [TestCase("買って", new[] { "[0,start]:", "[2,start]:" }, false)]
+        [TestCase("買って", new[] { "[0,start]:", "[1,start]:", "[2,start]:" }, true)]
+        public void TestLyricWithCheckっ(string lyric, string[] actualTimeTags, bool applyConfig)
         {
             var config = GeneratorConfig(applyConfig ? nameof(JaTimeTagGeneratorConfig.Checkっ) : null);
-            RunTimeTagCheckTest(lyric, index, config);
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
 
         [Test]
@@ -118,8 +118,23 @@ public void TestTagWithRubyLyric()
                 }
             };
 
-            var result = new double[] { 0, 0, 0, 2, 4, 6, 7, 7, 8, 9, 10, 12, 13 };
-            RunTimeTagCheckTest(lyric, result, config);
+            var actualTimeTags = new[]
+            {
+                "[0,start]:",
+                "[0,start]:",
+                "[0,start]:",
+                "[2,start]:",
+                "[4,start]:",
+                "[6,start]:",
+                "[7,start]:",
+                "[7,start]:",
+                "[8,start]:",
+                "[9,start]:",
+                "[10,start]:",
+                "[12,start]:",
+                "[13,start]:"
+            };
+            RunTimeTagCheckTest(lyric, actualTimeTags, config);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/Zh/ZhTimeTagGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/Zh/ZhTimeTagGeneratorTest.cs
index ad261108b..dd11354de 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/Zh/ZhTimeTagGeneratorTest.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/TimeTags/Zh/ZhTimeTagGeneratorTest.cs
@@ -9,10 +9,10 @@ namespace osu.Game.Rulesets.Karaoke.Tests.Edit.Generator.TimeTags.Zh
     [TestFixture]
     public class ZhTimeTagGeneratorTest : BaseTimeTagGeneratorTest<ZhTimeTagGenerator, ZhTimeTagGeneratorConfig>
     {
-        [TestCase("測試一些歌詞", new[] { 0, 1, 2, 3, 4, 5, 5.5 })]
-        [TestCase("拉拉拉~~~", new[] { 0, 1, 2, 5.5 })]
-        [TestCase("拉~拉~拉~", new[] { 0, 2, 4, 5.5 })]
-        public void TestLyricWithCheckLineEndKeyUp(string lyric, double[] index)
+        [TestCase("測試一些歌詞", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[3,start]:", "[4,start]:", "[5,start]:", "[5,end]:" })]
+        [TestCase("拉拉拉~~~", new[] { "[0,start]:", "[1,start]:", "[2,start]:", "[5,end]:" })]
+        [TestCase("拉~拉~拉~", new[] { "[0,start]:", "[2,start]:", "[4,start]:", "[5,end]:" })]
+        public void TestLyricWithCheckLineEndKeyUp(string lyric, string[] index)
         {
             var config = GeneratorConfig(nameof(ZhTimeTagGeneratorConfig.CheckLineEndKeyUp));
             RunTimeTagCheckTest(lyric, index, config);

From 65d61a5323907a68e81f9486ae259fda5091e2e6 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 21 Dec 2020 21:52:26 +0900
Subject: [PATCH 5/6] Re-write ruby generator test case source.

---
 .../RubyTags/Ja/JaRubyTagGeneratorTest.cs     | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/RubyTags/Ja/JaRubyTagGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/RubyTags/Ja/JaRubyTagGeneratorTest.cs
index fdfb7cc6e..882be9bc9 100644
--- a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/RubyTags/Ja/JaRubyTagGeneratorTest.cs
+++ b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/RubyTags/Ja/JaRubyTagGeneratorTest.cs
@@ -2,55 +2,51 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using NUnit.Framework;
 using osu.Game.Rulesets.Karaoke.Edit.Generator.RubyTags.Ja;
 using osu.Game.Rulesets.Karaoke.Objects;
+using osu.Game.Rulesets.Karaoke.Tests.Helper;
 
 namespace osu.Game.Rulesets.Karaoke.Tests.Edit.Generator.RubyTags.Ja
 {
     [TestFixture]
     public class JaRubyTagGeneratorTest
     {
-        [TestCase("花火大会", new[] { "はなび", "たいかい" })]
+        [TestCase("花火大会", new[] { "[0,2]:はなび", "[2,4]:たいかい" })]
         [TestCase("はなび", new string[] { })]
-        public void TestCreateRubyTags(string text, string[] ruby)
+        public void TestCreateRubyTags(string text, string[] actualRuby)
         {
             var config = generatorConfig(null);
-            RunRubyCheckTest(text, ruby, config);
+            RunRubyCheckTest(text, actualRuby, config);
         }
 
-        [TestCase("花火大会", new[] { "ハナビ", "タイカイ" })]
+        [TestCase("花火大会", new[] { "[0,2]:ハナビ", "[2,4]:タイカイ" })]
         [TestCase("ハナビ", new string[] { })]
-        public void TestCreateRubyTagsWithRubyAsKatakana(string text, string[] ruby)
+        public void TestCreateRubyTagsWithRubyAsKatakana(string text, string[] actualRuby)
         {
             var config = generatorConfig(nameof(JaRubyTagGeneratorConfig.RubyAsKatakana));
-            RunRubyCheckTest(text, ruby, config);
+            RunRubyCheckTest(text, actualRuby, config);
         }
 
-        [TestCase("はなび", new[] { "はな", "び" })]
-        [TestCase("ハナビ", new[] { "はなび" })]
-        public void TestCreateRubyTagsWithEnableDuplicatedRuby(string text, string[] ruby)
+        [TestCase("はなび", new[] { "[0,2]:はな", "[2,3]:び" })]
+        [TestCase("ハナビ", new[] { "[0,3]:はなび" })]
+        public void TestCreateRubyTagsWithEnableDuplicatedRuby(string text, string[] actualRuby)
         {
             var config = generatorConfig(nameof(JaRubyTagGeneratorConfig.EnableDuplicatedRuby));
-            RunRubyCheckTest(text, ruby, config);
+            RunRubyCheckTest(text, actualRuby, config);
         }
 
         #region test helper
 
-        protected void RunRubyCheckTest(string text, string[] ruby, JaRubyTagGeneratorConfig config)
+        protected void RunRubyCheckTest(string text, string[] actualRuby, JaRubyTagGeneratorConfig config)
         {
             var generator = new JaRubyTagGenerator(config);
 
             var lyric = new Lyric { Text = text };
             var rubyTags = generator.CreateRubyTags(lyric);
+            var actualRubyTags = TestCaseTagHelper.ParseRubyTags(actualRuby);
 
-            Assert.AreEqual(rubyTags.Length, ruby.Length);
-
-            foreach (var rubyTag in rubyTags)
-            {
-                Assert.IsTrue(ruby.Contains(rubyTag.Text));
-            }
+            Assert.AreEqual(rubyTags, actualRubyTags);
         }
 
         private JaRubyTagGeneratorConfig generatorConfig(params string[] properties)

From 951f136053906c3f1020040d7725850dcad002c5 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 21 Dec 2020 21:52:49 +0900
Subject: [PATCH 6/6] Re-format file also.

---
 .../Responses/KaraokeChangelogBuild.cs        | 160 +++++++++---------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/osu.Game.Rulesets.Karaoke/Online/API/Requests/Responses/KaraokeChangelogBuild.cs b/osu.Game.Rulesets.Karaoke/Online/API/Requests/Responses/KaraokeChangelogBuild.cs
index e86114115..1529951b5 100644
--- a/osu.Game.Rulesets.Karaoke/Online/API/Requests/Responses/KaraokeChangelogBuild.cs
+++ b/osu.Game.Rulesets.Karaoke/Online/API/Requests/Responses/KaraokeChangelogBuild.cs
@@ -1,80 +1,80 @@
-// Copyright (c) andy840119 <andy840119@gmail.com>. Licensed under the GPL Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-namespace osu.Game.Rulesets.Karaoke.Online.API.Requests.Responses
-{
-    public class KaraokeChangelogBuild
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="organization">Account or organization name</param>
-        /// <param name="project">Project name</param>
-        /// <param name="branch">Branch name</param>
-        public KaraokeChangelogBuild(string organization, string project, string branch = "master")
-        {
-            OrganizationName = organization;
-            ProjectName = project;
-            Branch = branch;
-            Versions = new VersionNavigation();
-        }
-
-        /// <summary>
-        /// Organization name
-        /// </summary>
-        public string OrganizationName { get; }
-
-        /// <summary>
-        /// Project name
-        /// </summary>
-        public string ProjectName { get; }
-
-        /// <summary>
-        /// Branch name
-        /// </summary>
-        public string Branch { get; }
-
-        /// <summary>
-        /// The URL of the loaded document.
-        /// </summary>
-        public string DocumentUrl => $"https://raw.githubusercontent.com/{OrganizationName}/{ProjectName}/{Branch}/{Path}/";
-
-        /// <summary>
-        /// The base URL for all root-relative links.
-        /// </summary>
-        public string RootUrl { get; set; }
-
-        /// <summary>
-        /// Path of the project
-        /// </summary>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Path to download readme url
-        /// </summary>
-        public string ReadmeDownloadUrl => $"{DocumentUrl}README.md";
-
-        /// <summary>
-        /// Display version
-        /// </summary>
-        public string DisplayVersion { get; set; }
-
-        /// <summary>
-        /// Version
-        /// </summary>
-        public VersionNavigation Versions { get; }
-
-        public class VersionNavigation
-        {
-            /// <summary>
-            /// Next version
-            /// </summary>
-            public KaraokeChangelogBuild Next { get; set; }
-
-            /// <summary>
-            /// Previous version
-            /// </summary>
-            public KaraokeChangelogBuild Previous { get; set; }
-        }
-    }
-}
+// Copyright (c) andy840119 <andy840119@gmail.com>. Licensed under the GPL Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Rulesets.Karaoke.Online.API.Requests.Responses
+{
+    public class KaraokeChangelogBuild
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="organization">Account or organization name</param>
+        /// <param name="project">Project name</param>
+        /// <param name="branch">Branch name</param>
+        public KaraokeChangelogBuild(string organization, string project, string branch = "master")
+        {
+            OrganizationName = organization;
+            ProjectName = project;
+            Branch = branch;
+            Versions = new VersionNavigation();
+        }
+
+        /// <summary>
+        /// Organization name
+        /// </summary>
+        public string OrganizationName { get; }
+
+        /// <summary>
+        /// Project name
+        /// </summary>
+        public string ProjectName { get; }
+
+        /// <summary>
+        /// Branch name
+        /// </summary>
+        public string Branch { get; }
+
+        /// <summary>
+        /// The URL of the loaded document.
+        /// </summary>
+        public string DocumentUrl => $"https://raw.githubusercontent.com/{OrganizationName}/{ProjectName}/{Branch}/{Path}/";
+
+        /// <summary>
+        /// The base URL for all root-relative links.
+        /// </summary>
+        public string RootUrl { get; set; }
+
+        /// <summary>
+        /// Path of the project
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Path to download readme url
+        /// </summary>
+        public string ReadmeDownloadUrl => $"{DocumentUrl}README.md";
+
+        /// <summary>
+        /// Display version
+        /// </summary>
+        public string DisplayVersion { get; set; }
+
+        /// <summary>
+        /// Version
+        /// </summary>
+        public VersionNavigation Versions { get; }
+
+        public class VersionNavigation
+        {
+            /// <summary>
+            /// Next version
+            /// </summary>
+            public KaraokeChangelogBuild Next { get; set; }
+
+            /// <summary>
+            /// Previous version
+            /// </summary>
+            public KaraokeChangelogBuild Previous { get; set; }
+        }
+    }
+}