All unit tests now run successfully with the generic version of ShouldPassFor (closes #181)

Author: ivaylokenov

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

@@ -1,14 +1,14 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Base
 {
     using System;
+    using And;
     using Contracts.And;
     using Contracts.Base;
     using Exceptions;
     using Internal;
     using Internal.TestContexts;
     using Utilities;
     using Utilities.Validators;
-    using And;
 
     /// <summary>
     /// Base class for all test builders with component.
@@ -25,6 +25,7 @@ protected BaseTestBuilderWithComponent(ComponentTestContext testContext)
             : base(testContext)
         {
             this.TestContext = testContext;
+            this.BuildComponentAction += () => { };
         }
 
         /// <summary>
@@ -45,18 +46,25 @@ private set
             }
         }
 
+        protected Action BuildComponentAction { get; set; }
+
         /// <inheritdoc />
         public IAndTestBuilder ShouldPassForThe<TComponent>(Action<TComponent> assertions)
             where TComponent : class
         {
+            this.BuildComponentAction();
+
             assertions(TestHelper.TryGetShouldPassForValue<TComponent>(this.TestContext));
+
             return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
         public IAndTestBuilder ShouldPassForThe<TComponent>(Func<TComponent, bool> predicate)
             where TComponent : class
         {
+            this.BuildComponentAction();
+
             if (!predicate(TestHelper.TryGetShouldPassForValue<TComponent>(this.TestContext)))
             {
                 throw new InvalidAssertionException($"Expected {typeof(TComponent).ToFriendlyTypeName()} to pass the given predicate but it failed.");

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

@@ -0,0 +1,18 @@
+namespace MyTested.AspNetCore.Mvc.Builders.Components
+{
+    using Base;
+    using Contracts.Base;
+    using Internal.TestContexts;
+
+    public abstract class BaseComponentBuilder<TBuilder> : BaseTestBuilderWithComponentBuilder<TBuilder>
+        where TBuilder : IBaseTestBuilder
+    {
+        public BaseComponentBuilder(ComponentTestContext testContext)
+            : base(testContext)
+        {
+            this.BuildComponentAction += this.BuildComponentIfNotExists;
+        }
+
+        protected abstract void BuildComponentIfNotExists();
+    }
+}

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestHelper.cs

@@ -55,15 +55,20 @@ public static TComponent TryGetShouldPassForValue<TComponent>(ComponentTestConte
             var result = testContext.ComponentAs<TComponent>()
                 ?? testContext.MethodResultAs<TComponent>()
                 ?? testContext.ModelAs<TComponent>();
+            
+            if (result != null)
+            {
+                return result;
+            }
 
             foreach (var shouldPassForPlugin in ShouldPassForPlugins)
             {
+                result = shouldPassForPlugin.TryGetValue(typeof(TComponent), testContext) as TComponent;
+
                 if (result != null)
                 {
                     return result;
                 }
-
-                result = shouldPassForPlugin.TryGetValue(typeof(TComponent), testContext) as TComponent;
             }
 
             throw new InvalidOperationException($"{typeof(TComponent).ToFriendlyTypeName()} could not be resolved for the 'ShouldPassForThe<TComponent>' method call.");

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/VoidMethodResult.cs

@@ -0,0 +1,15 @@
+namespace MyTested.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Represents void method result in generic test builder.
+    /// </summary>
+    public class VoidMethodResult
+    {
+        /// <summary>
+        /// Gets an instance of <see cref="VoidMethodResult"/>.
+        /// </summary>
+        /// <returns>Void method result.</returns>
+        /// <value>Instance of <see cref="VoidMethodResult"/>.</value>
+        public static VoidMethodResult Instance { get; } = new VoidMethodResult();
+    }
+}

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

@@ -30,9 +30,9 @@ public IBaseTestBuilderWithInvokedAction ShouldReturnEmpty()
         }
 
         /// <inheritdoc />
-        public IShouldHaveTestBuilder<VoidActionResult> ShouldHave()
+        public IShouldHaveTestBuilder<VoidMethodResult> ShouldHave()
         {
-            return new ShouldHaveTestBuilder<VoidActionResult>(this.TestContext);
+            return new ShouldHaveTestBuilder<VoidMethodResult>(this.TestContext);
         }
 
         /// <inheritdoc />

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Actions/IVoidActionResultTestBuilder.cs

@@ -18,7 +18,7 @@ public interface IVoidActionResultTestBuilder : IBaseTestBuilderWithInvokedActio
         /// Used for testing the action's additional data - action attributes, HTTP response, view bag and more.
         /// </summary>
         /// <returns>Test builder of <see cref="IShouldHaveTestBuilder{VoidActionResult}"/> type.</returns>
-        IShouldHaveTestBuilder<VoidActionResult> ShouldHave();
+        IShouldHaveTestBuilder<VoidMethodResult> ShouldHave();
 
         /// <summary>
         /// Used for testing whether the action throws exception.

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

@@ -69,7 +69,7 @@ public IVoidActionResultTestBuilder Calling(Expression<Action<TController>> acti
             this.TestContext.MethodName = actionName;
             this.TestContext.MethodCall = actionCall;
             this.TestContext.CaughtException = caughtException;
-            this.TestContext.MethodResult = VoidActionResult.Instance;
+            this.TestContext.MethodResult = VoidMethodResult.Instance;
 
             return new VoidActionResultTestBuilder(this.TestContext);
         }
@@ -89,7 +89,7 @@ public IVoidActionResultTestBuilder Calling(Expression<Func<TController, Task>>
             }
 
             this.TestContext.Apply(actionInfo);
-            this.TestContext.MethodResult = VoidActionResult.Instance;
+            this.TestContext.MethodResult = VoidMethodResult.Instance;
 
             return new VoidActionResultTestBuilder(this.TestContext);
         }
@@ -114,7 +114,7 @@ private ActionTestContext<TActionResult> GetAndValidateActionResult<TActionResul
 
         private string GetAndValidateAction(LambdaExpression actionCall)
         {
-            this.BuildControllerIfNotExists();
+            this.BuildComponentAction();
 
             this.TestContext.MethodCall = actionCall;
             this.TestContext.PreMethodInvocationAction?.Invoke();

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

@@ -2,6 +2,7 @@
 {
     using System;
     using Base;
+    using Components;
     using Contracts.Controllers;
     using Internal.Application;
     using Internal.Contracts;
@@ -17,7 +18,7 @@
     /// Used for building the controller which will be tested.
     /// </summary>
     /// <typeparam name="TController">Class representing ASP.NET Core MVC controller.</typeparam>
-    public partial class ControllerBuilder<TController> : BaseTestBuilderWithComponentBuilder<IAndControllerBuilder<TController>>, IAndControllerBuilder<TController>
+    public partial class ControllerBuilder<TController> : BaseComponentBuilder<IAndControllerBuilder<TController>>, IAndControllerBuilder<TController>
         where TController : class
     {
         private ControllerTestContext testContext;
@@ -45,7 +46,7 @@ private TController Controller
         {
             get
             {
-                this.BuildControllerIfNotExists();
+                this.BuildComponentAction();
                 return this.TestContext.ComponentAs<TController>();
             }
         }
@@ -81,7 +82,7 @@ public IAndControllerBuilder<TController> AndAlso()
         /// <inheritdoc />
         public IControllerTestBuilder ShouldHave()
         {
-            this.BuildControllerIfNotExists();
+            this.BuildComponentAction();
             return new ControllerTestBuilder(this.TestContext);
         }
 

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

@@ -53,7 +53,7 @@ public IAndControllerBuilder<TController> WithSetup(Action<TController> controll
             return this;
         }
 
-        private void BuildControllerIfNotExists()
+        protected override void BuildComponentIfNotExists()
         {
             if (!this.isPreparedForTesting)
             {