diff --git a/WireMock.Net Solution.sln.DotSettings b/WireMock.Net Solution.sln.DotSettings index 701cb04ec..2e1d593a1 100644 --- a/WireMock.Net Solution.sln.DotSettings +++ b/WireMock.Net Solution.sln.DotSettings @@ -12,11 +12,15 @@ XUA True True + True True True True True + True + True True + True True True \ No newline at end of file diff --git a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs index d1975f65a..e2daeea73 100644 --- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs +++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs @@ -556,7 +556,7 @@ public static void Run() .Given(Request.Create().WithPath("/random200or505async").UsingGet()) .RespondWith(Response.Create().WithCallback(async request => { - await Task.Delay(1); + await Task.Delay(1).ConfigureAwait(false); int code = new Random().Next(1, 2) == 1 ? 505 : 200; diff --git a/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs b/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs index db4eba46d..e8177f181 100644 --- a/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs +++ b/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs @@ -46,7 +46,7 @@ public double IsMatch(string input) try { var configManager = new ConfigurationManager(_stsDiscoveryEndpoint, new OpenIdConnectConfigurationRetriever()); - var config = configManager.GetConfigurationAsync().GetAwaiter().GetResult(); + var config = configManager.GetConfigurationAsync().ConfigureAwait(false).GetAwaiter().GetResult(); var validationParameters = new TokenValidationParameters { diff --git a/src/WireMock.Net/Http/HttpResponseMessageHelper.cs b/src/WireMock.Net/Http/HttpResponseMessageHelper.cs index 7c73f3e56..a11517ba9 100644 --- a/src/WireMock.Net/Http/HttpResponseMessageHelper.cs +++ b/src/WireMock.Net/Http/HttpResponseMessageHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net.Http; @@ -17,7 +17,7 @@ public static async Task CreateAsync(HttpResponseMessage httpRe var headers = (httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers) ?? Enumerable.Empty>>()).ToArray(); if (httpResponseMessage.Content != null) { - var stream = await httpResponseMessage.Content.ReadAsStreamAsync(); + var stream = await httpResponseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false); IEnumerable contentTypeHeader = null; if (headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase))) { @@ -38,7 +38,7 @@ public static async Task CreateAsync(HttpResponseMessage httpRe ContentEncoding = contentEncodingHeader?.FirstOrDefault(), DecompressGZipAndDeflate = decompressGzipAndDeflate }; - responseMessage.BodyData = await BodyParser.Parse(bodyParserSettings); + responseMessage.BodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); } foreach (var header in headers) diff --git a/src/WireMock.Net/Mapping.cs b/src/WireMock.Net/Mapping.cs index 42c87a9ec..2fa77e006 100644 --- a/src/WireMock.Net/Mapping.cs +++ b/src/WireMock.Net/Mapping.cs @@ -108,9 +108,9 @@ public Mapping( } /// - public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage) + public Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage) { - return await Provider.ProvideResponseAsync(requestMessage, Settings); + return Provider.ProvideResponseAsync(requestMessage, Settings); } /// diff --git a/src/WireMock.Net/Matchers/JSONPathMatcher.cs b/src/WireMock.Net/Matchers/JSONPathMatcher.cs index 6d6de3f2c..4f95d5b97 100644 --- a/src/WireMock.Net/Matchers/JSONPathMatcher.cs +++ b/src/WireMock.Net/Matchers/JSONPathMatcher.cs @@ -63,8 +63,8 @@ public double IsMatch(string input) { try { - var jtoken = JToken.Parse(input); - match = IsMatch(jtoken); + var jToken = JToken.Parse(input); + match = IsMatch(jToken); } catch (JsonException) { @@ -89,8 +89,8 @@ public double IsMatch(object input) try { // Check if JToken or object - JToken jtoken = input is JToken token ? token : JObject.FromObject(input); - match = IsMatch(jtoken); + JToken jToken = input is JToken token ? token : JObject.FromObject(input); + match = IsMatch(jToken); } catch (JsonException) { @@ -113,9 +113,9 @@ public AnyOf[] GetPatterns() /// public string Name => "JsonPathMatcher"; - private double IsMatch(JToken jtoken) + private double IsMatch(JToken jToken) { - return MatchScores.ToScore(_patterns.Select(pattern => jtoken.SelectToken(pattern.GetPattern()) != null)); + return MatchScores.ToScore(_patterns.Select(pattern => jToken.SelectToken(pattern.GetPattern()) != null)); } } } \ No newline at end of file diff --git a/src/WireMock.Net/Matchers/SimMetricsMatcher.cs b/src/WireMock.Net/Matchers/SimMetricsMatcher.cs index c02754d52..c67d1563d 100644 --- a/src/WireMock.Net/Matchers/SimMetricsMatcher.cs +++ b/src/WireMock.Net/Matchers/SimMetricsMatcher.cs @@ -83,9 +83,9 @@ public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf public double IsMatch(string input) { - IStringMetric stringmetricType = GetStringMetricType(); + IStringMetric stringMetricType = GetStringMetricType(); - return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_patterns.Select(p => stringmetricType.GetSimilarity(p.GetPattern(), input)))); + return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_patterns.Select(p => stringMetricType.GetSimilarity(p.GetPattern(), input)))); } private IStringMetric GetStringMetricType() diff --git a/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs b/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs index 72ba82216..0f43e878b 100644 --- a/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs +++ b/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using Newtonsoft.Json; #if !USE_ASPNETCORE @@ -52,19 +52,22 @@ public override Task Invoke(IContext ctx) public Task Invoke(IContext ctx) #endif { - return InvokeInternal(ctx); + return InvokeInternalAsync(ctx); } - private async Task InvokeInternal(IContext ctx) + private async Task InvokeInternalAsync(IContext ctx) { try { - await Next?.Invoke(ctx); + if (Next != null) + { + await Next.Invoke(ctx).ConfigureAwait(false); + } } catch (Exception ex) { _options.Logger.Error("HttpStatusCode set to 500 {0}", ex); - await _responseMapper.MapAsync(ResponseMessageBuilder.Create(JsonConvert.SerializeObject(ex), 500), ctx.Response); + await _responseMapper.MapAsync(ResponseMessageBuilder.Create(JsonConvert.SerializeObject(ex), 500), ctx.Response).ConfigureAwait(false); } } } diff --git a/src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs b/src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs index 810903c70..429a52867 100644 --- a/src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs +++ b/src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs @@ -4,7 +4,6 @@ using WireMock.Logging; using WireMock.Matchers; using WireMock.Util; -using JetBrains.Annotations; #if !USE_ASPNETCORE using Owin; #else diff --git a/src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs b/src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs index 0b62aa862..32c9a9350 100644 --- a/src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs +++ b/src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs @@ -65,25 +65,25 @@ public async Task MapAsync(IRequest request, IWireMockMiddleware DecompressGZipAndDeflate = !options.DisableRequestBodyDecompressing.GetValueOrDefault(false) }; - body = await BodyParser.Parse(bodyParserSettings); + body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); } return new RequestMessage(urlDetails, method, clientIP, body, headers, cookies) { DateTime = DateTime.UtcNow }; } - private (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request) + private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request) { #if !USE_ASPNETCORE - var urldetails = UrlUtils.Parse(request.Uri, request.PathBase); + var urlDetails = UrlUtils.Parse(request.Uri, request.PathBase); string clientIP = request.RemoteIpAddress; #else - var urldetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase); + var urlDetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase); var connection = request.HttpContext.Connection; string clientIP = connection.RemoteIpAddress.IsIPv4MappedToIPv6 ? connection.RemoteIpAddress.MapToIPv4().ToString() : connection.RemoteIpAddress.ToString(); #endif - return (urldetails, clientIP); + return (urlDetails, clientIP); } } } \ No newline at end of file diff --git a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs index 81ffb0d87..f5d4f82ab 100644 --- a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs +++ b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -103,7 +103,7 @@ public async Task MapAsync(ResponseMessage responseMessage, IResponse response) if (bytes != null) { - await response.Body.WriteAsync(bytes, 0, bytes.Length); + await response.Body.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false); } } diff --git a/src/WireMock.Net/Owin/WireMockMiddleware.cs b/src/WireMock.Net/Owin/WireMockMiddleware.cs index b70fb468a..4127abd03 100644 --- a/src/WireMock.Net/Owin/WireMockMiddleware.cs +++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using WireMock.Logging; using System.Linq; -using HandlebarsDotNet.Helpers.Utils; using WireMock.Matchers; using WireMock.Http; using WireMock.Owin.Mappers; @@ -70,7 +69,7 @@ public Task Invoke(IContext ctx) private async Task InvokeInternalAsync(IContext ctx) { - var request = await _requestMapper.MapAsync(ctx.Request, _options); + var request = await _requestMapper.MapAsync(ctx.Request, _options).ConfigureAwait(false); var logRequest = false; ResponseMessage response = null; @@ -115,22 +114,22 @@ private async Task InvokeInternalAsync(IContext ctx) if (!targetMapping.IsAdminInterface && _options.RequestProcessingDelay > TimeSpan.Zero) { - await Task.Delay(_options.RequestProcessingDelay.Value); + await Task.Delay(_options.RequestProcessingDelay.Value).ConfigureAwait(false); } - var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request); + var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request).ConfigureAwait(false); response = theResponse; var responseBuilder = targetMapping.Provider as Response; if (!targetMapping.IsAdminInterface && theOptionalNewMapping != null) { - if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMapping == true) + if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping.Settings?.ProxyAndRecordSettings?.SaveMapping == true) { _options.Mappings.TryAdd(theOptionalNewMapping.Guid, theOptionalNewMapping); } - if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMappingToFile == true) + if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping.Settings?.ProxyAndRecordSettings?.SaveMappingToFile == true) { var matcherMapper = new MatcherMapper(targetMapping.Settings); var mappingConverter = new MappingConverter(matcherMapper); @@ -187,10 +186,10 @@ private async Task InvokeInternalAsync(IContext ctx) // Empty catch } - await _responseMapper.MapAsync(response, ctx.Response); + await _responseMapper.MapAsync(response, ctx.Response).ConfigureAwait(false); } - await CompletedTask; + await CompletedTask.ConfigureAwait(false); } private async Task SendToWebhooksAsync(IMapping mapping, RequestMessage request, ResponseMessage response) diff --git a/src/WireMock.Net/Proxy/ProxyHelper.cs b/src/WireMock.Net/Proxy/ProxyHelper.cs index fc4b30338..f872ce398 100644 --- a/src/WireMock.Net/Proxy/ProxyHelper.cs +++ b/src/WireMock.Net/Proxy/ProxyHelper.cs @@ -41,13 +41,13 @@ public ProxyHelper([NotNull] IWireMockServerSettings settings) var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url); // Call the URL - var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead); + var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false); // Create ResponseMessage bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false); bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false); - var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate); + var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate).ConfigureAwait(false); IMapping mapping = null; if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) && diff --git a/src/WireMock.Net/ResponseBuilders/Response.cs b/src/WireMock.Net/ResponseBuilders/Response.cs index 9fe97fac2..6e59269fa 100644 --- a/src/WireMock.Net/ResponseBuilders/Response.cs +++ b/src/WireMock.Net/ResponseBuilders/Response.cs @@ -54,10 +54,7 @@ public TimeSpan? Delay return _delay; } - private set - { - _delay = value; - } + private set => _delay = value; } /// @@ -219,7 +216,7 @@ public IResponseBuilder WithBody(Func> bodyFactory, BodyData = new BodyData { DetectedBodyType = BodyType.String, - BodyAsString = await bodyFactory(req), + BodyAsString = await bodyFactory(req).ConfigureAwait(false), Encoding = encoding ?? Encoding.UTF8 } }); @@ -385,7 +382,7 @@ public IResponseBuilder WithRandomDelay(int minimumMilliseconds = 0, int maximum if (Delay != null) { - await Task.Delay(Delay.Value); + await Task.Delay(Delay.Value).ConfigureAwait(false); } if (ProxyAndRecordSettings != null && _httpClientForProxy != null) @@ -409,7 +406,7 @@ string RemoveFirstOccurrence(string source, string find) _httpClientForProxy, requestMessage, requestMessage.ProxyUrl - ); + ).ConfigureAwait(false); } ResponseMessage responseMessage; @@ -425,7 +422,7 @@ string RemoveFirstOccurrence(string source, string find) } else { - responseMessage = await CallbackAsync(requestMessage); + responseMessage = await CallbackAsync(requestMessage).ConfigureAwait(false); } // Copy StatusCode from ResponseMessage (if defined) diff --git a/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs b/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs index 41a8f7b6f..c9e84166d 100644 --- a/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs +++ b/src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using WireMock.Settings; @@ -15,7 +15,7 @@ public DynamicAsyncResponseProvider(Func> public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings) { - return (await _responseMessageFunc(requestMessage), null); + return (await _responseMessageFunc(requestMessage).ConfigureAwait(false), null); } } } \ No newline at end of file diff --git a/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs b/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs index a67e269ec..d1083aa9a 100644 --- a/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs +++ b/src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using WireMock.Settings; @@ -17,7 +17,7 @@ public ProxyAsyncResponseProvider(Func ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings) { - return (await _responseMessageFunc(requestMessage, _settings), null); + return (await _responseMessageFunc(requestMessage, _settings).ConfigureAwait(false), null); } } } \ No newline at end of file diff --git a/src/WireMock.Net/Serialization/MappingConverter.cs b/src/WireMock.Net/Serialization/MappingConverter.cs index 2fe826954..ebeaaaf53 100644 --- a/src/WireMock.Net/Serialization/MappingConverter.cs +++ b/src/WireMock.Net/Serialization/MappingConverter.cs @@ -3,7 +3,6 @@ using System.Linq; using WireMock.Admin.Mappings; using WireMock.Matchers.Request; -using WireMock.Models; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Settings; diff --git a/src/WireMock.Net/Serialization/MatcherMapper.cs b/src/WireMock.Net/Serialization/MatcherMapper.cs index a92daaa8a..ebf574301 100644 --- a/src/WireMock.Net/Serialization/MatcherMapper.cs +++ b/src/WireMock.Net/Serialization/MatcherMapper.cs @@ -77,8 +77,8 @@ public IMatcher Map([CanBeNull] MatcherModel matcher) return new JsonPartialMatcher(matchBehaviour, valueForJsonPartialMatcher, ignoreCase, throwExceptionWhenMatcherFails); case nameof(JsonPartialWildcardMatcher): - object valueForJsonPartialWilcardMatcher = matcher.Pattern ?? matcher.Patterns; - return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWilcardMatcher, ignoreCase, throwExceptionWhenMatcherFails); + object valueForJsonPartialWildcardMatcher = matcher.Pattern ?? matcher.Patterns; + return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWildcardMatcher, ignoreCase, throwExceptionWhenMatcherFails); case nameof(JsonPathMatcher): return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns); diff --git a/src/WireMock.Net/Server/WireMockServer.Admin.cs b/src/WireMock.Net/Server/WireMockServer.Admin.cs index 0c663ce00..b4ac85667 100644 --- a/src/WireMock.Net/Server/WireMockServer.Admin.cs +++ b/src/WireMock.Net/Server/WireMockServer.Admin.cs @@ -261,7 +261,7 @@ private async Task ProxyAndRecordAsync(RequestMessage requestMe _httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri - ); + ).ConfigureAwait(false); if (mapping != null) { @@ -673,13 +673,13 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel, bool pathO } } - bool pathOrUrlmatchersValid = false; + bool pathOrUrlMatchersValid = false; if (requestModel.Path != null) { if (requestModel.Path is string path) { requestBuilder = requestBuilder.WithPath(path); - pathOrUrlmatchersValid = true; + pathOrUrlMatchersValid = true; } else { @@ -687,7 +687,7 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel, bool pathO if (pathModel?.Matchers != null) { requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(_matcherMapper.Map).OfType().ToArray()); - pathOrUrlmatchersValid = true; + pathOrUrlMatchersValid = true; } } } @@ -696,7 +696,7 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel, bool pathO if (requestModel.Url is string url) { requestBuilder = requestBuilder.WithUrl(url); - pathOrUrlmatchersValid = true; + pathOrUrlMatchersValid = true; } else { @@ -704,12 +704,12 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel, bool pathO if (urlModel?.Matchers != null) { requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(_matcherMapper.Map).OfType().ToArray()); - pathOrUrlmatchersValid = true; + pathOrUrlMatchersValid = true; } } } - if (pathOrUrlRequired && !pathOrUrlmatchersValid) + if (pathOrUrlRequired && !pathOrUrlMatchersValid) { _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added."); return null; diff --git a/src/WireMock.Net/Server/WireMockServer.ImportWireMockOrg.cs b/src/WireMock.Net/Server/WireMockServer.ImportWireMockOrg.cs index 5262f349d..22ddfa5b2 100644 --- a/src/WireMock.Net/Server/WireMockServer.ImportWireMockOrg.cs +++ b/src/WireMock.Net/Server/WireMockServer.ImportWireMockOrg.cs @@ -114,7 +114,7 @@ private ResponseMessage MappingsPostWireMockOrg(RequestMessage requestMessage) { ProcessWireMockOrgJObjectAndUseStringMatcher(headers, (key, match) => { - requestBuilder = requestBuilder.WithHeader(key, match as IStringMatcher); + requestBuilder = requestBuilder.WithHeader(key, match); }); } @@ -122,7 +122,7 @@ private ResponseMessage MappingsPostWireMockOrg(RequestMessage requestMessage) { ProcessWireMockOrgJObjectAndUseStringMatcher(cookies, (key, match) => { - requestBuilder = requestBuilder.WithCookie(key, match as IStringMatcher); + requestBuilder = requestBuilder.WithCookie(key, match); }); } diff --git a/src/WireMock.Net/Server/WireMockServer.LogEntries.cs b/src/WireMock.Net/Server/WireMockServer.LogEntries.cs index ee27b497b..e79c8d572 100644 --- a/src/WireMock.Net/Server/WireMockServer.LogEntries.cs +++ b/src/WireMock.Net/Server/WireMockServer.LogEntries.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -77,7 +77,7 @@ public void ResetLogEntries() [PublicAPI] public bool DeleteLogEntry(Guid guid) { - // Check a logentry exists with the same GUID, if so, remove it. + // Check a LogEntry exists with the same GUID, if so, remove it. var existing = _options.LogEntries.ToList().FirstOrDefault(m => m.Guid == guid); if (existing != null) { diff --git a/src/WireMock.Net/Transformers/Transformer.cs b/src/WireMock.Net/Transformers/Transformer.cs index 901590f2d..998577796 100644 --- a/src/WireMock.Net/Transformers/Transformer.cs +++ b/src/WireMock.Net/Transformers/Transformer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; @@ -7,7 +7,7 @@ using WireMock.Types; using WireMock.Util; -namespace WireMock.Transformers.Handlebars +namespace WireMock.Transformers { internal class Transformer : ITransformer { diff --git a/src/WireMock.Net/Util/BodyParser.cs b/src/WireMock.Net/Util/BodyParser.cs index cd91c9c9a..82c9f3926 100644 --- a/src/WireMock.Net/Util/BodyParser.cs +++ b/src/WireMock.Net/Util/BodyParser.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Net.Http.Headers; @@ -107,15 +107,15 @@ public static BodyType DetectBodyTypeFromContentType([CanBeNull] string contentT return BodyType.Bytes; } - public static async Task Parse([NotNull] BodyParserSettings settings) + public static async Task ParseAsync([NotNull] BodyParserSettings settings) { Check.NotNull(settings, nameof(settings)); - var bodyWithContentEncoding = await ReadBytesAsync(settings.Stream, settings.ContentEncoding, settings.DecompressGZipAndDeflate); + var bodyWithContentEncoding = await ReadBytesAsync(settings.Stream, settings.ContentEncoding, settings.DecompressGZipAndDeflate).ConfigureAwait(false); var data = new BodyData { - BodyAsBytes = bodyWithContentEncoding.Value, - DetectedCompression = bodyWithContentEncoding.Key, + BodyAsBytes = bodyWithContentEncoding.Bytes, + DetectedCompression = bodyWithContentEncoding.ContentType, DetectedBodyType = BodyType.Bytes, DetectedBodyTypeFromContentType = DetectBodyTypeFromContentType(settings.ContentType) }; @@ -163,20 +163,20 @@ public static async Task Parse([NotNull] BodyParserSettings settings) return data; } - private static async Task> ReadBytesAsync(Stream stream, string contentEncoding = null, bool decompressGZipAndDeflate = true) + private static async Task<(string ContentType, byte[] Bytes)> ReadBytesAsync(Stream stream, string contentEncoding = null, bool decompressGZipAndDeflate = true) { using (var memoryStream = new MemoryStream()) { - await stream.CopyToAsync(memoryStream); + await stream.CopyToAsync(memoryStream).ConfigureAwait(false); byte[] data = memoryStream.ToArray(); string type = contentEncoding?.ToLowerInvariant(); if (decompressGZipAndDeflate && (type == "gzip" || type == "deflate")) { - return new KeyValuePair(type, CompressionUtils.Decompress(type, data)); + return (type, CompressionUtils.Decompress(type, data)); } - return new KeyValuePair(null, data); + return (null, data); } } } diff --git a/src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs b/src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs index 50bdb6d77..ad4f4a484 100644 --- a/src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs +++ b/src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Concurrent; using System.IO; using JetBrains.Annotations; @@ -16,7 +16,7 @@ public class EnhancedFileSystemWatcher : FileSystemWatcher // Default Watch Interval in Milliseconds private const int DefaultWatchInterval = 100; - // This Dictionary keeps the track of when an event occured last for a particular file + // This Dictionary keeps the track of when an event occurred last for a particular file private ConcurrentDictionary _lastFileEvent; // Watch Interval in Milliseconds @@ -176,13 +176,13 @@ private void InitializeMembers(int interval = 100) } /// - /// This method searches the dictionary to find out when the last event occured - /// for a particular file. If that event occured within the specified timespan + /// This method searches the dictionary to find out when the last event occurred + /// for a particular file. If that event occurred within the specified timespan /// it returns true, else false /// /// The filename to be checked - /// True if an event has occured within the specified interval, False otherwise - private bool HasAnotherFileEventOccuredRecently(string fileName) + /// True if an event has occurred within the specified interval, False otherwise + private bool HasAnotherFileEventOccurredRecently(string fileName) { // Check dictionary only if user wants to filter recent events otherwise return value stays false. if (!FilterRecentEvents) @@ -194,7 +194,7 @@ private bool HasAnotherFileEventOccuredRecently(string fileName) if (_lastFileEvent.ContainsKey(fileName)) { // If dictionary contains the filename, check how much time has elapsed - // since the last event occured. If the timespan is less that the + // since the last event occurred. If the timespan is less that the // specified interval, set return value to true // and store current datetime in dictionary for this file DateTime lastEventTime = _lastFileEvent[fileName]; @@ -206,7 +206,7 @@ private bool HasAnotherFileEventOccuredRecently(string fileName) else { // If dictionary does not contain the filename, - // no event has occured in past for this file, so set return value to false + // no event has occurred in past for this file, so set return value to false // and append filename along with current datetime to the dictionary _lastFileEvent.TryAdd(fileName, DateTime.Now); } @@ -215,11 +215,11 @@ private bool HasAnotherFileEventOccuredRecently(string fileName) } #region FileSystemWatcher EventHandlers - // Base class Event Handlers. Check if an event has occured recently and call method + // Base class Event Handlers. Check if an event has occurred recently and call method // to raise appropriate event only if no recent event is detected private void OnChanged(object sender, FileSystemEventArgs e) { - if (!HasAnotherFileEventOccuredRecently(e.FullPath)) + if (!HasAnotherFileEventOccurredRecently(e.FullPath)) { OnChanged(e); } @@ -227,7 +227,7 @@ private void OnChanged(object sender, FileSystemEventArgs e) private void OnCreated(object sender, FileSystemEventArgs e) { - if (!HasAnotherFileEventOccuredRecently(e.FullPath)) + if (!HasAnotherFileEventOccurredRecently(e.FullPath)) { OnCreated(e); } @@ -235,7 +235,7 @@ private void OnCreated(object sender, FileSystemEventArgs e) private void OnDeleted(object sender, FileSystemEventArgs e) { - if (!HasAnotherFileEventOccuredRecently(e.FullPath)) + if (!HasAnotherFileEventOccurredRecently(e.FullPath)) { OnDeleted(e); } @@ -243,7 +243,7 @@ private void OnDeleted(object sender, FileSystemEventArgs e) private void OnRenamed(object sender, RenamedEventArgs e) { - if (!HasAnotherFileEventOccuredRecently(e.OldFullPath)) + if (!HasAnotherFileEventOccurredRecently(e.OldFullPath)) { OnRenamed(e); } diff --git a/src/dotnet-WireMock.Net/Program.cs b/src/dotnet-WireMock.Net/Program.cs index b4b803943..49cb98584 100644 --- a/src/dotnet-WireMock.Net/Program.cs +++ b/src/dotnet-WireMock.Net/Program.cs @@ -46,7 +46,7 @@ static async Task Main(string[] args) while (true) { Logger.Info("Server running : {IsStarted}", Server.IsStarted); - await Task.Delay(SleepTime); + await Task.Delay(SleepTime).ConfigureAwait(false); } } diff --git a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs index b56c85cbe..deb31564d 100644 --- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs +++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs @@ -33,7 +33,7 @@ public WireMockAssertionsTests() [Fact] public async Task AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl"); + await _httpClient.GetAsync("anyurl").ConfigureAwait(false); _server.Should() .HaveReceivedACall() @@ -56,7 +56,7 @@ public void AtAbsoluteUrl_Should_ThrowWhenNoCallsWereMade() [Fact] public async Task AtAbsoluteUrl_Should_ThrowWhenNoCallsMatchingTheAbsoluteUrlWereMade() { - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); Action act = () => _server.Should() .HaveReceivedACall() @@ -72,7 +72,7 @@ public async Task AtAbsoluteUrl_Should_ThrowWhenNoCallsMatchingTheAbsoluteUrlWer public async Task WithHeader_WhenACallWasMadeWithExpectedHeader_Should_BeOK() { _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer a"); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); _server.Should() .HaveReceivedACall() @@ -84,7 +84,7 @@ public async Task WithHeader_WhenACallWasMadeWithExpectedHeaderAmongMultipleHead { _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); _server.Should() .HaveReceivedACall() @@ -94,7 +94,7 @@ public async Task WithHeader_WhenACallWasMadeWithExpectedHeaderAmongMultipleHead [Fact] public async Task WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderNameWereMade() { - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); Action act = () => _server.Should() .HaveReceivedACall() @@ -110,7 +110,7 @@ public async Task WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderValuesWereM { _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); Action act = () => _server.Should() .HaveReceivedACall() @@ -134,7 +134,7 @@ public async Task WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderWithMultipl { _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); Action act = () => _server.Should() .HaveReceivedACall() @@ -153,7 +153,7 @@ public async Task WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderWithMultipl [Fact] public async Task AtUrl_WhenACallWasMadeToUrl_Should_BeOK() { - await _httpClient.GetAsync("anyurl"); + await _httpClient.GetAsync("anyurl").ConfigureAwait(false); _server.Should() .HaveReceivedACall() @@ -176,7 +176,7 @@ public void AtUrl_Should_ThrowWhenNoCallsWereMade() [Fact] public async Task AtUrl_Should_ThrowWhenNoCallsMatchingTheUrlWereMade() { - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); Action act = () => _server.Should() .HaveReceivedACall() @@ -195,7 +195,7 @@ public async Task WithProxyUrl_WhenACallWasMadeWithProxyUrl_Should_BeOK() _server.Given(Request.Create().UsingAnyMethod()) .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" })); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); _server.Should() .HaveReceivedACall() @@ -226,7 +226,7 @@ public async Task WithProxyUrl_Should_ThrowWhenNoCallsWithTheProxyUrlWereMade() _server.Given(Request.Create().UsingAnyMethod()) .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" })); - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); Action act = () => _server.Should() .HaveReceivedACall() @@ -241,7 +241,7 @@ public async Task WithProxyUrl_Should_ThrowWhenNoCallsWithTheProxyUrlWereMade() [Fact] public async Task FromClientIP_whenACallWasMadeFromClientIP_Should_BeOK() { - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP; _server.Should() @@ -265,7 +265,7 @@ public void FromClientIP_Should_ThrowWhenNoCallsWereMade() [Fact] public async Task FromClientIP_Should_ThrowWhenNoCallsFromClientIPWereMade() { - await _httpClient.GetAsync(""); + await _httpClient.GetAsync("").ConfigureAwait(false); var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP; Action act = () => _server.Should() diff --git a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs index 2bb6169c4..8f15ead75 100644 --- a/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs @@ -1,4 +1,4 @@ -using System.Net.Http.Headers; +using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using FluentAssertions; @@ -20,7 +20,7 @@ public async Task ByteArrayContentHelperTests_Create_WithNullContentType() // Assert result.Headers.ContentType.Should().BeNull(); - (await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content); + (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content); } [Theory] @@ -38,7 +38,7 @@ public async Task ByteArrayContentHelperTests_Create(string test, string expecte // Assert result.Headers.ContentType.ToString().Should().Be(expected); - (await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content); + (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content); } } } diff --git a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs index 71c090c15..689c9efbf 100644 --- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs +++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs @@ -1,4 +1,4 @@ -using NFluent; +using NFluent; using System.Collections.Generic; using System.Text; using System.Threading.Tasks; @@ -43,7 +43,7 @@ public async Task HttpRequestMessageHelper_Create_Bytes() var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content.ReadAsByteArrayAsync()).ContainsExactly(Encoding.UTF8.GetBytes("hi")); + Check.That(await message.Content.ReadAsByteArrayAsync().ConfigureAwait(false)).ContainsExactly(Encoding.UTF8.GetBytes("hi")); } [Fact] @@ -61,7 +61,7 @@ public async Task HttpRequestMessageHelper_Create_Json() var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}"); + Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}"); } [Fact] @@ -80,7 +80,7 @@ public async Task HttpRequestMessageHelper_Create_Json_With_ContentType_Applicat var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}"); + Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}"); Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json"); } @@ -100,7 +100,7 @@ public async Task HttpRequestMessageHelper_Create_Json_With_ContentType_Applicat var message = HttpRequestMessageHelper.Create(request, "http://url"); // Assert - Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}"); + Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}"); Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8"); } diff --git a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs index e3dfaed40..edd81326e 100644 --- a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs +++ b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -41,7 +41,7 @@ public async Task WireMockServer_LogEntriesChanged_WithException_Should_LogError server.LogEntriesChanged += (sender, args) => throw new Exception(); // Act - await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}"); + await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false); // Assert loggerMock.Verify(l => l.Error(It.IsAny(), It.IsAny()), Times.Once); @@ -65,7 +65,7 @@ public async Task WireMockServer_LogEntriesChanged() server.LogEntriesChanged += (sender, args) => count++; // Act - await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}"); + await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false); // Assert Check.That(count).Equals(1); @@ -101,7 +101,7 @@ public async Task WireMockServer_LogEntriesChanged_Parallel() Thread.Sleep(50); listOfTasks.Add(http.GetAsync($"{server.Urls[0]}{path}")); } - var responses = await Task.WhenAll(listOfTasks); + var responses = await Task.WhenAll(listOfTasks).ConfigureAwait(false); 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 b0c4b187a..576f243c4 100644 --- a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs +++ b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using Xunit; using Moq; @@ -66,7 +66,7 @@ public OwinResponseMapperTests() public async Task OwinResponseMapper_MapAsync_Null() { // Act - await _sut.MapAsync(null, _responseMock.Object); + await _sut.MapAsync(null, _responseMock.Object).ConfigureAwait(false); } [Theory] @@ -81,7 +81,7 @@ public async Task OwinResponseMapper_MapAsync_Valid_StatusCode(object code, int }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); @@ -102,7 +102,7 @@ public async Task OwinResponseMapper_MapAsync_Invalid_StatusCode_When_AllowOnlyD }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); @@ -118,7 +118,7 @@ public async Task OwinResponseMapper_MapAsync_StatusCode_Is_Null() }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _responseMock.VerifySet(r => r.StatusCode = It.IsAny(), Times.Never); @@ -138,7 +138,7 @@ public async Task OwinResponseMapper_MapAsync_StatusCode_Is_NotInEnumRange(objec }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); @@ -154,7 +154,7 @@ public async Task OwinResponseMapper_MapAsync_NoBody() }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _stream.Verify(s => s.WriteAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); @@ -172,7 +172,7 @@ public async Task OwinResponseMapper_MapAsync_Body() }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny()), Times.Once); @@ -190,7 +190,7 @@ public async Task OwinResponseMapper_MapAsync_BodyAsBytes() }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _stream.Verify(s => s.WriteAsync(bytes, 0, bytes.Length, It.IsAny()), Times.Once); @@ -208,7 +208,7 @@ public async Task OwinResponseMapper_MapAsync_BodyAsJson() }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _stream.Verify(s => s.WriteAsync(new byte[] { 123, 34, 116, 34, 58, 34, 120, 34, 125 }, 0, 9, It.IsAny()), Times.Once); @@ -224,7 +224,7 @@ public async Task OwinResponseMapper_MapAsync_SetResponseHeaders() }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert #if NET452 @@ -248,7 +248,7 @@ public async Task OwinResponseMapper_MapAsync_WithFault_EMPTY_RESPONSE() }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // Assert _stream.Verify(s => s.WriteAsync(new byte[0], 0, 0, It.IsAny()), Times.Once); @@ -270,7 +270,7 @@ public async Task OwinResponseMapper_MapAsync_WithFault_MALFORMED_RESPONSE_CHUNK }; // Act - await _sut.MapAsync(responseMessage, _responseMock.Object); + await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false); // 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 93d1d766b..af712f548 100644 --- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs +++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs @@ -80,7 +80,7 @@ public WireMockMiddlewareTests() public async Task WireMockMiddleware_Invoke_NoMatch() { // Act - await _sut.Invoke(_contextMock.Object); + await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); // Assert and Verify _optionsMock.Verify(o => o.Logger.Warn(It.IsAny(), It.IsAny()), Times.Once); @@ -103,7 +103,7 @@ public async Task WireMockMiddleware_Invoke_IsAdminInterface_EmptyHeaders_401() _matcherMock.Setup(m => m.FindBestMatch(It.IsAny())).Returns((result, result)); // Act - await _sut.Invoke(_contextMock.Object); + await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); // Assert and Verify _optionsMock.Verify(o => o.Logger.Error(It.IsAny(), It.IsAny()), Times.Once); @@ -126,7 +126,7 @@ public async Task WireMockMiddleware_Invoke_IsAdminInterface_MissingHeader_401() _matcherMock.Setup(m => m.FindBestMatch(It.IsAny())).Returns((result, result)); // Act - await _sut.Invoke(_contextMock.Object); + await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); // Assert and Verify _optionsMock.Verify(o => o.Logger.Error(It.IsAny(), It.IsAny()), Times.Once); @@ -142,7 +142,7 @@ public async Task WireMockMiddleware_Invoke_RequestLogExpirationDurationIsDefine _optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1); // Act - await _sut.Invoke(_contextMock.Object); + await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); } [Fact] @@ -186,7 +186,7 @@ public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_A _matcherMock.Setup(m => m.FindBestMatch(It.IsAny())).Returns((result, result)); // Act - await _sut.Invoke(_contextMock.Object); + await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); // Assert and Verify fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny(), It.IsAny()), Times.Once); @@ -240,7 +240,7 @@ public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_A _matcherMock.Setup(m => m.FindBestMatch(It.IsAny())).Returns((result, result)); // Act - await _sut.Invoke(_contextMock.Object); + await _sut.Invoke(_contextMock.Object).ConfigureAwait(false); // 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 8573bc2d2..de388b2b3 100644 --- a/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs +++ b/test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs @@ -301,7 +301,7 @@ public async Task RequestMessageBodyMatcher_GetMatchingScore_Funcs_Matching(obje ContentType = null, DeserializeJson = true }; - bodyData = await BodyParser.Parse(bodyParserSettings); + bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); } else if (body is string s) { @@ -311,7 +311,7 @@ public async Task RequestMessageBodyMatcher_GetMatchingScore_Funcs_Matching(obje ContentType = null, DeserializeJson = true }; - bodyData = await BodyParser.Parse(bodyParserSettings); + bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); } else { diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs index 0c3e17ae7..a49eae027 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs @@ -1,4 +1,4 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using NFluent; using WireMock.Models; using WireMock.ResponseBuilders; @@ -21,7 +21,7 @@ public async Task Response_Create_Func() var responseBuilder = Response.Create(() => responseMessage); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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 b9f2bf3b9..b1a91bf38 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using FluentAssertions; using System; using System.Collections.Generic; using System.IO; @@ -37,7 +37,7 @@ public async Task Response_ProvideResponse_WithBodyFromFile_AbsolutePath() ); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); + var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false); // Assert response.Should().Contain("world"); @@ -68,7 +68,7 @@ public async Task Response_ProvideResponse_WithBodyFromFile_InSubDirectory() ); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); + var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false); // Assert response.Should().Contain("world"); @@ -99,7 +99,7 @@ public async Task Response_ProvideResponse_WithBodyFromFile_InAdminMappingFolder ); // Act - var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content"); + var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false); // Assert response.Should().Contain("world"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs index 8b47c9cab..6c56302b0 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Text; using System.Threading.Tasks; using Moq; @@ -43,7 +43,7 @@ public async Task Response_ProvideResponse_WithBody_Bytes_Encoding_Destination_S var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // then Check.That(response.Message.BodyData.BodyAsString).Equals("01"); @@ -65,7 +65,7 @@ public async Task Response_ProvideResponse_WithBody_Bytes_Encoding_Destination_B var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // then Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 }); @@ -87,7 +87,7 @@ public async Task Response_ProvideResponse_WithBody_String_Encoding() var responseBuilder = Response.Create().WithBody("test", null, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // then Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -109,7 +109,7 @@ public async Task Response_ProvideResponse_WithBody_Object_Encoding() var responseBuilder = Response.Create().WithBodyAsJson(x, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // then Check.That(response.Message.BodyData.BodyAsJson).Equals(x); @@ -131,7 +131,7 @@ public async Task Response_ProvideResponse_WithBody_Object_Indented() var responseBuilder = Response.Create().WithBodyAsJson(x, true); // act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // then Check.That(response.Message.BodyData.BodyAsJson).Equals(x); @@ -147,7 +147,7 @@ public async Task Response_ProvideResponse_WithBody_String_SameAsSource_Encoding var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); @@ -165,7 +165,7 @@ public async Task Response_ProvideResponse_WithBody_String_Bytes_Encoding() var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).IsNull(); @@ -183,7 +183,7 @@ public async Task Response_ProvideResponse_WithBody_String_Json_Encoding() var responseBuilder = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).IsNull(); @@ -205,7 +205,7 @@ public async Task Response_ProvideResponse_WithBody_Func() .WithBody(req => $"path: {req.Path}"); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); @@ -229,12 +229,12 @@ public async Task Response_ProvideResponse_WithBody_FuncAsync() .WithHeader("H2", "X2") .WithBody(async req => { - await Task.Delay(1); + await Task.Delay(1).ConfigureAwait(false); return $"path: {req.Path}"; }); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); @@ -262,8 +262,8 @@ public async Task Response_ProvideResponse_WithJsonBodyAndTransform_Func() .WithTransformer(); // Act - var response1 = await responseBuilder.ProvideResponseAsync(request1, _settings); - var response2 = await responseBuilder.ProvideResponseAsync(request2, _settings); + var response1 = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false); + var response2 = await responseBuilder.ProvideResponseAsync(request2, _settings).ConfigureAwait(false); // Assert Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value()).IsEqualTo(request1Id); @@ -287,7 +287,7 @@ public async Task Response_ProvideResponse_WithBodyAsFile() var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents); - var response = await responseBuilder.ProvideResponseAsync(request1, _settings); + var response = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); @@ -303,7 +303,7 @@ public async Task Response_ProvideResponse_WithResponseAsFile() var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents); - var response = await responseBuilder.ProvideResponseAsync(request1, _settings); + var response = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); @@ -319,7 +319,7 @@ public async Task Response_ProvideResponse_WithResponseDeleted() var responseBuilder = Response.Create().WithStatusCode(200).WithBody("File deleted."); - var response = await responseBuilder.ProvideResponseAsync(request1, _settings); + var response = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted."); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs index 7c50ad75e..cba83e86e 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs @@ -50,7 +50,7 @@ public async Task Response_WithCallbackAsync() }); // Act - var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -74,7 +74,7 @@ public async Task Response_WithCallback() }); // Act - var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -103,7 +103,7 @@ public async Task Response_WithCallback_ShouldUseStatusCodeAndHeaderInTheCallbac }); // Act - var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -135,7 +135,7 @@ public async Task Response_WithCallback_And_Additional_WithStatusCode_And_WithHe .WithHeader(header, "Stef"); // Act - var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -161,7 +161,7 @@ public async Task Response_WithCallback_And_UseTransformer_Is_True() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs index 378f4d1d6..119b49493 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs @@ -1,4 +1,4 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using FluentAssertions; using WireMock.Models; using WireMock.ResponseBuilders; @@ -22,7 +22,7 @@ public async Task Response_ProvideResponse_WithFault(FaultType faultType) // Act var responseBuilder = Response.Create().WithFault(faultType); - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert response.Message.FaultType.Should().Be(faultType); @@ -38,7 +38,7 @@ public async Task Response_ProvideResponse_WithFault_IncludingPercentage(FaultTy // Act var responseBuilder = Response.Create().WithFault(faultType, percentage); - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert response.Message.FaultType.Should().Be(faultType); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs index a0e8428ed..dc067f7a3 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs @@ -1,4 +1,4 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using HandlebarsDotNet; using Moq; using Newtonsoft.Json.Linq; @@ -39,7 +39,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_File() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -64,7 +64,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_File_Replace() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject 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 fc2222961..9d1f91ce8 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs @@ -1,4 +1,4 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using Moq; using NFluent; using WireMock.Handlers; @@ -39,7 +39,7 @@ public async Task Response_ProvideResponseAsync_HandlebarsHelpers_String_Upperca .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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 816af1268..fa06ee041 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs @@ -40,7 +40,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_Humanizer() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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 c71768f3b..207f74c00 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Text; using System.Threading.Tasks; using Moq; @@ -77,7 +77,7 @@ public async Task Response_ProvideResponse_Handlebars_JsonPath_SelectToken_Objec .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -103,7 +103,7 @@ public async Task Response_ProvideResponse_Handlebars_JsonPath_SelectToken_Numbe .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -157,7 +157,7 @@ public async Task Response_ProvideResponse_Handlebars_JsonPath_SelectToken_Reque .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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}}}"); @@ -210,7 +210,7 @@ public async Task Response_ProvideResponse_Handlebars_JsonPath_SelectToken_Reque .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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}}}"); @@ -263,7 +263,7 @@ public async Task Response_ProvideResponse_Handlebars_JsonPath_SelectTokens_Requ .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); @@ -316,7 +316,7 @@ public async Task Response_ProvideResponse_Handlebars_JsonPath_SelectTokens_Requ .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); @@ -369,7 +369,7 @@ public async Task Response_ProvideResponse_Transformer_WithBodyAsFile_JsonPath() .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ? // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.json"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs index 2ce7c1dbd..427ed4423 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs @@ -42,7 +42,7 @@ public async Task Response_ProvideResponse_Handlebars_Linq1_String0() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -72,7 +72,7 @@ public async Task Response_ProvideResponse_Handlebars_Linq1_String1() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -102,7 +102,7 @@ public async Task Response_ProvideResponse_Handlebars_Linq1_String2() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -132,7 +132,7 @@ public async Task Response_ProvideResponse_Handlebars_Linq2_Object() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -213,7 +213,7 @@ public void Response_ProvideResponse_Handlebars_Linq1_ParseError_Throws_Exceptio .WithTransformer(); // Act - Func a = async () => await responseBuilder.ProvideResponseAsync(request, _settings); + Func a = async () => await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert a.Should().ThrowAsync(); @@ -240,7 +240,7 @@ public void Response_ProvideResponse_Handlebars_Linq2_ParseError_Throws_Exceptio .WithTransformer(); // Act - Func a = async () => await responseBuilder.ProvideResponseAsync(request, _settings); + Func a = async () => await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert a.Should().ThrowAsync(); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs index c14d0bf2f..6afc2ca4d 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Threading.Tasks; using Moq; using Newtonsoft.Json.Linq; @@ -43,7 +43,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_Random1() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -66,7 +66,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_Random1_Boolean() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -88,7 +88,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_Random1_Guid() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -112,7 +112,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_Random1_StringList() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -134,7 +134,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_Random2() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert JObject 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 be180bb3b..534fec428 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using Moq; using NFluent; @@ -40,7 +40,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_RegexMatch() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // assert Check.That(response.Message.BodyData.BodyAsString).Equals("abc"); @@ -59,7 +59,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_RegexMatch_NoMatch() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // assert Check.That(response.Message.BodyData.BodyAsString).Equals(""); @@ -78,7 +78,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_RegexMatch2() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // assert Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https"); @@ -97,7 +97,7 @@ public async Task Response_ProvideResponseAsync_Handlebars_RegexMatch2_NoMatch() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // assert Check.That(response.Message.BodyData.BodyAsString).Equals(""); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs index bc2a1f912..8b14c04e1 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs @@ -1,4 +1,4 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Xml; using NFluent; using WireMock.Models; @@ -53,7 +53,7 @@ public async Task Response_ProvideResponse_Handlebars_XPath_SelectSingleNode_Req .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator(); @@ -84,7 +84,7 @@ public async Task Response_ProvideResponse_Handlebars_XPath_SelectSingleNode_Tex .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc"); @@ -112,7 +112,7 @@ public async Task Response_ProvideResponse_Handlebars_XPath_SelectNodes_Request_ .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator(); @@ -170,7 +170,7 @@ public async Task Response_ProvideResponse_Handlebars_XPath_SelectSingleNode_Req .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.BodyAsString.Should().Contain("TokenIdLijst").And.Contain("0000083256").And.Contain("0000083259"); @@ -198,7 +198,7 @@ public async Task Response_ProvideResponse_Handlebars_XPath_Evaluate_Request_Bod .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True"); @@ -226,7 +226,7 @@ public async Task Response_ProvideResponse_Handlebars_XPath_Evaluate_Attribute_R .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs index 87120b0c7..da9ed079f 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; using NFluent; using WireMock.Models; @@ -25,7 +25,7 @@ public async Task Response_ProvideResponse_WithHeader_SingleValue(string headerN IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValue); // Act - var response = await builder.ProvideResponseAsync(requestMock, _settings); + var response = await builder.ProvideResponseAsync(requestMock, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue); @@ -41,7 +41,7 @@ public async Task Response_ProvideResponse_WithHeader_MultipleValues(string head IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValues); // Act - var response = await builder.ProvideResponseAsync(requestMock, _settings); + var response = await builder.ProvideResponseAsync(requestMock, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues); @@ -56,7 +56,7 @@ public async Task Response_ProvideResponse_WithHeaders_SingleValue() var response = Response.Create().WithHeaders(headers); // Act - var responseMessage = await response.ProvideResponseAsync(request, _settings); + var responseMessage = await response.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x"); @@ -71,7 +71,7 @@ public async Task Response_ProvideResponse_WithHeaders_MultipleValues() var responseBuilder = Response.Create().WithHeaders(headers); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.Headers["h"]).ContainsExactly("x"); @@ -86,7 +86,7 @@ public async Task Response_ProvideResponse_WithHeaders_WiremockList() var builder = Response.Create().WithHeaders(headers); // Act - var response = await builder.ProvideResponseAsync(request, _settings); + var response = await builder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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 eb9489425..a1e7c32ed 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; @@ -49,7 +49,7 @@ public async Task Response_WithProxy(string prepend, string append, string expec var responseBuilder = Response.Create().WithProxy(_server.Urls[0]); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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 c72e58df6..d7dbc1462 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using FluentAssertions; using NFluent; @@ -43,7 +43,7 @@ public async Task Response_ProvideResponse_DotLiquid_WithNullBody_ShouldNotThrow var responseBuilder = Response.Create().WithTransformer(TransformerType.ScribanDotLiquid); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.Should().BeNull(); @@ -65,7 +65,7 @@ public async Task Response_ProvideResponse_DotLiquid_UrlPathVerb() .WithTransformer(TransformerType.Scriban); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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 dc14c9515..49cd36bea 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using FluentAssertions; using Moq; using System.Net; using System.Threading.Tasks; @@ -40,7 +40,7 @@ public async Task Response_ProvideResponse_WithStatusCode(object statusCode, obj break; } - var response = await responseBuilder.ProvideResponseAsync(request, _settingsMock.Object); + var response = await responseBuilder.ProvideResponseAsync(request, _settingsMock.Object).ConfigureAwait(false); // 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 61bea898a..230143f36 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Threading.Tasks; @@ -49,7 +49,7 @@ public async Task Response_ProvideResponse_Transformer_WithNullBody_ShouldNotThr var responseBuilder = Response.Create().WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.Should().BeNull(); @@ -74,7 +74,7 @@ public async Task Response_ProvideResponse_Transformer_UrlPathVerb(TransformerTy .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt"); @@ -98,7 +98,7 @@ public async Task Response_ProvideResponse_Transformer_UrlPath(TransformerType t .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // 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"); @@ -116,7 +116,7 @@ public async Task Response_ProvideResponse_Handlebars_PathSegments() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock"); @@ -136,7 +136,7 @@ public async Task Response_ProvideResponse_Scriban_PathSegments(TransformerType .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock"); @@ -158,7 +158,7 @@ public async Task Response_ProvideResponse_Handlebars_Query() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5"); @@ -182,7 +182,7 @@ public async Task Response_ProvideResponse_Scriban_Query(TransformerType transfo .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5"); @@ -205,7 +205,7 @@ public async Task Response_ProvideResponse_Handlebars_StatusCode() .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -231,7 +231,7 @@ public async Task Response_ProvideResponse_Scriban_StatusCode(TransformerType tr .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -257,7 +257,7 @@ public async Task Response_ProvideResponse_Transformer_StatusCodeIsNull(Transfor .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -278,7 +278,7 @@ public async Task Response_ProvideResponse_Handlebars_Header() var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -300,7 +300,7 @@ public async Task Response_ProvideResponse_Handlebars_Headers() var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -325,7 +325,7 @@ public async Task Response_ProvideResponse_Scriban_Headers(TransformerType trans var responseBuilder = Response.Create().WithHeader("x", "{{request.Headers[\"Content-Type\"]}}", "{{request.Url}}").WithBody("test").WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -353,7 +353,7 @@ public async Task Response_ProvideResponse_Transformer_Origin_Port_Protocol_Host .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost"); @@ -380,7 +380,7 @@ public async Task Response_ProvideResponse_Transformer_WithBodyAsJson_ResultAsOb .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}"); @@ -407,7 +407,7 @@ public async Task Response_ProvideResponse_Transformer_WithBodyAsJson_ResultAsAr .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]"); @@ -424,7 +424,7 @@ public async Task Response_ProvideResponse_Handlebars_WithBodyAsFile() .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -443,7 +443,7 @@ public async Task Response_ProvideResponse_Scriban_WithBodyAsFile(TransformerTyp .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -468,7 +468,7 @@ public async Task Response_ProvideResponse_Transformer_WithBodyAsFile_And_Transf .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -497,7 +497,7 @@ public async Task Response_ProvideResponse_Transformer_WithBodyAsJson_ResultAsNo .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("\"test\""); @@ -521,7 +521,7 @@ public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsTem .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); @@ -547,7 +547,7 @@ public async Task Response_ProvideResponse_Scriban_WithBodyAsJson_ResultAsTempla .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); @@ -575,7 +575,7 @@ public async Task Response_ProvideResponse_Transformer_WithBodyAsString_KeepsEnc .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(request, _settings); + var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false); // Assert response.Message.BodyData.BodyAsString.Should().Be(text); diff --git a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs index f9e371611..413460ad2 100644 --- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs +++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Net; using System.Net.Http; @@ -28,7 +28,7 @@ public async Task Scenarios_Should_skip_non_relevant_states() .RespondWith(Response.Create()); // when - var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path); + var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); // then Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound); @@ -56,8 +56,8 @@ public async Task Scenarios_Should_process_request_if_equals_state_and_single_st .RespondWith(Response.Create().WithBody("Test state msg")); // when - var responseNoState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); - var responseWithState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); + var responseNoState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); + var responseWithState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); // then Check.That(responseNoState).Equals("No state msg"); @@ -90,9 +90,9 @@ public async Task Scenarios_With_Same_Path_Should_Use_Times_When_Moving_To_Next_ // when var client = new HttpClient(); - 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); + 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); // then responseScenario1.Should().Be(body1); @@ -137,11 +137,11 @@ public async Task Scenarios_With_Different_Paths_Should_Use_Times_When_Moving_To // when var client = new HttpClient(); - 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); + 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); // then t1a.Should().Be(body1); @@ -173,8 +173,8 @@ public async Task Scenarios_Should_Respect_Int_Valued_Scenarios_and_States() .RespondWith(Response.Create().WithBody("Scenario 1, State 2")); // when - var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); - var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); + 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); // then Check.That(responseIntScenario).Equals("Scenario 1, Setting State 2"); @@ -203,8 +203,8 @@ public async Task Scenarios_Should_Respect_Mixed_String_Scenario_and_Int_State() .RespondWith(Response.Create().WithBody("string state, State 2")); // when - var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); - var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); + 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); // then Check.That(responseIntScenario).Equals("string state, Setting State 2"); @@ -233,8 +233,8 @@ public async Task Scenarios_Should_Respect_Mixed_Int_Scenario_and_String_Scenari .RespondWith(Response.Create().WithBody("string state, State 2")); // when - var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); - var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path); + 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); // then Check.That(responseIntScenario).Equals("int state, Setting State 2"); @@ -280,7 +280,7 @@ public async Task Scenarios_TodoList_Example() Check.That(server.Scenarios["To do list"].Started).IsTrue(); Check.That(server.Scenarios["To do list"].Finished).IsFalse(); - var postResponse = await new HttpClient().PostAsync(url + "/todo/items", new StringContent("Cancel newspaper subscription")); + var postResponse = await new HttpClient().PostAsync(url + "/todo/items", new StringContent("Cancel newspaper subscription")).ConfigureAwait(false); Check.That(postResponse.StatusCode).Equals(HttpStatusCode.Created); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); @@ -288,7 +288,7 @@ public async Task Scenarios_TodoList_Example() Check.That(server.Scenarios["To do list"].Started).IsTrue(); Check.That(server.Scenarios["To do list"].Finished).IsFalse(); - string getResponse2 = await new HttpClient().GetStringAsync(url + "/todo/items"); + string getResponse2 = await new HttpClient().GetStringAsync(url + "/todo/items").ConfigureAwait(false); Check.That(getResponse2).Equals("Buy milk;Cancel newspaper subscription"); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); @@ -331,16 +331,16 @@ public async Task Scenarios_Should_process_request_if_equals_state_and_multiple_ // Act and Assert string url = "http://localhost:" + server.Ports[0]; - var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1"); + var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1").ConfigureAwait(false); Check.That(responseNoState1).Equals("No state msg 1"); - var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2"); + var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2").ConfigureAwait(false); Check.That(responseNoState2).Equals("No state msg 2"); - var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X"); + var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X").ConfigureAwait(false); Check.That(responseWithState1).Equals("Test state msg 1"); - var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X"); + var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X").ConfigureAwait(false); Check.That(responseWithState2).Equals("Test state msg 2"); server.Stop(); diff --git a/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs b/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs index 59bb036e6..8de3952c4 100644 --- a/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs +++ b/test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs @@ -1,7 +1,7 @@ -using FluentAssertions; +using System; +using FluentAssertions; using HandlebarsDotNet; using Moq; -using System; using WireMock.Handlers; using WireMock.Transformers.Handlebars; using Xunit; diff --git a/test/WireMock.Net.Tests/Util/BodyParserTests.cs b/test/WireMock.Net.Tests/Util/BodyParserTests.cs index 156d49e4e..8a1a0ea63 100644 --- a/test/WireMock.Net.Tests/Util/BodyParserTests.cs +++ b/test/WireMock.Net.Tests/Util/BodyParserTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using NFluent; using System.IO; using System.IO.Compression; @@ -30,7 +30,7 @@ public async Task BodyParser_Parse_ContentTypeJson(string contentType, string bo }; // Act - var body = await BodyParser.Parse(bodyParserSettings); + var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // Assert Check.That(body.BodyAsBytes).IsNotNull(); @@ -54,7 +54,7 @@ public async Task BodyParser_Parse_ContentTypeString(string contentType, string }; // Act - var body = await BodyParser.Parse(bodyParserSettings); + var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // Assert Check.That(body.BodyAsBytes).IsNotNull(); @@ -79,7 +79,7 @@ public async Task BodyParser_Parse_DetectedBodyType(byte[] content, BodyType det }; // act - var body = await BodyParser.Parse(bodyParserSettings); + var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // assert Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); @@ -100,7 +100,7 @@ public async Task BodyParser_Parse_DetectedBodyTypeNoJsonParsing(byte[] content, }; // act - var body = await BodyParser.Parse(bodyParserSettings); + var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // assert Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); @@ -139,7 +139,7 @@ Content of a txt }; // Act - var result = await BodyParser.Parse(bodyParserSettings); + var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // Assert Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String); @@ -163,7 +163,7 @@ public async Task BodyParser_Parse_WithUTF16EncodingAndContentTypeMultipart_Dete }; // Act - var result = await BodyParser.Parse(bodyParserSettings); + var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // Assert Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes); @@ -186,7 +186,7 @@ public async Task BodyParser_Parse_ContentTypeIsNull(string bodyAsString, BodyTy }; // Act - var body = await BodyParser.Parse(bodyParserSettings); + var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // Assert Check.That(body.BodyAsBytes).IsNotNull(); @@ -214,7 +214,7 @@ public async Task BodyParser_Parse_ContentEncoding_GZip_And_DecompressGzipAndDef }; // Act - var result = await BodyParser.Parse(bodyParserSettings); + var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // Assert result.DetectedBodyType.Should().Be(BodyType.String); @@ -243,7 +243,7 @@ public async Task BodyParser_Parse_ContentEncoding_GZip_And_DecompressGzipAndDef }; // Act - var result = await BodyParser.Parse(bodyParserSettings); + var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false); // Assert result.BodyAsBytes.Should().BeEquivalentTo(compressed); diff --git a/test/WireMock.Net.Tests/WireMockAdminApiTests.cs b/test/WireMock.Net.Tests/WireMockAdminApiTests.cs index 06e665c24..4d5f06697 100644 --- a/test/WireMock.Net.Tests/WireMockAdminApiTests.cs +++ b/test/WireMock.Net.Tests/WireMockAdminApiTests.cs @@ -1,4 +1,4 @@ -#if !NET452 && !NET461 +#if !NET452 && !NET461 using System; using System.Linq; using System.Net.Http; @@ -31,7 +31,7 @@ public async Task IWireMockAdminApi_GetSettingsAsync() var api = RestClient.For(server.Urls[0]); // Act - var settings = await api.GetSettingsAsync(); + var settings = await api.GetSettingsAsync().ConfigureAwait(false); Check.That(settings).IsNotNull(); } @@ -44,7 +44,7 @@ public async Task IWireMockAdminApi_PostSettingsAsync() // Act var settings = new SettingsModel(); - var status = await api.PostSettingsAsync(settings); + var status = await api.PostSettingsAsync(settings).ConfigureAwait(false); Check.That(status.Status).Equals("Settings updated"); } @@ -57,7 +57,7 @@ public async Task IWireMockAdminApi_PutSettingsAsync() // Act var settings = new SettingsModel(); - var status = await api.PutSettingsAsync(settings); + var status = await api.PutSettingsAsync(settings).ConfigureAwait(false); Check.That(status.Status).Equals("Settings updated"); } @@ -77,7 +77,7 @@ public async Task IWireMockAdminApi_PutMappingAsync() Priority = 500, Title = "test" }; - var result = await api.PutMappingAsync(new Guid("a0000000-0000-0000-0000-000000000000"), model); + var result = await api.PutMappingAsync(new Guid("a0000000-0000-0000-0000-000000000000"), model).ConfigureAwait(false); // Assert Check.That(result).IsNotNull(); @@ -111,7 +111,7 @@ public async Task IWireMockAdminApi_PostMappingAsync_WithStatusCode(object statu Priority = 500, Title = "test" }; - var result = await api.PostMappingAsync(model); + var result = await api.PostMappingAsync(model).ConfigureAwait(false); // Assert Check.That(result).IsNotNull(); @@ -122,7 +122,7 @@ public async Task IWireMockAdminApi_PostMappingAsync_WithStatusCode(object statu Check.That(mapping).IsNotNull(); Check.That(mapping.Title).Equals("test"); - var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")); + var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")).ConfigureAwait(false); Check.That(response.Message.StatusCode).Equals(expectedStatusCode); server.Stop(); @@ -148,7 +148,7 @@ public async Task IWireMockAdminApi_PostMappingsAsync() Response = new ResponseModel { Body = "txt 2" }, Title = "test 2" }; - var result = await api.PostMappingsAsync(new[] { model1, model2 }); + var result = await api.PostMappingsAsync(new[] { model1, model2 }).ConfigureAwait(false); // Assert Check.That(result).IsNotNull(); @@ -169,11 +169,11 @@ public async Task IWireMockAdminApi_FindRequestsAsync() Logger = new WireMockNullLogger() }); var serverUrl = "http://localhost:" + server.Ports[0]; - await new HttpClient().GetAsync(serverUrl + "/foo"); + await new HttpClient().GetAsync(serverUrl + "/foo").ConfigureAwait(false); var api = RestClient.For(serverUrl); // Act - var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "GET" } }); + var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "GET" } }).ConfigureAwait(false); // Assert Check.That(requests).HasSize(1); @@ -193,11 +193,11 @@ public async Task IWireMockAdminApi_GetRequestsAsync() Logger = new WireMockNullLogger() }); var serverUrl = "http://localhost:" + server.Ports[0]; - await new HttpClient().GetAsync(serverUrl + "/foo"); + await new HttpClient().GetAsync(serverUrl + "/foo").ConfigureAwait(false); var api = RestClient.For(serverUrl); // Act - var requests = await api.GetRequestsAsync(); + var requests = await api.GetRequestsAsync().ConfigureAwait(false); // Assert Check.That(requests).HasSize(1); @@ -233,7 +233,7 @@ public async Task IWireMockAdminApi_GetRequestsAsync_JsonApi() var api = RestClient.For(serverUrl); // Act - var requests = await api.GetRequestsAsync(); + var requests = await api.GetRequestsAsync().ConfigureAwait(false); // Assert Check.That(requests).HasSize(1); @@ -270,7 +270,7 @@ public async Task IWireMockAdminApi_GetMappingAsync_WithBodyModelMatcherModel_Wi }, Response = new ResponseModel { Body = "world" } }; - var postMappingResult = await api.PostMappingAsync(model); + var postMappingResult = await api.PostMappingAsync(model).ConfigureAwait(false); // Assert postMappingResult.Should().NotBeNull(); @@ -278,7 +278,7 @@ public async Task IWireMockAdminApi_GetMappingAsync_WithBodyModelMatcherModel_Wi var mapping = server.Mappings.FirstOrDefault(m => m.Guid == guid); mapping.Should().NotBeNull(); - var getMappingResult = await api.GetMappingAsync(guid); + var getMappingResult = await api.GetMappingAsync(guid).ConfigureAwait(false); getMappingResult.Should().NotBeNull(); getMappingResult.Request.Body.Should().BeEquivalentTo(model.Request.Body); @@ -311,7 +311,7 @@ public async Task IWireMockAdminApi_GetRequestsAsync_Json() var api = RestClient.For(serverUrl); // Act - var requests = await api.GetRequestsAsync(); + var requests = await api.GetRequestsAsync().ConfigureAwait(false); // Assert Check.That(requests).HasSize(1); @@ -340,7 +340,7 @@ public async Task IWireMockAdminApi_PostFileAsync_Ascii() var api = RestClient.For(server.Urls[0]); // Act - var request = await api.PostFileAsync("filename.txt", "abc"); + var request = await api.PostFileAsync("filename.txt", "abc").ConfigureAwait(false); // Assert Check.That(request.Guid).IsNull(); @@ -373,7 +373,7 @@ public async Task IWireMockAdminApi_PutFileAsync_Ascii() var api = RestClient.For(server.Urls[0]); // Act - var request = await api.PutFileAsync("filename.txt", "abc-abc"); + var request = await api.PutFileAsync("filename.txt", "abc-abc").ConfigureAwait(false); // Assert Check.That(request.Guid).IsNull(); @@ -459,7 +459,7 @@ public async Task IWireMockAdminApi_GetFileAsync_Found() var api = RestClient.For(server.Urls[0]); // Act - string file = await api.GetFileAsync("filename.txt"); + string file = await api.GetFileAsync("filename.txt").ConfigureAwait(false); // Assert Check.That(file).Equals(data); @@ -490,7 +490,7 @@ public async Task IWireMockAdminApi_DeleteFileAsync_Ok() var api = RestClient.For(server.Urls[0]); // Act - await api.DeleteFileAsync("filename.txt"); + await api.DeleteFileAsync("filename.txt").ConfigureAwait(false); // Verify filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is(p => p == "filename.txt")), Times.Once); diff --git a/test/WireMock.Net.Tests/WireMockServer.Admin.cs b/test/WireMock.Net.Tests/WireMockServer.Admin.cs index 9906e853d..3a0734ea1 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Admin.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Admin.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -324,7 +324,7 @@ public async Task WireMockServer_Admin_Mappings_AtPriority() Check.That(mappings).HasSize(2); // when - var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/1"); + var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/1").ConfigureAwait(false); // then Check.That((int)response.StatusCode).IsEqualTo(400); @@ -339,7 +339,7 @@ public async Task WireMockServer_Admin_Requests_Get() var server = WireMockServer.Start(); // when - await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo"); + await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); // then Check.That(server.LogEntries).HasSize(1); @@ -359,9 +359,9 @@ public async Task WireMockServer_Admin_Logging_SetMaxRequestLogCount() var server = WireMockServer.Start(); server.SetMaxRequestLogCount(2); - 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"); + 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); // Assert Check.That(server.LogEntries).HasSize(2); @@ -469,7 +469,7 @@ public async Task WireMockServer_Admin_DeleteMappings() Content = new StringContent(guidsJsonBody, Encoding.UTF8, "application/json") }; - var response = await new HttpClient().SendAsync(request); + var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); // Assert IEnumerable guids = server.MappingModels.Select(mapping => mapping.Guid.Value); @@ -477,7 +477,7 @@ public async Task WireMockServer_Admin_DeleteMappings() 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()).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}"); + Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}"); } } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs index 2b3eaffff..182e3d192 100644 --- a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs +++ b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs @@ -1,4 +1,4 @@ -using Moq; +using Moq; using NFluent; using System.IO; using System.Linq; @@ -39,7 +39,7 @@ public async Task WireMockServer_Admin_Files_Post_Ascii() 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); + var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false); // Assert Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK); @@ -74,7 +74,7 @@ public async Task WireMockServer_Admin_Files_Post_MappingFolderDoesNotExistsButW 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); + var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false); // Assert Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK); @@ -107,7 +107,7 @@ public async Task WireMockServer_Admin_Files_GetAscii() multipartFormDataContent.Add(new StreamContent(new MemoryStream())); // Act - var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt"); + var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt").ConfigureAwait(false); // Assert Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK); @@ -143,7 +143,7 @@ public async Task WireMockServer_Admin_Files_GetUTF16() multipartFormDataContent.Add(new StreamContent(new MemoryStream())); // Act - var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.bin"); + var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.bin").ConfigureAwait(false); // Assert Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK); @@ -173,7 +173,7 @@ public async Task WireMockServer_Admin_Files_Head() // 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); + var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false); // Assert Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NoContent); @@ -201,7 +201,7 @@ public async Task WireMockServer_Admin_Files_Head_FileDoesNotExistsReturns404() // 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); + var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false); // Assert Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NotFound); diff --git a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs index a6617b14f..57df7716f 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs @@ -46,7 +46,7 @@ public async Task WireMockServer_ProxySSL_Should_log_proxied_requests() RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage); + await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); // Assert Check.That(server.Mappings).HasSize(2); @@ -75,7 +75,7 @@ public async Task WireMockServer_Proxy_With_SaveMapping_Is_True_And_SaveMappingT RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage); + await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); // Assert server.Mappings.Should().HaveCount(2); @@ -107,7 +107,7 @@ public async Task WireMockServer_Proxy_With_SaveMapping_Is_False_And_SaveMapping RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage); + await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); // Assert server.Mappings.Should().HaveCount(1); @@ -143,7 +143,7 @@ public async Task WireMockServer_Proxy_With_SaveMappingForStatusCodePattern_Is_F RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage); + await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); // Assert server.Mappings.Should().HaveCount(1); @@ -174,7 +174,7 @@ public async Task WireMockServer_Proxy_Should_log_proxied_requests() RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - await new HttpClient(httpClientHandler).SendAsync(requestMessage); + await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); // Assert server.Mappings.Should().HaveCount(2); @@ -198,8 +198,8 @@ public async Task WireMockServer_Proxy_Should_proxy_responses() RequestUri = new Uri($"{server.Urls[0]}{path}") }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage); - string content = await response.Content.ReadAsStringAsync(); + var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); // Assert Check.That(server.Mappings).HasSize(1); @@ -239,7 +239,7 @@ public async Task WireMockServer_Proxy_Should_preserve_content_header_in_proxied }; requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain"); requestMessage.Content.Headers.Add("bbb", "test"); - await new HttpClient().SendAsync(requestMessage); + await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); // Assert var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; @@ -288,10 +288,10 @@ public async Task WireMockServer_Proxy_Should_preserve_Authorization_header_in_p Content = new StringContent("stringContent", Encoding.ASCII) }; requestMessage.Headers.Authorization = new AuthenticationHeaderValue("BASIC", "test-A"); - var result = await new HttpClient().SendAsync(requestMessage); + var result = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); // Assert - (await result.Content.ReadAsStringAsync()).Should().Be("BASIC test-A"); + (await result.Content.ReadAsStringAsync().ConfigureAwait(false)).Should().Be("BASIC test-A"); var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; var authorizationHeader = receivedRequest.Headers["Authorization"].ToString().Should().Be("BASIC test-A"); @@ -334,7 +334,7 @@ public async Task WireMockServer_Proxy_Should_exclude_ExcludedHeaders_in_mapping }; requestMessage.Headers.Add("foobar", "exact_match"); requestMessage.Headers.Add("ok", "ok-value"); - await new HttpClient().SendAsync(requestMessage); + await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); // Assert var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); @@ -381,7 +381,7 @@ public async Task WireMockServer_Proxy_Should_exclude_ExcludedCookies_in_mapping cookieContainer.Add(new Uri("http://localhost"), new Cookie("GoodCookie", "I_should_pass")); var handler = new HttpClientHandler { CookieContainer = cookieContainer }; - await new HttpClient(handler).SendAsync(requestMessage); + await new HttpClient(handler).SendAsync(requestMessage).ConfigureAwait(false); // Assert var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); @@ -416,7 +416,7 @@ public async Task WireMockServer_Proxy_Should_preserve_content_header_in_proxied Content = new StringContent("") }; requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain"); - await new HttpClient().SendAsync(requestMessage); + await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); // Assert var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; @@ -448,10 +448,10 @@ public async Task WireMockServer_Proxy_Should_preserve_content_header_in_proxied Method = HttpMethod.Get, RequestUri = new Uri($"{server.Urls[0]}{path}") }; - var response = await new HttpClient().SendAsync(requestMessage); + var response = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); // Assert - Check.That(await response.Content.ReadAsStringAsync()).IsEqualTo("body"); + Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).IsEqualTo("body"); Check.That(response.Content.Headers.Contains("Content-Type")).IsTrue(); Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain"); } @@ -482,7 +482,7 @@ public async Task WireMockServer_Proxy_Should_change_absolute_location_header_in RequestUri = new Uri($"{server.Urls[0]}{path}") }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage); + var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); // Assert Check.That(response.Headers.Contains("Location")).IsTrue(); @@ -513,7 +513,7 @@ public async Task WireMockServer_Proxy_Should_preserve_cookie_header_in_proxied_ }; var clientHandler = new HttpClientHandler(); clientHandler.CookieContainer.Add(requestUri, new Cookie("name", "value")); - await new HttpClient(clientHandler).SendAsync(requestMessage); + await new HttpClient(clientHandler).SendAsync(requestMessage).ConfigureAwait(false); // then var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; @@ -552,7 +552,7 @@ public async Task WireMockServer_Proxy_Should_preserve_binary_request_content() .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0])); // act - var response = await new HttpClient().PostAsync(server.Urls[0], new ByteArrayContent(jpegHeader)); + var response = await new HttpClient().PostAsync(server.Urls[0], new ByteArrayContent(jpegHeader)).ConfigureAwait(false); // assert Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK); @@ -581,10 +581,10 @@ public async Task WireMockServer_Proxy_Should_set_BodyAsJson_in_proxied_response Method = HttpMethod.Get, RequestUri = new Uri($"{server.Urls[0]}{path}") }; - var response = await new HttpClient().SendAsync(requestMessage); + var response = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false); // Assert - string content = await response.Content.ReadAsStringAsync(); + string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); Check.That(content).IsEqualTo("{\"i\":42}"); Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8"); } @@ -612,10 +612,10 @@ public async Task WireMockServer_Proxy_Should_set_Body_in_multipart_proxied_resp { { new StringContent("data"), "test", "test.txt" } }; - var response = await new HttpClient().PostAsync(uri, form); + var response = await new HttpClient().PostAsync(uri, form).ConfigureAwait(false); // Assert - string content = await response.Content.ReadAsStringAsync(); + string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); Check.That(content).IsEqualTo("{\"i\":42}"); } @@ -647,10 +647,10 @@ public async Task WireMockServer_Proxy_Should_Not_overrule_AdminMappings() Method = HttpMethod.Get, RequestUri = new Uri($"{server.Urls[0]}{path}") }; - var response1 = await new HttpClient().SendAsync(requestMessage1); + var response1 = await new HttpClient().SendAsync(requestMessage1).ConfigureAwait(false); // Assert 1 - string content1 = await response1.Content.ReadAsStringAsync(); + string content1 = await response1.Content.ReadAsStringAsync().ConfigureAwait(false); Check.That(content1).IsEqualTo("ok"); // Act 2 @@ -659,10 +659,10 @@ public async Task WireMockServer_Proxy_Should_Not_overrule_AdminMappings() Method = HttpMethod.Get, RequestUri = new Uri($"{server.Urls[0]}/__admin/mappings") }; - var response2 = await new HttpClient().SendAsync(requestMessage2); + var response2 = await new HttpClient().SendAsync(requestMessage2).ConfigureAwait(false); // Assert 2 - string content2 = await response2.Content.ReadAsStringAsync(); + string content2 = await response2.Content.ReadAsStringAsync().ConfigureAwait(false); Check.That(content2).IsEqualTo("[]"); } @@ -688,12 +688,12 @@ public async Task WireMockServer_Proxy_WhenTargetIsNotAvailable_Should_Return_Co RequestUri = new Uri(server.Urls[0]) }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; - var result = await new HttpClient(httpClientHandler).SendAsync(requestMessage); + var result = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false); // Assert result.StatusCode.Should().Be(HttpStatusCode.InternalServerError); - var content = await result.Content.ReadAsStringAsync(); + var content = await result.Content.ReadAsStringAsync().ConfigureAwait(false); 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 53412b6c6..bace30b65 100644 --- a/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs +++ b/test/WireMock.Net.Tests/WireMockServer.Proxy2.cs @@ -1,4 +1,4 @@ -using NFluent; +using NFluent; using System; using System.Linq; using System.Net; @@ -35,8 +35,8 @@ public async Task WireMockServer_ProxyAndRecordSettings_ShouldProxy() request.Headers.Add("prx", "1"); // Assert - var response = await new HttpClient().SendAsync(request); - string content = await response.Content.ReadAsStringAsync(); + var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); 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 f988a4c48..253f0ce66 100644 --- a/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs +++ b/test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Net; using System.Net.Http; @@ -70,8 +70,8 @@ public async Task WireMockServer_WithWebhooks_Should_Send_Message_To_Webhooks() }; // Assert - var response = await new HttpClient().SendAsync(request); - string content = await response.Content.ReadAsStringAsync(); + var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); @@ -118,8 +118,8 @@ public async Task WireMockServer_WithWebhook_Should_Send_Message_To_Webhook() }; // Assert - var response = await new HttpClient().SendAsync(request); - string content = await response.Content.ReadAsStringAsync(); + var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); @@ -151,8 +151,8 @@ public async Task WireMockServer_WithWebhookArgs_Should_Send_StringMessage_To_We }; // Assert - var response = await new HttpClient().SendAsync(request); - string content = await response.Content.ReadAsStringAsync(); + var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); response.StatusCode.Should().Be(HttpStatusCode.OK); content.Should().Be("a-response"); @@ -185,8 +185,8 @@ public async Task WireMockServer_WithWebhookArgs_Should_Send_JsonMessage_To_Webh }; // Assert - var response = await new HttpClient().SendAsync(request); - string content = await response.Content.ReadAsStringAsync(); + var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); + string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false); 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 f77229d15..d10ee314b 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs @@ -37,7 +37,7 @@ public async Task WireMockServer_WithBodyAsJson_Using_PostAsJsonAsync_And_Wildca }; // Act - var response = await new HttpClient().PostAsJsonAsync("http://localhost:" + server.Ports[0] + "/foo", jsonObject); + var response = await new HttpClient().PostAsJsonAsync("http://localhost:" + server.Ports[0] + "/foo", jsonObject).ConfigureAwait(false); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); @@ -58,7 +58,7 @@ public async Task WireMockServer_WithBodyAsJson_Using_PostAsync_And_WildcardMatc ); // Act - var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("{ Hi = \"Hello World\" }")); + var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("{ Hi = \"Hello World\" }")).ConfigureAwait(false); // Assert response.StatusCode.Should().Be(HttpStatusCode.OK); diff --git a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs index 030a4304b..10081e1c0 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs @@ -28,7 +28,7 @@ public async Task WireMockServer_WithCallback_Should_Use_StatusCodeFromResponse( // Act var httpClient = new HttpClient(); - var response = await httpClient.PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("dummy")); + var response = await httpClient.PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("dummy")).ConfigureAwait(false); // Assert response.StatusCode.Should().Be(HttpStatusCode.Conflict); diff --git a/test/WireMock.Net.Tests/WireMockServerTests.cs b/test/WireMock.Net.Tests/WireMockServerTests.cs index 16ae05708..7fc834796 100644 --- a/test/WireMock.Net.Tests/WireMockServerTests.cs +++ b/test/WireMock.Net.Tests/WireMockServerTests.cs @@ -25,7 +25,7 @@ public async Task WireMockServer_Should_reset_requestlogs() var server = WireMockServer.Start(); // when - await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo"); + await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); server.ResetLogEntries(); // then @@ -83,7 +83,7 @@ public async Task WireMockServer_Should_respond_a_redirect_without_body() .WithBody("REDIRECT SUCCESSFUL")); // Act - var response = await new HttpClient().GetStringAsync($"http://localhost:{server.Ports[0]}{path}"); + var response = await new HttpClient().GetStringAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false); // Assert Check.That(response).IsEqualTo("REDIRECT SUCCESSFUL"); @@ -107,7 +107,7 @@ public async Task WireMockServer_Should_delay_responses_for_a_given_route() // Act var watch = new Stopwatch(); watch.Start(); - await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo"); + await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); watch.Stop(); // Asser. @@ -136,14 +136,14 @@ public async Task WireMockServer_Should_randomly_delay_responses_for_a_given_rou async Task ExecuteTimedRequestAsync() { watch.Reset(); - await httClient.GetStringAsync("http://localhost:" + server.Ports[0] + "/foo"); + await httClient.GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); return watch.ElapsedMilliseconds; } // Act - await ExecuteTimedRequestAsync(); - await ExecuteTimedRequestAsync(); - await ExecuteTimedRequestAsync(); + await ExecuteTimedRequestAsync().ConfigureAwait(false); + await ExecuteTimedRequestAsync().ConfigureAwait(false); + await ExecuteTimedRequestAsync().ConfigureAwait(false); server.Stop(); } @@ -161,7 +161,7 @@ public async Task WireMockServer_Should_delay_responses() // Act var watch = new Stopwatch(); watch.Start(); - await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo"); + await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false); watch.Stop(); // Assert @@ -199,7 +199,7 @@ public async Task WireMockServer_Should_exclude_restrictedResponseHeader() .RespondWith(Response.Create().WithHeader("Transfer-Encoding", "chunked").WithHeader("test", "t")); // Act - var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path); + var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false); // Assert Check.That(response.Headers.Contains("test")).IsTrue(); @@ -230,7 +230,7 @@ public async Task WireMockServer_Should_exclude_body_for_methods_where_body_is_d // 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); + var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); // Assert Check.That(response.StatusCode).Equals(HttpStatusCode.OK); @@ -264,7 +264,7 @@ public async Task WireMockServer_Should_not_exclude_body_for_supported_methods(s // 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); + var response = await new HttpClient().SendAsync(request).ConfigureAwait(false); // Assert Check.That(response.StatusCode).Equals(HttpStatusCode.OK); @@ -298,11 +298,11 @@ public async Task WireMockServer_Should_AcceptPostMappingsWithContentTypeJsonAnd var server = WireMockServer.StartWithAdminInterface(); // Act - var response = await new HttpClient().PostAsync($"{server.Urls[0]}/__admin/mappings", stringContent); + var response = await new HttpClient().PostAsync($"{server.Urls[0]}/__admin/mappings", stringContent).ConfigureAwait(false); // Assert Check.That(response.StatusCode).Equals(HttpStatusCode.Created); - Check.That(await response.Content.ReadAsStringAsync()).Contains("Mapping added"); + Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Contains("Mapping added"); server.Stop(); } @@ -331,10 +331,10 @@ public async Task WireMockServer_Should_SupportRequestGZipAndDeflate(string cont content.Headers.ContentEncoding.Add(contentEncoding); // Act - var response = await new HttpClient().PostAsync($"{server.Urls[0]}/foo", content); + var response = await new HttpClient().PostAsync($"{server.Urls[0]}/foo", content).ConfigureAwait(false); // Assert - Check.That(await response.Content.ReadAsStringAsync()).Contains("OK"); + Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Contains("OK"); server.Stop(); } @@ -354,7 +354,7 @@ public async Task WireMockServer_Should_respond_to_ipv4_loopback() .WithBody("from ipv4 loopback")); // Act - var response = await new HttpClient().GetStringAsync($"http://127.0.0.1:{server.Ports[0]}/foo"); + var response = await new HttpClient().GetStringAsync($"http://127.0.0.1:{server.Ports[0]}/foo").ConfigureAwait(false); // Assert Check.That(response).IsEqualTo("from ipv4 loopback"); @@ -376,7 +376,7 @@ public async Task WireMockServer_Should_respond_to_ipv6_loopback() .WithBody("from ipv6 loopback")); // Act - var response = await new HttpClient().GetStringAsync($"http://[::1]:{server.Ports[0]}/foo"); + var response = await new HttpClient().GetStringAsync($"http://[::1]:{server.Ports[0]}/foo").ConfigureAwait(false); // Assert Check.That(response).IsEqualTo("from ipv6 loopback");