Fix S2184 and S2104 (#2328)

* Fix SA1204 * Fix warning S2184 * Remove S2184 and SA1204 warning supressions
App-vNext · Oct 5, 2024 · 3392a33 · 3392a33
1 parent 439cf15
commit 3392a33
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/test/Polly.Specs/Bulkhead/BulkheadSpecsBase.cs b/test/Polly.Specs/Bulkhead/BulkheadSpecsBase.cs
@@ -3,6 +3,12 @@
 [Collection(Constants.ParallelThreadDependentTestCollection)]
 public abstract class BulkheadSpecsBase : IDisposable
 {
+    protected static AssertionFailure? Expect(int expected, Func<int> actualFunc, string measure)
+    {
+        int actual = actualFunc();
+        return actual != expected ? new AssertionFailure(expected, actual, measure) : null;
+    }
+
     #region Time constraints
 
     protected readonly TimeSpan ShimTimeSpan = TimeSpan.FromMilliseconds(50); // How frequently to retry the assertions.
@@ -312,12 +318,6 @@ protected void EnsureNoUnbservedTaskExceptions()
 
     #endregion
 
-    protected static AssertionFailure? Expect(int expected, Func<int> actualFunc, string measure)
-    {
-        int actual = actualFunc();
-        return actual != expected ? new AssertionFailure(expected, actual, measure) : null;
-    }
-
     protected void Within(TimeSpan timeSpan, Func<AssertionFailure?> actionContainingAssertions)
     {
         TimeSpan permitted = timeSpan;

diff --git a/test/Polly.Specs/Polly.Specs.csproj b/test/Polly.Specs/Polly.Specs.csproj
@@ -9,8 +9,8 @@
     <Include>[Polly]*</Include>
     <IncludePollyUsings>true</IncludePollyUsings>
     <NoWarn>$(NoWarn);CA1030;CA1031;CA2008;CA2201</NoWarn>
-    <NoWarn>$(NoWarn);S104;S2184;S6966</NoWarn>
-    <NoWarn>$(NoWarn);SA1204;SA1402;SA1600</NoWarn>
+    <NoWarn>$(NoWarn);S104;S6966</NoWarn>
+    <NoWarn>$(NoWarn);SA1402;SA1600</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/Polly.Specs/Retry/WaitAndRetryAsyncSpecs.cs b/test/Polly.Specs/Retry/WaitAndRetryAsyncSpecs.cs
@@ -1070,7 +1070,7 @@ public async Task Should_honour_cancellation_immediately_during_wait_phase_of_wa
         attemptsInvoked.Should().Be(1);
 
         watch.Elapsed.Should().BeLessThan(retryDelay);
-        watch.Elapsed.Should().BeCloseTo(shimTimeSpan, precision: TimeSpan.FromMilliseconds((int)shimTimeSpan.TotalMilliseconds / 2));  // Consider increasing shimTimeSpan, or loosening precision, if test fails transiently in different environments.
+        watch.Elapsed.Should().BeCloseTo(shimTimeSpan, precision: TimeSpan.FromMilliseconds(shimTimeSpan.TotalMilliseconds / 2));  // Consider increasing shimTimeSpan, or loosening precision, if test fails transiently in different environments.
     }
 
     [Fact]

diff --git a/test/Polly.Specs/Retry/WaitAndRetrySpecs.cs b/test/Polly.Specs/Retry/WaitAndRetrySpecs.cs
@@ -1098,7 +1098,7 @@ public void Should_honour_cancellation_immediately_during_wait_phase_of_waitandr
         attemptsInvoked.Should().Be(1);
 
         watch.Elapsed.Should().BeLessThan(retryDelay);
-        watch.Elapsed.Should().BeCloseTo(shimTimeSpan, precision: TimeSpan.FromMilliseconds((int)shimTimeSpan.TotalMilliseconds / 2));  // Consider increasing shimTimeSpan, or loosening precision, if test fails transiently in different environments.
+        watch.Elapsed.Should().BeCloseTo(shimTimeSpan, precision: TimeSpan.FromMilliseconds(shimTimeSpan.TotalMilliseconds / 2));  // Consider increasing shimTimeSpan, or loosening precision, if test fails transiently in different environments.
     }
 
     [Fact]