Merge pull request #327 - Make InvokedWith More Accessible

Make InvokedWith More Accessible

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.ViewComponents/MyViewComponent.cs

@@ -1,6 +1,9 @@
 namespace MyTested.AspNetCore.Mvc
 {
     using System;
+    using System.Linq.Expressions;
+    using System.Threading.Tasks;
+    using Builders.Contracts.Invocations;
     using Builders.Contracts.ViewComponents;
     using Builders.ViewComponents;
     using Internal.Application;
@@ -71,5 +74,25 @@ public static IViewComponentBuilder<TViewComponent> Instance(Func<TViewComponent
         public new static IViewComponentTestBuilder ShouldHave()
             => Instance()
                 .ShouldHave();
+
+        /// <summary>
+        /// Indicates which view component method should be invoked and tested.
+        /// </summary>
+        /// <typeparam name="TInvocationResult">Type of result from the invocation.</typeparam>
+        /// <param name="invocationCall">Method call expression indicating invoked method.</param>
+        /// <returns>Test builder of <see cref="IViewComponentResultTestBuilder{TInvocationResult}"/> type.</returns>
+        public new static IViewComponentResultTestBuilder<TInvocationResult> InvokedWith<TInvocationResult>(Expression<Func<TViewComponent, TInvocationResult>> invocationCall)
+            => Instance()
+                .InvokedWith(invocationCall);
+
+        /// <summary>
+        /// Indicates which view component method should be invoked and tested.
+        /// </summary>
+        /// <typeparam name="TInvocationResult">Type of result from the invocation.</typeparam>
+        /// <param name="invocationCall">Method call expression indicating invoked asynchronous method.</param>
+        /// <returns>Test builder of <see cref="IViewComponentResultTestBuilder{TInvocationResult}"/> type.</returns>
+        public new static IViewComponentResultTestBuilder<TInvocationResult> InvokedWith<TInvocationResult>(Expression<Func<TViewComponent, Task<TInvocationResult>>> invocationCall)
+            => Instance()
+                .InvokedWith(invocationCall);
     }
 }

test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/DataTests/MemoryCacheEntryDetailsTestBuilderTests.cs

