Moved Models builders to the Abstractions package (#66)

Author: ivaylokenov

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

@@ -0,0 +1,34 @@
+namespace MyTested.AspNetCore.Mvc.Builders.Base
+{
+    using Internal.TestContexts;
+    using Utilities.Validators;
+
+    public class BaseTestBuilderWithActionContext : BaseTestBuilderWithComponent
+    {
+        private ActionTestContext testContext;
+
+        public BaseTestBuilderWithActionContext(ActionTestContext testContext) 
+            : base(testContext)
+        {
+            this.TestContext = testContext;
+        }
+
+        /// <summary>
+        /// Gets the currently used <see cref="ActionTestContext"/>.
+        /// </summary>
+        /// <value>Result of type <see cref="ActionTestContext"/>.</value>
+        public new ActionTestContext TestContext
+        {
+            get
+            {
+                return this.testContext;
+            }
+
+            private set
+            {
+                CommonValidator.CheckForNullReference(value, nameof(this.TestContext));
+                this.testContext = value;
+            }
+        }
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Models/IAndModelDetailsTestBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/Models/IAndModelDetailsTestBuilder.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// Used for adding AndAlso() method to the model details tests.
     /// </summary>
-    /// <typeparam name="TModel">Model from invoked action in ASP.NET Core MVC controller.</typeparam>
+    /// <typeparam name="TModel">Model from invoked method in ASP.NET Core MVC.</typeparam>
     public interface IAndModelDetailsTestBuilder<TModel> : IModelDetailsTestBuilder<TModel>
     {
         /// <summary>

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Models/IAndModelErrorTestBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/Models/IAndModelErrorTestBuilder.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// Used for adding AndAlso() method to the <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/> error tests.
     /// </summary>
-    /// <typeparam name="TModel">Model from invoked action in ASP.NET Core MVC controller.</typeparam>
+    /// <typeparam name="TModel">Model from invoked method in ASP.NET Core MVC.</typeparam>
     public interface IAndModelErrorTestBuilder<TModel> : IModelErrorTestBuilder<TModel>
     {
         /// <summary>

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/Models/IModelDetailsTestBuilder.cs

@@ -0,0 +1,26 @@
+namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Models
+{
+    using And;
+    using System;
+
+    /// <summary>
+    /// Used for testing the model members.
+    /// </summary>
+    /// <typeparam name="TModel">Model from invoked method in ASP.NET Core MVC.</typeparam>
+    public interface IModelDetailsTestBuilder<TModel> : IModelErrorTestBuilder<TModel>
+    {
+        /// <summary>
+        /// Tests whether the returned model from the invoked method passes the given assertions.
+        /// </summary>
+        /// <param name="assertions">Method containing all assertions on the model.</param>
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/>.</returns>
+        IAndTestBuilder Passing(Action<TModel> assertions);
+
+        /// <summary>
+        /// Tests whether the returned model from the invoked method passes the given predicate.
+        /// </summary>
+        /// <param name="predicate">Predicate testing the model.</param>
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/>.</returns>
+        IAndTestBuilder Passing(Func<TModel, bool> predicate);
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Models/IModelErrorTestBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/Models/IModelErrorTestBuilder.cs

@@ -5,7 +5,7 @@
     /// <summary>
     /// Used for testing <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/> errors.
     /// </summary>
-    public interface IModelErrorTestBuilder : IBaseTestBuilderWithInvokedAction
+    public interface IModelErrorTestBuilder : IBaseTestBuilderWithComponent
     {
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Models/IModelErrorTestBuilder{TModel}.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/Models/IModelErrorTestBuilder{TModel}.cs

@@ -5,8 +5,8 @@
     /// <summary>
     /// Used for testing <see cref="Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"/> errors.
     /// </summary>
-    /// <typeparam name="TModel">Model from invoked action in ASP.NET Core MVC controller.</typeparam>
-    public interface IModelErrorTestBuilder<TModel> : IModelErrorTestBuilder, IBaseTestBuilderWithModel<TModel>
+    /// <typeparam name="TModel">Model from invoked method in ASP.NET Core MVC.</typeparam>
+    public interface IModelErrorTestBuilder<TModel> : IModelErrorTestBuilder, IBaseTestBuilderWithComponent
     {
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Models/ModelDetailsTestBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Models/ModelDetailsTestBuilder.cs

@@ -1,6 +1,7 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Models
 {
     using System;
+    using And;
     using Contracts.And;
     using Contracts.Models;
     using Exceptions;
@@ -11,39 +12,39 @@
     /// <summary>
     /// Used for testing the model members.
     /// </summary>
-    /// <typeparam name="TModel">Model from invoked action in ASP.NET Core MVC controller.</typeparam>
+    /// <typeparam name="TModel">Model from invoked method in ASP.NET Core MVC.</typeparam>
     public class ModelDetailsTestBuilder<TModel>
         : ModelErrorTestBuilder<TModel>, IAndModelDetailsTestBuilder<TModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelDetailsTestBuilder{TResponseModel}"/> class.
         /// </summary>
-        /// <param name="testContext"><see cref="ControllerTestContext"/> containing data about the currently executed assertion chain.</param>
-        public ModelDetailsTestBuilder(ControllerTestContext testContext)
+        /// <param name="testContext"><see cref="ActionTestContext"/> containing data about the currently executed assertion chain.</param>
+        public ModelDetailsTestBuilder(ActionTestContext testContext)
             : base(testContext)
         {
         }
 
         /// <inheritdoc />
-        public IAndTestBuilderWithInvokedAction Passing(Action<TModel> assertions)
+        public IAndTestBuilder Passing(Action<TModel> assertions)
         {
             assertions(this.Model);
-            return this.NewAndTestBuilderWithInvokedAction();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IAndTestBuilderWithInvokedAction Passing(Func<TModel, bool> predicate)
+        public IAndTestBuilder Passing(Func<TModel, bool> predicate)
         {
             if (!predicate(this.Model))
             {
                 throw new ResponseModelAssertionException(string.Format(
                     "When calling {0} action in {1} expected response model {2} to pass the given predicate, but it failed.",
-                    this.ActionName,
-                    this.Controller.GetName(),
+                    this.TestContext.MethodName,
+                    this.TestContext.Component.GetName(),
                     typeof(TModel).ToFriendlyTypeName()));
             }
 
-            return this.NewAndTestBuilderWithInvokedAction();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Models/ModelErrorTestBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Models/ModelErrorTestBuilder.cs

@@ -8,15 +8,15 @@
     /// <summary>
     /// Used for testing the <see cref="ModelStateDictionary"/> errors.
     /// </summary>
-    public class ModelErrorTestBuilder : BaseTestBuilderWithInvokedAction, IModelErrorTestBuilder
+    public class ModelErrorTestBuilder : BaseTestBuilderWithActionContext, IModelErrorTestBuilder
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelErrorTestBuilder"/> class.
         /// </summary>
-        /// <param name="testContext"><see cref="ControllerTestContext"/> containing data about the currently executed assertion chain.</param>
+        /// <param name="testContext"><see cref="ActionTestContext"/> containing data about the currently executed assertion chain.</param>
         /// <param name="modelState">Optional <see cref="ModelStateDictionary"/> to use the test builder with. Default is controller's <see cref="ModelStateDictionary"/>.</param>
         public ModelErrorTestBuilder(
-            ControllerTestContext testContext,
+            ActionTestContext testContext,
             ModelStateDictionary modelState = null)
             : base(testContext)
         {

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Models/ModelErrorTestBuilder{TModel}.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Models/ModelErrorTestBuilder{TModel}.cs

@@ -10,25 +10,25 @@
     /// <summary>
     /// Used for testing the <see cref="ModelStateDictionary"/> errors.
     /// </summary>
-    /// <typeparam name="TModel">Model from invoked action in ASP.NET Core MVC controller.</typeparam>
+    /// <typeparam name="TModel">Model from invoked method in ASP.NET Core MVC.</typeparam>
     public class ModelErrorTestBuilder<TModel> : ModelErrorTestBuilder, IAndModelErrorTestBuilder<TModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelErrorTestBuilder{TModel}"/> class.
         /// </summary>
-        /// <param name="testContext"><see cref="ControllerTestContext"/> containing data about the currently executed assertion chain.</param>
+        /// <param name="testContext"><see cref="ActionTestContext"/> containing data about the currently executed assertion chain.</param>
         /// <param name="modelState">Optional <see cref="ModelStateDictionary"/> to use the class with. Default is Default is <see cref="ControllerBase"/>'s <see cref="ModelStateDictionary"/>.</param>
         public ModelErrorTestBuilder(
-            ControllerTestContext testContext,
+            ActionTestContext testContext,
             ModelStateDictionary modelState = null)
             : base(testContext, modelState)
         {
         }
 
         /// <summary>
-        /// Gets model from invoked action in ASP.NET Core MVC controller.
+        /// Gets model from invoked method in ASP.NET Core MVC.
         /// </summary>
-        /// <value>Model from invoked action.</value>
+        /// <value>Model from invoked method.</value>
         protected TModel Model => this.TestContext.ModelAs<TModel>();
 
         /// <inheritdoc />
@@ -38,8 +38,8 @@ public void ThrowNewModelErrorAssertionException(string messageFormat, string er
         {
             throw new ModelErrorAssertionException(string.Format(
                     messageFormat,
-                    this.ActionName,
-                    this.Controller.GetName(),
+                    this.TestContext.MethodName,
+                    this.TestContext.Component.GetName(),
                     errorKey));
         }
     }

src/MyTested.AspNetCore.Mvc.Controllers/Exceptions/ActionResultAssertionException.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Exceptions/InvocationResultAssertionException.cs

@@ -5,13 +5,13 @@
     /// <summary>
     /// <see cref="Exception"/> for invalid action return type.
     /// </summary>
-    public class ActionResultAssertionException : Exception
+    public class InvocationResultAssertionException : Exception
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ActionResultAssertionException"/> class.
+        /// Initializes a new instance of the <see cref="InvocationResultAssertionException"/> class.
         /// </summary>
         /// <param name="message">The message that describes the error.</param>
-        public ActionResultAssertionException(string message)
+        public InvocationResultAssertionException(string message)
             : base(message)
         {
         }