Refactored classes and moved ComponentBuildDelegate to ComponentTestContext (closes #181)

Author: ivaylokenov

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

@@ -25,7 +25,6 @@ protected BaseTestBuilderWithComponent(ComponentTestContext testContext)
             : base(testContext)
         {
             this.TestContext = testContext;
-            this.BuildComponentAction += () => { };
         }
 
         /// <summary>
@@ -45,14 +44,12 @@ private set
                 this.testContext = value;
             }
         }
-
-        protected Action BuildComponentAction { get; set; }
-
+        
         /// <inheritdoc />
         public IAndTestBuilder ShouldPassForThe<TComponent>(Action<TComponent> assertions)
             where TComponent : class
         {
-            this.BuildComponentAction();
+            this.TestContext.ComponentBuildDelegate?.Invoke();
 
             assertions(TestHelper.TryGetShouldPassForValue<TComponent>(this.TestContext));
 
@@ -63,7 +60,7 @@ public IAndTestBuilder ShouldPassForThe<TComponent>(Action<TComponent> assertion
         public IAndTestBuilder ShouldPassForThe<TComponent>(Func<TComponent, bool> predicate)
             where TComponent : class
         {
-            this.BuildComponentAction();
+            this.TestContext.ComponentBuildDelegate?.Invoke();
 
             if (!predicate(TestHelper.TryGetShouldPassForValue<TComponent>(this.TestContext)))
             {

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Components/BaseComponentBuilder.cs

@@ -10,7 +10,7 @@ public abstract class BaseComponentBuilder<TBuilder> : BaseTestBuilderWithCompon
         public BaseComponentBuilder(ComponentTestContext testContext)
             : base(testContext)
         {
-            this.BuildComponentAction += this.BuildComponentIfNotExists;
+            this.TestContext.ComponentBuildDelegate += this.BuildComponentIfNotExists;
         }
 
         protected abstract void BuildComponentIfNotExists();

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

@@ -25,7 +25,7 @@ public object Component
             {
                 if (this.component == null)
                 {
-                    this.component = this.ComponentConstruction();
+                    this.component = this.ComponentConstructionDelegate();
                 }
 
                 return this.component;
@@ -134,11 +134,13 @@ public object Model
             }
         }
 
-        public Func<object> ComponentConstruction { get; set; }
+        public Func<object> ComponentConstructionDelegate { get; set; }
+
+        public Action ComponentBuildDelegate { get; set; }
 
-        public Action ComponentPreparationAction { get; set; }
+        public Action ComponentPreparationDelegate { get; set; }
 
-        public Action PreMethodInvocationAction { get; set; }
+        public Action PreMethodInvocationDelegate { get; set; }
 
         public TComponent ComponentAs<TComponent>()
             where TComponent : class => this.Component as TComponent;

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnEmpty.cs

@@ -12,7 +12,7 @@ public partial class ShouldReturnTestBuilder<TActionResult>
         public IBaseTestBuilderWithActionResult<TActionResult> Empty()
         {
             this.ValidateActionReturnType<EmptyResult>();
-            return this.NewAndShouldPassForTestBuilder();
+            return this.NewAndTestBuilderWithActionResult();
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnNoContent.cs

@@ -12,7 +12,7 @@ public partial class ShouldReturnTestBuilder<TActionResult>
         public IBaseTestBuilderWithActionResult<TActionResult> NoContent()
         {
             this.ValidateActionReturnType<NoContentResult>();
-            return this.NewAndShouldPassForTestBuilder();
+            return this.NewAndTestBuilderWithActionResult();
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnNullOrDefault.cs

@@ -21,7 +21,7 @@ public IBaseTestBuilderWithActionResult<TActionResult> DefaultValue()
                     typeof(TActionResult).ToFriendlyTypeName()));
             }
 
-            return this.NewAndShouldPassForTestBuilder();
+            return this.NewAndTestBuilderWithActionResult();
         }
 
         /// <inheritdoc />
@@ -35,7 +35,7 @@ public IBaseTestBuilderWithActionResult<TActionResult> Null()
                     typeof(TActionResult).ToFriendlyTypeName()));
             }
 
-            return this.NewAndShouldPassForTestBuilder();
+            return this.NewAndTestBuilderWithActionResult();
         }
 
         /// <inheritdoc />
@@ -49,7 +49,7 @@ public IBaseTestBuilderWithActionResult<TActionResult> NotNull()
                     typeof(TActionResult).ToFriendlyTypeName()));
             }
 
-            return this.NewAndShouldPassForTestBuilder();
+            return this.NewAndTestBuilderWithActionResult();
         }
 
         private bool CheckValidDefaultValue()

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnUnauthorized.cs

@@ -12,7 +12,7 @@ public partial class ShouldReturnTestBuilder<TActionResult>
         public IBaseTestBuilderWithActionResult<TActionResult> Unauthorized()
         {
             this.ValidateActionReturnType<UnauthorizedResult>();
-            return this.NewAndShouldPassForTestBuilder();
+            return this.NewAndTestBuilderWithActionResult();
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnUnsupportedMediaType.cs

@@ -12,7 +12,7 @@ public partial class ShouldReturnTestBuilder<TActionResult>
         public IBaseTestBuilderWithActionResult<TActionResult> UnsupportedMediaType()
         {
             this.ValidateActionReturnType<UnsupportedMediaTypeResult>();
-            return this.NewAndShouldPassForTestBuilder();
+            return this.NewAndTestBuilderWithActionResult();
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/VoidActionResultTestBuilder.cs

@@ -26,7 +26,7 @@ public VoidActionResultTestBuilder(ControllerTestContext testContext)
         public IBaseTestBuilderWithInvokedAction ShouldReturnEmpty()
         {
             ActionValidator.CheckForException(this.CaughtException);
-            return this.NewAndShouldPassForTestBuilder();
+            return this.NewAndTestBuilderWithInvokedAction();
         }
 
         /// <inheritdoc />

src/MyTested.AspNetCore.Mvc.Controllers/Builders/And/AndShouldPassForTestBuilder{TActionResult}.cs renamed to src/MyTested.AspNetCore.Mvc.Controllers/Builders/And/AndTestBuilderWithActionResult{TActionResult}.cs

@@ -7,13 +7,13 @@
     /// Provides additional testing methods.
     /// </summary>
     /// <typeparam name="TActionResult">Result from invoked action in ASP.NET Core MVC controller.</typeparam>
-    public class AndShouldPassForTestBuilder<TActionResult> : BaseTestBuilderWithActionResult<TActionResult>
+    public class AndTestBuilderWithActionResult<TActionResult> : BaseTestBuilderWithActionResult<TActionResult>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="AndShouldPassForTestBuilder{TActionResult}"/> class.
+        /// Initializes a new instance of the <see cref="AndTestBuilderWithActionResult{TActionResult}"/> class.
         /// </summary>
         /// <param name="testContext"><see cref="ControllerTestContext"/> containing data about the currently executed assertion chain.</param>
-        public AndShouldPassForTestBuilder(ControllerTestContext testContext)
+        public AndTestBuilderWithActionResult(ControllerTestContext testContext)
             : base(testContext)
         {
         }