1.0.36.0

* FaultType - wip

* .

* copy fault

* tests

* code-factor

* more tests

* fix tests

* fixed

* remove RANDOM_DATA_THEN_CLOSE

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 1.0.36.0 (26 October 2019)
+- [#360](https://github.com/WireMock-Net/WireMock.Net/pull/360) - Add support for Faults [feature] contributed by [StefH](https://github.com/StefH)
+- [#343](https://github.com/WireMock-Net/WireMock.Net/issues/343) - Feature: Please provide support for Bad responses. [feature]
+
+# 1.0.35.0 (25 October 2019)
+- [#367](https://github.com/WireMock-Net/WireMock.Net/pull/367) - No symbol NuGets [feature] contributed by [StefH](https://github.com/StefH)
+- [#368](https://github.com/WireMock-Net/WireMock.Net/pull/368) - Remove Obsolete annotations [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.0.34.0 (22 October 2019)
+- [#354](https://github.com/WireMock-Net/WireMock.Net/pull/354) - AllowBodyForAllHttpMethods [bug, feature] contributed by [StefH](https://github.com/StefH)
+- [#365](https://github.com/WireMock-Net/WireMock.Net/pull/365) - Bump Microsoft.AspNetCore.All from 2.0.8 to 2.0.9 in /examples/WireMock.Net.WebApplication [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#366](https://github.com/WireMock-Net/WireMock.Net/pull/366) - Update ObsoleteAnnotations [feature] contributed by [StefH](https://github.com/StefH)
+- [#352](https://github.com/WireMock-Net/WireMock.Net/issues/352) - DELETE request drops the body [feature, question]
+
 # 1.0.33.0 (12 October 2019)
 - [#311](https://github.com/WireMock-Net/WireMock.Net/pull/311) - fix jsonpath matcher [bug] contributed by [StefH](https://github.com/StefH)
 - [#324](https://github.com/WireMock-Net/WireMock.Net/pull/324) - Add CSharpCodeMatcher [feature] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.33</VersionPrefix>
+    <VersionPrefix>1.0.36</VersionPrefix>
   </PropertyGroup>
 
   <Choose>

GitHubReleaseNotes.txt

@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes
 
-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid --version 1.0.33.0
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid --version 1.0.36.0

azure-pipelines.yml

@@ -82,4 +82,4 @@ steps:
   inputs:
     command: custom
     custom: nuget
-    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg --source https://www.myget.org/F/wiremock-net/api/v3/index.json --no-service-endpoint --api-key $(MyGetKey)
+    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg --no-symbols --source https://www.myget.org/F/wiremock-net/api/v3/index.json --no-service-endpoint --api-key $(MyGetKey)

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

@@ -11,7 +11,7 @@
 
   <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="Microsoft.AspNetCore.All" Version="2.0.9" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -11,7 +11,6 @@ namespace WireMock.Net.StandAlone
     /// <summary>
     /// The StandAloneApp
     /// </summary>
-    [Obsolete("This class will be removed in version 1.1.0")]
     public static class StandAloneApp
     {
         /// <summary>
@@ -19,7 +18,6 @@ namespace WireMock.Net.StandAlone
         /// </summary>
         /// <param name="settings">The FluentMockServerSettings</param>
         [PublicAPI]
-        [Obsolete("Will be replaced by WireMockServer.Start(settings) in version 1.1.0")]
         public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
         {
             Check.NotNull(settings, nameof(settings));
@@ -37,7 +35,6 @@ namespace WireMock.Net.StandAlone
         /// <param name="args">The commandline arguments</param>
         /// <param name="logger">The logger</param>
         [PublicAPI]
-        [Obsolete("Will be replaced by `var settings = WireMockServerSettingsParser.ParseArguments(args, logger); WireMockServer.Start(settings);` in version 1.1.0")]
         public static FluentMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null)
         {
             Check.NotNull(args, nameof(args));
@@ -56,6 +53,7 @@ namespace WireMock.Net.StandAlone
                 MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
                 RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
                 AllowCSharpCodeMatcher = parser.GetBoolValue("AllowCSharpCodeMatcher"),
+                AllowBodyForAllHttpMethods = parser.GetBoolValue("AllowBodyForAllHttpMethods")
             };
 
             if (logger != null)

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

@@ -11,14 +11,14 @@
     <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
     <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
     <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
-    <DebugType>full</DebugType>
+    <!--<DebugType>full</DebugType>
     <IncludeSource>True</IncludeSource>
-    <IncludeSymbols>True</IncludeSymbols>
+    <IncludeSymbols>True</IncludeSymbols>-->
     <ProjectGuid>{B6269AAC-170A-43D5-8B9A-579DED3D9A95}</ProjectGuid>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

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

@@ -0,0 +1,18 @@
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// Fault Model
+    /// </summary>
+    public class FaultModel
+    {
+        /// <summary>
+        /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE, MALFORMED_RESPONSE_CHUNK or RANDOM_DATA_THEN_CLOSE.
+        /// </summary>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fault percentage.
+        /// </summary>
+        public double? Percentage { get; set; }
+    }
+}

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

@@ -86,5 +86,10 @@ namespace WireMock.Admin.Mappings
         /// The client X509Certificate2 Thumbprint or SubjectName to use.
         /// </summary>
         public string X509Certificate2ThumbprintOrSubjectName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fault.
+        /// </summary>
+        public FaultModel Fault { get; set; }
     }
 }

src/WireMock.Net/Admin/Requests/LogResponseModel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
+using WireMock.ResponseBuilders;
 using WireMock.Util;
 
 namespace WireMock.Admin.Requests
@@ -68,5 +69,15 @@ namespace WireMock.Admin.Requests
         /// The detected body type (detection based on Content-Type).
         /// </summary>
         public BodyType DetectedBodyTypeFromContentType { get; set; }
+
+        /// <summary>
+        /// The FaultType.
+        /// </summary>
+        public string FaultType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Fault percentage.
+        /// </summary>
+        public double? FaultPercentage { get; set; }
     }
 }

src/WireMock.Net/Admin/Settings/SettingsModel.cs

@@ -24,5 +24,10 @@
         /// Gets or sets the MaxRequestLog count.
         /// </summary>
         public int? MaxRequestLogCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets wether to allow a body for all HTTP methods.
+        /// </summary>
+        public bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs

@@ -20,7 +20,7 @@ namespace WireMock.Owin
 
         IStringMatcher AuthorizationMatcher { get; set; }
 
-        bool AllowPartialMapping { get; set; }
+        bool? AllowPartialMapping { get; set; }
 
         ConcurrentDictionary<Guid, IMapping> Mappings { get; }
 
@@ -37,5 +37,7 @@ namespace WireMock.Owin
         Action<IAppBuilder> PostWireMockMiddlewareInit { get; set; }
 
         IFileSystemHandler FileSystemHandler { get; set; }
+
+        bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Owin/Mappers/IOwinRequestMapper.cs

@@ -16,7 +16,8 @@ namespace WireMock.Owin.Mappers
         /// MapAsync IRequest to RequestMessage
         /// </summary>
         /// <param name="request">The OwinRequest/HttpRequest</param>
+        /// <param name="options">The WireMockMiddlewareOptions</param>
         /// <returns>RequestMessage</returns>
-        Task<RequestMessage> MapAsync(IRequest request);
+        Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options);
     }
 }

src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs

@@ -20,7 +20,7 @@ namespace WireMock.Owin.Mappers
     internal class OwinRequestMapper : IOwinRequestMapper
     {
         /// <inheritdoc cref="IOwinRequestMapper.MapAsync"/>
-        public async Task<RequestMessage> MapAsync(IRequest request)
+        public async Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options)
         {
             (UrlDetails urldetails, string clientIP) = ParseRequest(request);
 
@@ -47,7 +47,7 @@ namespace WireMock.Owin.Mappers
             }
 
             BodyData body = null;
-            if (request.Body != null && BodyParser.ShouldParseBody(method))
+            if (request.Body != null && BodyParser.ShouldParseBody(method, options.AllowBodyForAllHttpMethods == true))
             {
                 body = await BodyParser.Parse(request.Body, request.ContentType);
             }

src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs

@@ -4,8 +4,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using RandomDataGenerator.FieldOptions;
+using RandomDataGenerator.Randomizers;
 using WireMock.Handlers;
 using WireMock.Http;
+using WireMock.ResponseBuilders;
 using WireMock.Util;
 using WireMock.Validation;
 #if !USE_ASPNETCORE
@@ -22,6 +25,8 @@ namespace WireMock.Owin.Mappers
     /// </summary>
     public class OwinResponseMapper : IOwinResponseMapper
     {
+        private readonly IRandomizerNumber<double> _randomizerDouble = RandomizerFactory.GetRandomizer(new FieldOptionsDouble { Min = 0, Max = 1 });
+        private readonly IRandomizerBytes _randomizerBytes = RandomizerFactory.GetRandomizer(new FieldOptionsBytes { Min = 100, Max = 200 });
         private readonly IFileSystemHandler _fileSystemHandler;
         private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
 
@@ -53,8 +58,43 @@ namespace WireMock.Owin.Mappers
                 return;
             }
 
-            response.StatusCode = responseMessage.StatusCode;
+            byte[] bytes;
+            switch (responseMessage.FaultType)
+            {
+                case FaultType.EMPTY_RESPONSE:
+                    bytes = IsFault(responseMessage) ? new byte[0] : GetNormalBody(responseMessage);
+                    break;
 
+                case FaultType.MALFORMED_RESPONSE_CHUNK:
+                    bytes = GetNormalBody(responseMessage) ?? new byte[0];
+                    if (IsFault(responseMessage))
+                    {
+                        bytes = bytes.Take(bytes.Length / 2).Union(_randomizerBytes.Generate()).ToArray();
+                    }
+
+                    break;
+
+                default:
+                    bytes = GetNormalBody(responseMessage);
+                    break;
+            }
+
+            response.StatusCode = responseMessage.StatusCode;
+            SetResponseHeaders(responseMessage, response);
+
+            if (bytes != null)
+            {
+                await response.Body.WriteAsync(bytes, 0, bytes.Length);
+            }
+        }
+
+        private bool IsFault(ResponseMessage responseMessage)
+        {
+            return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
+        }
+
+        private byte[] GetNormalBody(ResponseMessage responseMessage)
+        {
             byte[] bytes = null;
             switch (responseMessage.BodyData?.DetectedBodyType)
             {
@@ -63,7 +103,9 @@ namespace WireMock.Owin.Mappers
                     break;
 
                 case BodyType.Json:
-                    Formatting formatting = responseMessage.BodyData.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
+                    Formatting formatting = responseMessage.BodyData.BodyAsJsonIndented == true
+                        ? Formatting.Indented
+                        : Formatting.None;
                     string jsonBody = JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
                     bytes = (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
                     break;
@@ -77,12 +119,7 @@ namespace WireMock.Owin.Mappers
                     break;
             }
 
-            SetResponseHeaders(responseMessage, response);
-
-            if (bytes != null)
-            {
-                await response.Body.WriteAsync(bytes, 0, bytes.Length);
-            }
+            return bytes;
         }
 
         private void SetResponseHeaders(ResponseMessage responseMessage, IResponse response)

src/WireMock.Net/Owin/MappingMatcher.cs

@@ -37,7 +37,7 @@ namespace WireMock.Owin
                 }
             }
 
