diff --git a/Source/Mockolate/Web/HttpClientExtensions.ReturnsAsync.cs b/Source/Mockolate/Web/HttpClientExtensions.ReturnsAsync.cs new file mode 100644 index 00000000..076c4fe6 --- /dev/null +++ b/Source/Mockolate/Web/HttpClientExtensions.ReturnsAsync.cs @@ -0,0 +1,91 @@ +using System.Net; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Mockolate.Setup; + +namespace Mockolate.Web; + +public static partial class HttpClientExtensions +{ + /// + extension(IReturnMethodSetup, HttpRequestMessage, CancellationToken> setup) + { + /// + /// Asynchronously returns a with the given . + /// + public IReturnMethodSetupReturnBuilder, HttpRequestMessage, CancellationToken> + ReturnsAsync(HttpStatusCode statusCode) + => setup.ReturnsAsync(new HttpResponseMessage(statusCode)); + + /// + /// Asynchronously returns a with the given + /// and . + /// + /// + /// Uses default encoding (UTF-8) and default media type ("text/plain") for the content.
+ /// If you need a different encoding, use the overload that takes an .
+ /// If you need a different media type, use the overload that takes an explicit media type. + /// + public IReturnMethodSetupReturnBuilder, HttpRequestMessage, CancellationToken> + ReturnsAsync(HttpStatusCode statusCode, string content) + => setup.ReturnsAsync(new HttpResponseMessage(statusCode) + { + Content = new StringContent(content), + }); + + /// + /// Asynchronously returns a with the given , + /// and . + /// + /// + /// Uses default encoding (UTF-8) for the content.
+ /// If you need a different encoding, use the overload that takes an . + /// + public IReturnMethodSetupReturnBuilder, HttpRequestMessage, CancellationToken> + ReturnsAsync(HttpStatusCode statusCode, string content, string mediaType) + => setup.ReturnsAsync(new HttpResponseMessage(statusCode) + { + Content = new StringContent(content, Encoding.UTF8, mediaType), + }); + + /// + /// Asynchronously returns a with the given + /// and . + /// + public IReturnMethodSetupReturnBuilder, HttpRequestMessage, CancellationToken> + ReturnsAsync(HttpStatusCode statusCode, byte[] bytes) + => setup.ReturnsAsync(new HttpResponseMessage(statusCode) + { + Content = new ByteArrayContent(bytes), + }); + + /// + /// Asynchronously returns a with the given , + /// and . + /// + public IReturnMethodSetupReturnBuilder, HttpRequestMessage, CancellationToken> + ReturnsAsync(HttpStatusCode statusCode, byte[] bytes, string mediaType) + { + ByteArrayContent content = new(bytes); + content.Headers.ContentType = new MediaTypeHeaderValue(mediaType); + return setup.ReturnsAsync(new HttpResponseMessage(statusCode) + { + Content = content, + }); + } + + /// + /// Asynchronously returns a with the given + /// and . + /// + public IReturnMethodSetupReturnBuilder, HttpRequestMessage, CancellationToken> + ReturnsAsync(HttpStatusCode statusCode, HttpContent content) + => setup.ReturnsAsync(new HttpResponseMessage(statusCode) + { + Content = content, + }); + } +} diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs index 4b1e3e1e..282f75cd 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Delete.cs @@ -9,9 +9,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs index 3008922c..1580cad7 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Get.cs @@ -9,9 +9,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs index 6be80c19..58f76fff 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Patch.cs @@ -10,9 +10,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs index 5b6ac660..6e8a7627 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Post.cs @@ -9,9 +9,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs b/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs index 94f75289..f24adff5 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Setup.Put.cs @@ -9,9 +9,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs index b075d633..7ec45c22 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Delete.cs @@ -8,9 +8,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs index 7d78de1d..b812e001 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Get.cs @@ -8,9 +8,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs index 8a4f2159..323307b3 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Patch.cs @@ -9,9 +9,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs index a71e2420..76897647 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Post.cs @@ -8,9 +8,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs b/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs index 69c946bc..ed8600f4 100644 --- a/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs +++ b/Source/Mockolate/Web/HttpClientExtensions.Verify.Put.cs @@ -8,9 +8,6 @@ namespace Mockolate.Web; #pragma warning disable S2325 // Methods and properties that don't access instance data should be static -/// -/// Extensions for mocking . -/// public static partial class HttpClientExtensions { /// diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt index 61f2f114..c0e92b25 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net10.0.txt @@ -1833,6 +1833,15 @@ namespace Mockolate.Web public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } + extension(Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> setup) + { + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, string content) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, string content, string mediaType) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, byte[] bytes) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, byte[] bytes, string mediaType) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, System.Net.Http.HttpContent content) { } + } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt index 481ab96a..7fe675bc 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_net8.0.txt @@ -1832,6 +1832,15 @@ namespace Mockolate.Web public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } + extension(Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> setup) + { + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, string content) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, string content, string mediaType) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, byte[] bytes) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, byte[] bytes, string mediaType) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, System.Net.Http.HttpContent content) { } + } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } diff --git a/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt b/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt index 5acc6777..cae7a720 100644 --- a/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt +++ b/Tests/Mockolate.Api.Tests/Expected/Mockolate_netstandard2.0.txt @@ -1777,6 +1777,15 @@ namespace Mockolate.Web public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } public Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> PutAsync(Mockolate.Parameters.IParameter requestUri, Mockolate.Parameters.IParameter content, Mockolate.Parameters.IParameter cancellationToken) { } } + extension(Mockolate.Setup.IReturnMethodSetup, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> setup) + { + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, string content) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, string content, string mediaType) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, byte[] bytes) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, byte[] bytes, string mediaType) { } + public Mockolate.Setup.IReturnMethodSetupReturnBuilder, System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken> ReturnsAsync(System.Net.HttpStatusCode statusCode, System.Net.Http.HttpContent content) { } + } extension(Mockolate.Verify.IMockVerifyInvokedWithToStringWithEqualsWithGetHashCode verifyInvoked) { public Mockolate.Verify.VerificationResult DeleteAsync(Mockolate.Parameters.IParameter requestUri) { } diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.ReturnsAsyncTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.ReturnsAsyncTests.cs new file mode 100644 index 00000000..6d69dc90 --- /dev/null +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.ReturnsAsyncTests.cs @@ -0,0 +1,137 @@ +using System.Net; +using System.Net.Http; +using System.Text; +using System.Threading; +using Mockolate.Web; + +namespace Mockolate.Tests.Web; + +public sealed partial class HttpClientExtensionsTests +{ + public sealed class ReturnsAsyncTests + { + [Theory] + [InlineData(HttpStatusCode.OK)] + [InlineData(HttpStatusCode.NotFound)] + [InlineData(HttpStatusCode.InternalServerError)] + [InlineData(HttpStatusCode.Forbidden)] + public async Task WithStatusCode_ShouldReturnHttpResponseMessageWithStatusCode(HttpStatusCode statusCode) + { + HttpClient httpClient = Mock.Create(); + httpClient.SetupMock.Method + .GetAsync(It.IsAny()) + .ReturnsAsync(statusCode); + + HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); + + await That(result.StatusCode).IsEqualTo(statusCode); +#if NET8_0_OR_GREATER + await That(result.Content.ReadAsByteArrayAsync()).IsEmpty(); +#else + await That(result.Content).IsNull(); +#endif + } + + [Theory] + [InlineData(HttpStatusCode.OK, "foo")] + [InlineData(HttpStatusCode.NotFound, "bar")] + public async Task WithStatusCodeAndBytes_ShouldReturnHttpResponseMessageWithStatusCodeAndByteArrayContent( + HttpStatusCode statusCode, string stringContent) + { + byte[] bytes = Encoding.UTF8.GetBytes(stringContent); + HttpClient httpClient = Mock.Create(); + httpClient.SetupMock.Method + .GetAsync(It.IsAny()) + .ReturnsAsync(statusCode, bytes); + + HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); + + await That(result.StatusCode).IsEqualTo(statusCode); + await That(result.Content).Is(); + await That(result.Content.ReadAsByteArrayAsync()).IsEqualTo(bytes); + await That(result.Content.Headers.ContentType).IsNull(); + } + + [Theory] + [InlineData(HttpStatusCode.OK, "foo")] + [InlineData(HttpStatusCode.NotFound, "bar")] + public async Task + WithStatusCodeAndHttpContent_ShouldReturnHttpResponseMessageWithStatusCodeAndByteArrayContent( + HttpStatusCode statusCode, string stringContent) + { + byte[] bytes = Encoding.UTF8.GetBytes(stringContent); + ByteArrayContent content = new(bytes); + HttpClient httpClient = Mock.Create(); + httpClient.SetupMock.Method + .GetAsync(It.IsAny()) + .ReturnsAsync(statusCode, content); + + HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); + + await That(result.StatusCode).IsEqualTo(statusCode); + await That(result.Content).Is(); + await That(result.Content.ReadAsStringAsync()).IsEqualTo(stringContent); + await That(result.Content.Headers.ContentType).IsNull(); + } + + [Theory] + [InlineData(HttpStatusCode.OK, "foo")] + [InlineData(HttpStatusCode.NotFound, "bar")] + public async Task WithStatusCodeAndString_ShouldReturnHttpResponseMessageWithStatusCodeAndStringContent( + HttpStatusCode statusCode, string content) + { + HttpClient httpClient = Mock.Create(); + httpClient.SetupMock.Method + .GetAsync(It.IsAny()) + .ReturnsAsync(statusCode, content); + + HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); + + await That(result.StatusCode).IsEqualTo(statusCode); + await That(result.Content).Is(); + await That(result.Content.ReadAsStringAsync()).IsEqualTo(content); + await That(result.Content.Headers.ContentType?.MediaType).IsEqualTo("text/plain"); + } + + [Theory] + [InlineData(HttpStatusCode.OK, "foo", "text/plain")] + [InlineData(HttpStatusCode.NotFound, "bar", "application/json")] + public async Task + WithStatusCodeBytesAndMediaType_ShouldReturnHttpResponseMessageWithStatusCodeAndByteArrayContent( + HttpStatusCode statusCode, string stringContent, string mediaType) + { + byte[] bytes = Encoding.UTF8.GetBytes(stringContent); + HttpClient httpClient = Mock.Create(); + httpClient.SetupMock.Method + .GetAsync(It.IsAny()) + .ReturnsAsync(statusCode, bytes, mediaType); + + HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); + + await That(result.StatusCode).IsEqualTo(statusCode); + await That(result.Content).Is(); + await That(result.Content.ReadAsByteArrayAsync()).IsEqualTo(bytes); + await That(result.Content.Headers.ContentType?.MediaType).IsEqualTo(mediaType); + } + + [Theory] + [InlineData(HttpStatusCode.OK, "foo", "text/plain")] + [InlineData(HttpStatusCode.NotFound, "bar", "application/json")] + public async Task + WithStatusCodeStringContentAndMediaType_ShouldReturnHttpResponseMessageWithStatusCodeAndStringContent( + HttpStatusCode statusCode, string content, string mediaType) + { + HttpClient httpClient = Mock.Create(); + httpClient.SetupMock.Method + .GetAsync(It.IsAny()) + .ReturnsAsync(statusCode, content, mediaType); + + HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); + + await That(result.StatusCode).IsEqualTo(statusCode); + await That(result.Content).Is(); + await That(result.Content.ReadAsStringAsync()).IsEqualTo(content); + await That(result.Content.Headers.ContentType?.MediaType).IsEqualTo(mediaType); + } + } +} diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.DeleteTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.DeleteTests.cs index e55ecee3..ec724a48 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.DeleteTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.DeleteTests.cs @@ -22,7 +22,7 @@ public async Task StringUri_ShouldVerifyHttpMethod(string method, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .DeleteAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -42,7 +42,7 @@ public async Task StringUri_ShouldVerifyUriString(string pattern, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .DeleteAsync(It.Matches(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.DeleteAsync("https://www.aweXpect.com", CancellationToken.None); @@ -61,7 +61,7 @@ public async Task StringUri_WithCancellationToken_ShouldVerifyCancellationToken( .DeleteAsync( It.Matches("*aweXpect.com*"), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.DeleteAsync("https://www.aweXpect.com", CancellationToken.None); @@ -79,7 +79,7 @@ void Act() { httpClient.SetupMock.Method .DeleteAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() @@ -97,7 +97,7 @@ public async Task Uri_ShouldVerifyHttpMethod(string method, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .DeleteAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -117,7 +117,7 @@ public async Task Uri_ShouldVerifyUri(string pattern, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .DeleteAsync(It.IsUri(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.DeleteAsync("https://www.aweXpect.com", CancellationToken.None); @@ -136,7 +136,7 @@ public async Task Uri_WithCancellationToken_ShouldVerifyCancellationToken(bool t .DeleteAsync( It.IsUri("*aweXpect.com*"), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.DeleteAsync("https://www.aweXpect.com", CancellationToken.None); @@ -154,7 +154,7 @@ void Act() { httpClient.SetupMock.Method .DeleteAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.GetTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.GetTests.cs index 650bf122..87dda3af 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.GetTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.GetTests.cs @@ -22,7 +22,7 @@ public async Task StringUri_ShouldVerifyHttpMethod(string method, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -42,7 +42,7 @@ public async Task StringUri_ShouldVerifyUriString(string pattern, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.Matches(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); @@ -61,7 +61,7 @@ public async Task StringUri_WithCancellationToken_ShouldVerifyCancellationToken( .GetAsync( It.Matches("*aweXpect.com*"), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); @@ -79,7 +79,7 @@ void Act() { httpClient.SetupMock.Method .GetAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() @@ -97,7 +97,7 @@ public async Task Uri_ShouldVerifyHttpMethod(string method, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -117,7 +117,7 @@ public async Task Uri_ShouldVerifyUri(string pattern, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); @@ -136,7 +136,7 @@ public async Task Uri_WithCancellationToken_ShouldVerifyCancellationToken(bool t .GetAsync( It.IsUri("*aweXpect.com*"), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); @@ -154,7 +154,7 @@ void Act() { httpClient.SetupMock.Method .GetAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PatchTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PatchTests.cs index f29f471f..0be3a62f 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PatchTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PatchTests.cs @@ -23,7 +23,7 @@ public async Task StringUri_ShouldVerifyHttpContent(string mediaType, bool expec HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PatchAsync(It.IsAny(), It.IsHttpContent("application/json")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PatchAsync("https://www.aweXpect.com", new StringContent("", Encoding.UTF8, mediaType), @@ -44,7 +44,7 @@ public async Task StringUri_ShouldVerifyHttpMethod(string method, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PatchAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -64,7 +64,7 @@ public async Task StringUri_ShouldVerifyUriString(string pattern, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PatchAsync(It.Matches(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PatchAsync("https://www.aweXpect.com", new StringContent(""), @@ -85,7 +85,7 @@ public async Task StringUri_WithCancellationToken_ShouldVerifyCancellationToken( It.Matches("*aweXpect.com*"), It.IsAny(), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PatchAsync("https://www.aweXpect.com", new StringContent(""), @@ -104,7 +104,7 @@ void Act() { httpClient.SetupMock.Method .PatchAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() @@ -121,7 +121,7 @@ public async Task Uri_ShouldVerifyHttpContent(string mediaType, bool expectSucce HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PatchAsync(It.IsAny(), It.IsHttpContent("application/json")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PatchAsync("https://www.aweXpect.com", new StringContent("", Encoding.UTF8, mediaType), @@ -142,7 +142,7 @@ public async Task Uri_ShouldVerifyHttpMethod(string method, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PatchAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -162,7 +162,7 @@ public async Task Uri_ShouldVerifyUri(string pattern, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PatchAsync(It.IsUri(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PatchAsync("https://www.aweXpect.com", new StringContent(""), @@ -183,7 +183,7 @@ public async Task Uri_WithCancellationToken_ShouldVerifyCancellationToken(bool t It.IsUri("*aweXpect.com*"), It.IsAny(), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PatchAsync("https://www.aweXpect.com", new StringContent(""), @@ -202,7 +202,7 @@ void Act() { httpClient.SetupMock.Method .PatchAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PostTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PostTests.cs index c4aafa29..518cbbac 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PostTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PostTests.cs @@ -22,7 +22,7 @@ public async Task StringUri_ShouldVerifyHttpContent(string mediaType, bool expec HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent("application/json")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent("", Encoding.UTF8, mediaType), @@ -42,7 +42,7 @@ public async Task StringUri_ShouldVerifyHttpMethod(string method, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -62,7 +62,7 @@ public async Task StringUri_ShouldVerifyUriString(string pattern, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.Matches(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -83,7 +83,7 @@ public async Task StringUri_WithCancellationToken_ShouldVerifyCancellationToken( It.Matches("*aweXpect.com*"), It.IsAny(), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -102,7 +102,7 @@ void Act() { httpClient.SetupMock.Method .PostAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() @@ -119,7 +119,7 @@ public async Task Uri_ShouldVerifyHttpContent(string mediaType, bool expectSucce HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent("application/json")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent("", Encoding.UTF8, mediaType), @@ -139,7 +139,7 @@ public async Task Uri_ShouldVerifyHttpMethod(string method, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -159,7 +159,7 @@ public async Task Uri_ShouldVerifyUri(string pattern, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsUri(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -180,7 +180,7 @@ public async Task Uri_WithCancellationToken_ShouldVerifyCancellationToken(bool t It.IsUri("*aweXpect.com*"), It.IsAny(), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -199,7 +199,7 @@ void Act() { httpClient.SetupMock.Method .PostAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PutTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PutTests.cs index 03a165ca..500ed494 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PutTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.Setup.PutTests.cs @@ -22,7 +22,7 @@ public async Task StringUri_ShouldVerifyHttpContent(string mediaType, bool expec HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PutAsync(It.IsAny(), It.IsHttpContent("application/json")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PutAsync("https://www.aweXpect.com", new StringContent("", Encoding.UTF8, mediaType), @@ -42,7 +42,7 @@ public async Task StringUri_ShouldVerifyHttpMethod(string method, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PutAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -62,7 +62,7 @@ public async Task StringUri_ShouldVerifyUriString(string pattern, bool expectSuc HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PutAsync(It.Matches(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PutAsync("https://www.aweXpect.com", new StringContent(""), @@ -83,7 +83,7 @@ public async Task StringUri_WithCancellationToken_ShouldVerifyCancellationToken( It.Matches("*aweXpect.com*"), It.IsAny(), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PutAsync("https://www.aweXpect.com", new StringContent(""), @@ -102,7 +102,7 @@ void Act() { httpClient.SetupMock.Method .PutAsync(It.Matches("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() @@ -119,7 +119,7 @@ public async Task Uri_ShouldVerifyHttpContent(string mediaType, bool expectSucce HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PutAsync(It.IsAny(), It.IsHttpContent("application/json")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PutAsync("https://www.aweXpect.com", new StringContent("", Encoding.UTF8, mediaType), @@ -139,7 +139,7 @@ public async Task Uri_ShouldVerifyHttpMethod(string method, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PutAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.SendAsync( new HttpRequestMessage(new HttpMethod(method), "https://www.aweXpect.com"), @@ -159,7 +159,7 @@ public async Task Uri_ShouldVerifyUri(string pattern, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PutAsync(It.IsUri(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PutAsync("https://www.aweXpect.com", new StringContent(""), @@ -180,7 +180,7 @@ public async Task Uri_WithCancellationToken_ShouldVerifyCancellationToken(bool t It.IsUri("*aweXpect.com*"), It.IsAny(), It.Satisfies(_ => tokenMatches)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PutAsync("https://www.aweXpect.com", new StringContent(""), @@ -199,7 +199,7 @@ void Act() { httpClient.SetupMock.Method .PutAsync(It.IsUri("*aweXpect.com*")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.cs b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.cs index a99df9fd..456e44a8 100644 --- a/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.cs +++ b/Tests/Mockolate.Tests/Web/HttpClientExtensionsTests.cs @@ -18,7 +18,7 @@ public async Task InvalidParameter_ShouldReturnTrue() IReturnMethodSetup, HttpRequestMessage, CancellationToken> setup = httpClient .SetupMock.Method .GetAsync(new InvalidParameter()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); IInteractiveMethodSetup interactiveSetup = (IInteractiveMethodSetup)setup; bool result = interactiveSetup.Matches(new MethodInvocation(0, "System.Net.Http.HttpMessageHandler.SendAsync", @@ -37,7 +37,7 @@ public async Task NullUri_ShouldReturnFalse() IReturnMethodSetup, HttpRequestMessage, CancellationToken> setup = httpClient .SetupMock.Method .GetAsync(It.IsAny()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); IInteractiveMethodSetup interactiveSetup = (IInteractiveMethodSetup)setup; bool result = interactiveSetup.Matches(new MethodInvocation(0, "System.Net.Http.HttpMessageHandler.SendAsync", @@ -58,7 +58,7 @@ void Act() { httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() @@ -75,7 +75,7 @@ public async Task ShouldSupportMonitoring() .GetAsync(It.Matches("*") .Do(_ => callbackCount++) .Monitor(out IParameterMonitor monitor)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); await httpClient.GetAsync("https://www.aweXpect.com/foo", CancellationToken.None); await httpClient.PostAsync("https://www.aweXpect.com/bar", null, CancellationToken.None); @@ -96,7 +96,7 @@ public async Task TrailingSlash_ShouldBeIgnored(string matchPattern) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.Matches(matchPattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); @@ -111,7 +111,7 @@ public async Task TrailingSlash_WhenNotPresent_ShouldNotBeAdded() HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.Matches("*www.aweXpect.com/foo/")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com/foo", CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithBytesTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithBytesTests.cs index 25c35aaf..68c38c13 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithBytesTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithBytesTests.cs @@ -23,7 +23,7 @@ public async Task Predicate_ShouldValidatePredicate(byte[] body, byte expectedFi HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithBytes(b => b.Length > 0 && b[0] == expectedFirstByte)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new ByteArrayContent(body), @@ -44,7 +44,7 @@ public async Task ShouldCheckForEquality(byte[] body, byte[] expected, bool expe HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithBytes(expected)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new ByteArrayContent(body), @@ -61,7 +61,7 @@ public async Task WhenValidatedAndSetup_ShouldResetStreamPosition() HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithBytes(body)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient .PostAsync("https://www.aweXpect.com", new ByteArrayContent(body), CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithFormDataTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithFormDataTests.cs index 844f752b..7ac04ed6 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithFormDataTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithFormDataTests.cs @@ -34,7 +34,7 @@ public async Task Exactly_ShouldOnlyMatchWhenAllParametersAreChecked( HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithFormData(values).Exactly()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); MultipartFormDataContent content = new() { new FormUrlEncodedContent(new List> @@ -60,7 +60,7 @@ public async Task ShouldEncodeValues(string key, string value) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithFormData(key, value)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); MultipartFormDataContent content = new() { new FormUrlEncodedContent(new Dictionary @@ -91,7 +91,7 @@ public async Task WithFormData_ShouldMatchParametersInAnyOrder(params string[] r HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithFormData(values)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); MultipartFormDataContent content = new() { new FormUrlEncodedContent(new Dictionary @@ -130,7 +130,7 @@ public async Task WithFormDataParameter_ShouldVerifyParameters(string key, strin HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithFormData(key, value)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); MultipartFormDataContent content = new() { new FormUrlEncodedContent(new Dictionary @@ -171,7 +171,7 @@ public async Task WithFormDataString_ShouldVerifyParameters(string values, bool HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithFormData(values)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); MultipartFormDataContent content = new() { new FormUrlEncodedContent(new Dictionary diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithHeadersTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithHeadersTests.cs index 1e618f40..0e1c17f5 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithHeadersTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithHeadersTests.cs @@ -20,7 +20,7 @@ public async Task IncludingRequestHeaders_ShouldMatchRequestHeadersFromContentAn httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent() .WithHeaders(("foo", "my-value"), ("Authorization", "Basic abcdef")).IncludingRequestHeaders()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("foo", "my-value"); @@ -39,7 +39,7 @@ public async Task IncludingRequestHeaders_WhenNotSet_ShouldOnlyMatchRequestHeade httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent() .WithHeaders(("foo", "my-value"), ("Authorization", "Basic abcdef"))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("foo", "my-value"); @@ -62,7 +62,7 @@ public async Task MultipleCalls_ShouldVerifyKeyValueHeaders( httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent() .WithHeaders(key1, value1).WithHeaders(key2, value2)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader1", "foo"); content.Headers.Add("x-myHeader2", "bar"); @@ -88,7 +88,7 @@ public async Task MultipleCalls_ShouldVerifyKeyValuePairHeaders( httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent() .WithHeaders((key1, value1)).WithHeaders((key2, value2))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader1", "foo"); content.Headers.Add("x-myHeader2", "bar"); @@ -114,7 +114,7 @@ public async Task MultipleCalls_ShouldVerifyStringHeaders( httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent() .WithHeaders(headers1).WithHeaders(headers2)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader1", "foo"); content.Headers.Add("x-myHeader2", "bar"); @@ -134,7 +134,7 @@ public async Task ShouldOnlyRequireOneMatchingValue() HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithHeaders("x-myHeader", "foo")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader", "foo"); content.Headers.Add("x-myHeader", "bar"); @@ -156,7 +156,7 @@ public async Task ShouldVerifyHeaderKeyCaseInsensitive(string key, bool expectSu HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithHeaders("foo", "my-value")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add(key, "my-value"); @@ -177,7 +177,7 @@ public async Task ShouldVerifyHeaderValueCaseSensitive(string value, bool expect HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithHeaders("x-myHeader", "foo")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader", value); @@ -201,7 +201,7 @@ public async Task ShouldVerifyMultipleHeaderKeyCaseInsensitive(string key, bool .WithHeaders( ("foo", "my-foo-value"), ("bar", "my-bar-value"))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add(key, "my-foo-value"); content.Headers.Add("bar", "my-bar-value"); @@ -227,7 +227,7 @@ public async Task ShouldVerifyMultipleHeaderValueCaseSensitive(string value, boo .WithHeaders( ("x-myHeader1", "foo"), ("x-myHeader2", "bar"))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader1", value); content.Headers.Add("x-myHeader2", "bar"); @@ -260,7 +260,7 @@ public async Task ShouldVerifyStringHeaders(string headers, bool expectSuccess) httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent() .WithHeaders(headers)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader1", "foo"); content.Headers.Add("x-myHeader2", "bar"); @@ -288,7 +288,7 @@ void Act() x-myHeader2 x-myHeader3: baz """)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithMediaTypeTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithMediaTypeTests.cs index bc94fa2c..ba65f733 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithMediaTypeTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithMediaTypeTests.cs @@ -21,7 +21,7 @@ public async Task ShouldVerifyMediaType(string mediaType, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithMediaType("application/json")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent("", Encoding.UTF8, mediaType), diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithStringMatchingTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithStringMatchingTests.cs index ddfc1fa7..c1e75844 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithStringMatchingTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithStringMatchingTests.cs @@ -22,7 +22,7 @@ public async Task AsRegex_IgnoringCase_ShouldCheckForCaseInsensitiveMatchingWild HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithStringMatching(pattern).AsRegex().IgnoringCase()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -41,7 +41,7 @@ public async Task AsRegex_ShouldCheckForMatchingWildcard(string body, string pat HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithStringMatching(pattern).AsRegex()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -58,7 +58,7 @@ public async Task AsRegex_ShouldUseProvidedOptions() httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithStringMatching("F[A-Z]*").AsRegex(RegexOptions.IgnoreCase)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent("foo"), @@ -74,7 +74,7 @@ public async Task AsRegex_ShouldUseTimeout() httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithStringMatching("F[A-Z]*").AsRegex(timeout: TimeSpan.FromSeconds(0))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); Task Act() { @@ -101,7 +101,7 @@ public async Task IgnoringCase_ShouldCheckForCaseInsensitiveMatchingWildcard( HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithStringMatching(pattern).IgnoringCase()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -123,7 +123,7 @@ public async Task ShouldCheckForMatchingWildcard(string body, string pattern, bo HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithStringMatching(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithStringTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithStringTests.cs index 31c21c45..e0f421cf 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithStringTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.WithStringTests.cs @@ -26,7 +26,7 @@ public async Task IgnoringCase_ShouldCheckForCaseInsensitiveEquality(string body HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithString(expected).IgnoringCase()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -48,7 +48,7 @@ public async Task Predicate_ShouldValidatePredicate(string content, bool expectS httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent() .WithString(c => c.Equals(c.ToLowerInvariant(), StringComparison.Ordinal))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(content), @@ -69,7 +69,7 @@ public async Task ShouldCheckForEquality(string body, string expected, HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithString(expected)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -87,7 +87,7 @@ public async Task ShouldNotCheckHttpContentType() HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithString("foo")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new ByteArrayContent(bytes), @@ -135,7 +135,7 @@ public async Task ShouldVerifyMediaType(string mediaType, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithStringMatching("*").WithMediaType(mediaType)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new("foo", Encoding.UTF8, "text/plain"); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", @@ -156,7 +156,7 @@ public async Task WhenCharsetHeaderIsNotSet_ShouldFallbackToUtf8() HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithString(original)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new(bytes); HttpResponseMessage result = await httpClient.PostAsync( @@ -181,7 +181,7 @@ public async Task WhenCharsetHeaderIsSet_ShouldApplyEncodingCorrectly( HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithString(original)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new(bytes); content.Headers.Add("Content-Type", $"text/plain; charset={charsetHeader}"); @@ -198,7 +198,7 @@ public async Task WhenValidatedAndSetup_ShouldResetStreamPosition() HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithString("foo")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient .PostAsync("https://www.aweXpect.com", new StringContent("foo"), CancellationToken.None); @@ -220,7 +220,7 @@ public async Task WithInvalidCharsetHeader_ShouldFallbackToUtf8(string charsetHe HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithString(original)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new(bytes); content.Headers.ContentType = new MediaTypeHeaderValue("text/plain") { diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.cs index 07925b78..cc3c9642 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpContentTests.cs @@ -53,7 +53,7 @@ public async Task ShouldSupportMultipleCombinations() .WithStringMatching("*") .WithString("foo") .WithBytes(b => b.Length == 3)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new(bytes); content.Headers.Add("x-my-header", "my-value"); @@ -73,7 +73,7 @@ public async Task ShouldSupportWithHeadersInWrapper() .PostAsync(It.IsAny(), It.IsHttpContent() .WithStringMatching("*") .WithHeaders("x-my-header", "my-value")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new(bytes); content.Headers.Add("x-my-header", "my-value"); @@ -93,7 +93,7 @@ public async Task ShouldVerifyMediaType(string mediaType, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent("image/png")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new([]); content.Headers.ContentType = new MediaTypeHeaderValue(mediaType); @@ -114,7 +114,7 @@ public async Task WithMediaType_ShouldVerifyMediaType(string mediaType, bool exp HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .PostAsync(It.IsAny(), It.IsHttpContent().WithMediaType("image/png")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new([]); content.Headers.ContentType = new MediaTypeHeaderValue(mediaType); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WhoseContentIsTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WhoseContentIsTests.cs index 1b1ae910..88e8cce9 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WhoseContentIsTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WhoseContentIsTests.cs @@ -22,7 +22,7 @@ public async Task ShouldNotCheckHttpContentType() HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c.WithString("foo"))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new ByteArrayContent(bytes), @@ -40,7 +40,7 @@ public async Task ShouldVerifyMediaType(string mediaType, bool expectSuccess) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs("image/png")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new([]); content.Headers.ContentType = new MediaTypeHeaderValue(mediaType); @@ -61,7 +61,7 @@ public async Task ShouldVerifyMediaTypeAndContent(string mediaType, string value HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(mediaType, c => c.WithString(value))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new("foo", Encoding.UTF8, "text/plain"); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", @@ -85,7 +85,7 @@ public async Task WithBytes_Predicate_ShouldValidatePredicate( HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c.WithBytes(b => b.Length > 0 && b[0] == expectedFirstByte))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new ByteArrayContent(body), @@ -106,7 +106,7 @@ public async Task WithBytes_ShouldCheckForEquality(byte[] body, byte[] expected, HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c.WithBytes(expected))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new ByteArrayContent(body), @@ -125,7 +125,7 @@ public async Task WithMediaType_ShouldVerifyMediaType(string mediaType, bool exp HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c.WithMediaType("image/png"))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); ByteArrayContent content = new([]); content.Headers.ContentType = new MediaTypeHeaderValue(mediaType); @@ -147,7 +147,7 @@ public async Task WithString_IgnoringCase_ShouldCheckForCaseInsensitiveEquality( HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c.WithString(expected).IgnoringCase())) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -169,7 +169,7 @@ public async Task WithString_Predicate_ShouldValidatePredicate(string content, b httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c .WithString(v => v.Equals(v.ToLowerInvariant(), StringComparison.Ordinal)))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(content), @@ -189,7 +189,7 @@ public async Task WithString_ShouldCheckForEquality(string body, string expected HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c.WithString(expected))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -211,7 +211,7 @@ public async Task httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage() .WhoseContentIs(c => c.WithStringMatching(pattern).AsRegex().IgnoringCase())) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -232,7 +232,7 @@ public async Task WithStringMatching_AsRegex_ShouldCheckForMatchingWildcard( httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage() .WhoseContentIs(c => c.WithStringMatching(pattern).AsRegex())) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -249,7 +249,7 @@ public async Task WithStringMatching_AsRegex_ShouldUseProvidedOptions() httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c .WithStringMatching("F[A-Z]*").AsRegex(RegexOptions.IgnoreCase))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent("foo"), @@ -265,7 +265,7 @@ public async Task WithStringMatching_AsRegex_ShouldUseTimeout() httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c .WithStringMatching("F[A-Z]*").AsRegex(timeout: TimeSpan.FromSeconds(0)))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); Task Act() { @@ -293,7 +293,7 @@ public async Task WithStringMatching_IgnoringCase_ShouldCheckForCaseInsensitiveM httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c .WithStringMatching(pattern).IgnoringCase())) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), @@ -317,7 +317,7 @@ public async Task WithStringMatching_ShouldCheckForMatchingWildcard( httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseContentIs(c => c .WithStringMatching(pattern))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(body), diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WhoseUriIsTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WhoseUriIsTests.cs index 4204f883..1dc26997 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WhoseUriIsTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WhoseUriIsTests.cs @@ -19,7 +19,7 @@ public async Task ShouldSupportPatternWithUriConfiguration(string uri, bool expe HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseUriIs("*awexpect*", u => u.ForHttps())) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); @@ -35,7 +35,7 @@ public async Task ShouldSupportUriConfiguration(string uri, bool expectMatch) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseUriIs(u => u.ForHttps())) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); @@ -63,7 +63,7 @@ public async Task ShouldVerifyFullUriWithWildcardMatch(string uri, string patter HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WhoseUriIs(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); @@ -80,7 +80,7 @@ public async Task TrailingSlash_ShouldBeIgnored(string matchPattern) httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage() .WhoseUriIs(matchPattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); @@ -96,7 +96,7 @@ public async Task TrailingSlash_WhenNotPresent_ShouldNotBeAdded() httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage() .WhoseUriIs("*www.aweXpect.com/foo/")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com/foo", CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WithHeadersTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WithHeadersTests.cs index 05ad566e..bb6de162 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WithHeadersTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.WithHeadersTests.cs @@ -26,7 +26,7 @@ public async Task MultipleCalls_ShouldVerifyKeyValueHeaders( httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage() .WithHeaders(key1, value1).WithHeaders(key2, value2)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader", "foo"); @@ -52,7 +52,7 @@ public async Task MultipleCalls_ShouldVerifyKeyValuePairHeaders( httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage() .WithHeaders((key1, value1)).WithHeaders((key2, value2))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader", "foo"); @@ -78,7 +78,7 @@ public async Task MultipleCalls_ShouldVerifyStringHeaders( httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage() .WithHeaders(headers1).WithHeaders(headers2)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader", "foo"); @@ -103,7 +103,7 @@ public async Task ShouldAlsoMatchContentHeaders() Authorization : Basic abcdef x-myHeader3: baz """)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); StringContent content = new(""); content.Headers.Add("x-myHeader1", "foo"); content.Headers.Add("x-myHeader2", "bar"); @@ -128,7 +128,7 @@ public async Task ShouldMatchAgainstDefaultRequestHeaders() Authorization: Basic abcdef Accept: application/json """)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -148,7 +148,7 @@ public async Task ShouldVerifyHeaderKeyCaseInsensitive(string key, bool expectSu httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WithHeaders(key, "Basic abcdef")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -169,7 +169,7 @@ public async Task ShouldVerifyHeaderValueCaseSensitive(string value, bool expect httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage().WithHeaders("Authorization", $"Basic {value}")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -193,7 +193,7 @@ public async Task ShouldVerifyMultipleHeaderKeyCaseInsensitive(string key, bool .WithHeaders( (key, "Basic foo"), ("Accept", "application/json"))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -217,7 +217,7 @@ public async Task ShouldVerifyMultipleHeaderValueCaseSensitive(string value, boo .WithHeaders( ("Authorization", "Basic foo"), ("Accept", "application/json"))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.PostAsync("https://www.aweXpect.com", new StringContent(""), @@ -241,7 +241,7 @@ void Act() x-myHeader2 x-myHeader3: baz """)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); } await That(Act).Throws() diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.cs index 5b3f34a3..faa5b916 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsHttpRequestMessageTests.cs @@ -51,7 +51,7 @@ public async Task WithMethod_ShouldVerifyMethod(string method, bool expectSucces HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .SendAsync(It.IsHttpRequestMessage(new HttpMethod(method))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.ForHttpAndHttpsTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.ForHttpAndHttpsTests.cs index c6e6d6f6..29cdb75b 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.ForHttpAndHttpsTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.ForHttpAndHttpsTests.cs @@ -20,7 +20,7 @@ public async Task ForHttp_ShouldVerifyHttpScheme(string uri, bool expectMatch) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().ForHttp()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); @@ -37,7 +37,7 @@ public async Task ForHttps_ShouldVerifyHttpsScheme(string uri, bool expectMatch) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().ForHttps()) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithHostTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithHostTests.cs index f16a84c0..f055dfbc 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithHostTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithHostTests.cs @@ -21,7 +21,7 @@ public async Task ShouldVerifyHost(string uri, string hostPattern, bool expectMa HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithHost(hostPattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithPathTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithPathTests.cs index 973d0cdb..96d9f65e 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithPathTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithPathTests.cs @@ -22,7 +22,7 @@ public async Task ShouldVerifyPath(string uri, string pathPattern, bool expectMa HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithPath(pathPattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithPortTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithPortTests.cs index be198589..2301e125 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithPortTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithPortTests.cs @@ -22,7 +22,7 @@ public async Task ShouldVerifyPort(string uri, int port, bool expectMatch) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithPort(port)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithQueryTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithQueryTests.cs index 0eb95f12..e6b088ae 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithQueryTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.WithQueryTests.cs @@ -23,7 +23,7 @@ public async Task MultipleCalls_ShouldVerifyKeyValueQueryParameters( HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithQuery(key1, value1).WithQuery(key2, value2)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient .GetAsync("https://www.aweXpect.com/foo/bar?x=123&y=234&z=345", CancellationToken.None); @@ -43,7 +43,7 @@ public async Task MultipleCalls_ShouldVerifyKeyValuePairQueryParameters( HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithQuery((key1, value1)).WithQuery((key2, value2))) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient .GetAsync("https://www.aweXpect.com/foo/bar?x=123&y=234&z=345", CancellationToken.None); @@ -63,7 +63,7 @@ public async Task MultipleCalls_ShouldVerifyStringQueryParameters( HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithQuery(query1).WithQuery(query2)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient .GetAsync("https://www.aweXpect.com/foo/bar?x=123&y=234&z=345", CancellationToken.None); @@ -79,7 +79,7 @@ public async Task ShouldEncodeValues(string key, string value) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithQuery(key, value)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com/?x%3c%3e=1%3c2%3e+3", CancellationToken.None); @@ -102,7 +102,7 @@ public async Task WithQueryParameter_ShouldVerifyQueryParameters(string uri, str HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithQuery(key, value)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); @@ -124,7 +124,7 @@ public async Task WithQueryParameters_ShouldMatchQueryParametersInAnyOrder(param HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithQuery(queryParameters)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com?x=123&y=234&z=345", CancellationToken.None); @@ -148,7 +148,7 @@ public async Task WithQueryString_ShouldVerifyQueryParameters(string uri, string HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri().WithQuery(query)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); diff --git a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.cs b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.cs index d250f2ff..37c93adb 100644 --- a/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.cs +++ b/Tests/Mockolate.Tests/Web/ItExtensionsTests.IsUriTests.cs @@ -49,7 +49,7 @@ public async Task ShouldVerifyFullUriWithWildcardMatch(string uri, string patter HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri(pattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync(uri, CancellationToken.None); @@ -64,7 +64,7 @@ public async Task TrailingSlash_ShouldBeIgnored(string matchPattern) HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri(matchPattern)) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com", CancellationToken.None); @@ -79,7 +79,7 @@ public async Task TrailingSlash_WhenNotPresent_ShouldNotBeAdded() HttpClient httpClient = Mock.Create(); httpClient.SetupMock.Method .GetAsync(It.IsUri("*www.aweXpect.com/foo/")) - .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK)); + .ReturnsAsync(HttpStatusCode.OK); HttpResponseMessage result = await httpClient.GetAsync("https://www.aweXpect.com/foo", CancellationToken.None);