WithRouteData moved to MyTested.AspNetCore.Mvc.Routing (#125)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Base/BaseTestBuilderWithComponent.cs

@@ -1,5 +1,6 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Base
 {
+    using System;
     using Contracts.Base;
     using Internal.TestContexts;
     using Utilities.Validators;
@@ -38,5 +39,9 @@ private set
                 this.testContext = value;
             }
         }
+        
+        public Action<ComponentTestContext> ComponentPreparationAction { get; set; }
+
+        public Action<ComponentTestContext> PreInvocationAction { get; set; }
     }
 }

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

@@ -99,6 +99,7 @@ public IEnumerable<object> MethodAttributes
                 return this.methodAttributes;
             }
         }
+
         public Exception CaughtException { get; set; }
 
         public object Model

src/MyTested.AspNetCore.Mvc.Core/Builders/Contracts/Controllers/IControllerBuilder.cs

@@ -51,19 +51,6 @@ public interface IControllerBuilder<TController> : IBaseTestBuilderWithComponent
         /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
         IAndControllerBuilder<TController> WithActionContext(Action<ActionContext> actionContextSetup);
 
-        /// <summary>
-        /// Indicates that route values should be extracted from the provided action call expression.
-        /// </summary>
-        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
-        IAndControllerBuilder<TController> WithRouteData();
-
-        /// <summary>
-        /// Indicates that route values should be extracted from the provided action call expression adding the given additional values.
-        /// </summary>
-        /// <param name="additionalRouteValues">Anonymous object containing route values.</param>
-        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
-        IAndControllerBuilder<TController> WithRouteData(object additionalRouteValues);
-        
         /// <summary>
         /// Configures a service with scoped lifetime by using the provided <see cref="Action"/> delegate.
         /// </summary>

src/MyTested.AspNetCore.Mvc.Core/Builders/Controllers/ControllerActionCallBuilder.cs

@@ -123,7 +123,7 @@ private ActionTestContext<TActionResult> GetAndValidateActionResult<TActionResul
         private string GetAndValidateAction(LambdaExpression actionCall)
         {
             this.BuildControllerIfNotExists();
-            this.SetRouteData(actionCall);
+            this.PreInvocationAction?.Invoke(this.TestContext);
 
             var methodInfo = ExpressionParser.GetMethodInfo(actionCall);
 

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

@@ -30,8 +30,6 @@ public partial class ControllerBuilder<TController> : BaseTestBuilderWithCompone
         private Action<TController> controllerSetupAction;
         private bool isPreparedForTesting;
         private bool enabledValidation;
-        private bool resolveRouteValues;
-        private object additionalRouteValues;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ControllerBuilder{TController}"/> class.
@@ -71,8 +69,6 @@ private TController Controller
             }
         }
 
-        public Action<ControllerTestContext> ControllerPreparationAction { get; set; }
-
         private new MockedHttpContext HttpContext => this.TestContext.MockedHttpContext;
 
         private HttpRequest HttpRequest => this.HttpContext.Request;

src/MyTested.AspNetCore.Mvc.Core/Builders/Controllers/ControllerHttpBuilder.cs

@@ -117,7 +117,7 @@ private void PrepareController()
 
             controllerPropertyActivators.ForEach(a => a.Activate(this.TestContext.ControllerContext, this.TestContext.Component));
 
-            this.ControllerPreparationAction?.Invoke(this.TestContext);
+            this.ComponentPreparationAction?.Invoke(this.TestContext);
 
             this.controllerSetupAction?.Invoke(this.TestContext.ComponentAs<TController>());
         }

src/MyTested.AspNetCore.Mvc.Core/Builders/Controllers/ControllerSetupBuilder.cs

@@ -6,14 +6,18 @@
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.ModelBinding;
     using Microsoft.AspNetCore.Routing;
-    using Routing;
     using Utilities.Extensions;
     using Utilities.Validators;
+    using Routing;
 
     public class ControllerTestContext : ComponentTestContext
     {
         private ControllerContext controllerContext;
         private RouteData expressionRouteData;
+
+        public ModelStateDictionary ModelState => this.ControllerContext.ModelState;
+
+        public override string ExceptionMessagePrefix => $"When calling {this.MethodName} action in {this.Component.GetName()} expected";
 
         public override RouteData RouteData
         {
@@ -41,10 +45,6 @@ public override RouteData RouteData
             }
         }
 
-        public ModelStateDictionary ModelState => this.ControllerContext.ModelState;
-
-        public override string ExceptionMessagePrefix => $"When calling {this.MethodName} action in {this.Component.GetName()} expected";
-        
         internal ControllerContext ControllerContext
         {
             get

src/MyTested.AspNetCore.Mvc.Core/Internal/TestContexts/ControllerTestContext.cs

@@ -0,0 +1,50 @@
+namespace MyTested.AspNetCore.Mvc
+{
+    using Builders.Base;
+    using Builders.Contracts.Base;
+    using Internal.Application;
+    using Internal.Routing;
+    using Utilities.Extensions;
+
+    /// <summary>
+    /// Contains HTTP extension methods for <see cref="IBaseTestBuilderWithComponentBuilder{TBuilder}"/>.
+    /// </summary>
+    public static class ComponentBuilderRoutingExtensions
+    {
+        /// <summary>
+        /// Indicates that route values should be extracted from the provided method call expression.
+        /// </summary>
+        /// <typeparam name="TBuilder">Class representing ASP.NET Core MVC test builder.</typeparam>
+        /// <param name="builder">Instance of <see cref="IBaseTestBuilderWithComponentBuilder{TBuilder}"/> type.</param>
+        /// <returns>The same component builder.</returns>
+        public static TBuilder WithRouteData<TBuilder>(
+            this IBaseTestBuilderWithComponentBuilder<TBuilder> builder)
+            where TBuilder : IBaseTestBuilder
+        {
+            return builder.WithRouteData(null);
+        }
+
+        /// <summary>
+        /// Indicates that route values should be extracted from the provided action call expression adding the given additional values.
+        /// </summary>
+        /// <typeparam name="TBuilder">Class representing ASP.NET Core MVC test builder.</typeparam>
+        /// <param name="builder">Instance of <see cref="IBaseTestBuilderWithComponentBuilder{TBuilder}"/> type.</param>
+        /// <param name="additionalRouteValues">Anonymous object containing route values.</param>
+        /// <returns>The same component builder.</returns>
+        public static TBuilder WithRouteData<TBuilder>(
+            this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
+            object additionalRouteValues)
+            where TBuilder : IBaseTestBuilder
+        {
+            var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
+
+            actualBuilder.PreInvocationAction += testContext =>
+            {
+                testContext.RouteData = RouteExpressionParser.ResolveRouteData(TestApplication.Router, testContext.MethodCall);
+                testContext.RouteData.Values.Add(additionalRouteValues);
+            };
+
+            return actualBuilder.Builder;
+        }
+    }
+}