BenMorris/NetArchTest#120 - Add support for records and init-only pro…

…perties
NeVeSpl · May 13, 2023 · ca5a3ca · szyb · May 31, 2023 · NeVeSpl
1 parent b84c1db
commit ca5a3ca
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 5 deletions.
diff --git a/src/NetArchTest.Rules/Extensions/Mono.Cecil/PropertyDefinitionExtensions.cs b/src/NetArchTest.Rules/Extensions/Mono.Cecil/PropertyDefinitionExtensions.cs
@@ -10,9 +10,26 @@ static internal class PropertyDefinitionExtensions
         /// <returns>An indication of whether the property is readonly.</returns>
         public static bool IsReadonly(this PropertyDefinition propertyDefinition)
         {
-            return propertyDefinition.SetMethod == null;
+            if (propertyDefinition.SetMethod == null)
+            {
+                return true;
+            }
+            else
+            {                
+                if (propertyDefinition.IsInitOnly())
+                {
+                    return true;
+                }
+            }
+
+            return false;
         }
-
+
+        public static bool IsInitOnly(this PropertyDefinition propertyDefinition)
+        {
+            return propertyDefinition.SetMethod?.ReturnType.FullName == "System.Void modreq(System.Runtime.CompilerServices.IsExternalInit)";
+        }
+
         /// <summary>
         /// Tests whether a property is nullable
         /// </summary>

diff --git a/src/NetArchTest.Rules/NetArchTest.csproj b/src/NetArchTest.Rules/NetArchTest.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/NetArchTest.Rules.UnitTests/ConditionTests.cs b/test/NetArchTest.Rules.UnitTests/ConditionTests.cs
@@ -624,7 +624,7 @@ public void AreMutable_MatchesFound_ClassSelected()
                 .That()
                 .ResideInNamespace("NetArchTest.TestStructure.Mutability")
                 .And()
-                .DoNotHaveNameStartingWith("ImmutableClass")
+                .DoNotHaveNameStartingWith("Immutable")
                 .Should()
                 .BeMutable().GetResult();
 

diff --git a/test/NetArchTest.Rules.UnitTests/PredicateTests.cs b/test/NetArchTest.Rules.UnitTests/PredicateTests.cs
@@ -656,10 +656,11 @@ public void AreImmutable_MatchesFound_ClassSelected()
                 .And()
                 .AreImmutable().GetReflectionTypes();
 
-            Assert.Equal(3, result.Count()); // Three types found
+            Assert.Equal(4, result.Count()); // Three types found
             Assert.Contains<Type>(typeof(ImmutableClass1), result);
             Assert.Contains<Type>(typeof(ImmutableClass2), result);
             Assert.Contains<Type>(typeof(ImmutableClass3), result);
+            Assert.Contains<Type>(typeof(ImmutableRecord1), result);
         }
 
         [Fact(DisplayName = "Types can be selected for being mutable.")]

diff --git a/test/NetArchTest.TestStructure/AssemblyInfo.cs b/test/NetArchTest.TestStructure/AssemblyInfo.cs
@@ -1,3 +1,7 @@
 using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("NetArchTest.UnitTests")]
 
+namespace System.Runtime.CompilerServices
+{
+    internal static class IsExternalInit { }
+}
diff --git a/test/NetArchTest.TestStructure/Mutability/ImmutableRecord1.cs b/test/NetArchTest.TestStructure/Mutability/ImmutableRecord1.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NetArchTest.TestStructure.Mutability
+{
+    public record ImmutableRecord1(int Property)
+    {
+    }
+}
diff --git a/test/NetArchTest.TestStructure/NetArchTest.TestStructure.csproj b/test/NetArchTest.TestStructure/NetArchTest.TestStructure.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
+	  <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>