@@ -78,7 +78,6 @@ public void WithValidShouldThrowExceptionWithIncorrectValuePredicate()
         public void WithValidShouldNotThrowExceptionWithViewComponentCorrectValuePredicate()
         {
             MyViewComponent<MemoryCacheValuesComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke())
                 .ShouldHave()
                 .MemoryCache(memoryCache => memoryCache
@@ -98,7 +97,6 @@ public void WithValidShouldThrowExceptionWithViewComponentIncorrectValuePredicat
                 () =>
                 {
                     MyViewComponent<MemoryCacheValuesComponent>
-                        .Instance()
                         .InvokedWith(c => c.Invoke())
                         .ShouldHave()
                         .MemoryCache(memoryCache => memoryCache

test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs

@@ -68,7 +68,6 @@ public void MockMemoryCacheShouldBeDifferentForEveryViewComponentCallSynchronous
                 .View();
 
             MyViewComponent<MemoryCacheComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke())
                 .ShouldReturn()
                 .Content("No cache");

test/MyTested.AspNetCore.Mvc.Caching.Test/ServicesTests.cs

@@ -21,7 +21,6 @@ public void DbContextShouldNotThrowExceptionWithCorrectAssertions()
                 });
 
             MyViewComponent<CreateDataComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke(new CustomModel { Id = 1, Name = "Test" }))
                 .ShouldHave()
                 .Data(dbContext => dbContext
@@ -47,7 +46,6 @@ public void DbContextShouldNotThrowExceptionWithCorrectPredicate()
                 });
 
             MyViewComponent<CreateDataComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke(new CustomModel { Id = 1, Name = "Test" }))
                 .ShouldHave()
                 .Data(dbContext => dbContext
@@ -70,7 +68,6 @@ public void DbContextShouldThrowExceptionWithIncorrectPredicate()
                 });
 
             MyViewComponent<CreateDataComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke(new CustomModel { Id = 1, Name = "Test" }))
                 .ShouldHave()
                 .Data(dbContext => dbContext
@@ -82,7 +79,6 @@ public void DbContextShouldThrowExceptionWithIncorrectPredicate()
             Test.AssertException<DataProviderAssertionException>(() =>
             {
                 MyViewComponent<CreateDataComponent>
-                    .Instance()
                     .InvokedWith(c => c.Invoke(new CustomModel { Id = 2, Name = "Test" }))
                     .ShouldHave()
                     .Data(dbContext => dbContext

test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs

@@ -63,7 +63,6 @@ public void WithEntitesShouldSetupDbContext()
                 .Content("Invalid");
 
             MyViewComponent<FindDataComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke(1))
                 .ShouldReturn()
                 .Content("Invalid");
@@ -111,7 +110,6 @@ public void WithSetShouldSetupDbContext()
                 .Content("Invalid");
 
             MyViewComponent<FindDataComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke(1))
                 .ShouldReturn()
                 .Content("Invalid");

test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ViewComponentsTests/ViewComponentBuilderTests.cs

@@ -10,7 +10,6 @@ public class ViewComponentShouldReturnViewTests
         public void ShouldReturnViewWithNameShouldNotThrowExceptionWithCorrectModel()
         {
             MyViewComponent<ViewResultComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke("model"))
                 .ShouldReturn()
                 .View(new ResponseModel { StringValue = "TestValue" });
@@ -20,7 +19,6 @@ public void ShouldReturnViewWithNameShouldNotThrowExceptionWithCorrectModel()
         public void ShouldReturnViewWithNameShouldNotThrowExceptionWithCorrectNameAndModel()
         {
             MyViewComponent<ViewResultComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke("All"))
                 .ShouldReturn()
                 .View("SomeView", new ResponseModel { IntegerValue = 10 });

test/MyTested.AspNetCore.Mvc.Helpers.Test/BuildersTests/InvocationsTests/ShouldReturnTests/ViewComponentShouldReturnViewTests.cs

@@ -695,7 +695,6 @@ public void WithJsonBodyAsStringShouldWorkCorrectly()
         public void ViewComponentInvocationShouldNotThrowExceptionWithCorrectResponse()
         {
             MyViewComponent<HttpResponseComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke())
                 .ShouldHave()
                 .HttpResponse(response => response
@@ -723,7 +722,6 @@ public void ViewComponentWithJsonBodyShouldThrowExceptionWithWrongBody()
                 () =>
                 {
                     MyViewComponent<HttpResponseComponent>
-                        .Instance()
                         .InvokedWith(c => c.Invoke())
                         .ShouldHave()
                         .HttpResponse(response => response.WithJsonBody(new RequestModel { Integer = 2, RequiredString = "Text" }));

test/MyTested.AspNetCore.Mvc.Http.Test/BuildersTests/HttpTests/HttpResponseTestBuilderTests.cs

@@ -87,7 +87,6 @@ public void WithHttpContextSetupShouldPopulateContextProperties()
         public void WithRequestShouldNotWorkWithDefaultRequestAction()
         {
             MyViewComponent<HttpRequestComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke())
                 .ShouldReturn()
                 .Content();
@@ -122,7 +121,6 @@ public void WithRequestAsObjectShouldWorkWithSetRequestAction()
         public void HttpResponseAssertionsShouldWorkCorrectly()
         {
             MyViewComponent<NormalComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke())
                 .ShouldReturn()
                 .Content()
@@ -136,7 +134,6 @@ public void HttpResponseAssertionsShouldWorkCorrectly()
         public void HttpResponsePredicateShouldWorkCorrectly()
         {
             MyViewComponent<NormalComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke())
                 .ShouldPassForThe<HttpResponse>(response => response != null);
         }
@@ -148,7 +145,6 @@ public void HttpResponsePredicateShouldThrowExceptionWithInvalidTest()
                 () =>
                 {
                     MyViewComponent<NormalComponent>
-                        .Instance()
                         .InvokedWith(c => c.Invoke())
                         .ShouldPassForThe<HttpResponse>(response => response == null);
                 },

test/MyTested.AspNetCore.Mvc.Http.Test/BuildersTests/ViewComponentsTests/ViewComponentBuilderTests.cs

@@ -146,7 +146,6 @@ public void AndShouldWorkCorrectlyWithInvalidModelState()
         public void ShouldHaveValidModelStateShouldBeValidWithViewComponentValidModelState()
         {
             MyViewComponent<NormalComponent>
-                .Instance()
                 .InvokedWith(c => c.Invoke())
                 .ShouldHave()
                 .ValidModelState();
@@ -221,7 +220,6 @@ public void ShouldHaveInvalidModelStateShouldThrowExceptionWithValidViewComponen
                 () =>
                 {
                     MyViewComponent<NormalComponent>
-                        .Instance()
                         .InvokedWith(c => c.Invoke())
                         .ShouldHave()
                         .InvalidModelState();
@@ -236,7 +234,6 @@ public void ShouldHaveInvalidModelStateShouldThrowExceptionWithViewComponentMode
                 () =>
                 {
                     MyViewComponent<NormalComponent>
-                        .Instance()
                         .InvokedWith(c => c.Invoke())
                         .ShouldHave()
                         .InvalidModelState(withNumberOfErrors: 5);