From 78c41b84a1e69e835b7edc2453f5e53fd432a128 Mon Sep 17 00:00:00 2001 From: RoosterDragon Date: Sun, 19 Feb 2023 12:36:11 +0000 Subject: [PATCH] Fix IDE0082 --- .editorconfig | 3 +++ OpenRA.Test/OpenRA.Game/ActorInfoTest.cs | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index b77f6c91c0..fc93f280cd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -204,6 +204,9 @@ dotnet_diagnostic.IDE0071.severity = warning # Simplify conditional expression. dotnet_diagnostic.IDE0075.severity = warning +# Convert typeof to nameof. +dotnet_diagnostic.IDE0082.severity = warning + # Naming rule violation. dotnet_diagnostic.IDE1006.severity = warning diff --git a/OpenRA.Test/OpenRA.Game/ActorInfoTest.cs b/OpenRA.Test/OpenRA.Game/ActorInfoTest.cs index 60e91b15d1..c6e3a18021 100644 --- a/OpenRA.Test/OpenRA.Game/ActorInfoTest.cs +++ b/OpenRA.Test/OpenRA.Game/ActorInfoTest.cs @@ -82,10 +82,10 @@ namespace OpenRA.Test var actorInfo = new ActorInfo("test", new MockBInfo(), new MockCInfo()); var ex = Assert.Throws(() => actorInfo.TraitsInConstructOrder()); - StringAssert.Contains(typeof(MockBInfo).Name, ex.Message, "Exception message did not report a missing dependency."); - StringAssert.Contains(typeof(MockCInfo).Name, ex.Message, "Exception message did not report a missing dependency."); - StringAssert.Contains(typeof(MockInheritInfo).Name, ex.Message, "Exception message did not report a missing dependency (from a base class)."); - StringAssert.Contains(typeof(IMock).Name, ex.Message, "Exception message did not report a missing dependency (from an interface)."); + StringAssert.Contains(nameof(MockBInfo), ex.Message, "Exception message did not report a missing dependency."); + StringAssert.Contains(nameof(MockCInfo), ex.Message, "Exception message did not report a missing dependency."); + StringAssert.Contains(nameof(MockInheritInfo), ex.Message, "Exception message did not report a missing dependency (from a base class)."); + StringAssert.Contains(nameof(IMock), ex.Message, "Exception message did not report a missing dependency (from an interface)."); } [TestCase(TestName = "Trait ordering allows optional dependencies to be missing")] @@ -104,9 +104,9 @@ namespace OpenRA.Test var actorInfo = new ActorInfo("test", new MockDInfo(), new MockEInfo(), new MockFInfo()); var ex = Assert.Throws(() => actorInfo.TraitsInConstructOrder()); - StringAssert.Contains(typeof(MockDInfo).Name, ex.Message, "Exception message should report all cyclic dependencies."); - StringAssert.Contains(typeof(MockEInfo).Name, ex.Message, "Exception message should report all cyclic dependencies."); - StringAssert.Contains(typeof(MockFInfo).Name, ex.Message, "Exception message should report all cyclic dependencies."); + StringAssert.Contains(nameof(MockDInfo), ex.Message, "Exception message should report all cyclic dependencies."); + StringAssert.Contains(nameof(MockEInfo), ex.Message, "Exception message should report all cyclic dependencies."); + StringAssert.Contains(nameof(MockFInfo), ex.Message, "Exception message should report all cyclic dependencies."); } [TestCase(TestName = "Trait ordering exception reports cyclic optional dependencies")] @@ -115,9 +115,9 @@ namespace OpenRA.Test var actorInfo = new ActorInfo("test", new MockJInfo(), new MockKInfo(), new MockLInfo()); var ex = Assert.Throws(() => actorInfo.TraitsInConstructOrder()); - StringAssert.Contains(typeof(MockJInfo).Name, ex.Message, "Exception message should report all cyclic dependencies."); - StringAssert.Contains(typeof(MockKInfo).Name, ex.Message, "Exception message should report all cyclic dependencies."); - StringAssert.Contains(typeof(MockLInfo).Name, ex.Message, "Exception message should report all cyclic dependencies."); + StringAssert.Contains(nameof(MockJInfo), ex.Message, "Exception message should report all cyclic dependencies."); + StringAssert.Contains(nameof(MockKInfo), ex.Message, "Exception message should report all cyclic dependencies."); + StringAssert.Contains(nameof(MockLInfo), ex.Message, "Exception message should report all cyclic dependencies."); } } }