Added DataProviderValidator.cs (#125)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Core/Exceptions/DataProviderAssertionException.cs renamed to src/MyTested.AspNetCore.Mvc.Abstractions/Exceptions/DataProviderAssertionException.cs

@@ -0,0 +1,46 @@
+namespace MyTested.AspNetCore.Mvc.Utilities.Validators
+{
+    using Exceptions;
+    using Extensions;
+    using Internal.TestContexts;
+
+    public static class DataProviderValidator
+    {
+        public static void ValidateDataProviderNumberOfEntries(ComponentTestContext testContext, string name, int? expectedCount, int actualCount)
+        {
+            if (actualCount == 0
+                || (expectedCount != null && actualCount != expectedCount))
+            {
+                ThrowNewDataProviderAssertionException(
+                    testContext,
+                    name,
+                    expectedCount == null ? " entries" : $" with {expectedCount} {(expectedCount != 1 ? "entries" : "entry")}",
+                    expectedCount == null ? "none were found" : $"in fact contained {actualCount}");
+            }
+        }
+
+        public static void ThrowNewDataProviderAssertionExceptionWithNoEntries(ComponentTestContext testContext, string name)
+        {
+            ThrowNewDataProviderAssertionException(
+                testContext,
+                name,
+                " with no entries",
+                "in fact it had some");
+        }
+
+        public static void ThrowNewDataProviderAssertionException(
+            ComponentTestContext testContext,
+            string name,
+            string expectedValue,
+            string actualValue)
+        {
+            throw new DataProviderAssertionException(string.Format(
+                "When calling {0} action in {1} expected to have {2}{3}, but {4}.",
+                testContext.MethodName,
+                testContext.Component.GetName(),
+                name,
+                expectedValue,
+                actualValue));
+        }
+    }
+}

src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/Validators/DataProviderValidator.cs

@@ -6,6 +6,7 @@
     using Builders.Contracts.And;
     using Builders.Contracts.Data;
     using Builders.Data;
+    using Utilities.Validators;
 
     /// <summary>
     /// Contains <see cref="Microsoft.Extensions.Caching.Memory.IMemoryCache"/> extension methods for <see cref="IShouldHaveTestBuilder{TActionResult}"/>.
@@ -24,7 +25,9 @@ public static IAndTestBuilder<TActionResult> NoMemoryCache<TActionResult>(this I
 
             if (actualShouldHaveTestBuilder.TestContext.GetMockedMemoryCache().Count > 0)
             {
-                actualShouldHaveTestBuilder.ThrowNewDataProviderAssertionExceptionWithNoEntries(MemoryCacheTestBuilder.MemoryCacheName);
+                DataProviderValidator.ThrowNewDataProviderAssertionExceptionWithNoEntries(
+                    actualShouldHaveTestBuilder.TestContext,
+                    MemoryCacheTestBuilder.MemoryCacheName);
             }
 
             return actualShouldHaveTestBuilder.NewAndTestBuilder();
@@ -44,7 +47,8 @@ public static IAndTestBuilder<TActionResult> MemoryCache<TActionResult>(
         {
             var actualShouldHaveTestBuilder = (ShouldHaveTestBuilder<TActionResult>)shouldHaveTestBuilder;
 
-            actualShouldHaveTestBuilder.ValidateDataProviderNumberOfEntries(
+            DataProviderValidator.ValidateDataProviderNumberOfEntries(
+                actualShouldHaveTestBuilder.TestContext,
                 MemoryCacheTestBuilder.MemoryCacheName,
                 withNumberOfEntries,
                 actualShouldHaveTestBuilder.TestContext.GetMockedMemoryCache().Count);

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

@@ -32,36 +32,5 @@ public IAndTestBuilder<TActionResult> HttpResponse(Action<IHttpResponseTestBuild
             httpResponseTestBuilder(new HttpResponseTestBuilder(this.TestContext));
             return this.NewAndTestBuilder();
         }
-
-        public void ValidateDataProviderNumberOfEntries(string name, int? expectedCount, int actualCount)
-        {
-            if (actualCount == 0
-                || (expectedCount != null && actualCount != expectedCount))
-            {
-                this.ThrowNewDataProviderAssertionException(
-                    name,
-                    expectedCount == null ? " entries" : $" with {expectedCount} {(expectedCount != 1 ? "entries" : "entry")}",
-                    expectedCount == null ? "none were found" : $"in fact contained {actualCount}");
-            }
-        }
-
-        public void ThrowNewDataProviderAssertionExceptionWithNoEntries(string name)
-        {
-            this.ThrowNewDataProviderAssertionException(
-                name,
-                " with no entries",
-                "in fact it had some");
-        }
-
-        public void ThrowNewDataProviderAssertionException(string name, string expectedValue, string actualValue)
-        {
-            throw new DataProviderAssertionException(string.Format(
-                "When calling {0} action in {1} expected to have {2}{3}, but {4}.",
-                this.ActionName,
-                this.Controller.GetName(),
-                name,
-                expectedValue,
-                actualValue));
-        }
     }
 }

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

@@ -7,6 +7,7 @@
     using Builders.Contracts.And;
     using Builders.Contracts.Data;
     using Builders.Data;
+    using Utilities.Validators;
 
     /// <summary>
     /// Contains <see cref="Microsoft.AspNetCore.Http.ISession"/> extension methods for <see cref="IShouldHaveTestBuilder{TActionResult}"/>.
@@ -25,7 +26,9 @@ public static IAndTestBuilder<TActionResult> NoSession<TActionResult>(this IShou
 
             if (actualShouldHaveTestBuilder.TestContext.Session.Keys.Any())
             {
-                actualShouldHaveTestBuilder.ThrowNewDataProviderAssertionExceptionWithNoEntries(SessionTestBuilder.SessionName);
+                DataProviderValidator.ThrowNewDataProviderAssertionExceptionWithNoEntries(
+                    actualShouldHaveTestBuilder.TestContext,
+                    SessionTestBuilder.SessionName);
             }
 
             return actualShouldHaveTestBuilder.NewAndTestBuilder();
@@ -45,7 +48,8 @@ public static IAndTestBuilder<TActionResult> Session<TActionResult>(
         {
             var actualShouldHaveTestBuilder = (ShouldHaveTestBuilder<TActionResult>)shouldHaveTestBuilder;
 
-            actualShouldHaveTestBuilder.ValidateDataProviderNumberOfEntries(
+            DataProviderValidator.ValidateDataProviderNumberOfEntries(
+                actualShouldHaveTestBuilder.TestContext,
                 SessionTestBuilder.SessionName,
                 withNumberOfEntries,
                 actualShouldHaveTestBuilder.TestContext.Session.Keys.Count());

src/MyTested.AspNetCore.Mvc.Session/ShouldHaveTestBuilderSessionExtensions.cs

@@ -7,6 +7,7 @@
     using Builders.Contracts.Data;
     using Builders.Data;
     using Internal.TestContexts;
+    using Utilities.Validators;
 
     /// <summary>
     /// Contains <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"/> extension methods for <see cref="IShouldHaveTestBuilder{TActionResult}"/>.
@@ -25,7 +26,9 @@ public static IAndTestBuilder<TActionResult> NoTempData<TActionResult>(this ISho
 
             if (actualShouldHaveTestBuilder.TestContext.GetTempData().Count > 0)
             {
-                actualShouldHaveTestBuilder.ThrowNewDataProviderAssertionExceptionWithNoEntries(TempDataTestBuilder.TempDataName);
+                DataProviderValidator.ThrowNewDataProviderAssertionExceptionWithNoEntries(
+                    actualShouldHaveTestBuilder.TestContext,
+                    TempDataTestBuilder.TempDataName);
             }
 
             return actualShouldHaveTestBuilder.NewAndTestBuilder();
@@ -44,7 +47,8 @@ public static IAndTestBuilder<TActionResult> TempData<TActionResult>(
         {
             var actualShouldHaveTestBuilder = (ShouldHaveTestBuilder<TActionResult>)shouldHaveTestBuilder;
 
-            actualShouldHaveTestBuilder.ValidateDataProviderNumberOfEntries(
+            DataProviderValidator.ValidateDataProviderNumberOfEntries(
+                actualShouldHaveTestBuilder.TestContext,
                 TempDataTestBuilder.TempDataName,
                 withNumberOfEntries,
                 actualShouldHaveTestBuilder.TestContext.GetTempData().Count);

src/MyTested.AspNetCore.Mvc.ViewFeatures/ShouldHaveTestBuilderTempDataExtensions.cs

@@ -7,6 +7,7 @@
     using Builders.Contracts.Data;
     using Builders.Data;
     using Internal.TestContexts;
+    using Utilities.Validators;
 
     /// <summary>
     /// Contains <see cref="Microsoft.AspNetCore.Mvc.Controller.ViewBag"/> extension methods for <see cref="IShouldHaveTestBuilder{TActionResult}"/>.
@@ -25,7 +26,9 @@ public static IAndTestBuilder<TActionResult> NoViewBag<TActionResult>(this IShou
 
             if (actualShouldHaveTestBuilder.TestContext.GetViewData().Count > 0)
             {
-                actualShouldHaveTestBuilder.ThrowNewDataProviderAssertionExceptionWithNoEntries(ViewBagTestBuilder.ViewBagName);
+                DataProviderValidator.ThrowNewDataProviderAssertionExceptionWithNoEntries(
+                    actualShouldHaveTestBuilder.TestContext,
+                    ViewBagTestBuilder.ViewBagName);
             }
 
             return actualShouldHaveTestBuilder.NewAndTestBuilder();
@@ -45,7 +48,8 @@ public static IAndTestBuilder<TActionResult> ViewBag<TActionResult>(
         {
             var actualShouldHaveTestBuilder = (ShouldHaveTestBuilder<TActionResult>)shouldHaveTestBuilder;
 
-            actualShouldHaveTestBuilder.ValidateDataProviderNumberOfEntries(
+            DataProviderValidator.ValidateDataProviderNumberOfEntries(
+                actualShouldHaveTestBuilder.TestContext,
                 ViewBagTestBuilder.ViewBagName,
                 withNumberOfEntries,
                 actualShouldHaveTestBuilder.TestContext.GetViewData().Count);

src/MyTested.AspNetCore.Mvc.ViewFeatures/ShouldHaveTestBuilderViewBagExtensions.cs

@@ -7,6 +7,7 @@
     using Builders.Contracts.Data;
     using Builders.Data;
     using Internal.TestContexts;
+    using Utilities.Validators;
 
     /// <summary>
     /// Contains <see cref="Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"/> extension methods for <see cref="IShouldHaveTestBuilder{TActionResult}"/>.
@@ -25,7 +26,9 @@ public static IAndTestBuilder<TActionResult> NoViewData<TActionResult>(this ISho
 
             if (actualShouldHaveTestBuilder.TestContext.GetViewData().Count > 0)
             {
-                actualShouldHaveTestBuilder.ThrowNewDataProviderAssertionExceptionWithNoEntries(ViewDataTestBuilder.ViewDataName);
+                DataProviderValidator.ThrowNewDataProviderAssertionExceptionWithNoEntries(
+                    actualShouldHaveTestBuilder.TestContext,
+                    ViewDataTestBuilder.ViewDataName);
             }
 
             return actualShouldHaveTestBuilder.NewAndTestBuilder();
@@ -45,7 +48,8 @@ public static IAndTestBuilder<TActionResult> ViewData<TActionResult>(
         {
             var actualShouldHaveTestBuilder = (ShouldHaveTestBuilder<TActionResult>)shouldHaveTestBuilder;
 
-            actualShouldHaveTestBuilder.ValidateDataProviderNumberOfEntries(
+            DataProviderValidator.ValidateDataProviderNumberOfEntries(
+                actualShouldHaveTestBuilder.TestContext,
                 ViewDataTestBuilder.ViewDataName,
                 withNumberOfEntries,
                 actualShouldHaveTestBuilder.TestContext.GetViewData().Count);