wip (#594)

examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs

@@ -10,6 +10,7 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
+using WireMock.Util;
 
 namespace WireMock.Net.StandAlone.NETCoreApp
 {
@@ -34,6 +35,14 @@ namespace WireMock.Net.StandAlone.NETCoreApp
 
             _server = WireMockServer.Start(settings);
 
+            _server.Given(Request.Create().WithPath("/api/sap")
+                .UsingPost()
+                .WithBody((IBodyData xmlData) => {
+                    //xmlData is always null
+                    return true;
+                }))
+                .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
+
             _server
                 .Given(Request.Create()
                     .UsingAnyMethod())

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

@@ -2,6 +2,7 @@ using JetBrains.Annotations;
 using System;
 using System.Linq;
 using WireMock.Types;
+using WireMock.Util;
 using WireMock.Validation;
 
 namespace WireMock.Matchers.Request
@@ -26,6 +27,11 @@ namespace WireMock.Matchers.Request
         /// </summary>
         public Func<object, bool> JsonFunc { get; }
 
+        /// <summary>
+        /// The body data function for BodyData
+        /// </summary>
+        public Func<IBodyData, bool> BodyDataFunc { get; }
+
         /// <summary>
         /// The matchers.
         /// </summary>
@@ -88,6 +94,16 @@ namespace WireMock.Matchers.Request
             JsonFunc = func;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="func">The function.</param>
+        public RequestMessageBodyMatcher([NotNull] Func<IBodyData, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+            BodyDataFunc = func;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
@@ -158,6 +174,11 @@ namespace WireMock.Matchers.Request
                 return MatchScores.ToScore(DataFunc(requestMessage?.BodyData?.BodyAsBytes));
             }
 
+            if (BodyDataFunc != null)
+            {
+                return MatchScores.ToScore(BodyDataFunc(requestMessage?.BodyData));
+            }
+
             return MatchScores.Mismatch;
         }
     }

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -2,6 +2,7 @@
 using System;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Util;
 
 namespace WireMock.RequestBuilders
 {
@@ -63,10 +64,17 @@ namespace WireMock.RequestBuilders
         IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
 
         /// <summary>
-        /// WithBody: func (object)
+        /// WithBody: func (json object)
         /// </summary>
         /// <param name="func">The function.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody([NotNull] Func<object, bool> func);
+
+        /// <summary>
+        /// WithBody: func (BodyData object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
     }
 }

src/WireMock.Net/RequestBuilders/Request.WithBody.cs

@@ -3,6 +3,7 @@
 using System;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Util;
 using WireMock.Validation;
 
 namespace WireMock.RequestBuilders
@@ -71,5 +72,14 @@ namespace WireMock.RequestBuilders
             _requestMatchers.Add(new RequestMessageBodyMatcher(func));
             return this;
         }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{IBodyData, bool})"/>
+        public IRequestBuilder WithBody(Func<IBodyData, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+
+            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+            return this;
+        }
     }
 }

test/WireMock.Net.Tests/RequestWithBodyTests.cs

@@ -54,6 +54,25 @@ namespace WireMock.Net.Tests
             Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
         }
 
+        [Fact]
+        public void Request_WithBody_FuncBodyData()
+        {
+            // Assign
+            var requestBuilder = Request.Create().UsingAnyMethod().WithBody((IBodyData b) => b != null);
+
+            // Act
+            var body = new BodyData
+            {
+                BodyAsJson = 123,
+                DetectedBodyType = BodyType.Json
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body);
+
+            // Assert
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
         [Fact]
         public void Request_WithBody_FuncByteArray()
         {