Merge pull request #46 from SixLabors/js/fix-cache

Js/fix cache
SixLabors · Nov 26, 2018 · dc8659d · dc8659d
2 parents a109f51 + 3ebaa92
commit dc8659d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/ImageSharp.Web/Caching/CacheHash.cs b/src/ImageSharp.Web/Caching/CacheHash.cs
@@ -43,6 +43,7 @@ public string Create(string value, uint length)
             using (var hashAlgorithm = SHA256.Create())
             using (IManagedByteBuffer buffer = this.memoryAllocator.AllocateManagedByteBuffer(byteCount))
             {
+                Encoding.ASCII.GetBytes(value, 0, byteCount, buffer.Array, 0);
                 byte[] hash = hashAlgorithm.ComputeHash(buffer.Array, 0, byteCount);
                 string ext = this.formatHelper.GetExtensionOrDefault(value);
                 return $"{HexEncoder.Encode(new Span<byte>(hash).Slice(0, len / 2))}.{ext}";

diff --git a/tests/ImageSharp.Web.Tests/Caching/AsyncKeyLockTests.cs b/tests/ImageSharp.Web.Tests/Caching/AsyncKeyLockTests.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Caching;
 using Xunit;
@@ -27,15 +26,15 @@ private void AsyncLockCanLockByKey()
             bool zeroEntered = false;
             bool entered = false;
             int index = 0;
-            Task[] tasks = Enumerable.Range(0, 3).Select(i => Task.Run(async () =>
+            Task[] tasks = Enumerable.Range(0, 5).Select(i => Task.Run(async () =>
             {
                 using (await AsyncLock.WriterLockAsync(AsyncKey).ConfigureAwait(false))
                 {
                     if (i == 0)
                     {
                         entered = true;
                         zeroEntered = true;
-                        Thread.Sleep(3000);
+                        await Task.Delay(3000).ConfigureAwait(false);
                         entered = false;
                     }
                     else if (zeroEntered)
@@ -48,23 +47,23 @@ private void AsyncLockCanLockByKey()
             })).ToArray();
 
             Task.WaitAll(tasks);
-            Assert.Equal(3, index);
+            Assert.Equal(5, index);
         }
 
         private void AsyncLockAllowsDifferentKeysToRun()
         {
             bool zeroEntered = false;
             bool entered = false;
             int index = 0;
-            Task[] tasks = Enumerable.Range(0, 3).Select(i => Task.Run(async () =>
+            Task[] tasks = Enumerable.Range(0, 5).Select(i => Task.Run(async () =>
             {
                 using (await AsyncLock.WriterLockAsync(i > 0 ? AsyncKey2 : AsyncKey1).ConfigureAwait(false))
                 {
                     if (i == 0)
                     {
                         entered = true;
                         zeroEntered = true;
-                        Thread.Sleep(2000);
+                        await Task.Delay(2000).ConfigureAwait(false);
                         entered = false;
                     }
                     else if (zeroEntered)
@@ -78,7 +77,7 @@ private void AsyncLockAllowsDifferentKeysToRun()
             })).ToArray();
 
             Task.WaitAll(tasks);
-            Assert.Equal(3, index);
+            Assert.Equal(5, index);
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs b/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs
@@ -41,6 +41,17 @@ public void CachHashProducesIdenticalResults()
             Assert.Equal(expected, actual);
         }
 
+        [Fact]
+        public void CachHashProducesDifferentResults()
+        {
+            const string input = "http://testwebsite.com/image-12345.jpeg?width=400";
+            const string input2 = "http://testwebsite.com/image-23456.jpeg?width=400";
+            string expected = cacheHash.Create(input, 8);
+            string actual = cacheHash.Create(input2, 8);
+
+            Assert.NotEqual(expected, actual);
+        }
+
         [Fact]
         public void CachHashLengthIsIdentical()
         {