-            if (_options.AllowPartialMapping)
+            if (_options.AllowPartialMapping == true)
             {
                 var partialMappings = mappings
                     .Where(pm => (pm.Mapping.IsAdminInterface && pm.RequestMatchResult.IsPerfectMatch) || !pm.Mapping.IsAdminInterface)

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -69,7 +69,7 @@ namespace WireMock.Owin
 
         private async Task InvokeInternal(IContext ctx)
         {
-            var request = await _requestMapper.MapAsync(ctx.Request);
+            var request = await _requestMapper.MapAsync(ctx.Request, _options);
 
             bool logRequest = false;
             ResponseMessage response = null;

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -21,7 +21,7 @@ namespace WireMock.Owin
 
         public IStringMatcher AuthorizationMatcher { get; set; }
 
-        public bool AllowPartialMapping { get; set; }
+        public bool? AllowPartialMapping { get; set; }
 
         public ConcurrentDictionary<Guid, IMapping> Mappings { get; } = new ConcurrentDictionary<Guid, IMapping>();
 
@@ -39,5 +39,8 @@ namespace WireMock.Owin
 
         /// <inheritdoc cref="IWireMockMiddlewareOptions.FileSystemHandler"/>
         public IFileSystemHandler FileSystemHandler { get; set; }
+
+        /// <inheritdoc cref="IWireMockMiddlewareOptions.AllowBodyForAllHttpMethods"/>
+        public bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,13 +1,14 @@
 using JetBrains.Annotations;
 using System;
 using WireMock.Matchers;
+using WireMock.Matchers.Request;
 
 namespace WireMock.RequestBuilders
 {
     /// <summary>
     /// The BodyRequestBuilder interface.
     /// </summary>
-    public interface IBodyRequestBuilder
+    public interface IBodyRequestBuilder : IRequestMatcher
     {
         /// <summary>
         /// WithBody: IMatcher

src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs

@@ -1,15 +1,14 @@
-using System;
+using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
-using JetBrains.Annotations;
 using WireMock.Matchers;
-using WireMock.Matchers.Request;
 
 namespace WireMock.RequestBuilders
 {
     /// <summary>
     /// The HeadersAndCookieRequestBuilder interface.
     /// </summary>
-    public interface IHeadersAndCookiesRequestBuilder : IBodyRequestBuilder, IRequestMatcher, IParamsRequestBuilder
+    public interface IHeadersAndCookiesRequestBuilder : IParamsRequestBuilder
     {
         /// <summary>
         /// WithHeader: matching based on name, pattern and matchBehaviour.

src/WireMock.Net/RequestBuilders/IParamsRequestBuilder.cs

@@ -9,7 +9,7 @@ namespace WireMock.RequestBuilders
     /// <summary>
     /// The ParamsRequestBuilder interface.
     /// </summary>
-    public interface IParamsRequestBuilder
+    public interface IParamsRequestBuilder : IBodyRequestBuilder
     {
         /// <summary>
         /// WithParam: matching on key only.

src/WireMock.Net/ResponseBuilders/FaultType.cs

@@ -0,0 +1,23 @@
+namespace WireMock.ResponseBuilders
+{
+    /// <summary>
+    /// The FaultType enumeration
+    /// </summary>
+    public enum FaultType
+    {
+        /// <summary>
+        /// No Fault
+        /// </summary>
+        NONE,
+
+        /// <summary>
+        /// Return a completely empty response.
+        /// </summary>
+        EMPTY_RESPONSE,
+
+        /// <summary>
+        /// Send a defined status header, then garbage, then close the connection.
+        /// </summary>
+        MALFORMED_RESPONSE_CHUNK
+    }
+}

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

@@ -7,7 +7,7 @@ namespace WireMock.ResponseBuilders
     /// <summary>
     /// The BodyResponseBuilder interface.
     /// </summary>
-    public interface IBodyResponseBuilder : ITransformResponseBuilder
+    public interface IBodyResponseBuilder : IFaultResponseBuilder
     {
         /// <summary>
         /// WithBody : Create a ... response based on a string.

src/WireMock.Net/ResponseBuilders/IFaultRequestBuilder.cs

@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+
+namespace WireMock.ResponseBuilders
+{
+    /// <summary>
+    /// The FaultRequestBuilder interface.
+    /// </summary>
+    public interface IFaultResponseBuilder : ITransformResponseBuilder
+    {
+        /// <summary>
+        /// WithBody : Create a fault response.
+        /// </summary>
+        /// <param name="faultType">The FaultType.</param>
+        /// <param name="percentage">The percentage when this fault should occur. When null, it's always.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithFault(FaultType faultType, [CanBeNull] double? percentage = null);
+    }
+}

src/WireMock.Net/ResponseBuilders/Response.WithFault.cs

@@ -0,0 +1,14 @@
+namespace WireMock.ResponseBuilders
+{
+    public partial class Response
+    {
+        /// <inheritdoc cref="IFaultResponseBuilder.WithFault(FaultType, double?)"/>
+        public IResponseBuilder WithFault(FaultType faultType, double? percentage = null)
+        {
+            ResponseMessage.FaultType = faultType;
+            ResponseMessage.FaultPercentage = percentage;
+
+            return this;
+        }
+    }
+}

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -19,7 +19,7 @@ namespace WireMock.ResponseBuilders
     /// <summary>
     /// The Response.
     /// </summary>
-    public class Response : IResponseBuilder
+    public partial class Response : IResponseBuilder
     {
         private HttpClient _httpClientForProxy;
 
@@ -375,6 +375,7 @@ namespace WireMock.ResponseBuilders
         public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
         {
             Check.NotNull(requestMessage, nameof(requestMessage));
+            Check.NotNull(settings, nameof(settings));
 
             if (Delay != null)
             {

src/WireMock.Net/ResponseMessage.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using WireMock.ResponseBuilders;
 using WireMock.Util;
 using WireMock.Validation;
 
@@ -35,6 +36,16 @@ namespace WireMock
         /// </summary>
         public BodyData BodyData { get; set; }
 
+        /// <summary>
+        /// The FaultType.
+        /// </summary>
+        public FaultType FaultType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Fault percentage.
+        /// </summary>
+        public double? FaultPercentage { get; set; }
+
         /// <summary>
         /// Adds the header.
         /// </summary>

src/WireMock.Net/Serialization/LogEntryMapper.cs

@@ -2,6 +2,7 @@
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
 using WireMock.Logging;
+using WireMock.ResponseBuilders;
 using WireMock.Util;
 
 namespace WireMock.Serialization
@@ -61,6 +62,12 @@ namespace WireMock.Serialization
                 Headers = logEntry.ResponseMessage.Headers
             };
 
+            if (logEntry.ResponseMessage.FaultType != FaultType.NONE)
+            {
+                logResponseModel.FaultType = logEntry.ResponseMessage.FaultType.ToString();
+                logResponseModel.FaultPercentage = logEntry.ResponseMessage.FaultPercentage;
+            }
+
             if (logEntry.ResponseMessage.BodyData != null)
             {
                 logResponseModel.BodyOriginal = logEntry.ResponseMessage.BodyOriginal;

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -114,6 +114,7 @@ namespace WireMock.Serialization
                 mappingModel.Response.UseTransformer = null;
                 mappingModel.Response.BodyEncoding = null;
                 mappingModel.Response.ProxyUrl = response.ProxyUrl;
+                mappingModel.Response.Fault = null;
             }
             else
             {
@@ -161,6 +162,15 @@ namespace WireMock.Serialization
                         };
                     }
                 }
+
+                if (response.ResponseMessage.FaultType != FaultType.NONE)
+                {
+                    mappingModel.Response.Fault = new FaultModel
+                    {
+                        Type = response.ResponseMessage.FaultType.ToString(),
+                        Percentage = response.ResponseMessage.FaultPercentage
+                    };
+                }
             }
 
             return mappingModel;

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

@@ -339,7 +339,8 @@ namespace WireMock.Server
                 AllowPartialMapping = _options.AllowPartialMapping,
                 MaxRequestLogCount = _options.MaxRequestLogCount,
                 RequestLogExpirationDuration = _options.RequestLogExpirationDuration,
-                GlobalProcessingDelay = (int?)_options.RequestProcessingDelay?.TotalMilliseconds
+                GlobalProcessingDelay = (int?)_options.RequestProcessingDelay?.TotalMilliseconds,
+                AllowBodyForAllHttpMethods = _options.AllowBodyForAllHttpMethods
             };
 
             return ToJson(model);
@@ -361,6 +362,11 @@ namespace WireMock.Server
                 _options.RequestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
             }
 
+            if (settings.AllowBodyForAllHttpMethods != null)
+            {
+                _options.AllowBodyForAllHttpMethods = settings.AllowBodyForAllHttpMethods.Value;
+            }
+
             return ResponseMessageBuilder.Create("Settings updated");
         }
         #endregion Settings
@@ -814,6 +820,11 @@ namespace WireMock.Server
                 responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile);
             }
 
+            if (responseModel.Fault != null && Enum.TryParse(responseModel.Fault.Type, out FaultType faultType))
+            {
+                responseBuilder.WithFault(faultType, responseModel.Fault.Percentage);
+            }
+
             return responseBuilder;
         }
 

src/WireMock.Net/Server/FluentMockServer.cs

@@ -1,11 +1,11 @@
-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 JetBrains.Annotations;
+using Newtonsoft.Json;
 using WireMock.Admin.Mappings;
 using WireMock.Exceptions;
 using WireMock.Handlers;
@@ -25,7 +25,6 @@ namespace WireMock.Server
     /// <summary>
     /// The fluent mock server.
     /// </summary>
-    [Obsolete("Will be replaced by WireMockServer in version 1.1.0")]
     public partial class FluentMockServer : IDisposable
     {
         private const int ServerStartDelayInMs = 100;
@@ -257,6 +256,12 @@ namespace WireMock.Server
                 }
             }
 
