[Test] 重构测试代码比较音符相等的整体逻辑；同时修复若干问题。

Author: Starrah

parser/chu/C2sParser.cs

@@ -55,6 +55,7 @@ public override (ChuChart, List<Alert>) Parse(string text)
         }
 
         FillAllPrevious(chart, alerts, _rawTargetNote);
+        chart.Sort();
         return (chart, alerts);
     }
 

parser/chu/SusParser.cs

@@ -58,6 +58,7 @@ public override (ChuChart, List<Alert>) Parse(string text)
         }
 
         FillAllPrevious(chart, alerts);
+        chart.Sort();
         return (chart, alerts);
     }
 

parser/chu/UgcParser.cs

@@ -49,6 +49,7 @@ public override (ChuChart, List<Alert>) Parse(string text)
 
         FinalizeUgcSflDurations(chart);
         FillAllPrevious(chart, alerts);
+        chart.Sort();
         return (chart, alerts);
     }
 

tests/chu/ChuTests.cs

@@ -1,4 +1,3 @@
-using System.Reflection;
 using MuConvert.chu;
 using MuConvert.utils;
 using Rationals;
@@ -7,6 +6,9 @@ namespace MuConvert.Tests.chu;
 
 public class ChuTests
 {
+    private static readonly Rational Tol768 = new(1, 768);
+    private static readonly Rational Tol384 = new(1, 384);
+
     private static string TestsetDir => Path.Combine(AppContext.BaseDirectory, "..", "..", "..", "chu", "testset");
     private static string OfficialDir => Path.Combine(TestsetDir, "官谱");
     private static string CustomDir => Path.Combine(TestsetDir, "自制谱");
@@ -32,130 +34,97 @@ public void C2sRoundTrip(string c2sPath)
         var (reparsed, _) = new C2sParser().Parse(rt);
 
         Assert.Equal(chart.Notes.Count, reparsed.Notes.Count);
-
-        var originalSnapshots = chart.Notes
-            .Select(SnapshotNote)
-            .OrderBy(s => s)
-            .ToArray();
-
-        var reparsedSnapshots = reparsed.Notes
-            .Select(SnapshotNote)
-            .OrderBy(s => s)
-            .ToArray();
-
-        Assert.Equal(originalSnapshots, reparsedSnapshots);
+        AssertNotesEqual(chart.Notes, reparsed.Notes);
     }
 
