Documentation and cleaner API (closes #101)

ivaylokenov · ivaylokenov · commit 1333c08f93b1 · 2016-09-18T12:35:43.000+03:00
diff --git a/docs/api/MyTested.AspNetCore.Mvc.Builders.Contracts.Invocations.IViewComponentShouldReturnTestBuilder-1.html b/docs/api/MyTested.AspNetCore.Mvc.Builders.Contracts.Invocations.IViewComponentShouldReturnTestBuilder-1.html
diff --git a/docs/manifest.json b/docs/manifest.json
diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Contracts/Invocations/IViewComponentShouldReturnTestBuilder.cs b/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Contracts/Invocations/IViewComponentShouldReturnTestBuilder.cs
@@ -1,98 +1,98 @@
 ﻿namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Invocations
 {
     using System;
-    using Base;
+    using And;
     using ViewComponentResults;
 
     /// <summary>
     /// Used for testing returned view component result.
     /// </summary>
     /// <typeparam name="TInvocationResult">Result from invoked view component in ASP.NET Core MVC.</typeparam>
     public interface IViewComponentShouldReturnTestBuilder<TInvocationResult>
-        : IBaseShouldReturnTestBuilder<TInvocationResult, IBaseTestBuilderWithViewComponentResult<TInvocationResult>>
+        : IBaseShouldReturnTestBuilder<TInvocationResult, IAndTestBuilder>
     {
         /// <summary>
         /// Tests whether the view component result is <see cref="Microsoft.AspNetCore.Mvc.ViewComponents.ContentViewComponentResult"/>.
         /// </summary>
-        /// <returns>Test builder of <see cref="IBaseTestBuilderWithViewComponentResult{TInvocationResult}"/> type.</returns>
-        IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content();
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        IAndTestBuilder Content();
 
         /// <summary>
         /// Tests whether the view component result is <see cref="Microsoft.AspNetCore.Mvc.ViewComponents.ContentViewComponentResult"/> with expected content.
         /// </summary>
         /// <param name="content">Expected content as string.</param>
-        /// <returns>Test builder of <see cref="IBaseTestBuilderWithViewComponentResult{TInvocationResult}"/> type.</returns>
-        IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(string content);
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        IAndTestBuilder Content(string content);
 
         /// <summary>
         /// Tests whether <see cref="Microsoft.AspNetCore.Mvc.ViewComponents.ContentViewComponentResult"/> passes the given assertions.
         /// </summary>
         /// <param name="assertions">Action containing all assertions on the content.</param>
-        /// <returns>Test builder of <see cref="IBaseTestBuilderWithViewComponentResult{TInvocationResult}"/> type.</returns>
-        IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(Action<string> assertions);
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        IAndTestBuilder Content(Action<string> assertions);
 
         /// <summary>
         /// Tests whether <see cref="Microsoft.AspNetCore.Mvc.ViewComponents.ContentViewComponentResult"/> passes the given predicate.
         /// </summary>
         /// <param name="predicate">Predicate testing the content.</param>
-        /// <returns>Test builder of <see cref="IBaseTestBuilderWithViewComponentResult{TInvocationResult}"/> type.</returns>
-        IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(Func<string, bool> predicate);
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        IAndTestBuilder Content(Func<string, bool> predicate);
 
         /// <summary>
         /// Tests whether the view component result is <see cref="Microsoft.AspNetCore.Html.IHtmlContent"/>.
         /// </summary>
-        /// <returns>Test builder of <see cref="IBaseTestBuilderWithViewComponentResult{TInvocationResult}"/> type.</returns>
-        IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent();
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        IAndTestBuilder HtmlContent();
 
         /// <summary>
         /// Tests whether the view component result is <see cref="Microsoft.AspNetCore.Html.IHtmlContent"/> with expected content.
         /// </summary>
         /// <param name="htmlContent">Expected HTML content as string.</param>
-        /// <returns>Test builder of <see cref="IBaseTestBuilderWithViewComponentResult{TInvocationResult}"/> type.</returns>
-        IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(string htmlContent);
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        IAndTestBuilder HtmlContent(string htmlContent);
 
         /// <summary>
         /// Tests whether <see cref="Microsoft.AspNetCore.Html.IHtmlContent"/> passes the given assertions.
         /// </summary>
         /// <param name="assertions">Action containing all assertions on the HTML content.</param>
-        /// <returns>Test builder of <see cref="IBaseTestBuilderWithViewComponentResult{TInvocationResult}"/> type.</returns>
-        IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(Action<string> assertions);
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        IAndTestBuilder HtmlContent(Action<string> assertions);
 
         /// <summary>
         /// Tests whether <see cref="Microsoft.AspNetCore.Html.IHtmlContent"/> passes the given predicate.
         /// </summary>
         /// <param name="predicate">Predicate testing the HTML content.</param>
-        /// <returns>Test builder of <see cref="IBaseTestBuilderWithViewComponentResult{TInvocationResult}"/> type.</returns>
-        IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(Func<string, bool> predicate);
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        IAndTestBuilder HtmlContent(Func<string, bool> predicate);
 
         /// <summary>
         /// Tests whether the view component result is <see cref="Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult"/> with the default view name.
         /// </summary>
-        /// <returns>Test builder of <see cref="IViewTestBuilder"/> type.</returns>
-        IViewTestBuilder View();
+        /// <returns>Test builder of <see cref="IAndViewTestBuilder"/> type.</returns>
+        IAndViewTestBuilder View();
 
         /// <summary>
         /// Tests whether the view component result is <see cref="Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult"/> with the provided view name.
         /// </summary>
         /// <param name="viewName">Expected view name.</param>
-        /// <returns>Test builder of <see cref="IViewTestBuilder"/> type.</returns>
-        IViewTestBuilder View(string viewName);
+        /// <returns>Test builder of <see cref="IAndViewTestBuilder"/> type.</returns>
+        IAndViewTestBuilder View(string viewName);
 
         /// <summary>
         /// Tests whether the view component result is <see cref="Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult"/> with the provided deeply equal model object.
         /// </summary>
         /// <typeparam name="TModel">Expected model type.</typeparam>
         /// <param name="model">Expected model object.</param>
-        /// <returns>Test builder of <see cref="IViewTestBuilder"/> type.</returns>
-        IViewTestBuilder View<TModel>(TModel model);
+        /// <returns>Test builder of <see cref="IAndViewTestBuilder"/> type.</returns>
+        IAndViewTestBuilder View<TModel>(TModel model);
 
         /// <summary>
         /// Tests whether the view component result is <see cref="Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult"/> with the provided view name and deeply equal model object.
         /// </summary>
         /// <typeparam name="TModel">Expected model type.</typeparam>
         /// <param name="viewName">Expected view name.</param>
         /// <param name="model">Expected model object.</param>
-        /// <returns>Test builder of <see cref="IViewTestBuilder"/> type.</returns>
-        IViewTestBuilder View<TModel>(string viewName, TModel model);
+        /// <returns>Test builder of <see cref="IAndViewTestBuilder"/> type.</returns>
+        IAndViewTestBuilder View<TModel>(string viewName, TModel model);
     }
 }
diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnContent.cs b/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnContent.cs
@@ -1,22 +1,23 @@
 ﻿namespace MyTested.AspNetCore.Mvc.Builders.Invocations.ShouldReturn
 {
     using System;
-    using Contracts.Base;
+    using And;
+    using Contracts.And;
     using Microsoft.AspNetCore.Mvc.ViewComponents;
     using Utilities.Validators;
     using Exceptions;
 
     public partial class ViewComponentShouldReturnTestBuilder<TInvocationResult>
     {
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content()
+        public IAndTestBuilder Content()
         {
             InvocationResultValidator.ValidateInvocationResultType<ContentViewComponentResult>(this.TestContext);
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(string content)
+        public IAndTestBuilder Content(string content)
         {
             var actualContent = this.GetActualContent();
 
@@ -28,21 +29,21 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(string
                     actualContent);
             }
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(Action<string> assertions)
+        public IAndTestBuilder Content(Action<string> assertions)
         {
             var actualContent = this.GetActualContent();
 
             assertions(actualContent);
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(Func<string, bool> predicate)
+        public IAndTestBuilder Content(Func<string, bool> predicate)
         {
             var actualContent = this.GetActualContent();
 
@@ -53,7 +54,7 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(Func<s
                     actualContent);
             }
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         private string GetActualContent()
diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnHtmlContent.cs b/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnHtmlContent.cs
@@ -1,7 +1,8 @@
 ﻿namespace MyTested.AspNetCore.Mvc.Builders.Invocations.ShouldReturn
 {
     using System;
-    using Contracts.Base;
+    using And;
+    using Contracts.And;
     using Exceptions;
     using Utilities.Validators;
     using Microsoft.AspNetCore.Html;
@@ -11,16 +12,16 @@
     public partial class ViewComponentShouldReturnTestBuilder<TInvocationResult>
     {
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent()
+        public IAndTestBuilder HtmlContent()
         {
             InvocationResultValidator
                 .ValidateInvocationResultType<IHtmlContent>(this.TestContext, canBeAssignable: true);
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(string htmlContent)
+        public IAndTestBuilder HtmlContent(string htmlContent)
         {
             var actualContent = this.GetHtmlContentAsString();
 
@@ -32,21 +33,21 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(st
                     actualContent);
             }
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(Action<string> assertions)
+        public IAndTestBuilder HtmlContent(Action<string> assertions)
         {
             var actualContent = this.GetHtmlContentAsString();
 
             assertions(actualContent);
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(Func<string, bool> predicate)
+        public IAndTestBuilder HtmlContent(Func<string, bool> predicate)
         {
             var actualContent = this.GetHtmlContentAsString();
 
@@ -57,7 +58,7 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(Fu
                     actualContent);
             }
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         private string GetHtmlContentAsString()
diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnNullOrDefault.cs b/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnNullOrDefault.cs
@@ -1,15 +1,15 @@
 ﻿namespace MyTested.AspNetCore.Mvc.Builders.Invocations.ShouldReturn
 {
     using And;
-    using Contracts.Base;
+    using Contracts.And;
     using Exceptions;
     using Utilities;
     using Utilities.Validators;
 
     public partial class ViewComponentShouldReturnTestBuilder<TInvocationResult>
     {
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> DefaultValue()
+        public IAndTestBuilder DefaultValue()
         {
             if (!this.CheckValidDefaultValue())
             {
@@ -18,11 +18,11 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> DefaultValue()
                     typeof(TInvocationResult).ToFriendlyTypeName()));
             }
             
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Null()
+        public IAndTestBuilder Null()
         {
             CommonValidator.CheckIfTypeCanBeNull(typeof(TInvocationResult));
             if (!this.CheckValidDefaultValue())
@@ -32,11 +32,11 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Null()
                     typeof(TInvocationResult).ToFriendlyTypeName()));
             }
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         /// <inheritdoc />
-        public IBaseTestBuilderWithViewComponentResult<TInvocationResult> NotNull()
+        public IAndTestBuilder NotNull()
         {
             CommonValidator.CheckIfTypeCanBeNull(typeof(TInvocationResult));
             if (this.CheckValidDefaultValue())
@@ -46,7 +46,7 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> NotNull()
                     typeof(TInvocationResult).ToFriendlyTypeName()));
             }
 
-            return this.NewAndTestBuilderWithViewComponentResult();
+            return new AndTestBuilder(this.TestContext);
         }
 
         private bool CheckValidDefaultValue()
diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnTestBuilder.cs b/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnTestBuilder.cs
@@ -13,8 +13,5 @@ public ViewComponentShouldReturnTestBuilder(ViewComponentTestContext testContext
             : base(testContext)
         {
         }
-
-        private IBaseTestBuilderWithViewComponentResult<TInvocationResult> NewAndTestBuilderWithViewComponentResult()
-            => new AndTestBuilderWithViewComponentResult<TInvocationResult>(this.TestContext);
     }
 }
diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnView.cs b/src/MyTested.AspNetCore.Mvc.ViewComponents/Builders/Invocations/ShouldReturn/ViewComponentShouldReturnView.cs
@@ -9,13 +9,13 @@
     public partial class ViewComponentShouldReturnTestBuilder<TInvocationResult>
     {
         /// <inheritdoc />
-        public IViewTestBuilder View()
+        public IAndViewTestBuilder View()
         {
             return this.View(null);
         }
 
         /// <inheritdoc />
-        public IViewTestBuilder View(string viewName)
+        public IAndViewTestBuilder View(string viewName)
         {
             var viewResult = InvocationResultValidator
                 .GetInvocationResult<ViewViewComponentResult>(this.TestContext);
@@ -33,13 +33,13 @@ public IViewTestBuilder View(string viewName)
         }
 
         /// <inheritdoc />
-        public IViewTestBuilder View<TModel>(TModel model)
+        public IAndViewTestBuilder View<TModel>(TModel model)
         {
             return this.View(null, model);
         }
 
         /// <inheritdoc />
-        public IViewTestBuilder View<TModel>(string viewName, TModel model)
+        public IAndViewTestBuilder View<TModel>(string viewName, TModel model)
         {
             var viewTestBuilder = this.View(viewName);
             viewTestBuilder.WithModel(model);

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,23 @@`
`1`	`1`	`namespace MyTested.AspNetCore.Mvc.Builders.Invocations.ShouldReturn`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`		`- using Contracts.Base;`
	`4`	`+ using And;`
	`5`	`+ using Contracts.And;`
`5`	`6`	`using Microsoft.AspNetCore.Mvc.ViewComponents;`
`6`	`7`	`using Utilities.Validators;`
`7`	`8`	`using Exceptions;`
`8`	`9`
`9`	`10`	`public partial class ViewComponentShouldReturnTestBuilder<TInvocationResult>`
`10`	`11`	`{`
`11`	`12`	`/// <inheritdoc />`
`12`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content()`
	`13`	`+ public IAndTestBuilder Content()`
`13`	`14`	`{`
`14`	`15`	`InvocationResultValidator.ValidateInvocationResultType<ContentViewComponentResult>(this.TestContext);`
`15`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`16`	`+ return new AndTestBuilder(this.TestContext);`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`/// <inheritdoc />`
`19`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(string content)`
	`20`	`+ public IAndTestBuilder Content(string content)`
`20`	`21`	`{`
`21`	`22`	`var actualContent = this.GetActualContent();`
`22`	`23`
`@@ -28,21 +29,21 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(string`
`28`	`29`	`actualContent);`
`29`	`30`	`}`
`30`	`31`
`31`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`32`	`+ return new AndTestBuilder(this.TestContext);`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`/// <inheritdoc />`
`35`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(Action<string> assertions)`
	`36`	`+ public IAndTestBuilder Content(Action<string> assertions)`
`36`	`37`	`{`
`37`	`38`	`var actualContent = this.GetActualContent();`
`38`	`39`
`39`	`40`	`assertions(actualContent);`
`40`	`41`
`41`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`42`	`+ return new AndTestBuilder(this.TestContext);`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`/// <inheritdoc />`
`45`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(Func<string, bool> predicate)`
	`46`	`+ public IAndTestBuilder Content(Func<string, bool> predicate)`
`46`	`47`	`{`
`47`	`48`	`var actualContent = this.GetActualContent();`
`48`	`49`
`@@ -53,7 +54,7 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Content(Func<s`
`53`	`54`	`actualContent);`
`54`	`55`	`}`
`55`	`56`
`56`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`57`	`+ return new AndTestBuilder(this.TestContext);`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`private string GetActualContent()`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`namespace MyTested.AspNetCore.Mvc.Builders.Invocations.ShouldReturn`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`		`- using Contracts.Base;`
	`4`	`+ using And;`
	`5`	`+ using Contracts.And;`
`5`	`6`	`using Exceptions;`
`6`	`7`	`using Utilities.Validators;`
`7`	`8`	`using Microsoft.AspNetCore.Html;`
`@@ -11,16 +12,16 @@`
`11`	`12`	`public partial class ViewComponentShouldReturnTestBuilder<TInvocationResult>`
`12`	`13`	`{`
`13`	`14`	`/// <inheritdoc />`
`14`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent()`
	`15`	`+ public IAndTestBuilder HtmlContent()`
`15`	`16`	`{`
`16`	`17`	`InvocationResultValidator`
`17`	`18`	`.ValidateInvocationResultType<IHtmlContent>(this.TestContext, canBeAssignable: true);`
`18`	`19`
`19`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`20`	`+ return new AndTestBuilder(this.TestContext);`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`/// <inheritdoc />`
`23`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(string htmlContent)`
	`24`	`+ public IAndTestBuilder HtmlContent(string htmlContent)`
`24`	`25`	`{`
`25`	`26`	`var actualContent = this.GetHtmlContentAsString();`
`26`	`27`
`@@ -32,21 +33,21 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(st`
`32`	`33`	`actualContent);`
`33`	`34`	`}`
`34`	`35`
`35`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`36`	`+ return new AndTestBuilder(this.TestContext);`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`/// <inheritdoc />`
`39`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(Action<string> assertions)`
	`40`	`+ public IAndTestBuilder HtmlContent(Action<string> assertions)`
`40`	`41`	`{`
`41`	`42`	`var actualContent = this.GetHtmlContentAsString();`
`42`	`43`
`43`	`44`	`assertions(actualContent);`
`44`	`45`
`45`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`46`	`+ return new AndTestBuilder(this.TestContext);`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`/// <inheritdoc />`
`49`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(Func<string, bool> predicate)`
	`50`	`+ public IAndTestBuilder HtmlContent(Func<string, bool> predicate)`
`50`	`51`	`{`
`51`	`52`	`var actualContent = this.GetHtmlContentAsString();`
`52`	`53`
`@@ -57,7 +58,7 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> HtmlContent(Fu`
`57`	`58`	`actualContent);`
`58`	`59`	`}`
`59`	`60`
`60`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`61`	`+ return new AndTestBuilder(this.TestContext);`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`private string GetHtmlContentAsString()`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`namespace MyTested.AspNetCore.Mvc.Builders.Invocations.ShouldReturn`
`2`	`2`	`{`
`3`	`3`	`using And;`
`4`		`- using Contracts.Base;`
	`4`	`+ using Contracts.And;`
`5`	`5`	`using Exceptions;`
`6`	`6`	`using Utilities;`
`7`	`7`	`using Utilities.Validators;`
`8`	`8`
`9`	`9`	`public partial class ViewComponentShouldReturnTestBuilder<TInvocationResult>`
`10`	`10`	`{`
`11`	`11`	`/// <inheritdoc />`
`12`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> DefaultValue()`
	`12`	`+ public IAndTestBuilder DefaultValue()`
`13`	`13`	`{`
`14`	`14`	`if (!this.CheckValidDefaultValue())`
`15`	`15`	`{`
`@@ -18,11 +18,11 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> DefaultValue()`
`18`	`18`	`typeof(TInvocationResult).ToFriendlyTypeName()));`
`19`	`19`	`}`
`20`	`20`
`21`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`21`	`+ return new AndTestBuilder(this.TestContext);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/// <inheritdoc />`
`25`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Null()`
	`25`	`+ public IAndTestBuilder Null()`
`26`	`26`	`{`
`27`	`27`	`CommonValidator.CheckIfTypeCanBeNull(typeof(TInvocationResult));`
`28`	`28`	`if (!this.CheckValidDefaultValue())`
`@@ -32,11 +32,11 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> Null()`
`32`	`32`	`typeof(TInvocationResult).ToFriendlyTypeName()));`
`33`	`33`	`}`
`34`	`34`
`35`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`35`	`+ return new AndTestBuilder(this.TestContext);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/// <inheritdoc />`
`39`		`- public IBaseTestBuilderWithViewComponentResult<TInvocationResult> NotNull()`
	`39`	`+ public IAndTestBuilder NotNull()`
`40`	`40`	`{`
`41`	`41`	`CommonValidator.CheckIfTypeCanBeNull(typeof(TInvocationResult));`
`42`	`42`	`if (this.CheckValidDefaultValue())`
`@@ -46,7 +46,7 @@ public IBaseTestBuilderWithViewComponentResult<TInvocationResult> NotNull()`
`46`	`46`	`typeof(TInvocationResult).ToFriendlyTypeName()));`
`47`	`47`	`}`
`48`	`48`
`49`		`- return this.NewAndTestBuilderWithViewComponentResult();`
	`49`	`+ return new AndTestBuilder(this.TestContext);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`private bool CheckValidDefaultValue()`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,5 @@ public ViewComponentShouldReturnTestBuilder(ViewComponentTestContext testContext`
`13`	`13`	`: base(testContext)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`		`-`
`17`		`- private IBaseTestBuilderWithViewComponentResult<TInvocationResult> NewAndTestBuilderWithViewComponentResult()`
`18`		`- => new AndTestBuilderWithViewComponentResult<TInvocationResult>(this.TestContext);`
`19`	`16`	`}`
`20`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@`
`9`	`9`	`public partial class ViewComponentShouldReturnTestBuilder<TInvocationResult>`
`10`	`10`	`{`
`11`	`11`	`/// <inheritdoc />`
`12`		`- public IViewTestBuilder View()`
	`12`	`+ public IAndViewTestBuilder View()`
`13`	`13`	`{`
`14`	`14`	`return this.View(null);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/// <inheritdoc />`
`18`		`- public IViewTestBuilder View(string viewName)`
	`18`	`+ public IAndViewTestBuilder View(string viewName)`
`19`	`19`	`{`
`20`	`20`	`var viewResult = InvocationResultValidator`
`21`	`21`	`.GetInvocationResult<ViewViewComponentResult>(this.TestContext);`
`@@ -33,13 +33,13 @@ public IViewTestBuilder View(string viewName)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/// <inheritdoc />`
`36`		`- public IViewTestBuilder View<TModel>(TModel model)`
	`36`	`+ public IAndViewTestBuilder View<TModel>(TModel model)`
`37`	`37`	`{`
`38`	`38`	`return this.View(null, model);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/// <inheritdoc />`
`42`		`- public IViewTestBuilder View<TModel>(string viewName, TModel model)`
	`42`	`+ public IAndViewTestBuilder View<TModel>(string viewName, TModel model)`
`43`	`43`	`{`
`44`	`44`	`var viewTestBuilder = this.View(viewName);`
`45`	`45`	`viewTestBuilder.WithModel(model);`