starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-04-01 15:13:33 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Add .ConfigureAwait(false); to the await Task calls (#704)

Browse Source 
Add .ConfigureAwait(false); to the await Task calls
This commit is contained in:
Stef Heyenrath
2021-12-24 14:08:43 +01:00
committed by GitHub
parent 1d1ff4a418
commit b5ae087b95
62 changed files with 373 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WireMock.Net Solution.sln.DotSettings
View File

@@ -12,11 +12,15 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Flurl/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Flurl/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=guidb/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Scriban/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Sigil/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Victoor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhook/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Webhook/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhooks/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Webhooks/@EntryIndexedValue">True</s:Boolean>
</wpf:ResourceDictionary> </wpf:ResourceDictionary>

2
examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
View File

@@ -556,7 +556,7 @@ namespace WireMock.Net.ConsoleApplication
.Given(Request.Create().WithPath("/random200or505async").UsingGet()) .Given(Request.Create().WithPath("/random200or505async").UsingGet())
.RespondWith(Response.Create().WithCallback(async request => .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; int code = new Random().Next(1, 2) == 1 ? 505 : 200;

2
src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs
View File

@@ -46,7 +46,7 @@ namespace WireMock.Authentication
try try
{ {
var configManager = new ConfigurationManager<OpenIdConnectConfiguration>(_stsDiscoveryEndpoint, new OpenIdConnectConfigurationRetriever()); var configManager = new ConfigurationManager<OpenIdConnectConfiguration>(_stsDiscoveryEndpoint, new OpenIdConnectConfigurationRetriever());
var config = configManager.GetConfigurationAsync().GetAwaiter().GetResult(); var config = configManager.GetConfigurationAsync().ConfigureAwait(false).GetAwaiter().GetResult();
var validationParameters = new TokenValidationParameters var validationParameters = new TokenValidationParameters
{ {

6
src/WireMock.Net/Http/HttpResponseMessageHelper.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
@@ -17,7 +17,7 @@ namespace WireMock.Http
var headers = (httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers) ?? Enumerable.Empty<KeyValuePair<string, IEnumerable<string>>>()).ToArray(); var headers = (httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers) ?? Enumerable.Empty<KeyValuePair<string, IEnumerable<string>>>()).ToArray();
if (httpResponseMessage.Content != null) if (httpResponseMessage.Content != null)
{ {
var stream = await httpResponseMessage.Content.ReadAsStreamAsync(); var stream = await httpResponseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false);
IEnumerable<string> contentTypeHeader = null; IEnumerable<string> contentTypeHeader = null;
if (headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase))) if (headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)))
{ {
@@ -38,7 +38,7 @@ namespace WireMock.Http
ContentEncoding = contentEncodingHeader?.FirstOrDefault(), ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
DecompressGZipAndDeflate = decompressGzipAndDeflate DecompressGZipAndDeflate = decompressGzipAndDeflate
}; };
responseMessage.BodyData = await BodyParser.Parse(bodyParserSettings); responseMessage.BodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
} }
foreach (var header in headers) foreach (var header in headers)

4
src/WireMock.Net/Mapping.cs
View File

@@ -108,9 +108,9 @@ namespace WireMock
} }
/// <inheritdoc cref="IMapping.ProvideResponseAsync" /> /// <inheritdoc cref="IMapping.ProvideResponseAsync" />
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);
} }
/// <inheritdoc cref="IMapping.GetRequestMatchResult" /> /// <inheritdoc cref="IMapping.GetRequestMatchResult" />

12
src/WireMock.Net/Matchers/JSONPathMatcher.cs
View File

@@ -63,8 +63,8 @@ namespace WireMock.Matchers
{ {
try try
{ {
var jtoken = JToken.Parse(input); var jToken = JToken.Parse(input);
match = IsMatch(jtoken); match = IsMatch(jToken);
} }
catch (JsonException) catch (JsonException)
{ {
@@ -89,8 +89,8 @@ namespace WireMock.Matchers
try try
{ {
// Check if JToken or object // Check if JToken or object
JToken jtoken = input is JToken token ? token : JObject.FromObject(input); JToken jToken = input is JToken token ? token : JObject.FromObject(input);
match = IsMatch(jtoken); match = IsMatch(jToken);
} }
catch (JsonException) catch (JsonException)
{ {
@@ -113,9 +113,9 @@ namespace WireMock.Matchers
/// <inheritdoc cref="IMatcher.Name"/> /// <inheritdoc cref="IMatcher.Name"/>
public string Name => "JsonPathMatcher"; 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));
} }
} }
} }

4
src/WireMock.Net/Matchers/SimMetricsMatcher.cs
View File

@@ -83,9 +83,9 @@ namespace WireMock.Matchers
/// <inheritdoc cref="IStringMatcher.IsMatch"/> /// <inheritdoc cref="IStringMatcher.IsMatch"/>
public double IsMatch(string input) 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() private IStringMetric GetStringMetricType()

13
src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Newtonsoft.Json; using Newtonsoft.Json;
#if !USE_ASPNETCORE #if !USE_ASPNETCORE
@@ -52,19 +52,22 @@ namespace WireMock.Owin
public Task Invoke(IContext ctx) public Task Invoke(IContext ctx)
#endif #endif
{ {
return InvokeInternal(ctx); return InvokeInternalAsync(ctx);
} }
private async Task InvokeInternal(IContext ctx) private async Task InvokeInternalAsync(IContext ctx)
{ {
try try
{ {
await Next?.Invoke(ctx); if (Next != null)
{
await Next.Invoke(ctx).ConfigureAwait(false);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
_options.Logger.Error("HttpStatusCode set to 500 {0}", 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);
} }
} }
} }

1
src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs
View File

@@ -4,7 +4,6 @@ using WireMock.Handlers;
using WireMock.Logging; using WireMock.Logging;
using WireMock.Matchers; using WireMock.Matchers;
using WireMock.Util; using WireMock.Util;
using JetBrains.Annotations;
#if !USE_ASPNETCORE #if !USE_ASPNETCORE
using Owin; using Owin;
#else #else

10
src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs
View File

@@ -65,25 +65,25 @@ namespace WireMock.Owin.Mappers
DecompressGZipAndDeflate = !options.DisableRequestBodyDecompressing.GetValueOrDefault(false) 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 }; 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 #if !USE_ASPNETCORE
var urldetails = UrlUtils.Parse(request.Uri, request.PathBase); var urlDetails = UrlUtils.Parse(request.Uri, request.PathBase);
string clientIP = request.RemoteIpAddress; string clientIP = request.RemoteIpAddress;
#else #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; var connection = request.HttpContext.Connection;
string clientIP = connection.RemoteIpAddress.IsIPv4MappedToIPv6 string clientIP = connection.RemoteIpAddress.IsIPv4MappedToIPv6
? connection.RemoteIpAddress.MapToIPv4().ToString() ? connection.RemoteIpAddress.MapToIPv4().ToString()
: connection.RemoteIpAddress.ToString(); : connection.RemoteIpAddress.ToString();
#endif #endif
return (urldetails, clientIP); return (urlDetails, clientIP);
} }
} }
} }

4
src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
@@ -103,7 +103,7 @@ namespace WireMock.Owin.Mappers
if (bytes != null) if (bytes != null)
{ {
await response.Body.WriteAsync(bytes, 0, bytes.Length); await response.Body.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
} }
} }

15
src/WireMock.Net/Owin/WireMockMiddleware.cs
View File

@@ -2,7 +2,6 @@ using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using WireMock.Logging; using WireMock.Logging;
using System.Linq; using System.Linq;
using HandlebarsDotNet.Helpers.Utils;
using WireMock.Matchers; using WireMock.Matchers;
using WireMock.Http; using WireMock.Http;
using WireMock.Owin.Mappers; using WireMock.Owin.Mappers;
@@ -70,7 +69,7 @@ namespace WireMock.Owin
private async Task InvokeInternalAsync(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; var logRequest = false;
ResponseMessage response = null; ResponseMessage response = null;
@@ -115,22 +114,22 @@ namespace WireMock.Owin
if (!targetMapping.IsAdminInterface && _options.RequestProcessingDelay > TimeSpan.Zero) 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; response = theResponse;
var responseBuilder = targetMapping.Provider as Response; var responseBuilder = targetMapping.Provider as Response;
if (!targetMapping.IsAdminInterface && theOptionalNewMapping != null) 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); _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 matcherMapper = new MatcherMapper(targetMapping.Settings);
var mappingConverter = new MappingConverter(matcherMapper); var mappingConverter = new MappingConverter(matcherMapper);
@@ -187,10 +186,10 @@ namespace WireMock.Owin
// Empty catch // 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) private async Task SendToWebhooksAsync(IMapping mapping, RequestMessage request, ResponseMessage response)

4
src/WireMock.Net/Proxy/ProxyHelper.cs
View File

@@ -41,13 +41,13 @@ namespace WireMock.Proxy
var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url); var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
// Call the URL // Call the URL
var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead); var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
// Create ResponseMessage // Create ResponseMessage
bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false); bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.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; IMapping mapping = null;
if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) && if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&

13
src/WireMock.Net/ResponseBuilders/Response.cs
View File