+            if (settings.AllowBodyForAllHttpMethods == true)
+            {
+                _options.AllowBodyForAllHttpMethods = _settings.AllowBodyForAllHttpMethods;
+                _settings.Logger.Info("AllowBodyForAllHttpMethods is set to {0}", _settings.AllowBodyForAllHttpMethods == true);
+            }
+
             if (settings.AllowPartialMapping == true)
             {
                 AllowPartialMapping();

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -10,7 +10,6 @@ namespace WireMock.Settings
     /// <summary>
     /// FluentMockServerSettings
     /// </summary>
-    [Obsolete("Will be replaced by WireMockServerSettings in version 1.1.0")]
     public class FluentMockServerSettings : IFluentMockServerSettings
     {
         /// <inheritdoc cref="IFluentMockServerSettings.Port"/>
@@ -94,5 +93,9 @@ namespace WireMock.Settings
         /// <inheritdoc cref="IFluentMockServerSettings.AllowCSharpCodeMatcher"/>
         [PublicAPI]
         public bool? AllowCSharpCodeMatcher { get; set; }
+
+        /// <inheritdoc cref="IFluentMockServerSettings.AllowBodyForAllHttpMethods"/>
+        [PublicAPI]
+        public bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -9,7 +9,6 @@ namespace WireMock.Settings
     /// <summary>
     /// IFluentMockServerSettings
     /// </summary>
-    [Obsolete("This interface will be removed and replaced by the class WireMockServerSettings in version 1.1.0")]
     public interface IFluentMockServerSettings
     {
         /// <summary>
@@ -124,6 +123,13 @@ namespace WireMock.Settings
         /// <summary>
         /// Allow the usage of CSharpCodeMatcher (default is not allowed).
         /// </summary>
+        [PublicAPI]
         bool? AllowCSharpCodeMatcher { get; set; }
+
+        /// <summary>
+        /// Allow a Body for all HTTP Methods. (default set to false).
+        /// </summary>
+        [PublicAPI]
+        bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Settings/IProxyAndRecordSettings.cs

@@ -1,13 +1,10 @@
-using System;
-
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
     /// <summary>
     /// IProxyAndRecordSettings
     /// </summary>
-    [Obsolete("This interface will be removed and replaced by the class ProxyAndRecordSettings in version 1.1.0")]
     public interface IProxyAndRecordSettings
     {
         /// <summary>

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -45,6 +45,9 @@ namespace WireMock.Transformers
                     break;
             }
 
+            responseMessage.FaultType = original.FaultType;
+            responseMessage.FaultPercentage = original.FaultPercentage;
+
             // Headers
             var newHeaders = new Dictionary<string, WireMockList<string>>();
             foreach (var header in original.Headers)

src/WireMock.Net/Util/BodyParser.cs

@@ -59,14 +59,19 @@ namespace WireMock.Util
 
         private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings { DateParseHandling = DateParseHandling.None };
 
-        public static bool ShouldParseBody([CanBeNull] string method)
+        public static bool ShouldParseBody([CanBeNull] string httpMethod, bool allowBodyForAllHttpMethods)
         {
-            if (string.IsNullOrEmpty(method))
+            if (string.IsNullOrEmpty(httpMethod))
             {
                 return false;
             }
 
-            if (BodyAllowedForMethods.TryGetValue(method.ToUpper(), out bool allowed))
+            if (allowBodyForAllHttpMethods)
+            {
+                return true;
+            }
+
+            if (BodyAllowedForMethods.TryGetValue(httpMethod.ToUpper(), out bool allowed))
             {
                 return allowed;
             }

src/WireMock.Net/WireMock.Net.csproj

@@ -12,14 +12,14 @@
     <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
     <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
     <RootNamespace>WireMock</RootNamespace>
-    <DebugType>full</DebugType>
+    <!--<DebugType>full</DebugType>
     <IncludeSource>True</IncludeSource>
-    <IncludeSymbols>True</IncludeSymbols>
+    <IncludeSymbols>True</IncludeSymbols>-->
     <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -32,6 +32,10 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
   </PropertyGroup>
 
+  <!--<ItemGroup>
+    <None Include="WireMock.Net-Logo.png" Pack="true" PackagePath="../../"/>
+  </ItemGroup>-->
+
   <!--https://github.com/aspnet/RoslynCodeDomProvider/issues/51-->
   <Target Name="CheckIfShouldKillVBCSCompiler" />
 
@@ -53,11 +57,16 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="RequestBuilders\Request.WithFault.cs" />
     <Compile Remove="Util\CloneUtils.cs" />
     <Compile Remove="Util\IndexableDictionary.cs" />
     <Compile Remove="Util\NamedReaderWriterLocker.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="ResponseBuilders\Response.WithFault.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
       <PrivateAssets>All</PrivateAssets>
@@ -71,7 +80,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.8" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.10" />
     <PackageReference Include="JmesPath.Net" Version="1.0.125" />
     <!--<PackageReference Include="CloneExtensionsEx" Version="1.0.2" />-->
     <!--<PackageReference Include="FastDeepCloner" Version="1.2.5" />-->

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

@@ -116,7 +116,25 @@ namespace WireMock.Net.Tests
 
             // Assert
             var options = server.GetPrivateFieldValue<IWireMockMiddlewareOptions>("_options");
-            Check.That(options.AllowPartialMapping).IsTrue();
+            Check.That(options.AllowPartialMapping).Equals(true);
+
+            // Verify
+            _loggerMock.Verify(l => l.Info(It.IsAny<string>(), It.IsAny<bool>()));
+        }
+
+        [Fact]
+        public void FluentMockServer_FluentMockServerSettings_AllowBodyForAllHttpMethods()
+        {
+            // Assign and Act
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Logger = _loggerMock.Object,
+                AllowBodyForAllHttpMethods = true
+            });
+
+            // Assert
+            var options = server.GetPrivateFieldValue<IWireMockMiddlewareOptions>("_options");
+            Check.That(options.AllowBodyForAllHttpMethods).Equals(true);
 
             // Verify
             _loggerMock.Verify(l => l.Info(It.IsAny<string>(), It.IsAny<bool>()));

test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using System.Threading;
 using WireMock.Handlers;
 using WireMock.Owin.Mappers;
+using WireMock.ResponseBuilders;
 using WireMock.Util;
 #if NET452
 using Microsoft.Owin;
@@ -97,7 +98,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
         public async Task OwinResponseMapper_MapAsync_Body()
         {
             // Arrange
-            string body = "abc";
+            string body = "abcd";
             var responseMessage = new ResponseMessage
             {
                 Headers = new Dictionary<string, WireMockList<string>>(),
@@ -108,7 +109,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             await _sut.MapAsync(responseMessage, _responseMock.Object);
 
             // Assert
-            _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99 }, 0, 3, It.IsAny<CancellationToken>()), Times.Once);
+            _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny<CancellationToken>()), Times.Once);
         }
 
         [Fact]
