Merge pull request #82 from Lorilatschki/second-fix

fix: analyze string const by comparing with full name

Author: BenMorris

src/NetArchTest.Rules/Dependencies/DataStructures/CachedNamespaceTree.cs

@@ -32,5 +32,10 @@ public IEnumerable<string> GetAllMatchingNames(TypeReference type)
             }
             return node.value;
         }
+
+        public IEnumerable<string> GetAllMatchingNames(string fullName)
+        {
+            return _searchTree.GetAllMatchingNames(fullName).ToArray();
+        }
     }
 }

src/NetArchTest.Rules/Dependencies/DataStructures/ISearchTree.cs

@@ -6,6 +6,7 @@
     internal interface ISearchTree
     {
         IEnumerable<string> GetAllMatchingNames(TypeReference type);
+        IEnumerable<string> GetAllMatchingNames(string fullName);
         int TerminatedNodesCount { get; }
     }
 }

src/NetArchTest.Rules/Dependencies/TypeDefinitionCheckingContext.cs

@@ -96,6 +96,10 @@ private void CheckFields(TypeDefinition typeToCheck)
                 {
                     CheckCustomAttributes(field);
                     CheckTypeReference(field.FieldType);
+                    if (field.HasConstant && field.FieldType.FullName == typeof(string).FullName)
+                    {
+                        _result.CheckDependency(field.Constant.ToString());
+                    }
                 }
             }
         }
@@ -140,19 +144,19 @@ private void CheckMethods(TypeDefinition typeToCheck)
                 foreach (var method in typeToCheck.Methods)
                 {
                     if (_result.CanWeSkipFurtherSearch()) return;
-                    this.CheckMethodHeader(method);
+                    CheckMethodHeader(method);
                 }
 
                 foreach (var method in typeToCheck.Methods)
                 {
                     if (_result.CanWeSkipFurtherSearch()) return;
-                    this.CheckMethodBodyVariables(method);
+                    CheckMethodBodyVariables(method);
                 }
 
                 foreach (var method in typeToCheck.Methods)
                 {
                     if (_result.CanWeSkipFurtherSearch()) return;
-                    this.CheckMethodBodyInstructions(method);
+                    CheckMethodBodyInstructions(method);
                 }
             }
         }

src/NetArchTest.Rules/Dependencies/TypeDefinitionCheckingResult.cs

@@ -74,6 +74,22 @@ public bool CanWeSkipFurtherSearch()
             }           
         }
 
+        public void CheckDependency(string dependencyTypeFullName)
+        {
+            var matchedDependencies = _searchTree.GetAllMatchingNames(dependencyTypeFullName);
+            if (matchedDependencies.Any())
+            {
+                foreach (var match in matchedDependencies)
+                {
+                    _foundDependencies.Add(match);
+                }
+            }
+            else
+            {
+                _hasDependencyFromOutsideOfSearchTree = true;
+            }
+        }
+
         public void CheckDependency(TypeReference dependency)
         {
             var matchedDependencies = _searchTree.GetAllMatchingNames(dependency);

test/NetArchTest.Rules.UnitTests/DependencySearch/DependencyTypeTests.cs

@@ -398,6 +398,18 @@ public void DependencySearch_VariableTuple_NotFound()
             Utils.RunDependencyTest(typeof(VariableTuple), typeof(Tuple<int, double>), false, true);
         }
 
+        [Fact(DisplayName = "Finds a dependency Array in ConstStringFieldValue.")]
+        public void DependencySearch_ConstFieldString_Found()
+        {
+            Utils.RunDependencyTest(typeof(ConstStringFieldValue), typeof(Array), true, true);
+        }
+
+        [Fact(DisplayName = "Does not find a dependency ArrayJagged in ConstStringFieldValue.")]
+        public void DependencySearch_ConstFieldString_NotFound()
+        {
+            Utils.RunDependencyTest(typeof(ConstStringFieldValue), typeof(ArrayJagged), false, true);
+        }
+      
         [Fact(DisplayName = "Finds a dependency StaticType in BaseCtorCall.")]
         public void DependencySearch_BaseCtorCall_Found()
         {

test/NetArchTest.TestStructure/Dependencies/Search/DependencyType/ConstStringFieldValue.cs

@@ -0,0 +1,9 @@
+namespace NetArchTest.TestStructure.Dependencies.Search.DependencyType
+{
+    public class ConstStringFieldValue
+    {
+#pragma warning disable 219
+        private const string FullTypeName = "NetArchTest.TestStructure.Dependencies.Search.DependencyType.Array";
+#pragma warning restore 219
+    }
+}