@@ -54,10 +54,7 @@ namespace WireMock.ResponseBuilders
return _delay; return _delay;
} }
private set private set => _delay = value;
{
_delay = value;
}
} }
/// <summary> /// <summary>
@@ -219,7 +216,7 @@ namespace WireMock.ResponseBuilders
BodyData = new BodyData BodyData = new BodyData
{ {
DetectedBodyType = BodyType.String, DetectedBodyType = BodyType.String,
BodyAsString = await bodyFactory(req), BodyAsString = await bodyFactory(req).ConfigureAwait(false),
Encoding = encoding ?? Encoding.UTF8 Encoding = encoding ?? Encoding.UTF8
} }
}); });
@@ -385,7 +382,7 @@ namespace WireMock.ResponseBuilders
if (Delay != null) if (Delay != null)
{ {
await Task.Delay(Delay.Value); await Task.Delay(Delay.Value).ConfigureAwait(false);
} }
if (ProxyAndRecordSettings != null && _httpClientForProxy != null) if (ProxyAndRecordSettings != null && _httpClientForProxy != null)
@@ -409,7 +406,7 @@ namespace WireMock.ResponseBuilders
_httpClientForProxy, _httpClientForProxy,
requestMessage, requestMessage,
requestMessage.ProxyUrl requestMessage.ProxyUrl
); ).ConfigureAwait(false);
} }
ResponseMessage responseMessage; ResponseMessage responseMessage;
@@ -425,7 +422,7 @@ namespace WireMock.ResponseBuilders
} }
else else
{ {
responseMessage = await CallbackAsync(requestMessage); responseMessage = await CallbackAsync(requestMessage).ConfigureAwait(false);
} }
// Copy StatusCode from ResponseMessage (if defined) // Copy StatusCode from ResponseMessage (if defined)

4
src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using WireMock.Settings; using WireMock.Settings;
@@ -15,7 +15,7 @@ namespace WireMock.ResponseProviders
public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings) public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
{ {
return (await _responseMessageFunc(requestMessage), null); return (await _responseMessageFunc(requestMessage).ConfigureAwait(false), null);
} }
} }
} }

4
src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using WireMock.Settings; using WireMock.Settings;
@@ -17,7 +17,7 @@ namespace WireMock.ResponseProviders
public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings) public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
{ {
return (await _responseMessageFunc(requestMessage, _settings), null); return (await _responseMessageFunc(requestMessage, _settings).ConfigureAwait(false), null);
} }
} }
} }

1
src/WireMock.Net/Serialization/MappingConverter.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using WireMock.Admin.Mappings; using WireMock.Admin.Mappings;
using WireMock.Matchers.Request; using WireMock.Matchers.Request;
using WireMock.Models;
using WireMock.RequestBuilders; using WireMock.RequestBuilders;
using WireMock.ResponseBuilders; using WireMock.ResponseBuilders;
using WireMock.Settings; using WireMock.Settings;

4
src/WireMock.Net/Serialization/MatcherMapper.cs
View File

@@ -77,8 +77,8 @@ namespace WireMock.Serialization
return new JsonPartialMatcher(matchBehaviour, valueForJsonPartialMatcher, ignoreCase, throwExceptionWhenMatcherFails); return new JsonPartialMatcher(matchBehaviour, valueForJsonPartialMatcher, ignoreCase, throwExceptionWhenMatcherFails);
case nameof(JsonPartialWildcardMatcher): case nameof(JsonPartialWildcardMatcher):
object valueForJsonPartialWilcardMatcher = matcher.Pattern ?? matcher.Patterns; object valueForJsonPartialWildcardMatcher = matcher.Pattern ?? matcher.Patterns;
return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWilcardMatcher, ignoreCase, throwExceptionWhenMatcherFails); return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWildcardMatcher, ignoreCase, throwExceptionWhenMatcherFails);
case nameof(JsonPathMatcher): case nameof(JsonPathMatcher):
return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns); return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);

14
src/WireMock.Net/Server/WireMockServer.Admin.cs
View File