-    /// <summary>
-    /// Builds a stable, comparable string from a note's public instance properties (name-sorted)
-    /// so round-trip tests verify no field loss without hard-coding each property in the test.
-    /// Omits <see cref="ChuNote.ExtraData"/> and <see cref="ChuNote.EndTime"/> (redundant with Time/Duration or not stable across formats).
-    /// </summary>
-    private static string SnapshotNote(ChuNote note)
+    private static void AssertNotesEqual(IReadOnlyList<ChuNote> expected_, IReadOnlyList<ChuNote> actual_)
     {
-        string F(object? v, string field) => v switch
+        const string EOF = "<EOF>";
+        List<ChuNote> expected = expected_.ToList();
+        List<ChuNote> actual = actual_.ToList();
+        
+        for (var i = 0; i < Math.Max(expected.Count, actual.Count); i++)
         {
-            Rational r => r.CanonicalForm.ToString(),
-            List<int> list => string.Join(",", list),
-            string s => s switch
+            bool result;
+            if (i >= expected.Count || i >= actual.Count) result = false;
+            else 
             {
-                "DEF" => "",
-                "A" when note.Type == "FLK" => "L",
-                _ => s
-            },
-            null => "",
-            _ => v.ToString() ?? "",
-        };
-
-        var firstParts = new[]
-        {
-            $"Type={note.Type}", 
-            $"Time={note.Time}", 
-            $"Cell={note.Cell}",
-            $"Width={note.Width}",
-        };
-        var propParts = typeof(ChuNote).GetProperties(BindingFlags.Instance | BindingFlags.Public)
-            .OrderBy(p => p.Name)
-            .Where(p => p.Name is not ("EndTime" or "Type" or "Time" or "Cell" or "Width"))
-            .Select(p => $"{p.Name}={F(p.GetValue(note), p.Name)}");
-        var fieldParts = typeof(ChuNote).GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)
-            .OrderBy(f => f.Name)
-            .Select(f => $"{f.Name}={F(f.GetValue(note), f.Name)}");
-        return string.Join("|", firstParts.Concat(propParts).Concat(fieldParts));
+                result = CompareNote(expected[i], actual[i]);
+                if (!result)
+                {
+                    // 尝试同一时刻的其他行有无相同的，如果有，交换之
+                    var j = i + 1;
+                    while (j < expected.Count && expected[j].Time == actual[i].Time)
+                    {
+                        if (CompareNote(expected[j], actual[i]))
+                        {
+                            (expected[j], expected[i]) = (expected[i], expected[j]);
+                            result = true;
+                            break;
+                        }
+                        j++;
+                    }
+                }
+            }
+
+            if (!result) {
+                Assert.Fail(
+                    $"Note mismatch at index {i}:{Environment.NewLine}" +
+                    $"EXPECTED: {(i < expected.Count ? FormatNote(expected[i]) : EOF)}{Environment.NewLine}" +
+                    $"ACTUAL  : {(i < actual.Count ? FormatNote(actual[i]) : EOF)}");
+            }
+        }
     }
 
     /// <summary>
-    /// 将 UGC 网格上的 <see cref="ChuNote"/> 的 Time / Duration 投影为「经 C2S 生成器写出再解析」后等价的分数（C2S 小节 tick = <paramref name="c2sResolution"/>）。
+    /// 比较两个音符是否实质等同；时间与时长等字段可命中宽容规则（见测试类内常量与分支注释）。
     /// </summary>
-    private static ChuNote UgcNoteScaledToC2sTicks(ChuNote n, int ugcTicksPerBeat, int c2sResolution)
+    public static bool CompareNote(ChuNote expected, ChuNote actual)
     {
-        var tpmUgc = ugcTicksPerBeat * 4;
-        var (m, oU) = Utils.BarAndTick(n.Time, tpmUgc);
-        var oC = (int)Math.Round((double)oU * c2sResolution / tpmUgc);
-        var time = m + new Rational(oC, c2sResolution);
-        var dur = new Rational(Utils.Tick(n.Duration, c2sResolution), c2sResolution);
-        return CloneChuNoteWithTiming(n, time, dur);
+        if (expected.Type != actual.Type) return false;
+        if (!TimesEquivalent(expected.Time, actual.Time)) return false;
+        if (!DurationsEquivalent(expected, actual)) return false;
+        if (expected.Cell != actual.Cell || expected.Width != actual.Width) return false;
+        if (expected.EndCell != actual.EndCell || expected.EndWidth != actual.EndWidth) return false;
+        if (expected.Height != actual.Height || expected.EndHeight != actual.EndHeight) return false;
+        if (expected.CrushInterval != actual.CrushInterval) return false;
+        if (!TagsEquivalent(expected, actual)) return false;
+        if (expected.TargetNote != actual.TargetNote) return false;
+        return true;
     }
 
+    /// <summary>规则 (a)：time 相差 ≤ 1/768 视为相等。</summary>
+    private static bool TimesEquivalent(Rational a, Rational b) => (a - b).Abs() <= Tol768;
+
     /// <summary>
-    /// 将 C2S 网格上的音符投影为「经 UGC 生成器写出再解析」后等价的分数（UGC 小节 tick = <paramref name="ugcTicksPerBeat"/> × 4）。
+    /// 规则 (b)：|Δduration| ≤ 1/768，或（|Δduration| ≤ 1/384 且 |ΔendTime| ≤ 1/768）时视为 duration 语义相等。
     /// </summary>
