Implemented overloads with string values (#247)

Author: HristoHentov

src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/DistributedCache/DistributedCacheBuilder.cs

@@ -31,13 +31,25 @@ public IAndDistributedCacheBuilder WithEntry(string key, byte[] value)
             return this;
         }
 
+        public IAndDistributedCacheBuilder WithEntry(string key, string value)
+        {
+            this.DistributedCache.SetString(key, value);
+            return this;
+        }
+
         /// <inheritdoc />
         public IAndDistributedCacheBuilder WithEntry(string key, byte[] value, DistributedCacheEntryOptions options)
         {
             this.DistributedCache.Set(key, value, options);
             return this;
         }
 
+        public IAndDistributedCacheBuilder WithEntry(string key, string value, DistributedCacheEntryOptions options)
+        {
+            this.DistributedCache.SetString(key, value, options);
+            return this;
+        }
+
         public IAndDistributedCacheBuilder WithEntry(Action<IDistributedCacheEntryKeyBuilder> distributedCacheEntryBuilder)
         {
             var newDistributedCacheEntryBuilder = new DistributedCacheEntryBuilder();
@@ -61,6 +73,12 @@ public IAndDistributedCacheBuilder WithEntries(IDictionary<string, byte[]> entri
             return this;
         }
 
+        public IAndDistributedCacheBuilder WithEntries(IDictionary<string, string> entries)
+        {
+            entries.ForEach(e => this.WithEntry(e.Key, e.Value));
+            return this;
+        }
+
         /// <inheritdoc />
         public IDistributedCacheBuilder AndAlso() => this;
     }

src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/DistributedCache/DistributedCacheEntryBuilder.cs

@@ -3,6 +3,7 @@
     using System;
     using Contracts.Data.DistributedCache;
     using Internal.Caching;
+    using Utilities;
 
     public class DistributedCacheEntryBuilder : IDistributedCacheEntryKeyBuilder, IAndDistributedCacheEntryBuilder
     {
@@ -25,6 +26,12 @@ public IAndDistributedCacheEntryBuilder WithValue(byte[] value)
             return this;
         }
 
+        public IAndDistributedCacheEntryBuilder WithValue(string value)
+        {
+            this.WithValue(BytesHelper.GetBytes(value));
+            return this;
+        }
+
         public IAndDistributedCacheEntryBuilder WithAbsoluteExpiration(DateTimeOffset? absoluteExpiration)
         {
             this.DistributedCacheEntry.Options.AbsoluteExpiration = absoluteExpiration;

src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/DistributedCache/DistributedCacheEntryTestBuilder.cs

@@ -48,6 +48,12 @@ public DistributedCacheEntryTestBuilder(ComponentTestContext testContext)
             return this;
         }
 
+        public new IAndDistributedCacheEntryTestBuilder WithValue(string value)
+        {
+            this.WithValue(BytesHelper.GetBytes(value));
+            return this;
+        }
+
         public new IAndDistributedCacheEntryTestBuilder WithAbsoluteExpiration(DateTimeOffset? absoluteExpiration)
         {
             this.validations.Add((expected, actual) =>

src/MyTested.AspNetCore.Mvc.Caching/Builders/Data/DistributedCache/DistributedCacheTestBuilder.cs

@@ -39,11 +39,34 @@ public DistributedCacheTestBuilder(ComponentTestContext testContext)
             this.distributedCacheDictionary = this.GetDistributedCacheDictionary();
         }
 
+        public IAndDistributedCacheTestBuilder ContainingEntryWithValue(string value)
+        {
+            this.ContainingEntryWithValue(BytesHelper.GetBytes(value));
+            return this;
+        }
+
         /// <inheritdoc />
         public IAndDistributedCacheTestBuilder ContainingEntries(IDictionary<string, byte[]> entries)
         {
             var expectedItems = entries.Count;
-            var actualItems = ((IDistributedCacheMock)distributedCache).Count; //TODO: check where count is needed and either copy mem cache implementation or provide way to get count.
+            var actualItems = this.GetDistributedCacheMock().Count;
+
+            if (expectedItems != actualItems)
+            {
+                this.ThrowNewDataProviderAssertionException(
+                    DistributedCacheName,
+                    $"to have {expectedItems} {(expectedItems != 1 ? "entries" : "entry")}",
+                    $"in fact found {actualItems}");
+            }
+
+            entries.ForEach(e => this.ContainingEntry(e.Key, e.Value));
+            return this;
+        }
+
+        public IAndDistributedCacheTestBuilder ContainingEntries(IDictionary<string, string> entries)
+        {
+            var expectedItems = entries.Count;
+            var actualItems = this.GetDistributedCacheMock().Count;
 
             if (expectedItems != actualItems)
             {
@@ -72,6 +95,12 @@ public IAndDistributedCacheTestBuilder ContainingEntry(string key, byte[] value)
             return this;
         }
 
+        public IAndDistributedCacheTestBuilder ContainingEntry(string key, string value)
+        {
+            this.ContainingEntry(key, BytesHelper.GetBytes(value));
+            return this;
+        }
+
         /// <inheritdoc />
         public IAndDistributedCacheTestBuilder ContainingEntry(string key, byte[] value, DistributedCacheEntryOptions options)
         {
@@ -90,6 +119,12 @@ public IAndDistributedCacheTestBuilder ContainingEntry(string key, byte[] value,
             return this;
         }
 
+        public IAndDistributedCacheTestBuilder ContainingEntry(string key, string value, DistributedCacheEntryOptions options)
+        {
+            this.ContainingEntry(key, BytesHelper.GetBytes(value), options);
+            return this;
+        }
+
         public IAndDistributedCacheTestBuilder ContainingEntry(Action<IDistributedCacheEntryKeyTestBuilder> distributedCacheEntryTestBuilder)
         {
             var mockedDistributedCache = this.GetDistributedCacheMock();

src/MyTested.AspNetCore.Mvc.Caching/Utilities/BytesHelper.cs

@@ -0,0 +1,17 @@
+namespace MyTested.AspNetCore.Mvc.Utilities
+{
+    using System.Text;
+
+    /// <summary>
+    /// Contains helper methods that provide byte representations of types.
+    /// </summary>
+    public static class BytesHelper
+    {
+        /// <summary>
+        /// Returns the byte representation of an UTF8 string.
+        /// </summary>
+        /// <param name="value">The string to get the byte representation of.</param>
+        /// <returns></returns>
+        public static byte[] GetBytes(string value) => Encoding.UTF8.GetBytes(value);
+    }
+}