Merge pull request #7 from stepaside/master

Updated dependencies to use the latest StackExchange.Redis
johnnycardy · May 18, 2022 · 797e80a · 797e80a
2 parents 35a5d2e + 6b61e42
commit 797e80a
Show file tree

Hide file tree

Showing 27 changed files with 756 additions and 78 deletions.
diff --git a/StackRedis.L1.Test/Keys/KeyDelete.cs b/StackRedis.L1.Test/Keys/KeyDelete.cs
@@ -12,7 +12,7 @@ public class KeyDelete : UnitTestBase
         [TestMethod]
         public void KeyDelete_AfterSet()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.AreEqual("value1", (string)_memDb.StringGet("key1"));
@@ -34,7 +34,7 @@ public void KeyDelete_AfterSet()
         [TestMethod]
         public async Task KeyDeleteAsync_AfterSet()
         {
-            await _memDb.StringSetAsync("key1", "value1");
+            await _memDb.StringSetAsync("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.AreEqual("value1", (string)(await _memDb.StringGetAsync("key1")));

diff --git a/StackRedis.L1.Test/Keys/KeyExists.cs b/StackRedis.L1.Test/Keys/KeyExists.cs
@@ -28,7 +28,7 @@ public void KeyExists_True_StringAdd()
             Assert.IsFalse(_memDb.KeyExists("key1"));
             Assert.AreEqual(1, CallsByMemDb);
 
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
             Assert.AreEqual(2, CallsByMemDb);
 
             //We should be able to tell that it exists without going to redis
@@ -39,7 +39,7 @@ public void KeyExists_True_StringAdd()
         [TestMethod]
         public void KeyExists_False_KeyDelete()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             Assert.IsTrue(_memDb.KeyExists("key1"));

diff --git a/StackRedis.L1.Test/Keys/KeyExistsAsync.cs b/StackRedis.L1.Test/Keys/KeyExistsAsync.cs
@@ -28,7 +28,7 @@ public async Task KeyExistsAsync_True_StringAdd()
             Assert.IsFalse(await _memDb.KeyExistsAsync("key1"));
             Assert.AreEqual(1, CallsByMemDb);
 
-            await _memDb.StringSetAsync("key1", "value1");
+            await _memDb.StringSetAsync("key1", "value1", null, When.Always);
             Assert.AreEqual(2, CallsByMemDb);
 
             //We should be able to tell that it exists without going to redis
@@ -39,7 +39,7 @@ public async Task KeyExistsAsync_True_StringAdd()
         [TestMethod]
         public async Task KeyExistsAsync_False_KeyDelete()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             Assert.IsTrue(await _memDb.KeyExistsAsync("key1"));

diff --git a/StackRedis.L1.Test/Keys/KeyExpire.cs b/StackRedis.L1.Test/Keys/KeyExpire.cs
@@ -13,7 +13,7 @@ public class KeyExpire : UnitTestBase
         [TestMethod]
         public async Task KeyExpire_DateTime()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
@@ -28,14 +28,14 @@ public async Task KeyExpire_DateTime()
             Assert.IsFalse(_memDb.StringGet("key1").HasValue);
 
             //Add it again and make sure it's back
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
         }
 
         [TestMethod]
         public void KeyExpire_DateTime_Negative()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
@@ -49,7 +49,7 @@ public void KeyExpire_DateTime_Negative()
         [TestMethod]
         public async Task KeyExpire_Timespan()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
@@ -64,14 +64,14 @@ public async Task KeyExpire_Timespan()
             Assert.IsFalse(_memDb.StringGet("key1").HasValue);
 
             //Add it again and make sure it's back
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
         }
 
         [TestMethod]
         public void KeyExpire_Timespan_Negative()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