@@ -261,7 +261,7 @@ namespace WireMock.Server
_httpClientForProxy, _httpClientForProxy,
requestMessage, requestMessage,
proxyUriWithRequestPathAndQuery.AbsoluteUri proxyUriWithRequestPathAndQuery.AbsoluteUri
); ).ConfigureAwait(false);
if (mapping != null) if (mapping != null)
{ {
@@ -673,13 +673,13 @@ namespace WireMock.Server
} }
} }
bool pathOrUrlmatchersValid = false; bool pathOrUrlMatchersValid = false;
if (requestModel.Path != null) if (requestModel.Path != null)
{ {
if (requestModel.Path is string path) if (requestModel.Path is string path)
{ {
requestBuilder = requestBuilder.WithPath(path); requestBuilder = requestBuilder.WithPath(path);
pathOrUrlmatchersValid = true; pathOrUrlMatchersValid = true;
} }
else else
{ {
@@ -687,7 +687,7 @@ namespace WireMock.Server
if (pathModel?.Matchers != null) if (pathModel?.Matchers != null)
{ {
requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray()); requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
pathOrUrlmatchersValid = true; pathOrUrlMatchersValid = true;
} }
} }
} }
@@ -696,7 +696,7 @@ namespace WireMock.Server
if (requestModel.Url is string url) if (requestModel.Url is string url)
{ {
requestBuilder = requestBuilder.WithUrl(url); requestBuilder = requestBuilder.WithUrl(url);
pathOrUrlmatchersValid = true; pathOrUrlMatchersValid = true;
} }
else else
{ {
@@ -704,12 +704,12 @@ namespace WireMock.Server
if (urlModel?.Matchers != null) if (urlModel?.Matchers != null)
{ {
requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray()); requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().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."); _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
return null; return null;

4
src/WireMock.Net/Server/WireMockServer.ImportWireMockOrg.cs
View File

@@ -114,7 +114,7 @@ namespace WireMock.Server
{ {
ProcessWireMockOrgJObjectAndUseStringMatcher(headers, (key, match) => ProcessWireMockOrgJObjectAndUseStringMatcher(headers, (key, match) =>
{ {
requestBuilder = requestBuilder.WithHeader(key, match as IStringMatcher); requestBuilder = requestBuilder.WithHeader(key, match);
}); });
} }
@@ -122,7 +122,7 @@ namespace WireMock.Server
{ {
ProcessWireMockOrgJObjectAndUseStringMatcher(cookies, (key, match) => ProcessWireMockOrgJObjectAndUseStringMatcher(cookies, (key, match) =>
{ {
requestBuilder = requestBuilder.WithCookie(key, match as IStringMatcher); requestBuilder = requestBuilder.WithCookie(key, match);
}); });
} }

4
src/WireMock.Net/Server/WireMockServer.LogEntries.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
@@ -77,7 +77,7 @@ namespace WireMock.Server
[PublicAPI] [PublicAPI]
public bool DeleteLogEntry(Guid guid) 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); var existing = _options.LogEntries.ToList().FirstOrDefault(m => m.Guid == guid);
if (existing != null) if (existing != null)
{ {

4
src/WireMock.Net/Transformers/Transformer.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq;
using WireMock.Types; using WireMock.Types;
using WireMock.Util; using WireMock.Util;
namespace WireMock.Transformers.Handlebars namespace WireMock.Transformers
{ {
internal class Transformer : ITransformer internal class Transformer : ITransformer
{ {

18
src/WireMock.Net/Util/BodyParser.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Http.Headers; using System.Net.Http.Headers;
@@ -107,15 +107,15 @@ namespace WireMock.Util
return BodyType.Bytes; return BodyType.Bytes;
} }
public static async Task<BodyData> Parse([NotNull] BodyParserSettings settings) public static async Task<BodyData> ParseAsync([NotNull] BodyParserSettings settings)
{ {
Check.NotNull(settings, nameof(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 var data = new BodyData
{ {
BodyAsBytes = bodyWithContentEncoding.Value, BodyAsBytes = bodyWithContentEncoding.Bytes,
DetectedCompression = bodyWithContentEncoding.Key, DetectedCompression = bodyWithContentEncoding.ContentType,
DetectedBodyType = BodyType.Bytes, DetectedBodyType = BodyType.Bytes,
DetectedBodyTypeFromContentType = DetectBodyTypeFromContentType(settings.ContentType) DetectedBodyTypeFromContentType = DetectBodyTypeFromContentType(settings.ContentType)
}; };
@@ -163,20 +163,20 @@ namespace WireMock.Util
return data; return data;
} }
private static async Task<KeyValuePair<string, byte[]>> 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()) using (var memoryStream = new MemoryStream())
{ {
await stream.CopyToAsync(memoryStream); await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
byte[] data = memoryStream.ToArray(); byte[] data = memoryStream.ToArray();
string type = contentEncoding?.ToLowerInvariant(); string type = contentEncoding?.ToLowerInvariant();
if (decompressGZipAndDeflate && (type == "gzip" || type == "deflate")) if (decompressGZipAndDeflate && (type == "gzip" || type == "deflate"))
{ {
return new KeyValuePair<string, byte[]>(type, CompressionUtils.Decompress(type, data)); return (type, CompressionUtils.Decompress(type, data));
} }
return new KeyValuePair<string, byte[]>(null, data); return (null, data);
} }
} }
} }

26
src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.IO; using System.IO;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -16,7 +16,7 @@ namespace WireMock.Util
// Default Watch Interval in Milliseconds // Default Watch Interval in Milliseconds
private const int DefaultWatchInterval = 100; 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<string, DateTime> _lastFileEvent; private ConcurrentDictionary<string, DateTime> _lastFileEvent;
// Watch Interval in Milliseconds // Watch Interval in Milliseconds
@@ -176,13 +176,13 @@ namespace WireMock.Util
} }
/// <summary> /// <summary>
/// This method searches the dictionary to find out when the last event occured /// This method searches the dictionary to find out when the last event occurred
/// for a particular file. If that event occured within the specified timespan /// for a particular file. If that event occurred within the specified timespan
/// it returns true, else false /// it returns true, else false
/// </summary> /// </summary>
/// <param name="fileName">The filename to be checked</param> /// <param name="fileName">The filename to be checked</param>
/// <returns>True if an event has occured within the specified interval, False otherwise</returns> /// <returns>True if an event has occurred within the specified interval, False otherwise</returns>
private bool HasAnotherFileEventOccuredRecently(string fileName) private bool HasAnotherFileEventOccurredRecently(string fileName)
{ {
// Check dictionary only if user wants to filter recent events otherwise return value stays false. // Check dictionary only if user wants to filter recent events otherwise return value stays false.
if (!FilterRecentEvents) if (!FilterRecentEvents)
@@ -194,7 +194,7 @@ namespace WireMock.Util
if (_lastFileEvent.ContainsKey(fileName)) if (_lastFileEvent.ContainsKey(fileName))
{ {
// If dictionary contains the filename, check how much time has elapsed // 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 // specified interval, set return value to true
// and store current datetime in dictionary for this file // and store current datetime in dictionary for this file
DateTime lastEventTime = _lastFileEvent[fileName]; DateTime lastEventTime = _lastFileEvent[fileName];
@@ -206,7 +206,7 @@ namespace WireMock.Util
else else
{ {
// If dictionary does not contain the filename, // 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 // and append filename along with current datetime to the dictionary
_lastFileEvent.TryAdd(fileName, DateTime.Now); _lastFileEvent.TryAdd(fileName, DateTime.Now);
} }
@@ -215,11 +215,11 @@ namespace WireMock.Util
} }
#region FileSystemWatcher EventHandlers #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 // to raise appropriate event only if no recent event is detected
private void OnChanged(object sender, FileSystemEventArgs e) private void OnChanged(object sender, FileSystemEventArgs e)
{ {
if (!HasAnotherFileEventOccuredRecently(e.FullPath)) if (!HasAnotherFileEventOccurredRecently(e.FullPath))
{ {
OnChanged(e); OnChanged(e);
} }
@@ -227,7 +227,7 @@ namespace WireMock.Util
private void OnCreated(object sender, FileSystemEventArgs e) private void OnCreated(object sender, FileSystemEventArgs e)
{ {
if (!HasAnotherFileEventOccuredRecently(e.FullPath)) if (!HasAnotherFileEventOccurredRecently(e.FullPath))
{ {
OnCreated(e); OnCreated(e);
} }
@@ -235,7 +235,7 @@ namespace WireMock.Util
private void OnDeleted(object sender, FileSystemEventArgs e) private void OnDeleted(object sender, FileSystemEventArgs e)
{ {
if (!HasAnotherFileEventOccuredRecently(e.FullPath)) if (!HasAnotherFileEventOccurredRecently(e.FullPath))
{ {
OnDeleted(e); OnDeleted(e);
} }
@@ -243,7 +243,7 @@ namespace WireMock.Util
private void OnRenamed(object sender, RenamedEventArgs e) private void OnRenamed(object sender, RenamedEventArgs e)
{ {
if (!HasAnotherFileEventOccuredRecently(e.OldFullPath)) if (!HasAnotherFileEventOccurredRecently(e.OldFullPath))
{ {
OnRenamed(e); OnRenamed(e);
} }

2
src/dotnet-WireMock.Net/Program.cs
View File

@@ -46,7 +46,7 @@ namespace WireMock.Net
while (true) while (true)
{ {
Logger.Info("Server running : {IsStarted}", Server.IsStarted); Logger.Info("Server running : {IsStarted}", Server.IsStarted);
await Task.Delay(SleepTime); await Task.Delay(SleepTime).ConfigureAwait(false);
} }
} }

26
test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs
View File

@@ -33,7 +33,7 @@ namespace WireMock.Net.Tests.FluentAssertions
[Fact] [Fact]
public async Task AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK() public async Task AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK()
{ {
await _httpClient.GetAsync("anyurl"); await _httpClient.GetAsync("anyurl").ConfigureAwait(false);
_server.Should() _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -56,7 +56,7 @@ namespace WireMock.Net.Tests.FluentAssertions
[Fact] [Fact]
public async Task AtAbsoluteUrl_Should_ThrowWhenNoCallsMatchingTheAbsoluteUrlWereMade() public async Task AtAbsoluteUrl_Should_ThrowWhenNoCallsMatchingTheAbsoluteUrlWereMade()
{ {
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
Action act = () => _server.Should() Action act = () => _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -72,7 +72,7 @@ namespace WireMock.Net.Tests.FluentAssertions
public async Task WithHeader_WhenACallWasMadeWithExpectedHeader_Should_BeOK() public async Task WithHeader_WhenACallWasMadeWithExpectedHeader_Should_BeOK()
{ {
_httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer a"); _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer a");
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
_server.Should() _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -84,7 +84,7 @@ namespace WireMock.Net.Tests.FluentAssertions
{ {
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
_server.Should() _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -94,7 +94,7 @@ namespace WireMock.Net.Tests.FluentAssertions
[Fact] [Fact]
public async Task WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderNameWereMade() public async Task WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderNameWereMade()
{ {
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
Action act = () => _server.Should() Action act = () => _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -110,7 +110,7 @@ namespace WireMock.Net.Tests.FluentAssertions
{ {
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
Action act = () => _server.Should() Action act = () => _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -134,7 +134,7 @@ namespace WireMock.Net.Tests.FluentAssertions
{ {
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
_httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
Action act = () => _server.Should() Action act = () => _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -153,7 +153,7 @@ namespace WireMock.Net.Tests.FluentAssertions
[Fact] [Fact]
public async Task AtUrl_WhenACallWasMadeToUrl_Should_BeOK() public async Task AtUrl_WhenACallWasMadeToUrl_Should_BeOK()
{ {
await _httpClient.GetAsync("anyurl"); await _httpClient.GetAsync("anyurl").ConfigureAwait(false);
_server.Should() _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -176,7 +176,7 @@ namespace WireMock.Net.Tests.FluentAssertions
[Fact] [Fact]
public async Task AtUrl_Should_ThrowWhenNoCallsMatchingTheUrlWereMade() public async Task AtUrl_Should_ThrowWhenNoCallsMatchingTheUrlWereMade()
{ {
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
Action act = () => _server.Should() Action act = () => _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -195,7 +195,7 @@ namespace WireMock.Net.Tests.FluentAssertions
_server.Given(Request.Create().UsingAnyMethod()) _server.Given(Request.Create().UsingAnyMethod())
.RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" })); .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" }));
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
_server.Should() _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -226,7 +226,7 @@ namespace WireMock.Net.Tests.FluentAssertions
_server.Given(Request.Create().UsingAnyMethod()) _server.Given(Request.Create().UsingAnyMethod())
.RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" })); .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" }));
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
Action act = () => _server.Should() Action act = () => _server.Should()
.HaveReceivedACall() .HaveReceivedACall()
@@ -241,7 +241,7 @@ namespace WireMock.Net.Tests.FluentAssertions
[Fact] [Fact]
public async Task FromClientIP_whenACallWasMadeFromClientIP_Should_BeOK() public async Task FromClientIP_whenACallWasMadeFromClientIP_Should_BeOK()
{ {
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP; var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP;
_server.Should() _server.Should()
@@ -265,7 +265,7 @@ namespace WireMock.Net.Tests.FluentAssertions
[Fact] [Fact]
public async Task FromClientIP_Should_ThrowWhenNoCallsFromClientIPWereMade() public async Task FromClientIP_Should_ThrowWhenNoCallsFromClientIPWereMade()
{ {
await _httpClient.GetAsync(""); await _httpClient.GetAsync("").ConfigureAwait(false);
var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP; var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP;
Action act = () => _server.Should() Action act = () => _server.Should()

6
test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs
View File

@@ -1,4 +1,4 @@
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using FluentAssertions; using FluentAssertions;
@@ -20,7 +20,7 @@ namespace WireMock.Net.Tests.Http
// Assert // Assert
result.Headers.ContentType.Should().BeNull(); result.Headers.ContentType.Should().BeNull();
(await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content); (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
} }
[Theory] [Theory]
@@ -38,7 +38,7 @@ namespace WireMock.Net.Tests.Http
// Assert // Assert
result.Headers.ContentType.ToString().Should().Be(expected); result.Headers.ContentType.ToString().Should().Be(expected);
(await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content); (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
} }
} }
} }

10
test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs
View File

@@ -1,4 +1,4 @@
using NFluent; using NFluent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -43,7 +43,7 @@ namespace WireMock.Net.Tests.Http
var message = HttpRequestMessageHelper.Create(request, "http://url"); var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert // 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] [Fact]
@@ -61,7 +61,7 @@ namespace WireMock.Net.Tests.Http
var message = HttpRequestMessageHelper.Create(request, "http://url"); var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert // Assert
Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}"); Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
} }
[Fact] [Fact]
@@ -80,7 +80,7 @@ namespace WireMock.Net.Tests.Http
var message = HttpRequestMessageHelper.Create(request, "http://url"); var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert // 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"); Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json");
} }
@@ -100,7 +100,7 @@ namespace WireMock.Net.Tests.Http
var message = HttpRequestMessageHelper.Create(request, "http://url"); var message = HttpRequestMessageHelper.Create(request, "http://url");
// Assert // 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"); Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
} }

8
test/WireMock.Net.Tests/ObservableLogEntriesTest.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
@@ -41,7 +41,7 @@ namespace WireMock.Net.Tests
server.LogEntriesChanged += (sender, args) => throw new Exception(); server.LogEntriesChanged += (sender, args) => throw new Exception();
// Act // Act
await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}"); await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false);
// Assert // Assert
loggerMock.Verify(l => l.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once); loggerMock.Verify(l => l.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
@@ -65,7 +65,7 @@ namespace WireMock.Net.Tests
server.LogEntriesChanged += (sender, args) => count++; server.LogEntriesChanged += (sender, args) => count++;
// Act // Act
await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}"); await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false);
// Assert // Assert
Check.That(count).Equals(1); Check.That(count).Equals(1);
@@ -101,7 +101,7 @@ namespace WireMock.Net.Tests
Thread.Sleep(50); Thread.Sleep(50);
listOfTasks.Add(http.GetAsync($"{server.Urls[0]}{path}")); 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); var countResponsesWithStatusNotOk = responses.Count(r => r.StatusCode != HttpStatusCode.OK);
// Assert // Assert

26
test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using Xunit; using Xunit;
using Moq; using Moq;
@@ -66,7 +66,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
public async Task OwinResponseMapper_MapAsync_Null() public async Task OwinResponseMapper_MapAsync_Null()
{ {
// Act // Act
await _sut.MapAsync(null, _responseMock.Object); await _sut.MapAsync(null, _responseMock.Object).ConfigureAwait(false);
} }
[Theory] [Theory]
@@ -81,7 +81,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -102,7 +102,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -118,7 +118,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_responseMock.VerifySet(r => r.StatusCode = It.IsAny<int>(), Times.Never); _responseMock.VerifySet(r => r.StatusCode = It.IsAny<int>(), Times.Never);
@@ -138,7 +138,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_responseMock.VerifySet(r => r.StatusCode = expected, Times.Once); _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -154,7 +154,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Never); _stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Never);
@@ -172,7 +172,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny<CancellationToken>()), Times.Once); _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny<CancellationToken>()), Times.Once);
@@ -190,7 +190,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_stream.Verify(s => s.WriteAsync(bytes, 0, bytes.Length, It.IsAny<CancellationToken>()), Times.Once); _stream.Verify(s => s.WriteAsync(bytes, 0, bytes.Length, It.IsAny<CancellationToken>()), Times.Once);
@@ -208,7 +208,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_stream.Verify(s => s.WriteAsync(new byte[] { 123, 34, 116, 34, 58, 34, 120, 34, 125 }, 0, 9, It.IsAny<CancellationToken>()), Times.Once); _stream.Verify(s => s.WriteAsync(new byte[] { 123, 34, 116, 34, 58, 34, 120, 34, 125 }, 0, 9, It.IsAny<CancellationToken>()), Times.Once);
@@ -224,7 +224,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
#if NET452 #if NET452
@@ -248,7 +248,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_stream.Verify(s => s.WriteAsync(new byte[0], 0, 0, It.IsAny<CancellationToken>()), Times.Once); _stream.Verify(s => s.WriteAsync(new byte[0], 0, 0, It.IsAny<CancellationToken>()), Times.Once);
@@ -270,7 +270,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
}; };
// Act // Act
await _sut.MapAsync(responseMessage, _responseMock.Object); await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
// Assert // Assert
_responseMock.VerifySet(r => r.StatusCode = 100, Times.Once); _responseMock.VerifySet(r => r.StatusCode = 100, Times.Once);

12
test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs
View File

@@ -80,7 +80,7 @@ namespace WireMock.Net.Tests.Owin
public async Task WireMockMiddleware_Invoke_NoMatch() public async Task WireMockMiddleware_Invoke_NoMatch()
{ {
// Act // Act
await _sut.Invoke(_contextMock.Object); await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
// Assert and Verify // Assert and Verify
_optionsMock.Verify(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once); _optionsMock.Verify(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
@@ -103,7 +103,7 @@ namespace WireMock.Net.Tests.Owin
_matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result)); _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
// Act // Act
await _sut.Invoke(_contextMock.Object); await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
// Assert and Verify // Assert and Verify
_optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once); _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
@@ -126,7 +126,7 @@ namespace WireMock.Net.Tests.Owin
_matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result)); _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
// Act // Act
await _sut.Invoke(_contextMock.Object); await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
// Assert and Verify // Assert and Verify
_optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once); _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
@@ -142,7 +142,7 @@ namespace WireMock.Net.Tests.Owin
_optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1); _optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1);
// Act // Act
await _sut.Invoke(_contextMock.Object); await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
} }
[Fact] [Fact]
@@ -186,7 +186,7 @@ namespace WireMock.Net.Tests.Owin
_matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result)); _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
// Act // Act
await _sut.Invoke(_contextMock.Object); await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
// Assert and Verify // Assert and Verify
fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once); fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
@@ -240,7 +240,7 @@ namespace WireMock.Net.Tests.Owin
_matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result)); _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
// Act // Act
await _sut.Invoke(_contextMock.Object); await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
// Assert and Verify // Assert and Verify
fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once); fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);