-    private static ChuNote C2sNoteScaledToUgcTicks(ChuNote n, int ugcTicksPerBeat, int c2sResolution)
+    private static bool DurationsEquivalent(ChuNote e, ChuNote a)
     {
-        var tpmUgc = ugcTicksPerBeat * 4;
-        var (m, oC) = Utils.BarAndTick(n.Time, c2sResolution);
-        var oU = (int)Math.Round((double)oC * tpmUgc / c2sResolution);
-        var time = m + new Rational(oU, tpmUgc);
-        var dur = new Rational(Utils.Tick(n.Duration, tpmUgc), tpmUgc);
-        return CloneChuNoteWithTiming(n, time, dur);
+        var dd = (e.Duration - a.Duration).Abs().CanonicalForm;
+        return dd <= Tol768 || (dd <= Tol384 && (e.EndTime - a.EndTime).Abs() <= Tol768);
     }
 
-    private static ChuNote CloneChuNoteWithTiming(ChuNote n, Rational time, Rational duration) => new()
-    {
-        Type = n.Type,
-        Time = time,
-        Cell = n.Cell,
-        Width = n.Width,
-        Duration = duration,
-        EndCell = n.EndCell,
-        EndWidth = n.EndWidth,
-        Previous = n.Previous,
-        Tag = n.Tag,
-        Height = n.Height,
-        EndHeight = n.EndHeight,
-        CrushInterval = n.CrushInterval,
-    };
-
-    /// <summary>
-    /// 比较 UGC 与 C2S 的音符 IR：因 tick 网格不同，在各自「经对方格式写回再解析」的量化意义下比较快照。
-    /// </summary>
-    private static void AssertUgcNotesEquivalentToReparsedC2s(ChuChart ugc, ChuChart c2s, bool isUgcReference)
+    /// <summary>规则 (c)(d)：广义 Air 的 DEF/空串；FLK 的 A/L。</summary>
+    private static bool TagsEquivalent(ChuNote e, ChuNote a)
     {
-        if (isUgcReference)
+        if (e.Tag == a.Tag) return true;
+        if (ChuUtils.IsGeneralizedAir(e))
         {
-            var ugcSnaps = ugc.Notes.Where(n=>n.Type != "CLICK")
-                .OrderBy(n=>n.Time).ThenBy(n=>n.Cell).ThenBy(n=>n.Width).ThenBy(n=>n.Duration).ThenBy(n=>n.Type)
-                .Select(n => SnapshotNote(UgcNoteScaledToC2sTicks(n, 480, 384)))
-                .ToArray();
-            var c2sSnaps = c2s.Notes
-                .OrderBy(n=>n.Time).ThenBy(n=>n.Cell).ThenBy(n=>n.Width).ThenBy(n=>n.Duration).ThenBy(n=>n.Type)
-                .Select(SnapshotNote)
-                .ToArray();
-            Assert.Equal(ugcSnaps, c2sSnaps);
+            if ((e.Tag == "DEF" && a.Tag == "") || (e.Tag == "" && a.Tag == "DEF"))
+                return true;
         }
-        else
+        if (e.Type == "FLK")
         {
-            var ugcSnaps = ugc.Notes.Where(n=>n.Type != "CLICK")
-                .OrderBy(n=>n.Time).ThenBy(n=>n.Cell).ThenBy(n=>n.Width).ThenBy(n=>n.Duration).ThenBy(n=>n.Type).ThenBy(n=>n.TargetNote)
-                .Select(SnapshotNote)
-                .ToArray();
-            var c2sSnaps = c2s.Notes
-                .OrderBy(n=>n.Time).ThenBy(n=>n.Cell).ThenBy(n=>n.Width).ThenBy(n=>n.Duration).ThenBy(n=>n.Type).ThenBy(n=>n.TargetNote)
-                .Select(n => SnapshotNote(C2sNoteScaledToUgcTicks(n, 480, 384)))
-                .ToArray();
-            Assert.Equal(c2sSnaps, ugcSnaps);
+            if ((e.Tag == "A" && a.Tag == "L") || (e.Tag == "L" && a.Tag == "A"))
+                return true;
         }
+        return false;
     }
