All library tests ported (#326)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Routing/ModelBindingActionInvoker.cs

@@ -1,5 +1,6 @@
 namespace MyTested.AspNetCore.Mvc.Internal.Routing
 {
+    using System;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Reflection;
@@ -14,6 +15,8 @@
 
     public class ModelBindingActionInvoker : IModelBindingActionInvoker
     {
+        private static readonly Type RouteActionResultMockType = typeof(RouteActionResultMock);
+
         private readonly ControllerContext controllerContext;
         private readonly dynamic cacheEntry;
         private readonly dynamic cacheEntryMock;
@@ -49,6 +52,17 @@ public ModelBindingActionInvoker(
 
         public async Task InvokeAsync()
         {
+            var exposedInvoker = this.invoker.Exposed();
+
+            // Invoke the filter pipeline and execute the fake action mock.
+            await exposedInvoker.InvokeAsync();
+
+            if (exposedInvoker._result.GetType() != RouteActionResultMockType)
+            {
+                // Filters short-circuited the action pipeline. Do not perform model binding.
+                return;
+            }
+
             // Not initialized in the constructor because filters may
             // short-circuit the request and tests will fail with wrong exception message.
             this.arguments = new Dictionary<string, object>();
@@ -57,12 +71,10 @@ public async Task InvokeAsync()
             if (actionDescriptor.BoundProperties.Count == 0 &&
                 actionDescriptor.Parameters.Count == 0)
             {
+                // No parameters on the real action. Do not perform model binding.
                 return;
             }
 
-            // Invokes the filter pipeline and executes a mocked action.
-            await this.invoker.Exposed().InvokeAsync();
-
             // Invokes the model binding on the real action.
             var controllerInstance = this.cacheEntry.ControllerFactory.Invoke(this.controllerContext);
 

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Routing/MvcRouteResolver.cs

@@ -45,8 +45,8 @@ public static ResolvedRouteContext Resolve(IServiceProvider services, IRouter ro
                     .Routers
                     .Where(r => r.GetType() == WebFramework.Internals.MvcAttributeRouteHandler)
                     .FirstOrDefault()
-                    .AsDynamic()
-                    ?.Actions
+                    ?.Exposed()
+                    .Actions
                     ?? actionSelector.SelectCandidates(routeContext);
 
                 actionDescriptor = actionSelector.SelectBestCandidate(

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Routing/RouteActionResultMock.cs

@@ -0,0 +1,11 @@
+namespace MyTested.AspNetCore.Mvc.Internal.Routing
+{
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+
+    internal class RouteActionResultMock : IActionResult
+    {
+        public Task ExecuteResultAsync(ActionContext context)
+            => Task.CompletedTask;
+    }
+}

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Routing/RouteControllerMock.cs

@@ -2,9 +2,8 @@
 {
     internal class RouteControllerMock
     {
-        public void ActionMock() 
-        {
-            // Intentionally left empty. Used by the route testing services to fake the actual action call.
-        }
+        // Used by the route testing services to fake the actual action call.
+        public RouteActionResultMock ActionMock()
+            => new RouteActionResultMock();
     }
 }

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Routing/RouteDataResolver.cs

@@ -7,10 +7,8 @@
 
     public static class RouteDataResolver
     {
-        public static RouteData ResolveRouteData(IRouter router, HttpContext httpContext)
-        {
-            return ResolveRouteData(router, new RouteContext(httpContext));
-        }
+        public static RouteData ResolveRouteData(IRouter router, HttpContext httpContext) 
+            => ResolveRouteData(router, new RouteContext(httpContext));
 
         public static RouteData ResolveRouteData(IRouter router, RouteContext routeContext)
         {

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestContexts/HttpTestContext.cs

@@ -1,5 +1,6 @@
 namespace MyTested.AspNetCore.Mvc.Internal.TestContexts
 {
+    using System.Linq;
     using System.Linq.Expressions;
     using Application;
     using Http;
@@ -42,7 +43,7 @@ public virtual RouteData RouteData
                 if (this.routeData == null)
                 {
                     this.routeData = this.HttpContext.GetRouteData();
-                    if (this.routeData == null)
+                    if (this.routeData == null || !this.routeData.Routers.Any())
                     {
                         this.routeData = RouteDataResolver.ResolveRouteData(TestApplication.Router, this.HttpContext);
                     }

src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs

@@ -19,10 +19,7 @@ public ExposedObject(object instance)
             this.type = instance?.GetType();
         }
 
-        public ExposedObject(Type type)
-        {
-            this.type = type;
-        }
+        public ExposedObject(Type type) => this.type = type;
 
         public object Object => this.instance ?? this.type;
 
@@ -47,7 +44,7 @@ public override bool TrySetMember(SetMemberBinder binder, object value)
                 return true;
             }
 
-            var field = this.type.GetField(binder.Name);
+            var field = this.type.GetField(binder.Name, Flags);
 
             if (field != null)
             {
@@ -70,7 +67,7 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
                 return true;
             }
 
-            var field = this.type.GetField(binder.Name);
+            var field = this.type.GetField(binder.Name, Flags);
 
             if (field != null)
             {

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Controllers/ControllerBuilder.cs

@@ -66,6 +66,8 @@ protected override TController TryCreateComponentWithFactory()
         protected override void ActivateComponent() 
             => this.Services
                 .GetServices(WebFramework.Internals.ControllerPropertyActivator)
-                ?.ForEach(a => a.Exposed().Activate(this.TestContext.ComponentContext, this.TestContext.Component));
+                ?.ForEach(a => a
+                    .Exposed()
+                    .Activate(this.TestContext.ComponentContext, this.TestContext.Component));
     }
 }

src/MyTested.AspNetCore.Mvc.Routing/ComponentBuilderRoutingExtensions.cs

@@ -1,5 +1,6 @@
 namespace MyTested.AspNetCore.Mvc
 {
+    using System.Linq;
     using Builders.Base;
     using Builders.Contracts.Base;
     using Internal.Application;
@@ -52,6 +53,10 @@ public static TBuilder WithRouteData<TBuilder>(
                 if (testContext.RouteData == null)
                 {
                     testContext.RouteData = new RouteData();
+                }
+
+                if (!testContext.RouteData.Routers.Any())
+                {
                     testContext.RouteData.Routers.Add(TestApplication.Router);
                 }
 

src/MyTested.AspNetCore.Mvc.ViewFeatures/ModelErrorTestBuilderViewFeaturesExtensions.cs

@@ -33,7 +33,7 @@ public static IModelErrorDetailsTestBuilder<TModel> ContainingErrorFor<TModel, T
         {
             var actualModelErrorTestBuilder = (ModelErrorTestBuilder<TModel>)modelErrorTestBuilder;
 
-            var memberName = ExpressionHelper.GetExpressionText(memberWithError, ExpressionTextCache);
+            string memberName = ExpressionHelper.GetExpressionText(memberWithError, ExpressionTextCache);
             actualModelErrorTestBuilder.ContainingError(memberName);
 
             return new ModelErrorDetailsTestBuilder<TModel>(
@@ -57,7 +57,7 @@ public static IAndModelErrorTestBuilder<TModel> ContainingNoErrorFor<TModel, TMe
         {
             var actualModelErrorTestBuilder = (ModelErrorTestBuilder<TModel>)modelErrorTestBuilder;
 
-            var memberName = ExpressionHelper.GetExpressionText(memberWithNoError, ExpressionTextCache);
+            string memberName = ExpressionHelper.GetExpressionText(memberWithNoError, ExpressionTextCache);
             if (actualModelErrorTestBuilder.ModelState.ContainsKey(memberName))
             {
                 actualModelErrorTestBuilder.ThrowNewModelErrorAssertionException(