Refactor to make tests re-useable for different CacheProvider types

reisenberger · reisenberger · commit 62eab65c10b2 · 2019-01-26T11:56:40.000Z
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/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray.cs b/src/Polly.Caching.Distributed.SharedSpecs/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/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String.cs b/src/Polly.Caching.Distributed.SharedSpecs/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/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_ByteArray.cs b/src/Polly.Caching.Distributed.SharedSpecs/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/src/Polly.Caching.Distributed.SharedSpecs/Integration/CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Sync_String.cs b/src/Polly.Caching.Distributed.SharedSpecs/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/src/Polly.Caching.Distributed.SharedSpecs/Integration/MemoryDistributedCachePolicyFactory.cs b/src/Polly.Caching.Distributed.SharedSpecs/Integration/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" />

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,13 @@ namespace Polly.Caching.Distributed.Specs.Integration`
`6`	`6`	`{`
`7`	`7`	`public abstract class CacheRoundTripSpecsBase`
`8`	`8`	`{`
	`9`	`+ protected CacheRoundTripSpecsBase(ICachePolicyFactory cachePolicyFactory)`
	`10`	`+ {`
	`11`	`+ CachePolicyFactory = cachePolicyFactory;`
	`12`	`+ }`
	`13`	`+`
	`14`	`+ protected ICachePolicyFactory CachePolicyFactory { get; }`
	`15`	`+`
`9`	`16`	`protected const string OperationKey = "SomeOperationKey";`
`10`	`17`
`11`	`18`	`public abstract Task Should_roundtrip_this_variant_of<TResult>(TResult testValue);`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,15 @@`
`1`		`-#if !NETCOREAPP1_1`
`2`		`-`
`3`		`-using System;`
	`1`	`+using System;`
`4`	`2`	`using System.Threading.Tasks;`
`5`	`3`	`using FluentAssertions;`
`6`	`4`
`7`	`5`	`namespace Polly.Caching.Distributed.Specs.Integration`
`8`	`6`	`{`
`9`	`7`	`public abstract class CacheRoundTripSpecsSyncBase<TCache> : CacheRoundTripSpecsBase`
`10`	`8`	`{`
	`9`	`+ protected CacheRoundTripSpecsSyncBase(ICachePolicyFactory cachePolicyFactory) : base(cachePolicyFactory)`
	`10`	`+ {`
	`11`	`+ }`
	`12`	`+`
`11`	`13`	`public override Task Should_roundtrip_this_variant_of<TResult>(TResult testValue)`
`12`	`14`	`{`
`13`	`15`	`// Arrange`
`@@ -47,6 +49,4 @@ public override Task Should_roundtrip_this_variant_of<TResult>(TResult testValue`
`47`	`49`	`return Task.CompletedTask;`
`48`	`50`	`}`
`49`	`51`	`}`
`50`		`-}`
`51`		`-`
`52`		`-#endif`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,12 @@`
`2`	`2`
`3`	`3`	`namespace Polly.Caching.Distributed.Specs.Integration`
`4`	`4`	`{`
`5`		`- public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray : CacheRoundTripSpecsAsyncBase<byte[]> { }`
	`5`	`+ public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray : CacheRoundTripSpecsAsyncBase<byte[]> {`
	`6`	`+`
	`7`	`+ public CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_ByteArray() : base(new MemoryDistributedCachePolicyFactory())`
	`8`	`+ {`
	`9`	`+ }`
	`10`	`+ }`
`6`	`11`	`}`
`7`	`12`
`8`	`13`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace Polly.Caching.Distributed.Specs.Integration`
`4`	`4`	`{`
`5`		`- public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String : CacheRoundTripSpecsAsyncBase<string> { }`
	`5`	`+ public class CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String : CacheRoundTripSpecsAsyncBase<string> {`
	`6`	`+ public CacheRoundTripSpecs_NetStandardIDistributedCacheProvider_Async_String() : base(new MemoryDistributedCachePolicyFactory())`
	`7`	`+ {`
	`8`	`+ }`
	`9`	`+ }`
`6`	`10`	`}`
`7`	`11`
`8`	`12`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-#if !NETCOREAPP1_1`
`2`		`-`
`3`		`-using System;`
	`1`	`+using System;`
`4`	`2`	`using System.Threading;`
`5`	`3`	`using System.Threading.Tasks;`
`6`	`4`	`using FluentAssertions;`
`@@ -9,6 +7,10 @@ namespace Polly.Caching.Distributed.Specs.Integration`
`9`	`7`	`{`
`10`	`8`	`public abstract class CacheRoundTripSpecsAsyncBase<TCache> : CacheRoundTripSpecsBase`
`11`	`9`	`{`
	`10`	`+ protected CacheRoundTripSpecsAsyncBase(ICachePolicyFactory cachePolicyFactory) : base(cachePolicyFactory)`
	`11`	`+ {`
	`12`	`+ }`
	`13`	`+`
`12`	`14`	`public override async Task Should_roundtrip_this_variant_of<TResult>(TResult testValue)`
`13`	`15`	`{`
`14`	`16`	`// Arrange`
`@@ -46,6 +48,4 @@ public override async Task Should_roundtrip_this_variant_of<TResult>(TResult tes`
`46`	`48`	`underlyingDelegateExecuteCount.Should().Be(1);`
`47`	`49`	`}`
`48`	`50`	`}`
`49`		`-}`
`50`		`-`
`51`		`-#endif`
	`51`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@`
`9`	`9`
`10`	`10`	`namespace Polly.Caching.Distributed.Specs.Integration`
`11`	`11`	`{`
`12`		`- public class CachePolicyFactory`
	`12`	`+ public class MemoryDistributedCachePolicyFactory : ICachePolicyFactory`
`13`	`13`	`{`
`14`		`- public static (ISyncCacheProvider<TResult>, ISyncPolicy<TResult>) CreateSyncCachePolicy<TCache, TResult>()`
	`14`	`+ public (ISyncCacheProvider<TResult>, ISyncPolicy<TResult>) CreateSyncCachePolicy<TCache, TResult>()`
`15`	`15`	`{`
`16`	`16`	`var memoryIDistributedCache = new MemoryDistributedCache(Options.Create(new MemoryDistributedCacheOptions()));`
`17`	`17`	`ISyncCacheProvider<TResult> memoryIDistributedCacheProvider;`
`@@ -32,7 +32,7 @@ public static (ISyncCacheProvider<TResult>, ISyncPolicy<TResult>) CreateSyncCach`
`32`	`32`	`return (memoryIDistributedCacheProvider, policy);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public static (IAsyncCacheProvider<TResult>, IAsyncPolicy<TResult>) CreateAsyncCachePolicy<TCache, TResult>()`
	`35`	`+ public (IAsyncCacheProvider<TResult>, IAsyncPolicy<TResult>) CreateAsyncCachePolicy<TCache, TResult>()`
`36`	`36`	`{`
`37`	`37`	`var memoryIDistributedCache = new MemoryDistributedCache(Options.Create(new MemoryDistributedCacheOptions()));`
`38`	`38`	`IAsyncCacheProvider<TResult> memoryIDistributedCacheProvider;`