From ef8530a379f6694a44f5e33d0896cee1bd8a72dd Mon Sep 17 00:00:00 2001 From: GeWuYou <95328647+GeWuYou@users.noreply.github.com> Date: Fri, 17 Apr 2026 23:08:53 +0800 Subject: [PATCH] =?UTF-8?q?test(UiRouterInteractionTests):=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0UI=E8=B7=AF=E7=94=B1=E4=BA=A4=E4=BA=92=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=96=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改modal验证逻辑为验证topmost元素的输入动作掩码、指针输入阻塞和操作输入阻塞属性 - 为_instanceCounter字段查找添加更详细的错误消息以提高调试可读性 - 验证_instanceCounter字段类型是否仍为int类型以确保测试稳定性 - 移除对field变量的null合并操作符调用以简化代码逻辑 --- GFramework.Game.Tests/UI/UiRouterInteractionTests.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/GFramework.Game.Tests/UI/UiRouterInteractionTests.cs b/GFramework.Game.Tests/UI/UiRouterInteractionTests.cs index 618e289d..dbed8ac1 100644 --- a/GFramework.Game.Tests/UI/UiRouterInteractionTests.cs +++ b/GFramework.Game.Tests/UI/UiRouterInteractionTests.cs @@ -35,7 +35,9 @@ public class UiRouterInteractionTests Assert.That(modal.CapturedActions, Is.EqualTo(UiInputActionMask.Cancel)); Assert.That(modal.BlocksWorldPointerInput, Is.True); Assert.That(modal.BlocksWorldActionInput, Is.True); - Assert.That(topmost, Is.SameAs(modal)); + Assert.That(topmost.CapturedActions, Is.EqualTo(UiInputActionMask.Cancel)); + Assert.That(topmost.BlocksWorldPointerInput, Is.True); + Assert.That(topmost.BlocksWorldActionInput, Is.True); }); } @@ -173,9 +175,10 @@ public class UiRouterInteractionTests private static void SetInstanceCounter(UiRouterBase router, int value) { var field = typeof(UiRouterBase).GetField("_instanceCounter", BindingFlags.Instance | BindingFlags.NonPublic); - Assert.That(field, Is.Not.Null); + Assert.That(field, Is.Not.Null, "UiRouterBase._instanceCounter 字段未找到，可能发生了内部重构。"); + Assert.That(field!.FieldType, Is.EqualTo(typeof(int)), "_instanceCounter 字段类型已变化，请同步调整测试。"); - field!.SetValue(router, value); + field.SetValue(router, value); } ///