@@ -167,5 +168,47 @@ namespace WireMock.Net.Tests.Owin.Mappers
             _headers.Verify(h => h.TryGetValue("h", out v), Times.Once);
 #endif
         }
+
+        [Fact]
+        public async Task OwinResponseMapper_MapAsync_WithFault_EMPTY_RESPONSE()
+        {
+            // Arrange
+            string body = "abc";
+            var responseMessage = new ResponseMessage
+            {
+                Headers = new Dictionary<string, WireMockList<string>>(),
+                BodyData = new BodyData { DetectedBodyType = BodyType.String, BodyAsString = body },
+                FaultType = FaultType.EMPTY_RESPONSE
+            };
+
+            // Act
+            await _sut.MapAsync(responseMessage, _responseMock.Object);
+
+            // Assert
+            _stream.Verify(s => s.WriteAsync(new byte[0], 0, 0, It.IsAny<CancellationToken>()), Times.Once);
+        }
+
+        [Theory]
+        [InlineData("abcd", BodyType.String)]
+        [InlineData("", BodyType.String)]
+        [InlineData(null, BodyType.None)]
+        public async Task OwinResponseMapper_MapAsync_WithFault_MALFORMED_RESPONSE_CHUNK(string body, BodyType detected)
+        {
+            // Arrange
+            var responseMessage = new ResponseMessage
+            {
+                Headers = new Dictionary<string, WireMockList<string>>(),
+                BodyData = new BodyData { DetectedBodyType = detected, BodyAsString = body },
+                StatusCode = 100,
+                FaultType = FaultType.MALFORMED_RESPONSE_CHUNK
+            };
+
+            // Act
+            await _sut.MapAsync(responseMessage, _responseMock.Object);
+
+            // Assert
+            _responseMock.VerifySet(r => r.StatusCode = 100, Times.Once);
+            _stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), 0, It.Is<int>(count => count >= 0), It.IsAny<CancellationToken>()), Times.Once);
+        }
     }
 }