4
test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs
View File

@@ -301,7 +301,7 @@ namespace WireMock.Net.Tests.RequestMatchers
ContentType = null, ContentType = null,
DeserializeJson = true DeserializeJson = true
}; };
bodyData = await BodyParser.Parse(bodyParserSettings); bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
} }
else if (body is string s) else if (body is string s)
{ {
@@ -311,7 +311,7 @@ namespace WireMock.Net.Tests.RequestMatchers
ContentType = null, ContentType = null,
DeserializeJson = true DeserializeJson = true
}; };
bodyData = await BodyParser.Parse(bodyParserSettings); bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
} }
else else
{ {

4
test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs
View File

@@ -1,4 +1,4 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using NFluent; using NFluent;
using WireMock.Models; using WireMock.Models;
using WireMock.ResponseBuilders; using WireMock.ResponseBuilders;
@@ -21,7 +21,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create(() => responseMessage); var responseBuilder = Response.Create(() => responseMessage);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message).Equals(responseMessage); Check.That(response.Message).Equals(responseMessage);

8
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs
View File

@@ -1,4 +1,4 @@
using FluentAssertions; using FluentAssertions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@@ -37,7 +37,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
); );
// Act // 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 // Assert
response.Should().Contain("<hello>world</hello>"); response.Should().Contain("<hello>world</hello>");
@@ -68,7 +68,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
); );
// Act // 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 // Assert
response.Should().Contain("<hello>world</hello>"); response.Should().Contain("<hello>world</hello>");
@@ -99,7 +99,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
); );
// Act // 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 // Assert
response.Should().Contain("<hello>world</hello>"); response.Should().Contain("<hello>world</hello>");

34
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Moq; using Moq;
@@ -43,7 +43,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII); var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII);
// act // act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// then // then
Check.That(response.Message.BodyData.BodyAsString).Equals("01"); Check.That(response.Message.BodyData.BodyAsString).Equals("01");
@@ -65,7 +65,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII); var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII);
// act // act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// then // then
Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 }); Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 });
@@ -87,7 +87,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithBody("test", null, Encoding.ASCII); var responseBuilder = Response.Create().WithBody("test", null, Encoding.ASCII);
// act // act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// then // then
Check.That(response.Message.BodyData.BodyAsString).Equals("test"); Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -109,7 +109,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithBodyAsJson(x, Encoding.ASCII); var responseBuilder = Response.Create().WithBodyAsJson(x, Encoding.ASCII);
// act // act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// then // then
Check.That(response.Message.BodyData.BodyAsJson).Equals(x); Check.That(response.Message.BodyData.BodyAsJson).Equals(x);
@@ -131,7 +131,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithBodyAsJson(x, true); var responseBuilder = Response.Create().WithBodyAsJson(x, true);
// act // act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// then // then
Check.That(response.Message.BodyData.BodyAsJson).Equals(x); Check.That(response.Message.BodyData.BodyAsJson).Equals(x);
@@ -147,7 +147,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII); var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
@@ -165,7 +165,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII); var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).IsNull(); Check.That(response.Message.BodyData.BodyAsString).IsNull();
@@ -183,7 +183,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII); var responseBuilder = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).IsNull(); Check.That(response.Message.BodyData.BodyAsString).IsNull();
@@ -205,7 +205,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithBody(req => $"path: {req.Path}"); .WithBody(req => $"path: {req.Path}");
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test");
@@ -229,12 +229,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithHeader("H2", "X2") .WithHeader("H2", "X2")
.WithBody(async req => .WithBody(async req =>
{ {
await Task.Delay(1); await Task.Delay(1).ConfigureAwait(false);
return $"path: {req.Path}"; return $"path: {req.Path}";
}); });
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test");
@@ -262,8 +262,8 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response1 = await responseBuilder.ProvideResponseAsync(request1, _settings); var response1 = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false);
var response2 = await responseBuilder.ProvideResponseAsync(request2, _settings); var response2 = await responseBuilder.ProvideResponseAsync(request2, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id); Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id);
@@ -287,7 +287,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents); 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.StatusCode).IsEqualTo(200);
Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents);
@@ -303,7 +303,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents); 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.StatusCode).IsEqualTo(200);
Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents);
@@ -319,7 +319,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithStatusCode(200).WithBody("File deleted."); 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.StatusCode).IsEqualTo(200);
Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted."); Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted.");

10
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs
View File

@@ -50,7 +50,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
}); });
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
@@ -74,7 +74,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
}); });
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
@@ -103,7 +103,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
}); });
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
@@ -135,7 +135,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithHeader(header, "Stef"); .WithHeader(header, "Stef");
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
@@ -161,7 +161,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings); var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); response.Message.BodyData.BodyAsString.Should().Be("/fooBar");

6
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs
View File

@@ -1,4 +1,4 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using FluentAssertions; using FluentAssertions;
using WireMock.Models; using WireMock.Models;
using WireMock.ResponseBuilders; using WireMock.ResponseBuilders;
@@ -22,7 +22,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
// Act // Act
var responseBuilder = Response.Create().WithFault(faultType); var responseBuilder = Response.Create().WithFault(faultType);
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.FaultType.Should().Be(faultType); response.Message.FaultType.Should().Be(faultType);
@@ -38,7 +38,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
// Act // Act
var responseBuilder = Response.Create().WithFault(faultType, percentage); var responseBuilder = Response.Create().WithFault(faultType, percentage);
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.FaultType.Should().Be(faultType); response.Message.FaultType.Should().Be(faultType);

6
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs
View File

@@ -1,4 +1,4 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using HandlebarsDotNet; using HandlebarsDotNet;
using Moq; using Moq;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -39,7 +39,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -64,7 +64,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);

4
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs
View File

@@ -1,4 +1,4 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Moq; using Moq;
using NFluent; using NFluent;
using WireMock.Handlers; using WireMock.Handlers;
@@ -39,7 +39,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// assert // assert
Check.That(response.Message.BodyData.BodyAsString).Equals("ABC"); Check.That(response.Message.BodyData.BodyAsString).Equals("ABC");

2
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs
View File

