Simplified BaseTestBuilderWithComponentBuilder (#125)

Author: ivaylokenov

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

@@ -34,7 +34,7 @@ protected BaseTestBuilderWithComponent(ComponentTestContext testContext)
 
             private set
             {
-                CommonValidator.CheckForNullReference(value.Component, nameof(value.Component));
+                CommonValidator.CheckForNullReference(value, nameof(this.TestContext));
                 this.testContext = value;
             }
         }

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

@@ -3,13 +3,13 @@
     using Contracts.Base;
     using Internal.TestContexts;
 
-    public abstract class BaseTestBuilderWithComponentBuilder<TBuilder> : BaseTestBuilder,
+    public abstract class BaseTestBuilderWithComponentBuilder<TBuilder> : BaseTestBuilderWithComponent,
         IBaseTestBuilderWithComponentBuilder<TBuilder>
         where TBuilder : IBaseTestBuilder
     {
         private TBuilder builder;
 
-        protected BaseTestBuilderWithComponentBuilder(HttpTestContext testContext)
+        protected BaseTestBuilderWithComponentBuilder(ComponentTestContext testContext)
             : base(testContext)
         {
         }

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

@@ -21,7 +21,7 @@ public static class ComponentShouldHaveTestBuilderCachingExtensions
         public static TBuilder NoMemoryCache<TBuilder>(this IBaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder> builder)
             where TBuilder : IBaseTestBuilder
         {
-            var actualBuilder = (BaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder>)builder;
+            var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
             if (actualBuilder.TestContext.GetMockedMemoryCache().Count > 0)
             {
@@ -46,7 +46,7 @@ public static TBuilder MemoryCache<TBuilder>(
             int? withNumberOfEntries = null)
             where TBuilder : IBaseTestBuilder
         {
-            var actualBuilder = (BaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder>)builder;
+            var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
             DataProviderValidator.ValidateDataProviderNumberOfEntries(
                 actualBuilder.TestContext,
@@ -69,7 +69,7 @@ public static TBuilder MemoryCache<TBuilder>(
             Action<IMemoryCacheTestBuilder> memoryCacheTestBuilder)
             where TBuilder : IBaseTestBuilder
         {
-            var actualBuilder = (BaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder>)builder;
+            var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
             memoryCacheTestBuilder(new MemoryCacheTestBuilder(actualBuilder.TestContext));
 

src/MyTested.AspNetCore.Mvc.Caching/ComponentShouldHaveTestBuilderCachingExtensions.cs

@@ -15,7 +15,7 @@
     /// </summary>
     /// <typeparam name="TActionResult">Result from invoked action in ASP.NET Core MVC controller.</typeparam>
     public partial class ShouldHaveTestBuilder<TActionResult>
-        : BaseTestBuilderWithComponentShouldHaveTestBuilder<IAndActionResultTestBuilder<TActionResult>>, IShouldHaveTestBuilder<TActionResult>
+        : BaseTestBuilderWithComponentBuilder<IAndActionResultTestBuilder<TActionResult>>, IShouldHaveTestBuilder<TActionResult>
     {
         private ControllerTestContext testContext;
 

src/MyTested.AspNetCore.Mvc.Core/Builders/Actions/ShouldHave/ShouldHaveTestBuilder.cs

@@ -23,7 +23,7 @@ public static TBuilder DbContext<TBuilder>(
             Action<IDbContextTestBuilder> dbContextTestBuilder)
             where TBuilder : IBaseTestBuilder
         {
-            var actualBuilder = (BaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder>)builder;
+            var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
             dbContextTestBuilder(new DbContextTestBuilder(actualBuilder.TestContext));
 

src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ComponentShouldHaveTestBuilderEntityFrameworkCoreExtensions.cs

@@ -22,7 +22,7 @@ public static class ComponentShouldHaveTestBuilderSessionExtensions
         public static TBuilder NoSession<TBuilder>(this IBaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder> builder)
             where TBuilder : IBaseTestBuilder
         {
-            var actualBuilder = (BaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder>)builder;
+            var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
             if (actualBuilder.TestContext.Session.Keys.Any())
             {
@@ -47,7 +47,7 @@ public static TBuilder Session<TBuilder>(
             int? withNumberOfEntries = null)
             where TBuilder : IBaseTestBuilder
         {
-            var actualBuilder = (BaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder>)builder;
+            var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
             DataProviderValidator.ValidateDataProviderNumberOfEntries(
                 actualBuilder.TestContext,
@@ -70,7 +70,7 @@ public static TBuilder Session<TBuilder>(
             Action<ISessionTestBuilder> sessionTestBuilder)
             where TBuilder : IBaseTestBuilder
         {
-            var actualBuilder = (BaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder>)builder;
+            var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
 
             sessionTestBuilder(new SessionTestBuilder(actualBuilder.TestContext));