test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs

@@ -52,7 +52,7 @@ namespace WireMock.Net.Tests.Owin
             _requestMapperMock = new Mock<IOwinRequestMapper>();
             _requestMapperMock.SetupAllProperties();
             var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>())).ReturnsAsync(request);
+            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
 
             _responseMapperMock = new Mock<IOwinResponseMapper>();
             _responseMapperMock.SetupAllProperties();
@@ -87,7 +87,7 @@ namespace WireMock.Net.Tests.Owin
         {
             // Assign
             var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
-            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>())).ReturnsAsync(request);
+            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
 
             _optionsMock.SetupGet(o => o.AuthorizationMatcher).Returns(new ExactMatcher());
             _mappingMock.SetupGet(m => m.IsAdminInterface).Returns(true);
@@ -108,7 +108,7 @@ namespace WireMock.Net.Tests.Owin
         {
             // Assign
             var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]> { { "h", new[] { "x" } } });
-            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>())).ReturnsAsync(request);
+            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
 
             _optionsMock.SetupGet(o => o.AuthorizationMatcher).Returns(new ExactMatcher());
             _mappingMock.SetupGet(m => m.IsAdminInterface).Returns(true);

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithWithFaultTests.cs

@@ -0,0 +1,49 @@
+using FluentAssertions;
+using Moq;
+using System.Threading.Tasks;
+using WireMock.Models;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using Xunit;
+
+namespace WireMock.Net.Tests.ResponseBuilders
+{
+    public class ResponseWithWithFaultTests
+    {
+        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
+        private const string ClientIp = "::1";
+
+        [Theory]
+        [InlineData(FaultType.EMPTY_RESPONSE)]
+        [InlineData(FaultType.MALFORMED_RESPONSE_CHUNK)]
+        public async Task Response_ProvideResponse_WithFault(FaultType faultType)
+        {
+            // Arrange
+            var request = new RequestMessage(new UrlDetails("http://localhost/fault"), "GET", ClientIp);
+
+            // Act
+            var response = Response.Create().WithFault(faultType);
+            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+
+            // Assert
+            responseMessage.FaultType.Should().Be(faultType);
+            responseMessage.FaultPercentage.Should().BeNull();
+        }
+
+        [Theory]
+        [InlineData(FaultType.EMPTY_RESPONSE, 0.5)]
+        public async Task Response_ProvideResponse_WithFault_IncludingPercentage(FaultType faultType, double percentage)
+        {
+            // Arrange
+            var request = new RequestMessage(new UrlDetails("http://localhost/fault"), "GET", ClientIp);
+
+            // Act
+            var response = Response.Create().WithFault(faultType, percentage);
+            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+
+            // Assert
+            responseMessage.FaultType.Should().Be(faultType);
+            responseMessage.FaultPercentage.Should().Be(percentage);
+        }
+    }
+}

