Refactor to make tests re-useable for different CacheProvider types

App-vNext · Jan 26, 2019 · 62eab65 · 62eab65
1 parent a853a22
commit 62eab65
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 20 deletions.
diff --git a/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripSpecsBase.cs b/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripSpecsBase.cs
@@ -6,6 +6,13 @@ namespace Polly.Caching.Distributed.Specs.Integration
 {
     public abstract class CacheRoundTripSpecsBase
     {
+        protected CacheRoundTripSpecsBase(ICachePolicyFactory cachePolicyFactory)
+        {
+            CachePolicyFactory = cachePolicyFactory;
+        }
+
+        protected ICachePolicyFactory CachePolicyFactory { get; }
+
         protected const string OperationKey = "SomeOperationKey";
 
         public abstract Task Should_roundtrip_this_variant_of<TResult>(TResult testValue);

diff --git a/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripSpecsSyncBase.cs b/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripSpecsSyncBase.cs
@@ -1,13 +1,15 @@
-#if !NETCOREAPP1_1
-
-using System;
+using System;
 using System.Threading.Tasks;
 using FluentAssertions;
 
 namespace Polly.Caching.Distributed.Specs.Integration
 {
     public abstract class CacheRoundTripSpecsSyncBase<TCache> : CacheRoundTripSpecsBase
     {
+        protected CacheRoundTripSpecsSyncBase(ICachePolicyFactory cachePolicyFactory) : base(cachePolicyFactory)
+        {
+        }
+
         public override Task Should_roundtrip_this_variant_of<TResult>(TResult testValue)
         {
             // Arrange
@@ -47,6 +49,4 @@ public override Task Should_roundtrip_this_variant_of<TResult>(TResult testValue
             return Task.CompletedTask;
         }
     }
-}
-
-#endif
+}
diff --git a/...s/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray.cs b/...s/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray.cs
@@ -2,7 +2,12 @@
 
 namespace Polly.Caching.Distributed.Specs.Integration
 {
-    public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray : CacheRoundTripSpecsAsyncBase<byte[]> { }
+    public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray : CacheRoundTripSpecsAsyncBase<byte[]> {
+
+        public CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray() : base(new MemoryDistributedCachePolicyFactory())
+        {
+        }
+    }
 }
 
 #endif
diff --git a/...pecs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String.cs b/...pecs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String.cs
@@ -2,7 +2,11 @@
 
 namespace Polly.Caching.Distributed.Specs.Integration
 {
-    public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String : CacheRoundTripSpecsAsyncBase<string> { }
+    public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String : CacheRoundTripSpecsAsyncBase<string> {
+        public CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String() : base(new MemoryDistributedCachePolicyFactory())
+        {
+        }
+    }
 }
 
 #endif
diff --git a/...cs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_ByteArray.cs b/...cs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_ByteArray.cs
@@ -2,7 +2,11 @@
 
 namespace Polly.Caching.Distributed.Specs.Integration
 {
-    public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_ByteArray : CacheRoundTripSpecsSyncBase<byte[]> { }
+    public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_ByteArray : CacheRoundTripSpecsSyncBase<byte[]> {
+        public CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_ByteArray() : base(new MemoryDistributedCachePolicyFactory())
+        {
+        }
+    }
 }
 
 #endif
diff --git a/...Specs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_String.cs b/...Specs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_String.cs
@@ -2,7 +2,11 @@
 
 namespace Polly.Caching.Distributed.Specs.Integration
 {
-    public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_String : CacheRoundTripSpecsSyncBase<string> { }
+    public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_String : CacheRoundTripSpecsSyncBase<string> {
+        public CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_String() : base(new MemoryDistributedCachePolicyFactory())
+        {
+        }
+    }
 }
 
 #endif
diff --git a/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripspecsAsyncBase.cs b/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripspecsAsyncBase.cs
@@ -1,6 +1,4 @@
-#if !NETCOREAPP1_1
-
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -9,6 +7,10 @@ namespace Polly.Caching.Distributed.Specs.Integration
 {
     public abstract class CacheRoundTripSpecsAsyncBase<TCache> : CacheRoundTripSpecsBase
     {
+        protected CacheRoundTripSpecsAsyncBase(ICachePolicyFactory cachePolicyFactory) : base(cachePolicyFactory)
+        {
+        }
+
         public override async Task Should_roundtrip_this_variant_of<TResult>(TResult testValue)
         {
             // Arrange
@@ -46,6 +48,4 @@ public override async Task Should_roundtrip_this_variant_of<TResult>(TResult tes
             underlyingDelegateExecuteCount.Should().Be(1);
         }
     }
-}
-
-#endif
+}
diff --git a/src/Polly.Caching.Distributed.SharedSpecs/Integration/ICachePolicyFactory.cs b/src/Polly.Caching.Distributed.SharedSpecs/Integration/ICachePolicyFactory.cs
@@ -0,0 +1,8 @@
+namespace Polly.Caching.Distributed.Specs.Integration
+{
+    public interface ICachePolicyFactory
+    {
+        (ISyncCacheProvider<TResult>, ISyncPolicy<TResult>) CreateSyncCachePolicy<TCache, TResult>();
+        (IAsyncCacheProvider<TResult>, IAsyncPolicy<TResult>) CreateAsyncCachePolicy<TCache, TResult>();
+    }
+}
diff --git a/...edSpecs/Integration/CachePolicyFactory.cs → ...on/MemoryDistributedCachePolicyFactory.cs b/...edSpecs/Integration/CachePolicyFactory.cs → ...on/MemoryDistributedCachePolicyFactory.cs
@@ -9,9 +9,9 @@
 
 namespace Polly.Caching.Distributed.Specs.Integration
 {
-    public class CachePolicyFactory
+    public class MemoryDistributedCachePolicyFactory : ICachePolicyFactory
     {
-        public static (ISyncCacheProvider<TResult>, ISyncPolicy<TResult>) CreateSyncCachePolicy<TCache, TResult>()
+        public (ISyncCacheProvider<TResult>, ISyncPolicy<TResult>) CreateSyncCachePolicy<TCache, TResult>()
         {
             var memoryIDistributedCache = new MemoryDistributedCache(Options.Create(new MemoryDistributedCacheOptions()));
             ISyncCacheProvider<TResult> memoryIDistributedCacheProvider;
@@ -32,7 +32,7 @@ public static (ISyncCacheProvider<TResult>, ISyncPolicy<TResult>) CreateSyncCach
             return (memoryIDistributedCacheProvider, policy);
         }
 
-        public static (IAsyncCacheProvider<TResult>, IAsyncPolicy<TResult>) CreateAsyncCachePolicy<TCache, TResult>()
+        public (IAsyncCacheProvider<TResult>, IAsyncPolicy<TResult>) CreateAsyncCachePolicy<TCache, TResult>()
         {
             var memoryIDistributedCache = new MemoryDistributedCache(Options.Create(new MemoryDistributedCacheOptions()));
             IAsyncCacheProvider<TResult> memoryIDistributedCacheProvider;

diff --git a/src/Polly.Caching.Distributed.SharedSpecs/Polly.Caching.Distributed.SharedSpecs.projitems b/src/Polly.Caching.Distributed.SharedSpecs/Polly.Caching.Distributed.SharedSpecs.projitems
@@ -10,14 +10,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Integration\ByteArraySerializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Integration\CachePolicyFactory.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Integration\MemoryDistributedCachePolicyFactory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Integration\CacheRoundTripSpecsAsyncBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Integration\CacheRoundTripSpecsBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Integration\CacheRoundTripSpecsSyncBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Integration\CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Integration\CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Integration\CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_ByteArray.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Integration\CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_String.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Integration\ICachePolicyFactory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Unit\CacheProviderHelperTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Unit\NetStandardIDistributedCacheByteArrayProviderSpecs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Unit\NetStandardIDistributedCacheStringProviderSpecs.cs" />