@@ -86,7 +86,7 @@ public void KeyExpire_Timespan_Negative()
         public async Task KeyExpire_ClearTimeout_Timespan()
         {
             //Set a key with a timeout
-            _memDb.StringSet("key1", "value1", TimeSpan.FromMilliseconds(50));
+            _memDb.StringSet("key1", "value1", TimeSpan.FromMilliseconds(50), When.Always);
 
             //Clear the timeout before it finishes
             _memDb.KeyExpire("key1", (TimeSpan?)null);
@@ -102,7 +102,7 @@ public async Task KeyExpire_ClearTimeout_Timespan()
         public async Task KeyExpire_ClearTimeout_DateTime()
         {
             //Set a key with a timeout
-            _memDb.StringSet("key1", "value1", TimeSpan.FromMilliseconds(50));
+            _memDb.StringSet("key1", "value1", TimeSpan.FromMilliseconds(50), When.Always);
 
             //Clear the timeout before it finishes
             _memDb.KeyExpire("key1", (DateTime?)null);

diff --git a/StackRedis.L1.Test/Keys/KeyExpireAsync.cs b/StackRedis.L1.Test/Keys/KeyExpireAsync.cs
@@ -12,7 +12,7 @@ public class KeyExpireAsync : UnitTestBase
         [TestMethod]
         public async Task KeyExpireAsync_DateTime()
         {
-            await _memDb.StringSetAsync("key1", "value1");
+            await _memDb.StringSetAsync("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.IsTrue((await _memDb.StringGetAsync("key1")).HasValue);
@@ -27,14 +27,14 @@ public async Task KeyExpireAsync_DateTime()
             Assert.IsFalse((await _memDb.StringGetAsync("key1")).HasValue);
 
             //Add it again and make sure it's back
-            await _memDb.StringSetAsync("key1", "value1");
+            await _memDb.StringSetAsync("key1", "value1", null, When.Always);
             Assert.IsTrue((await _memDb.StringGetAsync("key1")).HasValue);
         }
 
         [TestMethod]
         public async Task KeyExpireAsync_DateTime_Negative()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
@@ -48,7 +48,7 @@ public async Task KeyExpireAsync_DateTime_Negative()
         [TestMethod]
         public async Task KeyExpire_Timespan()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
@@ -63,14 +63,14 @@ public async Task KeyExpire_Timespan()
             Assert.IsFalse(_memDb.StringGet("key1").HasValue);
 
             //Add it again and make sure it's back
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
         }
 
         [TestMethod]
         public async Task KeyExpire_Timespan_Negative()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //value1 should be mem cached
             Assert.IsTrue(_memDb.StringGet("key1").HasValue);
@@ -85,7 +85,7 @@ public async Task KeyExpire_Timespan_Negative()
         public async Task KeyExpire_ClearTimeout_Timespan()
         {
             //Set a key with a timeout
-            _memDb.StringSet("key1", "value1", TimeSpan.FromMilliseconds(50));
+            _memDb.StringSet("key1", "value1", TimeSpan.FromMilliseconds(50), When.Always);
 
             //Clear the timeout before it finishes
             await _memDb.KeyExpireAsync("key1", (TimeSpan?)null);
@@ -101,7 +101,7 @@ public async Task KeyExpire_ClearTimeout_Timespan()
         public async Task KeyExpire_ClearTimeout_DateTime()
         {
             //Set a key with a timeout
-            _memDb.StringSet("key1", "value1", TimeSpan.FromMilliseconds(50));
+            _memDb.StringSet("key1", "value1", TimeSpan.FromMilliseconds(50), When.Always);
 
             //Clear the timeout before it finishes
             await _memDb.KeyExpireAsync("key1", (DateTime?)null);

diff --git a/StackRedis.L1.Test/Keys/KeyRename.cs b/StackRedis.L1.Test/Keys/KeyRename.cs
@@ -13,7 +13,7 @@ public class KeyRename : UnitTestBase
         public void KeyRename_Simple()
         {
             //Create a key
-            _memDb.StringSet("blah_key1", "str");
+            _memDb.StringSet("blah_key1", "str", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             //Rename it
@@ -32,7 +32,7 @@ public void KeyRename_Simple()
         [TestMethod]
         public async Task KeyRename_ExpiryStillSet()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //Now expire it
             _memDb.KeyExpire("key1", DateTime.UtcNow.AddMilliseconds(50));
@@ -52,8 +52,8 @@ public async Task KeyRename_ExpiryStillSet()
         [TestMethod]
         public void KeyRename_NewKeyAlreadyExists()
         {
-            _memDb.StringSet("key1", "value1");
-            _memDb.StringSet("key2", "value2");
+            _memDb.StringSet("key1", "value1", null, When.Always);
+            _memDb.StringSet("key2", "value2", null, When.Always);
 
             //Rename the key
             _memDb.KeyRename("key1", "key2");

diff --git a/StackRedis.L1.Test/Keys/KeyRenameAsync.cs b/StackRedis.L1.Test/Keys/KeyRenameAsync.cs
@@ -13,7 +13,7 @@ public class KeyRenameAsync : UnitTestBase
         public async Task KeyRenameAsync_Simple()
         {
             //Create a key
-            await _memDb.StringSetAsync("key1", "str");
+            await _memDb.StringSetAsync("key1", "str", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             //Rename it
@@ -33,7 +33,7 @@ public async Task KeyRenameAsync_Simple()
         [TestMethod]
         public async Task KeyRenameAsync_ExpiryStillSet()
         {
-            await _memDb.StringSetAsync("key1", "value1");
+            await _memDb.StringSetAsync("key1", "value1", null, When.Always);
 
             //Now expire it
             await _memDb.KeyExpireAsync("key1", DateTime.UtcNow.AddMilliseconds(20));
@@ -53,8 +53,8 @@ public async Task KeyRenameAsync_ExpiryStillSet()
         [TestMethod]
         public async Task KeyRenameAsync_NewKeyAlreadyExists()
         {
-            await _memDb.StringSetAsync("key1", "value1");
-            await _memDb.StringSetAsync("key2", "value2");
+            await _memDb.StringSetAsync("key1", "value1", null, When.Always);
+            await _memDb.StringSetAsync("key2", "value2", null, When.Always);
 
             //Rename the key
             await _memDb.KeyRenameAsync("key1", "key2");

diff --git a/StackRedis.L1.Test/Keys/KeyTimeToLive.cs b/StackRedis.L1.Test/Keys/KeyTimeToLive.cs
@@ -13,7 +13,7 @@ public class KeyTimeToLive : UnitTestBase
         [TestMethod]
         public void KeyTimeToLive_Simple()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //Give it a ttl in redis
             _redisDirectDb.KeyExpire("key1", TimeSpan.FromMinutes(10));
@@ -32,7 +32,7 @@ public void KeyTimeToLive_Simple()
         [TestMethod]
         public async Task KeyTimeToLive_ByOtherClient()
         {
-            _memDb.StringSet("key1", "value1");
+            _memDb.StringSet("key1", "value1", null, When.Always);
 
             //Give it a ttl in redis
             _redisDirectDb.KeyExpire("key1", TimeSpan.FromMinutes(10));

diff --git a/StackRedis.L1.Test/NoRedis/NoRedisTests.cs b/StackRedis.L1.Test/NoRedis/NoRedisTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +15,7 @@ public class NoRedisTests
         public void NoRedis_StringGet()
         {
             RedisL1Database db = new RedisL1Database("unique str");
-            db.StringSet("nodbkey", "value");
+            db.StringSet("nodbkey", "value", null, When.Always);
             Assert.AreEqual("value", (string)db.StringGet("nodbkey"));
         }
     }

diff --git a/StackRedis.L1.Test/StackRedis.L1.Test.csproj b/StackRedis.L1.Test/StackRedis.L1.Test.csproj
@@ -20,10 +20,10 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.600" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="StackExchange.Redis" Version="2.5.61" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\StackRedis.L1\StackRedis.L1.csproj" />

diff --git a/StackRedis.L1.Test/String/StringAppend.cs b/StackRedis.L1.Test/String/StringAppend.cs
@@ -12,7 +12,7 @@ public class StringAppend: UnitTestBase
         [TestMethod]
         public void StringAppend_Simple()
         {
-            _memDb.StringSet("key", "a");
+            _memDb.StringSet("key", "a", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             _memDb.StringAppend("key", "b");
@@ -27,7 +27,7 @@ public void StringAppend_Simple()
         [TestMethod]
         public async Task StringAppend_InRedis_Notification()
         {
-            _memDb.StringSet("key", "a");
+            _memDb.StringSet("key", "a", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             _otherClientDb.StringAppend("key", "b");
@@ -57,7 +57,7 @@ public void StringAppend_DoesNotExist()
         [TestMethod]
         public async Task StringAppendAsync_Simple()
         {
-            await _memDb.StringSetAsync("key", "a");
+            await _memDb.StringSetAsync("key", "a", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             await _memDb.StringAppendAsync("key", "b");
@@ -72,7 +72,7 @@ public async Task StringAppendAsync_Simple()
         [TestMethod]
         public async Task StringAppendAsync_InRedis_Notification()
         {
-            await _memDb.StringSetAsync("key", "a");
+            await _memDb.StringSetAsync("key", "a", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             await _otherClientDb.StringAppendAsync("key", "b");

diff --git a/StackRedis.L1.Test/String/StringDecrement.cs b/StackRedis.L1.Test/String/StringDecrement.cs
@@ -12,7 +12,7 @@ public class StringDecrement: UnitTestBase
         [TestMethod]
         public void StringDecrement_Double_Simple()
         {
-            _memDb.StringSet("key", "2.5");
+            _memDb.StringSet("key", "2.5", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             _memDb.StringDecrement("key", 1.5);
@@ -28,7 +28,7 @@ public void StringDecrement_Double_Simple()
         [TestMethod]
         public async Task StringDecrement_Double_InRedis_Notification()
         {
-            _memDb.StringSet("key", "2.5");
+            _memDb.StringSet("key", "2.5", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             _otherClientDb.StringDecrement("key", 1.5);
@@ -46,7 +46,7 @@ public async Task StringDecrement_Double_InRedis_Notification()
         [TestMethod]
         public async Task StringDecrementAsync_Double_Simple()
         {
-            await _memDb.StringSetAsync("key", "2.5");
+            await _memDb.StringSetAsync("key", "2.5", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             await _memDb.StringDecrementAsync("key", 1.5);
@@ -61,7 +61,7 @@ public async Task StringDecrementAsync_Double_Simple()
         [TestMethod]
         public void StringDecrement_Long_Simple()
         {
-            _memDb.StringSet("key", "3");
+            _memDb.StringSet("key", "3", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             _memDb.StringDecrement("key", 2);
@@ -77,7 +77,7 @@ public void StringDecrement_Long_Simple()
         [TestMethod]
         public async Task StringDecrement_Long_InRedis_Notification()
         {
-            _memDb.StringSet("key", "3");
+            _memDb.StringSet("key", "3", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             _otherClientDb.StringDecrement("key", 2);
@@ -95,7 +95,7 @@ public async Task StringDecrement_Long_InRedis_Notification()
         [TestMethod]
         public async Task StringDecrementAsync_Long_Simple()
         {
-            await _memDb.StringSetAsync("key", "3");
+            await _memDb.StringSetAsync("key", "3", null, When.Always);
             Assert.AreEqual(1, CallsByMemDb);
 
             await _memDb.StringDecrementAsync("key", 2);