diff --git a/src/MockHttp/Extensions/IRespondsExtensions.cs b/src/MockHttp/Extensions/IRespondsExtensions.cs index a2db86d6..b38a0ce8 100644 --- 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 ProduceResponseAsync(MockHttpRequestContext req } } } -#nullable restore diff --git a/test/MockHttp.Testing/DelegateTestCase.cs b/test/MockHttp.Testing/DelegateTestCase.cs index d9c1603e..adb8dc9b 100644 --- a/test/MockHttp.Testing/DelegateTestCase.cs +++ b/test/MockHttp.Testing/DelegateTestCase.cs @@ -2,7 +2,7 @@ namespace MockHttp; -public class DelegateTestCase : List +public class DelegateTestCase : List { public string Name { get; } public Delegate Delegate { get; } @@ -15,7 +15,7 @@ private DelegateTestCase(Delegate @delegate) Add(@delegate); } - public IEnumerable GetNullArgumentTestCases(bool withoutName = false) + public IEnumerable GetNullArgumentTestCases(bool withoutName = false) { const int paramOffset = 2; MethodInfo methodInfo = Delegate.GetMethodInfo(); @@ -37,7 +37,7 @@ public IEnumerable GetNullArgumentTestCases(bool withoutName = false) } // Set value for current case to null. - var testCase = new List(this) { [i] = null! }; + var testCase = new List(this) { [i] = null }; // Insert current parameter name. testCase.Insert(paramOffset, parameter.Name!); @@ -46,7 +46,7 @@ public IEnumerable 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 index e866b068..f624665c 100644 --- 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 TestCases() + public static IEnumerable TestCases() { var streamMock = new Mock { CallBase = true }; streamMock.SetReturnsDefault(true); @@ -243,4 +243,3 @@ public Task ProduceResponseAsync(MockHttpRequestContext req } } } -#nullable restore diff --git a/test/MockHttp.Tests/Extensions/ListExtensionsTests.cs b/test/MockHttp.Tests/Extensions/ListExtensionsTests.cs index 361ffa8a..e2da9899 100644 --- 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 index 9c2a288a..38469b12 100644 --- 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 index 342d65e2..2f4c048b 100644 --- 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 TestCases() + public static IEnumerable TestCases() { var streamMock = new Mock { 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 index 921673ff..0714855d 100644 --- 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 index 9c8a7c39..80d03843 100644 --- 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 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 index d607b18b..20248a03 100644 --- 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 index de6c903e..9495e2e4 100644 --- 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 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 index b102ba10..7cac2a51 100644 --- 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 index 5e5615fc..45e9da86 100644 --- 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 index 6dda9a8a..8376b675 100644 --- 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 index 3c711a66..cda70dee 100644 --- 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 index 4f29a0a0..880145ea 100644 --- 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 index 48061217..0079b01f 100644 --- 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 index 0506efb0..3ffe9beb 100644 --- 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 index cde72336..f9bfdfde 100644 --- 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 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 index 27a81f7f..37c4fa16 100644 --- 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 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 index a3938773..5a99a307 100644 --- 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 index c300eadf..2d717aff 100644 --- 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 index 40b3f560..e38f23f3 100644 --- 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 index 118a0d1b..88ce92ea 100644 --- 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 index e9b9581a..c2ba3a63 100644 --- 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 $"Hello"; } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/LinqToXmlBodyWithIndentationSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/LinqToXmlBodyWithIndentationSpec.cs index 8229154e..3f6b3afb 100644 --- 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() + ""; } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/NullBuilderTests.cs b/test/MockHttp.Tests/Language/Flow/Response/NullBuilderTests.cs index 829c102f..881cd092 100644 --- 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 TestCases() + public static IEnumerable TestCases() { var responseBuilderImpl = new ResponseBuilder(); IResponseBuilder responseBuilder = Mock.Of(); @@ -134,6 +133,7 @@ public static IEnumerable TestCases() DelegateTestCase.Create( ResponseBuilderExtensions.Latency, responseBuilder, + // ReSharper disable once ConvertClosureToMethodGroup () => NetworkLatency.FourG() ), DelegateTestCase.Create( @@ -147,4 +147,3 @@ public static IEnumerable 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 index c0c6b84e..27181136 100644 --- 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 index 66e1b0e7..deadf112 100644 --- 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 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 index 9afdc0e4..61385aa0 100644 --- 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 act) .WithParameterName("offset"); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutSpec.cs index 8bdc0f98..b9eddb04 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics; +using System.Diagnostics; using System.Net; using MockHttp.Specs; @@ -35,4 +34,3 @@ protected override Task Should(HttpResponseMessage response) return Task.CompletedTask; } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithNullTimeSpanSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithNullTimeSpanSpec.cs index 005c15f1..103aa32d 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithNullTimeSpanSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithNullTimeSpanSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace MockHttp.Language.Flow.Response; +namespace MockHttp.Language.Flow.Response; public class ServerTimeoutWithNullTimeSpanSpec : ServerTimeoutSpec { @@ -8,4 +7,3 @@ public ServerTimeoutWithNullTimeSpanSpec() { } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithOutOfRangeTimeSpanSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithOutOfRangeTimeSpanSpec.cs index a4cc8d7b..fb30c540 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithOutOfRangeTimeSpanSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithOutOfRangeTimeSpanSpec.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 act) .WithParameterName("timeoutAfter"); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithZeroTimeSpanSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithZeroTimeSpanSpec.cs index 6c12c33e..7f77bce1 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithZeroTimeSpanSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/ServerTimeoutWithZeroTimeSpanSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace MockHttp.Language.Flow.Response; +namespace MockHttp.Language.Flow.Response; public class ServerTimeoutWithZeroTimeSpanSpec : ServerTimeoutSpec { @@ -8,4 +7,3 @@ public ServerTimeoutWithZeroTimeSpanSpec() { } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StatusCodeOutOfRangeSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/StatusCodeOutOfRangeSpec.cs index 8c00f794..ad9b32e4 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StatusCodeOutOfRangeSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StatusCodeOutOfRangeSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Net; +using System.Net; using MockHttp.Specs; namespace MockHttp.Language.Flow.Response; @@ -33,4 +32,3 @@ protected override Task ShouldThrow(Func act) .WithParameterName("statusCode"); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StatusCodeSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/StatusCodeSpec.cs index e13d0cf8..c5716053 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StatusCodeSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StatusCodeSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Net; +using System.Net; using MockHttp.Specs; namespace MockHttp.Language.Flow.Response; @@ -31,4 +30,3 @@ protected override Task Should(HttpResponseMessage response) return Task.CompletedTask; } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StatusCodeWithReasonPhrase.cs b/test/MockHttp.Tests/Language/Flow/Response/StatusCodeWithReasonPhrase.cs index afb3086b..9f895d07 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StatusCodeWithReasonPhrase.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StatusCodeWithReasonPhrase.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Net; +using System.Net; using MockHttp.Specs; namespace MockHttp.Language.Flow.Response; @@ -33,4 +32,3 @@ protected override Task Should(HttpResponseMessage response) return Task.CompletedTask; } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StatusCodeWithStringBodySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/StatusCodeWithStringBodySpec.cs index 0037bb34..fa9ec4c8 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StatusCodeWithStringBodySpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StatusCodeWithStringBodySpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Net; +using System.Net; using MockHttp.FluentAssertions; using MockHttp.Specs; @@ -20,4 +19,3 @@ protected override Task Should(HttpResponseMessage response) .And.HaveContentAsync("my text"); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StreamBodyCannotReadSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/StreamBodyCannotReadSpec.cs index 0096b076..c4b3e84f 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StreamBodyCannotReadSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StreamBodyCannotReadSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using MockHttp.Specs; +using MockHttp.Specs; namespace MockHttp.Language.Flow.Response; @@ -26,4 +25,3 @@ await act.Should() _streamMock.Verify(); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StreamBodyCannotSeekSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/StreamBodyCannotSeekSpec.cs index 8635eda6..ccae9b92 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StreamBodyCannotSeekSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StreamBodyCannotSeekSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace MockHttp.Language.Flow.Response; +namespace MockHttp.Language.Flow.Response; public class StreamBodyCannotSeekSpec : StreamBodySpec { @@ -26,4 +25,3 @@ public override Task DisposeAsync() return base.DisposeAsync(); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StreamBodySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/StreamBodySpec.cs index 74a2ce7e..02586575 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StreamBodySpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StreamBodySpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using MockHttp.FluentAssertions; +using MockHttp.FluentAssertions; using MockHttp.Http; namespace MockHttp.Language.Flow.Response; @@ -34,4 +33,3 @@ public override Task DisposeAsync() return base.DisposeAsync(); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StringBodySpec.cs b/test/MockHttp.Tests/Language/Flow/Response/StringBodySpec.cs index c42f08cb..9470c5a0 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StringBodySpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StringBodySpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Text; +using System.Text; using MockHttp.FluentAssertions; using MockHttp.Http; using MockHttp.Specs; @@ -21,4 +20,3 @@ protected override Task Should(HttpResponseMessage response) .And.HaveContentAsync("my text"); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/StringBodyWithEncodingSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/StringBodyWithEncodingSpec.cs index fa1f2a3a..e32446f6 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/StringBodyWithEncodingSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/StringBodyWithEncodingSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Text; +using System.Text; using MockHttp.FluentAssertions; using MockHttp.Http; using MockHttp.Specs; @@ -21,4 +20,3 @@ protected override Task Should(HttpResponseMessage response) .And.HaveContentAsync("my text", Encoding.Unicode); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/TransferRateSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/TransferRateSpec.cs index 786ecd56..e7401029 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/TransferRateSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/TransferRateSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics; +using System.Diagnostics; using System.Net; using MockHttp.IO; using MockHttp.Specs; @@ -33,4 +32,3 @@ protected override async Task Should(HttpResponseMessage response) responseContent.Should().BeEquivalentTo(_content, opts => opts.WithStrictOrdering()); } } -#nullable restore diff --git a/test/MockHttp.Tests/Language/Flow/Response/TransferRateWithNonSeekableStreamSpec.cs b/test/MockHttp.Tests/Language/Flow/Response/TransferRateWithNonSeekableStreamSpec.cs index c4a56cdd..06f4f5a5 100644 --- a/test/MockHttp.Tests/Language/Flow/Response/TransferRateWithNonSeekableStreamSpec.cs +++ b/test/MockHttp.Tests/Language/Flow/Response/TransferRateWithNonSeekableStreamSpec.cs @@ -1,5 +1,4 @@ -#nullable enable -using MockHttp.IO; +using MockHttp.IO; using MockHttp.Specs; namespace MockHttp.Language.Flow.Response; @@ -32,4 +31,3 @@ await act.Should() .WithMessage("Cannot use a rate limited stream that is not seekable.*"); } } -#nullable restore diff --git a/test/MockHttp.Tests/Matchers/FormDataMatcherTests.cs b/test/MockHttp.Tests/Matchers/FormDataMatcherTests.cs index a68d7706..ffde4f22 100644 --- a/test/MockHttp.Tests/Matchers/FormDataMatcherTests.cs +++ b/test/MockHttp.Tests/Matchers/FormDataMatcherTests.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Net.Http.Headers; +using System.Net.Http.Headers; using System.Text; using MockHttp.Http; using MockHttp.Responses; @@ -213,4 +212,3 @@ public async Task Given_that_content_is_not_formData_when_matching_it_should_ret yield return new object[] { new ByteArrayContent(Array.Empty()) }; } } -#nullable restore diff --git a/test/MockHttp.Tests/MockHttpHandlerTests.cs b/test/MockHttp.Tests/MockHttpHandlerTests.cs index e0f8273d..bce5bae8 100644 --- a/test/MockHttp.Tests/MockHttpHandlerTests.cs +++ b/test/MockHttp.Tests/MockHttpHandlerTests.cs @@ -642,7 +642,7 @@ public void Given_null_argument_when_executing_method_it_should_throw(params obj NullArgumentTest.Execute(args); } - public static IEnumerable TestCases() + public static IEnumerable TestCases() { var mockHttp = new MockHttpHandler(); #pragma warning disable IDE0039 diff --git a/test/MockHttp.Tests/RateLimitedStreamTests.cs b/test/MockHttp.Tests/RateLimitedStreamTests.cs index d5fd1f67..3059add7 100644 --- a/test/MockHttp.Tests/RateLimitedStreamTests.cs +++ b/test/MockHttp.Tests/RateLimitedStreamTests.cs @@ -1,5 +1,4 @@ -#nullable enable -using System.Diagnostics; +using System.Diagnostics; using MockHttp.IO; using Xunit.Abstractions; @@ -168,8 +167,9 @@ public void When_flushing_it_should_flush_underlying() public void Dispose() { + // ReSharper disable ConditionalAccessQualifierIsNonNullableAccordingToAPIContract _actualStream?.Dispose(); _sut?.Dispose(); + // ReSharper restore ConditionalAccessQualifierIsNonNullableAccordingToAPIContract } } -#nullable restore