fix for issue fluentassertions#458; Check whether expectedType is a g…

…eneric type definition and if it is verify that the subject type is a generic type for that generic type definition (fluentassertions#476)
dennisdoomen · Sep 5, 2016 · 77be654 · 77be654
1 parent 5c89e71
commit 77be654
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/Src/Core/Primitives/ReferenceTypeAssertions.cs b/Src/Core/Primitives/ReferenceTypeAssertions.cs
@@ -140,7 +140,15 @@ public AndConstraint<TAssertions> BeOfType(Type expectedType, string because = "
                 .BecauseOf(because, becauseArgs)
                 .FailWith("Expected {context:type} to be {0}{reason}, but found <null>.", expectedType);
 
-            Subject.GetType().Should().Be(expectedType, because, becauseArgs);
+            Type subjectType = Subject.GetType(); 
+            if (expectedType.IsGenericTypeDefinition() && subjectType.IsGenericType())
+            {
+                subjectType.GetGenericTypeDefinition().Should().Be(expectedType, because, becauseArgs);
+            } 
+            else
+            {
+                subjectType.Should().Be(expectedType, because, becauseArgs);
+            }
 
             return new AndConstraint<TAssertions>((TAssertions)this);
         }

diff --git a/Src/FluentAssertions.Core.Dotnet/ReflectionExtensions.cs b/Src/FluentAssertions.Core.Dotnet/ReflectionExtensions.cs
@@ -44,6 +44,11 @@ public static Type[] GetGenericArguments(this Type type)
             return type.GetTypeInfo().GenericTypeArguments;
         }  
 
+        public static bool IsGenericTypeDefinition(this Type type)
+        {
+            return type.GetTypeInfo().IsGenericTypeDefinition;
+        }
+
     }
 
 }
diff --git a/Src/FluentAssertions.Core/ReflectionExtensions.cs b/Src/FluentAssertions.Core/ReflectionExtensions.cs
@@ -35,6 +35,10 @@ public static bool IsInterface(this Type type)
             return type.IsInterface;
         }
 
+        public static bool IsGenericTypeDefinition(this Type type)
+        {
+            return type.IsGenericTypeDefinition;
+        }
 
         public static Type GetTypeInfo(this Type type)
         {

diff --git a/Tests/FluentAssertions.Shared.Specs/ReferenceTypeAssertionsSpecs.cs b/Tests/FluentAssertions.Shared.Specs/ReferenceTypeAssertionsSpecs.cs
@@ -115,6 +115,25 @@ public void When_object_is_of_the_expected_type_it_should_not_throw()
             action.ShouldNotThrow();
         }
 
+        [TestMethod]
+        public void When_object_is_an_open_generic_of_the_expected_type_it_should_not_throw()
+        {
+            //-----------------------------------------------------------------------------------------------------------
+            // Arrange
+            //-----------------------------------------------------------------------------------------------------------
+            var openGeneric = new System.Collections.Generic.List<string>();
+
+            //-----------------------------------------------------------------------------------------------------------
+            // Act
+            //-----------------------------------------------------------------------------------------------------------
+            Action action = () => openGeneric.Should().BeOfType(typeof(System.Collections.Generic.List<>));
+
+            //-----------------------------------------------------------------------------------------------------------
+            // Assert
+            //-----------------------------------------------------------------------------------------------------------
+            action.ShouldNotThrow();
+        }
+
         [TestMethod]
         public void When_object_is_null_it_should_throw()
         {