@@ -40,7 +40,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);

16
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Moq; using Moq;
@@ -77,7 +77,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -103,7 +103,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -157,7 +157,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // 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}}}"); 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 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // 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}}}"); 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 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
@@ -316,7 +316,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
@@ -369,7 +369,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ? .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ?
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.json"); Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.json");

12
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs
View File

@@ -42,7 +42,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -72,7 +72,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -102,7 +102,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -132,7 +132,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -213,7 +213,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings); Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
a.Should().ThrowAsync<HandlebarsException>(); a.Should().ThrowAsync<HandlebarsException>();
@@ -240,7 +240,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings); Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
a.Should().ThrowAsync<HandlebarsException>(); a.Should().ThrowAsync<HandlebarsException>();

12
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Moq; using Moq;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -43,7 +43,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -66,7 +66,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -88,7 +88,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -112,7 +112,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -134,7 +134,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);

10
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Moq; using Moq;
using NFluent; using NFluent;
@@ -40,7 +40,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// assert // assert
Check.That(response.Message.BodyData.BodyAsString).Equals("abc"); Check.That(response.Message.BodyData.BodyAsString).Equals("abc");
@@ -59,7 +59,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// assert // assert
Check.That(response.Message.BodyData.BodyAsString).Equals(""); Check.That(response.Message.BodyData.BodyAsString).Equals("");
@@ -78,7 +78,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// assert // assert
Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https"); Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https");
@@ -97,7 +97,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// assert // assert
Check.That(response.Message.BodyData.BodyAsString).Equals(""); Check.That(response.Message.BodyData.BodyAsString).Equals("");

14
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs
View File

@@ -1,4 +1,4 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
using NFluent; using NFluent;
using WireMock.Models; using WireMock.Models;
@@ -53,7 +53,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator(); var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator();
@@ -84,7 +84,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc"); Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc");
@@ -112,7 +112,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator(); var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator();
@@ -170,7 +170,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.BodyAsString.Should().Contain("TokenIdLijst").And.Contain("0000083256").And.Contain("0000083259"); response.Message.BodyData.BodyAsString.Should().Contain("TokenIdLijst").And.Contain("0000083256").And.Contain("0000083259");
@@ -198,7 +198,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True"); Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True");
@@ -226,7 +226,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1"); Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1");

12
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using NFluent; using NFluent;
using WireMock.Models; using WireMock.Models;
@@ -25,7 +25,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValue); IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValue);
// Act // Act
var response = await builder.ProvideResponseAsync(requestMock, _settings); var response = await builder.ProvideResponseAsync(requestMock, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue); Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue);
@@ -41,7 +41,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValues); IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValues);
// Act // Act
var response = await builder.ProvideResponseAsync(requestMock, _settings); var response = await builder.ProvideResponseAsync(requestMock, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues); Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues);
@@ -56,7 +56,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var response = Response.Create().WithHeaders(headers); var response = Response.Create().WithHeaders(headers);
// Act // Act
var responseMessage = await response.ProvideResponseAsync(request, _settings); var responseMessage = await response.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x"); Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x");
@@ -71,7 +71,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithHeaders(headers); var responseBuilder = Response.Create().WithHeaders(headers);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.Headers["h"]).ContainsExactly("x"); Check.That(response.Message.Headers["h"]).ContainsExactly("x");
@@ -86,7 +86,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var builder = Response.Create().WithHeaders(headers); var builder = Response.Create().WithHeaders(headers);
// Act // Act
var response = await builder.ProvideResponseAsync(request, _settings); var response = await builder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.Headers["h"]).ContainsExactly("x"); Check.That(response.Message.Headers["h"]).ContainsExactly("x");

4
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -49,7 +49,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithProxy(_server.Urls[0]); var responseBuilder = Response.Create().WithProxy(_server.Urls[0]);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(request.ProxyUrl).IsNotNull(); Check.That(request.ProxyUrl).IsNotNull();

6
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using FluentAssertions; using FluentAssertions;
using NFluent; using NFluent;
@@ -43,7 +43,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithTransformer(TransformerType.ScribanDotLiquid); var responseBuilder = Response.Create().WithTransformer(TransformerType.ScribanDotLiquid);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.Should().BeNull(); response.Message.BodyData.Should().BeNull();
@@ -65,7 +65,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(TransformerType.Scriban); .WithTransformer(TransformerType.Scriban);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt"); Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");

4
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs
View File

@@ -1,4 +1,4 @@
using FluentAssertions; using FluentAssertions;
using Moq; using Moq;
using System.Net; using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -40,7 +40,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
break; break;
} }
var response = await responseBuilder.ProvideResponseAsync(request, _settingsMock.Object); var response = await responseBuilder.ProvideResponseAsync(request, _settingsMock.Object).ConfigureAwait(false);
// Assert // Assert
response.Message.StatusCode.Should().Be(expectedStatusCode); response.Message.StatusCode.Should().Be(expectedStatusCode);

48
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -49,7 +49,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithTransformer(transformerType); var responseBuilder = Response.Create().WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.Should().BeNull(); response.Message.BodyData.Should().BeNull();
@@ -74,7 +74,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt"); Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
@@ -98,7 +98,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // 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"); 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 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock"); Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock");
@@ -136,7 +136,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock"); Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock");
@@ -158,7 +158,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5"); Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5");
@@ -182,7 +182,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5"); Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
@@ -205,7 +205,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test"); Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -231,7 +231,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test"); Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -257,7 +257,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test"); Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -278,7 +278,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer(); var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test"); Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -300,7 +300,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer(); var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test"); Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -325,7 +325,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
var responseBuilder = Response.Create().WithHeader("x", "{{request.Headers[\"Content-Type\"]}}", "{{request.Url}}").WithBody("test").WithTransformer(transformerType); var responseBuilder = Response.Create().WithHeader("x", "{{request.Headers[\"Content-Type\"]}}", "{{request.Url}}").WithBody("test").WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test"); Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -353,7 +353,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost"); Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
@@ -380,7 +380,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}"); Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
@@ -407,7 +407,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]"); Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
@@ -424,7 +424,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml"); Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
@@ -443,7 +443,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml"); Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
@@ -468,7 +468,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml"); Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
@@ -497,7 +497,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("\"test\""); Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("\"test\"");
@@ -521,7 +521,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(); .WithTransformer();
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
@@ -547,7 +547,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
@@ -575,7 +575,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
.WithTransformer(transformerType); .WithTransformer(transformerType);
// Act // Act
var response = await responseBuilder.ProvideResponseAsync(request, _settings); var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
// Assert // Assert
response.Message.BodyData.BodyAsString.Should().Be(text); response.Message.BodyData.BodyAsString.Should().Be(text);

48
test/WireMock.Net.Tests/StatefulBehaviorTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
@@ -28,7 +28,7 @@ namespace WireMock.Net.Tests
.RespondWith(Response.Create()); .RespondWith(Response.Create());
// when // 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 // then
Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound); Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound);
@@ -56,8 +56,8 @@ namespace WireMock.Net.Tests
.RespondWith(Response.Create().WithBody("Test state msg")); .RespondWith(Response.Create().WithBody("Test state msg"));
// when // when
var responseNoState = 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); var responseWithState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
// then // then
Check.That(responseNoState).Equals("No state msg"); Check.That(responseNoState).Equals("No state msg");
@@ -90,9 +90,9 @@ namespace WireMock.Net.Tests
// when // when
var client = new HttpClient(); var client = new HttpClient();
var responseScenario1 = 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); var responseScenario2 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
var responseWithState = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path); var responseWithState = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
// then // then
responseScenario1.Should().Be(body1); responseScenario1.Should().Be(body1);
@@ -137,11 +137,11 @@ namespace WireMock.Net.Tests
// when // when
var client = new HttpClient(); var client = new HttpClient();
var t1a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1); var t1a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false);
var t1b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1); var t1b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false);
var t2a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2); var t2a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false);
var t2b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2); var t2b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false);
var t3 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path3); var t3 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path3).ConfigureAwait(false);
// then // then
t1a.Should().Be(body1); t1a.Should().Be(body1);
@@ -173,8 +173,8 @@ namespace WireMock.Net.Tests
.RespondWith(Response.Create().WithBody("Scenario 1, State 2")); .RespondWith(Response.Create().WithBody("Scenario 1, State 2"));
// when // when
var responseIntScenario = 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); var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
// then // then
Check.That(responseIntScenario).Equals("Scenario 1, Setting State 2"); Check.That(responseIntScenario).Equals("Scenario 1, Setting State 2");
@@ -203,8 +203,8 @@ namespace WireMock.Net.Tests
.RespondWith(Response.Create().WithBody("string state, State 2")); .RespondWith(Response.Create().WithBody("string state, State 2"));
// when // when
var responseIntScenario = 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); var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
// then // then
Check.That(responseIntScenario).Equals("string state, Setting State 2"); Check.That(responseIntScenario).Equals("string state, Setting State 2");
@@ -233,8 +233,8 @@ namespace WireMock.Net.Tests
.RespondWith(Response.Create().WithBody("string state, State 2")); .RespondWith(Response.Create().WithBody("string state, State 2"));
// when // when
var responseIntScenario = 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); var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
// then // then
Check.That(responseIntScenario).Equals("int state, Setting State 2"); Check.That(responseIntScenario).Equals("int state, Setting State 2");
@@ -280,7 +280,7 @@ namespace WireMock.Net.Tests
Check.That(server.Scenarios["To do list"].Started).IsTrue(); Check.That(server.Scenarios["To do list"].Started).IsTrue();
Check.That(server.Scenarios["To do list"].Finished).IsFalse(); 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(postResponse.StatusCode).Equals(HttpStatusCode.Created);
Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
@@ -288,7 +288,7 @@ namespace WireMock.Net.Tests
Check.That(server.Scenarios["To do list"].Started).IsTrue(); Check.That(server.Scenarios["To do list"].Started).IsTrue();
Check.That(server.Scenarios["To do list"].Finished).IsFalse(); 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(getResponse2).Equals("Buy milk;Cancel newspaper subscription");
Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list"); Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
@@ -331,16 +331,16 @@ namespace WireMock.Net.Tests
// Act and Assert // Act and Assert
string url = "http://localhost:" + server.Ports[0]; 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"); 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"); 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"); 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"); Check.That(responseWithState2).Equals("Test state msg 2");
server.Stop(); server.Stop();

