Use static global using for DictionaryHelpers

App-vNext · Jul 30, 2024 · 7ecc4fc · 7ecc4fc
1 parent 4107cdb
commit 7ecc4fc
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 47 deletions.
diff --git a/test/Polly.Specs/Caching/CacheAsyncSpecs.cs b/test/Polly.Specs/Caching/CacheAsyncSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CacheAsyncSpecs : IDisposable

diff --git a/test/Polly.Specs/Caching/CacheSpecs.cs b/test/Polly.Specs/Caching/CacheSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CacheSpecs : IDisposable

diff --git a/test/Polly.Specs/Caching/CacheTResultAsyncSpecs.cs b/test/Polly.Specs/Caching/CacheTResultAsyncSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CacheTResultAsyncSpecs : IDisposable

diff --git a/test/Polly.Specs/Caching/CacheTResultSpecs.cs b/test/Polly.Specs/Caching/CacheTResultSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Caching;
+namespace Polly.Specs.Caching;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CacheTResultSpecs : IDisposable

diff --git a/test/Polly.Specs/CircuitBreaker/CircuitBreakerSpecs.cs b/test/Polly.Specs/CircuitBreaker/CircuitBreakerSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.CircuitBreaker;
+namespace Polly.Specs.CircuitBreaker;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class CircuitBreakerSpecs : IDisposable

diff --git a/test/Polly.Specs/ContextSpecs.cs b/test/Polly.Specs/ContextSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs;
+namespace Polly.Specs;
 
 public class ContextSpecs
 {

diff --git a/test/Polly.Specs/DictionaryHelpers.cs b/test/Polly.Specs/DictionaryHelpers.cs
@@ -3,8 +3,8 @@ namespace Polly.Specs;
 public static class DictionaryHelpers
 {
     public static Dictionary<TKey, object> CreateDictionary<TKey>(TKey key, object value)
-        where TKey : notnull => new() { { key, value } };
+        where TKey : notnull => new() { [key] = value };
 
     public static Dictionary<TKey, object> CreateDictionary<TKey>(TKey key1, object value1, TKey key2, object value2)
-        where TKey : notnull => new() { { key1, value1 }, { key2, value2 } };
+        where TKey : notnull => new() { [key1] = value1, [key2] = value2 };
 }
diff --git a/test/Polly.Specs/Polly.Specs.csproj b/test/Polly.Specs/Polly.Specs.csproj
@@ -27,6 +27,7 @@
     <Using Include="Xunit" />
     <Using Include="Xunit.Abstractions" />
     <Using Include="Xunit.Sdk" />
+    <Using Include="Polly.Specs.DictionaryHelpers" Static="true" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Polly.Specs/Registry/ReadOnlyPolicyRegistrySpecs.cs b/test/Polly.Specs/Registry/ReadOnlyPolicyRegistrySpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Registry;
+namespace Polly.Specs.Registry;
 
 public class ReadOnlyPolicyRegistrySpecs
 {

diff --git a/test/Polly.Specs/Retry/RetryForeverSpecs.cs b/test/Polly.Specs/Retry/RetryForeverSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Retry;
+namespace Polly.Specs.Retry;
 
 public class RetryForeverSpecs
 {

diff --git a/test/Polly.Specs/Retry/RetrySpecs.cs b/test/Polly.Specs/Retry/RetrySpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Retry;
+namespace Polly.Specs.Retry;
 
 public class RetrySpecs
 {

diff --git a/test/Polly.Specs/Retry/WaitAndRetryForeverSpecs.cs b/test/Polly.Specs/Retry/WaitAndRetryForeverSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Retry;
+namespace Polly.Specs.Retry;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class WaitAndRetryForeverSpecs : IDisposable

diff --git a/test/Polly.Specs/Retry/WaitAndRetryForeverTResultAsyncSpecs.cs b/test/Polly.Specs/Retry/WaitAndRetryForeverTResultAsyncSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Retry;
+namespace Polly.Specs.Retry;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class WaitAndRetryForeverTResultAsyncSpecs : IDisposable

diff --git a/test/Polly.Specs/Retry/WaitAndRetryForeverTResultSpecs.cs b/test/Polly.Specs/Retry/WaitAndRetryForeverTResultSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Retry;
+namespace Polly.Specs.Retry;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class WaitAndRetryForeverTResultSpecs : IDisposable

diff --git a/test/Polly.Specs/Retry/WaitAndRetrySpecs.cs b/test/Polly.Specs/Retry/WaitAndRetrySpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Retry;
+namespace Polly.Specs.Retry;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class WaitAndRetrySpecs : IDisposable

diff --git a/test/Polly.Specs/Retry/WaitAndRetryTResultAsyncSpecs.cs b/test/Polly.Specs/Retry/WaitAndRetryTResultAsyncSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Retry;
+namespace Polly.Specs.Retry;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class WaitAndRetryTResultAsyncSpecs : IDisposable

diff --git a/test/Polly.Specs/Retry/WaitAndRetryTResultSpecs.cs b/test/Polly.Specs/Retry/WaitAndRetryTResultSpecs.cs
@@ -1,6 +1,4 @@
-using static Polly.Specs.DictionaryHelpers;
-
-namespace Polly.Specs.Retry;
+namespace Polly.Specs.Retry;
 
 [Collection(Constants.SystemClockDependentTestCollection)]
 public class WaitAndRetryTResultSpecs : IDisposable