diff --git a/src/WireMock.Net.Minimal/Mapping.cs b/src/WireMock.Net.Minimal/Mapping.cs index c62baa89..263b6e73 100644 --- a/src/WireMock.Net.Minimal/Mapping.cs +++ b/src/WireMock.Net.Minimal/Mapping.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Stef.Validation; using WireMock.Matchers.Request; using WireMock.Models; @@ -145,9 +146,9 @@ public class Mapping : IMapping } /// - public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage) + public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(HttpContext context, IRequestMessage requestMessage) { - return Provider.ProvideResponseAsync(this, requestMessage, Settings); + return Provider.ProvideResponseAsync(this, context, requestMessage, Settings); } /// diff --git a/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs b/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs index a1fc47b4..424c6e9d 100644 --- a/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs +++ b/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs @@ -23,7 +23,6 @@ internal partial class AspNetCoreSelfHost : IOwinSelfHost private readonly IWireMockLogger _logger; private readonly HostUrlOptions _urlOptions; - private Exception _runningException; private IWebHost _host; public bool IsStarted { get; private set; } @@ -32,7 +31,7 @@ internal partial class AspNetCoreSelfHost : IOwinSelfHost public List Ports { get; } = new(); - public Exception RunningException => _runningException; + public Exception? RunningException { get; private set; } public AspNetCoreSelfHost(IWireMockMiddlewareOptions wireMockMiddlewareOptions, HostUrlOptions urlOptions) { @@ -136,7 +135,7 @@ internal partial class AspNetCoreSelfHost : IOwinSelfHost } catch (Exception e) { - _runningException = e; + RunningException = e; _logger.Error(e.ToString()); IsStarted = false; diff --git a/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs b/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs index 3608d645..41b3377f 100644 --- a/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs +++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs @@ -9,12 +9,6 @@ using Microsoft.AspNetCore.Http.Extensions; using WireMock.Http; using WireMock.Models; using WireMock.Util; -//#if !USE_ASPNETCORE -//using IRequest = Microsoft.Owin.IOwinRequest; -//#else -//using Microsoft.AspNetCore.Http.Extensions; -//using IRequest = Microsoft.AspNetCore.Http.HttpRequest; -//#endif namespace WireMock.Owin.Mappers; @@ -76,10 +70,8 @@ internal class OwinRequestMapper : IOwinRequestMapper headers, cookies, httpVersion, -//#if USE_ASPNETCORE await request.HttpContext.Connection.GetClientCertificateAsync() -//#endif - ) + ) { DateTime = DateTime.UtcNow }; @@ -87,10 +79,6 @@ internal class OwinRequestMapper : IOwinRequestMapper private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(HttpRequest request) { - //#if !USE_ASPNETCORE - // var urlDetails = UrlUtils.Parse(request.Uri, request.PathBase); - // var clientIP = request.RemoteIpAddress; - //#else var urlDetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase); var connection = request.HttpContext.Connection; @@ -107,7 +95,7 @@ internal class OwinRequestMapper : IOwinRequestMapper { clientIP = connection.RemoteIpAddress.ToString(); } - //#endif + return (urlDetails, clientIP); } } \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs b/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs index 8dbb1f99..a6c65f11 100644 --- a/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs +++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs @@ -18,13 +18,6 @@ using WireMock.ResponseBuilders; using WireMock.Types; using WireMock.Util; -//#if !USE_ASPNETCORE -//using IResponse = Microsoft.Owin.IOwinResponse; -//#else -//using Microsoft.AspNetCore.Http; -//using IResponse = Microsoft.AspNetCore.Http.HttpResponse; -//#endif - namespace WireMock.Owin.Mappers { /// @@ -260,11 +253,7 @@ namespace WireMock.Owin.Mappers private static void AppendResponseHeader(HttpResponse response, string headerName, string[] values) { - //#if !USE_ASPNETCORE - // response.Headers.AppendValues(headerName, values); - //#else response.Headers.Append(headerName, values); - //#endif } } } \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs b/src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs index 17eef6fa..1cb84ce6 100644 --- a/src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs +++ b/src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs @@ -141,7 +141,7 @@ internal class WireMockMiddleware await Task.Delay(_options.RequestProcessingDelay.Value).ConfigureAwait(false); } - var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request).ConfigureAwait(false); + var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(ctx, request).ConfigureAwait(false); response = theResponse; var responseBuilder = targetMapping.Provider as Response; diff --git a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs index 13ba9afa..f5b891b1 100644 --- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs +++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs @@ -4,16 +4,16 @@ // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root. using System; using System.Net; +using System.Net.Http; using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; +using Microsoft.AspNetCore.Http; using Stef.Validation; using WireMock.Proxy; using WireMock.RequestBuilders; using WireMock.Settings; using WireMock.Transformers; -using WireMock.Transformers.Handlebars; -using WireMock.Transformers.Scriban; using WireMock.Types; using WireMock.Util; @@ -187,8 +187,10 @@ public partial class Response : IResponseBuilder } /// - public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings) + public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, HttpContext context, IRequestMessage requestMessage, WireMockServerSettings settings) { + Guard.NotNull(mapping); + Guard.NotNull(context); Guard.NotNull(requestMessage); Guard.NotNull(settings); diff --git a/src/WireMock.Net.Minimal/ResponseProviders/DynamicAsyncResponseProvider.cs b/src/WireMock.Net.Minimal/ResponseProviders/DynamicAsyncResponseProvider.cs index 79861832..394c8f34 100644 --- a/src/WireMock.Net.Minimal/ResponseProviders/DynamicAsyncResponseProvider.cs +++ b/src/WireMock.Net.Minimal/ResponseProviders/DynamicAsyncResponseProvider.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Stef.Validation; using WireMock.Settings; @@ -9,15 +10,16 @@ namespace WireMock.ResponseProviders; internal class DynamicAsyncResponseProvider : IResponseProvider { - private readonly Func> _responseMessageFunc; + private readonly Func> _responseMessageFunc; - public DynamicAsyncResponseProvider(Func> responseMessageFunc) + public DynamicAsyncResponseProvider(Func> responseMessageFunc) { _responseMessageFunc = Guard.NotNull(responseMessageFunc); } - public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings) + /// + public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, HttpContext context, IRequestMessage requestMessage, WireMockServerSettings settings) { - return (await _responseMessageFunc(requestMessage).ConfigureAwait(false), null); + return (await _responseMessageFunc(context, requestMessage).ConfigureAwait(false), null); } } \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/ResponseProviders/DynamicResponseProvider.cs b/src/WireMock.Net.Minimal/ResponseProviders/DynamicResponseProvider.cs index 8ea2eef1..443211e1 100644 --- a/src/WireMock.Net.Minimal/ResponseProviders/DynamicResponseProvider.cs +++ b/src/WireMock.Net.Minimal/ResponseProviders/DynamicResponseProvider.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Stef.Validation; using WireMock.Settings; @@ -9,16 +10,17 @@ namespace WireMock.ResponseProviders; internal class DynamicResponseProvider : IResponseProvider { - private readonly Func _responseMessageFunc; + private readonly Func _responseMessageFunc; - public DynamicResponseProvider(Func responseMessageFunc) + public DynamicResponseProvider(Func responseMessageFunc) { _responseMessageFunc = Guard.NotNull(responseMessageFunc); } - public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings) + /// + public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, HttpContext context, IRequestMessage requestMessage, WireMockServerSettings settings) { - (IResponseMessage responseMessage, IMapping? mapping) result = (_responseMessageFunc(requestMessage), null); + (IResponseMessage responseMessage, IMapping? mapping) result = (_responseMessageFunc(context, requestMessage), null); return Task.FromResult(result); } } \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/ResponseProviders/ProxyAsyncResponseProvider.cs b/src/WireMock.Net.Minimal/ResponseProviders/ProxyAsyncResponseProvider.cs index c60ebaad..e4e5c756 100644 --- a/src/WireMock.Net.Minimal/ResponseProviders/ProxyAsyncResponseProvider.cs +++ b/src/WireMock.Net.Minimal/ResponseProviders/ProxyAsyncResponseProvider.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Stef.Validation; using WireMock.Settings; @@ -9,17 +10,18 @@ namespace WireMock.ResponseProviders; internal class ProxyAsyncResponseProvider : IResponseProvider { - private readonly Func> _responseMessageFunc; + private readonly Func> _responseMessageFunc; private readonly WireMockServerSettings _settings; - public ProxyAsyncResponseProvider(Func> responseMessageFunc, WireMockServerSettings settings) + public ProxyAsyncResponseProvider(Func> responseMessageFunc, WireMockServerSettings settings) { _responseMessageFunc = Guard.NotNull(responseMessageFunc); _settings = Guard.NotNull(settings); } - public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings) + /// + public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, HttpContext context, IRequestMessage requestMessage, WireMockServerSettings settings) { - return (await _responseMessageFunc(requestMessage, _settings).ConfigureAwait(false), null); + return (await _responseMessageFunc(context, requestMessage, _settings).ConfigureAwait(false), null); } } \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs b/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs index f4434811..1d539ef9 100644 --- a/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs +++ b/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Net; using System.Text; using JetBrains.Annotations; +using Microsoft.AspNetCore.Http; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Stef.Validation; @@ -254,7 +255,7 @@ public partial class WireMockServer #endregion #region Health - private static IResponseMessage HealthGet(IRequestMessage requestMessage) + private static IResponseMessage HealthGet(HttpContext _, IRequestMessage requestMessage) { return new ResponseMessage { @@ -270,7 +271,7 @@ public partial class WireMockServer #endregion #region Settings - private IResponseMessage SettingsGet(IRequestMessage requestMessage) + private IResponseMessage SettingsGet(HttpContext _, IRequestMessage requestMessage) { var model = new SettingsModel { @@ -305,7 +306,7 @@ public partial class WireMockServer return ToJson(model); } - private IResponseMessage SettingsUpdate(IRequestMessage requestMessage) + private IResponseMessage SettingsUpdate(HttpContext _, IRequestMessage requestMessage) { var settings = DeserializeObject(requestMessage); @@ -357,9 +358,9 @@ public partial class WireMockServer #endregion Settings #region Mapping/{guid} - private IResponseMessage MappingGet(IRequestMessage requestMessage) + private IResponseMessage MappingGet(HttpContext context, IRequestMessage requestMessage) { - var mapping = FindMappingByGuid(requestMessage); + var mapping = FindMappingByGuid(context, requestMessage); if (mapping == null) { _settings.Logger.Warn("HttpStatusCode set to 404 : Mapping not found"); @@ -371,7 +372,7 @@ public partial class WireMockServer return ToJson(model); } - private IResponseMessage MappingCodeGet(IRequestMessage requestMessage) + private IResponseMessage MappingCodeGet(HttpContext context, IRequestMessage requestMessage) { if (TryParseGuidFromRequestMessage(requestMessage, out var guid)) { @@ -401,12 +402,12 @@ public partial class WireMockServer return defaultValue; } - private IMapping? FindMappingByGuid(IRequestMessage requestMessage) + private IMapping? FindMappingByGuid(HttpContext _, IRequestMessage requestMessage) { return TryParseGuidFromRequestMessage(requestMessage, out var guid) ? Mappings.FirstOrDefault(m => !m.IsAdminInterface && m.Guid == guid) : null; } - private IResponseMessage MappingPut(IRequestMessage requestMessage) + private IResponseMessage MappingPut(HttpContext _, IRequestMessage requestMessage) { if (TryParseGuidFromRequestMessage(requestMessage, out var guid)) { @@ -420,7 +421,7 @@ public partial class WireMockServer return ResponseMessageBuilder.Create(HttpStatusCode.NotFound, "Mapping not found"); } - private IResponseMessage MappingDelete(IRequestMessage requestMessage) + private IResponseMessage MappingDelete(HttpContext _, IRequestMessage requestMessage) { if (TryParseGuidFromRequestMessage(requestMessage, out var guid) && DeleteMapping(guid)) { @@ -439,7 +440,7 @@ public partial class WireMockServer #endregion Mapping/{guid} #region Mappings - private IResponseMessage SwaggerGet(IRequestMessage requestMessage) + private IResponseMessage SwaggerGet(HttpContext _, IRequestMessage requestMessage) { return new ResponseMessage { @@ -453,7 +454,7 @@ public partial class WireMockServer }; } - private IResponseMessage MappingsSave(IRequestMessage requestMessage) + private IResponseMessage MappingsSave(HttpContext _, IRequestMessage requestMessage) { SaveStaticMappings(); @@ -465,12 +466,12 @@ public partial class WireMockServer return _mappingBuilder.GetMappings(); } - private IResponseMessage MappingsGet(IRequestMessage requestMessage) + private IResponseMessage MappingsGet(HttpContext _, IRequestMessage requestMessage) { return ToJson(ToMappingModels()); } - private IResponseMessage MappingsCodeGet(IRequestMessage requestMessage) + private IResponseMessage MappingsCodeGet(HttpContext _, IRequestMessage requestMessage) { var converterType = GetEnumFromQuery(requestMessage, MappingConverterType.Server); @@ -479,7 +480,7 @@ public partial class WireMockServer return ToResponseMessage(code); } - private IResponseMessage MappingsPost(IRequestMessage requestMessage) + private IResponseMessage MappingsPost(HttpContext _, IRequestMessage requestMessage) { try { @@ -506,7 +507,7 @@ public partial class WireMockServer } } - private IResponseMessage MappingsDelete(IRequestMessage requestMessage) + private IResponseMessage MappingsDelete(HttpContext _, IRequestMessage requestMessage) { if (!string.IsNullOrEmpty(requestMessage.Body)) { @@ -560,7 +561,7 @@ public partial class WireMockServer return deletedGuids; } - private IResponseMessage MappingsReset(IRequestMessage requestMessage) + private IResponseMessage MappingsReset(HttpContext _, IRequestMessage requestMessage) { ResetMappings(); @@ -579,7 +580,7 @@ public partial class WireMockServer return ResponseMessageBuilder.Create(200, message); } - private IResponseMessage ReloadStaticMappings(IRequestMessage _) + private IResponseMessage ReloadStaticMappings(HttpContext _, IRequestMessage __) { ReadStaticMappings(); @@ -588,7 +589,7 @@ public partial class WireMockServer #endregion Mappings #region Request/{guid} - private IResponseMessage RequestGet(IRequestMessage requestMessage) + private IResponseMessage RequestGet(HttpContext _, IRequestMessage requestMessage) { if (TryParseGuidFromRequestMessage(requestMessage, out var guid)) { @@ -604,7 +605,7 @@ public partial class WireMockServer return ResponseMessageBuilder.Create(HttpStatusCode.NotFound, "Request not found"); } - private IResponseMessage RequestDelete(IRequestMessage requestMessage) + private IResponseMessage RequestDelete(HttpContext _, IRequestMessage requestMessage) { if (TryParseGuidFromRequestMessage(requestMessage, out var guid) && DeleteLogEntry(guid)) { @@ -617,7 +618,7 @@ public partial class WireMockServer #endregion Request/{guid} #region Requests - private IResponseMessage RequestsGet(IRequestMessage requestMessage) + private IResponseMessage RequestsGet(HttpContext _, IRequestMessage requestMessage) { var logEntryMapper = new LogEntryMapper(_options); var result = LogEntries @@ -627,7 +628,7 @@ public partial class WireMockServer return ToJson(result); } - private IResponseMessage RequestsDelete(IRequestMessage requestMessage) + private IResponseMessage RequestsDelete(HttpContext _, IRequestMessage requestMessage) { ResetLogEntries(); @@ -636,7 +637,7 @@ public partial class WireMockServer #endregion Requests #region Requests/find - private IResponseMessage RequestsFind(IRequestMessage requestMessage) + private IResponseMessage RequestsFind(HttpContext _, IRequestMessage requestMessage) { var requestModel = DeserializeObject(requestMessage); @@ -658,7 +659,7 @@ public partial class WireMockServer return ToJson(result); } - private IResponseMessage RequestsFindByMappingGuid(IRequestMessage requestMessage) + private IResponseMessage RequestsFindByMappingGuid(HttpContext _, IRequestMessage requestMessage) { if (requestMessage.Query != null && requestMessage.Query.TryGetValue("mappingGuid", out var value) && @@ -676,7 +677,7 @@ public partial class WireMockServer #endregion Requests/find #region Scenarios - private IResponseMessage ScenariosGet(IRequestMessage requestMessage) + private IResponseMessage ScenariosGet(HttpContext _, IRequestMessage requestMessage) { var scenariosStates = Scenarios.Values.Select(s => new ScenarioStateModel { @@ -690,14 +691,14 @@ public partial class WireMockServer return ToJson(scenariosStates, true); } - private IResponseMessage ScenariosReset(IRequestMessage requestMessage) + private IResponseMessage ScenariosReset(HttpContext _, IRequestMessage requestMessage) { ResetScenarios(); return ResponseMessageBuilder.Create(200, "Scenarios reset"); } - private IResponseMessage ScenarioReset(IRequestMessage requestMessage) + private IResponseMessage ScenarioReset(HttpContext _, IRequestMessage requestMessage) { var name = string.Equals(HttpRequestMethod.DELETE, requestMessage.Method, StringComparison.OrdinalIgnoreCase) ? requestMessage.Path.Substring(_adminPaths!.Scenarios.Length + 1) : @@ -708,7 +709,7 @@ public partial class WireMockServer ResponseMessageBuilder.Create(HttpStatusCode.NotFound, $"No scenario found by name '{name}'."); } - private IResponseMessage ScenariosSetState(IRequestMessage requestMessage) + private IResponseMessage ScenariosSetState(HttpContext _, IRequestMessage requestMessage) { var name = requestMessage.Path.Split('/').Reverse().Skip(1).First(); if (!_options.Scenarios.ContainsKey(name)) diff --git a/src/WireMock.Net.Minimal/Server/WireMockServer.AdminFiles.cs b/src/WireMock.Net.Minimal/Server/WireMockServer.AdminFiles.cs index 2629fbb1..164970ea 100644 --- a/src/WireMock.Net.Minimal/Server/WireMockServer.AdminFiles.cs +++ b/src/WireMock.Net.Minimal/Server/WireMockServer.AdminFiles.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Net; using System.Text; +using Microsoft.AspNetCore.Http; using WireMock.Types; using WireMock.Util; @@ -14,7 +15,7 @@ public partial class WireMockServer private static readonly Encoding[] FileBodyIsString = [Encoding.UTF8, Encoding.ASCII]; #region ProtoDefinitions/{id} - private IResponseMessage ProtoDefinitionAdd(IRequestMessage requestMessage) + private IResponseMessage ProtoDefinitionAdd(HttpContext _, IRequestMessage requestMessage) { if (requestMessage.Body is null) { @@ -30,7 +31,7 @@ public partial class WireMockServer #endregion #region Files/{filename} - private IResponseMessage FilePost(IRequestMessage requestMessage) + private IResponseMessage FilePost(HttpContext _, IRequestMessage requestMessage) { if (requestMessage.BodyAsBytes is null) { @@ -50,7 +51,7 @@ public partial class WireMockServer return ResponseMessageBuilder.Create(HttpStatusCode.OK, "File created"); } - private IResponseMessage FilePut(IRequestMessage requestMessage) + private IResponseMessage FilePut(HttpContext _, IRequestMessage requestMessage) { if (requestMessage.BodyAsBytes is null) { @@ -70,7 +71,7 @@ public partial class WireMockServer return ResponseMessageBuilder.Create(HttpStatusCode.OK, "File updated"); } - private IResponseMessage FileGet(IRequestMessage requestMessage) + private IResponseMessage FileGet(HttpContext _, IRequestMessage requestMessage) { var filename = GetFileNameFromRequestMessage(requestMessage); @@ -106,7 +107,7 @@ public partial class WireMockServer /// Note: Response is returned with no body as a head request doesn't accept a body, only the status code. /// /// The request message. - private IResponseMessage FileHead(IRequestMessage requestMessage) + private IResponseMessage FileHead(HttpContext _, IRequestMessage requestMessage) { var filename = GetFileNameFromRequestMessage(requestMessage); @@ -119,7 +120,7 @@ public partial class WireMockServer return ResponseMessageBuilder.Create(HttpStatusCode.NoContent); } - private IResponseMessage FileDelete(IRequestMessage requestMessage) + private IResponseMessage FileDelete(HttpContext _, IRequestMessage requestMessage) { var filename = GetFileNameFromRequestMessage(requestMessage); diff --git a/src/WireMock.Net.Minimal/Server/WireMockServer.ImportWireMockOrg.cs b/src/WireMock.Net.Minimal/Server/WireMockServer.ImportWireMockOrg.cs index 1cc29b61..d484e65d 100644 --- a/src/WireMock.Net.Minimal/Server/WireMockServer.ImportWireMockOrg.cs +++ b/src/WireMock.Net.Minimal/Server/WireMockServer.ImportWireMockOrg.cs @@ -6,12 +6,13 @@ using System.IO; using System.Linq; using System.Text; using JetBrains.Annotations; +using Microsoft.AspNetCore.Http; using Newtonsoft.Json.Linq; +using Stef.Validation; using WireMock.Matchers; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; using WireMock.Util; -using Stef.Validation; using OrgMapping = WireMock.Org.Abstractions.Mapping; namespace WireMock.Server; @@ -46,7 +47,7 @@ public partial class WireMockServer } } - private IResponseMessage MappingsPostWireMockOrg(IRequestMessage requestMessage) + private IResponseMessage MappingsPostWireMockOrg(HttpContext _, IRequestMessage requestMessage) { try { @@ -76,7 +77,7 @@ public partial class WireMockServer } } - private Guid? ConvertWireMockOrgMappingAndRegisterAsRespondProvider(Org.Abstractions.Mapping mapping, Guid? guid = null, string? path = null) + private Guid? ConvertWireMockOrgMappingAndRegisterAsRespondProvider(OrgMapping mapping, Guid? guid = null, string? path = null) { var requestBuilder = Request.Create(); diff --git a/src/WireMock.Net.Minimal/Server/WireMockServer.OpenApiParser.cs b/src/WireMock.Net.Minimal/Server/WireMockServer.OpenApiParser.cs index e5752e08..fd7fccce 100644 --- a/src/WireMock.Net.Minimal/Server/WireMockServer.OpenApiParser.cs +++ b/src/WireMock.Net.Minimal/Server/WireMockServer.OpenApiParser.cs @@ -1,19 +1,17 @@ // Copyright © WireMock.Net -using System.Net; -//#if OPENAPIPARSER using System; using System.Linq; +using System.Net; +using Microsoft.AspNetCore.Http; using WireMock.Net.OpenApiParser; -//#endif namespace WireMock.Server; public partial class WireMockServer { - private IResponseMessage OpenApiConvertToMappings(IRequestMessage requestMessage) + private IResponseMessage OpenApiConvertToMappings(HttpContext _, IRequestMessage requestMessage) { -//#if OPENAPIPARSER try { var mappingModels = new WireMockOpenApiParser().FromText(requestMessage.Body!, out var diagnostic); @@ -24,14 +22,10 @@ public partial class WireMockServer _settings.Logger.Error("HttpStatusCode set to {0} {1}", HttpStatusCode.BadRequest, e); return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, e.Message); } -//#else -// return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.6.x or lower."); -//#endif } - private IResponseMessage OpenApiSaveToMappings(IRequestMessage requestMessage) + private IResponseMessage OpenApiSaveToMappings(HttpContext _, IRequestMessage requestMessage) { -//#if OPENAPIPARSER try { var mappingModels = new WireMockOpenApiParser().FromText(requestMessage.Body!, out var diagnostic); @@ -49,8 +43,5 @@ public partial class WireMockServer _settings.Logger.Error("HttpStatusCode set to {0} {1}", HttpStatusCode.BadRequest, e); return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, e.Message); } -//#else -// return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.6.x or lower."); -//#endif } } \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/Server/WireMockServer.Proxy.cs b/src/WireMock.Net.Minimal/Server/WireMockServer.Proxy.cs index a78b33a1..82849b1e 100644 --- a/src/WireMock.Net.Minimal/Server/WireMockServer.Proxy.cs +++ b/src/WireMock.Net.Minimal/Server/WireMockServer.Proxy.cs @@ -3,6 +3,7 @@ using System; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using WireMock.Constants; using WireMock.Http; using WireMock.Proxy; @@ -33,7 +34,7 @@ public partial class WireMockServer proxyRespondProvider.AtPriority(WireMockConstants.ProxyPriority); } - if(settings.ProxyAndRecordSettings.ProxyAll) + if (settings.ProxyAndRecordSettings.ProxyAll) { proxyRespondProvider.AtPriority(int.MinValue); } @@ -41,7 +42,7 @@ public partial class WireMockServer proxyRespondProvider.RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings)); } - private async Task ProxyAndRecordAsync(IRequestMessage requestMessage, WireMockServerSettings settings) + private async Task ProxyAndRecordAsync(HttpContext _, IRequestMessage requestMessage, WireMockServerSettings settings) { var requestUri = new Uri(requestMessage.Url); var proxyUri = new Uri(settings.ProxyAndRecordSettings!.Url); diff --git a/src/WireMock.Net.Minimal/Server/WireMockServer.cs b/src/WireMock.Net.Minimal/Server/WireMockServer.cs index 2b36ef44..045755b9 100644 --- a/src/WireMock.Net.Minimal/Server/WireMockServer.cs +++ b/src/WireMock.Net.Minimal/Server/WireMockServer.cs @@ -471,7 +471,7 @@ public partial class WireMockServer : IWireMockServer Given(Request.Create().WithPath("/*").UsingAnyMethod()) .WithGuid(Guid.Parse("90008000-0000-4444-a17e-669cd84f1f05")) .AtPriority(1000) - .RespondWith(new DynamicResponseProvider(_ => ResponseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound))); + .RespondWith(new DynamicResponseProvider((_, _) => ResponseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound))); } /// diff --git a/src/WireMock.Net.Shared/IMapping.cs b/src/WireMock.Net.Shared/IMapping.cs index 764ed4d3..49863849 100644 --- a/src/WireMock.Net.Shared/IMapping.cs +++ b/src/WireMock.Net.Shared/IMapping.cs @@ -2,6 +2,8 @@ using System; using System.Threading.Tasks; +using System.Web; +using Microsoft.AspNetCore.Http; using WireMock.Matchers.Request; using WireMock.Models; using WireMock.ResponseProviders; @@ -146,9 +148,10 @@ public interface IMapping /// /// ProvideResponseAsync /// + /// The HttpContext. /// The request message. /// The including a new (optional) . - Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage); + Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(HttpContext context, IRequestMessage requestMessage); /// /// Gets the RequestMatchResult based on the RequestMessage. diff --git a/src/WireMock.Net.Shared/ResponseProviders/IResponseProvider.cs b/src/WireMock.Net.Shared/ResponseProviders/IResponseProvider.cs index 81fa5ca6..e5cdef6c 100644 --- a/src/WireMock.Net.Shared/ResponseProviders/IResponseProvider.cs +++ b/src/WireMock.Net.Shared/ResponseProviders/IResponseProvider.cs @@ -3,6 +3,7 @@ // This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License. // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root. using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using WireMock.Settings; namespace WireMock.ResponseProviders; @@ -16,8 +17,9 @@ public interface IResponseProvider /// The provide response. /// /// The used mapping. + /// The HttpContext. /// The request. /// The WireMockServerSettings. /// The including a new (optional) . - Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings); + Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, HttpContext context, IRequestMessage requestMessage, WireMockServerSettings settings); } \ No newline at end of file diff --git a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj index 76d36db4..10581050 100644 --- a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj +++ b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj @@ -28,6 +28,7 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs index cc772761..f8da3f87 100644 --- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs +++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs @@ -7,6 +7,8 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; using FluentAssertions; +using Microsoft.AspNetCore.Http; +using Moq; using NFluent; using RestEase; using WireMock.Admin.Mappings; @@ -116,7 +118,7 @@ public partial class WireMockAdminApiTests Check.That(mapping).IsNotNull(); Check.That(mapping.Title).Equals("test"); - var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")); + var response = await mapping.ProvideResponseAsync(Mock.Of(), new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")); Check.That(response.Message.StatusCode).Equals(expectedStatusCode); server.Stop(); diff --git a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs index f6296e2d..7d63dd3d 100644 --- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs +++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs @@ -13,9 +13,6 @@ using WireMock.Util; using WireMock.Logging; using WireMock.Matchers; using System.Collections.Generic; -#if NET6_0_OR_GREATER -using System.Diagnostics; -#endif using WireMock.Admin.Mappings; using WireMock.Admin.Requests; using WireMock.Settings; @@ -26,6 +23,7 @@ using WireMock.ResponseBuilders; using WireMock.RequestBuilders; #if NET6_0_OR_GREATER using WireMock.Owin.ActivityTracing; +using System.Diagnostics; #endif #if NET452 using Microsoft.Owin; @@ -36,6 +34,7 @@ using IResponse = Microsoft.Owin.IOwinResponse; using IContext = Microsoft.AspNetCore.Http.HttpContext; using IRequest = Microsoft.AspNetCore.Http.HttpRequest; using IResponse = Microsoft.AspNetCore.Http.HttpResponse; +using Microsoft.AspNetCore.Http; #endif namespace WireMock.Net.Tests.Owin; @@ -224,7 +223,7 @@ public class WireMockMiddlewareTests _mappingMock.SetupGet(m => m.Settings).Returns(settings); var newMappingFromProxy = new Mapping(NewGuid, UpdatedAt, string.Empty, string.Empty, null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null, null); - _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy)); + _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny(), It.IsAny())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy)); var requestBuilder = Request.Create().UsingAnyMethod(); _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder); @@ -278,7 +277,7 @@ public class WireMockMiddlewareTests _mappingMock.SetupGet(m => m.Settings).Returns(settings); var newMappingFromProxy = new Mapping(NewGuid, UpdatedAt, "my-title", "my-description", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null, data: null); - _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy)); + _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny(), It.IsAny())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy)); var requestBuilder = Request.Create().UsingAnyMethod(); _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs index 10830be3..264d9974 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs @@ -1,6 +1,7 @@ // Copyright © WireMock.Net using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Moq; using NFluent; using WireMock.Models; @@ -25,7 +26,7 @@ public class ResponseCreateTests var responseBuilder = Response.Create(() => responseMessage); // Act - var response = await responseBuilder.ProvideResponseAsync(mapping, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(mapping, Mock.Of(), request, _settings); // Assert Check.That(response.Message).Equals(responseMessage); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs index a7496136..312ccccb 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs @@ -4,6 +4,7 @@ using System; using System.Text; using System.Threading.Tasks; using FluentAssertions; +using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; using NFluent; @@ -49,7 +50,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then Check.That(response.Message.BodyData.BodyAsString).Equals("01"); @@ -71,7 +72,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 }); @@ -93,7 +94,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody("test", null, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then Check.That(response.Message.BodyData.BodyAsString).Equals("test"); @@ -115,7 +116,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBodyAsJson(x, Encoding.ASCII); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then Check.That(response.Message.BodyData.BodyAsJson).Equals(x); @@ -131,7 +132,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsBytes).IsNull(); @@ -149,7 +150,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsNull(); @@ -167,7 +168,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsNull(); @@ -191,7 +192,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBodyAsJson(x, true); // act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // then Check.That(response.Message.BodyData.BodyAsJson).Equals(x); @@ -213,7 +214,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBodyAsJson(requestMessage => responseBody); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsJson.Should().BeEquivalentTo(responseBody); @@ -234,7 +235,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBodyAsJson(requestMessage => Task.FromResult(responseBody)); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsJson.Should().BeEquivalentTo(responseBody); @@ -256,8 +257,8 @@ public class ResponseWithBodyTests .WithTransformer(); // Act - var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings); - var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request2, _settings); + var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request1, _settings); + var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request2, _settings); // Assert Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value()).IsEqualTo(request1Id); @@ -281,7 +282,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request1, _settings); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); @@ -297,7 +298,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request1, _settings); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents); @@ -313,7 +314,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithStatusCode(200).WithBody("File deleted."); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request1, _settings); Check.That(response.Message.StatusCode).IsEqualTo(200); Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted."); @@ -334,7 +335,7 @@ public class ResponseWithBodyTests var responseBuilder = Response.Create().WithBody(new { foo = "bar", n = 42 }, new JsonConverter.System.Text.Json.SystemTextJsonConverter()); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be(@"{""foo"":""bar"",""n"":42}"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs index e241ede3..655d6dc4 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs @@ -6,6 +6,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; using FluentAssertions; +using Microsoft.AspNetCore.Http; using Moq; using NFluent; using WireMock.Handlers; @@ -48,7 +49,7 @@ public class ResponseWithCallbackTests .WithBody(req => $"path: {req.Path}"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); @@ -77,8 +78,8 @@ public class ResponseWithCallbackTests }); // Act (2x) - var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); - var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); + var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response1.Message.BodyData!.BodyAsString.Should().Be("x"); @@ -104,8 +105,8 @@ public class ResponseWithCallbackTests }); // Act (2x) - var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); - var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response1 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); + var response2 = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response1.Message.BodyData!.BodyAsString.Should().Be("x"); @@ -131,7 +132,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test"); @@ -165,7 +166,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -189,7 +190,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -218,7 +219,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -250,7 +251,7 @@ public class ResponseWithCallbackTests .WithHeader(header, "Stef"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -276,7 +277,7 @@ public class ResponseWithCallbackTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMessage, _settings); // Assert response.Message.BodyData.BodyAsString.Should().Be("/fooBar"); @@ -311,7 +312,7 @@ public class ResponseWithCallbackTests }); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, requestMessage, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMessage, _settings); // Assert response.Message.Headers![headerKey].Should().Contain("extra"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs index 37ce850b..934fe99b 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithFaultTests.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using FluentAssertions; +using Microsoft.AspNetCore.Http; using Moq; using WireMock.Models; using WireMock.ResponseBuilders; @@ -32,7 +33,7 @@ public class ResponseWithFaultTests // Act var responseBuilder = Response.Create().WithFault(faultType); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.FaultType.Should().Be(faultType); @@ -48,7 +49,7 @@ public class ResponseWithFaultTests // Act var responseBuilder = Response.Create().WithFault(faultType, percentage); - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.FaultType.Should().Be(faultType); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs index 4ab7d0ae..379d9942 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsDateTimeTests.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using FluentAssertions; +using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; using WireMock.Handlers; @@ -47,7 +48,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -71,7 +72,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -94,7 +95,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -112,7 +113,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Contain($"DateTimeYear = \"{DateTime.Now.Year}\""); @@ -137,7 +138,7 @@ public class ResponseWithHandlebarsDateTimeTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs index fb28c785..7c94ca17 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs @@ -4,6 +4,7 @@ using System; using System.Threading.Tasks; using FluentAssertions; using HandlebarsDotNet; +using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; using NFluent; @@ -55,7 +56,7 @@ public class ResponseWithHandlebarsFileTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -80,7 +81,7 @@ public class ResponseWithHandlebarsFileTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -105,7 +106,7 @@ public class ResponseWithHandlebarsFileTests .WithTransformer(); // Act - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings)).Throws(); + Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); // Verify _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString(It.IsAny()), Times.Never); @@ -127,7 +128,7 @@ public class ResponseWithHandlebarsFileTests .WithTransformer(); // Act - Func action = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, settings); + Func action = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, settings); action.Should().ThrowAsync(); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs index 2e39428c..b0bf2149 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHelpersTests.cs @@ -1,6 +1,7 @@ // Copyright © WireMock.Net using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Moq; using NFluent; using WireMock.Handlers; @@ -40,7 +41,7 @@ public class ResponseWithHandlebarsHelpersTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(new Mock().Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(Mock.Of(), Mock.Of(), request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals("ABC"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs index 8f64b6df..1553622b 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; using NFluent; @@ -44,7 +45,7 @@ public class ResponseWithHandlebarsHumanizerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs index c18a565b..38d678ef 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs @@ -4,6 +4,7 @@ using System; using System.Text; using System.Threading.Tasks; using FluentAssertions; +using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -82,7 +83,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -108,7 +109,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson!); @@ -162,7 +163,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine} \"Name\": \"Acme Co\",{Environment.NewLine} \"Products\": [{Environment.NewLine} {{{Environment.NewLine} \"Name\": \"Anvil\",{Environment.NewLine} \"Price\": 50{Environment.NewLine} }}{Environment.NewLine} ]{Environment.NewLine}}}"); @@ -215,7 +216,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine} \"Name\": \"Acme Co\",{Environment.NewLine} \"Products\": [{Environment.NewLine} {{{Environment.NewLine} \"Name\": \"Anvil\",{Environment.NewLine} \"Price\": 50{Environment.NewLine} }}{Environment.NewLine} ]{Environment.NewLine}}}"); @@ -268,7 +269,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); @@ -321,7 +322,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%"); @@ -350,7 +351,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithTransformer(); // Act - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings)).Throws(); + Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); } [Fact] @@ -376,7 +377,7 @@ public class ResponseWithHandlebarsJsonPathTests .WithBodyFromFile("c:\\\\{{JsonPath.SelectToken request.body \"$.MyUniqueNumber\" }}\\test.json"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData?.BodyAsFile.Should().Be(@"c:\1\test.json"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs index d9dab929..2f1705f9 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs @@ -4,6 +4,7 @@ using System; using System.Threading.Tasks; using FluentAssertions; using HandlebarsDotNet; +using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; using NFluent; @@ -47,7 +48,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -77,7 +78,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -107,7 +108,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -137,7 +138,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -162,7 +163,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings)).Throws(); + Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); } [Fact] @@ -178,7 +179,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings)).Throws(); + Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); } [Fact] @@ -202,7 +203,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - Func a = async () => await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + Func a = async () => await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings).ConfigureAwait(false); // Assert a.Should().ThrowAsync(); @@ -229,7 +230,7 @@ public class ResponseWithHandlebarsLinqTests .WithTransformer(); // Act - Func a = async () => await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + Func a = async () => await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings).ConfigureAwait(false); // Assert a.Should().ThrowAsync(); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs index ad08d598..ad676e01 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using FluentAssertions; +using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; using WireMock.Handlers; @@ -48,7 +49,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -71,7 +72,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -94,7 +95,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -119,7 +120,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(options); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -141,7 +142,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var jObject = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -162,7 +163,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -184,7 +185,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); @@ -205,7 +206,7 @@ public class ResponseWithHandlebarsRandomTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var j = JObject.FromObject(response.Message.BodyData!.BodyAsJson!); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs index ddfac3ee..4d7eadab 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Moq; using NFluent; using WireMock.Handlers; @@ -44,7 +45,7 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals("abc"); @@ -63,7 +64,7 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals(""); @@ -82,7 +83,7 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https"); @@ -101,7 +102,7 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // assert Check.That(response.Message.BodyData.BodyAsString).Equals(""); @@ -120,6 +121,6 @@ public class ResponseWithHandlebarsRegexTests .WithTransformer(); // Act and Assert - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings)).Throws(); + Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs index 0dba8525..3030c0ca 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs @@ -12,6 +12,7 @@ using Xunit; using Moq; using WireMock.Handlers; using FluentAssertions; +using Microsoft.AspNetCore.Http; //#if !NETSTANDARD1_3 //using Wmhelp.XPath2; //#endif @@ -57,7 +58,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be("abc"); @@ -85,7 +86,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc"); @@ -113,7 +114,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be("abc,def,xyz"); @@ -169,7 +170,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be("0000083256"); @@ -197,7 +198,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True"); @@ -225,7 +226,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs index 891a915e..265114a4 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs @@ -1,5 +1,6 @@ // Copyright © WireMock.Net +using Microsoft.AspNetCore.Http; using Moq; using Newtonsoft.Json.Linq; using NFluent; @@ -44,7 +45,7 @@ public class ResponseWithHandlebarsXegerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); @@ -67,7 +68,7 @@ public class ResponseWithHandlebarsXegerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs index 46da4c5e..756fed71 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Moq; using NFluent; using WireMock.Models; @@ -35,7 +36,7 @@ public class ResponseWithHeadersTests IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValue); // Act - var response = await builder.ProvideResponseAsync(_mappingMock.Object, requestMock, _settings); + var response = await builder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMock, _settings); // Assert Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue); @@ -51,7 +52,7 @@ public class ResponseWithHeadersTests IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValues); // Act - var response = await builder.ProvideResponseAsync(_mappingMock.Object, requestMock, _settings); + var response = await builder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), requestMock, _settings); // Assert Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues); @@ -66,7 +67,7 @@ public class ResponseWithHeadersTests var response = Response.Create().WithHeaders(headers); // Act - var responseMessage = await response.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var responseMessage = await response.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x"); @@ -81,7 +82,7 @@ public class ResponseWithHeadersTests var responseBuilder = Response.Create().WithHeaders(headers); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.Headers["h"]).ContainsExactly("x"); @@ -96,7 +97,7 @@ public class ResponseWithHeadersTests var builder = Response.Create().WithHeaders(headers); // Act - var response = await builder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await builder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.Headers["h"]).ContainsExactly("x"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs index dc9dbe59..a66b3a25 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Moq; using NFluent; using WireMock.Models; @@ -56,7 +57,7 @@ public class ResponseWithProxyTests : IDisposable var responseBuilder = Response.Create().WithProxy(_server.Urls[0]); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(request.ProxyUrl).IsNotNull(); @@ -84,7 +85,7 @@ public class ResponseWithProxyTests : IDisposable // Act var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "GET", ClientIp); - Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings)).Throws(); + Check.ThatCode(() => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings)).Throws(); } public void Dispose() diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs index dd2d4ce4..51b4a7d7 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithScribanTests.cs @@ -47,7 +47,7 @@ public class ResponseWithScribanTests var responseBuilder = Response.Create().WithTransformer(TransformerType.ScribanDotLiquid); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData.Should().BeNull(); @@ -69,7 +69,7 @@ public class ResponseWithScribanTests .WithTransformer(TransformerType.Scriban); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt"); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs index e8799d2a..7c1bf913 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithStatusCodeTests.cs @@ -1,9 +1,10 @@ // Copyright © WireMock.Net -using FluentAssertions; -using Moq; using System.Net; using System.Threading.Tasks; +using FluentAssertions; +using Microsoft.AspNetCore.Http; +using Moq; using WireMock.Models; using WireMock.ResponseBuilders; using WireMock.Settings; @@ -42,7 +43,7 @@ public class ResponseWithStatusCodeTests break; } - var response = await responseBuilder.ProvideResponseAsync(new Mock().Object, request, _settingsMock.Object); + var response = await responseBuilder.ProvideResponseAsync(Mock.Of(), Mock.Of(), request, _settingsMock.Object); // Assert response.Message.StatusCode.Should().Be(expectedStatusCode); diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs index c67fddbe..d4ae937f 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs @@ -57,7 +57,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData.Should().BeNull(); @@ -82,7 +82,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test http://localhost/foo /foo POSt"); @@ -106,7 +106,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b"); @@ -124,7 +124,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("a b wiremock"); @@ -146,7 +146,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert var json = (JObject)response.Message.BodyData!.BodyAsJson!; @@ -167,7 +167,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("a wiremock"); @@ -189,7 +189,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5"); @@ -213,7 +213,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5"); @@ -236,7 +236,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -262,7 +262,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -288,7 +288,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -309,7 +309,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -334,7 +334,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithHeader("x", "{{mapping.Guid}}").WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.Headers.Should().NotBeNull(); @@ -356,7 +356,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -381,7 +381,7 @@ public class ResponseWithTransformerTests var responseBuilder = Response.Create().WithHeader("x", "{{request.Headers[\"Content-Type\"]}}", "{{request.Url}}").WithBody("test").WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test"); @@ -409,7 +409,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsString).Equals("test http://localhost:1234 1234 http localhost"); @@ -436,7 +436,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}"); @@ -478,7 +478,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, settings).ConfigureAwait(false); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be(expected); @@ -498,7 +498,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("[{\"x\":\"test\"}]"); @@ -519,7 +519,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("[{\"x\":\"test\"}]"); @@ -556,7 +556,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType, false, ReplaceNodeOptions.Evaluate); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be($"{{\"text\":{expected}}}"); @@ -583,7 +583,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]"); @@ -600,7 +600,7 @@ public class ResponseWithTransformerTests .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -619,7 +619,7 @@ public class ResponseWithTransformerTests .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -643,7 +643,7 @@ public class ResponseWithTransformerTests .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml"); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml"); @@ -672,7 +672,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("\"test\""); @@ -693,7 +693,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("{\"scope\":\"scope1 scope2 scope3 helloworld\"}"); @@ -718,7 +718,7 @@ public class ResponseWithTransformerTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); @@ -744,7 +744,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"name\":\"WireMock\"}"); @@ -772,7 +772,7 @@ public class ResponseWithTransformerTests .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be(text); @@ -825,7 +825,7 @@ AAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC .WithTransformer(transformerType); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be("text/plain text/json image.png"); @@ -853,7 +853,7 @@ AAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC _mappingMock.SetupGet(m => m.Data).Returns(data); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be(expected); diff --git a/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs b/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs index 1655dd68..704123cf 100644 --- a/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs +++ b/test/WireMock.Net.Tests/Settings/HandlebarsSettingsTests.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using FluentAssertions; using HandlebarsDotNet; using HandlebarsDotNet.Helpers.Enums; +using Microsoft.AspNetCore.Http; using Moq; using WireMock.Handlers; using WireMock.Models; @@ -46,7 +47,7 @@ public class HandlebarsSettingsTests .WithTransformer(); // Act - Func action = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); + Func action = () => responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, _settings); // Assert await action.Should().ThrowAsync(); @@ -74,7 +75,7 @@ public class HandlebarsSettingsTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, settingsWithEnv).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, Mock.Of(), request, settingsWithEnv).ConfigureAwait(false); // Assert response.Message?.BodyData?.BodyAsString.Should().NotContain("{{Environment.GetEnvironmentVariable");