4
test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs
View File

@@ -1,7 +1,7 @@
using FluentAssertions; using System;
using FluentAssertions;
using HandlebarsDotNet; using HandlebarsDotNet;
using Moq; using Moq;
using System;
using WireMock.Handlers; using WireMock.Handlers;
using WireMock.Transformers.Handlebars; using WireMock.Transformers.Handlebars;
using Xunit; using Xunit;

20
test/WireMock.Net.Tests/Util/BodyParserTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using NFluent; using NFluent;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
@@ -30,7 +30,7 @@ namespace WireMock.Net.Tests.Util
}; };
// Act // Act
var body = await BodyParser.Parse(bodyParserSettings); var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// Assert // Assert
Check.That(body.BodyAsBytes).IsNotNull(); Check.That(body.BodyAsBytes).IsNotNull();
@@ -54,7 +54,7 @@ namespace WireMock.Net.Tests.Util
}; };
// Act // Act
var body = await BodyParser.Parse(bodyParserSettings); var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// Assert // Assert
Check.That(body.BodyAsBytes).IsNotNull(); Check.That(body.BodyAsBytes).IsNotNull();
@@ -79,7 +79,7 @@ namespace WireMock.Net.Tests.Util
}; };
// act // act
var body = await BodyParser.Parse(bodyParserSettings); var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// assert // assert
Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
@@ -100,7 +100,7 @@ namespace WireMock.Net.Tests.Util
}; };
// act // act
var body = await BodyParser.Parse(bodyParserSettings); var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// assert // assert
Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType); Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
@@ -139,7 +139,7 @@ Content-Type: text/html
}; };
// Act // Act
var result = await BodyParser.Parse(bodyParserSettings); var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// Assert // Assert
Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String); Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String);
@@ -163,7 +163,7 @@ Content-Type: text/html
}; };
// Act // Act
var result = await BodyParser.Parse(bodyParserSettings); var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// Assert // Assert
Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes); Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes);
@@ -186,7 +186,7 @@ Content-Type: text/html
}; };
// Act // Act
var body = await BodyParser.Parse(bodyParserSettings); var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// Assert // Assert
Check.That(body.BodyAsBytes).IsNotNull(); Check.That(body.BodyAsBytes).IsNotNull();
@@ -214,7 +214,7 @@ Content-Type: text/html
}; };
// Act // Act
var result = await BodyParser.Parse(bodyParserSettings); var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// Assert // Assert
result.DetectedBodyType.Should().Be(BodyType.String); result.DetectedBodyType.Should().Be(BodyType.String);
@@ -243,7 +243,7 @@ Content-Type: text/html
}; };
// Act // Act
var result = await BodyParser.Parse(bodyParserSettings); var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
// Assert // Assert
result.BodyAsBytes.Should().BeEquivalentTo(compressed); result.BodyAsBytes.Should().BeEquivalentTo(compressed);

40
test/WireMock.Net.Tests/WireMockAdminApiTests.cs
View File

@@ -1,4 +1,4 @@
#if !NET452 && !NET461 #if !NET452 && !NET461
using System; using System;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
@@ -31,7 +31,7 @@ namespace WireMock.Net.Tests
var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]); var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
// Act // Act
var settings = await api.GetSettingsAsync(); var settings = await api.GetSettingsAsync().ConfigureAwait(false);
Check.That(settings).IsNotNull(); Check.That(settings).IsNotNull();
} }
@@ -44,7 +44,7 @@ namespace WireMock.Net.Tests
// Act // Act
var settings = new SettingsModel(); 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"); Check.That(status.Status).Equals("Settings updated");
} }
@@ -57,7 +57,7 @@ namespace WireMock.Net.Tests
// Act // Act
var settings = new SettingsModel(); 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"); Check.That(status.Status).Equals("Settings updated");
} }
@@ -77,7 +77,7 @@ namespace WireMock.Net.Tests
Priority = 500, Priority = 500,
Title = "test" 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 // Assert
Check.That(result).IsNotNull(); Check.That(result).IsNotNull();
@@ -111,7 +111,7 @@ namespace WireMock.Net.Tests
Priority = 500, Priority = 500,
Title = "test" Title = "test"
}; };
var result = await api.PostMappingAsync(model); var result = await api.PostMappingAsync(model).ConfigureAwait(false);
// Assert // Assert
Check.That(result).IsNotNull(); Check.That(result).IsNotNull();
@@ -122,7 +122,7 @@ namespace WireMock.Net.Tests
Check.That(mapping).IsNotNull(); Check.That(mapping).IsNotNull();
Check.That(mapping.Title).Equals("test"); 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); Check.That(response.Message.StatusCode).Equals(expectedStatusCode);
server.Stop(); server.Stop();
@@ -148,7 +148,7 @@ namespace WireMock.Net.Tests
Response = new ResponseModel { Body = "txt 2" }, Response = new ResponseModel { Body = "txt 2" },
Title = "test 2" Title = "test 2"
}; };
var result = await api.PostMappingsAsync(new[] { model1, model2 }); var result = await api.PostMappingsAsync(new[] { model1, model2 }).ConfigureAwait(false);
// Assert // Assert
Check.That(result).IsNotNull(); Check.That(result).IsNotNull();
@@ -169,11 +169,11 @@ namespace WireMock.Net.Tests
Logger = new WireMockNullLogger() Logger = new WireMockNullLogger()
}); });
var serverUrl = "http://localhost:" + server.Ports[0]; 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<IWireMockAdminApi>(serverUrl); var api = RestClient.For<IWireMockAdminApi>(serverUrl);
// Act // Act
var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "GET" } }); var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "GET" } }).ConfigureAwait(false);
// Assert // Assert
Check.That(requests).HasSize(1); Check.That(requests).HasSize(1);
@@ -193,11 +193,11 @@ namespace WireMock.Net.Tests
Logger = new WireMockNullLogger() Logger = new WireMockNullLogger()
}); });
var serverUrl = "http://localhost:" + server.Ports[0]; 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<IWireMockAdminApi>(serverUrl); var api = RestClient.For<IWireMockAdminApi>(serverUrl);
// Act // Act
var requests = await api.GetRequestsAsync(); var requests = await api.GetRequestsAsync().ConfigureAwait(false);
// Assert // Assert
Check.That(requests).HasSize(1); Check.That(requests).HasSize(1);
@@ -233,7 +233,7 @@ namespace WireMock.Net.Tests
var api = RestClient.For<IWireMockAdminApi>(serverUrl); var api = RestClient.For<IWireMockAdminApi>(serverUrl);
// Act // Act
var requests = await api.GetRequestsAsync(); var requests = await api.GetRequestsAsync().ConfigureAwait(false);
// Assert // Assert
Check.That(requests).HasSize(1); Check.That(requests).HasSize(1);
@@ -270,7 +270,7 @@ namespace WireMock.Net.Tests
}, },
Response = new ResponseModel { Body = "world" } Response = new ResponseModel { Body = "world" }
}; };
var postMappingResult = await api.PostMappingAsync(model); var postMappingResult = await api.PostMappingAsync(model).ConfigureAwait(false);
// Assert // Assert
postMappingResult.Should().NotBeNull(); postMappingResult.Should().NotBeNull();
@@ -278,7 +278,7 @@ namespace WireMock.Net.Tests
var mapping = server.Mappings.FirstOrDefault(m => m.Guid == guid); var mapping = server.Mappings.FirstOrDefault(m => m.Guid == guid);
mapping.Should().NotBeNull(); mapping.Should().NotBeNull();
var getMappingResult = await api.GetMappingAsync(guid); var getMappingResult = await api.GetMappingAsync(guid).ConfigureAwait(false);
getMappingResult.Should().NotBeNull(); getMappingResult.Should().NotBeNull();
getMappingResult.Request.Body.Should().BeEquivalentTo(model.Request.Body); getMappingResult.Request.Body.Should().BeEquivalentTo(model.Request.Body);
@@ -311,7 +311,7 @@ namespace WireMock.Net.Tests
var api = RestClient.For<IWireMockAdminApi>(serverUrl); var api = RestClient.For<IWireMockAdminApi>(serverUrl);
// Act // Act
var requests = await api.GetRequestsAsync(); var requests = await api.GetRequestsAsync().ConfigureAwait(false);
// Assert // Assert
Check.That(requests).HasSize(1); Check.That(requests).HasSize(1);
@@ -340,7 +340,7 @@ namespace WireMock.Net.Tests
var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]); var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
// Act // Act
var request = await api.PostFileAsync("filename.txt", "abc"); var request = await api.PostFileAsync("filename.txt", "abc").ConfigureAwait(false);
// Assert // Assert
Check.That(request.Guid).IsNull(); Check.That(request.Guid).IsNull();
@@ -373,7 +373,7 @@ namespace WireMock.Net.Tests
var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]); var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
// Act // Act
var request = await api.PutFileAsync("filename.txt", "abc-abc"); var request = await api.PutFileAsync("filename.txt", "abc-abc").ConfigureAwait(false);
// Assert // Assert
Check.That(request.Guid).IsNull(); Check.That(request.Guid).IsNull();
@@ -459,7 +459,7 @@ namespace WireMock.Net.Tests
var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]); var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
// Act // Act
string file = await api.GetFileAsync("filename.txt"); string file = await api.GetFileAsync("filename.txt").ConfigureAwait(false);
// Assert // Assert
Check.That(file).Equals(data); Check.That(file).Equals(data);
@@ -490,7 +490,7 @@ namespace WireMock.Net.Tests
var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]); var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
// Act // Act
await api.DeleteFileAsync("filename.txt"); await api.DeleteFileAsync("filename.txt").ConfigureAwait(false);
// Verify // Verify
filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is<string>(p => p == "filename.txt")), Times.Once); filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is<string>(p => p == "filename.txt")), Times.Once);

