Allow instance creation to be with inner builder #318

Author: Bozhidar4

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Controllers/IAndControllerInstanceBuilder.cs

@@ -0,0 +1,16 @@
+namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Controllers
+{
+    /// <summary>
+    /// Used for adding AndAlso() method to the controller builder.
+    /// </summary>
+    /// <typeparam name="TController">Class representing ASP.NET Core MVC controller.</typeparam>
+    public interface IAndControllerInstanceBuilder<TController> : IControllerBuilder<TController>
+        where TController : class
+    {
+        /// <summary>
+        /// AndAlso method for better readability when building controller instance.
+        /// </summary>
+        /// <returns>The same <see cref="IAndControllerBuilder{TController}"/>.</returns>
+        IAndControllerBuilder<TController> AndAlso();
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Controllers/IBaseControllerBuilder.cs

@@ -0,0 +1,50 @@
+namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Controllers
+{
+    using System;
+    using Builders.Contracts.Base;
+    using Microsoft.AspNetCore.Mvc;
+
+    /// <summary>
+    /// Used for building the controller which will be tested.
+    /// </summary>
+    /// <typeparam name="TController">Class representing ASP.NET Core MVC controller.</typeparam>
+    /// <typeparam name="TBuilder">Class representing ASP.NET Core MVC test builder.</typeparam>
+    public interface IBaseControllerBuilder<TController, TBuilder> : IBaseTestBuilderWithComponentBuilder<IAndControllerBuilder<TController>>
+        where TController : class
+    {
+        /// <summary>
+        /// Sets the <see cref="ControllerContext"/> on the tested controller.
+        /// </summary>
+        /// <param name="controllerContext">Instance of <see cref="ControllerContext"/> to set.</param>
+        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
+        IAndControllerBuilder<TController> WithControllerContext(ControllerContext controllerContext);
+
+        /// <summary>
+        /// Sets the <see cref="ControllerContext"/> on the tested controller.
+        /// </summary>
+        /// <param name="controllerContextSetup">Action setting the <see cref="ControllerContext"/>.</param>
+        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
+        IAndControllerBuilder<TController> WithControllerContext(Action<ControllerContext> controllerContextSetup);
+
+        /// <summary>
+        /// Sets the <see cref="ActionContext"/> on the tested controller.
+        /// </summary>
+        /// <param name="actionContext">Instance of <see cref="ActionContext"/> to set.</param>
+        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
+        IAndControllerBuilder<TController> WithActionContext(ActionContext actionContext);
+
+        /// <summary>
+        /// Sets the <see cref="ActionContext"/> on the tested controller.
+        /// </summary>
+        /// <param name="actionContextSetup">Action setting the <see cref="ActionContext"/>.</param>
+        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
+        IAndControllerBuilder<TController> WithActionContext(Action<ActionContext> actionContextSetup);
+
+        /// <summary>
+        /// Sets custom properties to the controller using a delegate.
+        /// </summary>
+        /// <param name="controllerSetup">Action to use for controller setup.</param>
+        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
+        IAndControllerBuilder<TController> WithSetup(Action<TController> controllerSetup);
+    }
+}

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

@@ -4,14 +4,12 @@
     using System.Linq.Expressions;
     using System.Threading.Tasks;
     using Actions;
-    using Base;
-    using Microsoft.AspNetCore.Mvc;
 
     /// <summary>
     /// Used for building the controller which will be tested.
     /// </summary>
     /// <typeparam name="TController">Class representing ASP.NET Core MVC controller.</typeparam>
-    public interface IControllerBuilder<TController> : IBaseTestBuilderWithComponentBuilder<IAndControllerBuilder<TController>>
+    public interface IControllerBuilder<TController> : IBaseControllerBuilder<TController, IAndControllerBuilder<TController>>
         where TController : class
     {
         /// <summary>
@@ -20,41 +18,6 @@ public interface IControllerBuilder<TController> : IBaseTestBuilderWithComponent
         /// <returns>Test builder of <see cref="IControllerTestBuilder"/> type.</returns>
         IControllerTestBuilder ShouldHave();
 
-        /// <summary>
-        /// Sets the <see cref="ControllerContext"/> on the tested controller.
-        /// </summary>
-        /// <param name="controllerContext">Instance of <see cref="ControllerContext"/> to set.</param>
-        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
-        IAndControllerBuilder<TController> WithControllerContext(ControllerContext controllerContext);
-
-        /// <summary>
-        /// Sets the <see cref="ControllerContext"/> on the tested controller.
-        /// </summary>
-        /// <param name="controllerContextSetup">Action setting the <see cref="ControllerContext"/>.</param>
-        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
-        IAndControllerBuilder<TController> WithControllerContext(Action<ControllerContext> controllerContextSetup);
-
-        /// <summary>
-        /// Sets the <see cref="ActionContext"/> on the tested controller.
-        /// </summary>
-        /// <param name="actionContext">Instance of <see cref="ActionContext"/> to set.</param>
-        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
-        IAndControllerBuilder<TController> WithActionContext(ActionContext actionContext);
-
-        /// <summary>
-        /// Sets the <see cref="ActionContext"/> on the tested controller.
-        /// </summary>
-        /// <param name="actionContextSetup">Action setting the <see cref="ActionContext"/>.</param>
-        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
-        IAndControllerBuilder<TController> WithActionContext(Action<ActionContext> actionContextSetup);
-        
-        /// <summary>
-        /// Sets custom properties to the controller using a delegate.
-        /// </summary>
-        /// <param name="controllerSetup">Action to use for controller setup.</param>
-        /// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
-        IAndControllerBuilder<TController> WithSetup(Action<TController> controllerSetup);
-
         /// <summary>
         /// Indicates which action should be invoked and tested.
         /// </summary>

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Controllers/IControllerInstanceBuilder.cs

@@ -0,0 +1,11 @@
+namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Controllers
+{
+    /// <summary>
+    /// Used for building the controller which will be tested.
+    /// </summary>
+    /// <typeparam name="TController">Class representing ASP.NET Core MVC controller.</typeparam>
+    public interface IControllerInstanceBuilder<TController> : IBaseControllerBuilder<TController, IAndControllerInstanceBuilder<TController>>
+        where TController : class
+    {
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers/MyController.cs

@@ -112,5 +112,13 @@ public static IControllerBuilder<TController> Instance(Func<TController> constru
         public new static IControllerTestBuilder ShouldHave()
             => Instance()
                 .ShouldHave();
+
+        /// <summary>
+        /// Starts a controller test.
+        /// </summary>
+        /// <param name="controllerInstanceBuilder">Instance of the ASP.NET Core MVC controller to test.</param>
+        /// <returns>Test builder of <see cref="IControllerInstanceBuilder{TController}"/> type.</returns>
+        public static IControllerInstanceBuilder<TController> Isntance(Action<IControllerInstanceBuilder<TController>> controllerInstanceBuilder)
+            => null;
     }
 }