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

wip (#421)

Browse Source
This commit is contained in:
Stef Heyenrath
2020-02-15 08:30:08 +01:00
committed by GitHub
parent f4861d9bab
commit d1b42bf436
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,9 +26,9 @@ namespace WireMock.Serialization
var request = (Request)mapping.RequestMatcher; var request = (Request)mapping.RequestMatcher;
var response = (Response)mapping.Provider; var response = (Response)mapping.Provider;
var clientIPMatchers = request.GetRequestMessageMatchers<RequestMessageClientIPMatcher>(); var clientIPMatchers = request.GetRequestMessageMatchers<RequestMessageClientIPMatcher>().Where(m => m.Matchers != null).SelectMany(m => m.Matchers).ToList();
var pathMatchers = request.GetRequestMessageMatchers<RequestMessagePathMatcher>(); var pathMatchers = request.GetRequestMessageMatchers<RequestMessagePathMatcher>().Where(m => m.Matchers != null).SelectMany(m => m.Matchers).ToList();
var urlMatchers = request.GetRequestMessageMatchers<RequestMessageUrlMatcher>(); var urlMatchers = request.GetRequestMessageMatchers<RequestMessageUrlMatcher>().Where(m => m.Matchers != null).SelectMany(m => m.Matchers).ToList();
var headerMatchers = request.GetRequestMessageMatchers<RequestMessageHeaderMatcher>(); var headerMatchers = request.GetRequestMessageMatchers<RequestMessageHeaderMatcher>();
var cookieMatchers = request.GetRequestMessageMatchers<RequestMessageCookieMatcher>(); var cookieMatchers = request.GetRequestMessageMatchers<RequestMessageCookieMatcher>();
var paramsMatchers = request.GetRequestMessageMatchers<RequestMessageParamMatcher>(); var paramsMatchers = request.GetRequestMessageMatchers<RequestMessageParamMatcher>();
@@ -45,36 +45,36 @@ namespace WireMock.Serialization
SetStateTo = mapping.NextState, SetStateTo = mapping.NextState,
Request = new RequestModel Request = new RequestModel
{ {
ClientIP = clientIPMatchers != null && clientIPMatchers.Any() ? new ClientIPModel ClientIP = clientIPMatchers.Any() ? new ClientIPModel
{ {
Matchers = _mapper.Map(clientIPMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)) Matchers = _mapper.Map(clientIPMatchers)
} : null, } : null,
Path = pathMatchers != null && pathMatchers.Any() ? new PathModel Path = pathMatchers.Any() ? new PathModel
{ {
Matchers = _mapper.Map(pathMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)) Matchers = _mapper.Map(pathMatchers)
} : null, } : null,
Url = urlMatchers != null && urlMatchers.Any() ? new UrlModel Url = urlMatchers.Any() ? new UrlModel
{ {
Matchers = _mapper.Map(urlMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)) Matchers = _mapper.Map(urlMatchers)
} : null, } : null,
Methods = methodMatcher?.Methods, Methods = methodMatcher?.Methods,
Headers = headerMatchers != null && headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel Headers = headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel
{ {
Name = hm.Name, Name = hm.Name,
Matchers = _mapper.Map(hm.Matchers) Matchers = _mapper.Map(hm.Matchers)
}).ToList() : null, }).ToList() : null,
Cookies = cookieMatchers != null && cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel Cookies = cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel
{ {
Name = cm.Name, Name = cm.Name,
Matchers = _mapper.Map(cm.Matchers) Matchers = _mapper.Map(cm.Matchers)
}).ToList() : null, }).ToList() : null,
Params = paramsMatchers != null && paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel Params = paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel
{ {
Name = pm.Key, Name = pm.Key,
IgnoreCase = pm.IgnoreCase == true ? true : (bool?)null, IgnoreCase = pm.IgnoreCase == true ? true : (bool?)null,

2
test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
View File

@@ -66,7 +66,7 @@
<ItemGroup> <ItemGroup>
<None Update="responsebody.json"> <None Update="responsebody.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Update="__admin\mappings\00000002-ee28-4f29-ae63-1ac9b0802d86.json"> <None Update="__admin\mappings\00000002-ee28-4f29-ae63-1ac9b0802d86.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>