16
test/WireMock.Net.Tests/WireMockServer.Admin.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -324,7 +324,7 @@ namespace WireMock.Net.Tests
Check.That(mappings).HasSize(2); Check.That(mappings).HasSize(2);
// when // 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 // then
Check.That((int)response.StatusCode).IsEqualTo(400); Check.That((int)response.StatusCode).IsEqualTo(400);
@@ -339,7 +339,7 @@ namespace WireMock.Net.Tests
var server = WireMockServer.Start(); var server = WireMockServer.Start();
// when // when
await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo"); await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);
// then // then
Check.That(server.LogEntries).HasSize(1); Check.That(server.LogEntries).HasSize(1);
@@ -359,9 +359,9 @@ namespace WireMock.Net.Tests
var server = WireMockServer.Start(); var server = WireMockServer.Start();
server.SetMaxRequestLogCount(2); server.SetMaxRequestLogCount(2);
await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo1"); await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo1").ConfigureAwait(false);
await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo2"); await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo2").ConfigureAwait(false);
await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo3"); await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo3").ConfigureAwait(false);
// Assert // Assert
Check.That(server.LogEntries).HasSize(2); Check.That(server.LogEntries).HasSize(2);
@@ -469,7 +469,7 @@ namespace WireMock.Net.Tests
Content = new StringContent(guidsJsonBody, Encoding.UTF8, "application/json") 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 // Assert
IEnumerable<Guid> guids = server.MappingModels.Select(mapping => mapping.Guid.Value); IEnumerable<Guid> guids = server.MappingModels.Select(mapping => mapping.Guid.Value);
@@ -477,7 +477,7 @@ namespace WireMock.Net.Tests
Check.That(guids.Contains(guid2.Value)).IsFalse(); Check.That(guids.Contains(guid2.Value)).IsFalse();
Check.That(guids.Contains(guid3.Value)).IsTrue(); Check.That(guids.Contains(guid3.Value)).IsTrue();
Check.That(response.StatusCode).Equals(HttpStatusCode.OK); 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}]\"}}");
} }
} }
} }

14
test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs
View File

@@ -1,4 +1,4 @@
using Moq; using Moq;
using NFluent; using NFluent;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -39,7 +39,7 @@ namespace WireMock.Net.Tests
multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string.")))); multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string."))));
// Act // 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 // Assert
Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK); Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK);
@@ -74,7 +74,7 @@ namespace WireMock.Net.Tests
multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string.")))); multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string."))));
// Act // 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 // Assert
Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK); Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK);
@@ -107,7 +107,7 @@ namespace WireMock.Net.Tests
multipartFormDataContent.Add(new StreamContent(new MemoryStream())); multipartFormDataContent.Add(new StreamContent(new MemoryStream()));
// Act // 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 // Assert
Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK); Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK);
@@ -143,7 +143,7 @@ namespace WireMock.Net.Tests
multipartFormDataContent.Add(new StreamContent(new MemoryStream())); multipartFormDataContent.Add(new StreamContent(new MemoryStream()));
// Act // 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 // Assert
Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK); Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK);
@@ -173,7 +173,7 @@ namespace WireMock.Net.Tests
// Act // Act
var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt"; var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt";
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri); var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri);
var httpResponseMessage = await _client.SendAsync(httpRequestMessage); var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false);
// Assert // Assert
Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NoContent); Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NoContent);
@@ -201,7 +201,7 @@ namespace WireMock.Net.Tests
// Act // Act
var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt"; var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt";
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri); var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri);
var httpResponseMessage = await _client.SendAsync(httpRequestMessage); var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false);
// Assert // Assert
Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NotFound); Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NotFound);

56
test/WireMock.Net.Tests/WireMockServer.Proxy.cs
View File

@@ -46,7 +46,7 @@ namespace WireMock.Net.Tests
RequestUri = new Uri(server.Urls[0]) RequestUri = new Uri(server.Urls[0])
}; };
var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
await new HttpClient(httpClientHandler).SendAsync(requestMessage); await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
Check.That(server.Mappings).HasSize(2); Check.That(server.Mappings).HasSize(2);
@@ -75,7 +75,7 @@ namespace WireMock.Net.Tests
RequestUri = new Uri(server.Urls[0]) RequestUri = new Uri(server.Urls[0])
}; };
var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
await new HttpClient(httpClientHandler).SendAsync(requestMessage); await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
server.Mappings.Should().HaveCount(2); server.Mappings.Should().HaveCount(2);
@@ -107,7 +107,7 @@ namespace WireMock.Net.Tests
RequestUri = new Uri(server.Urls[0]) RequestUri = new Uri(server.Urls[0])
}; };
var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
await new HttpClient(httpClientHandler).SendAsync(requestMessage); await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
server.Mappings.Should().HaveCount(1); server.Mappings.Should().HaveCount(1);
@@ -143,7 +143,7 @@ namespace WireMock.Net.Tests
RequestUri = new Uri(server.Urls[0]) RequestUri = new Uri(server.Urls[0])
}; };
var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
await new HttpClient(httpClientHandler).SendAsync(requestMessage); await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
server.Mappings.Should().HaveCount(1); server.Mappings.Should().HaveCount(1);
@@ -174,7 +174,7 @@ namespace WireMock.Net.Tests
RequestUri = new Uri(server.Urls[0]) RequestUri = new Uri(server.Urls[0])
}; };
var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
await new HttpClient(httpClientHandler).SendAsync(requestMessage); await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
server.Mappings.Should().HaveCount(2); server.Mappings.Should().HaveCount(2);
@@ -198,8 +198,8 @@ namespace WireMock.Net.Tests
RequestUri = new Uri($"{server.Urls[0]}{path}") RequestUri = new Uri($"{server.Urls[0]}{path}")
}; };
var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage); var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
string content = await response.Content.ReadAsStringAsync(); string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
// Assert // Assert
Check.That(server.Mappings).HasSize(1); Check.That(server.Mappings).HasSize(1);
@@ -239,7 +239,7 @@ namespace WireMock.Net.Tests
}; };
requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain"); requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
requestMessage.Content.Headers.Add("bbb", "test"); requestMessage.Content.Headers.Add("bbb", "test");
await new HttpClient().SendAsync(requestMessage); await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
@@ -288,10 +288,10 @@ namespace WireMock.Net.Tests
Content = new StringContent("stringContent", Encoding.ASCII) Content = new StringContent("stringContent", Encoding.ASCII)
}; };
requestMessage.Headers.Authorization = new AuthenticationHeaderValue("BASIC", "test-A"); 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 // 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 receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
var authorizationHeader = receivedRequest.Headers["Authorization"].ToString().Should().Be("BASIC test-A"); var authorizationHeader = receivedRequest.Headers["Authorization"].ToString().Should().Be("BASIC test-A");
@@ -334,7 +334,7 @@ namespace WireMock.Net.Tests
}; };
requestMessage.Headers.Add("foobar", "exact_match"); requestMessage.Headers.Add("foobar", "exact_match");
requestMessage.Headers.Add("ok", "ok-value"); requestMessage.Headers.Add("ok", "ok-value");
await new HttpClient().SendAsync(requestMessage); await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid);
@@ -381,7 +381,7 @@ namespace WireMock.Net.Tests
cookieContainer.Add(new Uri("http://localhost"), new Cookie("GoodCookie", "I_should_pass")); cookieContainer.Add(new Uri("http://localhost"), new Cookie("GoodCookie", "I_should_pass"));
var handler = new HttpClientHandler { CookieContainer = cookieContainer }; var handler = new HttpClientHandler { CookieContainer = cookieContainer };
await new HttpClient(handler).SendAsync(requestMessage); await new HttpClient(handler).SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid); var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid);
@@ -416,7 +416,7 @@ namespace WireMock.Net.Tests
Content = new StringContent("") Content = new StringContent("")
}; };
requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain"); requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
await new HttpClient().SendAsync(requestMessage); await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
@@ -448,10 +448,10 @@ namespace WireMock.Net.Tests
Method = HttpMethod.Get, Method = HttpMethod.Get,
RequestUri = new Uri($"{server.Urls[0]}{path}") RequestUri = new Uri($"{server.Urls[0]}{path}")
}; };
var response = await new HttpClient().SendAsync(requestMessage); var response = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
// Assert // 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.Contains("Content-Type")).IsTrue();
Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain"); Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain");
} }
@@ -482,7 +482,7 @@ namespace WireMock.Net.Tests
RequestUri = new Uri($"{server.Urls[0]}{path}") RequestUri = new Uri($"{server.Urls[0]}{path}")
}; };
var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; 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 // Assert
Check.That(response.Headers.Contains("Location")).IsTrue(); Check.That(response.Headers.Contains("Location")).IsTrue();
@@ -513,7 +513,7 @@ namespace WireMock.Net.Tests
}; };
var clientHandler = new HttpClientHandler(); var clientHandler = new HttpClientHandler();
clientHandler.CookieContainer.Add(requestUri, new Cookie("name", "value")); clientHandler.CookieContainer.Add(requestUri, new Cookie("name", "value"));
await new HttpClient(clientHandler).SendAsync(requestMessage); await new HttpClient(clientHandler).SendAsync(requestMessage).ConfigureAwait(false);
// then // then
var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage; var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
@@ -552,7 +552,7 @@ namespace WireMock.Net.Tests
.RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0])); .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0]));
// act // 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 // assert
Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK); Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK);
@@ -581,10 +581,10 @@ namespace WireMock.Net.Tests
Method = HttpMethod.Get, Method = HttpMethod.Get,
RequestUri = new Uri($"{server.Urls[0]}{path}") RequestUri = new Uri($"{server.Urls[0]}{path}")
}; };
var response = await new HttpClient().SendAsync(requestMessage); var response = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
// Assert // Assert
string content = await response.Content.ReadAsStringAsync(); string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
Check.That(content).IsEqualTo("{\"i\":42}"); Check.That(content).IsEqualTo("{\"i\":42}");
Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8"); Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
} }
@@ -612,10 +612,10 @@ namespace WireMock.Net.Tests
{ {
{ new StringContent("data"), "test", "test.txt" } { 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 // Assert
string content = await response.Content.ReadAsStringAsync(); string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
Check.That(content).IsEqualTo("{\"i\":42}"); Check.That(content).IsEqualTo("{\"i\":42}");
} }
@@ -647,10 +647,10 @@ namespace WireMock.Net.Tests
Method = HttpMethod.Get, Method = HttpMethod.Get,
RequestUri = new Uri($"{server.Urls[0]}{path}") 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 // Assert 1
string content1 = await response1.Content.ReadAsStringAsync(); string content1 = await response1.Content.ReadAsStringAsync().ConfigureAwait(false);
Check.That(content1).IsEqualTo("ok"); Check.That(content1).IsEqualTo("ok");
// Act 2 // Act 2
@@ -659,10 +659,10 @@ namespace WireMock.Net.Tests
Method = HttpMethod.Get, Method = HttpMethod.Get,
RequestUri = new Uri($"{server.Urls[0]}/__admin/mappings") 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 // Assert 2
string content2 = await response2.Content.ReadAsStringAsync(); string content2 = await response2.Content.ReadAsStringAsync().ConfigureAwait(false);
Check.That(content2).IsEqualTo("[]"); Check.That(content2).IsEqualTo("[]");
} }
@@ -688,12 +688,12 @@ namespace WireMock.Net.Tests
RequestUri = new Uri(server.Urls[0]) RequestUri = new Uri(server.Urls[0])
}; };
var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false }; 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 // Assert
result.StatusCode.Should().Be(HttpStatusCode.InternalServerError); result.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
var content = await result.Content.ReadAsStringAsync(); var content = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
content.Should().NotBeEmpty(); content.Should().NotBeEmpty();
server.LogEntries.Should().HaveCount(1); server.LogEntries.Should().HaveCount(1);

