Fixed incorrect behavior when action return type is ActionResult<T> (closes #359)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Models/BaseShouldReturnTestBuilderExtensions.cs

@@ -7,16 +7,19 @@
     using Builders.Base;
     using Builders.Contracts.Results;
     using Builders.Results;
-    using Exceptions;
     using Internal.TestContexts;
     using Microsoft.AspNetCore.Mvc;
+    using Utilities;
     using Utilities.Validators;
 
     /// <summary>
     /// Contains model extension methods for <see cref="IBaseShouldReturnTestBuilder"/>.
     /// </summary>
     public static class BaseShouldReturnTestBuilderExtensions
     {
+        private static readonly Type ActionResultGenericType = typeof(ActionResult<>);
+        private static readonly Type ObjectResultType = typeof(ObjectResult);
+
         /// <summary>
         /// Tests whether the result is of the provided type.
         /// </summary>
@@ -45,7 +48,7 @@ public static IAndTestBuilder ResultOfType<TResult>(
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
             InvocationResultValidator.ValidateInvocationResultType(
-                actualBuilder.TestContext,
+                ConvertMethodResult(actualBuilder.TestContext),
                 resultType,
                 canBeAssignable: true,
                 allowDifferentGenericTypeDefinitions: true);
@@ -79,7 +82,7 @@ public static IAndTestBuilder ResultOfType<TResult>(
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
             InvocationResultValidator.ValidateInvocationResultType<TResult>(
-                actualBuilder.TestContext,
+                ConvertMethodResult(actualBuilder.TestContext),
                 canBeAssignable: true);
 
             resultTestBuilder?.Invoke(new ResultDetailsTestBuilder<TResult>(actualBuilder.TestContext));
@@ -99,7 +102,9 @@ public static IAndTestBuilder Result(
         {
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
-            resultTestBuilder?.Invoke(new ResultDetailsTestBuilder(actualBuilder.TestContext));
+            var convertedTestContext = ConvertMethodResult(actualBuilder.TestContext);
+
+            resultTestBuilder?.Invoke(new ResultDetailsTestBuilder(convertedTestContext));
 
             return new AndTestBuilder(actualBuilder.TestContext);
         }
@@ -120,20 +125,18 @@ public static IAndTestBuilder Result<TResult>(
 
         private static ActionTestContext ConvertMethodResult(ActionTestContext testContext)
         {
-            var methodResult = testContext.MethodResult;
+            var methodReturnType = testContext.Method.ReturnType;
 
-            if (methodResult is IActionResult)
+            if (Reflection.AreAssignableByGeneric(ActionResultGenericType, methodReturnType))
             {
-                if (methodResult is ObjectResult objectResult)
-                {
-                    testContext.MethodResult = objectResult.Value;
-                }
-                else
+                var methodResultType = testContext.MethodResult.GetType();
+
+                if (Reflection.AreSameTypes(ObjectResultType, methodResultType))
                 {
-                    throw new InvocationResultAssertionException("Test");
-                }
+                    var objectResult = testContext.MethodResult as ObjectResult;
 
-                return testContext;
+                    testContext.MethodResult = objectResult?.Value;
+                }
             }
 
             return testContext;

test/MyTested.AspNetCore.Mvc.Models.Test/BuildersTests/ActionsTests/ShouldReturnTests/ShouldReturnTests.cs

@@ -556,6 +556,28 @@ public void AnonymousResultShouldBeProperlyRecognized()
                 });
         }
 
+        [Fact]
+        public void ObjectResultShouldBeProperlyRecognized()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.ObjectResultWithResponse())
+                .ShouldReturn()
+                .ResultOfType<ObjectResult>(result => result
+                    .Passing(obj => obj.Value is List<ResponseModel>));
+        }
+
+        [Fact]
+        public void ObjectResultChildrenShouldBeProperlyRecognized()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.OkResultWithResponse())
+                .ShouldReturn()
+                .ResultOfType<OkObjectResult>(result => result
+                    .Passing(obj => obj.Value is List<ResponseModel>));
+        }
+
         [Fact]
         public void AnonymousResultShouldBeProperlyRecognizedAndShouldThrowException()
         {
@@ -614,6 +636,17 @@ public void ActionResultOfTShouldBeProperlyRecognizedWithObjectActionResultAndMo
                     }));
         }
 
+        [Fact]
+        public void ActionResultOfTShouldBeProperlyRecognizedWithOkResultAndResultChain()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.ActionResultOfT(int.MaxValue))
+                .ShouldReturn()
+                .ResultOfType<OkObjectResult>(result => result
+                    .Passing(ok => ok.Value is ResponseModel));
+        }
+
         [Fact]
         public void ActionResultOfTShouldBeProperlyRecognizedWithModelOfGenericType()
         {