test/WireMock.Net.Tests/Serialization/LogEntryMapperTests.cs

@@ -1,6 +1,8 @@
-using NFluent;
+using FluentAssertions;
+using NFluent;
 using WireMock.Logging;
 using WireMock.Models;
+using WireMock.ResponseBuilders;
 using WireMock.Serialization;
 using WireMock.Util;
 using Xunit;
@@ -59,8 +61,7 @@ namespace WireMock.Net.Tests.Serialization
             // Assign
             var logEntry = new LogEntry
             {
-                RequestMessage = new RequestMessage(new UrlDetails("http://localhost"), "get", "::1"
-                ),
+                RequestMessage = new RequestMessage(new UrlDetails("http://localhost"), "get", "::1"),
                 ResponseMessage = new ResponseMessage
                 {
                     BodyData = new BodyData
@@ -88,5 +89,32 @@ namespace WireMock.Net.Tests.Serialization
             Check.That(result.Response.BodyAsJson).IsNull();
             Check.That(result.Response.BodyAsFile).IsEqualTo("test");
         }
+
+        [Fact]
+        public void LogEntryMapper_Map_LogEntry_WithFault()
+        {
+            // Assign
+            var logEntry = new LogEntry
+            {
+                RequestMessage = new RequestMessage(new UrlDetails("http://localhost"), "get", "::1"),
+                ResponseMessage = new ResponseMessage
+                {
+                    BodyData = new BodyData
+                    {
+                        DetectedBodyType = BodyType.File,
+                        BodyAsFile = "test"
+                    },
+                    FaultType = FaultType.EMPTY_RESPONSE,
+                    FaultPercentage = 0.5
+                }
+            };
+
+            // Act
+            var result = LogEntryMapper.Map(logEntry);
+
+            // Assert
+            result.Response.FaultType.Should().Be("EMPTY_RESPONSE");
+            result.Response.FaultPercentage.Should().Be(0.5);
+        }
     }
 }

test/WireMock.Net.Tests/Util/BodyParserTests.cs