6
test/WireMock.Net.Tests/WireMockServer.Proxy2.cs
View File

@@ -1,4 +1,4 @@
using NFluent; using NFluent;
using System; using System;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
@@ -35,8 +35,8 @@ namespace WireMock.Net.Tests
request.Headers.Add("prx", "1"); request.Headers.Add("prx", "1");
// Assert // Assert
var response = await new HttpClient().SendAsync(request); var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
string content = await response.Content.ReadAsStringAsync(); string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
Check.That(content).IsEqualTo("{\"p\":42}"); Check.That(content).IsEqualTo("{\"p\":42}");
Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.Created); Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.Created);

18
test/WireMock.Net.Tests/WireMockServer.WebhookTests.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
@@ -70,8 +70,8 @@ namespace WireMock.Net.Tests
}; };
// Assert // Assert
var response = await new HttpClient().SendAsync(request); var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
string content = await response.Content.ReadAsStringAsync(); string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
response.StatusCode.Should().Be(HttpStatusCode.OK); response.StatusCode.Should().Be(HttpStatusCode.OK);
content.Should().Be("a-response"); content.Should().Be("a-response");
@@ -118,8 +118,8 @@ namespace WireMock.Net.Tests
}; };
// Assert // Assert
var response = await new HttpClient().SendAsync(request); var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
string content = await response.Content.ReadAsStringAsync(); string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
response.StatusCode.Should().Be(HttpStatusCode.OK); response.StatusCode.Should().Be(HttpStatusCode.OK);
content.Should().Be("a-response"); content.Should().Be("a-response");
@@ -151,8 +151,8 @@ namespace WireMock.Net.Tests
}; };
// Assert // Assert
var response = await new HttpClient().SendAsync(request); var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
string content = await response.Content.ReadAsStringAsync(); string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
response.StatusCode.Should().Be(HttpStatusCode.OK); response.StatusCode.Should().Be(HttpStatusCode.OK);
content.Should().Be("a-response"); content.Should().Be("a-response");
@@ -185,8 +185,8 @@ namespace WireMock.Net.Tests
}; };
// Assert // Assert
var response = await new HttpClient().SendAsync(request); var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
string content = await response.Content.ReadAsStringAsync(); string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
response.StatusCode.Should().Be(HttpStatusCode.OK); response.StatusCode.Should().Be(HttpStatusCode.OK);
content.Should().Be("a-response"); content.Should().Be("a-response");

4
test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs
View File

@@ -37,7 +37,7 @@ namespace WireMock.Net.Tests
}; };
// Act // 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 // Assert
response.StatusCode.Should().Be(HttpStatusCode.OK); response.StatusCode.Should().Be(HttpStatusCode.OK);
@@ -58,7 +58,7 @@ namespace WireMock.Net.Tests
); );
// Act // 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 // Assert
response.StatusCode.Should().Be(HttpStatusCode.OK); response.StatusCode.Should().Be(HttpStatusCode.OK);

2
test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs
View File

@@ -28,7 +28,7 @@ namespace WireMock.Net.Tests
// Act // Act
var httpClient = new HttpClient(); 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 // Assert
response.StatusCode.Should().Be(HttpStatusCode.Conflict); response.StatusCode.Should().Be(HttpStatusCode.Conflict);

34
test/WireMock.Net.Tests/WireMockServerTests.cs
View File

@@ -25,7 +25,7 @@ namespace WireMock.Net.Tests
var server = WireMockServer.Start(); var server = WireMockServer.Start();
// when // 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(); server.ResetLogEntries();
// then // then
@@ -83,7 +83,7 @@ namespace WireMock.Net.Tests
.WithBody("REDIRECT SUCCESSFUL")); .WithBody("REDIRECT SUCCESSFUL"));
// Act // 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 // Assert
Check.That(response).IsEqualTo("REDIRECT SUCCESSFUL"); Check.That(response).IsEqualTo("REDIRECT SUCCESSFUL");
@@ -107,7 +107,7 @@ namespace WireMock.Net.Tests
// Act // Act
var watch = new Stopwatch(); var watch = new Stopwatch();
watch.Start(); 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(); watch.Stop();
// Asser. // Asser.
@@ -136,14 +136,14 @@ namespace WireMock.Net.Tests
async Task<long> ExecuteTimedRequestAsync() async Task<long> ExecuteTimedRequestAsync()
{ {
watch.Reset(); 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; return watch.ElapsedMilliseconds;
} }
// Act // Act
await ExecuteTimedRequestAsync(); await ExecuteTimedRequestAsync().ConfigureAwait(false);
await ExecuteTimedRequestAsync(); await ExecuteTimedRequestAsync().ConfigureAwait(false);
await ExecuteTimedRequestAsync(); await ExecuteTimedRequestAsync().ConfigureAwait(false);
server.Stop(); server.Stop();
} }
@@ -161,7 +161,7 @@ namespace WireMock.Net.Tests
// Act // Act
var watch = new Stopwatch(); var watch = new Stopwatch();
watch.Start(); 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(); watch.Stop();
// Assert // Assert
@@ -199,7 +199,7 @@ namespace WireMock.Net.Tests
.RespondWith(Response.Create().WithHeader("Transfer-Encoding", "chunked").WithHeader("test", "t")); .RespondWith(Response.Create().WithHeader("Transfer-Encoding", "chunked").WithHeader("test", "t"));
// Act // 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 // Assert
Check.That(response.Headers.Contains("test")).IsTrue(); Check.That(response.Headers.Contains("test")).IsTrue();
@@ -230,7 +230,7 @@ namespace WireMock.Net.Tests
// Act // Act
var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost:" + server.Ports[0] + "/"); var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost:" + server.Ports[0] + "/");
request.Content = new StringContent(content); request.Content = new StringContent(content);
var response = await new HttpClient().SendAsync(request); var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
// Assert // Assert
Check.That(response.StatusCode).Equals(HttpStatusCode.OK); Check.That(response.StatusCode).Equals(HttpStatusCode.OK);
@@ -264,7 +264,7 @@ namespace WireMock.Net.Tests
// Act // Act
var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost:" + server.Ports[0] + "/"); var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost:" + server.Ports[0] + "/");
request.Content = new StringContent(content); request.Content = new StringContent(content);
var response = await new HttpClient().SendAsync(request); var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
// Assert // Assert
Check.That(response.StatusCode).Equals(HttpStatusCode.OK); Check.That(response.StatusCode).Equals(HttpStatusCode.OK);
@@ -298,11 +298,11 @@ namespace WireMock.Net.Tests
var server = WireMockServer.StartWithAdminInterface(); var server = WireMockServer.StartWithAdminInterface();
// Act // 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 // Assert
Check.That(response.StatusCode).Equals(HttpStatusCode.Created); 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(); server.Stop();
} }
@@ -331,10 +331,10 @@ namespace WireMock.Net.Tests
content.Headers.ContentEncoding.Add(contentEncoding); content.Headers.ContentEncoding.Add(contentEncoding);
// Act // 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 // Assert
Check.That(await response.Content.ReadAsStringAsync()).Contains("OK"); Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Contains("OK");
server.Stop(); server.Stop();
} }
@@ -354,7 +354,7 @@ namespace WireMock.Net.Tests
.WithBody("from ipv4 loopback")); .WithBody("from ipv4 loopback"));
// Act // 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 // Assert
Check.That(response).IsEqualTo("from ipv4 loopback"); Check.That(response).IsEqualTo("from ipv4 loopback");
@@ -376,7 +376,7 @@ namespace WireMock.Net.Tests
.WithBody("from ipv6 loopback")); .WithBody("from ipv6 loopback"));
// Act // 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 // Assert
Check.That(response).IsEqualTo("from ipv6 loopback"); Check.That(response).IsEqualTo("from ipv6 loopback");