+    
+    private static string FormatNote(ChuNote n) =>
+        $"{n.Type} t={n.Time} start=({n.Cell},{n.Width}) dur={n.Duration} end=({n.EndCell},{n.EndWidth}) " +
+        $"tag={n.Tag} tgt={n.TargetNote} h=({n.Height},{n.EndHeight}) crush={n.CrushInterval}";
 
     [Theory]
     [MemberData(nameof(CustomUgcChartPaths))]
@@ -171,7 +140,7 @@ public void UgcToC2sViaGenerator(string ugcPath)
         // 再把转出来的c2s，parse回去，比较是否和一开始的ugc等价（注意不是文本 round-trip，而是 IR 等价，允许字段重排但不允许信息丢失）
         var (c2sChart, _) = new C2sParser().Parse(c2sText);
         Assert.NotEmpty(c2sChart.Notes);
-        AssertUgcNotesEquivalentToReparsedC2s(ugc, c2sChart, true);
+        AssertNotesEqual(ugc.Notes.Where(n => n.Type != "CLICK").ToList(), c2sChart.Notes);
     }
 
     [Theory]
@@ -188,6 +157,6 @@ public void C2sToUgcViaGenerator(string c2sPath)
         // 再把转出来的ugc，parse回去，比较是否和一开始的c2s等价
         var (ugcReparsed, _) = new UgcParser().Parse(ugcText);
         Assert.NotEmpty(ugcReparsed.Notes);
-        AssertUgcNotesEquivalentToReparsedC2s(ugcReparsed, c2s, false);
+        AssertNotesEqual(c2s.Notes, ugcReparsed.Notes.Where(n => n.Type != "CLICK").ToList());
     }
 }

tests/mai/Simai转MA2测试.cs

@@ -74,19 +74,24 @@ private static void AssertTextEqual(string expected, string actual)
             var exp = i < expectedLines.Length ? expectedLines[i] : "<EOF>";
             var act = i < actualLines.Length ? actualLines[i] : "<EOF>";
             var result = CompareLine(exp, act);
-            if (!result)
+            if (!result && i < actualLines.Length)
             {
                 // 尝试同一时刻的其他行有无相同的，如果有，交换之
                 var j = i + 1;
-                while (j < expectedLines.Length && IsSameTime(expectedLines[i], actualLines[j]))
+                while (j < expectedLines.Length)
                 {
                     if (CompareLine(expectedLines[j], act))
-                    {
+                    { // 匹配成功。交换之
                         (expectedLines[j], expectedLines[i]) = (expectedLines[i], expectedLines[j]);
                         result = true;
                         break;
                     }
-                    j++;
+                    else if (IsSameTime(expectedLines[j], act))
+                    { // 虽然暂时匹配失败，但是游标j还在，act同一时刻的窗口范围内。则应该允许继续比较。
+                        j++;
+                        continue;
+                    }
+                    else break; // 否则（匹配失败且j已经离开了同时刻的滑动窗口、说明未来也不再具有匹配上的可能性了），则中止匹配
                 }
             }
 

utils/Utils.cs

@@ -177,6 +177,11 @@ public static Rational Sum(this IEnumerable<Rational> source)
         return source.Aggregate(Rational.Zero, (acc, r) => acc + r);
     }
 
+    public static Rational Abs(this Rational r)
+    {
+        return r * r.Sign;
+    }
+    
     internal static Dictionary<K, V> RemoveRange<K, V>(this Dictionary<K, V> dict, IEnumerable<K> keys) where K : notnull
     {
         foreach (var key in keys) dict.Remove(key);