Add support for arrays types which contain generic parameters (Hangfi…

…reIO#740)
haoyk · Nov 24, 2016 · cc61a19 · cc61a19
1 parent b1a246d
commit cc61a19
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/src/Hangfire.Core/Common/TypeExtensions.cs b/src/Hangfire.Core/Common/TypeExtensions.cs
@@ -125,6 +125,17 @@ private static bool TypesMatchRecursive(TypeInfo parameterType, TypeInfo actualT
 
             if (parameterType.ContainsGenericParameters)
             {
+                if (parameterType.IsArray)
+                {
+                    // Return false if parameterType is array whereas actualType isn't
+                    if (!actualType.IsArray) return false;
+
+                    var parameterElementType = parameterType.GetElementType();
+                    var actualElementType = actualType.GetElementType();
+
+                    return TypesMatchRecursive(parameterElementType.GetTypeInfo(), actualElementType.GetTypeInfo(), genericArguments);
+                }
+
                 if (!actualType.IsGenericType || parameterType.GetGenericTypeDefinition() != actualType.GetGenericTypeDefinition())
                 {
                     return false;

diff --git a/tests/Hangfire.Core.Tests/Common/TypeExtensionsFacts.cs b/tests/Hangfire.Core.Tests/Common/TypeExtensionsFacts.cs
@@ -265,6 +265,35 @@ public void GetNonOpenMatchingMethod_ReturnsNull_WhenParameterTypeIsMatchedByGen
 
             Assert.Equal(null, method);
         }
+
+        [Fact]
+        public void GetNonOpenMatchingMethod_ReturnsCorrectMethod_WhenParameterTypeIsGenericArray()
+        {
+            var method = TypeExtensions.GetNonOpenMatchingMethod(typeof(NonGenericClass), "GenericMethod",
+                new[] { typeof(string[]) });
+
+            Assert.Equal("GenericMethod", method.Name);
+            Assert.Equal(typeof(string[]), method.GetParameters()[0].ParameterType);
+        }
+
+        [Fact]
+        public void GetNonOpenMatchingMethod_ReturnsCorrectMethod_WhenParameterTypeIsComplicatedGenericArray()
+        {
+            var method = TypeExtensions.GetNonOpenMatchingMethod(typeof(NonGenericClass), "GenericMethod",
+                new[] { typeof(List<int>[]) });
+
+            Assert.Equal("GenericMethod", method.Name);
+            Assert.Equal(typeof(List<int>[]), method.GetParameters()[0].ParameterType);
+        }
+
+        [Fact]
+        public void GetNonOpenMatchingMethod_ReturnsNull_WhenMatchingGenricMethodNotBeFound()
+        {
+            var method = TypeExtensions.GetNonOpenMatchingMethod(typeof(NonGenericClass), "GenericMethod",
+                new[] { typeof(Tuple<List<int>, string>) });
+
+            Assert.Null(method);
+        }
     }
 
     public class GenericClass<T1>
@@ -315,6 +344,10 @@ public void GenericMethod<T>(int arg0, T arg1, double arg2) { }
 
         public void GenericMethod<T>(Tuple<T, List<int>> arg) { }
 
+        public void GenericMethod<T>(T[] arg) { }
+
+        public void GenericMethod<T>(List<T>[] arg) { }
+
         public class NestedNonGenericClass
         {
             public class DoubleNestedNonGenericClass