diff --git a/examples/WireMock.Net.Console.NET8/MainApp.cs b/examples/WireMock.Net.Console.NET8/MainApp.cs index 942177dc..282803ac 100644 --- a/examples/WireMock.Net.Console.NET8/MainApp.cs +++ b/examples/WireMock.Net.Console.NET8/MainApp.cs @@ -345,9 +345,9 @@ namespace WireMock.Net.ConsoleApplication PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); }, PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); }, -#if USE_ASPNETCORE +//#if USE_ASPNETCORE AdditionalServiceRegistration = services => { System.Console.WriteLine($"AdditionalServiceRegistration : {services.GetType()}"); }, -#endif +//#endif Logger = new WireMockConsoleLogger(), HandlebarsRegistrationCallback = (handlebarsContext, fileSystemHandler) => @@ -368,7 +368,7 @@ namespace WireMock.Net.ConsoleApplication //var response = await http.GetAsync($"{_wireMockServer.Url}/pricing"); //var value = await response.Content.ReadAsStringAsync(); -#if PROTOBUF +//#if PROTOBUF var protoBufJsonMatcher = new JsonPartialWildcardMatcher(new { name = "*" }); server .Given(Request.Create() @@ -447,9 +447,9 @@ namespace WireMock.Net.ConsoleApplication .WithTrailingHeader("grpc-status", "0") .WithTransformer() ); -#endif +//#endif -#if GRAPHQL +//#if GRAPHQL var customScalars = new Dictionary { { "MyCustomScalar", typeof(int) } }; server .Given(Request.Create() @@ -523,9 +523,9 @@ namespace WireMock.Net.ConsoleApplication } """) ); -#endif +//#endif -#if MIMEKIT +//#if MIMEKIT var textPlainContentTypeMatcher = new ContentTypeMatcher("text/plain"); var textPlainContentMatcher = new ExactMatcher("This is some plain text"); var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher); @@ -557,7 +557,7 @@ namespace WireMock.Net.ConsoleApplication .RespondWith(Response.Create() .WithBody("MultiPart is ok") ); -#endif +//#endif // 400 ms server .Given(Request.Create() diff --git a/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj b/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj index ddc6cf32..d5674626 100644 --- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj +++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj @@ -6,6 +6,8 @@ + + diff --git a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj index 08142ea8..1e1f1682 100644 --- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj +++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj @@ -34,10 +34,6 @@ true - - @@ -56,12 +52,4 @@ - - \ No newline at end of file diff --git a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj index c0b204bf..7a7dbfeb 100644 --- a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj +++ b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj @@ -32,10 +32,6 @@ true - - diff --git a/src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj b/src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj index 68d9dc05..039c9410 100644 --- a/src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj +++ b/src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj @@ -30,19 +30,8 @@ - - - - \ No newline at end of file diff --git a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj index 687e05c3..261be595 100644 --- a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj +++ b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj @@ -38,18 +38,6 @@ - - diff --git a/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj b/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj index 979b8844..300c46ed 100644 --- a/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj +++ b/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj @@ -37,23 +37,15 @@ - - - - + diff --git a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj index f36a4337..ca2dbeb1 100644 --- a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj +++ b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj @@ -29,53 +29,21 @@ ../WireMock.Net/WireMock.Net.ruleset - - $(DefineConstants);TRAILINGHEADERS - + - - - - - - - - - @@ -84,73 +52,10 @@ - - - - - - - - - - - - - - - - WireMockServer.cs @@ -169,22 +74,10 @@ - - - - - \ No newline at end of file diff --git a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj index 338057d5..b12b1b28 100644 --- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj +++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj @@ -8,9 +8,6 @@ wiremock;openapi;OAS;raml;converter;parser;openapiparser {E5B03EEF-822C-4295-952B-4479AD30082B} true - MIT @@ -50,7 +47,6 @@ - diff --git a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj index 35bc4531..76d36db4 100644 --- a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj +++ b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj @@ -17,10 +17,6 @@ true - - - - ../WireMock.Net/WireMock.Net.ruleset @@ -30,18 +26,6 @@ true - - @@ -66,10 +50,6 @@ - - diff --git a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj index 9ca17e37..c0e7aca8 100644 --- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj +++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj @@ -28,14 +28,6 @@ true - - all @@ -44,10 +36,6 @@ - \ No newline at end of file diff --git a/src/WireMock.Net/WireMock.Net.csproj b/src/WireMock.Net/WireMock.Net.csproj index a48026a6..6b47c25a 100644 --- a/src/WireMock.Net/WireMock.Net.csproj +++ b/src/WireMock.Net/WireMock.Net.csproj @@ -29,10 +29,6 @@ WireMock.Net.ruleset - - $(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF - - @@ -40,11 +36,4 @@ - - - \ No newline at end of file diff --git a/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj b/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj index 186eca8e..dc984f92 100644 --- a/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj +++ b/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj @@ -9,10 +9,6 @@ true - - $(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF - - diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs index a98b2cf5..725570bb 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappings.cs @@ -41,7 +41,7 @@ message HelloReply { // Act var api = RestClient.For(server.Url); - var getMappingsResult = await api.GetMappingsAsync().ConfigureAwait(false); + var getMappingsResult = await api.GetMappingsAsync(); await Verifier.Verify(getMappingsResult, VerifySettings); } @@ -54,7 +54,7 @@ message HelloReply { // Act var client = server.CreateClient(); - var getMappingsResult = await client.GetStringAsync("/__admin/mappings").ConfigureAwait(false); + var getMappingsResult = await client.GetStringAsync("/__admin/mappings"); await Verifier.VerifyJson(getMappingsResult, VerifySettings); } diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs index 0d0436c3..cc772761 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs @@ -72,7 +72,7 @@ public partial class WireMockAdminApiTests Title = "test 2", Description = "description 2" }; - var result = await api.PostMappingsAsync(new[] { model1, model2 }).ConfigureAwait(false); + var result = await api.PostMappingsAsync(new[] { model1, model2 }); // Assert Check.That(result).IsNotNull(); @@ -105,7 +105,7 @@ public partial class WireMockAdminApiTests Priority = 500, Title = "test" }; - var result = await api.PostMappingAsync(model).ConfigureAwait(false); + var result = await api.PostMappingAsync(model); // Assert Check.That(result).IsNotNull(); @@ -116,7 +116,7 @@ public partial class WireMockAdminApiTests Check.That(mapping).IsNotNull(); Check.That(mapping.Title).Equals("test"); - var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")).ConfigureAwait(false); + var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")); Check.That(response.Message.StatusCode).Equals(expectedStatusCode); server.Stop(); diff --git a/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs b/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs index 2ca01dd2..0133325f 100644 --- a/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs +++ b/test/WireMock.Net.Tests/Client/Builders/AdminApiMappingBuilderTests.cs @@ -56,12 +56,12 @@ public class AdminApiMappingBuilderTests ); // Act - var status = await mappingBuilder.BuildAndPostAsync().ConfigureAwait(false); + var status = await mappingBuilder.BuildAndPostAsync(); // Assert status.Status.Should().Be("Mapping added"); - var getMappingResult = await api.GetMappingAsync(guid).ConfigureAwait(false); + var getMappingResult = await api.GetMappingAsync(guid); await Verifier.Verify(getMappingResult, VerifySettings).DontScrubGuids(); diff --git a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs index b2288e9b..874b7c6a 100644 --- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs +++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs @@ -37,7 +37,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedNoCalls_AtAbsoluteUrl_WhenACallWasNotMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("xxx").ConfigureAwait(false); + await _httpClient.GetAsync("xxx"); _server.Should() .HaveReceivedNoCalls() @@ -47,7 +47,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived0Calls_AtAbsoluteUrl_WhenACallWasNotMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("xxx").ConfigureAwait(false); + await _httpClient.GetAsync("xxx"); _server.Should() .HaveReceived(0).Calls() @@ -57,7 +57,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); _server.Should() .HaveReceived(1).Calls() @@ -67,7 +67,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsoluteUrl2_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); _server.Should() .HaveReceived(1).Calls() @@ -77,7 +77,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsoluteUrlUsingPost_WhenAPostCallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.PostAsync("anyurl", new StringContent("")).ConfigureAwait(false); + await _httpClient.PostAsync("anyurl", new StringContent("")); _server.Should() .HaveReceived(1).Calls() @@ -89,9 +89,9 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived2Calls_AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); _server.Should() .HaveReceived(2).Calls() @@ -101,7 +101,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); _server.Should() .HaveReceivedACall() @@ -111,7 +111,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsoluteUrlWildcardMatcher_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); _server.Should() .HaveReceivedACall() @@ -133,7 +133,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsoluteUrl_Should_ThrowWhenNoCallsMatchingTheAbsoluteUrlWereMade() { - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); Action act = () => _server.Should() .HaveReceivedACall() @@ -147,7 +147,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedNoCalls_AtAbsolutePath_WhenACallWasNotMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("xxx").ConfigureAwait(false); + await _httpClient.GetAsync("xxx"); _server.Should() .HaveReceivedNoCalls() @@ -157,7 +157,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived0Calls_AtAbsolutePath_WhenACallWasNotMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("xxx").ConfigureAwait(false); + await _httpClient.GetAsync("xxx"); _server.Should() .HaveReceived(0).Calls() @@ -167,7 +167,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("anypath").ConfigureAwait(false); + await _httpClient.GetAsync("anypath"); _server.Should() .HaveReceived(1).Calls() @@ -177,7 +177,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived1Calls_AtAbsolutePathUsingPost_WhenAPostCallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.PostAsync("anypath", new StringContent("")).ConfigureAwait(false); + await _httpClient.PostAsync("anypath", new StringContent("")); _server.Should() .HaveReceived(1).Calls() @@ -189,9 +189,9 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceived2Calls_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("anypath").ConfigureAwait(false); + await _httpClient.GetAsync("anypath"); - await _httpClient.GetAsync("anypath").ConfigureAwait(false); + await _httpClient.GetAsync("anypath"); _server.Should() .HaveReceived(2).Calls() @@ -201,7 +201,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("anypath").ConfigureAwait(false); + await _httpClient.GetAsync("anypath"); _server.Should() .HaveReceivedACall() @@ -211,7 +211,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsolutePathWildcardMatcher_WhenACallWasMadeToAbsolutePath_Should_BeOK() { - await _httpClient.GetAsync("anypath").ConfigureAwait(false); + await _httpClient.GetAsync("anypath"); _server.Should() .HaveReceivedACall() @@ -233,7 +233,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtAbsolutePath_Should_ThrowWhenNoCallsMatchingTheAbsolutePathWereMade() { - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); Action act = () => _server.Should() .HaveReceivedACall() @@ -248,7 +248,7 @@ public class WireMockAssertionsTests : IDisposable public async Task HaveReceivedACall_WithHeader_WhenACallWasMadeWithExpectedHeader_Should_BeOK() { _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer a"); - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); _server.Should() .HaveReceivedACall() @@ -259,7 +259,7 @@ public class WireMockAssertionsTests : IDisposable public async Task HaveReceivedACall_WithHeader_WhenACallWasMadeWithExpectedHeaderWithValue_Should_BeOK() { _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer a"); - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); _server.Should() .HaveReceivedACall() @@ -271,10 +271,10 @@ public class WireMockAssertionsTests : IDisposable { _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await _httpClient.GetAsync("1").ConfigureAwait(false); + await _httpClient.GetAsync("1"); _httpClient.DefaultRequestHeaders.AcceptLanguage.Add(new StringWithQualityHeaderValue("EN")); - await _httpClient.GetAsync("2").ConfigureAwait(false); + await _httpClient.GetAsync("2"); _server.Should() .HaveReceivedACall() @@ -286,7 +286,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderNameWereMade() { - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); Action act = () => _server.Should() .HaveReceivedACall() @@ -302,7 +302,7 @@ public class WireMockAssertionsTests : IDisposable { _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); Action act = () => _server.Should() .HaveReceivedACall() @@ -320,7 +320,7 @@ public class WireMockAssertionsTests : IDisposable httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await httpClient.GetAsync("").ConfigureAwait(false); + await httpClient.GetAsync(""); Action act = () => _server.Should() .HaveReceivedACall() @@ -374,7 +374,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtUrl_WhenACallWasMadeToUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); _server.Should() .HaveReceivedACall() @@ -384,7 +384,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtUrlWildcardMatcher_WhenACallWasMadeToUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); _server.Should() .HaveReceivedACall() @@ -406,7 +406,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_AtUrl_Should_ThrowWhenNoCallsMatchingTheUrlWereMade() { - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); Action act = () => _server.Should() .HaveReceivedACall() @@ -424,7 +424,7 @@ public class WireMockAssertionsTests : IDisposable _server.Given(Request.Create().UsingAnyMethod()) .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" })); - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); _server.Should() .HaveReceivedACall() @@ -454,7 +454,7 @@ public class WireMockAssertionsTests : IDisposable _server.Given(Request.Create().UsingAnyMethod()) .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" })); - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); Action act = () => _server.Should() .HaveReceivedACall() @@ -468,7 +468,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_FromClientIP_whenACallWasMadeFromClientIP_Should_BeOK() { - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP; _server.Should() @@ -491,7 +491,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_FromClientIP_Should_ThrowWhenNoCallsFromClientIPWereMade() { - await _httpClient.GetAsync("").ConfigureAwait(false); + await _httpClient.GetAsync(""); var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP; Action act = () => _server.Should() @@ -506,7 +506,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedNoCalls_UsingPost_WhenACallWasNotMadeUsingPost_Should_BeOK() { - await _httpClient.GetAsync("anyurl").ConfigureAwait(false); + await _httpClient.GetAsync("anyurl"); _server.Should() .HaveReceivedNoCalls() @@ -545,7 +545,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingOptions_Should_ThrowWhenCallsWereNotMadeUsingOptions() { - await _httpClient.PostAsync("anyurl", new StringContent("anycontent")).ConfigureAwait(false); + await _httpClient.PostAsync("anyurl", new StringContent("anycontent")); Action act = () => _server.Should() .HaveReceivedACall() @@ -566,7 +566,7 @@ public class WireMockAssertionsTests : IDisposable _httpClient.DefaultRequestHeaders.Add("Host", new Uri(_server.Urls[0]).Authority); - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("CONNECT"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("CONNECT"), "anyurl")); _server.Should() .HaveReceivedACall() @@ -577,7 +577,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingDelete_WhenACallWasMadeUsingDelete_Should_BeOK() { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("DELETE"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("DELETE"), "anyurl")); _server.Should() .HaveReceivedACall() @@ -587,7 +587,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingGet_WhenACallWasMadeUsingGet_Should_BeOK() { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("GET"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("GET"), "anyurl")); _server.Should() .HaveReceivedACall() @@ -597,7 +597,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingHead_WhenACallWasMadeUsingHead_Should_BeOK() { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("HEAD"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("HEAD"), "anyurl")); _server.Should() .HaveReceivedACall() @@ -607,7 +607,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingOptions_WhenACallWasMadeUsingOptions_Should_BeOK() { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("OPTIONS"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("OPTIONS"), "anyurl")); _server.Should() .HaveReceivedACall() @@ -619,7 +619,7 @@ public class WireMockAssertionsTests : IDisposable [InlineData("Post")] public async Task HaveReceivedACall_UsingPost_WhenACallWasMadeUsingPost_Should_BeOK(string method) { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod(method), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod(method), "anyurl")); _server.Should() .HaveReceivedACall() @@ -704,7 +704,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingPatch_WhenACallWasMadeUsingPatch_Should_BeOK() { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("PATCH"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("PATCH"), "anyurl")); _server.Should() .HaveReceivedACall() @@ -714,7 +714,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingPut_WhenACallWasMadeUsingPut_Should_BeOK() { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("PUT"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("PUT"), "anyurl")); _server.Should() .HaveReceivedACall() @@ -724,7 +724,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingTrace_WhenACallWasMadeUsingTrace_Should_BeOK() { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("TRACE"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("TRACE"), "anyurl")); _server.Should() .HaveReceivedACall() @@ -734,7 +734,7 @@ public class WireMockAssertionsTests : IDisposable [Fact] public async Task HaveReceivedACall_UsingAnyMethod_WhenACallWasMadeUsingGet_Should_BeOK() { - await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("GET"), "anyurl")).ConfigureAwait(false); + await _httpClient.SendAsync(new HttpRequestMessage(new HttpMethod("GET"), "anyurl")); _server.Should() .HaveReceivedACall() diff --git a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs index 307f0481..6af562c2 100644 --- a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs @@ -22,7 +22,7 @@ public class ByteArrayContentHelperTests // Assert result.Headers.ContentType.Should().BeNull(); - (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content); + (await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content); } [Theory] @@ -40,6 +40,6 @@ public class ByteArrayContentHelperTests // Assert result.Headers.ContentType.ToString().Should().Be(expected); - (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content); + (await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs index 25470cb4..12f120fd 100644 --- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs @@ -46,7 +46,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsByteArrayAsync().ConfigureAwait(false)).ContainsExactly(Encoding.UTF8.GetBytes("hi")); + Check.That(await message.Content!.ReadAsByteArrayAsync()).ContainsExactly(Encoding.UTF8.GetBytes("hi")); } [Fact] @@ -64,7 +64,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("0123"); + Check.That(await message.Content!.ReadAsStringAsync()).Equals("0123"); } [Fact] @@ -82,7 +82,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}"); + Check.That(await message.Content!.ReadAsStringAsync()).Equals("{\"x\":42}"); } [Fact] @@ -101,7 +101,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}"); + Check.That(await message.Content!.ReadAsStringAsync()).Equals("{\"x\":42}"); Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json"); } @@ -121,7 +121,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}"); + Check.That(await message.Content!.ReadAsStringAsync()).Equals("{\"x\":42}"); Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8"); } @@ -142,7 +142,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}"); + Check.That(await message.Content!.ReadAsStringAsync()).Equals("{\"x\":42}"); Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("multipart/form-data"); } @@ -242,7 +242,7 @@ public class HttpRequestMessageHelperTests var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals(body); + Check.That(await message.Content!.ReadAsStringAsync()).Equals(body); Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("multipart/form-data"); } diff --git a/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs b/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs index 5f39a0d2..2d3f588e 100644 --- a/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs +++ b/test/WireMock.Net.Tests/Matchers/ProtoBufMatcherTests.cs @@ -41,7 +41,7 @@ message HelloReply { // Act var matcher = new ProtoBufMatcher(() => ProtoDefinition, MessageType); - var result = await matcher.DecodeAsync(bytes).ConfigureAwait(false); + var result = await matcher.DecodeAsync(bytes); // Assert result.Should().BeEquivalentTo(new { name = "stef" }); @@ -55,7 +55,7 @@ message HelloReply { // Act var matcher = new ProtoBufMatcher(() => ProtoDefinition, MessageType); - var result = await matcher.IsMatchAsync(bytes).ConfigureAwait(false); + var result = await matcher.IsMatchAsync(bytes); // Assert result.Score.Should().Be(MatchScores.Perfect); diff --git a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs index c5db4dfb..66b4ed52 100644 --- a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs +++ b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs @@ -45,7 +45,7 @@ public class ObservableLogEntriesTest server.LogEntriesChanged += (sender, args) => throw new Exception(); // Act - await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false); + await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}"); // Assert loggerMock.Verify(l => l.Error(It.IsAny(), It.IsAny()), Times.Once); @@ -69,10 +69,10 @@ public class ObservableLogEntriesTest server.LogEntriesChanged += (sender, args) => count++; // Act 1a - await server.CreateClient().GetAsync(path).ConfigureAwait(false); + await server.CreateClient().GetAsync(path); // Act 1b - await server.CreateClient().GetAsync(path).ConfigureAwait(false); + await server.CreateClient().GetAsync(path); // Assert count.Should().Be(2); @@ -102,7 +102,7 @@ public class ObservableLogEntriesTest server.LogEntriesChanged += OnServerOnLogEntriesChanged; // Act 1 - await server.CreateClient().GetAsync(path).ConfigureAwait(false); + await server.CreateClient().GetAsync(path); // Assert 1 count.Should().Be(1); @@ -111,7 +111,7 @@ public class ObservableLogEntriesTest server.LogEntriesChanged -= OnServerOnLogEntriesChanged; // Act 2 - await server.CreateClient().GetAsync(path).ConfigureAwait(false); + await server.CreateClient().GetAsync(path); // Assert 2 count.Should().Be(1); @@ -147,7 +147,7 @@ public class ObservableLogEntriesTest Thread.Sleep(50); listOfTasks.Add(http.GetAsync($"{server.Urls[0]}{path}")); } - var responses = await Task.WhenAll(listOfTasks).ConfigureAwait(false); + var responses = await Task.WhenAll(listOfTasks); var countResponsesWithStatusNotOk = responses.Count(r => r.StatusCode != HttpStatusCode.OK); // Assert diff --git a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs index 4060938a..931c903b 100644 --- a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs +++ b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs @@ -70,7 +70,7 @@ public class OwinResponseMapperTests public async Task OwinResponseMapper_MapAsync_Null() { // Act - await _sut.MapAsync(null, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(null, _responseMock.Object); } [Theory] @@ -85,7 +85,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); @@ -106,7 +106,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); @@ -122,7 +122,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _responseMock.VerifySet(r => r.StatusCode = It.IsAny(), Times.Never); @@ -142,7 +142,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); @@ -158,7 +158,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _stream.Verify(s => s.WriteAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); @@ -176,7 +176,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny()), Times.Once); @@ -194,7 +194,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _stream.Verify(s => s.WriteAsync(bytes, 0, bytes.Length, It.IsAny()), Times.Once); @@ -212,7 +212,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _stream.Verify(s => s.WriteAsync(new byte[] { 123, 34, 116, 34, 58, 34, 120, 34, 125 }, 0, 9, It.IsAny()), Times.Once); @@ -228,7 +228,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert #if NET452 @@ -270,7 +270,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _stream.Verify(s => s.WriteAsync(new byte[0], 0, 0, It.IsAny()), Times.Once); @@ -292,7 +292,7 @@ public class OwinResponseMapperTests }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); + await _sut.MapAsync(responseMessage, _responseMock.Object); // Assert _responseMock.VerifySet(r => r.StatusCode = 100, Times.Once); diff --git a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs index cb8954de..b9f1cba0 100644 --- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs +++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs @@ -100,7 +100,7 @@ public class WireMockMiddlewareTests public async Task WireMockMiddleware_Invoke_NoMatch() { // Act - await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); + await _sut.Invoke(_contextMock.Object); // Assert and Verify _optionsMock.Verify(o => o.Logger.Warn(It.IsAny(), It.IsAny()), Times.Once); @@ -118,7 +118,7 @@ public class WireMockMiddlewareTests _optionsMock.Setup(o => o.SaveUnmatchedRequests).Returns(true); // Act - await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); + await _sut.Invoke(_contextMock.Object); // Assert _optionsMock.Verify(o => o.Logger.Warn(It.IsAny(), It.IsAny()), Times.Once); @@ -145,7 +145,7 @@ public class WireMockMiddlewareTests _matcherMock.Setup(m => m.FindBestMatch(It.IsAny())).Returns((result, result)); // Act - await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); + await _sut.Invoke(_contextMock.Object); // Assert and Verify _optionsMock.Verify(o => o.Logger.Error(It.IsAny(), It.IsAny()), Times.Once); @@ -168,7 +168,7 @@ public class WireMockMiddlewareTests _matcherMock.Setup(m => m.FindBestMatch(It.IsAny())).Returns((result, result)); // Act - await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); + await _sut.Invoke(_contextMock.Object); // Assert and Verify _optionsMock.Verify(o => o.Logger.Error(It.IsAny(), It.IsAny()), Times.Once); @@ -184,7 +184,7 @@ public class WireMockMiddlewareTests _optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1); // Act - await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); + await _sut.Invoke(_contextMock.Object); } [Fact] @@ -228,7 +228,7 @@ public class WireMockMiddlewareTests _matcherMock.Setup(m => m.FindBestMatch(It.IsAny())).Returns((result, result)); // Act - await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); + await _sut.Invoke(_contextMock.Object); // Assert and Verify fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny(), It.IsAny()), Times.Once); @@ -282,7 +282,7 @@ public class WireMockMiddlewareTests _matcherMock.Setup(m => m.FindBestMatch(It.IsAny())).Returns((result, result)); // Act - await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); + await _sut.Invoke(_contextMock.Object); // Assert and Verify fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny(), It.IsAny()), Times.Once); diff --git a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs index ab53577a..7a23c4db 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs @@ -491,7 +491,7 @@ public class RequestMessageBodyMatcherTests ContentType = null, DeserializeJson = true }; - bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + bodyData = await BodyParser.ParseAsync(bodyParserSettings); } else if (body is string s) { @@ -501,7 +501,7 @@ public class RequestMessageBodyMatcherTests ContentType = null, DeserializeJson = true }; - bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + bodyData = await BodyParser.ParseAsync(bodyParserSettings); } else { diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs index 7f4cd3cc..10830be3 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs @@ -25,7 +25,7 @@ public class ResponseCreateTests var responseBuilder = Response.Create(() => responseMessage); // Act - var response = await responseBuilder.ProvideResponseAsync(mapping, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(mapping, request, _settings); // Assert Check.That(response.Message).Equals(responseMessage); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs index d6bd82d0..464b23a3 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs @@ -37,7 +37,7 @@ namespace WireMock.Net.Tests.ResponseBuilders ); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false); + var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); // Assert response.Should().Contain("world"); @@ -68,7 +68,7 @@ namespace WireMock.Net.Tests.ResponseBuilders ); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false); + var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); // Assert response.Should().Contain("world"); @@ -99,7 +99,7 @@ namespace WireMock.Net.Tests.ResponseBuilders ); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false); + var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); // Assert response.Should().Contain("world"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs index 253d1ab8..a7496136 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs @@ -49,7 +49,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // then Check.That(response.Message.BodyData.BodyAsString).Equals("01"); @@ -71,7 +71,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // then Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 }); @@ -93,7 +93,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody("test", null, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // then Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -115,7 +115,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBodyAsJson(x, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // then Check.That(response.Message.BodyData.BodyAsJson).Equals(x); @@ -131,7 +131,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); @@ -149,7 +149,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsNull(); @@ -167,7 +167,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsNull(); @@ -191,7 +191,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBodyAsJson(x, true); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // then Check.That(response.Message.BodyData.BodyAsJson).Equals(x); @@ -213,7 +213,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBodyAsJson(requestMessage => responseBody); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsJson.Should().BeEquivalentTo(responseBody); @@ -234,7 +234,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBodyAsJson(requestMessage => Task.FromResult(responseBody)); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsJson.Should().BeEquivalentTo(responseBody); @@ -256,8 +256,8 @@ public class ResponseWithBodyTests .WithTransformer(); // Act - var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings).ConfigureAwait(false); - var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request2, _settings).ConfigureAwait(false); + var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings); + var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request2, _settings); // Assert Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value()).IsEqualTo(request1Id); @@ -281,7 +281,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); @@ -297,7 +297,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); @@ -313,7 +313,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithStatusCode(200).WithBody("File deleted."); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted."); @@ -334,7 +334,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody(new { foo = "bar", n = 42 }, new JsonConverter.System.Text.Json.SystemTextJsonConverter()); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be(@"{""foo"":""bar"",""n"":42}"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs index 1e077d4c..e241ede3 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs @@ -48,7 +48,7 @@ public class ResponseWithCallbackTests .WithBody(req => $"path: {req.Path}"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); @@ -77,8 +77,8 @@ public class ResponseWithCallbackTests }); // Act (2x) - var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); - var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response1.Message.BodyData!.BodyAsString.Should().Be("x"); @@ -104,8 +104,8 @@ public class ResponseWithCallbackTests }); // Act (2x) - var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); - var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response1.Message.BodyData!.BodyAsString.Should().Be("x"); @@ -131,7 +131,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); @@ -165,7 +165,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -189,7 +189,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -218,7 +218,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -250,7 +250,7 @@ public class ResponseWithCallbackTests .WithHeader(header, "Stef"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -276,7 +276,7 @@ public class ResponseWithCallbackTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -311,7 +311,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); // Assert response.Message.Headers![headerKey].Should().Contain("extra"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs index f0ef363a..37ce850b 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs @@ -32,7 +32,7 @@ public class ResponseWithFaultTests // Act var responseBuilder = Response.Create().WithFault(faultType); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.FaultType.Should().Be(faultType); @@ -48,7 +48,7 @@ public class ResponseWithFaultTests // Act var responseBuilder = Response.Create().WithFault(faultType, percentage); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.FaultType.Should().Be(faultType); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs index 84e9d169..4ab7d0ae 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs @@ -47,7 +47,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -71,7 +71,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -94,7 +94,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -112,7 +112,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Contain($"DateTimeYear = \"{DateTime.Now.Year}\""); @@ -137,7 +137,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs index 0b961c59..fb28c785 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs @@ -55,7 +55,7 @@ public class ResponseWithHandlebarsFileTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -80,7 +80,7 @@ public class ResponseWithHandlebarsFileTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var j = JObject.FromObject(response.Message.BodyData.BodyAsJson); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs index 716f131f..2e39428c 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs @@ -40,7 +40,7 @@ public class ResponseWithHandlebarsHelpersTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(new Mock().Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(new Mock().Object, request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals("ABC"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs index a4e58695..8f64b6df 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs @@ -44,7 +44,7 @@ public class ResponseWithHandlebarsHumanizerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs index a6b75caa..c18a565b 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs @@ -82,7 +82,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -108,7 +108,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson!); @@ -162,7 +162,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine} \"Name\": \"Acme Co\",{Environment.NewLine} \"Products\": [{Environment.NewLine} {{{Environment.NewLine} \"Name\": \"Anvil\",{Environment.NewLine} \"Price\": 50{Environment.NewLine} }}{Environment.NewLine} ]{Environment.NewLine}}}"); @@ -215,7 +215,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine} \"Name\": \"Acme Co\",{Environment.NewLine} \"Products\": [{Environment.NewLine} {{{Environment.NewLine} \"Name\": \"Anvil\",{Environment.NewLine} \"Price\": 50{Environment.NewLine} }}{Environment.NewLine} ]{Environment.NewLine}}}"); @@ -268,7 +268,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); @@ -321,7 +321,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); @@ -376,7 +376,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithBodyFromFile("c:\\\\{{JsonPath.SelectToken request.body \"$.MyUniqueNumber\" }}\\test.json"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData?.BodyAsFile.Should().Be(@"c:\1\test.json"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs index cdad36f4..d9dab929 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs @@ -47,7 +47,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -77,7 +77,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -107,7 +107,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -137,7 +137,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs index ee0477ce..c4907dca 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs @@ -49,7 +49,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -72,7 +72,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -95,7 +95,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -120,7 +120,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -142,7 +142,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -163,7 +163,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -185,7 +185,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -206,7 +206,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var j = JObject.FromObject(response.Message.BodyData.BodyAsJson); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs index f194ff31..ddfac3ee 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs @@ -44,7 +44,7 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals("abc"); @@ -63,7 +63,7 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals(""); @@ -82,7 +82,7 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https"); @@ -101,7 +101,7 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals(""); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs index 8e058d60..46da4c5e 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs @@ -35,7 +35,7 @@ public class ResponseWithHeadersTests IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValue); // Act - var response = await builder.ProvideResponseAsync(_mappingMock.Object, requestMock, _settings).ConfigureAwait(false); + var response = await builder.ProvideResponseAsync(_mappingMock.Object, requestMock, _settings); // Assert Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue); @@ -51,7 +51,7 @@ public class ResponseWithHeadersTests IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValues); // Act - var response = await builder.ProvideResponseAsync(_mappingMock.Object, requestMock, _settings).ConfigureAwait(false); + var response = await builder.ProvideResponseAsync(_mappingMock.Object, requestMock, _settings); // Assert Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues); @@ -66,7 +66,7 @@ public class ResponseWithHeadersTests var response = Response.Create().WithHeaders(headers); // Act - var responseMessage = await response.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var responseMessage = await response.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x"); @@ -81,7 +81,7 @@ public class ResponseWithHeadersTests var responseBuilder = Response.Create().WithHeaders(headers); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.Headers["h"]).ContainsExactly("x"); @@ -96,7 +96,7 @@ public class ResponseWithHeadersTests var builder = Response.Create().WithHeaders(headers); // Act - var response = await builder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await builder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.Headers["h"]).ContainsExactly("x"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs index 001190e9..dc9dbe59 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs @@ -56,7 +56,7 @@ public class ResponseWithProxyTests : IDisposable var responseBuilder = Response.Create().WithProxy(_server.Urls[0]); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(request.ProxyUrl).IsNotNull(); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs index 0578572b..dd2d4ce4 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs @@ -47,7 +47,7 @@ public class ResponseWithScribanTests var responseBuilder = Response.Create().WithTransformer(TransformerType.ScribanDotLiquid); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData.Should().BeNull(); @@ -69,7 +69,7 @@ public class ResponseWithScribanTests .WithTransformer(TransformerType.Scriban); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs index ed61213d..e8799d2a 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs @@ -42,7 +42,7 @@ public class ResponseWithStatusCodeTests break; } - var response = await responseBuilder.ProvideResponseAsync(new Mock().Object, request, _settingsMock.Object).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(new Mock().Object, request, _settingsMock.Object); // Assert response.Message.StatusCode.Should().Be(expectedStatusCode); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs index ee928b7c..c67fddbe 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs @@ -57,7 +57,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData.Should().BeNull(); @@ -82,7 +82,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test http://localhost/foo /foo POSt"); @@ -106,7 +106,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b"); @@ -124,7 +124,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("a b wiremock"); @@ -146,7 +146,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert var json = (JObject)response.Message.BodyData!.BodyAsJson!; @@ -167,7 +167,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("a wiremock"); @@ -189,7 +189,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5"); @@ -213,7 +213,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5"); @@ -236,7 +236,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -262,7 +262,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -288,7 +288,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -309,7 +309,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -334,7 +334,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithHeader("x", "{{mapping.Guid}}").WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.Headers.Should().NotBeNull(); @@ -356,7 +356,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -381,7 +381,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithHeader("x", "{{request.Headers[\"Content-Type\"]}}", "{{request.Url}}").WithBody("test").WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -409,7 +409,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test http://localhost:1234 1234 http localhost"); @@ -436,7 +436,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}"); @@ -498,7 +498,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("[{\"x\":\"test\"}]"); @@ -519,7 +519,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("[{\"x\":\"test\"}]"); @@ -556,7 +556,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType, false, ReplaceNodeOptions.Evaluate); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be($"{{\"text\":{expected}}}"); @@ -583,7 +583,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]"); @@ -600,7 +600,7 @@ public class ResponseWithTransformerTests .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -619,7 +619,7 @@ public class ResponseWithTransformerTests .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -643,7 +643,7 @@ public class ResponseWithTransformerTests .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -672,7 +672,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("\"test\""); @@ -693,7 +693,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("{\"scope\":\"scope1 scope2 scope3 helloworld\"}"); @@ -718,7 +718,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); @@ -744,7 +744,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); @@ -772,7 +772,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be(text); @@ -853,7 +853,7 @@ AAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC _mappingMock.SetupGet(m => m.Data).Returns(data); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be(expected); diff --git a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs index 15407222..9c237f9c 100644 --- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs +++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs @@ -30,7 +30,7 @@ public class StatefulBehaviorTests .RespondWith(Response.Create()); // when - var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); + var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path); // then Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound); @@ -58,8 +58,8 @@ public class StatefulBehaviorTests .RespondWith(Response.Create().WithBody("Test state msg")); // Act - var responseNoState = await new HttpClient().GetStringAsync(server.Url + path).ConfigureAwait(false); - var responseWithState = await new HttpClient().GetStringAsync(server.Url + path).ConfigureAwait(false); + var responseNoState = await new HttpClient().GetStringAsync(server.Url + path); + var responseWithState = await new HttpClient().GetStringAsync(server.Url + path); // Assert Check.That(responseNoState).Equals("No state msg"); @@ -137,9 +137,9 @@ public class StatefulBehaviorTests // when var client = new HttpClient(); - var responseScenario1 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); - var responseScenario2 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); - var responseWithState = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); + var responseScenario1 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path); + var responseScenario2 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path); + var responseWithState = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path); // then responseScenario1.Should().Be(body1); @@ -184,11 +184,11 @@ public class StatefulBehaviorTests // when var client = new HttpClient(); - var t1a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false); - var t1b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false); - var t2a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false); - var t2b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false); - var t3 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path3).ConfigureAwait(false); + var t1a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1); + var t1b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1); + var t2a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2); + var t2b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2); + var t3 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path3); // then t1a.Should().Be(body1); @@ -220,8 +220,8 @@ public class StatefulBehaviorTests .RespondWith(Response.Create().WithBody("Scenario 1, State 2")); // when - var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); - var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); + var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); + var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); // then Check.That(responseIntScenario).Equals("Scenario 1, Setting State 2"); @@ -250,8 +250,8 @@ public class StatefulBehaviorTests .RespondWith(Response.Create().WithBody("string state, State 2")); // when - var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); - var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); + var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); + var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); // then Check.That(responseIntScenario).Equals("string state, Setting State 2"); @@ -280,8 +280,8 @@ public class StatefulBehaviorTests .RespondWith(Response.Create().WithBody("string state, State 2")); // when - var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); - var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); + var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); + var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); // then Check.That(responseIntScenario).Equals("int state, Setting State 2"); @@ -319,7 +319,7 @@ public class StatefulBehaviorTests Check.That(server.Scenarios.Any()).IsFalse(); // Act and Assert - var getResponse1 = await client.GetStringAsync("/todo/items").ConfigureAwait(false); + var getResponse1 = await client.GetStringAsync("/todo/items"); Check.That(getResponse1).Equals("Buy milk"); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); @@ -327,7 +327,7 @@ public class StatefulBehaviorTests Check.That(server.Scenarios["To do list"].Started).IsTrue(); Check.That(server.Scenarios["To do list"].Finished).IsFalse(); - var postResponse = await client.PostAsync("/todo/items", new StringContent("Cancel newspaper subscription")).ConfigureAwait(false); + var postResponse = await client.PostAsync("/todo/items", new StringContent("Cancel newspaper subscription")); Check.That(postResponse.StatusCode).Equals(HttpStatusCode.Created); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); @@ -335,7 +335,7 @@ public class StatefulBehaviorTests Check.That(server.Scenarios["To do list"].Started).IsTrue(); Check.That(server.Scenarios["To do list"].Finished).IsFalse(); - string getResponse2 = await client.GetStringAsync("/todo/items").ConfigureAwait(false); + string getResponse2 = await client.GetStringAsync("/todo/items"); Check.That(getResponse2).Equals("Buy milk;Cancel newspaper subscription"); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); @@ -370,14 +370,14 @@ public class StatefulBehaviorTests server.SetScenarioState(scenario, "Buy milk"); server.Scenarios[scenario].Should().BeEquivalentTo(new { Name = scenario, NextState = "Buy milk" }); - var getResponse1 = await client.GetStringAsync("/todo/items").ConfigureAwait(false); + var getResponse1 = await client.GetStringAsync("/todo/items"); getResponse1.Should().Be("Buy milk"); server.SetScenarioState(scenario, "Cancel newspaper"); server.Scenarios[scenario].Name.Should().Be(scenario); server.Scenarios[scenario].Should().BeEquivalentTo(new { Name = scenario, NextState = "Cancel newspaper" }); - var getResponse2 = await client.GetStringAsync("/todo/items").ConfigureAwait(false); + var getResponse2 = await client.GetStringAsync("/todo/items"); getResponse2.Should().Be("Buy milk;Cancel newspaper subscription"); } @@ -441,16 +441,16 @@ public class StatefulBehaviorTests // Act and Assert string url = "http://localhost:" + server.Ports[0]; - var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1").ConfigureAwait(false); + var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1"); Check.That(responseNoState1).Equals("No state msg 1"); - var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2").ConfigureAwait(false); + var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2"); Check.That(responseNoState2).Equals("No state msg 2"); - var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X").ConfigureAwait(false); + var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X"); Check.That(responseWithState1).Equals("Test state msg 1"); - var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X").ConfigureAwait(false); + var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X"); Check.That(responseWithState2).Equals("Test state msg 2"); server.Stop(); diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs index 12b903b2..f6363a17 100644 --- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs +++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs @@ -33,7 +33,7 @@ public partial class TestcontainersTests try { - await wireMockContainer.StartAsync().ConfigureAwait(false); + await wireMockContainer.StartAsync(); // Assert using (new AssertionScope()) @@ -86,7 +86,7 @@ public partial class TestcontainersTests try { - await wireMockContainer.StartAsync().ConfigureAwait(false); + await wireMockContainer.StartAsync(); // Assert using (new AssertionScope()) diff --git a/test/WireMock.Net.Tests/Util/BodyParserTests.cs b/test/WireMock.Net.Tests/Util/BodyParserTests.cs index af5ae34a..8fc31afc 100644 --- a/test/WireMock.Net.Tests/Util/BodyParserTests.cs +++ b/test/WireMock.Net.Tests/Util/BodyParserTests.cs @@ -31,7 +31,7 @@ public class BodyParserTests }; // Act - var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var body = await BodyParser.ParseAsync(bodyParserSettings); // Assert Check.That(body.BodyAsBytes).IsNotNull(); @@ -55,7 +55,7 @@ public class BodyParserTests }; // Act - var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var body = await BodyParser.ParseAsync(bodyParserSettings); // Assert Check.That(body.BodyAsBytes).IsNotNull(); @@ -80,7 +80,7 @@ public class BodyParserTests }; // act - var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var body = await BodyParser.ParseAsync(bodyParserSettings); // assert Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); @@ -101,7 +101,7 @@ public class BodyParserTests }; // act - var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var body = await BodyParser.ParseAsync(bodyParserSettings); // assert Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); @@ -142,7 +142,7 @@ public class BodyParserTests }; // Act - var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var result = await BodyParser.ParseAsync(bodyParserSettings); // Assert Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String); @@ -166,7 +166,7 @@ public class BodyParserTests }; // Act - var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var result = await BodyParser.ParseAsync(bodyParserSettings); // Assert Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes); @@ -189,7 +189,7 @@ public class BodyParserTests }; // Act - var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var body = await BodyParser.ParseAsync(bodyParserSettings); // Assert Check.That(body.BodyAsBytes).IsNotNull(); @@ -217,7 +217,7 @@ public class BodyParserTests }; // Act - var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var result = await BodyParser.ParseAsync(bodyParserSettings); // Assert result.DetectedBodyType.Should().Be(BodyType.String); @@ -246,7 +246,7 @@ public class BodyParserTests }; // Act - var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); + var result = await BodyParser.ParseAsync(bodyParserSettings); // Assert result.BodyAsBytes.Should().BeEquivalentTo(compressed); diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj index aa08bc3a..de6ca818 100644 --- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj +++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj @@ -21,18 +21,6 @@ true - - - - $(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF - - $(DefineConstants);TRAILINGHEADERS @@ -81,7 +69,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -96,57 +83,8 @@ - - - - - - - - - - - - - - diff --git a/test/WireMock.Net.Tests/WireMockServer.Admin.cs b/test/WireMock.Net.Tests/WireMockServer.Admin.cs index f72bf342..4f575e1d 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Admin.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Admin.cs @@ -356,7 +356,7 @@ public class WireMockServerAdminTests Check.That(mappings).HasSize(2); // when - var response = await new HttpClient().GetAsync("http://localhost:" + server.Port + "/1").ConfigureAwait(false); + var response = await new HttpClient().GetAsync("http://localhost:" + server.Port + "/1"); // then Check.That((int)response.StatusCode).IsEqualTo(400); @@ -371,7 +371,7 @@ public class WireMockServerAdminTests var server = WireMockServer.Start(); // when - await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); + await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo"); // then Check.That(server.LogEntries).HasSize(1); @@ -391,9 +391,9 @@ public class WireMockServerAdminTests var server = WireMockServer.Start(); server.SetMaxRequestLogCount(2); - await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo1").ConfigureAwait(false); - await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo2").ConfigureAwait(false); - await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo3").ConfigureAwait(false); + await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo1"); + await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo2"); + await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo3"); // Assert Check.That(server.LogEntries).HasSize(2); @@ -417,9 +417,9 @@ public class WireMockServerAdminTests var server = WireMockServer.Start(); server.SetMaxRequestLogCount(0); - await client.GetAsync("http://localhost:" + server.Port + "/foo1").ConfigureAwait(false); - await client.GetAsync("http://localhost:" + server.Port + "/foo2").ConfigureAwait(false); - await client.GetAsync("http://localhost:" + server.Port + "/foo3").ConfigureAwait(false); + await client.GetAsync("http://localhost:" + server.Port + "/foo1"); + await client.GetAsync("http://localhost:" + server.Port + "/foo2"); + await client.GetAsync("http://localhost:" + server.Port + "/foo3"); // Assert server.LogEntries.Should().BeEmpty(); @@ -443,7 +443,7 @@ public class WireMockServerAdminTests client.GetAsync($"{server.Url}/foo3") }; - await Task.WhenAll(tasks).ConfigureAwait(false); + await Task.WhenAll(tasks); // Act var logEntries = server.FindLogEntries(new RequestMessageMethodMatcher("GET")); @@ -549,7 +549,7 @@ public class WireMockServerAdminTests Content = new StringContent(guidsJsonBody, Encoding.UTF8, "application/json") }; - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); // Assert var guids = server.MappingModels.Select(mapping => mapping.Guid!.Value).ToArray(); @@ -557,7 +557,7 @@ public class WireMockServerAdminTests Check.That(guids.Contains(guid2.Value)).IsFalse(); Check.That(guids.Contains(guid3.Value)).IsTrue(); Check.That(response.StatusCode).Equals(HttpStatusCode.OK); - Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}"); + Check.That(await response.Content.ReadAsStringAsync()).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}"); } #if NET5_0_OR_GREATER @@ -570,7 +570,7 @@ public class WireMockServerAdminTests var client = factory.CreateClient("any name"); // Act - await client.GetAsync($"{server.Url}/foo").ConfigureAwait(false); + await client.GetAsync($"{server.Url}/foo"); // Assert Check.That(server.LogEntries).HasSize(1); @@ -592,7 +592,7 @@ public class WireMockServerAdminTests var client = server.CreateClient(); // Act - await client.GetAsync($"{server.Url}/foo").ConfigureAwait(false); + await client.GetAsync($"{server.Url}/foo"); // Assert Check.That(server.LogEntries).HasSize(1); @@ -617,7 +617,7 @@ public class WireMockServerAdminTests var client = server.CreateClient(); // Act - var settings = await client.GetStringAsync($"{server.Url}/adm/settings").ConfigureAwait(false); + var settings = await client.GetStringAsync($"{server.Url}/adm/settings"); // Assert settings.Should().NotBeNull(); diff --git a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs index 479a40a4..06ad5c80 100644 --- a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs +++ b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs @@ -40,7 +40,7 @@ public class WireMockServerAdminFilesTests multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string.")))); // Act - var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false); + var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent); // Assert httpResponseMessage.StatusCode.Should().Be(HttpStatusCode.OK); @@ -74,7 +74,7 @@ public class WireMockServerAdminFilesTests multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string.")))); // Act - var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false); + var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent); // Assert httpResponseMessage.StatusCode.Should().Be(HttpStatusCode.OK); @@ -107,12 +107,12 @@ public class WireMockServerAdminFilesTests multipartFormDataContent.Add(new StreamContent(new MemoryStream())); // Act - var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt").ConfigureAwait(false); + var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt"); // Assert httpResponseMessageGet.StatusCode.Should().Be(HttpStatusCode.OK); - var result = await httpResponseMessageGet.Content.ReadAsStringAsync().ConfigureAwait(false); + var result = await httpResponseMessageGet.Content.ReadAsStringAsync(); result.Should().Be("Here's a string."); // Verify @@ -142,12 +142,12 @@ public class WireMockServerAdminFilesTests multipartFormDataContent.Add(new StreamContent(new MemoryStream())); // Act - var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.bin").ConfigureAwait(false); + var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.bin"); // Assert httpResponseMessageGet.StatusCode.Should().Be(HttpStatusCode.OK); - var result = await httpResponseMessageGet.Content.ReadAsByteArrayAsync().ConfigureAwait(false); + var result = await httpResponseMessageGet.Content.ReadAsByteArrayAsync(); result.Should().BeEquivalentTo(symbol); // Verify @@ -173,7 +173,7 @@ public class WireMockServerAdminFilesTests // Act var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt"; var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri); - var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false); + var httpResponseMessage = await _client.SendAsync(httpRequestMessage); // Assert httpResponseMessage.StatusCode.Should().Be(HttpStatusCode.NoContent); @@ -200,7 +200,7 @@ public class WireMockServerAdminFilesTests // Act var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt"; var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri); - var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false); + var httpResponseMessage = await _client.SendAsync(httpRequestMessage); // Assert httpResponseMessage.StatusCode.Should().Be(HttpStatusCode.NotFound); diff --git a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs index a8ea9df9..49555c84 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs @@ -49,7 +49,7 @@ public class WireMockServerProxyTests RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(httpClientHandler).SendAsync(requestMessage); // Assert Check.That(server.Mappings).HasSize(2); @@ -82,7 +82,7 @@ public class WireMockServerProxyTests Method = HttpMethod.Get, RequestUri = new Uri(server.Url!) }; - await client.SendAsync(requestMessage).ConfigureAwait(false); + await client.SendAsync(requestMessage); } // Assert @@ -115,7 +115,7 @@ public class WireMockServerProxyTests RequestUri = new Uri(server.Url!) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(httpClientHandler).SendAsync(requestMessage); } // Assert @@ -170,7 +170,7 @@ public class WireMockServerProxyTests Content = new StringContent(stringBody) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(httpClientHandler).SendAsync(requestMessage); // Assert server.Mappings.Should().HaveCount(2); @@ -205,7 +205,7 @@ public class WireMockServerProxyTests RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(httpClientHandler).SendAsync(requestMessage); // Assert server.Mappings.Should().HaveCount(1); @@ -241,7 +241,7 @@ public class WireMockServerProxyTests RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(httpClientHandler).SendAsync(requestMessage); // Assert server.Mappings.Should().HaveCount(1); @@ -280,7 +280,7 @@ public class WireMockServerProxyTests RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(httpClientHandler).SendAsync(requestMessage); // Assert server.Mappings.Should().HaveCount(1); @@ -311,7 +311,7 @@ public class WireMockServerProxyTests RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(httpClientHandler).SendAsync(requestMessage); // Assert server.Mappings.Should().HaveCount(2); @@ -335,8 +335,8 @@ public class WireMockServerProxyTests RequestUri = new Uri($"{server.Urls[0]}{path}") }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage); + string content = await response.Content.ReadAsStringAsync(); // Assert Check.That(server.Mappings).HasSize(1); @@ -376,7 +376,7 @@ public class WireMockServerProxyTests }; requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain"); requestMessage.Content.Headers.Add("bbb", "test"); - await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient().SendAsync(requestMessage); // Assert var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; @@ -425,10 +425,10 @@ public class WireMockServerProxyTests Content = new StringContent("stringContent", Encoding.ASCII) }; requestMessage.Headers.Authorization = new AuthenticationHeaderValue("BASIC", "test-A"); - var result = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); + var result = await new HttpClient().SendAsync(requestMessage); // Assert - (await result.Content.ReadAsStringAsync().ConfigureAwait(false)).Should().Be("BASIC test-A"); + (await result.Content.ReadAsStringAsync()).Should().Be("BASIC test-A"); var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; receivedRequest.Headers!["Authorization"].ToString().Should().Be("BASIC test-A"); @@ -471,7 +471,7 @@ public class WireMockServerProxyTests }; requestMessage.Headers.Add("foobar", "exact_match"); requestMessage.Headers.Add("ok", "ok-value"); - await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient().SendAsync(requestMessage); // Assert var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); @@ -518,7 +518,7 @@ public class WireMockServerProxyTests cookieContainer.Add(new Uri("http://localhost"), new Cookie("GoodCookie", "I_should_pass")); var handler = new HttpClientHandler { CookieContainer = cookieContainer }; - await new HttpClient(handler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(handler).SendAsync(requestMessage); // Assert var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); @@ -562,7 +562,7 @@ public class WireMockServerProxyTests RequestUri = new Uri($"{server.Urls[0]}{path}{param01}{param02}"), Content = new StringContent("stringContent"), }; - await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient().SendAsync(requestMessage); // Assert var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); @@ -609,7 +609,7 @@ public class WireMockServerProxyTests }; var handler = new HttpClientHandler(); - await new HttpClient(handler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(handler).SendAsync(requestMessage); // Assert var mapping = serverForProxyForwarding.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); @@ -641,7 +641,7 @@ public class WireMockServerProxyTests Content = new StringContent("") }; requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain"); - await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient().SendAsync(requestMessage); // Assert var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; @@ -673,10 +673,10 @@ public class WireMockServerProxyTests Method = HttpMethod.Get, RequestUri = new Uri($"{server.Urls[0]}{path}") }; - var response = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); + var response = await new HttpClient().SendAsync(requestMessage); // Assert - Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).IsEqualTo("body"); + Check.That(await response.Content.ReadAsStringAsync()).IsEqualTo("body"); Check.That(response.Content.Headers.Contains("Content-Type")).IsTrue(); Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain"); } @@ -707,7 +707,7 @@ public class WireMockServerProxyTests RequestUri = new Uri($"{server.Urls[0]}{path}") }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage); // Assert Check.That(response.Headers.Contains("Location")).IsTrue(); @@ -738,7 +738,7 @@ public class WireMockServerProxyTests }; var clientHandler = new HttpClientHandler(); clientHandler.CookieContainer.Add(requestUri, new Cookie("name", "value")); - await new HttpClient(clientHandler).SendAsync(requestMessage).ConfigureAwait(false); + await new HttpClient(clientHandler).SendAsync(requestMessage); // then var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; @@ -777,7 +777,7 @@ public class WireMockServerProxyTests .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0])); // act - var response = await new HttpClient().PostAsync(server.Urls[0], new ByteArrayContent(jpegHeader)).ConfigureAwait(false); + var response = await new HttpClient().PostAsync(server.Urls[0], new ByteArrayContent(jpegHeader)); // assert Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK); @@ -806,10 +806,10 @@ public class WireMockServerProxyTests Method = HttpMethod.Get, RequestUri = new Uri($"{server.Urls[0]}{path}") }; - var response = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); + var response = await new HttpClient().SendAsync(requestMessage); // Assert - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync(); Check.That(content).IsEqualTo("{\"i\":42}"); Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8"); } @@ -837,10 +837,10 @@ public class WireMockServerProxyTests { { new StringContent("data"), "test", "test.txt" } }; - var response = await new HttpClient().PostAsync(uri, form).ConfigureAwait(false); + var response = await new HttpClient().PostAsync(uri, form); // Assert - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync(); Check.That(content).IsEqualTo("{\"i\":42}"); } @@ -872,10 +872,10 @@ public class WireMockServerProxyTests Method = HttpMethod.Get, RequestUri = new Uri($"{server.Urls[0]}{path}") }; - var response1 = await new HttpClient().SendAsync(requestMessage1).ConfigureAwait(false); + var response1 = await new HttpClient().SendAsync(requestMessage1); // Assert 1 - string content1 = await response1.Content.ReadAsStringAsync().ConfigureAwait(false); + string content1 = await response1.Content.ReadAsStringAsync(); Check.That(content1).IsEqualTo("ok"); // Act 2 @@ -884,10 +884,10 @@ public class WireMockServerProxyTests Method = HttpMethod.Get, RequestUri = new Uri($"{server.Urls[0]}/__admin/mappings") }; - var response2 = await new HttpClient().SendAsync(requestMessage2).ConfigureAwait(false); + var response2 = await new HttpClient().SendAsync(requestMessage2); // Assert 2 - string content2 = await response2.Content.ReadAsStringAsync().ConfigureAwait(false); + string content2 = await response2.Content.ReadAsStringAsync(); Check.That(content2).IsEqualTo("[]"); } @@ -913,12 +913,12 @@ public class WireMockServerProxyTests RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - var result = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + var result = await new HttpClient(httpClientHandler).SendAsync(requestMessage); // Assert result.StatusCode.Should().Be(HttpStatusCode.InternalServerError); - var content = await result.Content.ReadAsStringAsync().ConfigureAwait(false); + var content = await result.Content.ReadAsStringAsync(); content.Should().NotBeEmpty(); server.LogEntries.Should().HaveCount(1); diff --git a/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs b/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs index 9fa748ea..6addd270 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs @@ -37,8 +37,8 @@ namespace WireMock.Net.Tests request.Headers.Add("prx", "1"); // Assert - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); - string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); + string content = await response.Content.ReadAsStringAsync(); Check.That(content).IsEqualTo("{\"p\":42}"); Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.Created); diff --git a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs index d082528c..00b41e7b 100644 --- a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs +++ b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs @@ -75,8 +75,8 @@ public class WireMockServerWebhookTests }; // Assert - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); + var content = await response.Content.ReadAsStringAsync(); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); @@ -124,8 +124,8 @@ public class WireMockServerWebhookTests }; // Assert - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); + var content = await response.Content.ReadAsStringAsync(); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); @@ -180,8 +180,8 @@ public class WireMockServerWebhookTests }; // Assert - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); + var content = await response.Content.ReadAsStringAsync(); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); @@ -235,8 +235,8 @@ public class WireMockServerWebhookTests }; // Assert - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); + var content = await response.Content.ReadAsStringAsync(); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); @@ -267,8 +267,8 @@ public class WireMockServerWebhookTests }; // Assert - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); + var content = await response.Content.ReadAsStringAsync(); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); @@ -301,8 +301,8 @@ public class WireMockServerWebhookTests }; // Assert - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); - var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); + var content = await response.Content.ReadAsStringAsync(); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs index f02163f7..51ec03a1 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs @@ -65,7 +65,7 @@ public partial class WireMockServerTests var requestUri = new Uri($"http://localhost:{server.Port}/a"); var json = new { requestId = "1", value = "A" }; - var response = await server.CreateClient().PostAsJsonAsync(requestUri, json).ConfigureAwait(false); + var response = await server.CreateClient().PostAsJsonAsync(requestUri, json); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -115,7 +115,7 @@ public partial class WireMockServerTests var requestUri = new Uri($"http://localhost:{server.Port}/a"); var json = new { extra = "X", requestId = "1", value = "A" }; - var response = await server.CreateClient().PostAsJsonAsync(requestUri, json).ConfigureAwait(false); + var response = await server.CreateClient().PostAsJsonAsync(requestUri, json); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -141,7 +141,7 @@ public partial class WireMockServerTests }; // Act - var response = await new HttpClient().PostAsJsonAsync("http://localhost:" + server.Ports[0] + "/foo", jsonObject).ConfigureAwait(false); + var response = await new HttpClient().PostAsJsonAsync("http://localhost:" + server.Ports[0] + "/foo", jsonObject); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -162,7 +162,7 @@ public partial class WireMockServerTests ); // Act - var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("{ Hi = \"Hello World\" }")).ConfigureAwait(false); + var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("{ Hi = \"Hello World\" }")); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -195,7 +195,7 @@ public partial class WireMockServerTests var content = "{\"jsonrpc\":\"2.0\",\"id\":\"ec475f56d4694b48bc737500ba575b35-1\",\"method\":\"initialize\",\"params\":{\"protocolVersion\":\"2024-11-05\",\"capabilities\":{},\"clientInfo\":{\"name\":\"GitHub Test\",\"version\":\"1.0.0\"}}}"; var response = await new HttpClient() .PostAsync($"{server.Url}/foo", new StringContent(content, Encoding.UTF8, "application/json")) - .ConfigureAwait(false); +; // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -223,7 +223,7 @@ public partial class WireMockServerTests var content = new FormUrlEncodedContent(new[] { new KeyValuePair("key1", "value1") }); var response = await new HttpClient() .PostAsync($"{server.Url}/foo", content) - .ConfigureAwait(false); +; // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -256,7 +256,7 @@ public partial class WireMockServerTests }); var response = await new HttpClient() .PostAsync($"{server.Url}/foo", content) - .ConfigureAwait(false); +; // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -300,7 +300,7 @@ public partial class WireMockServerTests }); var responseOrdered = await new HttpClient() .PostAsync($"{server.Url}/foo", contentOrdered) - .ConfigureAwait(false); +; // Assert 1 responseOrdered.StatusCode.Should().Be(HttpStatusCode.OK); @@ -314,7 +314,7 @@ public partial class WireMockServerTests }); var responseUnordered = await new HttpClient() .PostAsync($"{server.Url}/bar", contentUnordered) - .ConfigureAwait(false); +; // Assert 2 responseUnordered.StatusCode.Should().Be(HttpStatusCode.OK); @@ -361,7 +361,7 @@ public partial class WireMockServerTests // Act 1 var normal = await new HttpClient() .GetAsync(server.Url) - .ConfigureAwait(false); +; (await normal.Content.ReadAsStringAsync()).Should().Be("normal"); // Act 2 diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs index 5b480942..505fdfe0 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs @@ -30,7 +30,7 @@ namespace WireMock.Net.Tests // Act var httpClient = new HttpClient(); - var response = await httpClient.PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("dummy")).ConfigureAwait(false); + var response = await httpClient.PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("dummy")); // Assert response.StatusCode.Should().Be(HttpStatusCode.Conflict); diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs index 0a7ed22d..0204bf81 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithParam.cs @@ -40,7 +40,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/foo?query={queryValue}"); - var response = await server.CreateClient().GetAsync(requestUri).ConfigureAwait(false); + var response = await server.CreateClient().GetAsync(requestUri); // Assert response.StatusCode.Should().Be(HttpStatusCode.Accepted); @@ -64,7 +64,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/foo?query={queryValue}"); - var response = await server.CreateClient().GetAsync(requestUri).ConfigureAwait(false); + var response = await server.CreateClient().GetAsync(requestUri); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -87,7 +87,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/v1/person/workers?showsourcesystem=true&count=700&page=1§ions=personal%2Corganizations%2Cemployment"); - var response = await server.CreateClient().GetAsync(requestUri).ConfigureAwait(false); + var response = await server.CreateClient().GetAsync(requestUri); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -110,7 +110,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/v1/person/workers?showsourcesystem=true&count=700&page=1§ions=personal%2Corganizations%2Cemployment"); - var response = await server.CreateClient().GetAsync(requestUri).ConfigureAwait(false); + var response = await server.CreateClient().GetAsync(requestUri); // Assert response.StatusCode.Should().Be(HttpStatusCode.NotFound); diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithProbability.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithProbability.cs index 458d7149..4bfcdeea 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithProbability.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithProbability.cs @@ -29,7 +29,7 @@ public partial class WireMockServerTests // Act var requestUri = new Uri($"http://localhost:{server.Port}/foo"); - var response = await server.CreateClient().GetAsync(requestUri).ConfigureAwait(false); + var response = await server.CreateClient().GetAsync(requestUri); // Assert Assert.True(new[] { HttpStatusCode.OK, HttpStatusCode.InternalServerError }.Contains(response.StatusCode)); diff --git a/test/WireMock.Net.Tests/WireMockServerTests.cs b/test/WireMock.Net.Tests/WireMockServerTests.cs index 2641f2b1..6d8cbed1 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.cs @@ -74,7 +74,7 @@ public partial class WireMockServerTests var server = WireMockServer.Start(); // Act - await server.CreateClient().GetAsync("/foo").ConfigureAwait(false); + await server.CreateClient().GetAsync("/foo"); server.ResetLogEntries(); // Assert @@ -136,7 +136,7 @@ public partial class WireMockServerTests using var client = new HttpClient(handler); // Act - var result = await client.GetStringAsync($"{server.Url}{path}").ConfigureAwait(false); + var result = await client.GetStringAsync($"{server.Url}{path}"); // Assert result.Should().Be(body); @@ -184,7 +184,7 @@ public partial class WireMockServerTests { HttpClient.DefaultProxy = new WebProxy(httpUrl, false); - result = await new HttpClient().GetStringAsync(httpUrl).ConfigureAwait(false); + result = await new HttpClient().GetStringAsync(httpUrl); } finally { @@ -289,7 +289,7 @@ public partial class WireMockServerTests .WithBody("REDIRECT SUCCESSFUL")); // Act - var response = await new HttpClient().GetStringAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false); + var response = await new HttpClient().GetStringAsync($"http://localhost:{server.Ports[0]}{path}"); // Assert Check.That(response).IsEqualTo("REDIRECT SUCCESSFUL"); @@ -311,7 +311,7 @@ public partial class WireMockServerTests server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x")); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); + var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo"); // Assert response.Should().Be("x"); @@ -336,7 +336,7 @@ public partial class WireMockServerTests // Act var watch = new Stopwatch(); watch.Start(); - await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); + await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo"); watch.Stop(); // Assert @@ -370,9 +370,9 @@ public partial class WireMockServerTests } // Act - await ExecuteTimedRequestAsync().ConfigureAwait(false); - await ExecuteTimedRequestAsync().ConfigureAwait(false); - await ExecuteTimedRequestAsync().ConfigureAwait(false); + await ExecuteTimedRequestAsync(); + await ExecuteTimedRequestAsync(); + await ExecuteTimedRequestAsync(); server.Stop(); } @@ -390,7 +390,7 @@ public partial class WireMockServerTests // Act var watch = new Stopwatch(); watch.Start(); - await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); + await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo"); watch.Stop(); // Assert @@ -428,7 +428,7 @@ public partial class WireMockServerTests .RespondWith(Response.Create().WithHeader("Transfer-Encoding", "chunked").WithHeader("test", "t")); // Act - var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); + var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path); // Assert Check.That(response.Headers.Contains("test")).IsTrue(); @@ -451,7 +451,7 @@ public partial class WireMockServerTests // Act var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, path); - var response = await server.CreateClient().SendAsync(httpRequestMessage).ConfigureAwait(false); + var response = await server.CreateClient().SendAsync(httpRequestMessage); // Assert response.Content.Headers.GetValues(HttpKnownHeaderNames.ContentLength).Should().Contain(length); @@ -479,7 +479,7 @@ public partial class WireMockServerTests // Act var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost:" + server.Ports[0] + "/"); request.Content = new StringContent(content); - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); // Assert Check.That(response.StatusCode).Equals(HttpStatusCode.OK); @@ -513,7 +513,7 @@ public partial class WireMockServerTests // Act var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost:" + server.Ports[0] + "/"); request.Content = new StringContent(content); - var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); + var response = await new HttpClient().SendAsync(request); // Assert Check.That(response.StatusCode).Equals(HttpStatusCode.OK); @@ -547,11 +547,11 @@ public partial class WireMockServerTests var server = WireMockServer.StartWithAdminInterface(); // Act - var response = await new HttpClient().PostAsync($"{server.Url}/__admin/mappings", stringContent).ConfigureAwait(false); + var response = await new HttpClient().PostAsync($"{server.Url}/__admin/mappings", stringContent); // Assert Check.That(response.StatusCode).Equals(HttpStatusCode.Created); - Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Contains("Mapping added"); + Check.That(await response.Content.ReadAsStringAsync()).Contains("Mapping added"); server.Stop(); } @@ -580,10 +580,10 @@ public partial class WireMockServerTests content.Headers.ContentEncoding.Add(contentEncoding); // Act - var response = await new HttpClient().PostAsync($"{server.Urls[0]}/foo", content).ConfigureAwait(false); + var response = await new HttpClient().PostAsync($"{server.Urls[0]}/foo", content); // Assert - Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Contains("OK"); + Check.That(await response.Content.ReadAsStringAsync()).Contains("OK"); server.Stop(); } @@ -603,7 +603,7 @@ public partial class WireMockServerTests .WithBody("from ipv4 loopback")); // Act - var response = await new HttpClient().GetStringAsync($"http://127.0.0.1:{server.Ports[0]}/foo").ConfigureAwait(false); + var response = await new HttpClient().GetStringAsync($"http://127.0.0.1:{server.Ports[0]}/foo"); // Assert Check.That(response).IsEqualTo("from ipv4 loopback"); @@ -625,7 +625,7 @@ public partial class WireMockServerTests .WithBody("from ipv6 loopback")); // Act - var response = await new HttpClient().GetStringAsync($"http://[::1]:{server.Ports[0]}/foo").ConfigureAwait(false); + var response = await new HttpClient().GetStringAsync($"http://[::1]:{server.Ports[0]}/foo"); // Assert Check.That(response).IsEqualTo("from ipv6 loopback"); @@ -672,7 +672,7 @@ public partial class WireMockServerTests }"); // Act - var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/customer/132/document/pic.jpg", new StringContent("{ Hi = \"Hello World\" }")).ConfigureAwait(false); + var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/customer/132/document/pic.jpg", new StringContent("{ Hi = \"Hello World\" }")); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -719,7 +719,7 @@ public partial class WireMockServerTests }"); // Act - var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/customer/132/document/pic", new StringContent("{ Hi = \"Hello World\" }")).ConfigureAwait(false); + var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/customer/132/document/pic", new StringContent("{ Hi = \"Hello World\" }")); // Assert response.StatusCode.Should().Be(HttpStatusCode.NotFound);