From d798d4d3f567ee5311105950f2cd5a59d6c9fcf2 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 16 Feb 2025 06:52:47 +1100 Subject: [PATCH] Update StaticFieldValidationTest (#34287) --- .../Tests/Linter/StaticFieldValidationTest.cs | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs index 0632fe1347..90bf82e8f1 100644 --- a/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs +++ b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using Content.Shared.Tag; +using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; using Robust.Shared.Reflection; using Robust.Shared.Serialization.Manager.Attributes; @@ -29,7 +30,9 @@ public sealed class StaticFieldValidationTest Assert.That(protoMan.ValidateStaticFields(typeof(StringValid), protos), Is.Empty); Assert.That(protoMan.ValidateStaticFields(typeof(StringArrayValid), protos), Is.Empty); Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdValid), protos), Is.Empty); + Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdTValid), protos), Is.Empty); Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdArrayValid), protos), Is.Empty); + Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdTArrayValid), protos), Is.Empty); Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdTestValid), protos), Is.Empty); Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdArrayValid), protos), Is.Empty); Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdListValid), protos), Is.Empty); @@ -39,7 +42,9 @@ public sealed class StaticFieldValidationTest Assert.That(protoMan.ValidateStaticFields(typeof(StringInvalid), protos), Has.Count.EqualTo(1)); Assert.That(protoMan.ValidateStaticFields(typeof(StringArrayInvalid), protos), Has.Count.EqualTo(2)); Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdInvalid), protos), Has.Count.EqualTo(1)); + Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdTInvalid), protos), Has.Count.EqualTo(1)); Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdArrayInvalid), protos), Has.Count.EqualTo(2)); + Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdTArrayInvalid), protos), Has.Count.EqualTo(2)); Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdTestInvalid), protos), Has.Count.EqualTo(1)); Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdArrayInvalid), protos), Has.Count.EqualTo(2)); Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdListInvalid), protos), Has.Count.EqualTo(2)); @@ -88,24 +93,48 @@ public sealed class StaticFieldValidationTest public static EntProtoId Tag = "StaticFieldTestEnt"; } + [Reflect(false)] + private sealed class EntProtoIdTValid + { + public static EntProtoId Tag = "StaticFieldTestEnt"; + } + [Reflect(false)] private sealed class EntProtoIdInvalid { public static EntProtoId Tag = string.Empty; } + [Reflect(false)] + private sealed class EntProtoIdTInvalid + { + public static EntProtoId Tag = string.Empty; + } + [Reflect(false)] private sealed class EntProtoIdArrayValid { public static EntProtoId[] Tag = ["StaticFieldTestEnt", "StaticFieldTestEnt"]; } + [Reflect(false)] + private sealed class EntProtoIdTArrayValid + { + public static EntProtoId[] Tag = ["StaticFieldTestEnt", "StaticFieldTestEnt"]; + } + [Reflect(false)] private sealed class EntProtoIdArrayInvalid { public static EntProtoId[] Tag = [string.Empty, "StaticFieldTestEnt", string.Empty]; } + [Reflect(false)] + private sealed class EntProtoIdTArrayInvalid + { + public static EntProtoId[] Tag = [string.Empty, "StaticFieldTestEnt", string.Empty]; + } + [Reflect(false)] private sealed class ProtoIdTestValid { -- 2.51.2