@@ -1,168 +1,185 @@
-using NFluent;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using WireMock.Util;
-using Xunit;
-
-namespace WireMock.Net.Tests.Util
-{
-    public class BodyParserTests
-    {
-        [Theory]
-        [InlineData("application/json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-        [InlineData("application/json; charset=utf-8", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-        [InlineData("application/json; odata.metadata=minimal", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-        [InlineData("application/vnd.api+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-        [InlineData("application/vnd.test+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
-        public async Task BodyParser_Parse_ContentTypeJson(string contentType, string bodyAsJson, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
-        {
-            // Arrange
-            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsJson));
-
-            // Act
-            var body = await BodyParser.Parse(memoryStream, contentType);
-
-            // Assert
-            Check.That(body.BodyAsBytes).IsNotNull();
-            Check.That(body.BodyAsJson).IsNotNull();
-            Check.That(body.BodyAsString).Equals(bodyAsJson);
-            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
-        }
-
-        [Theory]
-        [InlineData("application/xml", "<xml>hello</xml>", BodyType.String, BodyType.String)]
-        [InlineData("something", "hello", BodyType.String, BodyType.Bytes)]
-        public async Task BodyParser_Parse_ContentTypeString(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
-        {
-            // Arrange
-            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString));
-
-            // Act
-            var body = await BodyParser.Parse(memoryStream, contentType);
-
-            // Assert
-            Check.That(body.BodyAsBytes).IsNotNull();
-            Check.That(body.BodyAsJson).IsNull();
-            Check.That(body.BodyAsString).Equals(bodyAsString);
-            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
-        }
-
-        [Theory]
-        [InlineData(new byte[] {34, 97, 34}, BodyType.Json)]
-        [InlineData(new byte[] {97}, BodyType.String)]
-        [InlineData(new byte[] {0xFF, 0xD8, 0xFF, 0xE0}, BodyType.Bytes)]
-        public async Task BodyParser_Parse_DetectedBodyType(byte[] content, BodyType detectedBodyType)
-        {
-            // arrange
-            var memoryStream = new MemoryStream(content);
-
-            // act
-            var body = await BodyParser.Parse(memoryStream, null);
-
-            // assert
-            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-        }
-
-        [Fact]
-        public async Task BodyParser_Parse_WithUTF8EncodingAndContentTypeMultipart_DetectedBodyTypeEqualsString()
-        {
-            // Arrange
-            string contentType = "multipart/form-data";
-            string body = @"
-
------------------------------9051914041544843365972754266
-Content-Disposition: form-data; name=""text""
-
-text default
------------------------------9051914041544843365972754266
-Content-Disposition: form-data; name=""file1""; filename=""a.txt""
-Content-Type: text/plain
-
-Content of a txt
-
------------------------------9051914041544843365972754266
-Content-Disposition: form-data; name=""file2""; filename=""a.html""
-Content-Type: text/html
-
-<!DOCTYPE html><title>Content of a.html.</title>
-
------------------------------9051914041544843365972754266--";
-
-            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(body));
-
-            // Act
-            var result = await BodyParser.Parse(memoryStream, contentType);
-
-            // Assert
-            Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String);
-            Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
-            Check.That(result.BodyAsBytes).IsNotNull();
-            Check.That(result.BodyAsJson).IsNull();
-            Check.That(result.BodyAsString).IsNotNull();
-        }
-
-        [Fact]
-        public async Task BodyParser_Parse_WithUTF16EncodingAndContentTypeMultipart_DetectedBodyTypeEqualsString()
-        {
-            // Arrange
-            string contentType = "multipart/form-data";
-            string body = char.ConvertFromUtf32(0x1D161); //U+1D161 = MUSICAL SYMBOL SIXTEENTH NOTE
-
-            var memoryStream = new MemoryStream(Encoding.UTF32.GetBytes(body));
-
-            // Act
-            var result = await BodyParser.Parse(memoryStream, contentType);
-
-            // Assert
-            Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes);
-            Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
-            Check.That(result.BodyAsBytes).IsNotNull();
-            Check.That(result.BodyAsJson).IsNull();
-            Check.That(result.BodyAsString).IsNull();
-        }
-
-        [Theory]
-        [InlineData(null, "hello", BodyType.String, BodyType.Bytes)]
-        public async Task BodyParser_Parse_ContentTypeIsNull(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
-        {
-            // Arrange
-            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString));
-
-            // Act
-            var body = await BodyParser.Parse(memoryStream, contentType);
-
-            // Assert
-            Check.That(body.BodyAsBytes).IsNotNull();
-            Check.That(body.BodyAsJson).IsNull();
-            Check.That(body.BodyAsString).Equals(bodyAsString);
-            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
-            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
-        }
-
-        [Theory]
-        [InlineData("HEAD", false)]
-        [InlineData("GET", false)]
-        [InlineData("PUT", true)]
-        [InlineData("POST", true)]
+using NFluent;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using WireMock.Util;
+using Xunit;
+
+namespace WireMock.Net.Tests.Util
+{
+    public class BodyParserTests
+    {
+        [Theory]
+        [InlineData("application/json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        [InlineData("application/json; charset=utf-8", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        [InlineData("application/json; odata.metadata=minimal", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        [InlineData("application/vnd.api+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        [InlineData("application/vnd.test+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
+        public async Task BodyParser_Parse_ContentTypeJson(string contentType, string bodyAsJson, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
+        {
+            // Arrange
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsJson));
+
+            // Act
+            var body = await BodyParser.Parse(memoryStream, contentType);
+
+            // Assert
+            Check.That(body.BodyAsBytes).IsNotNull();
+            Check.That(body.BodyAsJson).IsNotNull();
+            Check.That(body.BodyAsString).Equals(bodyAsJson);
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
+        }
+
+        [Theory]
+        [InlineData("application/xml", "<xml>hello</xml>", BodyType.String, BodyType.String)]
+        [InlineData("something", "hello", BodyType.String, BodyType.Bytes)]
+        public async Task BodyParser_Parse_ContentTypeString(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
+        {
+            // Arrange
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString));
+
+            // Act
+            var body = await BodyParser.Parse(memoryStream, contentType);
+
+            // Assert
+            Check.That(body.BodyAsBytes).IsNotNull();
+            Check.That(body.BodyAsJson).IsNull();
+            Check.That(body.BodyAsString).Equals(bodyAsString);
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
+        }
+
+        [Theory]
+        [InlineData(new byte[] {34, 97, 34}, BodyType.Json)]
+        [InlineData(new byte[] {97}, BodyType.String)]
+        [InlineData(new byte[] {0xFF, 0xD8, 0xFF, 0xE0}, BodyType.Bytes)]
+        public async Task BodyParser_Parse_DetectedBodyType(byte[] content, BodyType detectedBodyType)
+        {
+            // arrange
+            var memoryStream = new MemoryStream(content);
+
+            // act
+            var body = await BodyParser.Parse(memoryStream, null);
+
+            // assert
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+        }
+
+        [Fact]
+        public async Task BodyParser_Parse_WithUTF8EncodingAndContentTypeMultipart_DetectedBodyTypeEqualsString()
+        {
+            // Arrange
+            string contentType = "multipart/form-data";
+            string body = @"
+
+-----------------------------9051914041544843365972754266
+Content-Disposition: form-data; name=""text""
+
+text default
+-----------------------------9051914041544843365972754266
+Content-Disposition: form-data; name=""file1""; filename=""a.txt""
+Content-Type: text/plain
+
+Content of a txt
+
+-----------------------------9051914041544843365972754266
+Content-Disposition: form-data; name=""file2""; filename=""a.html""
+Content-Type: text/html
+
+<!DOCTYPE html><title>Content of a.html.</title>
+
+-----------------------------9051914041544843365972754266--";
+
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(body));
+
+            // Act
+            var result = await BodyParser.Parse(memoryStream, contentType);
+
+            // Assert
+            Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String);
+            Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
+            Check.That(result.BodyAsBytes).IsNotNull();
+            Check.That(result.BodyAsJson).IsNull();
+            Check.That(result.BodyAsString).IsNotNull();
+        }
+
+        [Fact]
+        public async Task BodyParser_Parse_WithUTF16EncodingAndContentTypeMultipart_DetectedBodyTypeEqualsString()
+        {
+            // Arrange
+            string contentType = "multipart/form-data";
+            string body = char.ConvertFromUtf32(0x1D161); //U+1D161 = MUSICAL SYMBOL SIXTEENTH NOTE
+
+            var memoryStream = new MemoryStream(Encoding.UTF32.GetBytes(body));
+
+            // Act
+            var result = await BodyParser.Parse(memoryStream, contentType);
+
+            // Assert
+            Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes);
+            Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
+            Check.That(result.BodyAsBytes).IsNotNull();
+            Check.That(result.BodyAsJson).IsNull();
+            Check.That(result.BodyAsString).IsNull();
+        }
+
+        [Theory]
+        [InlineData(null, "hello", BodyType.String, BodyType.Bytes)]
+        public async Task BodyParser_Parse_ContentTypeIsNull(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
+        {
+            // Arrange
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString));
+
+            // Act
+            var body = await BodyParser.Parse(memoryStream, contentType);
+
+            // Assert
+            Check.That(body.BodyAsBytes).IsNotNull();
+            Check.That(body.BodyAsJson).IsNull();
+            Check.That(body.BodyAsString).Equals(bodyAsString);
+            Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
+            Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
+        }
+
+        [Theory]
+        [InlineData("HEAD", false)]
+        [InlineData("GET", false)]
+        [InlineData("PUT", true)]
+        [InlineData("POST", true)]
         [InlineData("DELETE", false)]
         [InlineData("TRACE", false)]
         [InlineData("OPTIONS", true)]
         [InlineData("CONNECT", false)]
