Merge pull request #315 - Make Calling more accessible

ivaylokenov · web-flow · commit 40c32f0907c8 · 2019-08-17T23:03:31.000+03:00
#290 Make Calling more accessible
diff --git a/samples/ApplicationParts/ApplicationParts.Test/Tests.cs b/samples/ApplicationParts/ApplicationParts.Test/Tests.cs
@@ -17,15 +17,13 @@ public void CustomRouteShouldMatchCorrectController()
         [Test]
         public void HomeControllerShouldReturnView()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.Index())
                 .ShouldReturn()
                 .View();
         
         [Test]
         public void RedirectShouldRedirectToIndex()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.RedirectToIndex())
                 .ShouldReturn()
                 .Redirect(redirect => redirect
diff --git a/samples/Autofac/Autofac.AssemblyInit.Test/HomeControllerTest.cs b/samples/Autofac/Autofac.AssemblyInit.Test/HomeControllerTest.cs
@@ -17,7 +17,6 @@ public void CustomRouteShouldMatchCorrectController()
         [TestMethod]
         public void IndexShouldReturnViewWithCorrectModel()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.Index())
                 .ShouldReturn()
                 .View(view => view
@@ -27,7 +26,6 @@ public void IndexShouldReturnViewWithCorrectModel()
         [TestMethod]
         public void RedirectShouldRedirectToIndex()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.RedirectToIndex())
                 .ShouldReturn()
                 .Redirect(redirect => redirect
diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Test/HomeControllerTest.cs b/samples/Autofac/Autofac.NoContainerBuilder.Test/HomeControllerTest.cs
@@ -16,7 +16,6 @@ public void CustomRouteShouldMatchCorrectController()
         [Fact]
         public void IndexShouldReturnViewWithCorrectModel()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.Index())
                 .ShouldReturn()
                 .View(view => view
@@ -26,7 +25,6 @@ public void IndexShouldReturnViewWithCorrectModel()
         [Fact]
         public void RedirectShouldRedirectToIndex()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.RedirectToIndex())
                 .ShouldReturn()
                 .Redirect(redirect => redirect
diff --git a/samples/Autofac/Autofac.Test/HomeControllerTest.cs b/samples/Autofac/Autofac.Test/HomeControllerTest.cs
@@ -16,7 +16,6 @@ public void CustomRouteShouldMatchCorrectController()
         [Fact]
         public void IndexShouldReturnViewWithCorrectModel()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.Index())
                 .ShouldReturn()
                 .View(view => view
@@ -26,7 +25,6 @@ public void IndexShouldReturnViewWithCorrectModel()
         [Fact]
         public void RedirectShouldRedirectToIndex()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.RedirectToIndex())
                 .ShouldReturn()
                 .Redirect(redirect => redirect
diff --git a/samples/Blog/Blog.Test/Controllers/HomeControllerTest.cs b/samples/Blog/Blog.Test/Controllers/HomeControllerTest.cs
@@ -13,7 +13,6 @@ public class HomeControllerTest
         [Fact]
         public void PrivacyShouldReturnDefaultView()
             => MyController<HomeController>
-                .Instance()
                 .Calling(c => c.Privacy())
                 .ShouldReturn()
                 .View();
diff --git a/samples/Configuration/Test.Core.MissingAppPackage/HomeControllerTest.cs b/samples/Configuration/Test.Core.MissingAppPackage/HomeControllerTest.cs
@@ -13,7 +13,6 @@ public void MissingAppPackageShouldThrowCorrectException()
             var exception = Assert.Throws<InvalidOperationException>(() =>
             {
                 MyController<HomeController>
-                    .Instance()
                     .Calling(c => c.Index())
                     .ShouldReturn()
                     .View();
diff --git a/samples/Configuration/Test.DifferentEnvironment/HomeControllerTest.cs b/samples/Configuration/Test.DifferentEnvironment/HomeControllerTest.cs
@@ -13,7 +13,6 @@ public void DifferentEnvironmentShouldThrowCorrectException()
             var exception = Assert.Throws<InvalidOperationException>(() =>
             {
                 MyController<HomeController>
-                    .Instance()
                     .Calling(c => c.Index())
                     .ShouldReturn()
                     .View();
diff --git a/samples/Configuration/Test.FullFramework.NoCompilationContext/HomeControllerTest.cs b/samples/Configuration/Test.FullFramework.NoCompilationContext/HomeControllerTest.cs
@@ -13,7 +13,6 @@ public void MissingCompilationContextShouldThrowCorrectException()
             var exception = Assert.Throws<InvalidOperationException>(() =>
             {
                 MyController<HomeController>
-                    .Instance()
                     .Calling(c => c.Index())
                     .ShouldReturn()
                     .View();
diff --git a/samples/Configuration/Test.MissingStartupType/HomeControllerTest.cs b/samples/Configuration/Test.MissingStartupType/HomeControllerTest.cs
@@ -13,7 +13,6 @@ public void MissingStartupShouldThrowCorrectException()
             var exception = Assert.Throws<TypeInitializationException>(() =>
             {
                 MyController<HomeController>
-                    .Instance()
                     .Calling(c => c.Index())
                     .ShouldReturn()
                     .View();
diff --git a/samples/Configuration/Test.NoStartupType/HomeControllerTest.cs b/samples/Configuration/Test.NoStartupType/HomeControllerTest.cs
@@ -13,7 +13,6 @@ public void NoStartupShouldThrowCorrectException()
             var exception = Assert.Throws<TypeInitializationException>(() =>
             {
                 MyController<HomeController>
-                    .Instance()
                     .Calling(c => c.Index())
                     .ShouldReturn()
                     .View();
diff --git a/samples/Configuration/Test.WrongStartupType/HomeControllerTest.cs b/samples/Configuration/Test.WrongStartupType/HomeControllerTest.cs
@@ -13,7 +13,6 @@ public void WrongStartupShouldThrowCorrectException()
             var exception = Assert.Throws<InvalidOperationException>(() =>
             {
                 MyController<HomeController>
-                    .Instance()
                     .Calling(c => c.Index())
                     .ShouldReturn()
                     .View();
diff --git a/src/MyTested.AspNetCore.Mvc.Controllers/MyController.cs b/src/MyTested.AspNetCore.Mvc.Controllers/MyController.cs
@@ -1,6 +1,9 @@
 ﻿namespace MyTested.AspNetCore.Mvc
 {
     using System;
+    using System.Linq.Expressions;
+    using System.Threading.Tasks;
+    using Builders.Contracts.Actions;
     using Builders.Contracts.Controllers;
     using Builders.Controllers;
     using Internal.Application;
@@ -63,5 +66,43 @@ public static IControllerBuilder<TController> Instance(TController controller)
         /// <returns>Test builder of <see cref="IControllerBuilder{TController}"/> type.</returns>
         public static IControllerBuilder<TController> Instance(Func<TController> construction) 
             => new MyController<TController>(construction);
+
+        /// <summary>
+        /// Indicates which action should be invoked and tested.
+        /// </summary>
+        /// <typeparam name="TActionResult">Type of result from action.</typeparam>
+        /// <param name="actionCall">Method call expression indicating invoked action.</param>
+        /// <returns>Test builder of <see cref="IActionResultTestBuilder{TActionResult}"/> type.</returns>
+        public new static IActionResultTestBuilder<TActionResult> Calling<TActionResult>(Expression<Func<TController, TActionResult>> actionCall)
+            => Instance()
+                .Calling(actionCall);
+
+        /// <summary>
+        /// Indicates which action should be invoked and tested.
+        /// </summary>
+        /// <typeparam name="TActionResult">Type of result from action.</typeparam>
+        /// <param name="actionCall">Method call expression indicating invoked asynchronous action.</param>
+        /// <returns>Test builder of <see cref="IActionResultTestBuilder{TActionResult}"/> type.</returns>
+        public new static IActionResultTestBuilder<TActionResult> Calling<TActionResult>(Expression<Func<TController, Task<TActionResult>>> actionCall)
+            => Instance()
+                .Calling(actionCall);
+
+        /// <summary>
+        /// Indicates which action should be invoked and tested.
+        /// </summary>
+        /// <param name="actionCall">Method call expression indicating invoked void action.</param>
+        /// <returns>Test builder of <see cref="IActionResultTestBuilder{TActionResult}"/> type.</returns>
+        public new static IVoidActionResultTestBuilder Calling(Expression<Action<TController>> actionCall)
+            => Instance()
+                .Calling(actionCall);
+
+        /// <summary>
+        /// Indicates which action should be invoked and tested.
+        /// </summary>
+        /// <param name="actionCall">Method call expression indicating invoked asynchronous void action.</param>
+        /// <returns>Test builder of <see cref="IActionResultTestBuilder{TActionResult}"/> type.</returns>
+        public new static IVoidActionResultTestBuilder Calling(Expression<Func<TController, Task>> actionCall)
+            => Instance()
+                .Calling(actionCall);
     }
 }
diff --git a/test/MyTested.AspNetCore.Mvc.Caching.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.Caching.Test/ServicesTests.cs
@@ -93,6 +93,7 @@ public void MockMemoryCacheShouldBeDifferentForEveryCallSynchronouslyWithCachedC
                 .Ok();
 
             controller
+                .WithMemoryCache(cache => cache.WithEntry(string.Empty, string.Empty))
                 .Calling(c => c.MemoryCacheAction())
                 .ShouldReturn()
                 .BadRequest();

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public void MissingAppPackageShouldThrowCorrectException()`
`13`	`13`	`var exception = Assert.Throws<InvalidOperationException>(() =>`
`14`	`14`	`{`
`15`	`15`	`MyController<HomeController>`
`16`		`- .Instance()`
`17`	`16`	`.Calling(c => c.Index())`
`18`	`17`	`.ShouldReturn()`
`19`	`18`	`.View();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public void DifferentEnvironmentShouldThrowCorrectException()`
`13`	`13`	`var exception = Assert.Throws<InvalidOperationException>(() =>`
`14`	`14`	`{`
`15`	`15`	`MyController<HomeController>`
`16`		`- .Instance()`
`17`	`16`	`.Calling(c => c.Index())`
`18`	`17`	`.ShouldReturn()`
`19`	`18`	`.View();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public void MissingCompilationContextShouldThrowCorrectException()`
`13`	`13`	`var exception = Assert.Throws<InvalidOperationException>(() =>`
`14`	`14`	`{`
`15`	`15`	`MyController<HomeController>`
`16`		`- .Instance()`
`17`	`16`	`.Calling(c => c.Index())`
`18`	`17`	`.ShouldReturn()`
`19`	`18`	`.View();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public void MissingStartupShouldThrowCorrectException()`
`13`	`13`	`var exception = Assert.Throws<TypeInitializationException>(() =>`
`14`	`14`	`{`
`15`	`15`	`MyController<HomeController>`
`16`		`- .Instance()`
`17`	`16`	`.Calling(c => c.Index())`
`18`	`17`	`.ShouldReturn()`
`19`	`18`	`.View();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public void NoStartupShouldThrowCorrectException()`
`13`	`13`	`var exception = Assert.Throws<TypeInitializationException>(() =>`
`14`	`14`	`{`
`15`	`15`	`MyController<HomeController>`
`16`		`- .Instance()`
`17`	`16`	`.Calling(c => c.Index())`
`18`	`17`	`.ShouldReturn()`
`19`	`18`	`.View();`