Bugfix for #192, forgot to check for Default expiration mode in confi…

…guration builder validation check
MichaCo · Nov 18, 2017 · b6479c8 · b6479c8
1 parent 9837d40
commit b6479c8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 15 deletions.
diff --git a/src/CacheManager.Core/Configuration/ConfigurationBuilder.cs b/src/CacheManager.Core/Configuration/ConfigurationBuilder.cs
@@ -493,7 +493,8 @@ public ConfigurationBuilderCacheHandlePart EnableStatistics()
         /// <seealso cref="ExpirationMode"/>
         public ConfigurationBuilderCacheHandlePart WithExpiration(ExpirationMode expirationMode, TimeSpan timeout)
         {
-            if (expirationMode != ExpirationMode.None && timeout == TimeSpan.Zero)
+            // fixed #192 (was missing check for "Default" mode)
+            if (expirationMode != ExpirationMode.None && expirationMode != ExpirationMode.Default && timeout == TimeSpan.Zero)
             {
                 throw new InvalidOperationException("If expiration mode is not set to 'None', timeout cannot be zero.");
             }
@@ -798,4 +799,4 @@ public ICacheManagerConfiguration Build()
             return Configuration;
         }
     }
-}
+}
diff --git a/...Manager.MSConfiguration.TypeLoad.Tests/CacheManager.MSConfiguration.TypeLoad.Tests.csproj b/...Manager.MSConfiguration.TypeLoad.Tests/CacheManager.MSConfiguration.TypeLoad.Tests.csproj
@@ -21,13 +21,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="FluentAssertions" Version="4.19.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="FluentAssertions" Version="4.19.4" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">    
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
   </ItemGroup>
 
   <ItemGroup>
@@ -37,5 +37,4 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
   </PropertyGroup>
-
-</Project>
+</Project>
diff --git a/test/CacheManager.Tests/CacheManager.Tests.csproj b/test/CacheManager.Tests/CacheManager.Tests.csproj
@@ -32,10 +32,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="FluentAssertions" Version="4.19.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="FluentAssertions" Version="4.19.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">

diff --git a/test/CacheManager.Tests/CacheManagerExpirationTest.cs b/test/CacheManager.Tests/CacheManagerExpirationTest.cs
@@ -896,7 +896,7 @@ public void Redis_ExpirationTimeoutLimit()
             // act/assert
             using (cache)
             {
-                Action act = ()=> cache.Add(new CacheItem<object>(key, key, ExpirationMode.Absolute, timeout));
+                Action act = () => cache.Add(new CacheItem<object>(key, key, ExpirationMode.Absolute, timeout));
 
                 act.ShouldThrow<ArgumentException>().WithMessage("*not supported*");
             }
@@ -1030,6 +1030,23 @@ public void CacheItem_WithNoExpiration()
             absolute.ExpirationTimeout.Should().BeCloseTo(default(TimeSpan));
         }
 
+        /// <summary>
+        /// Issue #192
+        /// </summary>
+        [Fact]
+        public void Configuration_AllowsZeroForDefaultExpiration()
+        {
+            var expirationMode = ExpirationMode.Default;
+            var timeout = TimeSpan.Zero;
+
+            Action act = () => CacheFactory.Build<string>(
+                s => s
+                    .WithDictionaryHandle()
+                    .WithExpiration(expirationMode, timeout));
+
+            act.ShouldNotThrow();
+        }
+
 #if !NETCOREAPP
 
         [Fact]
@@ -1242,4 +1259,4 @@ private static async Task TestRemoveExpiration(int timeoutMillis, Func<string, b
             }
         }
     }
-}
+}