1.0.4.14

* LinqMatcher

* LinqMatcher : revert

* LinqMatcher

CHANGELOG.md

@@ -1,3 +1,83 @@
+# 1.0.4.14 (02 September 2018)
+
+ - [#197](https://github.com/WireMock-Net/WireMock.Net/pull/197) - Set IsStarted = true in a IApplicationLifetime.ApplicationStarted listener contributed by ([davide-romanini](https://github.com/davide-romanini)) +fix
+ - [#196](https://github.com/WireMock-Net/WireMock.Net/issues/196) - Issue: AspNetCoreSelfHost.IsStarted set before the server actually started for real +fix
+
+Commits: 077b3c0891...5ccb992201
+
+
+# 1.0.4.13 (31 August 2018)
+
+ - [#195](https://github.com/WireMock-Net/WireMock.Net/pull/195) - Add LinqMatcher contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+
+Commits: 9f17948e9f...9f17948e9f
+
+
+# 1.0.4.12 (23 August 2018)
+
+ - [#191](https://github.com/WireMock-Net/WireMock.Net/pull/191) - Fix ignore case logic for header-name and cookie-name contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#190](https://github.com/WireMock-Net/WireMock.Net/pull/190) - Fix ResponseMessageTransformer (#188) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#189](https://github.com/WireMock-Net/WireMock.Net/issues/189) - Issue: Case of header key/name not ignored in RequestBuilder when ignoreCase == true
+ - [#188](https://github.com/WireMock-Net/WireMock.Net/issues/188) - Bug: ResponseMessageTransformer : 
+
+Commits: e6ecf5cc84...f8d22d4c47
+
+
+# 1.0.4.11 (20 August 2018)
+
+ - [#187](https://github.com/WireMock-Net/WireMock.Net/issues/187) - Bug: Admin GetRequestAsync does not populate request body for JsonApi ("application/vnd.api+json") content
+ - [#186](https://github.com/WireMock-Net/WireMock.Net/pull/186) - ContentType "application/vnd.api+json" is not recognized as json contributed by Steve Land ([steveland83](https://github.com/steveland83))
+ - [#185](https://github.com/WireMock-Net/WireMock.Net/pull/185) - Support Microsoft.AspNetCore for net 4.6.1 and up contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +feature
+ - [#184](https://github.com/WireMock-Net/WireMock.Net/issues/184) - Bug: Fix AppVeyor PR build process
+ - [#183](https://github.com/WireMock-Net/WireMock.Net/pull/183) - Set Content-Type header for PutMappingAsync in the client contributed by ([seanamosw](https://github.com/seanamosw))
+ - [#182](https://github.com/WireMock-Net/WireMock.Net/issues/182) - Bug: IFluentMockServerAdmin::PutMappingAsync does not set Content-Type
+
+Commits: 01d6dce62d...be08c3175e
+
+
+# 1.0.4.10 (14 August 2018)
+
+ - [#180](https://github.com/WireMock-Net/WireMock.Net/pull/180) - Add IFileSystemHandler to support Azure for StaticMapping location contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#173](https://github.com/WireMock-Net/WireMock.Net/issues/173) - Feature: Mapping files lost when restarting an Azure app service +feature
+
+Commits: 4b91c05fe7...4b91c05fe7
+
+
+# 1.0.4.9 (08 August 2018)
+
+ - [#177](https://github.com/WireMock-Net/WireMock.Net/issues/177) - Feature: Skip invalid static mapping files +feature
+ - [#176](https://github.com/WireMock-Net/WireMock.Net/issues/176) - Question: Saving mapping with relative (not found) file fails
+ - [#175](https://github.com/WireMock-Net/WireMock.Net/issues/175) - Bug: Don't allow adding a mapping with no URL or PATH +fix
+ - [#174](https://github.com/WireMock-Net/WireMock.Net/issues/174) - Bug: JsonMatcher and JsonPathMatcher throws when posting byte[] +fix
+ - [#172](https://github.com/WireMock-Net/WireMock.Net/issues/172) - Question: Same/similar fluent interface for in process and admin client API
+
+Commits: 8cb15b2311...d9fde9329a
+
+
+# 1.0.4.8 (23 July 2018)
+
+ - [#170](https://github.com/WireMock-Net/WireMock.Net/pull/170) - Support json path in the response contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#167](https://github.com/WireMock-Net/WireMock.Net/issues/167) - Feature: Support for JsonPath in the response (with HandleBars) +feature
+
+Commits: 1f226f7361...1f226f7361
+
+
+# 1.0.4.7 (19 July 2018)
+
+ - [#169](https://github.com/WireMock-Net/WireMock.Net/pull/169) - Fix for Restricted Response headers contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +fix
+ - [#148](https://github.com/WireMock-Net/WireMock.Net/issues/148) - Question: proxy passthrough when no match?
+
+Commits: b2bf63b013...b2bf63b013
+
+
+# 1.0.4.6 (18 July 2018)
+
+ - [#168](https://github.com/WireMock-Net/WireMock.Net/pull/168) - Expose scenario states contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +feature
+ - [#163](https://github.com/WireMock-Net/WireMock.Net/issues/163) - Feature: Expose scenario states
+
+Commits: 6b0924029f...8f34291ea9
+
+
 # 1.0.4.5 (17 July 2018)
 
  - [#166](https://github.com/WireMock-Net/WireMock.Net/pull/166) - Fix Sonar issues contributed by Stef Heyenrath ([StefH](https://github.com/StefH))

GitReleaseNotes.txt

@@ -1,5 +1,5 @@
 https://github.com/GitTools/GitReleaseNotes
 
-GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.4.5
+GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.4.14
 
 GitReleaseNotes.exe . /OutputFile CHANGELOG.md /allTags

README.md

@@ -1,65 +1,70 @@
 # WireMock.Net
 A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock.org](http://WireMock.org).
 
-### Info
+## Key Features
+* HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
+* Runs in unit tests, as a standalone process, as windows service, as Azure or IIS or as docker
+* Configurable via a fluent DotNet API, JSON files and JSON over HTTP
+* Record/playback of stubs
+* Per-request conditional proxying
+* Stateful behaviour simulation
+* Configurable response delays
+
+## Info
 | | |
 | --- | --- |
-| **Chat** | [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
-| **Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues) |
-| **Build** | [![Build status](https://ci.appveyor.com/api/projects/status/b3n6q3ygbww4lyls?svg=true)](https://ci.appveyor.com/project/StefH/wiremock-net) |
-| | |
-| ***Sonar*** |   |
-|  **Sonar Quality Gate** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=alert_status)](https://sonarcloud.io/project/issues?id=wiremock) |
-|  **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=bugs)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=BUG) |
-|  **Sonar Code Smells** | [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=code_smells)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=CODE_SMELL) |
-|  **Sonar Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=coverage)](https://sonarcloud.io/component_measures?id=wiremock&metric=coverage) |
-|  **Coveralls.io** | [![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master) |
+| ***Project*** |   |
+|   **Chat** | [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
+|   **Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues) |
 | | |
+| ***Quality*** |   |
+|   **Build** | [![Build status](https://ci.appveyor.com/api/projects/status/b3n6q3ygbww4lyls?svg=true)](https://ci.appveyor.com/project/StefH/wiremock-net) |
+|   **CodeFactor** | [![CodeFactor](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net)
+|   **Sonar Quality Gate** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=alert_status)](https://sonarcloud.io/project/issues?id=wiremock) |
+|   **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=bugs)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=BUG) |
+|   **Sonar Code Smells** | [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=code_smells)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=CODE_SMELL) |
+|   **Sonar Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=coverage)](https://sonarcloud.io/component_measures?id=wiremock&metric=coverage) |
+|   **Coveralls** | [![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master) |
+| |
 | ***Nuget*** |   |
-|  **WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |
-|  **WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net.StandAlone](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |
-
-### Frameworks
-The following frameworks are supported:
-- net 4.5.2 and up
-- net 4.6 and up
-- netstandard 1.3
-- netstandard 2.0
-
-## Build info
-To build you need:
-- Microsoft .NET Framework 4.5.2 Developer Pack (https://www.microsoft.com/en-us/download/details.aspx?id=42637)
-- Microsoft .NET Framework 4.6 Targeting Pack (https://www.microsoft.com/en-us/download/confirmation.aspx?id=48136)
-- Microsoft .NET Framework 4.6.2 Developer Pack (https://www.microsoft.com/en-us/download/confirmation.aspx?id=53321)
-- .NET Core 2.0 (https://www.microsoft.com/net/core)
+|   **WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |
+|   **WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net.StandAlone](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |
 
+## Development
+For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.
 
 ## Stubbing
-A core feature of WireMock.Net is the ability to return canned/predefined HTTP responses for requests matching criteria, see [Wiki : Stubbing & Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing-and-Request-Matching).
+A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
+See [Wiki : Stubbing](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing).
 
-## Using WireMock in UnitTest framework
+## Request Matching
+WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Request-Matching).
+
+## Response Templating
+The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/WireMock-Net/WireMock.Net/wiki/Response-Templating).
+
+## Admin API Reference
+The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
+
+## Using
+WireMock.Net can be used in several ways:
+
+### UnitTesting
 You can use your favorite test framework and use WireMock within your tests, see
 [Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
 
-## Admin API Reference
-The WireMock admin API provides functionality to define the mappings via a http interface, see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
+### As standalone process / console application
+This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
 
-## WireMock as a standalone process
-This is quite straight forward to launch a mock server within a console application, see [Wiki : standalone](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
+### As a Windows Service
+You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
 
-### SSL
-You can start a standalone mock server listening for HTTPS requests. To do so, there is just a flag to set when creating the server:
-```csharp
-var server1 = FluentMockServer.Start(port: 8443, ssl: true);
+### As a Web Job in Azure or application in IIS
+See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
 
-// or like this
+### In a docker container
+There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
+For more details see also [Docker](https://github.com/WireMock-Net/WireMock.Net-docker).
 
-var server2 = FluentMockServer.Start(new FluentMockServerSettings
-{
-    Urls = new[] { "http://localhost:9091", "https://localhost:9443" }
-});
-```
-
-- In case when using **net 4.5.2** or **net 4.6**, you need a certificate registered on your box, properly associated with your application and the port number that will be used. This is not really specific to WireMock.Net, not very straightforward and hence the following stackoverflow thread might come handy: [Httplistener with https support](http://stackoverflow.com/questions/11403333/httplistener-with-https-support).
-
-- When using **netstandard**, WireMock.Net uses a self signed certificate (which can be overriden if you like) to host https urls.
+#### HTTPS / SSL
+More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-HTTPS-(SSL))

WireMock.Net Solution.sln

@@ -40,8 +40,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {B6269AAC-170A-43D5-8B9A-579DED3D9A95}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET452", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.Console.NET452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NETCore2", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.NETCore2.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Proxy.Net452", "examples\WireMock.Net.Console.Proxy.Net452\WireMock.Net.Console.Proxy.Net452.csproj", "{26433A8F-BF01-4962-97EB-81BFFBB61096}"
@@ -52,6 +50,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.HeadersTest", "examples\WireMock.Net.Console.HeadersTest\WireMock.Net.Console.HeadersTest.csproj", "{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net461.Classic", "examples\WireMock.Net.Console.Net461.Classic\WireMock.Net.Console.Net461.Classic.csproj", "{1261BB9B-A7D4-456C-8985-3CE560361B8E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452.Classic", "examples\WireMock.Net.Console.Net452.Classic\WireMock.Net.Console.Net452.Classic.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp2", "examples\WireMock.Net.Console.NETCoreApp2\WireMock.Net.Console.NETCoreApp2.csproj", "{83645809-9E01-4E81-8733-BA9497554ABF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -90,10 +96,6 @@ Global
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.Build.0 = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -114,6 +116,22 @@ Global
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -127,12 +145,15 @@ Global
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {EF242EDF-7133-4277-9A0C-18744DE08707}
 		{10E16614-61CA-48D8-8BDD-664C13913DED} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{83645809-9E01-4E81-8733-BA9497554ABF} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}

appveyor.yml

@@ -15,6 +15,9 @@ install:
 - ps: $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = "true"
 - dotnet tool install --global dotnet-sonarscanner
 
+# https://www.appveyor.com/docs/build-configuration/#secure-variables
+# However, secure variables are not decoded during Pull Request builds which prevents someone from submitting PR with malicious build script displaying those variables. In more controlled environment through with a trusted team and private GitHub repositories there is an option on General tab of project settings to allow secure variables for PRs.
+# See also https://medium.com/@stef.heyenrath/how-to-fix-sonarcloud-issue-in-a-github-pr-when-using-appveyor-integration-8909b49406b4
 environment:
   PATH: $(PATH);$(PROGRAMFILES)\dotnet\
   COVERALLS_REPO_TOKEN:
@@ -22,28 +25,36 @@ environment:
   SONAR_TOKEN:
     secure: guog1+ttdnlD8sVgvizlewksm3qbO7dy2oZUcR8WhurWYvdOByinxXo732hmSaMT
 
+
 before_build:
 - dotnet restore .\src\WireMock.Net\WireMock.Net.csproj
 - dotnet restore .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj
 - dotnet restore .\test\WireMock.Net.Tests\WireMock.Net.Tests.csproj
 
+
 build_script:
-# build WireMock.Net with SonarScanner
-- dotnet sonarscanner begin /k:"wiremock" /d:sonar.organization="stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="%SONAR_TOKEN%" /v:"%APPVEYOR_BUILD_NUMBER%" /d:sonar.cs.opencover.reportsPaths="%CD%\coverage.xml"
+# Begin SonarScanner
+- ps: 'if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { & dotnet sonarscanner begin /k:"wiremock" /d:sonar.organization="stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$env:SONAR_TOKEN" /v:"$env:APPVEYOR_BUILD_NUMBER" /d:sonar.cs.opencover.reportsPaths="$env:CD\coverage.xml" }'
+
+# build WireMock.Net
 - dotnet build .\src\WireMock.Net\WireMock.Net.csproj -c %CONFIGURATION%
 
 # build WireMock.Net.Standalone
 - dotnet build .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj -c %CONFIGURATION%
 
-# build WireMock.Net.Tests
+# build WireMock.Net.Tests (net452 and net462)
 - dotnet build .\test\WireMock.Net.Tests\WireMock.Net.Tests.csproj -c %CONFIGURATION%
 
-test_script:
-  - nuget.exe install OpenCover -ExcludeVersion
-  - nuget.exe install coveralls.net -ExcludeVersion -Version 0.7.0
-  - pip install codecov
 
-  - cmd: '"OpenCover\tools\OpenCover.Console.exe" -target:dotnet.exe -targetargs:"test test\WireMock.Net.Tests\WireMock.Net.Tests.csproj --no-build" -output:coverage.xml -returntargetcode -register:user -filter:"+[WireMock.Net]* -[WireMock.Net.Tests*]*" -nodefaultfilters -returntargetcode -oldstyle -searchdirs:".\test\WireMock.Net.Tests\bin\%CONFIGURATION%\net452"'
-  - codecov -f "coverage.xml"
-  - coveralls.net\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml
-  - dotnet sonarscanner end /d:sonar.login="%SONAR_TOKEN%"
+test_script:
+- nuget.exe install OpenCover -ExcludeVersion
+- nuget.exe install coveralls.net -ExcludeVersion -Version 0.7.0
+- pip install codecov
+
+- cmd: '"OpenCover\tools\OpenCover.Console.exe" -target:dotnet.exe -targetargs:"test test\WireMock.Net.Tests\WireMock.Net.Tests.csproj --no-build --framework net452" -output:coverage.xml -returntargetcode -register:user -filter:"+[WireMock.Net]* -[WireMock.Net.Tests*]*" -nodefaultfilters -returntargetcode -oldstyle -searchdirs:".\test\WireMock.Net.Tests\bin\%CONFIGURATION%\net452"'
+- codecov -f "coverage.xml"
+- coveralls.net\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml
+
+
+# End SonarScanner
+- ps: 'if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { & dotnet sonarscanner end /d:sonar.login="$env:SONAR_TOKEN" }'

examples/WireMock.Net.Client/Program.cs

@@ -43,11 +43,14 @@ namespace WireMock.Net.Client
             var request = api.GetRequestsAsync().Result;
             Console.WriteLine($"request = {JsonConvert.SerializeObject(request)}");
 
-            var deleteRequestsAsync = api.DeleteRequestsAsync().Result;
-            Console.WriteLine($"deleteRequestsAsync = {deleteRequestsAsync.Status}");
+            //var deleteRequestsAsync = api.DeleteRequestsAsync().Result;
+            //Console.WriteLine($"DeleteRequestsAsync = {deleteRequestsAsync.Status}");
 
-            var resetRequestsAsync = api.ResetRequestsAsync().Result;
-            Console.WriteLine($"resetRequestsAsync = {resetRequestsAsync.Status}");
+            //var resetRequestsAsync = api.ResetRequestsAsync().Result;
+            //Console.WriteLine($"ResetRequestsAsync = {resetRequestsAsync.Status}");
+
+            var scenarioStates = api.GetScenariosAsync().Result;
+            Console.WriteLine($"GetScenariosAsync = {JsonConvert.SerializeObject(scenarioStates)}");
 
             Console.WriteLine("Press any key to quit");
             Console.ReadKey();

examples/WireMock.Net.Client/WireMock.Net.Client.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="RestEase" Version="1.4.4" />
   </ItemGroup>
 

examples/WireMock.Net.Console.HeadersTest/Program.cs

@@ -0,0 +1,60 @@
+using System.IO;
+using System.Reflection;
+using log4net;
+using log4net.Config;
+using log4net.Repository;
+using Newtonsoft.Json;
+using WireMock.Logging;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.NETCoreApp
+{
+    static class Program
+    {
+        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+        static void Main(params string[] args)
+        {
+            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
+
+            string url = "http://localhost:9999/";
+
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { url },
+                StartAdminInterface = true,
+                Logger = new WireMockConsoleLogger()
+            });
+            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
+
+            server.SetBasicAuthentication("a", "b");
+
+            server.AllowPartialMapping();
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithHeader("Keep-Alive-Test", "stef")
+                )
+                .RespondWith(Response.Create()
+                    .WithHeader("Keep-Alive", "timeout=1, max=1")
+                    .WithBody("Keep-Alive OK")
+                );
+
+            System.Console.WriteLine("Press any key to stop the server");
+            System.Console.ReadKey();
+            server.Stop();
+
+            System.Console.WriteLine("Displaying all requests");
+            var allRequests = server.LogEntries;
+            System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
+
+            System.Console.WriteLine("Press any key to quit");
+            System.Console.ReadKey();
+        }
+    }
+}

examples/WireMock.Net.Console.HeadersTest/WireMock.Net.Console.HeadersTest.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.Console.HeadersTest/nlog.config

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      autoReload="true"
+      internalLogLevel="info"
+      internalLogFile="c:\temp\wiremock-internal-nlog.log">
+
+  <targets>
+    <!-- write logs to file  -->
+    <target xsi:type="File" name="all" fileName="c:\temp\wiremock-${shortdate}.log"
+            layout="${longdate}|${event-properties:item=EventId.Id}|${uppercase:${level}}|${logger}|${message} ${exception}" />
+  </targets>
+
+  <!-- rules to map from logger name to target -->
+  <rules>
+    <logger name="*" minlevel="Debug" writeTo="all" />
+  </rules>
+</nlog>

examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj

@@ -7,15 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="__admin\mappings\826aff7c-6208-4a3c-923d-575248907db4.json" />
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs" Link="MainApp.cs" />
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs" Link="CustomFileSystemFileHandler.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\WireMock.Net.ConsoleApplication\MainApp.cs" Link="MainApp.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
+    <Content Include="__admin\mappings\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -23,7 +20,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/791a3f31-6946-4ce7-8e6f-0237c7443275.json

@@ -3,14 +3,7 @@
   "Title": "",
   "Priority": 0,
   "Request": {
-    "Path": {
-      "Matchers": [
-        {
-          "Name": "WildcardMatcher",
-          "Pattern": "/proxy-google-test-post"
-        }
-      ]
-    },
+    "Path": "/proxy-google-test-post",
     "Methods": [
       "post"
     ],

examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -0,0 +1,19 @@
+{
+  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
+  "Priority": 4,
+  "Request": {
+    "Path": {},
+    "Methods": [
+      "get"
+    ]
+  },
+  "Response": {
+    "StatusCode": 200,
+    "BodyDestination": "SameAsSource",
+    "Body": "NO PATH OR URL",
+    "UseTransformer": false,
+    "Headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj

@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs" Link="MainApp.cs" />
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs" Link="CustomFileSystemFileHandler.cs" />
+    <Compile Include="..\WireMock.Net.Console.NETCoreApp\Program.cs" Link="Program.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="__admin\mappings\*.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.Console.NETCoreApp2/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json

@@ -0,0 +1,22 @@
+{
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/static/mapping"
+                }
+            ]
+        },
+        "Methods": [
+            "get"
+        ]
+    },
+    "Response": {
+        "BodyAsJson": { "body": "static mapping" },
+      "Headers": {
+        "Content-Type": "application/json",
+        "Test-X": [ "test 1", "test 2" ]
+      }
+    }
+}

examples/WireMock.Net.Console.NETCoreApp2/__admin/mappings/791a3f31-6946-4ce7-8e6f-0237c7443275.json

@@ -0,0 +1,29 @@
+{
+  "Guid": "791a3f31-6946-4ce7-8e6f-0237c7443275",
+  "Title": "",
+  "Priority": 0,
+  "Request": {
+    "Path": "/proxy-google-test-post",
+    "Methods": [
+      "post"
+    ],
+    "Body": {}
+  },
+  "Response": {
+    "StatusCode": 404,
+    "Body": "<!DOCTYPE html>\n<html lang=en>\n  <meta charset=utf-8>\n  <meta name=viewport content=\"initial-scale=1, minimum-scale=1, width=device-width\">\n  <title>Error 404 (Not Found)!!1</title>\n  <style>\n    *{margin:0;padding:0}html,code{font:15px/22px arial,sans-serif}html{background:#fff;color:#222;padding:15px}body{margin:7% auto 0;max-width:390px;min-height:180px;padding:30px 0 15px}* > body{background:url(//www.google.com/images/errors/robot.png) 100% 5px no-repeat;padding-right:205px}p{margin:11px 0 22px;overflow:hidden}ins{color:#777;text-decoration:none}a img{border:0}@media screen and (max-width:772px){body{background:none;margin-top:0;max-width:none;padding-right:0}}#logo{background:url(//www.google.com/images/branding/googlelogo/1x/googlelogo_color_150x54dp.png) no-repeat;margin-left:-5px}@media only screen and (min-resolution:192dpi){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat 0% 0%/100% 100%;-moz-border-image:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) 0}}@media only screen and (-webkit-min-device-pixel-ratio:2){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat;-webkit-background-size:100% 100%}}#logo{display:inline-block;height:54px;width:150px}\n  </style>\n  <a href=//www.google.com/><span id=logo aria-label=Google></span></a>\n  <p><b>404.</b> <ins>That’s an error.</ins>\n  <p>The requested URL <code>/proxy-google-test-post</code> was not found on this server.  <ins>That’s all we know.</ins>\n",
+    "BodyAsBytes": "PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ZW4+CiAgPG1ldGEgY2hhcnNldD11dGYtOD4KICA8bWV0YSBuYW1lPXZpZXdwb3J0IGNvbnRlbnQ9ImluaXRpYWwtc2NhbGU9MSwgbWluaW11bS1zY2FsZT0xLCB3aWR0aD1kZXZpY2Utd2lkdGgiPgogIDx0aXRsZT5FcnJvciA0MDQgKE5vdCBGb3VuZCkhITE8L3RpdGxlPgogIDxzdHlsZT4KICAgICp7bWFyZ2luOjA7cGFkZGluZzowfWh0bWwsY29kZXtmb250OjE1cHgvMjJweCBhcmlhbCxzYW5zLXNlcmlmfWh0bWx7YmFja2dyb3VuZDojZmZmO2NvbG9yOiMyMjI7cGFkZGluZzoxNXB4fWJvZHl7bWFyZ2luOjclIGF1dG8gMDttYXgtd2lkdGg6MzkwcHg7bWluLWhlaWdodDoxODBweDtwYWRkaW5nOjMwcHggMCAxNXB4fSogPiBib2R5e2JhY2tncm91bmQ6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2Vycm9ycy9yb2JvdC5wbmcpIDEwMCUgNXB4IG5vLXJlcGVhdDtwYWRkaW5nLXJpZ2h0OjIwNXB4fXB7bWFyZ2luOjExcHggMCAyMnB4O292ZXJmbG93OmhpZGRlbn1pbnN7Y29sb3I6Izc3Nzt0ZXh0LWRlY29yYXRpb246bm9uZX1hIGltZ3tib3JkZXI6MH1AbWVkaWEgc2NyZWVuIGFuZCAobWF4LXdpZHRoOjc3MnB4KXtib2R5e2JhY2tncm91bmQ6bm9uZTttYXJnaW4tdG9wOjA7bWF4LXdpZHRoOm5vbmU7cGFkZGluZy1yaWdodDowfX0jbG9nb3tiYWNrZ3JvdW5kOnVybCgvL3d3dy5nb29nbGUuY29tL2ltYWdlcy9icmFuZGluZy9nb29nbGVsb2dvLzF4L2dvb2dsZWxvZ29fY29sb3JfMTUweDU0ZHAucG5nKSBuby1yZXBlYXQ7bWFyZ2luLWxlZnQ6LTVweH1AbWVkaWEgb25seSBzY3JlZW4gYW5kIChtaW4tcmVzb2x1dGlvbjoxOTJkcGkpeyNsb2dve2JhY2tncm91bmQ6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2JyYW5kaW5nL2dvb2dsZWxvZ28vMngvZ29vZ2xlbG9nb19jb2xvcl8xNTB4NTRkcC5wbmcpIG5vLXJlcGVhdCAwJSAwJS8xMDAlIDEwMCU7LW1vei1ib3JkZXItaW1hZ2U6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2JyYW5kaW5nL2dvb2dsZWxvZ28vMngvZ29vZ2xlbG9nb19jb2xvcl8xNTB4NTRkcC5wbmcpIDB9fUBtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRpbzoyKXsjbG9nb3tiYWNrZ3JvdW5kOnVybCgvL3d3dy5nb29nbGUuY29tL2ltYWdlcy9icmFuZGluZy9nb29nbGVsb2dvLzJ4L2dvb2dsZWxvZ29fY29sb3JfMTUweDU0ZHAucG5nKSBuby1yZXBlYXQ7LXdlYmtpdC1iYWNrZ3JvdW5kLXNpemU6MTAwJSAxMDAlfX0jbG9nb3tkaXNwbGF5OmlubGluZS1ibG9jaztoZWlnaHQ6NTRweDt3aWR0aDoxNTBweH0KICA8L3N0eWxlPgogIDxhIGhyZWY9Ly93d3cuZ29vZ2xlLmNvbS8+PHNwYW4gaWQ9bG9nbyBhcmlhLWxhYmVsPUdvb2dsZT48L3NwYW4+PC9hPgogIDxwPjxiPjQwNC48L2I+IDxpbnM+VGhhdOKAmXMgYW4gZXJyb3IuPC9pbnM+CiAgPHA+VGhlIHJlcXVlc3RlZCBVUkwgPGNvZGU+L3Byb3h5LWdvb2dsZS10ZXN0LXBvc3Q8L2NvZGU+IHdhcyBub3QgZm91bmQgb24gdGhpcyBzZXJ2ZXIuICA8aW5zPlRoYXTigJlzIGFsbCB3ZSBrbm93LjwvaW5zPgo=",
+    "BodyEncoding": {
+      "CodePage": 65001,
+      "EncodingName": "Unicode (UTF-8)",
+      "WebName": "utf-8"
+    },
+    "UseTransformer": false,
+    "Headers": {
+      "Date": "Wed, 27 Oct 2017 18:57:40 GMT",
+      "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"39,38,37,35\"",
+      "Referrer-Policy": "no-referrer",
+      "Connection": "close"
+    }
+  }
+}

examples/WireMock.Net.Console.NETCoreApp2/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -0,0 +1,19 @@
+{
+  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
+  "Priority": 4,
+  "Request": {
+    "Path": {},
+    "Methods": [
+      "get"
+    ]
+  },
+  "Response": {
+    "StatusCode": 200,
+    "BodyDestination": "SameAsSource",
+    "Body": "NO PATH OR URL",
+    "UseTransformer": false,
+    "Headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs

@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.IO;
+using WireMock.Handlers;
+
+namespace WireMock.Net.ConsoleApplication
+{
+    internal class CustomFileSystemFileHandler : IFileSystemHandler
+    {
+        private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
+
+        /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
+        public bool FolderExists(string path)
+        {
+            return Directory.Exists(path);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
+        public void CreateFolder(string path)
+        {
+            Directory.CreateDirectory(path);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
+        public IEnumerable<string> EnumerateFiles(string path)
+        {
+            return Directory.EnumerateFiles(path);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
+        public string GetMappingFolder()
+        {
+            return Path.Combine(@"c:\temp-wiremock", AdminMappingsFolder);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
+        public string ReadMappingFile(string path)
+        {
+            return File.ReadAllText(path);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile"/>
+        public void WriteMappingFile(string path, string text)
+        {
+            File.WriteAllText(path, text);
+        }
+    }
+}

examples/WireMock.Net.Console.Net452.Classic/MainApp.cs

@@ -30,7 +30,9 @@ namespace WireMock.Net.ConsoleApplication
                 //},
                 PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
                 PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },
-                Logger = new WireMockConsoleLogger()
+                Logger = new WireMockConsoleLogger(),
+
+                FileSystemHandler = new CustomFileSystemFileHandler()
             });
             System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
 
@@ -38,6 +40,33 @@ namespace WireMock.Net.ConsoleApplication
 
             server.AllowPartialMapping();
 
+            server
+                .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
+                .AtPriority(4)
+                .RespondWith(Response.Create()
+                    .WithStatusCode(200)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody(@"{ ""result"": ""Contains x with FUNC 200""}"));
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithPath("/proxy-test-keep-alive")
+                )
+                .RespondWith(Response.Create()
+                    .WithHeader("Keep-Alive", "timeout=1, max=1")
+                );
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithPath("/proxy-execute-keep-alive")
+                )
+                .RespondWith(Response.Create()
+                    .WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999", BlackListedHeaders = new[] { "Keep-Alive" } })
+                    .WithHeader("Keep-Alive-Test", "stef")
+                );
+
             server
                 .Given(Request.Create()
                     .WithPath("/xpath").UsingPost()
@@ -125,8 +154,10 @@ namespace WireMock.Net.ConsoleApplication
 
             server
                 .Given(Request.Create().WithPath("/file_rel").UsingGet())
+                .WithGuid("0000aaaa-fcf4-4256-a0d3-1c76e4862947")
                 .RespondWith(Response.Create()
-                    .WithBodyFromFile("Program.cs", false)
+                    .WithHeader("Content-Type", "application/xml")
+                    .WithBodyFromFile("WireMock.Net.xml", false)
                 );
 
             server
@@ -157,14 +188,6 @@ namespace WireMock.Net.ConsoleApplication
                     .WithStatusCode(200)
                     .WithBody("hi"));
 
-            server
-                .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
-                .AtPriority(4)
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""Contains x with FUNC 200""}"));
-
             server
                 .Given(Request.Create().WithPath("/data").UsingPost().WithBody(b => b.Contains("e")))
                 .AtPriority(999)
@@ -237,6 +260,46 @@ namespace WireMock.Net.ConsoleApplication
                     .WithDelay(TimeSpan.FromMilliseconds(100))
                 );
 
+            server
+                .Given(Request.Create().WithPath("/jsonpathtestToken").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody("{{JsonPath.SelectToken request.body \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}")
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/zubinix").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody("{ \"result\": \"{{JsonPath.SelectToken request.bodyAsJson \"username\"}}\" }")
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/zubinix2").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { path = "{{request.path}}", result = "{{JsonPath.SelectToken request.bodyAsJson \"username\"}}" })
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/jsonpathtestTokenJson").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { status = "OK", url = "{{request.url}}", transformed = "{{JsonPath.SelectToken request.body \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}" })
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/jsonpathtestTokens").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody("[{{#JsonPath.SelectTokens request.body \"$..Products[?(@.Price >= 50)].Name\"}} { \"idx\":{{id}}, \"value\":\"{{value}}\" }, {{/JsonPath.SelectTokens}} {} ]")
+                    .WithTransformer()
+                );
+
             server
                 .Given(Request.Create()
                     .WithPath("/state1")
@@ -273,6 +336,28 @@ namespace WireMock.Net.ConsoleApplication
                 .RespondWith(Response.Create()
                     .WithBody("Test state msg 2"));
 
+            server
+                .Given(Request.Create().WithPath("/encoded-test/a%20b"))
+                .RespondWith(Response.Create()
+                    .WithBody("EncodedTest 1 : Path={{request.path}}, Url={{request.url}}")
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/encoded-test/a b"))
+                .RespondWith(Response.Create()
+                    .WithBody("EncodedTest 2 : Path={{request.path}}, Url={{request.url}}")
+                    .WithTransformer()
+                );
+
+            // https://stackoverflow.com/questions/51985089/wiremock-request-matching-with-comparison-between-two-query-parameters
+            server
+                .Given(Request.Create().WithPath("/linq")
+                    .WithParam("from", new LinqMatcher("DateTime.Parse(it) > \"2018-03-01 00:00:00\"")))
+                .RespondWith(Response.Create()
+                    .WithBody("linq match !!!")
+                );
+
             System.Console.WriteLine("Press any key to stop the server");
             System.Console.ReadKey();
             server.Stop();

examples/WireMock.Net.Console.Net452.Classic/Properties/AssemblyInfo.cs

@@ -4,12 +4,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("WireMock.Net.ConsoleApplication")]
+[assembly: AssemblyTitle("WireMock.Net.Console.Net452.Classic")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WireMock.Net.ConsoleApplication")]
-[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2017")]
+[assembly: AssemblyProduct("WireMock.Net.Console.Net452.Classic")]
+[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj

@@ -43,8 +43,8 @@
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SimMetrics.Net, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SimMetrics.Net.1.0.4\lib\net45\SimMetrics.Net.dll</HintPath>
@@ -54,6 +54,7 @@
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CustomFileSystemFileHandler.cs" />
     <Compile Include="MainApp.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -71,6 +72,9 @@
     <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="__admin\mappings\873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">

examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -0,0 +1,19 @@
+{
+  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
+  "Priority": 4,
+  "Request": {
+    "Path": {},
+    "Methods": [
+      "get"
+    ]
+  },
+  "Response": {
+    "StatusCode": 200,
+    "BodyDestination": "SameAsSource",
+    "Body": "NO PATH OR URL",
+    "UseTransformer": false,
+    "Headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

examples/WireMock.Net.Console.Net452.Classic/log4net.config

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+  <appSettings>
+    <add key="log4net.Internal.Debug" value="true"/>
+  </appSettings>
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+  </log4net>
+</configuration>

examples/WireMock.Net.Console.Net452.Classic/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
   <package id="SimMetrics.Net" version="1.0.4" targetFramework="net452" />
 </packages>

examples/WireMock.Net.Console.Net461.Classic/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+</configuration>

examples/WireMock.Net.Console.Net461.Classic/Properties/AssemblyInfo.cs

@@ -1,34 +1,35 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("WireMock.Net.Tests")]
+[assembly: AssemblyTitle("WireMock.Net.Console.Net461.Classic")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WireMock.Net.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyProduct("WireMock.Net.Console.Net461.Classic")]
+[assembly: AssemblyCopyright("Copyright © Stef Heyenrath  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d8b56d28-33ce-4bef-97d4-7dd546e37f25")]
+[assembly: Guid("1261bb9b-a7d4-456c-8985-3ce560361b8e")]
 
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1261BB9B-A7D4-456C-8985-3CE560361B8E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WireMock.Net.Console.Net461.Classic</RootNamespace>
+    <AssemblyName>WireMock.Net.Console.Net461.Classic</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="SimMetrics.Net, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimMetrics.Net.1.0.4\lib\net45\SimMetrics.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs">
+      <Link>CustomFileSystemFileHandler.cs</Link>
+    </Compile>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs">
+      <Link>MainApp.cs</Link>
+    </Compile>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\WireMock.Net.Console.Net452.Classic\log4net.config">
+      <Link>log4net.config</Link>
+    </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
+      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
+      <Name>WireMock.Net.StandAlone</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

examples/WireMock.Net.Console.Net461.Classic/packages.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.8" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
+  <package id="SimMetrics.Net" version="1.0.4" targetFramework="net461" />
+</packages>

examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj

@@ -71,8 +71,8 @@
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

examples/WireMock.Net.Console.Proxy.Net452/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
 </packages>

examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.Service/App.config

@@ -7,7 +7,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

examples/WireMock.Net.Service/Service-Install.bat

@@ -1,5 +1,5 @@
 @echo off
-call uninstall.bat
+call Service-Uninstall.bat
 
 SET mypath=%~dp0
 SET targetpath=C:\Services\WireMock.Net.Service\

examples/WireMock.Net.Service/WireMock.Net.Service.csproj

@@ -32,8 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Handlebars, Version=1.8.1.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.1.9.0\lib\net40\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -47,8 +47,8 @@
     <Reference Include="MimeKitLite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MimeKitLite.2.0.1\lib\net45\MimeKitLite.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>

examples/WireMock.Net.Service/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Handlebars.Net" version="1.9.0" targetFramework="net452" />
+  <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
@@ -9,7 +9,7 @@
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
   <package id="MimeKitLite" version="2.0.1" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="RestEase" version="1.4.4" targetFramework="net452" />
   <package id="SimMetrics.Net" version="1.0.4" targetFramework="net452" />

examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj

@@ -45,14 +45,14 @@
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Xml" />

examples/WireMock.Net.StandAlone.Net452/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

examples/WireMock.Net.StandAlone.Net452/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.8" targetFramework="net452" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
 </packages>

examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj

@@ -1,17 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
     <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
     <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
     <RootNamespace>WireMock.Net.WebApplication</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.WebApplication/libman.json

@@ -0,0 +1,5 @@
+{
+  "version": "1.0",
+  "defaultProvider": "cdnjs",
+  "libraries": []
+}

examples/WireMock.Net.WebApplication/web.config

@@ -7,6 +7,6 @@
     <handlers>
       <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
     </handlers>
-    <aspNetCore processPath="bin\IISSupport\VSIISExeLauncher.exe" arguments="-argFile IISExeLauncherArgs.txt" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
   </system.webServer>
 </configuration>

src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.4.5</Version>
+    <Version>1.0.4.14</Version>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
     <PackageId>WireMock.Net.StandAlone</PackageId>
@@ -30,7 +29,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>NETSTANDARD</DefineConstants>
+    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,5 +45,4 @@
   <ItemGroup>
     <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
   </ItemGroup>
-
 </Project>

src/WireMock.Net/Admin/Mappings/MappingModel.cs

@@ -30,13 +30,13 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Execution state condition for the current mapping.
         /// </summary>
-        public object WhenStateIs { get; set; }
+        public string WhenStateIs { get; set; }
 
         /// <summary>
         /// The next state which will be signaled after the current mapping execution.
         /// In case the value is null state will not be changed.
         /// </summary>
-        public object SetStateTo { get; set; }
+        public string SetStateTo { get; set; }
 
         /// <summary>
         /// The request.

src/WireMock.Net/Admin/Scenarios/ScenarioStateModel.cs

@@ -0,0 +1,28 @@
+namespace WireMock.Admin.Scenarios
+{
+    /// <summary>
+    /// ScenarioStateModel
+    /// </summary>
+    public class ScenarioStateModel
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the NextState.
+        /// </summary>
+        public string NextState { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is started.
+        /// </summary>
+        public bool Started { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is finished.
+        /// </summary>
+        public bool Finished { get; set; }
+    }
+}

src/WireMock.Net/Client/IFluentMockServerAdmin.cs

@@ -84,6 +84,7 @@ namespace WireMock.Client
         /// <param name="guid">The Guid</param>
         /// <param name="mapping">MappingModel</param>
         [Put("__admin/mappings/{guid}")]
+        [Header("Content-Type", "application/json")]
         Task<StatusModel> PutMappingAsync([Path] Guid guid, [Body] MappingModel mapping);
 
         /// <summary>
@@ -145,7 +146,7 @@ namespace WireMock.Client
         /// Get all scenarios
         /// </summary>
         [Get("__admin/scenarios")]
-        Task<string> GetScenariosAsync();
+        Task<IList<ScenarioState>> GetScenariosAsync();
 
         /// <summary>
         /// Delete (reset) all scenarios

src/WireMock.Net/Handlers/IFileSystemHandler.cs

@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+
+namespace WireMock.Handlers
+{
+    /// <summary>
+    /// Handler to interact with the file system to handle folders and read and write static mapping files.
+    /// </summary>
+    public interface IFileSystemHandler
+    {
+        /// <summary>
+        /// Gets the folder where the static mappings are located. For local file system, this would be `{CurrentFolder}/__admin/mappings`.
+        /// </summary>
+        /// <returns>The foldername.</returns>
+        string GetMappingFolder();
+
+        /// <summary>
+        /// Determines whether the given path refers to an existing directory on disk.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>true if path refers to an existing directory; false if the directory does not exist or an error occurs when trying to determine if the specified directory exists.</returns>
+        bool FolderExists(string path);
+
+        /// <summary>
+        ///  Creates all directories and subdirectories in the specified path unless they already exist.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        void CreateFolder(string path);
+
+        /// <summary>
+        ///  Returns an enumerable collection of file names in a specified path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>An enumerable collection of the full names (including paths) for the files in the directory specified by path.</returns>
+        IEnumerable<string> EnumerateFiles(string path);
+
+        /// <summary>
+        /// Read a static mapping file as text.
+        /// </summary>
+        /// <param name="path">The path (folder + filename with .json extension).</param>
+        string ReadMappingFile(string path);
+
+        /// <summary>
+        /// Write the static mapping.
+        /// </summary>
+        /// <param name="path">The path (folder + filename with .json extension).</param>
+        /// <param name="text">The text.</param>
+        void WriteMappingFile(string path, string text);
+    }
+}

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+using System.IO;
+using JetBrains.Annotations;
+using WireMock.Validation;
+
+namespace WireMock.Handlers
+{
+    /// <summary>
+    /// Default implementation for a handler to interact with the local file system to read and write static mapping files.
+    /// </summary>
+    public class LocalFileSystemHandler : IFileSystemHandler
+    {
+        private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
+
+        /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
+        public bool FolderExists([NotNull] string path)
+        {
+            Check.NotNullOrEmpty(path, nameof(path));
+
+            return Directory.Exists(path);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
+        public void CreateFolder([NotNull] string path)
+        {
+            Check.NotNullOrEmpty(path, nameof(path));
+
+            Directory.CreateDirectory(path);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
+        public IEnumerable<string> EnumerateFiles([NotNull] string path)
+        {
+            Check.NotNullOrEmpty(path, nameof(path));
+
+            return Directory.EnumerateFiles(path);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
+        public string GetMappingFolder()
+        {
+            return Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
+        public string ReadMappingFile([NotNull] string path)
+        {
+            Check.NotNullOrEmpty(path, nameof(path));
+
+            return File.ReadAllText(path);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile"/>
+        public void WriteMappingFile([NotNull] string path, [NotNull] string text)
+        {
+            Check.NotNullOrEmpty(path, nameof(path));
+            Check.NotNull(text, nameof(text));
+
+            File.WriteAllText(path, text);
+        }
+    }
+}

src/WireMock.Net/Http/PortUtil.cs

@@ -9,7 +9,7 @@ namespace WireMock.Http
     /// </summary>
     public static class PortUtil
     {
-        private static readonly Regex UrlDetailsRegex = new Regex(@"^(?<proto>\w+)://[^/]+?(?<port>\d+)?/", RegexOptions.Compiled);
+        private static readonly Regex UrlDetailsRegex = new Regex(@"^(?<proto>\w+)://[^/]+?(?<port>\d+)/?", RegexOptions.Compiled);
 
         /// <summary>
         /// Finds a free TCP port.

src/WireMock.Net/Mapping.cs

@@ -41,14 +41,14 @@ namespace WireMock
         /// Execution state condition for the current mapping.
         /// </summary>
         [CanBeNull]
-        public object ExecutionConditionState { get; }
+        public string ExecutionConditionState { get; }
 
         /// <summary>
         /// The next state which will be signaled after the current mapping execution.
-        /// In case the value is null state will not be changed.
+        /// In case the value is null, state will not be changed.
         /// </summary>
         [CanBeNull]
-        public object NextState { get; }
+        public string NextState { get; }
 
         /// <summary>
         /// The Request matcher.
@@ -77,7 +77,7 @@ namespace WireMock
         /// <param name="scenario">The scenario. [Optional]</param>
         /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
         /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
-        public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path, IRequestMatcher requestMatcher, IResponseProvider provider, int priority, [CanBeNull] string scenario, [CanBeNull] object executionConditionState, [CanBeNull] object nextState)
+        public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path, IRequestMatcher requestMatcher, IResponseProvider provider, int priority, [CanBeNull] string scenario, [CanBeNull] string executionConditionState, [CanBeNull] string nextState)
         {
             Guid = guid;
             Title = title;
@@ -106,7 +106,7 @@ namespace WireMock
         /// <param name="requestMessage">The request message.</param>
         /// <param name="nextState">The Next State.</param>
         /// <returns>The <see cref="RequestMatchResult"/>.</returns>
-        public RequestMatchResult GetRequestMatchResult(RequestMessage requestMessage, [CanBeNull] object nextState)
+        public RequestMatchResult GetRequestMatchResult(RequestMessage requestMessage, [CanBeNull] string nextState)
         {
             var result = new RequestMatchResult();
 

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -63,7 +63,9 @@ namespace WireMock.Matchers
         public double IsMatch(object input)
         {
             double match = MatchScores.Mismatch;
-            if (input != null)
+
+            // When input is null or byte[], return Mismatch.
+            if (input != null && !(input is byte[]))
             {
                 try
                 {

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -65,7 +65,9 @@ namespace WireMock.Matchers
         public double IsMatch(object input)
         {
             bool match = false;
-            if (input != null)
+
+            // When input is null or byte[], return Mismatch.
+            if (input != null && !(input is byte[]))
             {
                 try
                 {
@@ -73,10 +75,21 @@ namespace WireMock.Matchers
                     JToken jtokenInput = input is JToken tokenInput ? tokenInput : JObject.FromObject(input);
 
                     // Check if JToken or string or object
-                    JToken jtokenValue =
-                        Value is JToken tokenValue ? tokenValue :
-                        Value is string stringValue ? JToken.Parse(stringValue) :
-                        JObject.FromObject(input);
+                    JToken jtokenValue;
+                    switch (Value)
+                    {
+                        case JToken tokenValue:
+                            jtokenValue = tokenValue;
+                            break;
+
+                        case string stringValue:
+                            jtokenValue = JToken.Parse(stringValue);
+                            break;
+
+                        default:
+                            jtokenValue = JObject.FromObject(Value);
+                            break;
+                    }
 
                     match = JToken.DeepEquals(jtokenValue, jtokenInput);
                 }

src/WireMock.Net/Matchers/LinqMatcher.cs

@@ -0,0 +1,99 @@
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using JetBrains.Annotations;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// System.Linq.Dynamic.Core Expression Matcher
+    /// </summary>
+    /// <inheritdoc cref="IStringMatcher"/>
+    public class LinqMatcher : IStringMatcher
+    {
+        private readonly string[] _patterns;
+
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+        /// </summary>
+        /// <param name="pattern">The pattern.</param>
+        public LinqMatcher([NotNull] string pattern) : this(new[] { pattern })
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+        /// </summary>
+        /// <param name="patterns">The patterns.</param>
+        public LinqMatcher([NotNull] string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="pattern">The pattern.</param>
+        public LinqMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern) : this(matchBehaviour, new[] { pattern })
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        public LinqMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns)
+        {
+            MatchBehaviour = matchBehaviour;
+            _patterns = patterns;
+        }
+
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
+        public double IsMatch(string input)
+        {
+            // Convert a single input string to a Queryable string-list with 1 entry.
+            IQueryable queryable = new[] { input }.AsQueryable();
+
+            // Use the Any(...) method to check if the result matches
+            double match = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern)));
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+        }
+
+        ///// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        //public double IsMatch(object input)
+        //{
+        //    object value;
+        //    switch (input)
+        //    {
+        //        case JObject valueAsJObject:
+        //            value = valueAsJObject.ToObject<object>();
+        //            break;
+
+        //        default:
+        //            value = input;
+        //            break;
+        //    }
+
+        //    // Convert a single object to a Queryable object-list with 1 entry.
+        //    IQueryable queryable = new[] { value }.AsQueryable().Select("new (it as x)");
+
+        //    // Use the Any(...) method to check if the result matches
+        //    double match = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern)));
+
+        //    return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+        //}
+
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+        public string[] GetPatterns()
+        {
+            return _patterns;
+        }
+
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "LinqMatcher";
+    }
+}

src/WireMock.Net/Matchers/MatchBehaviourHelper.cs

@@ -1,5 +1,4 @@
-
-namespace WireMock.Matchers
+namespace WireMock.Matchers
 {
     internal static class MatchBehaviourHelper
     {

src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs

@@ -12,6 +12,7 @@ namespace WireMock.Matchers.Request
     public class RequestMessageCookieMatcher : IRequestMatcher
     {
         private readonly MatchBehaviour _matchBehaviour;
+        private readonly bool _ignoreCase;
 
         /// <value>
         /// The funcs.
@@ -41,6 +42,7 @@ namespace WireMock.Matchers.Request
             Check.NotNull(pattern, nameof(pattern));
 
             _matchBehaviour = matchBehaviour;
+            _ignoreCase = ignoreCase;
             Name = name;
             Matchers = new IStringMatcher[] { new WildcardMatcher(matchBehaviour, pattern, ignoreCase) };
         }
@@ -84,9 +86,12 @@ namespace WireMock.Matchers.Request
                 return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
+            // Check if we want to use IgnoreCase to compare the Cookie-Name and Cookie-Value
+            var cookies = !_ignoreCase ? requestMessage.Cookies : new Dictionary<string, string>(requestMessage.Cookies, StringComparer.OrdinalIgnoreCase);
+
             if (Funcs != null)
             {
-                return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Cookies)));
+                return MatchScores.ToScore(Funcs.Any(f => f(cookies)));
             }
 
             if (Matchers == null)
@@ -94,12 +99,12 @@ namespace WireMock.Matchers.Request
                 return MatchScores.Mismatch;
             }
 
-            if (!requestMessage.Cookies.ContainsKey(Name))
+            if (!cookies.ContainsKey(Name))
             {
                 return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
-            string value = requestMessage.Cookies[Name];
+            string value = cookies[Name];
             return Matchers.Max(m => m.IsMatch(value));
         }
     }

src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs

@@ -14,6 +14,7 @@ namespace WireMock.Matchers.Request
     public class RequestMessageHeaderMatcher : IRequestMatcher
     {
         private readonly MatchBehaviour _matchBehaviour;
+        private readonly bool _ignoreCase;
 
         /// <summary>
         /// The functions
@@ -43,6 +44,7 @@ namespace WireMock.Matchers.Request
             Check.NotNull(pattern, nameof(pattern));
 
             _matchBehaviour = matchBehaviour;
+            _ignoreCase = ignoreCase;
             Name = name;
             Matchers = new IStringMatcher[] { new WildcardMatcher(matchBehaviour, pattern, ignoreCase) };
         }
@@ -60,6 +62,7 @@ namespace WireMock.Matchers.Request
             Check.NotNull(patterns, nameof(patterns));
 
             _matchBehaviour = matchBehaviour;
+            _ignoreCase = ignoreCase;
             Name = name;
             Matchers = patterns.Select(pattern => new WildcardMatcher(matchBehaviour, pattern, ignoreCase)).Cast<IStringMatcher>().ToArray();
         }
@@ -103,9 +106,12 @@ namespace WireMock.Matchers.Request
                 return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
+            // Check if we want to use IgnoreCase to compare the Header-Name and Header-Value(s)
+            var headers = !_ignoreCase ? requestMessage.Headers : new Dictionary<string, WireMockList<string>>(requestMessage.Headers, StringComparer.OrdinalIgnoreCase);
+
             if (Funcs != null)
             {
-                return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Headers.ToDictionary(entry => entry.Key, entry => entry.Value.ToArray()))));
+                return MatchScores.ToScore(Funcs.Any(f => f(headers.ToDictionary(entry => entry.Key, entry => entry.Value.ToArray()))));
             }
 
             if (Matchers == null)
@@ -113,12 +119,12 @@ namespace WireMock.Matchers.Request
                 return MatchScores.Mismatch;
             }
 
-            if (!requestMessage.Headers.ContainsKey(Name))
+            if (!headers.ContainsKey(Name))
             {
                 return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
-            WireMockList<string> list = requestMessage.Headers[Name];
+            WireMockList<string> list = headers[Name];
             return Matchers.Max(m => list.Max(value => m.IsMatch(value))); // TODO : is this correct ?
         }
     }

src/WireMock.Net/Matchers/Request/RequestMessageScenarioAndStateMatcher.cs

@@ -11,21 +11,21 @@ namespace WireMock.Matchers.Request
         /// Execution state condition for the current mapping.
         /// </summary>
         [CanBeNull]
-        private readonly object _executionConditionState;
+        private readonly string _executionConditionState;
 
         /// <summary>
         /// The next state which will be signaled after the current mapping execution.
         /// In case the value is null state will not be changed.
         /// </summary>
         [CanBeNull]
-        private readonly object _nextState;
+        private readonly string _nextState;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageScenarioAndStateMatcher"/> class.
         /// </summary>
         /// <param name="nextState">The next state.</param>
         /// <param name="executionConditionState">Execution state condition for the current mapping.</param>
-        public RequestMessageScenarioAndStateMatcher([CanBeNull] object nextState, [CanBeNull] object executionConditionState)
+        public RequestMessageScenarioAndStateMatcher([CanBeNull] string nextState, [CanBeNull] string executionConditionState)
         {
             _nextState = nextState;
             _executionConditionState = executionConditionState;

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -1,4 +1,4 @@
-#if NETSTANDARD
+#if USE_ASPNETCORE
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -104,12 +104,20 @@ namespace WireMock.Owin
         {
             try
             {
-                IsStarted = true;
+                var appLifetime = (IApplicationLifetime) _host.Services.GetService(typeof(IApplicationLifetime));
+                appLifetime.ApplicationStarted.Register(() => IsStarted = true);
+
 #if NETSTANDARD1_3
                 _logger.Info("WireMock.Net server using netstandard1.3");
+#elif NETSTANDARD2_0
+                _logger.Info("WireMock.Net server using netstandard2.0");
+#elif NET46
+                _logger.Info("WireMock.Net server using .net 4.6.1 or higher");
+#endif
+
+#if NETSTANDARD1_3
                 _host.Run(_cts.Token);
 #else
-                _logger.Info("WireMock.Net server using netstandard2.0");
                 _host.RunAsync(_cts.Token).Wait();
 #endif
             }
@@ -132,7 +140,7 @@ namespace WireMock.Owin
 #if NETSTANDARD1_3
             return Task.FromResult(true);
 #else
-            return _host.WaitForShutdownAsync();
+            return _host.StopAsync();
 #endif
         }
     }

src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace WireMock.Owin
 {
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
     internal class GlobalExceptionMiddleware : OwinMiddleware
 #else
     internal class GlobalExceptionMiddleware
@@ -17,7 +17,7 @@ namespace WireMock.Owin
     {
         private readonly WireMockMiddlewareOptions _options;
 
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
         public GlobalExceptionMiddleware(OwinMiddleware next, WireMockMiddlewareOptions options) : base(next)
         {
             _options = options;
@@ -30,13 +30,13 @@ namespace WireMock.Owin
         }
 #endif
 
-#if NETSTANDARD
+#if USE_ASPNETCORE
         public RequestDelegate Next { get; }
 #endif
 
         private readonly OwinResponseMapper _responseMapper = new OwinResponseMapper();
 
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
         public override async Task Invoke(IOwinContext ctx)
 #else
         public async Task Invoke(HttpContext ctx)

src/WireMock.Net/Owin/OwinRequestMapper.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using WireMock.Util;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
@@ -23,14 +23,14 @@ namespace WireMock.Owin
         /// <param name="request"></param>
         /// <returns></returns>
         public async Task<RequestMessage> MapAsync(
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
             IOwinRequest request
 #else
             HttpRequest request
 #endif
             )
         {
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
             var urldetails = UrlUtils.Parse(request.Uri, request.PathBase);
             string clientIP = request.RemoteIpAddress;
 #else

src/WireMock.Net/Owin/OwinResponseMapper.cs

@@ -2,12 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using WireMock.Http;
 using WireMock.Util;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
@@ -23,7 +24,7 @@ namespace WireMock.Owin
         private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
 
         // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
         private static readonly IDictionary<string, Action<IOwinResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IOwinResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
 #else
         private static readonly IDictionary<string, Action<HttpResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<HttpResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
@@ -32,7 +33,7 @@ namespace WireMock.Owin
         };
 
         private void SetResponseHeaders(ResponseMessage responseMessage
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
             , IOwinResponse response
 #else
             , HttpResponse response
@@ -48,9 +49,14 @@ namespace WireMock.Owin
                 }
                 else
                 {
-#if !NETSTANDARD
-                    response.Headers.AppendValues(pair.Key, pair.Value.ToArray());
+#if !USE_ASPNETCORE
+                    // For non-NETSTANDARD, check if this response header can be added (#148)
+                    if (!WebHeaderCollection.IsRestricted(pair.Key, true))
+                    {
+                        response.Headers.AppendValues(pair.Key, pair.Value.ToArray());
+                    }
 #else
+                    // NETSTANDARD can add any header (or so it seems)
                     response.Headers.Append(pair.Key, pair.Value.ToArray());
 #endif
                 }
@@ -63,13 +69,18 @@ namespace WireMock.Owin
         /// <param name="responseMessage"></param>
         /// <param name="response"></param>
         public async Task MapAsync(ResponseMessage responseMessage
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
             , IOwinResponse response
 #else
             , HttpResponse response
 #endif
             )
         {
+            if (responseMessage == null)
+            {
+                return;
+            }
+
             response.StatusCode = responseMessage.StatusCode;
 
             byte[] bytes = null;

src/WireMock.Net/Owin/OwinSelfHost.cs

@@ -1,4 +1,4 @@
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using JetBrains.Annotations;
 using Microsoft.Owin.Hosting;
 using Owin;
@@ -65,9 +65,9 @@ namespace WireMock.Owin
         private void StartServers()
         {
 #if NET46
-            _logger.Info("WireMock.Net server using .net 4.6.x or higher");
+            _logger.Info("WireMock.Net server using .net 4.6.1 or higher");
 #else
-            _logger.Info("WireMock.Net server using .net 4.5.x or higher");
+            _logger.Info("WireMock.Net server using .net 4.5.x");
 #endif
             var servers = new List<IDisposable>();
 

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -9,7 +9,7 @@ using WireMock.Util;
 using Newtonsoft.Json;
 using WireMock.Http;
 using WireMock.Serialization;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
@@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace WireMock.Owin
 {
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
     internal class WireMockMiddleware : OwinMiddleware
 #else
     internal class WireMockMiddleware
@@ -29,7 +29,7 @@ namespace WireMock.Owin
         private readonly OwinRequestMapper _requestMapper = new OwinRequestMapper();
         private readonly OwinResponseMapper _responseMapper = new OwinResponseMapper();
 
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
         public WireMockMiddleware(OwinMiddleware next, WireMockMiddlewareOptions options) : base(next)
         {
             _options = options;
@@ -41,7 +41,7 @@ namespace WireMock.Owin
         }
 #endif
 
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
         public override async Task Invoke(IOwinContext ctx)
 #else
         public async Task Invoke(HttpContext ctx)
@@ -60,7 +60,10 @@ namespace WireMock.Owin
                     // Set start
                     if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)
                     {
-                        _options.Scenarios.TryAdd(mapping.Scenario, null);
+                        _options.Scenarios.TryAdd(mapping.Scenario, new ScenarioState
+                        {
+                            Name = mapping.Scenario
+                        });
                     }
                 }
 
@@ -68,7 +71,7 @@ namespace WireMock.Owin
                     .Select(m => new
                     {
                         Mapping = m,
-                        MatchResult = m.GetRequestMatchResult(request, m.Scenario != null && _options.Scenarios.ContainsKey(m.Scenario) ? _options.Scenarios[m.Scenario] : null)
+                        MatchResult = m.GetRequestMatchResult(request, m.Scenario != null && _options.Scenarios.ContainsKey(m.Scenario) ? _options.Scenarios[m.Scenario].NextState : null)
                     })
                     .ToList();
 
@@ -125,7 +128,9 @@ namespace WireMock.Owin
 
                 if (targetMapping.Scenario != null)
                 {
-                    _options.Scenarios[targetMapping.Scenario] = targetMapping.NextState;
+                    _options.Scenarios[targetMapping.Scenario].NextState = targetMapping.NextState;
+                    _options.Scenarios[targetMapping.Scenario].Started = true;
+                    _options.Scenarios[targetMapping.Scenario].Finished = targetMapping.NextState == null;
                 }
             }
             catch (Exception ex)

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Util;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Owin;
 #else
 using Microsoft.AspNetCore.Builder;
@@ -22,9 +22,9 @@ namespace WireMock.Owin
 
         public bool AllowPartialMapping { get; set; }
 
-        public ConcurrentDictionary<Guid, Mapping> Mappings { get; } = new ConcurrentDictionary<Guid, Mapping>(); // Checked
+        public ConcurrentDictionary<Guid, Mapping> Mappings { get; } = new ConcurrentDictionary<Guid, Mapping>();
 
-        public ConcurrentDictionary<string, object> Scenarios { get; } = new ConcurrentDictionary<string, object>(); // Checked
+        public ConcurrentDictionary<string, ScenarioState> Scenarios { get; } = new ConcurrentDictionary<string, ScenarioState>();
 
         public ObservableCollection<LogEntry> LogEntries { get; } = new ConcurentObservableCollection<LogEntry>();
 
@@ -32,7 +32,7 @@ namespace WireMock.Owin
 
         public int? MaxRequestLogCount { get; set; }
 
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
         public Action<IAppBuilder> PreWireMockMiddlewareInit { get; set; }
 
         public Action<IAppBuilder> PostWireMockMiddlewareInit { get; set; }

src/WireMock.Net/ScenarioState.cs

@@ -0,0 +1,28 @@
+namespace WireMock
+{
+    /// <summary>
+    /// The ScenarioState
+    /// </summary>
+    public class ScenarioState
+    {
+        /// <summary>
+        /// Gets or sets the Name (from the Scenario).
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the NextState.
+        /// </summary>
+        public string NextState { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ScenarioState"/> is started.
+        /// </summary>
+        public bool Started { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ScenarioState"/> is finished.
+        /// </summary>
+        public bool Finished { get; set; }
+    }
+}

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -37,19 +37,16 @@ namespace WireMock.Serialization
                     ClientIP = clientIPMatchers != null && clientIPMatchers.Any() ? new ClientIPModel
                     {
                         Matchers = MatcherMapper.Map(clientIPMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
-                        //Funcs = Map(clientIPMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Path = pathMatchers != null && pathMatchers.Any() ? new PathModel
                     {
                         Matchers = MatcherMapper.Map(pathMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
-                        //Funcs = Map(pathMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Url = urlMatchers != null && urlMatchers.Any() ? new UrlModel
                     {
                         Matchers = MatcherMapper.Map(urlMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
-                        //Funcs = Map(urlMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Methods = methodMatcher?.Methods,
@@ -58,28 +55,23 @@ namespace WireMock.Serialization
                     {
                         Name = hm.Name,
                         Matchers = MatcherMapper.Map(hm.Matchers)
-                        //Funcs = Map(hm.Funcs)
                     }).ToList() : null,
 
                     Cookies = cookieMatchers != null && cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel
                     {
                         Name = cm.Name,
                         Matchers = MatcherMapper.Map(cm.Matchers)
-                        //Funcs = Map(cm.Funcs)
                     }).ToList() : null,
 
                     Params = paramsMatchers != null && paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel
                     {
                         Name = pm.Key,
                         Matchers = MatcherMapper.Map(pm.Matchers)
-                        //Funcs = Map(pm.Funcs)
                     }).ToList() : null,
 
                     Body = methodMatcher?.Methods != null && methodMatcher.Methods.Any(m => m == "get") ? null : new BodyModel
                     {
                         Matcher = bodyMatcher != null ? MatcherMapper.Map(bodyMatcher.Matcher) : null
-                        //Func = bodyMatcher != null ? Map(bodyMatcher.Func) : null,
-                        //DataFunc = bodyMatcher != null ? Map(bodyMatcher.DataFunc) : null
                     }
                 },
                 Response = new ResponseModel

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -21,11 +21,14 @@ namespace WireMock.Serialization
             string matcherName = parts[0];
             string matcherType = parts.Length > 1 ? parts[1] : null;
 
-            string[] stringPatterns = matcher.Patterns != null ? matcher.Patterns.Cast<string>().ToArray() : new [] { matcher.Pattern as string };
+            string[] stringPatterns = matcher.Patterns != null ? matcher.Patterns.Cast<string>().ToArray() : new[] { matcher.Pattern as string };
             MatchBehaviour matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
 
             switch (matcherName)
             {
+                case "LinqMatcher":
+                    return new LinqMatcher(matchBehaviour, stringPatterns);
+
                 case "ExactMatcher":
                     return new ExactMatcher(matchBehaviour, stringPatterns);
 
@@ -39,7 +42,7 @@ namespace WireMock.Serialization
                     return new JsonPathMatcher(matchBehaviour, stringPatterns);
 
                 case "XPathMatcher":
-                    return new XPathMatcher(matchBehaviour, (string) matcher.Pattern);
+                    return new XPathMatcher(matchBehaviour, (string)matcher.Pattern);
 
                 case "WildcardMatcher":
                     return new WildcardMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
@@ -51,7 +54,7 @@ namespace WireMock.Serialization
                         throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
                     }
 
-                    return new SimMetricsMatcher(matchBehaviour, (string) matcher.Pattern, type);
+                    return new SimMetricsMatcher(matchBehaviour, (string)matcher.Pattern, type);
 
                 default:
                     throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");

src/WireMock.Net/Server/FluentMockServer.Admin.cs

@@ -9,6 +9,7 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WireMock.Admin.Mappings;
+using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;
 using WireMock.Http;
 using WireMock.Logging;
@@ -29,19 +30,26 @@ namespace WireMock.Server
     /// </summary>
     public partial class FluentMockServer
     {
-        private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
         private const string ContentTypeJson = "application/json";
+
         private const string AdminMappings = "/__admin/mappings";
         private const string AdminRequests = "/__admin/requests";
         private const string AdminSettings = "/__admin/settings";
         private const string AdminScenarios = "/__admin/scenarios";
+
         private readonly RegexMatcher _adminMappingsGuidPathMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, @"^\/__admin\/mappings\/(\{{0,1}([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}\}{0,1})$");
         private readonly RegexMatcher _adminRequestsGuidPathMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, @"^\/__admin\/requests\/(\{{0,1}([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}\}{0,1})$");
 
         private readonly JsonSerializerSettings _settings = new JsonSerializerSettings
         {
             Formatting = Formatting.Indented,
-            NullValueHandling = NullValueHandling.Ignore,
+            NullValueHandling = NullValueHandling.Ignore
+        };
+
+        private readonly JsonSerializerSettings _settingsIncludeNullValues = new JsonSerializerSettings
+        {
+            Formatting = Formatting.Indented,
+            NullValueHandling = NullValueHandling.Include
         };
 
         #region InitAdmin
@@ -93,44 +101,66 @@ namespace WireMock.Server
         }
         #endregion
 
-        #region StaticMappings
+        #region StaticMappings        
+        /// <summary>
+        /// Saves the static mappings.
+        /// </summary>
+        /// <param name="folder">The optional folder. If not defined, use {CurrentFolder}/__admin/mappings</param>
+        [PublicAPI]
+        public void SaveStaticMappings([CanBeNull] string folder = null)
+        {
+            foreach (var mapping in Mappings.Where(m => !m.IsAdminInterface))
+            {
+                SaveMappingToFile(mapping, folder);
+            }
+        }
+
         /// <summary>
         /// Reads the static mappings from a folder.
         /// </summary>
-        /// <param name="folder">The optional folder. If not defined, use \__admin\mappings\</param>
+        /// <param name="folder">The optional folder. If not defined, use {CurrentFolder}/__admin/mappings</param>
         [PublicAPI]
         public void ReadStaticMappings([CanBeNull] string folder = null)
         {
             if (folder == null)
             {
-                folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
+                folder = _fileSystemHandler.GetMappingFolder();
             }
 
-            if (!Directory.Exists(folder))
+            if (!_fileSystemHandler.FolderExists(folder))
             {
+                _logger.Info("The Static Mapping folder '{0}' does not exist, reading Static MappingFiles will be skipped.", folder);
                 return;
             }
 
-            foreach (string filename in Directory.EnumerateFiles(folder).OrderBy(f => f))
+            foreach (string filename in _fileSystemHandler.EnumerateFiles(folder).OrderBy(f => f))
             {
                 _logger.Info("Reading Static MappingFile : '{0}'", filename);
-                ReadStaticMappingAndAddOrUpdate(filename);
+
+                try
+                {
+                    ReadStaticMappingAndAddOrUpdate(filename);
+                }
+                catch
+                {
+                    _logger.Error("Static MappingFile : '{0}' could not be read. This file will be skipped.", filename);
+                }
             }
         }
 
         /// <summary>
         /// Watches the static mappings for changes.
         /// </summary>
-        /// <param name="folder">The optional folder. If not defined, use \__admin\mappings\</param>
+        /// <param name="folder">The optional folder. If not defined, use {CurrentFolder}/__admin/mappings</param>
         [PublicAPI]
         public void WatchStaticMappings([CanBeNull] string folder = null)
         {
             if (folder == null)
             {
-                folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
+                folder = _fileSystemHandler.GetMappingFolder();
             }
 
-            if (!Directory.Exists(folder))
+            if (!_fileSystemHandler.FolderExists(folder))
             {
                 return;
             }
@@ -177,7 +207,7 @@ namespace WireMock.Server
 
             string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path);
 
-            MappingModel mappingModel = JsonConvert.DeserializeObject<MappingModel>(FileHelper.ReadAllText(path));
+            MappingModel mappingModel = JsonConvert.DeserializeObject<MappingModel>(_fileSystemHandler.ReadMappingFile(path));
             if (Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
             {
                 DeserializeAndAddOrUpdateMapping(mappingModel, guidFromFilename, path);
@@ -309,9 +339,9 @@ namespace WireMock.Server
             Guid guid = Guid.Parse(requestMessage.Path.TrimStart(AdminMappings.ToCharArray()));
 
             var mappingModel = DeserializeObject<MappingModel>(requestMessage);
-            DeserializeAndAddOrUpdateMapping(mappingModel, guid);
+            Guid? guidFromPut = DeserializeAndAddOrUpdateMapping(mappingModel, guid);
 
-            return ResponseMessageBuilder.Create("Mapping added or updated", 200, guid);
+            return ResponseMessageBuilder.Create("Mapping added or updated", 200, guidFromPut);
         }
 
         private ResponseMessage MappingDelete(RequestMessage requestMessage)
@@ -330,29 +360,31 @@ namespace WireMock.Server
         #region Mappings
         private ResponseMessage MappingsSave(RequestMessage requestMessage)
         {
-            foreach (var mapping in Mappings.Where(m => !m.IsAdminInterface))
-            {
-                SaveMappingToFile(mapping);
-            }
+            SaveStaticMappings();
 
             return ResponseMessageBuilder.Create("Mappings saved to disk");
         }
 
-        private void SaveMappingToFile(Mapping mapping)
+        private void SaveMappingToFile(Mapping mapping, string folder = null)
         {
-            string folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
-            if (!Directory.Exists(folder))
+            if (folder == null)
             {
-                Directory.CreateDirectory(folder);
+                folder = _fileSystemHandler.GetMappingFolder();
+            }
+
+            if (!_fileSystemHandler.FolderExists(folder))
+            {
+                _fileSystemHandler.CreateFolder(folder);
             }
 
             var model = MappingConverter.ToMappingModel(mapping);
-            string filename = !string.IsNullOrEmpty(mapping.Title) ? SanitizeFileName(mapping.Title) : mapping.Guid.ToString();
+            string filename = (!string.IsNullOrEmpty(mapping.Title) ? SanitizeFileName(mapping.Title) : mapping.Guid.ToString()) + ".json";
 
-            string filePath = Path.Combine(folder, filename + ".json");
-            _logger.Info("Saving Mapping to file {0}", filePath);
+            string path = Path.Combine(folder, filename);
 
-            File.WriteAllText(filePath, JsonConvert.SerializeObject(model, _settings));
+            _logger.Info("Saving Mapping file {0}", filename);
+
+            _fileSystemHandler.WriteMappingFile(path, JsonConvert.SerializeObject(model, _settings));
         }
 
         private static string SanitizeFileName(string name, char replaceChar = '_')
@@ -394,13 +426,18 @@ namespace WireMock.Server
             return ResponseMessageBuilder.Create("Mapping added", 201, guid);
         }
 
-        private Guid DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
+        private Guid? DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
         {
             Check.NotNull(mappingModel, nameof(mappingModel));
             Check.NotNull(mappingModel.Request, nameof(mappingModel.Request));
             Check.NotNull(mappingModel.Response, nameof(mappingModel.Response));
 
-            var requestBuilder = InitRequestBuilder(mappingModel.Request);
+            var requestBuilder = InitRequestBuilder(mappingModel.Request, true);
+            if (requestBuilder == null)
+            {
+                return null;
+            }
+
             var responseBuilder = InitResponseBuilder(mappingModel.Response);
 
             var respondProvider = Given(requestBuilder);
@@ -504,7 +541,7 @@ namespace WireMock.Server
         {
             var requestModel = DeserializeObject<RequestModel>(requestMessage);
 
-            var request = (Request)InitRequestBuilder(requestModel);
+            var request = (Request)InitRequestBuilder(requestModel, false);
 
             var dict = new Dictionary<LogEntry, RequestMatchResult>();
             foreach (var logEntry in LogEntries.Where(le => !le.RequestMessage.Path.StartsWith("/__admin/")))
@@ -525,13 +562,15 @@ namespace WireMock.Server
         #region Scenarios
         private ResponseMessage ScenariosGet(RequestMessage requestMessage)
         {
-            var scenarios = Scenarios.ToArray().Select(s => new
+            var scenariosStates = Scenarios.Values.Select(s => new ScenarioStateModel
             {
-                Name = s.Key,
-                Started = s.Value != null,
-                NextState = s.Value
+                Name = s.Name,
+                NextState = s.NextState,
+                Started = s.Started,
+                Finished = s.Finished
             });
-            return ToJson(scenarios);
+
+            return ToJson(scenariosStates, true);
         }
 
         private ResponseMessage ScenariosReset(RequestMessage requestMessage)
@@ -542,7 +581,7 @@ namespace WireMock.Server
         }
         #endregion
 
-        private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
+        private IRequestBuilder InitRequestBuilder(RequestModel requestModel, bool pathOrUrlRequired)
         {
             IRequestBuilder requestBuilder = Request.Create();
 
@@ -562,11 +601,13 @@ namespace WireMock.Server
                 }
             }
 
+            bool pathOrUrlmatchersValid = false;
             if (requestModel.Path != null)
             {
                 if (requestModel.Path is string path)
                 {
                     requestBuilder = requestBuilder.WithPath(path);
+                    pathOrUrlmatchersValid = true;
                 }
                 else
                 {
@@ -574,15 +615,16 @@ namespace WireMock.Server
                     if (pathModel?.Matchers != null)
                     {
                         requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
+                        pathOrUrlmatchersValid = true;
                     }
                 }
             }
-
-            if (requestModel.Url != null)
+            else if (requestModel.Url != null)
             {
                 if (requestModel.Url is string url)
                 {
                     requestBuilder = requestBuilder.WithUrl(url);
+                    pathOrUrlmatchersValid = true;
                 }
                 else
                 {
@@ -590,10 +632,17 @@ namespace WireMock.Server
                     if (urlModel?.Matchers != null)
                     {
                         requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
+                        pathOrUrlmatchersValid = true;
                     }
                 }
             }
 
+            if (pathOrUrlRequired && !pathOrUrlmatchersValid)
+            {
+                _logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
+                return null;
+            }
+
             if (requestModel.Methods != null)
             {
                 requestBuilder = requestBuilder.UsingMethod(requestModel.Methods);
@@ -692,7 +741,6 @@ namespace WireMock.Server
             {
                 responseBuilder = responseBuilder.WithBodyFromBase64(responseModel.BodyFromBase64, ToEncoding(responseModel.BodyEncoding));
             }
-
             else if (responseModel.BodyAsFile != null)
             {
                 responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile);
@@ -706,11 +754,11 @@ namespace WireMock.Server
             return responseBuilder;
         }
 
-        private ResponseMessage ToJson<T>(T result)
+        private ResponseMessage ToJson<T>(T result, bool keepNullValues = false)
         {
             return new ResponseMessage
             {
-                Body = JsonConvert.SerializeObject(result, _settings),
+                Body = JsonConvert.SerializeObject(result, keepNullValues ? _settingsIncludeNullValues : _settings),
                 StatusCode = 200,
                 Headers = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string>("application/json") } }
             };

src/WireMock.Net/Server/FluentMockServer.cs

@@ -1,11 +1,13 @@
 using JetBrains.Annotations;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using WireMock.Handlers;
 using WireMock.Http;
 using WireMock.Logging;
 using WireMock.Matchers;
@@ -24,6 +26,8 @@ namespace WireMock.Server
     public partial class FluentMockServer : IDisposable
     {
         private readonly IWireMockLogger _logger;
+        private readonly IFileSystemHandler _fileSystemHandler;
+
         private const int ServerStartDelay = 100;
         private readonly IOwinSelfHost _httpServer;
         private readonly WireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
@@ -56,7 +60,7 @@ namespace WireMock.Server
         /// Gets the scenarios.
         /// </summary>
         [PublicAPI]
-        public ConcurrentDictionary<string, object> Scenarios => new ConcurrentDictionary<string, object>(_options.Scenarios);
+        public ConcurrentDictionary<string, ScenarioState> Scenarios => new ConcurrentDictionary<string, ScenarioState>(_options.Scenarios);
 
         #region IDisposable Members
         /// <summary>
@@ -74,7 +78,7 @@ namespace WireMock.Server
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            if (_httpServer != null && _httpServer.IsStarted)
+            if (_httpServer != null)
             {
                 _httpServer.StopAsync();
             }
@@ -182,26 +186,28 @@ namespace WireMock.Server
         private FluentMockServer(IFluentMockServerSettings settings)
         {
             settings.Logger = settings.Logger ?? new WireMockConsoleLogger();
+
             _logger = settings.Logger;
+            _fileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler();
 
             _logger.Info("WireMock.Net by Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)");
             _logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
 
             if (settings.Urls != null)
             {
-                Urls = settings.Urls.Select(u => u.EndsWith("/") ? u : $"{u}/").ToArray();
+                Urls = settings.Urls.ToArray();
             }
             else
             {
                 int port = settings.Port > 0 ? settings.Port.Value : PortUtil.FindFreeTcpPort();
-                Urls = new[] { (settings.UseSSL == true ? "https" : "http") + "://localhost:" + port + "/" };
+                Urls = new[] { $"{(settings.UseSSL == true ? "https" : "http")}://localhost:{port}" };
             }
 
             _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
             _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
             _options.Logger = _logger;
 
-#if NETSTANDARD
+#if USE_ASPNETCORE
             _httpServer = new AspNetCoreSelfHost(_options, Urls);
 #else
             _httpServer = new OwinSelfHost(_options, Urls);
@@ -387,7 +393,6 @@ namespace WireMock.Server
         public void SetMaxRequestLogCount([CanBeNull] int? maxRequestLogCount)
         {
             _options.MaxRequestLogCount = maxRequestLogCount;
-
         }
 
         /// <summary>

src/WireMock.Net/Server/IRespondWithAProvider.cs

@@ -66,13 +66,13 @@ namespace WireMock.Server
         /// </summary>
         /// <param name="state">Any object which identifies the current state</param>
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WhenStateIs(object state);
+        IRespondWithAProvider WhenStateIs(string state);
 
         /// <summary>
         /// Once this mapping is executed the state will be changed to specified one.
         /// </summary>
         /// <param name="state">Any object which identifies the new state</param>
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WillSetStateTo(object state);
+        IRespondWithAProvider WillSetStateTo(string state);
     }
 }

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -12,8 +12,8 @@ namespace WireMock.Server
         private int _priority;
         private string _title;
         private string _path;
-        private object _executionConditionState;
-        private object _nextState;
+        private string _executionConditionState;
+        private string _nextState;
         private string _scenario;
         private readonly RegistrationCallback _registrationCallback;
         private readonly IRequestMatcher _requestMatcher;
@@ -87,25 +87,20 @@ namespace WireMock.Server
         }
 
         /// <see cref="IRespondWithAProvider.WhenStateIs"/>
-        public IRespondWithAProvider WhenStateIs(object state)
+        public IRespondWithAProvider WhenStateIs(string state)
         {
             if (string.IsNullOrEmpty(_scenario))
             {
                 throw new NotSupportedException("Unable to set state condition when no scenario is defined.");
             }
 
-            //if (_nextState != null)
-            //{
-            //    throw new NotSupportedException("Unable to set state condition when next state is defined.");
-            //}
-
             _executionConditionState = state;
 
             return this;
         }
 
         /// <see cref="IRespondWithAProvider.WillSetStateTo"/>
-        public IRespondWithAProvider WillSetStateTo(object state)
+        public IRespondWithAProvider WillSetStateTo(string state)
         {
             if (string.IsNullOrEmpty(_scenario))
             {

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -1,6 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
+using WireMock.Handlers;
 using WireMock.Logging;
 
 namespace WireMock.Settings
@@ -77,5 +78,10 @@ namespace WireMock.Settings
         [PublicAPI]
         [JsonIgnore]
         public IWireMockLogger Logger { get; set; } = new WireMockNullLogger();
+
+        /// <inheritdoc cref="IFluentMockServerSettings.FileSystemHandler"/>
+        [PublicAPI]
+        [JsonIgnore]
+        public IFileSystemHandler FileSystemHandler { get; set; } = new LocalFileSystemHandler();
     }
 }

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -1,5 +1,6 @@
 using System;
 using JetBrains.Annotations;
+using WireMock.Handlers;
 using WireMock.Logging;
 
 namespace WireMock.Settings
@@ -105,5 +106,11 @@ namespace WireMock.Settings
         /// </summary>
         [PublicAPI]
         IWireMockLogger Logger { get; set; }
+
+        /// <summary>
+        /// Handler to interact with the file system to read and write static mapping files.
+        /// </summary>
+        [PublicAPI]
+        IFileSystemHandler FileSystemHandler { get; set; }
     }
 }

src/WireMock.Net/Transformers/HandleBarsHelpers.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using HandlebarsDotNet;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WireMock.Validation;
+
+namespace WireMock.Transformers
+{
+    internal static class HandlebarsHelpers
+    {
+        public static void Register()
+        {
+            Handlebars.RegisterHelper("JsonPath.SelectToken", (writer, context, arguments) =>
+            {
+                (JObject valueToProcess, string jsonpath) = Parse(arguments);
+
+                JToken result = null;
+                try
+                {
+                    result = valueToProcess.SelectToken(jsonpath);
+                }
+                catch (JsonException)
+                {
+                    // Ignore JsonException and return
+                    return;
+                }
+
+                if (result != null)
+                {
+                    writer.WriteSafeString(result);
+                }
+            });
+
+            Handlebars.RegisterHelper("JsonPath.SelectTokens", (writer, options, context, arguments) =>
+            {
+                (JObject valueToProcess, string jsonpath) = Parse(arguments);
+
+                IEnumerable<JToken> values = null;
+                try
+                {
+                    values = valueToProcess.SelectTokens(jsonpath);
+                }
+                catch (JsonException)
+                {
+                    // Ignore JsonException and return
+                    return;
+                }
+
+                if (values == null)
+                {
+                    return;
+                }
+
+                int id = 0;
+                foreach (JToken value in values)
+                {
+                    options.Template(writer, new { id, value });
+                    id++;
+                }
+            });
+        }
+
+        private static (JObject valueToProcess, string jsonpath) Parse(object[] arguments)
+        {
+            Check.Condition(arguments, args => args.Length == 2, nameof(arguments));
+            Check.NotNull(arguments[0], "arguments[0]");
+            Check.NotNullOrEmpty(arguments[1] as string, "arguments[1]");
+
+            JObject valueToProcess;
+
+            switch (arguments[0])
+            {
+                case string jsonAsString:
+                    valueToProcess = JObject.Parse(jsonAsString);
+                    break;
+
+                case JObject jsonAsJObject:
+                    valueToProcess = jsonAsJObject;
+                    break;
+
+                default:
+                    throw new NotSupportedException($"The value '{arguments[0]}' with type {arguments[0].GetType()} cannot be used in Handlebars JsonPath.");
+            }
+
+            return (valueToProcess, arguments[1] as string);
+        }
+    }
+}

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -1,13 +1,20 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using HandlebarsDotNet;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using WireMock.Util;
 
 namespace WireMock.Transformers
 {
     internal static class ResponseMessageTransformer
     {
+        static ResponseMessageTransformer()
+        {
+            HandlebarsHelpers.Register();
+        }
+
         public static ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original)
         {
             bool bodyIsJson = original.BodyAsJson != null;
@@ -20,21 +27,13 @@ namespace WireMock.Transformers
 
             var template = new { request = requestMessage };
 
-            // Body
-            Formatting formatting = original.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
-            string body = bodyIsJson ? JsonConvert.SerializeObject(original.BodyAsJson, formatting) : original.Body;
-            if (body != null)
+            if (!bodyIsJson)
             {
-                var templateBody = Handlebars.Compile(body);
-
-                if (!bodyIsJson)
-                {
-                    responseMessage.Body = templateBody(template);
-                }
-                else
-                {
-                    responseMessage.BodyAsJson = JsonConvert.DeserializeObject(templateBody(template));
-                }
+                TransformBodyAsString(template, original, responseMessage);
+            }
+            else
+            {
+                TransformBodyAsJson(template, original, responseMessage);
             }
 
             // Headers
@@ -54,5 +53,83 @@ namespace WireMock.Transformers
 
             return responseMessage;
         }
+
+        private static void TransformBodyAsJson(object template, ResponseMessage original, ResponseMessage responseMessage)
+        {
+            JToken jToken;
+            switch (original.BodyAsJson)
+            {
+                case JObject bodyAsJObject:
+                    jToken = bodyAsJObject;
+                    break;
+
+                case Array bodyAsArray:
+                    jToken = JArray.FromObject(bodyAsArray);
+                    break;
+
+                default:
+                    jToken = JObject.FromObject(original.BodyAsJson);
+                    break;
+            }
+
+            WalkNode(jToken, template);
+
+            responseMessage.BodyAsJson = jToken;
+        }
+
+        private static void WalkNode(JToken node, object template)
+        {
+            if (node.Type == JTokenType.Object)
+            {
+                // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
+                foreach (JProperty child in node.Children<JProperty>().ToArray())
+                {
+                    WalkNode(child.Value, template);
+                }
+            }
+            else if (node.Type == JTokenType.Array)
+            {
+                // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
+                foreach (JToken child in node.Children().ToArray())
+                {
+                    WalkNode(child, template);
+                }
+            }
+            else if (node.Type == JTokenType.String)
+            {
+                // In case of string, try to transform the value.
+                string stringValue = node.Value<string>();
+                if (string.IsNullOrEmpty(stringValue))
+                {
+                    return;
+                }
+
+                var templateForStringValue = Handlebars.Compile(stringValue);
+                string transformedString = templateForStringValue(template);
+                if (!string.Equals(stringValue, transformedString))
+                {
+                    JToken value;
+                    try
+                    {
+                        // Try to convert this string into a real JsonObject
+                        value = JToken.Parse(transformedString);
+                    }
+                    catch (JsonException)
+                    {
+                        // Ignore JsonException and just convert to JToken
+                        value = transformedString;
+                    }
+
+                    node.Replace(value);
+                }
+            }
+        }
+
+        private static void TransformBodyAsString(object template, ResponseMessage original, ResponseMessage responseMessage)
+        {
+            var templateBody = Handlebars.Compile(original.Body);
+
+            responseMessage.Body = templateBody(template);
+        }
     }
 }

src/WireMock.Net/Util/BodyParser.cs

@@ -10,6 +10,12 @@ namespace WireMock.Util
 {
     internal static class BodyParser
     {
+        private static readonly string[] JsonContentTypes =
+        {
+            "application/json",
+            "application/vnd.api+json"
+        };
+
         private static readonly string[] TextContentTypes =
         {
             "text/",
@@ -41,7 +47,7 @@ namespace WireMock.Util
         {
             var data = new BodyData();
 
-            if (contentTypeHeaderValue != null && TextContentTypes.Any(t => contentTypeHeaderValue.StartsWith(t, StringComparison.OrdinalIgnoreCase)))
+            if (contentTypeHeaderValue != null && TextContentTypes.Any(text => contentTypeHeaderValue.StartsWith(text, StringComparison.OrdinalIgnoreCase)))
             {
                 try
                 {
@@ -55,7 +61,7 @@ namespace WireMock.Util
                     data.BodyAsBytes = await ReadBytesAsync(stream);
                 }
             }
-            else if (contentTypeHeaderValue != null && contentTypeHeaderValue.StartsWith("application/json", StringComparison.OrdinalIgnoreCase))
+            else if (contentTypeHeaderValue != null && JsonContentTypes.Any(json => contentTypeHeaderValue.StartsWith(json, StringComparison.OrdinalIgnoreCase)))
             {
                 var stringData = await ReadStringAsync(stream);
                 data.BodyAsString = stringData.Item1;

src/WireMock.Net/Util/FileHelper.cs

@@ -1,5 +1,8 @@
 using System.IO;
 using System.Threading;
+using JetBrains.Annotations;
+using WireMock.Handlers;
+using WireMock.Validation;
 
 namespace WireMock.Util
 {
@@ -8,17 +11,19 @@ namespace WireMock.Util
         private const int NumberOfRetries = 3;
         private const int DelayOnRetry = 500;
 
-        public static string ReadAllText(string path)
+        public static string ReadAllTextWithRetryAndDelay([NotNull] IFileSystemHandler filehandler, [NotNull] string path)
         {
+            Check.NotNull(filehandler, nameof(filehandler));
+            Check.NotNullOrEmpty(path, nameof(path));
+
             for (int i = 1; i <= NumberOfRetries; ++i)
             {
                 try
                 {
-                    return File.ReadAllText(path);
+                    return filehandler.ReadMappingFile(path);
                 }
                 catch
                 {
-                    // You may check error code to filter some exceptions, not every error can be recovered.
                     Thread.Sleep(DelayOnRetry);
                 }
             }

src/WireMock.Net/Util/UrlUtils.cs

@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using WireMock.Models;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;

src/WireMock.Net/WireMock.Net.csproj

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Version>1.0.4.5</Version>
+    <Version>1.0.4.14</Version>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net</AssemblyName>
     <PackageId>WireMock.Net</PackageId>
@@ -24,13 +23,17 @@
     <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'">
-    <DefineConstants>NETSTANDARD</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'">
+    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
@@ -41,39 +44,59 @@
     <PackageReference Include="JetBrains.Annotations" Version="11.1.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Handlebars.Net" Version="1.9.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" />
     <PackageReference Include="RestEase" Version="1.4.4" />
     <PackageReference Include="MimeKitLite" Version="2.0.1" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.17" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
+    <PackageReference Include="XPath2" Version="1.0.5.1" />
+    <Reference Include="System.Net.Http.WebRequest" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.3" />
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
     <PackageReference Include="XPath2" Version="1.0.5.1" />
     <Reference Include="System.Net.Http.WebRequest" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.4" />
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
     <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" />
     <PackageReference Include="XPath2" Version="1.0.5.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
     <PackageReference Include="XPath2" Version="1.0.5.1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
+    <PackageReference Include="XPath2" Version="1.0.5.1" />
+  </ItemGroup>
 </Project>

test/WireMock.Net.Tests.old/FluentMockServerTests.cs

@@ -1,291 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using NFluent;
-using NUnit.Framework;
-using WireMock.Matchers;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Server;
-
-namespace WireMock.Net.Tests
-{
-    [TestFixture]
-    [Timeout(5000)]
-    public class FluentMockServerTests
-    {
-        private FluentMockServer _server;
-
-        [Test]
-        public void FluentMockServer_Admin_Mappings_Get()
-        {
-            var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
-            _server = FluentMockServer.Start();
-
-            _server.Given(Request.Create().WithPath("/foo1").UsingGet())
-                .WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(201).WithBody("1"));
-
-            _server.Given(Request.Create().WithPath("/foo2").UsingGet())
-                .RespondWith(Response.Create().WithStatusCode(202).WithBody("2"));
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(2);
-
-            Check.That(mappings.First().RequestMatcher).IsNotNull();
-            Check.That(mappings.First().Provider).IsNotNull();
-            Check.That(mappings.First().Guid).Equals(guid);
-
-            Check.That(mappings[1].Guid).Not.Equals(guid);
-        }
-
-        [Test]
-        public void FluentMockServer_Admin_Mappings_Add_SameGuid()
-        {
-            var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
-            _server = FluentMockServer.Start();
-
-            _server.Given(Request.Create().WithPath("/1").UsingGet())
-                .WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(500));
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(1);
-            Check.That(mappings.First().Guid).Equals(guid);
-
-            _server.Given(Request.Create().WithPath("/2").UsingGet())
-                .WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(500));
-
-            Check.That(mappings).HasSize(1);
-            Check.That(mappings.First().Guid).Equals(guid);
-        }
-
-        [Test]
-        public async Task FluentMockServer_Admin_Mappings_AtPriority()
-        {
-            _server = FluentMockServer.Start();
-
-            // given
-            _server.Given(Request.Create().WithPath("/1").UsingGet())
-                .AtPriority(2)
-                .RespondWith(Response.Create().WithStatusCode(200));
-
-            _server.Given(Request.Create().WithPath("/1").UsingGet())
-                .AtPriority(1)
-                .RespondWith(Response.Create().WithStatusCode(400));
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(2);
-            Check.That(mappings[0].Priority).Equals(2);
-            Check.That(mappings[1].Priority).Equals(1);
-
-            // when
-            var response = await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/1");
-
-            // then
-            Check.That((int)response.StatusCode).IsEqualTo(400);
-        }
-
-        [Test]
-        public async Task FluentMockServer_Admin_Requests_Get()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            // when
-            await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
-
-            // then
-            Check.That(_server.LogEntries).HasSize(1);
-            var requestLogged = _server.LogEntries.First();
-            Check.That(requestLogged.RequestMessage.Method).IsEqualTo("get");
-            Check.That(requestLogged.RequestMessage.BodyAsBytes).IsNull();
-        }
-
-        [Test]
-        public async Task Should_respond_to_request()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            _server
-                .Given(Request.Create()
-                    .WithPath("/foo")
-                    .UsingGet())
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithBody(@"{ msg: ""Hello world!""}"));
-
-            // when
-            var response = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo");
-
-            // then
-            Check.That(response).IsEqualTo(@"{ msg: ""Hello world!""}");
-        }
-
-        [Test]
-        public async Task Should_respond_to_request_bodyAsBase64()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            _server.Given(Request.Create().WithPath("/foo").UsingGet()).RespondWith(Response.Create().WithBodyAsBase64("SGVsbG8gV29ybGQ/"));
-
-            // when
-            var response = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo");
-
-            // then
-            Check.That(response).IsEqualTo("Hello World?");
-        }
-
-        [Test]
-        public async Task Should_respond_404_for_unexpected_request()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            // when
-            var response = await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
-
-            // then
-            Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound);
-            Check.That((int)response.StatusCode).IsEqualTo(404);
-        }
-
-        [Test]
-        public async Task Should_find_a_request_satisfying_a_request_spec()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            // when
-            await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
-            await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/bar");
-
-            // then
-            var result = _server.FindLogEntries(Request.Create().WithPath(new RegexMatcher("^/b.*"))).ToList();
-            Check.That(result).HasSize(1);
-
-            var requestLogged = result.First();
-            Check.That(requestLogged.RequestMessage.Path).IsEqualTo("/bar");
-            Check.That(requestLogged.RequestMessage.Url).IsEqualTo("http://localhost:" + _server.Ports[0] + "/bar");
-        }
-
-        [Test]
-        public async Task Should_reset_requestlogs()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            // when
-            await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
-            _server.ResetLogEntries();
-
-            // then
-            Check.That(_server.LogEntries).IsEmpty();
-        }
-
-        [Test]
-        public void Should_reset_mappings()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            _server
-                .Given(Request.Create()
-                    .WithPath("/foo")
-                    .UsingGet())
-                .RespondWith(Response.Create()
-                    .WithBody(@"{ msg: ""Hello world!""}"));
-
-            // when
-            _server.ResetMappings();
-
-            // then
-            Check.That(_server.Mappings).IsEmpty();
-            Check.ThatAsyncCode(() => new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo"))
-                .ThrowsAny();
-        }
-
-        [Test]
-        public async Task Should_respond_a_redirect_without_body()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            _server
-                .Given(Request.Create()
-                    .WithPath("/foo")
-                    .UsingGet())
-                .RespondWith(Response.Create()
-                    .WithStatusCode(307)
-                    .WithHeader("Location", "/bar"));
-            _server
-                .Given(Request.Create()
-                    .WithPath("/bar")
-                    .UsingGet())
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithBody("REDIRECT SUCCESSFUL"));
-
-            // when
-            var response = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo");
-
-            // then
-            Check.That(response).IsEqualTo("REDIRECT SUCCESSFUL");
-        }
-
-        [Test]
-        public async Task Should_delay_responses_for_a_given_route()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            _server
-                .Given(Request.Create()
-                    .WithPath("/*"))
-                .RespondWith(Response.Create()
-                    .WithBody(@"{ msg: ""Hello world!""}")
-                    .WithDelay(TimeSpan.FromMilliseconds(200)));
-
-            // when
-            var watch = new Stopwatch();
-            watch.Start();
-            await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo");
-            watch.Stop();
-
-            // then
-            Check.That(watch.ElapsedMilliseconds).IsGreaterThan(200);
-        }
-
-        [Test]
-        public async Task Should_delay_responses()
-        {
-            // given
-            _server = FluentMockServer.Start();
-            _server.AddGlobalProcessingDelay(TimeSpan.FromMilliseconds(200));
-            _server
-                .Given(Request.Create().WithPath("/*"))
-                .RespondWith(Response.Create().WithBody(@"{ msg: ""Hello world!""}"));
-
-            // when
-            var watch = new Stopwatch();
-            watch.Start();
-            await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo");
-            watch.Stop();
-
-            // then
-            Check.That(watch.ElapsedMilliseconds).IsGreaterThan(200);
-        }
-
-        [TearDown]
-        public void ShutdownServer()
-        {
-            _server.Stop();
-        }
-    }
-}

test/WireMock.Net.Tests.old/Http/TinyHttpServerTests.cs

@@ -1,39 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Net.Http;
-using NFluent;
-using NUnit.Framework;
-using WireMock.Http;
-
-[module:
-    SuppressMessage("StyleCop.CSharp.DocumentationRules", 
-        "SA1600:ElementsMustBeDocumented", 
-        Justification = "Reviewed. Suppression is OK here, as it's a tests class.")]
-[module:
-    SuppressMessage("StyleCop.CSharp.DocumentationRules", 
-        "SA1633:FileMustHaveHeader", 
-        Justification = "Reviewed. Suppression is OK here, as unknown copyright and company.")]
-
-namespace WireMock.Net.Tests.Http
-{
-    [TestFixture]
-    public class TinyHttpServerTests
-    {
-        [Test]
-        public void Should_call_handler_on_request()
-        {
-            // given
-            var port = PortUtil.FindFreeTcpPort();
-            bool called = false;
-            var urlPrefix = "http://localhost:" + port + "/";
-            var server = new TinyHttpServer(ctx => called = true, urlPrefix);
-            server.Start();
-
-            // when
-            var httpClient = new HttpClient();
-            httpClient.GetAsync(urlPrefix).Wait(3000);
-
-            // then
-            Check.That(called).IsTrue();
-        }
-    }
-}

test/WireMock.Net.Tests.old/HttpListenerRequestMapperTests.cs

@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using NFluent;
-using NUnit.Framework;
-using WireMock.Http;
-
-namespace WireMock.Net.Tests
-{
-    [TestFixture]
-    public class HttpListenerRequestMapperTests
-    {
-        private MapperServer _server;
-
-        [SetUp]
-        public void StartListenerServer()
-        {
-            _server = MapperServer.Start();
-        }
-
-        [Test]
-        public async Task Should_map_uri_from_listener_request()
-        {
-            // given
-            var client = new HttpClient();
-
-            // when 
-            await client.GetAsync(MapperServer.UrlPrefix + "toto");
-
-            // then
-            Check.That(MapperServer.LastRequestMessage).IsNotNull();
-            Check.That(MapperServer.LastRequestMessage.Path).IsEqualTo("/toto");
-        }
-
-        [Test]
-        public async Task Should_map_verb_from_listener_request()
-        {
-            // given
-            var client = new HttpClient();
-
-            // when 
-            await client.PutAsync(MapperServer.UrlPrefix, new StringContent("Hello!"));
-
-            // then
-            Check.That(MapperServer.LastRequestMessage).IsNotNull();
-            Check.That(MapperServer.LastRequestMessage.Method).IsEqualTo("put");
-        }
-
-        [Test]
-        public async Task Should_map_body_from_listener_request()
-        {
-            // given
-            var client = new HttpClient();
-
-            // when 
-            await client.PutAsync(MapperServer.UrlPrefix, new StringContent("Hello!"));
-
-            // then
-            Check.That(MapperServer.LastRequestMessage).IsNotNull();
-            Check.That(MapperServer.LastRequestMessage.Body).IsEqualTo("Hello!");
-        }
-
-        [Test]
-        public async Task Should_map_headers_from_listener_request()
-        {
-            // given
-            var client = new HttpClient();
-            client.DefaultRequestHeaders.Add("X-Alex", "1706");
-
-            // when 
-            await client.GetAsync(MapperServer.UrlPrefix);
-
-            // then
-            Check.That(MapperServer.LastRequestMessage).IsNotNull();
-            Check.That(MapperServer.LastRequestMessage.Headers).Not.IsNullOrEmpty();
-            Check.That(MapperServer.LastRequestMessage.Headers.Contains(new KeyValuePair<string, string>("X-Alex", "1706"))).IsTrue();
-        }
-
-        [Test]
-        public async Task Should_map_params_from_listener_request()
-        {
-            // given
-            var client = new HttpClient();
-
-            // when 
-            await client.GetAsync(MapperServer.UrlPrefix + "index.html?id=toto");
-
-            // then
-            Check.That(MapperServer.LastRequestMessage).IsNotNull();
-            Check.That(MapperServer.LastRequestMessage.Path).EndsWith("/index.html");
-            Check.That(MapperServer.LastRequestMessage.GetParameter("id")).HasSize(1);
-        }
-
-        [TearDown]
-        public void StopListenerServer()
-        {
-            _server.Stop();
-        }
-
-        private class MapperServer : TinyHttpServer
-        {
-            private static volatile RequestMessage _lastRequestMessage;
-
-            private MapperServer(Action<HttpListenerContext> httpHandler, string urlPrefix) : base(httpHandler, urlPrefix)
-            {
-            }
-
-            public static RequestMessage LastRequestMessage
-            {
-                get
-                {
-                    return _lastRequestMessage;
-                }
-
-                private set
-                {
-                    _lastRequestMessage = value;
-                }
-            }
-
-            public static string UrlPrefix { get; private set; }
-
-            public new static MapperServer Start()
-            {
-                int port = PortUtil.FindFreeTcpPort();
-                UrlPrefix = "http://localhost:" + port + "/";
-                var server = new MapperServer(
-                    context =>
-                        {
-                            LastRequestMessage = new HttpListenerRequestMapper().Map(context.Request);
-                            context.Response.Close();
-                        }, UrlPrefix);
-                ((TinyHttpServer)server).Start();
-
-                return server;
-            }
-
-            public new void Stop()
-            {
-                base.Stop();
-                LastRequestMessage = null;
-            }
-        }
-    }
-}

test/WireMock.Net.Tests.old/HttpListenerResponseMapperTests.cs

@@ -1,133 +0,0 @@
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using NFluent;
-using NUnit.Framework;
-using WireMock.Http;
-
-namespace WireMock.Net.Tests
-{
-    [TestFixture]
-    public class HttpListenerResponseMapperTests
-    {
-        private TinyHttpServer _server;
-        private Task<HttpResponseMessage> _responseMsgTask;
-
-        [Test]
-        public void Should_map_status_code_from_original_response()
-        {
-            // given
-            var response = new ResponseMessage { StatusCode = 404 };
-            var httpListenerResponse = CreateHttpListenerResponse();
-
-            // when
-            new HttpListenerResponseMapper().Map(response, httpListenerResponse);
-
-            // then
-            Check.That(httpListenerResponse.StatusCode).IsEqualTo(404);
-        }
-
-        [Test]
-        public void Should_map_headers_from_original_response()
-        {
-            // given
-            var response = new ResponseMessage();
-            response.AddHeader("cache-control", "no-cache");
-            var httpListenerResponse = CreateHttpListenerResponse();
-
-            // when
-            new HttpListenerResponseMapper().Map(response, httpListenerResponse);
-
-            // then
-            Check.That(httpListenerResponse.Headers).HasSize(1);
-            Check.That(httpListenerResponse.Headers.Keys).Contains("cache-control");
-            Check.That(httpListenerResponse.Headers.Get("cache-control")).Contains("no-cache");
-        }
-
-        [Test]
-        public void Should_map_body_from_original_response()
-        {
-            // given
-            var response = new ResponseMessage
-            {
-                Body = "Hello !!!"
-            };
-
-            var httpListenerResponse = CreateHttpListenerResponse();
-
-            // when
-            new HttpListenerResponseMapper().Map(response, httpListenerResponse);
-
-            // then
-            var responseMessage = ToResponseMessage(httpListenerResponse);
-            Check.That(responseMessage).IsNotNull();
-
-            var contentTask = responseMessage.Content.ReadAsStringAsync();
-            Check.That(contentTask.Result).IsEqualTo("Hello !!!");
-        }
-
-        [Test]
-        public void Should_map_encoded_body_from_original_response()
-        {
-            // given
-            var response = new ResponseMessage
-            {
-                Body = "Hello !!!",
-                BodyEncoding = Encoding.ASCII
-            };
-
-            var httpListenerResponse = CreateHttpListenerResponse();
-
-            // when
-            new HttpListenerResponseMapper().Map(response, httpListenerResponse);
-
-            // then
-            Check.That(httpListenerResponse.ContentEncoding).Equals(Encoding.ASCII);
-
-            var responseMessage = ToResponseMessage(httpListenerResponse);
-            Check.That(responseMessage).IsNotNull();
-
-            var contentTask = responseMessage.Content.ReadAsStringAsync();
-            Check.That(contentTask.Result).IsEqualTo("Hello !!!");
-        }
-
-        [TearDown]
-        public void StopServer()
-        {
-            _server?.Stop();
-        }
-
-        /// <summary>
-        /// Dirty HACK to get HttpListenerResponse instances
-        /// </summary>
-        /// <returns>
-        /// The <see cref="HttpListenerResponse"/>.
-        /// </returns>
-        public HttpListenerResponse CreateHttpListenerResponse()
-        {
-            var port = PortUtil.FindFreeTcpPort();
-            var urlPrefix = "http://localhost:" + port + "/";
-            var responseReady = new AutoResetEvent(false);
-            HttpListenerResponse response = null;
-            _server = new TinyHttpServer(
-                context =>
-                    {
-                        response = context.Response;
-                        responseReady.Set();
-                    }, urlPrefix);
-            _server.Start();
-            _responseMsgTask = new HttpClient().GetAsync(urlPrefix);
-            responseReady.WaitOne();
-            return response;
-        }
-
-        public HttpResponseMessage ToResponseMessage(HttpListenerResponse listenerResponse)
-        {
-            listenerResponse.Close();
-            _responseMsgTask.Wait();
-            return _responseMsgTask.Result;
-        }
-    }
-}

test/WireMock.Net.Tests.old/RequestMessageTests.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Text;
-using NFluent;
-using NUnit.Framework;
-
-namespace WireMock.Net.Tests
-{
-    [TestFixture]
-    public class RequestMessageTests
-    {
-        [Test]
-        public void Should_handle_empty_query()
-        {
-            // given
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST");
-
-            // then
-            Check.That(request.GetParameter("not_there")).IsNull();
-        }
-
-        [Test]
-        public void Should_parse_query_params()
-        {
-            // given
-            string bodyAsString = "whatever";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost?foo=bar&multi=1&multi=2"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            Check.That(request.GetParameter("foo")).Contains("bar");
-            Check.That(request.GetParameter("multi")).Contains("1");
-            Check.That(request.GetParameter("multi")).Contains("2");
-        }
-    }
-}

test/WireMock.Net.Tests.old/RequestTests.cs

@@ -1,550 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NFluent;
-using NUnit.Framework;
-using WireMock.RequestBuilders;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-
-namespace WireMock.Net.Tests
-{
-    [TestFixture]
-    public class RequestTests
-    {
-        [Test]
-        public void Should_specify_requests_matching_given_path()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_paths()
-        {
-            var requestBuilder = Request.Create().WithPath("/x1", "/x2");
-
-            var request1 = new RequestMessage(new Uri("http://localhost/x1"), "blabla");
-            var request2 = new RequestMessage(new Uri("http://localhost/x2"), "blabla");
-
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(requestBuilder.GetMatchingScore(request1, requestMatchResult)).IsEqualTo(1.0);
-            Check.That(requestBuilder.GetMatchingScore(request2, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_pathFuncs()
-        {
-            // given
-            var spec = Request.Create().WithPath(url => url.EndsWith("/foo"));
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_path_prefix()
-        {
-            // given
-            var spec = Request.Create().WithPath(new RegexMatcher("^/foo"));
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo/bar"), "blabla");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_exclude_requests_not_matching_given_path()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/bar"), "blabla");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_url()
-        {
-            // given
-            var spec = Request.Create().WithUrl("*/foo");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_path_and_method_put()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingPut();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_path_and_method_post()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingPost();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_path_and_method_get()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingGet();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_path_and_method_delete()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingDelete();
-
-            // when
-            string bodyAsString = "whatever";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "Delete", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_path_and_method_head()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingHead();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_exclude_requests_matching_given_path_but_not_http_method()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingPut();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_exclude_requests_matching_given_http_method_but_not_url()
-        {
-            // given
-            var spec = Request.Create().WithPath("/bar").UsingPut();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_path_and_headers()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingAnyVerb().WithHeader("X-toto", "tata");
-
-            // when
-            string bodyAsString = "whatever";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary <string, string> { { "X-toto", "tata" } });
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_exclude_requests_not_matching_given_headers()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithHeader("X-toto", "tatata");
-
-            // when
-            string bodyAsString = "whatever";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary <string, string> { { "X-toto", "tata" } });
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_exclude_requests_not_matching_given_headers_ignorecase()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithHeader("X-toto", "abc", false);
-
-            // when
-            string bodyAsString = "whatever";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary <string, string> { { "X-toto", "ABC" } });
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_header_prefix()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithHeader("X-toto", "tata*");
-
-            // when
-            string bodyAsString = "whatever";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "TaTa" } });
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_cookies()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithCookie("session", "a*");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", null, null, null, null, new Dictionary<string, string> { { "session", "abc" } });
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithBody("Hello world!");
-
-            // when
-            string bodyAsString = "Hello world!";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_ExactMatcher_true()
-        {
-            // given
-            var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new ExactMatcher("cat"));
-
-            // when
-            string bodyAsString = "cat";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_ExactMatcher_multiplePatterns()
-        {
-            // given
-            var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new ExactMatcher("cat", "dog"));
-
-            // when
-            string bodyAsString = "cat";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.5);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_ExactMatcher_false()
-        {
-            // given
-            var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new ExactMatcher("cat"));
-
-            // when
-            string bodyAsString = "caR";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsLessThan(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_SimMetricsMatcher1()
-        {
-            // given
-            var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new SimMetricsMatcher("The cat walks in the street."));
-
-            // when
-            string bodyAsString = "The car drives in the street.";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsLessThan(1.0).And.IsGreaterThan(0.5);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_SimMetricsMatcher2()
-        {
-            // given
-            var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new SimMetricsMatcher("The cat walks in the street."));
-
-            // when
-            string bodyAsString = "Hello";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsLessThan(0.1).And.IsGreaterThan(0.05);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_WildcardMatcher()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingAnyVerb().WithBody(new WildcardMatcher("H*o*"));
-
-            // when
-            string bodyAsString = "Hello world!";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tatata" } });
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_RegexMatcher()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithBody(new RegexMatcher("H.*o"));
-
-            // when
-            string bodyAsString = "Hello world!";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_XPathMatcher_true()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithBody(new XPathMatcher("/todo-list[count(todo-item) = 3]"));
-
-            // when
-            string xmlBodyAsString = @"
-                    <todo-list>
-                        <todo-item id='a1'>abc</todo-item>
-                        <todo-item id='a2'>def</todo-item>
-                        <todo-item id='a3'>xyz</todo-item>
-                    </todo-list>";
-            byte[] body = Encoding.UTF8.GetBytes(xmlBodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, xmlBodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_XPathMatcher_false()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithBody(new XPathMatcher("/todo-list[count(todo-item) = 99]"));
-
-            // when
-            string xmlBodyAsString = @"
-                    <todo-list>
-                        <todo-item id='a1'>abc</todo-item>
-                        <todo-item id='a2'>def</todo-item>
-                        <todo-item id='a3'>xyz</todo-item>
-                    </todo-list>";
-            byte[] body = Encoding.UTF8.GetBytes(xmlBodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, xmlBodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_JsonPathMatcher_true()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"));
-
-            // when
-            string bodyAsString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_body_using_JsonPathMatcher_false()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"));
-
-            // when
-            string bodyAsString = "{ \"things\": { \"name\": \"Wiremock\" } }";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_exclude_requests_not_matching_given_body()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithBody("      Hello world!   ");
-
-            // when
-            string bodyAsString = "xxx";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tatata" } });
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_param()
-        {
-            // given
-            var spec = Request.Create().WithParam("bar", "1", "2");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_paramNoValue()
-        {
-            // given
-            var spec = Request.Create().WithParam("bar");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar"), "PUT");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_specify_requests_matching_given_param_func()
-        {
-            // given
-            var spec = Request.Create().UsingAnyVerb().WithParam(p => p.ContainsKey("bar"));
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Test]
-        public void Should_exclude_requests_not_matching_given_params()
-        {
-            // given
-            var spec = Request.Create().WithParam("bar", "1");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/test=7"), "PUT");
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-    }
-}

test/WireMock.Net.Tests.old/ResponseTests.cs

@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using NFluent;
-using NUnit.Framework;
-using WireMock.ResponseBuilders;
-
-namespace WireMock.Net.Tests
-{
-    [TestFixture]
-    public class ResponseTests
-    {
-        [Test]
-        public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            var response = Response.Create()
-                .WithBody("test {{request.url}} {{request.path}} {{request.method}}")
-                .WithTransformer();
-            
-            // act
-            var responseMessage = await response.ProvideResponse(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test http://localhost/foo /foo post");
-        }
-
-        [Test]
-        public async Task Response_ProvideResponse_Handlebars_Query()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo?a=1&a=2&b=5"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            var response = Response.Create()
-                .WithBody("test keya={{request.query.a}} idx={{request.query.a.[0]}} idx={{request.query.a.[1]}} keyb={{request.query.b}}")
-                .WithTransformer();
-
-            // act
-            var responseMessage = await response.ProvideResponse(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test keya=1 idx=1 idx=2 keyb=5");
-        }
-
-        [Test]
-        public async Task Response_ProvideResponse_Handlebars_Headers()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "Content-Type", "text/plain" } });
-
-            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
-
-            // act
-            var responseMessage = await response.ProvideResponse(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test");
-            Check.That(responseMessage.Headers).Contains(new KeyValuePair<string,string>("x", "text/plain"));
-        }
-
-        [Test]
-        public async Task Response_ProvideResponse_Encoding_Body()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            var response = Response.Create().WithBody("test", Encoding.ASCII);
-
-            // act
-            var responseMessage = await response.ProvideResponse(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test");
-            Check.That(responseMessage.BodyEncoding).Equals(Encoding.ASCII);
-        }
-
-        [Test]
-        public async Task Response_ProvideResponse_Encoding_JsonBody()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
-
-            var response = Response.Create().WithBodyAsJson(new { value = "test" }, Encoding.ASCII);
-
-            // act
-            var responseMessage = await response.ProvideResponse(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("{\"value\":\"test\"}");
-            Check.That(responseMessage.BodyEncoding).Equals(Encoding.ASCII);
-        }
-    }
-}

test/WireMock.Net.Tests.old/WildcardMatcherTest.cs

@@ -1,59 +0,0 @@
-using NUnit.Framework;
-using WireMock.Matchers;
-
-namespace WireMock.Net.Tests
-{
-    [TestFixture]
-    public class WildcardMatcherTest
-    {
-        [Test]
-        public void WildcardMatcher_patterns_positive()
-        {
-            var tests = new[]
-            {
-                new { p = "*", i = "" },
-                new { p = "?", i = " " },
-                new { p = "*", i = "a" },
-                new { p = "*", i = "ab" },
-                new { p = "?", i = "a" },
-                new { p = "*?", i = "abc" },
-                new { p = "?*", i = "abc" },
-                new { p = "abc", i = "abc" },
-                new { p = "abc*", i = "abc" },
-                new { p = "abc*", i = "abcd" },
-                new { p = "*abc*", i = "abc" },
-                new { p = "*a*bc*", i = "abc" },
-                new { p = "*a*b?", i = "aXXXbc" }
-            };
-            foreach (var test in tests)
-            {
-                var matcher = new WildcardMatcher(test.p);
-                Assert.AreEqual(1.0, matcher.IsMatch(test.i), "p = " + test.p + ", i = " + test.i);
-            }
-        }
-
-        [Test]
-        public void WildcardMatcher_patterns_negative()
-        {
-            var tests = new[]
-            {
-                new { p = "*a", i = ""},
-                new { p = "a*", i = ""},
-                new { p = "?", i = ""},
-                new { p = "*b*", i = "a"},
-                new { p = "b*a", i = "ab"},
-                new { p = "??", i = "a"},
-                new { p = "*?", i = ""},
-                new { p = "??*", i = "a"},
-                new { p = "*abc", i = "abX"},
-                new { p = "*abc*", i = "Xbc"},
-                new { p = "*a*bc*", i = "ac"}
-            };
-            foreach (var test in tests)
-            {
-                var matcher = new WildcardMatcher(test.p);
-                Assert.AreEqual(0.0, matcher.IsMatch(test.i), "p = " + test.p + ", i = " + test.i);
-            }
-        }
-    }
-}

test/WireMock.Net.Tests.old/WireMock.Net.Tests.csproj

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D8B56D28-33CE-4BEF-97D4-7DD546E37F25}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WireMock.Net.Tests</RootNamespace>
-    <AssemblyName>WireMock.Net.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NFluent, Version=1.3.1.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SimMetrics.Net, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimMetrics.Net.1.0.1.0\lib\net45\SimMetrics.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WireMock.Net">
-      <HintPath>..\..\src\WireMock.Net\bin\$(Configuration)\net45\WireMock.Net.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FluentMockServerTests.cs" />
-    <Compile Include="HttpListenerRequestMapperTests.cs" />
-    <Compile Include="HttpListenerResponseMapperTests.cs" />
-    <Compile Include="Http\TinyHttpServerTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RequestTests.cs" />
-    <Compile Include="RequestMessageTests.cs" />
-    <Compile Include="ResponseTests.cs" />
-    <Compile Include="WildcardMatcherTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

test/WireMock.Net.Tests.old/packages.config

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Castle.Core" version="3.3.3" targetFramework="net452" />
-  <package id="Moq" version="4.5.30" targetFramework="net452" />
-  <package id="NFluent" version="1.3.1.0" targetFramework="net452" />
-  <package id="NUnit" version="3.6.0" targetFramework="net452" />
-  <package id="SimMetrics.Net" version="1.0.1.0" targetFramework="net452" />
-</packages>

test/WireMock.Net.Tests/ClientTests.cs

@@ -1,50 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using NFluent;
-using RestEase;
-using WireMock.Admin.Mappings;
-using WireMock.Client;
-using WireMock.Server;
-using Xunit;
-
-namespace WireMock.Net.Tests
-{
-    public class ClientTests
-    {
-        [Fact]
-        public async Task Client_IFluentMockServerAdmin_PostMappingAsync()
-        {
-            // Assign
-            var server = FluentMockServer.StartWithAdminInterface();
-            var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
-
-            // Act
-            var model = new MappingModel
-            {
-                Request = new RequestModel
-                {
-                    Path = "/1"
-                },
-                Response = new ResponseModel
-                {
-                    Body = "txt",
-                    StatusCode = 200
-                },
-                Priority = 500,
-                Title = "test"
-            };
-            var result = await api.PostMappingAsync(model);
-
-            // Assert
-            Check.That(result).IsNotNull();
-            Check.That(result.Status).IsNotNull();
-            Check.That(result.Guid).IsNotNull();
-
-            var mapping = server.Mappings.Single(m => m.Priority == 500);
-            Check.That(mapping).IsNotNull();
-            Check.That(mapping.Title).Equals("test");
-
-            server.Stop();
-        }
-    }
-}

test/WireMock.Net.Tests/FluentMockServerAdminRestClientTests.cs

@@ -1,10 +1,11 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using NFluent;
 using RestEase;
 using WireMock.Admin.Mappings;
+using WireMock.Admin.Settings;
 using WireMock.Client;
 using WireMock.Logging;
 using WireMock.Server;
@@ -13,21 +14,92 @@ using Xunit;
 
 namespace WireMock.Net.Tests
 {
-    public class FluentMockServerAdminRestClientTests : IDisposable
+    public class FluentMockServerAdminRestClientTests
     {
-        public void Dispose()
+        [Fact]
+        public async Task IFluentMockServerAdmin_GetSettingsAsync()
         {
-            _server?.Stop();
+            // Assign
+            var server = FluentMockServer.StartWithAdminInterface();
+            var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
+
+            // Act
+            var settings = await api.GetSettingsAsync();
+            Check.That(settings).IsNotNull();
         }
 
-        private FluentMockServer _server;
+        [Fact]
+        public async Task IFluentMockServerAdmin_PostSettingsAsync()
+        {
+            // Assign
+            var server = FluentMockServer.StartWithAdminInterface();
+            var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
+
+            // Act
+            var settings = new SettingsModel();
+            var status = await api.PostSettingsAsync(settings);
+            Check.That(status.Status).Equals("Settings updated");
+        }
+
+        [Fact]
+        public async Task IFluentMockServerAdmin_PutSettingsAsync()
+        {
+            // Assign
+            var server = FluentMockServer.StartWithAdminInterface();
+            var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
+
+            // Act
+            var settings = new SettingsModel();
+            var status = await api.PutSettingsAsync(settings);
+            Check.That(status.Status).Equals("Settings updated");
+        }
+
+        [Fact]
+        public async Task IFluentMockServerAdmin_PostMappingAsync()
+        {
+            // Assign
+            var server = FluentMockServer.StartWithAdminInterface();
+            var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
+
+            // Act
+            var model = new MappingModel
+            {
+                Request = new RequestModel
+                {
+                    Path = "/1"
+                },
+                Response = new ResponseModel
+                {
+                    Body = "txt",
+                    StatusCode = 200
+                },
+                Priority = 500,
+                Title = "test"
+            };
+            var result = await api.PostMappingAsync(model);
+
+            // Assert
+            Check.That(result).IsNotNull();
+            Check.That(result.Status).IsNotNull();
+            Check.That(result.Guid).IsNotNull();
+
+            var mapping = server.Mappings.Single(m => m.Priority == 500);
+            Check.That(mapping).IsNotNull();
+            Check.That(mapping.Title).Equals("test");
+
+            server.Stop();
+        }
 
         [Fact]
         public async Task IFluentMockServerAdmin_FindRequestsAsync()
         {
             // given
-            _server = FluentMockServer.Start(new FluentMockServerSettings { StartAdminInterface = true, Logger = new WireMockNullLogger() });
-            var serverUrl = "http://localhost:" + _server.Ports[0];
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                StartAdminInterface = true,
+                Logger = new WireMockNullLogger()
+            });
+            var serverUrl = "http://localhost:" + server.Ports[0];
             await new HttpClient().GetAsync(serverUrl + "/foo");
             var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
 
@@ -46,8 +118,12 @@ namespace WireMock.Net.Tests
         public async Task IFluentMockServerAdmin_GetRequestsAsync()
         {
             // given
-            _server = FluentMockServer.Start(new FluentMockServerSettings { StartAdminInterface = true, Logger = new WireMockNullLogger() });
-            var serverUrl = "http://localhost:" + _server.Ports[0];
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                StartAdminInterface = true,
+                Logger = new WireMockNullLogger()
+            });
+            var serverUrl = "http://localhost:" + server.Ports[0];
             await new HttpClient().GetAsync(serverUrl + "/foo");
             var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
 
@@ -61,5 +137,75 @@ namespace WireMock.Net.Tests
             Check.That(requestLogged.Request.Body).IsNull();
             Check.That(requestLogged.Request.Path).IsEqualTo("/foo");
         }
+
+        [Fact]
+        public async Task IFluentMockServerAdmin_GetRequestsAsync_JsonApi()
+        {
+            // given
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                StartAdminInterface = true,
+                Logger = new WireMockNullLogger()
+            });
+            string serverUrl = server.Urls[0];
+            string data = "{\"data\":[{\"type\":\"program\",\"attributes\":{\"alias\":\"T000001\",\"title\":\"Title Group Entity\"}}]}";
+            string jsonApiAcceptHeader = "application/vnd.api+json";
+            string jsonApiContentType = "application/vnd.api+json";
+
+            var request = new HttpRequestMessage(HttpMethod.Post, serverUrl);
+            request.Headers.Accept.Clear();
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(jsonApiAcceptHeader));
+            request.Content = new StringContent(data);
+            request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(jsonApiContentType);
+
+            var response = await new HttpClient().SendAsync(request);
+
+            var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
+
+            // when
+            var requests = await api.GetRequestsAsync();
+
+            // then
+            Check.That(requests).HasSize(1);
+            var requestLogged = requests.First();
+            Check.That(requestLogged.Request.Method).IsEqualTo("post");
+            Check.That(requestLogged.Request.Body).IsNotNull();
+            Check.That(requestLogged.Request.Body).Contains("T000001");
+        }
+
+        [Fact]
+        public async Task IFluentMockServerAdmin_GetRequestsAsync_Json()
+        {
+            // given
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                StartAdminInterface = true,
+                Logger = new WireMockNullLogger()
+            });
+            string serverUrl = server.Urls[0];
+            string data = "{\"alias\": \"T000001\"}";
+            string jsonAcceptHeader = "application/json";
+            string jsonApiContentType = "application/json";
+
+            var request = new HttpRequestMessage(HttpMethod.Post, serverUrl);
+            request.Headers.Accept.Clear();
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(jsonAcceptHeader));
+            request.Content = new StringContent(data);
+            request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(jsonApiContentType);
+            var response = await new HttpClient().SendAsync(request);
+
+            var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
+
+            // when
+            var requests = await api.GetRequestsAsync();
+
+            // then
+            Check.That(requests).HasSize(1);
+            var requestLogged = requests.First();
+            Check.That(requestLogged.Request.Method).IsEqualTo("post");
+            Check.That(requestLogged.Request.Body).IsNotNull();
+            Check.That(requestLogged.Request.Body).Contains("T000001");
+        }
     }
+
 }

test/WireMock.Net.Tests/FluentMockServerTests.Admin.cs

@@ -0,0 +1,373 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Moq;
+using Newtonsoft.Json;
+using NFluent;
+using WireMock.Handlers;
+using WireMock.Logging;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public class FluentMockServerAdminTests
+    {
+        // For for AppVeyor + OpenCover
+        private string GetCurrentFolder()
+        {
+            string current = Directory.GetCurrentDirectory();
+            //if (!current.EndsWith("WireMock.Net.Tests"))
+            //    return Path.Combine(current, "test", "WireMock.Net.Tests");
+
+            return current;
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_ResetMappings()
+        {
+            var server = FluentMockServer.Start();
+
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings");
+            server.ReadStaticMappings(folder);
+
+            Check.That(server.Mappings).HasSize(3);
+
+            // Act
+            server.ResetMappings();
+
+            // Assert
+            Check.That(server.Mappings).HasSize(0);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_StartStop()
+        {
+            var server1 = FluentMockServer.Start("http://localhost:9091");
+
+            Check.That(server1.Urls[0]).Equals("http://localhost:9091");
+
+            server1.Stop();
+
+            var server2 = FluentMockServer.Start("http://localhost:9091/");
+
+            Check.That(server2.Urls[0]).Equals("http://localhost:9091/");
+
+            server2.Stop();
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_SaveStaticMappings()
+        {
+            // Assign
+            string guid = "791a3f31-6946-aaaa-8e6f-0237c7441111";
+            var staticMappingHandlerMock = new Mock<IFileSystemHandler>();
+            staticMappingHandlerMock.Setup(m => m.GetMappingFolder()).Returns("folder");
+            staticMappingHandlerMock.Setup(m => m.FolderExists(It.IsAny<string>())).Returns(true);
+            staticMappingHandlerMock.Setup(m => m.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()));
+
+            var _server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                FileSystemHandler = staticMappingHandlerMock.Object
+            });
+
+            _server
+                .Given(Request.Create().WithPath($"/foo_{Guid.NewGuid()}"))
+                .WithGuid(guid)
+                .RespondWith(Response.Create().WithBody("save test"));
+
+            // Act
+            _server.SaveStaticMappings();
+
+            // Assert and Verify
+            staticMappingHandlerMock.Verify(m => m.GetMappingFolder(), Times.Once);
+            staticMappingHandlerMock.Verify(m => m.FolderExists("folder"), Times.Once);
+            staticMappingHandlerMock.Verify(m => m.WriteMappingFile(Path.Combine("folder", guid + ".json"), It.IsAny<string>()), Times.Once);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_ReadStaticMapping_WithNonGuidFilename()
+        {
+            var guid = Guid.Parse("04ee4872-9efd-4770-90d3-88d445265d0d");
+            string title = "documentdb_root_title";
+
+            var _server = FluentMockServer.Start();
+
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", "documentdb_root.json");
+            _server.ReadStaticMappingAndAddOrUpdate(folder);
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(1);
+
+            Check.That(mappings.First().RequestMatcher).IsNotNull();
+            Check.That(mappings.First().Provider).IsNotNull();
+            Check.That(mappings.First().Guid).Equals(guid);
+            Check.That(mappings.First().Title).Equals(title);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_ReadStaticMapping_WithGuidFilename()
+        {
+            string guid = "00000002-ee28-4f29-ae63-1ac9b0802d86";
+
+            var _server = FluentMockServer.Start();
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
+            _server.ReadStaticMappingAndAddOrUpdate(folder);
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(1);
+
+            Check.That(mappings.First().RequestMatcher).IsNotNull();
+            Check.That(mappings.First().Provider).IsNotNull();
+            Check.That(mappings.First().Guid).Equals(Guid.Parse(guid));
+            Check.That(mappings.First().Title).IsNullOrEmpty();
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_ReadStaticMapping_WithResponseBodyFromFile()
+        {
+            string guid = "00000002-ee28-4f29-ae63-1ac9b0802d87";
+
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
+            string json = File.ReadAllText(folder);
+
+            string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "responsebody.json");
+
+            dynamic jsonObj = JsonConvert.DeserializeObject(json);
+            jsonObj["Response"]["BodyAsFile"] = responseBodyFilePath;
+
+            string output = JsonConvert.SerializeObject(jsonObj, Formatting.Indented);
+            File.WriteAllText(folder, output);
+
+            var _server = FluentMockServer.Start();
+            _server.ReadStaticMappingAndAddOrUpdate(folder);
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(1);
+
+            Check.That(mappings.First().RequestMatcher).IsNotNull();
+            Check.That(mappings.First().Provider).IsNotNull();
+            Check.That(mappings.First().Guid).Equals(Guid.Parse(guid));
+            Check.That(mappings.First().Title).IsNullOrEmpty();
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_ReadStaticMappings_FolderExistsIsTrue()
+        {
+            // Assign
+            var staticMappingHandlerMock = new Mock<IFileSystemHandler>();
+            staticMappingHandlerMock.Setup(m => m.GetMappingFolder()).Returns("folder");
+            staticMappingHandlerMock.Setup(m => m.FolderExists(It.IsAny<string>())).Returns(true);
+            staticMappingHandlerMock.Setup(m => m.EnumerateFiles(It.IsAny<string>())).Returns(new string[0]);
+
+            var _server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                FileSystemHandler = staticMappingHandlerMock.Object
+            });
+
+            // Act
+            _server.ReadStaticMappings();
+
+            // Assert and Verify
+            staticMappingHandlerMock.Verify(m => m.GetMappingFolder(), Times.Once);
+            staticMappingHandlerMock.Verify(m => m.FolderExists("folder"), Times.Once);
+            staticMappingHandlerMock.Verify(m => m.EnumerateFiles("folder"), Times.Once);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_ReadStaticMappingAndAddOrUpdate()
+        {
+            // Assign
+            string mapping = "{\"Request\": {\"Path\": {\"Matchers\": [{\"Name\": \"WildcardMatcher\",\"Pattern\": \"/static/mapping\"}]},\"Methods\": [\"get\"]},\"Response\": {\"BodyAsJson\": { \"body\": \"static mapping\" }}}";
+            var _staticMappingHandlerMock = new Mock<IFileSystemHandler>();
+            _staticMappingHandlerMock.Setup(m => m.ReadMappingFile(It.IsAny<string>())).Returns(mapping);
+
+            var _server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                FileSystemHandler = _staticMappingHandlerMock.Object
+            });
+
+            // Act
+            _server.ReadStaticMappingAndAddOrUpdate(@"c:\test.json");
+
+            // Assert and Verify
+            _staticMappingHandlerMock.Verify(m => m.ReadMappingFile(@"c:\test.json"), Times.Once);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_ReadStaticMappings()
+        {
+            var _server = FluentMockServer.Start();
+
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings");
+            _server.ReadStaticMappings(folder);
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(3);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_ReadStaticMappings_FolderDoesNotExist()
+        {
+            // Assign
+            var loggerMock = new Mock<IWireMockLogger>();
+            loggerMock.Setup(l => l.Info(It.IsAny<string>(), It.IsAny<object[]>()));
+            var settings = new FluentMockServerSettings
+            {
+                Logger = loggerMock.Object
+            };
+            var _server = FluentMockServer.Start(settings);
+
+            // Act
+            _server.ReadStaticMappings(Guid.NewGuid().ToString());
+
+            // Assert
+            Check.That(_server.Mappings).HasSize(0);
+
+            // Verify
+            loggerMock.Verify(l => l.Info(It.Is<string>(s => s.StartsWith("The Static Mapping folder")), It.IsAny<object[]>()), Times.Once);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_Mappings_WithGuid_Get()
+        {
+            Guid guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
+            var _server = FluentMockServer.Start();
+
+            _server.Given(Request.Create().WithPath("/foo1").UsingGet()).WithGuid(guid)
+                .RespondWith(Response.Create().WithStatusCode(201).WithBody("1"));
+
+            _server.Given(Request.Create().WithPath("/foo2").UsingGet())
+                .RespondWith(Response.Create().WithStatusCode(202).WithBody("2"));
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(2);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_Mappings_WithGuidAsString_Get()
+        {
+            string guid = "90356dba-b36c-469a-a17e-669cd84f1f05";
+            var _server = FluentMockServer.Start();
+
+            _server.Given(Request.Create().WithPath("/foo100").UsingGet()).WithGuid(guid)
+                .RespondWith(Response.Create().WithStatusCode(201).WithBody("1"));
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(1);
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_Mappings_Add_SameGuid()
+        {
+            var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
+            var _server = FluentMockServer.Start();
+
+            var response1 = Response.Create().WithStatusCode(500);
+            _server.Given(Request.Create().UsingGet())
+                .WithGuid(guid)
+                .RespondWith(response1);
+
+            var mappings1 = _server.Mappings.ToArray();
+            Check.That(mappings1).HasSize(1);
+            Check.That(mappings1.First().Guid).Equals(guid);
+
+            var response2 = Response.Create().WithStatusCode(400);
+            _server.Given(Request.Create().WithPath("/2").UsingGet())
+                .WithGuid(guid)
+                .RespondWith(response2);
+
+            var mappings2 = _server.Mappings.ToArray();
+            Check.That(mappings2).HasSize(1);
+            Check.That(mappings2.First().Guid).Equals(guid);
+            Check.That(mappings2.First().Provider).Equals(response2);
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Admin_Mappings_AtPriority()
+        {
+            var _server = FluentMockServer.Start();
+
+            // given
+            _server.Given(Request.Create().WithPath("/1").UsingGet())
+                .AtPriority(2)
+                .RespondWith(Response.Create().WithStatusCode(200));
+
+            _server.Given(Request.Create().WithPath("/1").UsingGet())
+                .AtPriority(1)
+                .RespondWith(Response.Create().WithStatusCode(400));
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(2);
+
+            // when
+            var response = await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/1");
+
+            // then
+            Check.That((int)response.StatusCode).IsEqualTo(400);
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Admin_Requests_Get()
+        {
+            // given
+            var _server = FluentMockServer.Start();
+
+            // when
+            await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
+
+            // then
+            Check.That(_server.LogEntries).HasSize(1);
+            var requestLogged = _server.LogEntries.First();
+            Check.That(requestLogged.RequestMessage.Method).IsEqualTo("get");
+            Check.That(requestLogged.RequestMessage.BodyAsBytes).IsNull();
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Admin_Logging_SetMaxRequestLogCount()
+        {
+            // Assign
+            var client = new HttpClient();
+            // Act
+            var _server = FluentMockServer.Start();
+            _server.SetMaxRequestLogCount(2);
+
+            await client.GetAsync("http://localhost:" + _server.Ports[0] + "/foo1");
+            await client.GetAsync("http://localhost:" + _server.Ports[0] + "/foo2");
+            await client.GetAsync("http://localhost:" + _server.Ports[0] + "/foo3");
+
+            // Assert
+            Check.That(_server.LogEntries).HasSize(2);
+
+            var requestLoggedA = _server.LogEntries.First();
+            Check.That(requestLoggedA.RequestMessage.Path).EndsWith("/foo2");
+
+            var requestLoggedB = _server.LogEntries.Last();
+            Check.That(requestLoggedB.RequestMessage.Path).EndsWith("/foo3");
+        }
+
+        [Fact]
+        public void FluentMockServer_Admin_WatchStaticMappings()
+        {
+            // Assign
+            var fileMock = new Mock<IFileSystemHandler>();
+            var settings = new FluentMockServerSettings
+            {
+                FileSystemHandler = fileMock.Object
+            };
+            var _server = FluentMockServer.Start(settings);
+
+            // Act
+            _server.WatchStaticMappings();
+
+            // Verify
+            fileMock.Verify(f => f.GetMappingFolder(), Times.Once);
+            fileMock.Verify(f => f.FolderExists(It.IsAny<string>()), Times.Once);
+        }
+    }
+}

test/WireMock.Net.Tests/FluentMockServerTests.Proxy.cs

@@ -1,10 +1,10 @@
-using System;
+using NFluent;
+using System;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using NFluent;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -13,52 +13,60 @@ using Xunit;
 
 namespace WireMock.Net.Tests
 {
-    public partial class FluentMockServerTests
+    public class FluentMockServerProxyTests
     {
-        private FluentMockServer _serverForProxyForwarding;
-
+#if NET452
         [Fact]
         public async Task FluentMockServer_Proxy_Should_proxy_responses()
         {
-            // given
-            _server = FluentMockServer.Start();
-            _server
-                .Given(Request.Create().WithPath("/*"))
+            // Assign
+            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            var server = FluentMockServer.Start();
+            server
+                .Given(Request.Create().WithPath(path))
                 .RespondWith(Response.Create().WithProxy("http://www.google.com"));
 
-            // when
-            var result = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/search?q=test");
+            // Act
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri($"{server.Urls[0]}{path}")
+            };
+            var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
+            var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+            string content = await response.Content.ReadAsStringAsync();
 
-            // then
-            Check.That(_server.Mappings).HasSize(1);
-            Check.That(result).Contains("google");
+            // Assert
+            Check.That(server.Mappings).HasSize(1);
+            Check.That(content).Contains("google");
         }
 
         [Fact]
         public async Task FluentMockServer_Proxy_Should_preserve_content_header_in_proxied_request()
         {
-            // given
-            _serverForProxyForwarding = FluentMockServer.Start();
-            _serverForProxyForwarding
-                .Given(Request.Create().WithPath("/*"))
+            // Assign
+            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            var serverForProxyForwarding = FluentMockServer.Start();
+            serverForProxyForwarding
+                .Given(Request.Create().WithPath(path))
                 .RespondWith(Response.Create());
 
             var settings = new FluentMockServerSettings
             {
                 ProxyAndRecordSettings = new ProxyAndRecordSettings
                 {
-                    Url = _serverForProxyForwarding.Urls[0],
+                    Url = serverForProxyForwarding.Urls[0],
                     SaveMapping = true,
                     SaveMappingToFile = false
                 }
             };
-            _server = FluentMockServer.Start(settings);
+            var server = FluentMockServer.Start(settings);
 
             // when
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Post,
-                RequestUri = new Uri(_server.Urls[0]),
+                RequestUri = new Uri($"{server.Urls[0]}{path}"),
                 Content = new StringContent("stringContent")
             };
             requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
@@ -66,14 +74,14 @@ namespace WireMock.Net.Tests
             await new HttpClient().SendAsync(requestMessage);
 
             // then
-            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
             Check.That(receivedRequest.Body).IsEqualTo("stringContent");
             Check.That(receivedRequest.Headers).ContainsKey("Content-Type");
             Check.That(receivedRequest.Headers["Content-Type"].First()).Contains("text/plain");
             Check.That(receivedRequest.Headers).ContainsKey("bbb");
 
             // check that new proxied mapping is added
-            Check.That(_server.Mappings).HasSize(2);
+            Check.That(server.Mappings).HasSize(2);
 
             //var newMapping = _server.Mappings.First(m => m.Guid != guid);
             //var matcher = ((Request)newMapping.RequestMatcher).GetRequestMessageMatchers<RequestMessageHeaderMatcher>().FirstOrDefault(m => m.Name == "bbb");
@@ -84,31 +92,29 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Proxy_Should_exclude_blacklisted_content_header_in_mapping()
         {
             // given
-            _serverForProxyForwarding = FluentMockServer.Start();
-            _serverForProxyForwarding
-                .Given(Request.Create().WithPath("/*"))
+            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            var serverForProxyForwarding = FluentMockServer.Start();
+            serverForProxyForwarding
+                .Given(Request.Create().WithPath(path))
                 .RespondWith(Response.Create());
 
             var settings = new FluentMockServerSettings
             {
                 ProxyAndRecordSettings = new ProxyAndRecordSettings
                 {
-                    Url = _serverForProxyForwarding.Urls[0],
+                    Url = serverForProxyForwarding.Urls[0],
                     SaveMapping = true,
                     SaveMappingToFile = false,
                     BlackListedHeaders = new[] { "blacklisted" }
                 }
             };
-            _server = FluentMockServer.Start(settings);
-            //_server
-            //    .Given(Request.Create().WithPath("/*"))
-            //    .RespondWith(Response.Create());
+            var server = FluentMockServer.Start(settings);
 
             // when
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Post,
-                RequestUri = new Uri(_server.Urls[0]),
+                RequestUri = new Uri($"{server.Urls[0]}{path}"),
                 Content = new StringContent("stringContent")
             };
             requestMessage.Headers.Add("blacklisted", "test");
@@ -116,7 +122,7 @@ namespace WireMock.Net.Tests
             await new HttpClient().SendAsync(requestMessage);
 
             // then
-            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
             Check.That(receivedRequest.Headers).Not.ContainsKey("bbb");
             Check.That(receivedRequest.Headers).ContainsKey("ok");
 
@@ -128,29 +134,30 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task FluentMockServer_Proxy_Should_preserve_content_header_in_proxied_request_with_empty_content()
         {
-            // given
-            _serverForProxyForwarding = FluentMockServer.Start();
-            _serverForProxyForwarding
-                .Given(Request.Create().WithPath("/*"))
+            // Assign
+            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            var serverForProxyForwarding = FluentMockServer.Start();
+            serverForProxyForwarding
+                .Given(Request.Create().WithPath(path))
                 .RespondWith(Response.Create());
 
-            _server = FluentMockServer.Start();
-            _server
+            var server = FluentMockServer.Start();
+            server
                 .Given(Request.Create().WithPath("/*"))
-                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+                .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0]));
 
-            // when
+            // Act
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Post,
-                RequestUri = new Uri(_server.Urls[0]),
+                RequestUri = new Uri($"{server.Urls[0]}{path}"),
                 Content = new StringContent("")
             };
             requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
             await new HttpClient().SendAsync(requestMessage);
 
-            // then
-            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            // Assert
+            var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
             Check.That(receivedRequest.Body).IsEqualTo("");
             Check.That(receivedRequest.Headers).ContainsKey("Content-Type");
             Check.That(receivedRequest.Headers["Content-Type"].First()).Contains("text/plain");
@@ -159,28 +166,29 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task FluentMockServer_Proxy_Should_preserve_content_header_in_proxied_response()
         {
-            // given
-            _serverForProxyForwarding = FluentMockServer.Start();
-            _serverForProxyForwarding
-                .Given(Request.Create().WithPath("/*"))
+            // Assign
+            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            var serverForProxyForwarding = FluentMockServer.Start();
+            serverForProxyForwarding
+                .Given(Request.Create().WithPath(path))
                 .RespondWith(Response.Create()
                     .WithBody("body")
                     .WithHeader("Content-Type", "text/plain"));
 
-            _server = FluentMockServer.Start();
-            _server
-                .Given(Request.Create().WithPath("/*"))
-                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+            var server = FluentMockServer.Start();
+            server
+                .Given(Request.Create().WithPath(path))
+                .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0]));
 
-            // when
+            // Act
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
-                RequestUri = new Uri(_server.Urls[0])
+                RequestUri = new Uri($"{server.Urls[0]}{path}")
             };
             var response = await new HttpClient().SendAsync(requestMessage);
 
-            // then
+            // Assert
             Check.That(await response.Content.ReadAsStringAsync()).IsEqualTo("body");
             Check.That(response.Content.Headers.Contains("Content-Type")).IsTrue();
             Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain");
@@ -190,49 +198,52 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Proxy_Should_change_absolute_location_header_in_proxied_response()
         {
             // Assign
+            string path = $"/prx_{Guid.NewGuid().ToString()}";
             var settings = new FluentMockServerSettings { AllowPartialMapping = false };
-            _serverForProxyForwarding = FluentMockServer.Start(settings);
-            _serverForProxyForwarding
-                .Given(Request.Create().WithPath("/*"))
+
+            var serverForProxyForwarding = FluentMockServer.Start(settings);
+            serverForProxyForwarding
+                .Given(Request.Create().WithPath(path))
                 .RespondWith(Response.Create()
                     .WithStatusCode(HttpStatusCode.Redirect)
-                    .WithHeader("Location", _serverForProxyForwarding.Urls[0] + "testpath"));
+                    .WithHeader("Location", "/testpath"));
 
-            _server = FluentMockServer.Start(settings);
-            _server
-                .Given(Request.Create().WithPath("/prx"))
-                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+            var server = FluentMockServer.Start(settings);
+            server
+                .Given(Request.Create().WithPath(path).UsingAnyMethod())
+                .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0]));
 
             // Act
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
-                RequestUri = new Uri(_server.Urls[0] + "/prx")
+                RequestUri = new Uri($"{server.Urls[0]}{path}")
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
             var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
 
             // Assert
             Check.That(response.Headers.Contains("Location")).IsTrue();
-            Check.That(response.Headers.GetValues("Location")).ContainsExactly(_server.Urls[0] + "testpath");
+            Check.That(response.Headers.GetValues("Location")).ContainsExactly("/testpath");
         }
 
         [Fact]
         public async Task FluentMockServer_Proxy_Should_preserve_cookie_header_in_proxied_request()
         {
-            // given
-            _serverForProxyForwarding = FluentMockServer.Start();
-            _serverForProxyForwarding
-                .Given(Request.Create().WithPath("/*"))
+            // Assign
+            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            var serverForProxyForwarding = FluentMockServer.Start();
+            serverForProxyForwarding
+                .Given(Request.Create().WithPath(path))
                 .RespondWith(Response.Create());
 
-            _server = FluentMockServer.Start();
-            _server
-                .Given(Request.Create().WithPath("/*"))
-                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+            var server = FluentMockServer.Start();
+            server
+                .Given(Request.Create().WithPath(path))
+                .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0]));
 
-            // when
-            var requestUri = new Uri(_server.Urls[0]);
+            // Act
+            var requestUri = new Uri($"{server.Urls[0]}{path}");
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
@@ -243,7 +254,7 @@ namespace WireMock.Net.Tests
             await new HttpClient(clientHandler).SendAsync(requestMessage);
 
             // then
-            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
             Check.That(receivedRequest.Cookies).IsNotNull();
             Check.That(receivedRequest.Cookies).ContainsPair("name", "value");
         }
@@ -252,23 +263,24 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Proxy_Should_set_BodyAsJson_in_proxied_response()
         {
             // Assign
-            _serverForProxyForwarding = FluentMockServer.Start();
-            _serverForProxyForwarding
-                .Given(Request.Create().WithPath("/*"))
+            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            var serverForProxyForwarding = FluentMockServer.Start();
+            serverForProxyForwarding
+                .Given(Request.Create().WithPath(path))
                 .RespondWith(Response.Create()
                     .WithBodyAsJson(new { i = 42 })
                     .WithHeader("Content-Type", "application/json; charset=utf-8"));
 
-            _server = FluentMockServer.Start();
-            _server
-                .Given(Request.Create().WithPath("/*"))
-                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+            var server = FluentMockServer.Start();
+            server
+                .Given(Request.Create().WithPath(path))
+                .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0]));
 
             // Act
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
-                RequestUri = new Uri(_server.Urls[0])
+                RequestUri = new Uri($"{server.Urls[0]}{path}")
             };
             var response = await new HttpClient().SendAsync(requestMessage);
 
@@ -277,5 +289,7 @@ namespace WireMock.Net.Tests
             Check.That(content).IsEqualTo("{\"i\":42}");
             Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
         }
+
+#endif
     }
 }

test/WireMock.Net.Tests/FluentMockServerTests.cs

@@ -1,231 +1,36 @@
-using System;
+using NFluent;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using NFluent;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using Xunit;
-using Newtonsoft.Json;
 
 namespace WireMock.Net.Tests
 {
-    public partial class FluentMockServerTests : IDisposable
+    public class FluentMockServerTests
     {
-        private FluentMockServer _server;
         private static string jsonRequestMessage = @"{ ""message"" : ""Hello server"" }";
 
-        // For for AppVeyor + OpenCover
-        private string GetCurrentFolder()
-        {
-            string current = Directory.GetCurrentDirectory();
-            //if (!current.EndsWith("WireMock.Net.Tests"))
-            //    return Path.Combine(current, "test", "WireMock.Net.Tests");
-
-            return current;
-        }
-
-        [Fact]
-        public void FluentMockServer_StartStop()
-        {
-            var server1 = FluentMockServer.Start("http://localhost:9091/");
-            server1.Stop();
-
-            var server2 = FluentMockServer.Start("http://localhost:9091/");
-            server2.Stop();
-        }
-
-        [Fact]
-        public void FluentMockServer_ReadStaticMapping_WithNonGuidFilename()
-        {
-            var guid = Guid.Parse("04ee4872-9efd-4770-90d3-88d445265d0d");
-            string title = "documentdb_root_title";
-
-            _server = FluentMockServer.Start();
-
-            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", "documentdb_root.json");
-            _server.ReadStaticMappingAndAddOrUpdate(folder);
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(1);
-
-            Check.That(mappings.First().RequestMatcher).IsNotNull();
-            Check.That(mappings.First().Provider).IsNotNull();
-            Check.That(mappings.First().Guid).Equals(guid);
-            Check.That(mappings.First().Title).Equals(title);
-        }
-
-        [Fact]
-        public void FluentMockServer_ReadStaticMapping_WithGuidFilename()
-        {
-            string guid = "00000002-ee28-4f29-ae63-1ac9b0802d86";
-
-            _server = FluentMockServer.Start();
-            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
-            _server.ReadStaticMappingAndAddOrUpdate(folder);
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(1);
-
-            Check.That(mappings.First().RequestMatcher).IsNotNull();
-            Check.That(mappings.First().Provider).IsNotNull();
-            Check.That(mappings.First().Guid).Equals(Guid.Parse(guid));
-            Check.That(mappings.First().Title).IsNullOrEmpty();
-        }
-
-        [Fact]
-        public void FluentMockServer_ReadStaticMapping_WithResponseBodyFromFile()
-        {
-            string guid = "00000002-ee28-4f29-ae63-1ac9b0802d87";
-
-            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
-            string json = File.ReadAllText(folder);
-
-            string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "responsebody.json");
-
-            dynamic jsonObj = JsonConvert.DeserializeObject(json);
-            jsonObj["Response"]["BodyAsFile"] = responseBodyFilePath;
-
-            string output = JsonConvert.SerializeObject(jsonObj, Formatting.Indented);
-            File.WriteAllText(folder, output);
-
-            _server = FluentMockServer.Start();
-            _server.ReadStaticMappingAndAddOrUpdate(folder);
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(1);
-
-            Check.That(mappings.First().RequestMatcher).IsNotNull();
-            Check.That(mappings.First().Provider).IsNotNull();
-            Check.That(mappings.First().Guid).Equals(Guid.Parse(guid));
-            Check.That(mappings.First().Title).IsNullOrEmpty();
-        }
-
-        [Fact]
-        public void FluentMockServer_ReadStaticMappings()
-        {
-            _server = FluentMockServer.Start();
-
-            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings");
-            _server.ReadStaticMappings(folder);
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(3);
-        }
-
-        [Fact]
-        public void FluentMockServer_Admin_Mappings_WithGuid_Get()
-        {
-            Guid guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
-            _server = FluentMockServer.Start();
-
-            _server.Given(Request.Create().WithPath("/foo1").UsingGet()).WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(201).WithBody("1"));
-
-            _server.Given(Request.Create().WithPath("/foo2").UsingGet())
-                .RespondWith(Response.Create().WithStatusCode(202).WithBody("2"));
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(2);
-        }
-
-        [Fact]
-        public void FluentMockServer_Admin_Mappings_WithGuidAsString_Get()
-        {
-            string guid = "90356dba-b36c-469a-a17e-669cd84f1f05";
-            _server = FluentMockServer.Start();
-
-            _server.Given(Request.Create().WithPath("/foo1").UsingGet()).WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(201).WithBody("1"));
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(1);
-        }
-
-        [Fact]
-        public void FluentMockServer_Admin_Mappings_Add_SameGuid()
-        {
-            var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
-            _server = FluentMockServer.Start();
-
-            var response1 = Response.Create().WithStatusCode(500);
-            _server.Given(Request.Create().UsingGet())
-                .WithGuid(guid)
-                .RespondWith(response1);
-
-            var mappings1 = _server.Mappings.ToArray();
-            Check.That(mappings1).HasSize(1);
-            Check.That(mappings1.First().Guid).Equals(guid);
-
-            var response2 = Response.Create().WithStatusCode(400);
-            _server.Given(Request.Create().WithPath("/2").UsingGet())
-                .WithGuid(guid)
-                .RespondWith(response2);
-
-            var mappings2 = _server.Mappings.ToArray();
-            Check.That(mappings2).HasSize(1);
-            Check.That(mappings2.First().Guid).Equals(guid);
-            Check.That(mappings2.First().Provider).Equals(response2);
-        }
-
-        [Fact]
-        public async Task FluentMockServer_Admin_Mappings_AtPriority()
-        {
-            _server = FluentMockServer.Start();
-
-            // given
-            _server.Given(Request.Create().WithPath("/1").UsingGet())
-                .AtPriority(2)
-                .RespondWith(Response.Create().WithStatusCode(200));
-
-            _server.Given(Request.Create().WithPath("/1").UsingGet())
-                .AtPriority(1)
-                .RespondWith(Response.Create().WithStatusCode(400));
-
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(2);
-
-            // when
-            var response = await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/1");
-
-            // then
-            Check.That((int)response.StatusCode).IsEqualTo(400);
-        }
-
-        [Fact]
-        public async Task FluentMockServer_Admin_Requests_Get()
-        {
-            // given
-            _server = FluentMockServer.Start();
-
-            // when
-            await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
-
-            // then
-            Check.That(_server.LogEntries).HasSize(1);
-            var requestLogged = _server.LogEntries.First();
-            Check.That(requestLogged.RequestMessage.Method).IsEqualTo("get");
-            Check.That(requestLogged.RequestMessage.BodyAsBytes).IsNull();
-        }
-
         [Fact]
         public async Task FluentMockServer_Should_respond_to_request_methodPatch()
         {
             // given
-            _server = FluentMockServer.Start();
+            string path = $"/foo_{Guid.NewGuid()}";
+            var _server = FluentMockServer.Start();
 
-            _server.Given(Request.Create().WithPath("/foo").UsingMethod("patch"))
+            _server.Given(Request.Create().WithPath(path).UsingMethod("patch"))
                 .RespondWith(Response.Create().WithBody("hello patch"));
 
             // when
-            var msg = new HttpRequestMessage(new HttpMethod("patch"), new Uri("http://localhost:" + _server.Ports[0] + "/foo"))
+            var msg = new HttpRequestMessage(new HttpMethod("patch"), new Uri("http://localhost:" + _server.Ports[0] + path))
             {
                 Content = new StringContent("{\"data\": {\"attr\":\"value\"}}")
             };
@@ -247,7 +52,7 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_respond_to_request_bodyAsString()
         {
             // given
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             _server
                 .Given(Request.Create()
@@ -268,7 +73,7 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_respond_to_request_BodyAsJson()
         {
             // Assign
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             _server
                 .Given(Request.Create().UsingAnyMethod())
@@ -285,7 +90,7 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_respond_to_request_BodyAsJson_Indented()
         {
             // Assign
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             _server
                 .Given(Request.Create().UsingAnyMethod())
@@ -302,7 +107,7 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_respond_to_request_bodyAsCallback()
         {
             // given
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             _server
                 .Given(Request.Create()
@@ -323,7 +128,7 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_respond_to_request_bodyAsBase64()
         {
             // given
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             _server.Given(Request.Create().WithPath("/foo").UsingGet()).RespondWith(Response.Create().WithBodyFromBase64("SGVsbG8gV29ybGQ/"));
 
@@ -338,13 +143,14 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_respond_to_request_bodyAsBytes()
         {
             // given
-            _server = FluentMockServer.Start();
+            string path = $"/foo_{Guid.NewGuid()}";
+            var _server = FluentMockServer.Start();
 
-            _server.Given(Request.Create().WithPath("/foo").UsingGet()).RespondWith(Response.Create().WithBody(new byte[] { 48, 49 }));
+            _server.Given(Request.Create().WithPath(path).UsingGet()).RespondWith(Response.Create().WithBody(new byte[] { 48, 49 }));
 
             // when
-            var responseAsString = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo");
-            var responseAsBytes = await new HttpClient().GetByteArrayAsync("http://localhost:" + _server.Ports[0] + "/foo");
+            var responseAsString = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + path);
+            var responseAsBytes = await new HttpClient().GetByteArrayAsync("http://localhost:" + _server.Ports[0] + path);
 
             // then
             Check.That(responseAsString).IsEqualTo("01");
@@ -367,17 +173,18 @@ namespace WireMock.Net.Tests
                 new object[] { new JsonPathMatcher("$..[?(@.message == 'Hello server')]"), "text/plain" }
             };
 
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             foreach (var item in validMatchersForHelloServerJsonMessage)
             {
+                string path = $"/foo_{Guid.NewGuid()}";
                 _server
-                    .Given(Request.Create().WithPath("/foo").WithBody((IMatcher)item[0]))
+                    .Given(Request.Create().WithPath(path).WithBody((IMatcher)item[0]))
                     .RespondWith(Response.Create().WithBody("Hello client"));
 
                 // Act
                 var content = new StringContent(jsonRequestMessage, Encoding.UTF8, (string)item[1]);
-                var response = await new HttpClient().PostAsync("http://localhost:" + _server.Ports[0] + "/foo", content);
+                var response = await new HttpClient().PostAsync("http://localhost:" + _server.Ports[0] + path, content);
 
                 // Assert
                 var responseString = await response.Content.ReadAsStringAsync();
@@ -392,10 +199,11 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_respond_404_for_unexpected_request()
         {
             // given
-            _server = FluentMockServer.Start();
+            string path = $"/foo{Guid.NewGuid()}";
+            var _server = FluentMockServer.Start();
 
             // when
-            var response = await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
+            var response = await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + path);
 
             // then
             Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound);
@@ -405,27 +213,28 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task FluentMockServer_Should_find_a_request_satisfying_a_request_spec()
         {
-            // given
-            _server = FluentMockServer.Start();
+            // Assign
+            string path = $"/bar_{Guid.NewGuid()}";
+            var _server = FluentMockServer.Start();
 
             // when
             await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
-            await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/bar");
+            await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + path);
 
             // then
             var result = _server.FindLogEntries(Request.Create().WithPath(new RegexMatcher("^/b.*"))).ToList();
             Check.That(result).HasSize(1);
 
             var requestLogged = result.First();
-            Check.That(requestLogged.RequestMessage.Path).IsEqualTo("/bar");
-            Check.That(requestLogged.RequestMessage.Url).IsEqualTo("http://localhost:" + _server.Ports[0] + "/bar");
+            Check.That(requestLogged.RequestMessage.Path).IsEqualTo(path);
+            Check.That(requestLogged.RequestMessage.Url).IsEqualTo("http://localhost:" + _server.Ports[0] + path);
         }
 
         [Fact]
         public async Task FluentMockServer_Should_reset_requestlogs()
         {
             // given
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             // when
             await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
@@ -439,11 +248,12 @@ namespace WireMock.Net.Tests
         public void FluentMockServer_Should_reset_mappings()
         {
             // given
-            _server = FluentMockServer.Start();
+            string path = $"/foo_{Guid.NewGuid()}";
+            var _server = FluentMockServer.Start();
 
             _server
                 .Given(Request.Create()
-                    .WithPath("/foo")
+                    .WithPath(path)
                     .UsingGet())
                 .RespondWith(Response.Create()
                     .WithBody(@"{ msg: ""Hello world!""}"));
@@ -453,35 +263,38 @@ namespace WireMock.Net.Tests
 
             // then
             Check.That(_server.Mappings).IsEmpty();
-            Check.ThatAsyncCode(() => new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo"))
+            Check.ThatAsyncCode(() => new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + path))
                 .ThrowsAny();
         }
 
         [Fact]
         public async Task FluentMockServer_Should_respond_a_redirect_without_body()
         {
-            // given
-            _server = FluentMockServer.Start();
+            // Assign
+            string path = $"/foo_{Guid.NewGuid()}";
+            string pathToRedirect = $"/bar_{Guid.NewGuid()}";
+
+            var _server = FluentMockServer.Start();
 
             _server
                 .Given(Request.Create()
-                    .WithPath("/foo")
+                    .WithPath(path)
                     .UsingGet())
                 .RespondWith(Response.Create()
                     .WithStatusCode(307)
-                    .WithHeader("Location", "/bar"));
+                    .WithHeader("Location", pathToRedirect));
             _server
                 .Given(Request.Create()
-                    .WithPath("/bar")
+                    .WithPath(pathToRedirect)
                     .UsingGet())
                 .RespondWith(Response.Create()
                     .WithStatusCode(200)
                     .WithBody("REDIRECT SUCCESSFUL"));
 
-            // when
-            var response = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/foo");
+            // Act
+            var response = await new HttpClient().GetStringAsync($"http://localhost:{_server.Ports[0]}{path}");
 
-            // then
+            // Assert
             Check.That(response).IsEqualTo("REDIRECT SUCCESSFUL");
         }
 
@@ -489,7 +302,7 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_delay_responses_for_a_given_route()
         {
             // given
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             _server
                 .Given(Request.Create()
@@ -512,7 +325,7 @@ namespace WireMock.Net.Tests
         public async Task FluentMockServer_Should_delay_responses()
         {
             // given
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
             _server.AddGlobalProcessingDelay(TimeSpan.FromMilliseconds(200));
             _server
                 .Given(Request.Create().WithPath("/*"))
@@ -533,7 +346,7 @@ namespace WireMock.Net.Tests
         //public async Task Should_proxy_responses_with_client_certificate()
         //{
         //    // given
-        //    _server = FluentMockServer.Start();
+        //    var _server = FluentMockServer.Start();
         //    _server
         //        .Given(Request.Create().WithPath("/*"))
         //        .RespondWith(Response.Create().WithProxy("https://server-that-expects-a-client-certificate", @"\\yourclientcertificatecontainingprivatekey.pfx", "yourclientcertificatepassword"));
@@ -545,34 +358,11 @@ namespace WireMock.Net.Tests
         //    Check.That(result).Contains("google");
         //}
 
-        [Fact]
-        public async Task FluentMockServer_Logging_SetMaxRequestLogCount()
-        {
-            // Assign
-            var client = new HttpClient();
-            // Act
-            _server = FluentMockServer.Start();
-            _server.SetMaxRequestLogCount(2);
-
-            await client.GetAsync("http://localhost:" + _server.Ports[0] + "/foo1");
-            await client.GetAsync("http://localhost:" + _server.Ports[0] + "/foo2");
-            await client.GetAsync("http://localhost:" + _server.Ports[0] + "/foo3");
-
-            // Assert
-            Check.That(_server.LogEntries).HasSize(2);
-
-            var requestLoggedA = _server.LogEntries.First();
-            Check.That(requestLoggedA.RequestMessage.Path).EndsWith("/foo2");
-
-            var requestLoggedB = _server.LogEntries.Last();
-            Check.That(requestLoggedB.RequestMessage.Path).EndsWith("/foo3");
-        }
-
         [Fact]
         public async Task FluentMockServer_Should_respond_to_request_callback()
         {
             // Assign
-            _server = FluentMockServer.Start();
+            var _server = FluentMockServer.Start();
 
             _server
                 .Given(Request.Create().WithPath("/foo").UsingGet())
@@ -585,10 +375,25 @@ namespace WireMock.Net.Tests
             Check.That(response).IsEqualTo("/fooBar");
         }
 
-        public void Dispose()
+#if !NET452
+        [Fact]
+        public async Task FluentMockServer_Should_not_exclude_restrictedResponseHeader_for_ASPNETCORE()
         {
-            _server?.Stop();
-            _serverForProxyForwarding?.Stop();
+            // Assign
+            string path = $"/foo_{Guid.NewGuid()}";
+            var _server = FluentMockServer.Start();
+
+            _server
+                .Given(Request.Create().WithPath(path).UsingGet())
+                .RespondWith(Response.Create().WithHeader("Keep-Alive", "k").WithHeader("test", "t"));
+
+            // Act
+            var response = await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + path);
+
+            // Assert
+            Check.That(response.Headers.Contains("test")).IsTrue();
+            Check.That(response.Headers.Contains("Keep-Alive")).IsTrue();
         }
+#endif
     }
-}
+}

test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs

@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+using NFluent;
+using WireMock.Handlers;
+using Xunit;
+
+namespace WireMock.Net.Tests.Handlers
+{
+    public class LocalFileSystemHandlerTests
+    {
+        private LocalFileSystemHandler sut = new LocalFileSystemHandler();
+
+        [Fact]
+        public void LocalFileSystemHandler_GetMappingFolder()
+        {
+            // Act
+            string result = sut.GetMappingFolder();
+
+            // Assert
+            Check.That(result).EndsWith(Path.Combine("__admin", "mappings"));
+        }
+
+        [Fact]
+        public void LocalFileSystemHandler_CreateFolder_Throws()
+        {
+            // Act
+            Check.ThatCode(() => sut.CreateFolder(null)).Throws<ArgumentNullException>();
+        }
+
+        [Fact]
+        public void LocalFileSystemHandler_WriteMappingFile_Throws()
+        {
+            // Act
+            Check.ThatCode(() => sut.WriteMappingFile(null, null)).Throws<ArgumentNullException>();
+        }
+    }
+}

test/WireMock.Net.Tests/MatcherMapperTests.cs

@@ -0,0 +1,97 @@
+using System;
+using NFluent;
+using WireMock.Admin.Mappings;
+using WireMock.Matchers;
+using WireMock.Serialization;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public class MatcherMapperTests
+    {
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_Null()
+        {
+            // Act
+            var result = MatcherMapper.Map((MatcherModel)null);
+
+            // Assert
+            Check.That(result).IsNull();
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_Exception()
+        {
+            // Assign
+            var model = new MatcherModel { Name = "test" };
+
+            // Act and Assert
+            Check.ThatCode(() => MatcherMapper.Map(model)).Throws<NotSupportedException>();
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_LinqMatcher_Pattern()
+        {
+            // Assign
+            var model = new MatcherModel
+            {
+                Name = "LinqMatcher",
+                Pattern = "p"
+            };
+
+            // Act
+            var matcher = MatcherMapper.Map(model) as LinqMatcher;
+
+            // Assert
+            Check.That(matcher).IsNotNull();
+            Check.That(matcher.MatchBehaviour).IsEqualTo(MatchBehaviour.AcceptOnMatch);
+            Check.That(matcher.GetPatterns()).ContainsExactly("p");
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_LinqMatcher_Patterns()
+        {
+            // Assign
+            var model = new MatcherModel
+            {
+                Name = "LinqMatcher",
+                Patterns = new[] { "p1", "p2" }
+            };
+
+            // Act
+            var matcher = MatcherMapper.Map(model) as LinqMatcher;
+
+            // Assert
+            Check.That(matcher).IsNotNull();
+            Check.That(matcher.MatchBehaviour).IsEqualTo(MatchBehaviour.AcceptOnMatch);
+            Check.That(matcher.GetPatterns()).Contains(new[] { "p1", "p2" });
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_IMatcher_Null()
+        {
+            // Act
+            var result = MatcherMapper.Map((IMatcher)null);
+
+            // Assert
+            Check.That(result).IsNull();
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_IMatcher_LinqMatcher_Pattern()
+        {
+            // Assign
+            var matcher = new LinqMatcher(MatchBehaviour.AcceptOnMatch, "p");
+
+            // Act
+            var result = MatcherMapper.Map(matcher);
+
+            // Assert
+            Check.That(result).IsNotNull();
+            Check.That(result.Name).IsEqualTo("LinqMatcher");
+            Check.That(result.IgnoreCase).IsNull();
+            Check.That(result.Pattern).IsEqualTo("p");
+            Check.That(result.Patterns).IsNull();
+        }
+    }
+}