-        [InlineData("PATCH", true)]
-        public void BodyParser_ShouldParseBody_ExpectedResultForKnownMethods(string method, bool resultShouldBe)
+        [InlineData("PATCH", true)]
+        public void BodyParser_ShouldParseBodyForMethodAndAllowAllIsFalse_ExpectedResultForKnownMethods(string method, bool resultShouldBe)
         {
-            Check.That(BodyParser.ShouldParseBody(method)).Equals(resultShouldBe);
+            Check.That(BodyParser.ShouldParseBody(method, false)).Equals(resultShouldBe);
         }
 
-        [Theory]
-        [InlineData("REPORT")]
-        [InlineData("SOME-UNKNOWN-METHOD")]
+        [Theory]
+        [InlineData("HEAD")]
+        [InlineData("GET")]
+        [InlineData("PUT")]
+        [InlineData("POST")]
+        [InlineData("DELETE")]
+        [InlineData("TRACE")]
+        [InlineData("OPTIONS")]
+        [InlineData("CONNECT")]
+        [InlineData("PATCH")]
+        [InlineData("REPORT")]
+        [InlineData("SOME-UNKNOWN-METHOD")]
+        public void BodyParser_ShouldParseBodyForMethodAndAllowAllIsTrue_ExpectedResultShouldBeTrue(string method)
+        {
+            Check.That(BodyParser.ShouldParseBody(method, true)).IsTrue();
+        }
+
+        [Theory]
+        [InlineData("REPORT")]
+        [InlineData("SOME-UNKNOWN-METHOD")]
         public void BodyParser_ShouldParseBody_DefaultIsTrueForUnknownMethods(string method)
         {
-            Check.That(BodyParser.ShouldParseBody(method)).IsTrue();
-        }
-    }
+            Check.That(BodyParser.ShouldParseBody(method, false)).IsTrue();
+        }
+    }
 }

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

@@ -41,7 +41,7 @@
     <PackageReference Include="FluentAssertions" Version="5.7.0" />
     <PackageReference Include="System.Threading" Version="4.3.0" />
     <PackageReference Include="RestEase" Version="1.4.7" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.8" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.10" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />