style: remove unused nullable analysis hint

skwasjer · Jan 2, 2023 · 45d1bc6 · 45d1bc6
1 parent e9049e9
commit 45d1bc6
Show file tree

Hide file tree

Showing 47 changed files with 54 additions and 139 deletions.
diff --git a/src/MockHttp/Extensions/IRespondsExtensions.cs b/src/MockHttp/Extensions/IRespondsExtensions.cs
@@ -1,6 +1,4 @@
-#nullable disable
-using MockHttp.Http;
-using MockHttp.Language;
+using MockHttp.Language;
 using MockHttp.Language.Flow;
 using MockHttp.Language.Flow.Response;
 using MockHttp.Responses;
@@ -140,4 +138,3 @@ public Task<HttpResponseMessage> ProduceResponseAsync(MockHttpRequestContext req
         }
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Testing/DelegateTestCase.cs b/test/MockHttp.Testing/DelegateTestCase.cs
@@ -2,7 +2,7 @@
 
 namespace MockHttp;
 
-public class DelegateTestCase : List<object>
+public class DelegateTestCase : List<object?>
 {
     public string Name { get; }
     public Delegate Delegate { get; }
@@ -15,7 +15,7 @@ private DelegateTestCase(Delegate @delegate)
         Add(@delegate);
     }
 
-    public IEnumerable<object[]> GetNullArgumentTestCases(bool withoutName = false)
+    public IEnumerable<object?[]> GetNullArgumentTestCases(bool withoutName = false)
     {
         const int paramOffset = 2;
         MethodInfo methodInfo = Delegate.GetMethodInfo();
@@ -37,7 +37,7 @@ public IEnumerable<object[]> GetNullArgumentTestCases(bool withoutName = false)
             }
 
             // Set value for current case to null.
-            var testCase = new List<object>(this) { [i] = null! };
+            var testCase = new List<object?>(this) { [i] = null };
 
             // Insert current parameter name.
             testCase.Insert(paramOffset, parameter.Name!);
@@ -46,7 +46,7 @@ public IEnumerable<object[]> GetNullArgumentTestCases(bool withoutName = false)
         }
     }
 
-    public object[] WithoutName()
+    public object?[] WithoutName()
     {
         return this.Skip(1).ToArray();
     }

diff --git a/test/MockHttp.Tests/Extensions/IRespondsExtensionsTests.cs b/test/MockHttp.Tests/Extensions/IRespondsExtensionsTests.cs
@@ -197,7 +197,7 @@ public void Given_null_argument_when_executing_method_it_should_throw(params obj
             NullArgumentTest.Execute(args);
         }
 
