Added all generic ShouldPassForThe method options (#181)

Author: ivaylokenov

samples/MusicStore/MusicStore.Test/Controllers/ShoppingCartControllerTest.cs

@@ -7,6 +7,7 @@
     using MyTested.AspNetCore.Mvc;
     using ViewModels;
     using Xunit;
+    using Microsoft.AspNetCore.Http;
 
     public class ShoppingCartControllerTest
     {
@@ -89,8 +90,7 @@ public void AddToCartShouldAddItemsToCart()
                 .Redirect()
                 .To<ShoppingCartController>(c => c.Index())
                 .AndAlso()
-                .ShouldPassFor()
-                .TheHttpContext(async httpContext =>
+                .ShouldPassForThe<HttpContext>(async httpContext =>
                 {
                     var cart = ShoppingCart.GetCart(From.Services<MusicStoreContext>(), httpContext);
                     Assert.Equal(1, (await cart.GetCartItems()).Count);
@@ -127,8 +127,7 @@ public void RemoveFromCartShouldRemoveItemFromCart()
                     Assert.Equal(" has been removed from your shopping cart.", model.Message);
                 })
                 .AndAlso()
-                .ShouldPassFor()
-                .TheHttpContext(async httpContext =>
+                .ShouldPassForThe<HttpContext>(async httpContext =>
                 {
                     var cart = ShoppingCart.GetCart(From.Services<MusicStoreContext>(), httpContext);
                     Assert.False((await cart.GetCartItems()).Any(c => c.CartItemId == cartItemId));

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

@@ -1,13 +1,9 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Base
 {
     using Contracts.Base;
-    using Contracts.ShouldPassFor;
     using Internal.TestContexts;
     using Licensing;
     using Microsoft.AspNetCore.Http;
-    using ShouldPassFor;
-    using System;
-    using System.Reflection;
     using Utilities.Validators;
 
     /// <summary>
@@ -47,8 +43,5 @@ private set
                 this.testContext = value;
             }
         }
-        
-        /// <inheritdoc />
-        public IShouldPassForTestBuilder ShouldPassFor() => new ShouldPassForTestBuilder(this.TestContext);
     }
 }

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/Base/IBaseTestBuilder.cs

@@ -1,16 +1,9 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Base
 {
-    using ShouldPassFor;
-
     /// <summary>
     /// Base interface for all test builders.
     /// </summary>
     public interface IBaseTestBuilder
     {
-        /// <summary>
-        /// Allows additional testing on various components.
-        /// </summary>
-        /// <returns>Test builder of <see cref="IShouldPassForTestBuilder"/> type.</returns>
-        IShouldPassForTestBuilder ShouldPassFor();
     }
 }

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/ShouldPassFor/IShouldPassForTestBuilder.cs

@@ -52,13 +52,18 @@ public static void SetHttpContextToAccessor(HttpContext httpContext)
         public static TComponent TryGetShouldPassForValue<TComponent>(ComponentTestContext testContext)
             where TComponent : class
         {
+            var result = testContext.ComponentAs<TComponent>()
+                ?? testContext.MethodResultAs<TComponent>()
+                ?? testContext.ModelAs<TComponent>();
+
             foreach (var shouldPassForPlugin in ShouldPassForPlugins)
             {
-                var 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/Builders/ShouldPassFor/ShouldPassForTestBuilder.cs

@@ -19,18 +19,10 @@ public class AbstractionsTestPlugin : BaseTestPlugin, IServiceRegistrationPlugin
         public Action<IServiceProvider> InitializationDelegate => serviceProvider => serviceProvider.GetService<IControllerActionDescriptorCache>();
 
         public object TryGetValue(Type type, ComponentTestContext testContext)
-        {
-            if (Reflection.AreAssignable(baseHttpContextType, type))
-            {
-                return testContext.HttpContext;
-            }
-
-            if (Reflection.AreAssignable(baseHttpRequestType, type))
-            {
-                return testContext.HttpRequest;
-            }
-
-            return null;
-        }
+            => Reflection.AreAssignable(baseHttpContextType, type) // HttpContext
+                ? testContext.HttpContext
+                : Reflection.AreAssignable(baseHttpRequestType, type) // HttpRequest
+                ? (object)testContext.HttpRequest
+                : null;
     }
 }

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

@@ -0,0 +1,21 @@
+namespace MyTested.AspNetCore.Mvc
+{
+    using System.Collections;
+    using System.Collections.Generic;
+    using Utilities.Validators;
+
+    public class ActionAttributes : IEnumerable<object>
+    {
+        private readonly IEnumerable<object> attributes;
+
+        public ActionAttributes(IEnumerable<object> attributes)
+        {
+            CommonValidator.CheckForNullReference(attributes, nameof(ActionAttributes));
+            this.attributes = attributes;
+        }
+
+        public IEnumerator<object> GetEnumerator() => this.attributes.GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+    }
+}

src/MyTested.AspNetCore.Mvc.Abstractions/Plugins/AbstractionsTestPlugin.cs

@@ -1,22 +1,17 @@
 namespace MyTested.AspNetCore.Mvc.Builders.ActionResults.BadRequest
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Net;
     using Base;
-    using Contracts.Base;
     using Contracts.ActionResults.BadRequest;
     using Contracts.Models;
-    using Contracts.ShouldPassFor;
     using Exceptions;
     using Internal.TestContexts;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Formatters;
     using Microsoft.AspNetCore.Mvc.ModelBinding;
     using Microsoft.Net.Http.Headers;
-    using Models;
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using ShouldPassFor;
     using Utilities.Extensions;
 
     /// <summary>
@@ -199,10 +194,7 @@ public IAndBadRequestTestBuilder WithErrorMessage(Func<string, bool> predicate)
 
         /// <inheritdoc />
         public IBadRequestTestBuilder AndAlso() => this;
-
-        IShouldPassForTestBuilderWithActionResult<ActionResult> IBaseTestBuilderWithActionResult<ActionResult>.ShouldPassFor()
-            => new ShouldPassForTestBuilderWithActionResult<ActionResult>(this.TestContext);
-
+        
         protected override void ThrowNewFailedValidationException(string propertyName, string expectedValue, string actualValue)
             => this.ThrowNewHttpBadRequestResultAssertionException(propertyName, expectedValue, actualValue);
 

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

@@ -8,15 +8,13 @@
     using Base;
     using Contracts.ActionResults.Created;
     using Contracts.Base;
-    using Contracts.ShouldPassFor;
     using Contracts.Uri;
     using Exceptions;
     using Internal.TestContexts;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Formatters;
     using Microsoft.AspNetCore.Routing;
     using Microsoft.Net.Http.Headers;
-    using ShouldPassFor;
     using Utilities.Extensions;
     using Utilities.Validators;
 
@@ -332,10 +330,7 @@ public IAndCreatedTestBuilder At<TController>(Expression<Func<TController, Task>
 
         /// <inheritdoc />
         public ICreatedTestBuilder AndAlso() => this;
-
-        IShouldPassForTestBuilderWithActionResult<ObjectResult> IBaseTestBuilderWithActionResult<ObjectResult>.ShouldPassFor()
-            => new ShouldPassForTestBuilderWithActionResult<ObjectResult>(this.TestContext);
-
+        
         /// <summary>
         /// Throws new created result assertion exception for the provided property name, expected value and actual value.
         /// </summary>