Merge pull request #46 from clevyr/use-default-sliding-expiration

use default sliding expiration expiration if not supplied in DistributedCacheEntryOptions
PomeloFoundation · Jun 27, 2023 · 86e202f · 86e202f
2 parents f624ab0 + 160827c
commit 86e202f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/Pomelo.Extensions.Caching.MySql/MySqlCache.cs b/src/Pomelo.Extensions.Caching.MySql/MySqlCache.cs
@@ -191,7 +191,7 @@ public void Set(string key, byte[] value, DistributedCacheEntryOptions options)
 				throw new ArgumentNullException(nameof(options));
 			}
 
-			//GetOptions(ref options);
+			GetOptions(ref options);
 
 			_dbOperations.SetCacheItem(key, value, options);
 
@@ -221,7 +221,7 @@ public async Task SetAsync(
 
 			token.ThrowIfCancellationRequested();
 
-            //GetOptions(ref options);
+            GetOptions(ref options);
 
             await _dbOperations.SetCacheItemAsync(key, value, options, token);
 

diff --git a/src/Pomelo.Extensions.Caching.MySql/Pomelo.Extensions.Caching.MySql.csproj b/src/Pomelo.Extensions.Caching.MySql/Pomelo.Extensions.Caching.MySql.csproj
@@ -11,7 +11,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>2.1.3</Version>
+    <Version>2.1.4</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Pomelo.snk</AssemblyOriginatorKeyFile>

diff --git a/test/Pomelo.Extensions.Caching.MySql.Tests/MySqlCacheWithDatabaseTest.cs b/test/Pomelo.Extensions.Caching.MySql.Tests/MySqlCacheWithDatabaseTest.cs
@@ -239,26 +239,7 @@ await sqlServerCache.SetAsync(
 			// Assert
 			Assert.Null(value);
 		}
-
-		[IgnoreWhenNoSqlSetupFact]
-		public async Task ThrowsException_OnNoSlidingOrAbsoluteExpirationOptions()
-		{
-			// Arrange
-			var key = Guid.NewGuid().ToString();
-			var sqlServerCache = GetCache();
-			var expectedValue = Encoding.UTF8.GetBytes("Hello, World!");
-
-			// Act & Assert
-			var exception = await Assert.ThrowsAsync<InvalidOperationException>(() =>
-			{
-				return sqlServerCache.SetAsync(
-					key,
-					expectedValue,
-					new DistributedCacheEntryOptions());
-			});
-			Assert.Equal("Either absolute or sliding expiration needs to be provided.", exception.Message);
-		}
-
+
 		[IgnoreWhenNoSqlSetupFact]
 		public async Task DoesNotThrowException_WhenOnlyAbsoluteExpirationSupplied_AbsoluteExpirationRelativeToNow()
 		{
@@ -379,6 +360,24 @@ await AssertGetCacheItemFromDatabaseAsync(
 				absoluteExpiration: absoluteExpiration,
 				expectedExpirationTime: absoluteExpiration);
 		}
+
+        [IgnoreWhenNoSqlSetupFact]
+        public async Task SetCacheItem_Uses_DefaultSlidingExpiration_If_NoSlidingOrAbsoluteExpirationSupplied()
+        {
+          // Arrange
+          var key = Guid.NewGuid().ToString();
+          var sqlServerCache = GetCache();
+          var expectedValue = Encoding.UTF8.GetBytes("Hello, World!");
+
+          await sqlServerCache.SetAsync(
+            key,
+            expectedValue,
+            new DistributedCacheEntryOptions());
+
+          var cacheItem = await GetCacheItemFromDatabaseAsync(key);
+          Assert.NotNull(cacheItem);
+          Assert.Equal(cacheItem.SlidingExpirationInSeconds, _databaseOptionsFixture.Options.Value.DefaultSlidingExpiration);
+        }
 
 		[IgnoreWhenNoSqlSetupFact]
 		public async Task ExtendsExpirationTime_ForSlidingExpiration()
@@ -779,7 +778,8 @@ await sqlServerCache.SetAsync(
 			cacheItemInfo = await sqlServerCache.GetAsync(key);
 			Assert.Null(cacheItemInfo);
 		}
-
+
+
 		private MySqlCache GetCache(ISystemClock testClock = null)
 		{
 			var options = _databaseOptionsFixture.Options.Value;