-        public static IEnumerable<object[]> TestCases()
+        public static IEnumerable<object?[]> TestCases()
         {
             var streamMock = new Mock<Stream> { CallBase = true };
             streamMock.SetReturnsDefault(true);
@@ -243,4 +243,3 @@ public Task<HttpResponseMessage> ProduceResponseAsync(MockHttpRequestContext req
         }
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Extensions/ListExtensionsTests.cs b/test/MockHttp.Tests/Extensions/ListExtensionsTests.cs
@@ -1,5 +1,4 @@
-#nullable enable
-namespace MockHttp.Extensions;
+namespace MockHttp.Extensions;
 
 public static class ListExtensionsTests
 {
@@ -162,4 +161,3 @@ public void Given_that_list_is_empty_when_replacing_it_should_just_add()
         }
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Extensions/NameValueCollectionExtensionsTests.cs b/test/MockHttp.Tests/Extensions/NameValueCollectionExtensionsTests.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 
 namespace MockHttp.Extensions;
 
@@ -42,4 +41,3 @@ public void Given_nameValueCollection_when_getting_as_enumerable_should_succeed(
         actual.Should().BeEquivalentTo(expectedKeyValuePairs);
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Extensions/RequestMatchingExtensionsTests.cs b/test/MockHttp.Tests/Extensions/RequestMatchingExtensionsTests.cs
@@ -677,7 +677,7 @@ public void Given_null_argument_when_executing_method_it_should_throw(params obj
             NullArgumentTest.Execute(args);
         }
 
-        public static IEnumerable<object[]> TestCases()
+        public static IEnumerable<object?[]> TestCases()
         {
             var streamMock = new Mock<Stream> { CallBase = true };
             streamMock.SetReturnsDefault(true);

diff --git a/test/MockHttp.Tests/Language/Flow/Response/ByteBodySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ByteBodySpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.FluentAssertions;
+using MockHttp.FluentAssertions;
 using MockHttp.Http;
 using MockHttp.Specs;
 
@@ -22,4 +21,3 @@ protected override Task Should(HttpResponseMessage response)
             .And.HaveContentAsync(Content);
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/ClientTimeoutSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ClientTimeoutSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Diagnostics;
+using System.Diagnostics;
 using MockHttp.Specs;
 
 namespace MockHttp.Language.Flow.Response;
@@ -33,4 +32,3 @@ protected override async Task ShouldThrow(Func<Task> act)
         _stopwatch.Elapsed.Should().BeGreaterThanOrEqualTo(TimeoutAfter ?? TimeSpan.Zero);
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/ClientTimeoutWithNullTimeSpanSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ClientTimeoutWithNullTimeSpanSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-namespace MockHttp.Language.Flow.Response;
+namespace MockHttp.Language.Flow.Response;
 
 public class ClientTimeoutWithNullTimeSpanSpec : ClientTimeoutSpec
 {
@@ -8,4 +7,3 @@ public ClientTimeoutWithNullTimeSpanSpec()
     {
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/ClientTimeoutWithOutOfRangeTimeSpanSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ClientTimeoutWithOutOfRangeTimeSpanSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.Specs;
+using MockHttp.Specs;
 
 namespace MockHttp.Language.Flow.Response;
 
@@ -17,4 +16,3 @@ protected override Task ShouldThrow(Func<Task> act)
             .WithParameterName("timeoutAfter");
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/ClientTimeoutWithZeroTimeSpanSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ClientTimeoutWithZeroTimeSpanSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-namespace MockHttp.Language.Flow.Response;
+namespace MockHttp.Language.Flow.Response;
 
 public class ClientTimeoutWithZeroTimeSpanSpec : ClientTimeoutSpec
 {
@@ -8,4 +7,3 @@ public ClientTimeoutWithZeroTimeSpanSpec()
     {
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/ContentTypeWithEncodingSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ContentTypeWithEncodingSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Text;
+using System.Text;
 using MockHttp.FluentAssertions;
 using MockHttp.Http;
 using MockHttp.Specs;
@@ -20,4 +19,3 @@ protected override Task Should(HttpResponseMessage response)
         return Task.CompletedTask;
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/ContentTypeWithWebEncodingSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ContentTypeWithWebEncodingSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.FluentAssertions;
+using MockHttp.FluentAssertions;
 using MockHttp.Http;
 using MockHttp.Specs;
 
@@ -19,4 +18,3 @@ protected override Task Should(HttpResponseMessage response)
         return Task.CompletedTask;
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/ContentTypeWithoutEncodingSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ContentTypeWithoutEncodingSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.FluentAssertions;
+using MockHttp.FluentAssertions;
 using MockHttp.Http;
 using MockHttp.Specs;
 
@@ -20,4 +19,3 @@ protected override Task Should(HttpResponseMessage response)
         return Task.CompletedTask;
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/FuncStreamBodyCannotReadSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/FuncStreamBodyCannotReadSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.Specs;
+using MockHttp.Specs;
 
 namespace MockHttp.Language.Flow.Response;
 
@@ -25,4 +24,3 @@ await act.Should()
         _streamMock.Verify();
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/FuncStreamBodySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/FuncStreamBodySpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.FluentAssertions;
+using MockHttp.FluentAssertions;
 using MockHttp.Http;
 
 namespace MockHttp.Language.Flow.Response;
@@ -19,4 +18,3 @@ protected override Task Should(HttpResponseMessage response)
             .And.HaveContentAsync(Content);
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/HeaderSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/HeaderSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Globalization;
+using System.Globalization;
 using MockHttp.FluentAssertions;
 using MockHttp.Specs;
 
@@ -46,4 +45,3 @@ protected override Task Should(HttpResponseMessage response)
         return Task.CompletedTask;
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/HeaderWithoutNameSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/HeaderWithoutNameSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.Specs;
+using MockHttp.Specs;
 
 namespace MockHttp.Language.Flow.Response;
 
@@ -17,4 +16,3 @@ protected override Task ShouldThrow(Func<Task> act)
             .WithParameterName("name");
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/HeaderWithoutValueSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/HeaderWithoutValueSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.Specs;
+using MockHttp.Specs;
 
 namespace MockHttp.Language.Flow.Response;
 
@@ -18,4 +17,3 @@ protected override Task ShouldThrow(Func<Task> act)
             .WithMessage("At least one header must be specified.*");
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/HttpContentBodySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/HttpContentBodySpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.FluentAssertions;
+using MockHttp.FluentAssertions;
 using MockHttp.Specs;
 
 namespace MockHttp.Language.Flow.Response;
@@ -25,4 +24,3 @@ public override Task DisposeAsync()
         return base.DisposeAsync();
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/HttpContentBodyWithCustomHeadersSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/HttpContentBodyWithCustomHeadersSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.FluentAssertions;
+using MockHttp.FluentAssertions;
 
 namespace MockHttp.Language.Flow.Response;
 
@@ -17,4 +16,3 @@ protected override Task Should(HttpResponseMessage response)
         return base.Should(response);
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/LatencySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/LatencySpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Net;
 using MockHttp.Specs;
 
@@ -23,4 +22,3 @@ protected override Task Should(HttpResponseMessage response)
         return Task.CompletedTask;
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/LinqToXmlBodySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/LinqToXmlBodySpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Text;
+using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 using MockHttp.FluentAssertions;
@@ -48,4 +47,3 @@ protected sealed override Task Should(HttpResponseMessage response)
             .And.HaveContentAsync(Encoding.GetString(Encoding.GetPreamble()) + GetExpectedXml(), Encoding);
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/LinqToXmlBodyWithDifferentEncodingSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/LinqToXmlBodyWithDifferentEncodingSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Text;
+using System.Text;
 using System.Xml;
 
 namespace MockHttp.Language.Flow.Response;
@@ -24,4 +23,3 @@ protected override string GetExpectedXml()
         return $"<?xml version=\"1.0\" encoding=\"{Encoding.WebName}\"?><doc><title>Hello</title></doc>";
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/LinqToXmlBodyWithIndentationSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/LinqToXmlBodyWithIndentationSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Xml;
+using System.Xml;
 
 namespace MockHttp.Language.Flow.Response;
 
@@ -21,4 +20,3 @@ protected override string GetExpectedXml()
           + "</doc>";
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/NullBuilderTests.cs b/test/MockHttp.Tests/Language/Flow/Response/NullBuilderTests.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Xml;
 using System.Xml.Linq;
@@ -17,7 +16,7 @@ public void Given_null_argument_when_executing_method_it_should_throw(params obj
             NullArgumentTest.Execute(args);
         }
 
-        public static IEnumerable<object[]> TestCases()
+        public static IEnumerable<object?[]> TestCases()
         {
             var responseBuilderImpl = new ResponseBuilder();
             IResponseBuilder responseBuilder = Mock.Of<IResponseBuilder>();
@@ -134,6 +133,7 @@ public static IEnumerable<object[]> TestCases()
                 DelegateTestCase.Create(
                     ResponseBuilderExtensions.Latency,
                     responseBuilder,
+                    // ReSharper disable once ConvertClosureToMethodGroup
                     () => NetworkLatency.FourG()
                 ),
                 DelegateTestCase.Create(
@@ -147,4 +147,3 @@ public static IEnumerable<object[]> TestCases()
             return testCases.SelectMany(tc => tc.GetNullArgumentTestCases());
         }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/PartialByteBodySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/PartialByteBodySpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.FluentAssertions;
+using MockHttp.FluentAssertions;
 using MockHttp.Http;
 
 namespace MockHttp.Language.Flow.Response;
@@ -19,4 +18,3 @@ protected override Task Should(HttpResponseMessage response)
             .And.HaveContentAsync(new byte[] { 5, 4, 3, 2 });
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/PartialByteBodyWithCountOutOfRangeSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/PartialByteBodyWithCountOutOfRangeSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.Specs;
+using MockHttp.Specs;
 
 namespace MockHttp.Language.Flow.Response;
 
@@ -32,4 +31,3 @@ protected override Task ShouldThrow(Func<Task> act)
             .WithParameterName("count");
     }
 }
-#nullable restore
diff --git a/test/MockHttp.Tests/Language/Flow/Response/PartialByteBodyWithOffsetOutOfRangeSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/PartialByteBodyWithOffsetOutOfRangeSpec.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using MockHttp.Specs;
+using MockHttp.Specs;
 
 namespace MockHttp.Language.Flow.Response;
 
@@ -32,4 +31,3 @@ protected override Task ShouldThrow(Func<Task> act)
             .WithParameterName("offset");
     }
 }
-#nullable restore