Merge pull request #323 - #289 make controller ShouldHave more accessible

ivaylokenov · web-flow · commit 468442e50589 · 2019-08-19T18:58:07.000+03:00
#289 make controller ShouldHave more accessible
diff --git a/README.md b/README.md
@@ -400,7 +400,6 @@ An attribute declaration test validates controller and action attribute declarat
 ```c#
 // Tests for specific controller attributes - Area and Authorize.
 MyController<MyMvcController>
-    .Instance()
     .ShouldHave()
     .Attributes(attributes => attributes
         .SpecifyingArea(ControllerConstants.AdministratorArea)
diff --git a/samples/Blog/Blog.Test/Controllers/Admin/ArticlesControllerTest.cs b/samples/Blog/Blog.Test/Controllers/Admin/ArticlesControllerTest.cs
@@ -18,7 +18,6 @@ public class ArticlesControllerTest
         [Fact]
         public void ControllerShouldBeInAdminArea()
             => MyController<ArticlesController>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attrs => attrs
                     .SpecifyingArea(ControllerConstants.AdministratorArea)
diff --git a/src/MyTested.AspNetCore.Mvc.Controllers/MyController.cs b/src/MyTested.AspNetCore.Mvc.Controllers/MyController.cs
@@ -104,5 +104,13 @@ public static IControllerBuilder<TController> Instance(Func<TController> constru
         public new static IVoidActionResultTestBuilder Calling(Expression<Func<TController, Task>> actionCall)
             => Instance()
                 .Calling(actionCall);
+
+        /// <summary>
+        /// Used for testing controller additional details.
+        /// </summary>
+        /// <returns>Test builder of <see cref="IControllerTestBuilder"/> type.</returns>
+        public new static IControllerTestBuilder ShouldHave()
+            => Instance()
+                .ShouldHave();
     }
 }
diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyViewComponent.cs b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyViewComponent.cs
@@ -63,5 +63,13 @@ public static IViewComponentBuilder<TViewComponent> Instance(TViewComponent view
         /// <returns>Test builder of <see cref="IViewComponentBuilder{TViewComponent}"/> type.</returns>
         public static IViewComponentBuilder<TViewComponent> Instance(Func<TViewComponent> construction) 
             => new MyViewComponent<TViewComponent>(construction);
+
+        /// <summary>
+        /// Used for testing view component additional details.
+        /// </summary>
+        /// <returns>Test builder of <see cref="IViewComponentTestBuilder"/> type.</returns>
+        public new static IViewComponentTestBuilder ShouldHave()
+            => Instance()
+                .ShouldHave();
     }
 }
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/BuildersTests/AttributesTests/ControllerAttributesTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/BuildersTests/AttributesTests/ControllerAttributesTestBuilderTests.cs
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/AndTests/AndProvideTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/AndTests/AndProvideTestBuilderTests.cs
@@ -28,7 +28,6 @@ public void AndProvideShouldReturnProperController()
         public void AndProvideTheControllerAttributesShouldReturnProperAttributes()
         {
             MyController<MvcController>
-                .Instance()
                 .ShouldHave()
                 .Attributes()
                 .ShouldPassForThe<ControllerAttributes>(attributes =>
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/AttributesTests/ControllerAttributesTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/AttributesTests/ControllerAttributesTestBuilderTests.cs
@@ -14,7 +14,6 @@ public class ControllerAttributesTestBuilderTests
         public void ContainingAttributeOfTypeShouldNotThrowExceptionWithControllerWithTheAttribute()
         {
             MyController<MvcController>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes.ContainingAttributeOfType<AuthorizeAttribute>());
         }
@@ -26,7 +25,6 @@ public void ContainingAttributeOfTypeShouldThrowExceptionWithControllerWithoutTh
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes.ContainingAttributeOfType<AllowAnonymousAttribute>());
                 },
@@ -37,7 +35,6 @@ public void ContainingAttributeOfTypeShouldThrowExceptionWithControllerWithoutTh
         public void PassingForShouldNotThrowExceptionWithCorrectAssertions()
         {
             MyController<MvcController>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes
                     .PassingFor<AuthorizeAttribute>(authorize => Assert.Equal("Admin,Moderator", authorize.Roles)));
@@ -50,7 +47,6 @@ public void PassingForShouldThrowExceptionWithIncorrectAssertions()
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .PassingFor<AuthorizeAttribute>(authorize => Assert.Equal("Admin", authorize.Roles)));
@@ -64,7 +60,6 @@ public void PassingForShouldThrowExceptionWithIncorrectAttribute()
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .PassingFor<ActionNameAttribute>(authorize => Assert.Equal("Admin", authorize.Name)));
@@ -76,7 +71,6 @@ public void PassingForShouldThrowExceptionWithIncorrectAttribute()
         public void PassingForShouldNotThrowExceptionWithCorrectPredicate()
         {
             MyController<MvcController>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes
                     .PassingFor<AuthorizeAttribute>(authorize => authorize.Roles == "Admin,Moderator"));
@@ -89,7 +83,6 @@ public void PassingForShouldThrowExceptionWithIncorrectPredicate()
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .PassingFor<AuthorizeAttribute>(authorize => authorize.Roles == "Admin"));
@@ -104,7 +97,6 @@ public void PassingForShouldThrowExceptionWithIncorrectAttributeWithPredicate()
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .PassingFor<AuthorizeAttribute>(authorize => authorize.Roles == "Admin,Moderator")
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/ControllersTests/ControllerTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/ControllersTests/ControllerTestBuilderTests.cs
@@ -11,7 +11,6 @@ public class ControllerTestBuilderTests
         public void NoAttributesShouldNotThrowExceptionWithControllerContainingNoAttributes()
         {
             MyController<NoAttributesController>
-                .Instance()
                 .ShouldHave()
                 .NoAttributes();
         }
@@ -23,7 +22,6 @@ public void NoAttributesShouldThrowExceptionWithControllerContainingAttributes()
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .NoAttributes();
                 }, 
@@ -34,7 +32,6 @@ public void NoAttributesShouldThrowExceptionWithControllerContainingAttributes()
         public void AttributesShouldNotThrowExceptionWithControllerContainingAttributes()
         {
             MyController<MvcController>
-                .Instance()
                 .ShouldHave()
                 .Attributes();
         }
@@ -46,7 +43,6 @@ public void AttributesShouldThrowExceptionWithControllerContainingNoAttributes()
                 () =>
                 {
                     MyController<NoAttributesController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes();
                 }, 
@@ -57,7 +53,6 @@ public void AttributesShouldThrowExceptionWithControllerContainingNoAttributes()
         public void AttributesShouldNotThrowExceptionWithControllerContainingNumberOfAttributes()
         {
             MyController<MvcController>
-                .Instance()
                 .ShouldHave()
                 .Attributes(withTotalNumberOf: 4);
         }
@@ -69,7 +64,6 @@ public void AttributesShouldThrowExceptionWithControllerContainingNumberOfAttrib
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(withTotalNumberOf: 10);
                 }, 
@@ -83,7 +77,6 @@ public void AttributesShouldThrowExceptionWithControllerContainingNumberOfAttrib
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(withTotalNumberOf: 1);
                 },
diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/BuildersTests/AttributesTests/ViewComponentAttributesTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/BuildersTests/AttributesTests/ViewComponentAttributesTestBuilderTests.cs
@@ -51,7 +51,6 @@ public void ChangingViewComponentNameToShouldThrowExceptionWithViewComponentWith
         public void IndicatingControllerShouldNotThrowExceptionWithTheAttribute()
         {
             MyViewComponent<AttributesComponent>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes
                     .IndicatingViewComponentExplicitly());
@@ -64,7 +63,6 @@ public void DisablingActionCallShouldThrowExceptionWithActionWithoutTheAttribute
                 () =>
                 {
                     MyViewComponent<ComponentWithCustomAttribute>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .IndicatingViewComponentExplicitly());
diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/BuildersTests/AttributesTests/ViewComponentAttributesTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/BuildersTests/AttributesTests/ViewComponentAttributesTestBuilderTests.cs
@@ -39,7 +39,6 @@ public void ContainingAttributeOfTypeShouldThrowExceptionWithViewComponentWithou
         public void PassingForShouldNotThrowExceptionWithCorrectAssertions()
         {
             MyViewComponent<AttributesComponent>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes
                     .PassingFor<ViewComponentAttribute>(vc => Assert.Equal("Test", vc.Name)));
@@ -52,7 +51,6 @@ public void PassingForShouldThrowExceptionWithIncorrectAssertions()
                 () =>
                 {
                     MyViewComponent<AttributesComponent>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .PassingFor<ViewComponentAttribute>(route => Assert.Equal("Invalid", route.Name)));
@@ -66,7 +64,6 @@ public void PassingForShouldThrowExceptionWithIncorrectAttribute()
                 () =>
                 {
                     MyViewComponent<AttributesComponent>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .PassingFor<ActionNameAttribute>(authorize => Assert.Equal("Admin", authorize.Name)));
@@ -78,7 +75,6 @@ public void PassingForShouldThrowExceptionWithIncorrectAttribute()
         public void PassingForShouldNotThrowExceptionWithCorrectPredicate()
         {
             MyViewComponent<AttributesComponent>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes
                     .PassingFor<ViewComponentAttribute>(route => route.Name == "Test"));
@@ -91,7 +87,6 @@ public void PassingForShouldThrowExceptionWithIncorrectPredicate()
                 () =>
                 {
                     MyViewComponent<AttributesComponent>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .PassingFor<ViewComponentAttribute>(vc => vc.Name == "Invalid"));
@@ -106,7 +101,6 @@ public void PassingForShouldThrowExceptionWithIncorrectAttributeWithPredicate()
                 () =>
                 {
                     MyViewComponent<AttributesComponent>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes
                             .PassingFor<ActionNameAttribute>(vc => vc.Name == "Admin"));
diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/BuildersTests/ShouldPassForTests/ShouldPassForTests.cs b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/BuildersTests/ShouldPassForTests/ShouldPassForTests.cs
@@ -30,7 +30,6 @@ public void AndProvideShouldReturnProperController()
         public void AndProvideTheControllerAttributesShouldReturnProperAttributes()
         {
             MyViewComponent<AttributesComponent>
-                .Instance()
                 .ShouldHave()
                 .Attributes()
                 .ShouldPassForThe<ViewComponentAttributes>(attributes =>
diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/BuildersTests/ViewComponentsTests/ViewComponentTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/BuildersTests/ViewComponentsTests/ViewComponentTestBuilderTests.cs
@@ -11,7 +11,6 @@ public class ViewComponentTestBuilderTests
         public void NoAttributesShouldNotThrowExceptionWithControllerContainingNoAttributes()
         {
             MyViewComponent<NormalComponent>
-                .Instance()
                 .ShouldHave()
                 .NoAttributes();
         }
@@ -23,7 +22,6 @@ public void NoAttributesShouldThrowExceptionWithControllerContainingAttributes()
                 () =>
                 {
                     MyViewComponent<AttributesComponent>
-                        .Instance()
                         .ShouldHave()
                         .NoAttributes();
                 },
@@ -34,7 +32,6 @@ public void NoAttributesShouldThrowExceptionWithControllerContainingAttributes()
         public void AttributesShouldNotThrowEceptionWithControllerContainingAttributes()
         {
             MyViewComponent<AttributesComponent>
-                .Instance()
                 .ShouldHave()
                 .Attributes();
         }
@@ -46,7 +43,6 @@ public void AttributesShouldThrowEceptionWithControllerContainingNoAttributes()
                 () =>
                 {
                     MyViewComponent<NormalComponent>
-                        .Instance()
                         .ShouldHave()
                         .Attributes();
                 },
@@ -57,7 +53,6 @@ public void AttributesShouldThrowEceptionWithControllerContainingNoAttributes()
         public void AttributesShouldNotThrowEceptionWithControllerContainingNumberOfAttributes()
         {
             MyViewComponent<AttributesComponent>
-                .Instance()
                 .ShouldHave()
                 .Attributes(withTotalNumberOf: 2);
         }
@@ -69,7 +64,6 @@ public void AttributesShouldThrowEceptionWithControllerContainingNumberOfAttribu
                 () =>
                 {
                     MyViewComponent<AttributesComponent>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(withTotalNumberOf: 10);
                 },
@@ -83,7 +77,6 @@ public void AttributesShouldThrowEceptionWithControllerContainingNumberOfAttribu
                 () =>
                 {
                     MyViewComponent<AttributesComponent>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(withTotalNumberOf: 1);
                 },
diff --git a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/BuildersTests/AttributesTests/ControllerAttributesTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/BuildersTests/AttributesTests/ControllerAttributesTestBuilderTests.cs
@@ -11,7 +11,6 @@ public class ControllerAttributesTestBuilderTests
         public void ValidatingAntiForgeryTokenShouldNotThrowExceptionWithTheAttribute()
         {
             MyController<MvcController>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes.ValidatingAntiForgeryToken());
         }
@@ -23,7 +22,6 @@ public void ValidatingAntiForgeryTokenShouldThrowExceptionWithActionWithoutTheAt
                 () =>
                 {
                     MyController<AttributesController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes.ValidatingAntiForgeryToken());
                 },
@@ -34,7 +32,6 @@ public void ValidatingAntiForgeryTokenShouldThrowExceptionWithActionWithoutTheAt
         public void IgnoringAntiForgeryTokenShouldNotThrowExceptionWithTheAttribute()
         {
             MyController<AttributesController>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes.IgnoringAntiForgeryToken());
         }
@@ -46,7 +43,6 @@ public void IgnoringAntiForgeryTokenShouldThrowExceptionWithActionWithoutTheAttr
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes.IgnoringAntiForgeryToken());
                 },
@@ -57,7 +53,6 @@ public void IgnoringAntiForgeryTokenShouldThrowExceptionWithActionWithoutTheAttr
         public void SkippingStatusCodePagesShouldNotThrowExceptionWithTheAttribute()
         {
             MyController<AttributesController>
-                .Instance()
                 .ShouldHave()
                 .Attributes(attributes => attributes.SkippingStatusCodePages());
         }
@@ -69,7 +64,6 @@ public void SkippingStatusCodePagesThrowExceptionWithActionWithoutTheAttribute()
                 () =>
                 {
                     MyController<MvcController>
-                        .Instance()
                         .ShouldHave()
                         .Attributes(attributes => attributes.SkippingStatusCodePages());
                 },

Original file line number	Diff line number	Diff line change
`@@ -104,5 +104,13 @@ public static IControllerBuilder<TController> Instance(Func<TController> constru`
`104`	`104`	`public new static IVoidActionResultTestBuilder Calling(Expression<Func<TController, Task>> actionCall)`
`105`	`105`	`=> Instance()`
`106`	`106`	`.Calling(actionCall);`
	`107`	`+`
	`108`	`+ /// <summary>`
	`109`	`+ /// Used for testing controller additional details.`
	`110`	`+ /// </summary>`
	`111`	`+ /// <returns>Test builder of <see cref="IControllerTestBuilder"/> type.</returns>`
	`112`	`+ public new static IControllerTestBuilder ShouldHave()`
	`113`	`+ => Instance()`
	`114`	`+ .ShouldHave();`
`107`	`115`	`}`
`108`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,5 +63,13 @@ public static IViewComponentBuilder<TViewComponent> Instance(TViewComponent view`
`63`	`63`	`/// <returns>Test builder of <see cref="IViewComponentBuilder{TViewComponent}"/> type.</returns>`
`64`	`64`	`public static IViewComponentBuilder<TViewComponent> Instance(Func<TViewComponent> construction)`
`65`	`65`	`=> new MyViewComponent<TViewComponent>(construction);`
	`66`	`+`
	`67`	`+ /// <summary>`
	`68`	`+ /// Used for testing view component additional details.`
	`69`	`+ /// </summary>`
	`70`	`+ /// <returns>Test builder of <see cref="IViewComponentTestBuilder"/> type.</returns>`
	`71`	`+ public new static IViewComponentTestBuilder ShouldHave()`
	`72`	`+ => Instance()`
	`73`	`+ .ShouldHave();`
`66`	`74`	`}`
`67`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public void AndProvideShouldReturnProperController()`
`28`	`28`	`public void AndProvideTheControllerAttributesShouldReturnProperAttributes()`
`29`	`29`	`{`
`30`	`30`	`MyController<MvcController>`
`31`		`- .Instance()`
`32`	`31`	`.ShouldHave()`
`33`	`32`	`.Attributes()`
`34`	`33`	`.ShouldPassForThe<ControllerAttributes>(attributes =>`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ public class ControllerTestBuilderTests`
`11`	`11`	`public void NoAttributesShouldNotThrowExceptionWithControllerContainingNoAttributes()`
`12`	`12`	`{`
`13`	`13`	`MyController<NoAttributesController>`
`14`		`- .Instance()`
`15`	`14`	`.ShouldHave()`
`16`	`15`	`.NoAttributes();`
`17`	`16`	`}`
`@@ -23,7 +22,6 @@ public void NoAttributesShouldThrowExceptionWithControllerContainingAttributes()`
`23`	`22`	`() =>`
`24`	`23`	`{`
`25`	`24`	`MyController<MvcController>`
`26`		`- .Instance()`
`27`	`25`	`.ShouldHave()`
`28`	`26`	`.NoAttributes();`
`29`	`27`	`},`
`@@ -34,7 +32,6 @@ public void NoAttributesShouldThrowExceptionWithControllerContainingAttributes()`
`34`	`32`	`public void AttributesShouldNotThrowExceptionWithControllerContainingAttributes()`
`35`	`33`	`{`
`36`	`34`	`MyController<MvcController>`
`37`		`- .Instance()`
`38`	`35`	`.ShouldHave()`
`39`	`36`	`.Attributes();`
`40`	`37`	`}`
`@@ -46,7 +43,6 @@ public void AttributesShouldThrowExceptionWithControllerContainingNoAttributes()`
`46`	`43`	`() =>`
`47`	`44`	`{`
`48`	`45`	`MyController<NoAttributesController>`
`49`		`- .Instance()`
`50`	`46`	`.ShouldHave()`
`51`	`47`	`.Attributes();`
`52`	`48`	`},`
`@@ -57,7 +53,6 @@ public void AttributesShouldThrowExceptionWithControllerContainingNoAttributes()`
`57`	`53`	`public void AttributesShouldNotThrowExceptionWithControllerContainingNumberOfAttributes()`
`58`	`54`	`{`
`59`	`55`	`MyController<MvcController>`
`60`		`- .Instance()`
`61`	`56`	`.ShouldHave()`
`62`	`57`	`.Attributes(withTotalNumberOf: 4);`
`63`	`58`	`}`
`@@ -69,7 +64,6 @@ public void AttributesShouldThrowExceptionWithControllerContainingNumberOfAttrib`
`69`	`64`	`() =>`
`70`	`65`	`{`
`71`	`66`	`MyController<MvcController>`
`72`		`- .Instance()`
`73`	`67`	`.ShouldHave()`
`74`	`68`	`.Attributes(withTotalNumberOf: 10);`
`75`	`69`	`},`
`@@ -83,7 +77,6 @@ public void AttributesShouldThrowExceptionWithControllerContainingNumberOfAttrib`
`83`	`77`	`() =>`
`84`	`78`	`{`
`85`	`79`	`MyController<MvcController>`
`86`		`- .Instance()`
`87`	`80`	`.ShouldHave()`
`88`	`81`	`.Attributes(withTotalNumberOf: 1);`
`89`	`82`	`},`