failing test for: Problem with Generic types #3

Author: NeVeSpl

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

@@ -210,7 +210,11 @@ private IEnumerable<string> GetTokens(TypeReference reference)
         {
             if ((reference.IsArray == false) && (reference.IsByReference == false) && (reference.IsPointer == false))
             {
-                yield return reference.GetNamespace();
+                var @namespace = reference.GetNamespace();
+                if (!string.IsNullOrEmpty(@namespace))
+                {
+                    yield return @namespace;
+                }
                 yield return reference.Name;
             }
             else

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

@@ -24,13 +24,14 @@ public void DependencySearch_IndirectReference_NotFound()
         [Fact(DisplayName = "Does not find things that are not dependency at all")]
         public void DependencySearch_Garbage_NotFound()
         {
-            Utils.RunDependencyTest(Utils.GetTypesThatResideInTheSameNamespaceButWithoutGivenType(typeof(IndirectReference)), new List<string> { "System.Object::.ctor()", "T", "T1", "T2", "ctor()", "!1)", "::.ctor(!0" }, false);            
+            Utils.RunDependencyTest(Utils.GetTypesThatResideInTheSameNamespaceButWithoutGivenType(typeof(IndirectReference)), new List<string> { "System.Object::.ctor()", "T", "T1", "T2", "ctor()", "!1)", "::.ctor(!0", "T1&", "T2&", "T1[]", "T2[]" }, false);            
         }
 
         [Fact(DisplayName = "Does not find a dependency that only partially matches actually referenced type.")]       
         public void DependencySearch_PartiallyMatchingDependency_NotFound()
-        { 
-            Utils.RunDependencyTest(Utils.GetTypesThatResideInTheSameNamespaceButWithoutGivenType(typeof(IndirectReference)),
+        {
+            var subjects = Utils.GetTypesThatResideInTheSameNamespaceButWithoutGivenType(typeof(IndirectReference), typeof(GenericMethodGenericParameter));
+            Utils.RunDependencyTest(subjects,
                                     dependencyToSearch: typeof(ExampleDep),
                                     expectToFindClass: false,
                                     expectToFindNamespace: true);
@@ -48,7 +49,8 @@ public void DependencySearch_PartiallyMatchingNamespace_NotFound()
         [Fact(DisplayName = "Does not find a dependency that differs only in case from actually referenced type.")]       
         public void DependencySearch_DependencyWithDifferentCaseOfCharacters_NotFound()
         {
-            Utils.RunDependencyTest(Utils.GetTypesThatResideInTheSameNamespaceButWithoutGivenType(typeof(IndirectReference)),
+            var subjects = Utils.GetTypesThatResideInTheSameNamespaceButWithoutGivenType(typeof(IndirectReference), typeof(GenericMethodGenericParameter));
+            Utils.RunDependencyTest(subjects,
                                     dependencyToSearch: typeof(ExampleDEPENDENCY),
                                     expectToFindClass: false,
                                     expectToFindNamespace: true);

test/NetArchTest.TestStructure/Dependencies/Search/GenericMethodGenericParameter.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NetArchTest.TestStructure.Dependencies.Search
+{
+    internal class GenericMethodGenericParameter
+    {
+        public static void Deconstruct<T1, T2>(KeyValuePair<T1, T2> tuple, T1[] key, out T2 value)
+        {
+            key = null;
+            value = tuple.Value;
+        }
+    }
+}