Tested all new methods for the .ActionResult<TResult> assertion chain (#359)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/Extensions/ActionTestContextExtensions.cs

@@ -0,0 +1,31 @@
+namespace MyTested.AspNetCore.Mvc.Utilities.Extensions
+{
+    using System;
+    using Internal.TestContexts;
+    using Microsoft.AspNetCore.Mvc;
+
+    public static class ActionTestContextExtensions
+    {
+        private static readonly Type ActionResultGenericType = typeof(ActionResult<>);
+        private static readonly Type ObjectResultType = typeof(ObjectResult);
+
+        public static ActionTestContext ConvertMethodResult(this ActionTestContext testContext)
+        {
+            var methodReturnType = testContext.Method.ReturnType;
+
+            if (Reflection.AreAssignableByGeneric(ActionResultGenericType, methodReturnType))
+            {
+                var methodResultType = testContext.MethodResult.GetType();
+
+                if (Reflection.AreSameTypes(ObjectResultType, methodResultType))
+                {
+                    var objectResult = testContext.MethodResult as ObjectResult;
+
+                    testContext.MethodResult = objectResult?.Value;
+                }
+            }
+
+            return testContext;
+        }
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/ActionResults/ActionResult/ActionResultOfTTestBuilder.cs

@@ -3,6 +3,7 @@
     using Builders.Base;
     using Contracts.ActionResults.ActionResult;
     using Internal.TestContexts;
+    using Utilities.Extensions;
 
     /// <summary>
     /// Used for testing <see cref="Microsoft.AspNetCore.Mvc.ActionResult{TResult}"/>.
@@ -21,6 +22,7 @@ public class ActionResultOfTTestBuilder<TResult>
         public ActionResultOfTTestBuilder(ControllerTestContext testContext) 
             : base(testContext)
         {
+            testContext.ConvertMethodResult();
         }
 
         /// <inheritdoc />

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

@@ -7,19 +7,14 @@
     using Builders.Base;
     using Builders.Contracts.Results;
     using Builders.Results;
-    using Internal.TestContexts;
-    using Microsoft.AspNetCore.Mvc;
-    using Utilities;
+    using Utilities.Extensions;
     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>
@@ -48,7 +43,7 @@ public static IAndTestBuilder ResultOfType<TResult>(
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
             InvocationResultValidator.ValidateInvocationResultType(
-                ConvertMethodResult(actualBuilder.TestContext),
+                actualBuilder.TestContext.ConvertMethodResult(),
                 resultType,
                 canBeAssignable: true,
                 allowDifferentGenericTypeDefinitions: true);
@@ -82,7 +77,7 @@ public static IAndTestBuilder ResultOfType<TResult>(
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
             InvocationResultValidator.ValidateInvocationResultType<TResult>(
-                ConvertMethodResult(actualBuilder.TestContext),
+                actualBuilder.TestContext.ConvertMethodResult(),
                 canBeAssignable: true);
 
             resultTestBuilder?.Invoke(new ResultDetailsTestBuilder<TResult>(actualBuilder.TestContext));
@@ -102,7 +97,7 @@ public static IAndTestBuilder Result(
         {
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
-            var convertedTestContext = ConvertMethodResult(actualBuilder.TestContext);
+            var convertedTestContext = actualBuilder.TestContext.ConvertMethodResult();
 
             resultTestBuilder?.Invoke(new ResultDetailsTestBuilder(convertedTestContext));
 
@@ -122,24 +117,5 @@ public static IAndTestBuilder Result<TResult>(
             => builder
                 .Result(value => value
                     .EqualTo(result));
-
-        private static ActionTestContext ConvertMethodResult(ActionTestContext testContext)
-        {
-            var methodReturnType = testContext.Method.ReturnType;
-
-            if (Reflection.AreAssignableByGeneric(ActionResultGenericType, methodReturnType))
-            {
-                var methodResultType = testContext.MethodResult.GetType();
-
-                if (Reflection.AreSameTypes(ObjectResultType, methodResultType))
-                {
-                    var objectResult = testContext.MethodResult as ObjectResult;
-
-                    testContext.MethodResult = objectResult?.Value;
-                }
-            }
-
-            return testContext;
-        }
     }
 }

test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/ActionsTests/ShouldReturnTests/ShouldReturnActionResultTests.cs

@@ -6,6 +6,7 @@
     using Setups.Controllers;
     using Setups.Models;
     using Xunit;
+    using Xunit.Sdk;
 
     public class ShouldReturnActionResultTests
     {
@@ -258,6 +259,65 @@ public void ShouldReturnActionResultOfTWithDetailsShouldThrowExceptionWhenResult
                 "When calling ActionResultOfT action in MvcController expected result to be ActionResult<RequestModel>, but instead received ActionResult<ResponseModel>.");
         }
 
+        [Fact]
+        public void ShouldReturnActionResultOfTWithResultDetailsShouldNotThrowExceptionWhenResultIsActionResultOfTWithCorrectResult()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.ActionResultOfT(1))
+                .ShouldReturn()
+                .ActionResult<ResponseModel>(result => result
+                    .Passing(model => model.IntegerValue == 1));
+        }
+
+        [Fact]
+        public void ShouldReturnActionResultOfTWithResultDetailsShouldThrowExceptionWhenResultIsActionResultOfTWithIncorrectResult()
+        {
+            Test.AssertException<InvocationResultAssertionException>(
+                () =>
+                {
+                    MyController<MvcController>
+                        .Instance()
+                        .Calling(c => c.ActionResultOfT(1))
+                        .ShouldReturn()
+                        .ActionResult<ResponseModel>(result => result
+                            .Passing(model => model.IntegerValue == 2));
+                },
+                "When calling ActionResultOfT action in MvcController expected the ResponseModel to pass the given predicate, but it failed.");
+        }
+
+        [Fact]
+        public void ShouldReturnActionResultOfTWithResultDetailsShouldNotThrowExceptionWhenResultIsActionResultOfTWithCorrectAssertion()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.ActionResultOfT(1))
+                .ShouldReturn()
+                .ActionResult<ResponseModel>(result => result
+                    .Passing(model =>
+                    {
+                        Assert.True(model.IntegerValue == 1);
+                    }));
+        }
+
+        [Fact]
+        public void ShouldReturnActionResultOfTWithResultDetailsShouldThrowExceptionWhenResultIsActionResultOfTWithIncorrectAssertion()
+        {
+            Assert.Throws<TrueException>(
+                () =>
+                {
+                    MyController<MvcController>
+                        .Instance()
+                        .Calling(c => c.ActionResultOfT(1))
+                        .ShouldReturn()
+                        .ActionResult<ResponseModel>(result => result
+                            .Passing(model =>
+                            {
+                                Assert.True(model.IntegerValue == 2);
+                            }));
+                });
+        }
+
         [Fact]
         public void ShouldReturnActionResultShouldWorkCorrectlyWithShouldPassFotTheMethod()
         {