Upgrade Google.Protobuf in test project

* Fix FluentAssertions (actual body is not displayed in error message)

* .

* .

* raw

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.5.51 (20 March 2024)
+- [#1085](https://github.com/WireMock-Net/WireMock.Net/pull/1085) - Fix FluentAssertions (actual body is not displayed in error message) [bug] contributed by [StefH](https://github.com/StefH)
+- [#1084](https://github.com/WireMock-Net/WireMock.Net/issues/1084) - FluentAssertions - Actual body is not displayed in error message when using Json Body [bug]
+
 # 1.5.50 (12 March 2024)
 - [#1080](https://github.com/WireMock-Net/WireMock.Net/pull/1080) - Fix FluentAssertions on Header(s) [bug] contributed by [StefH](https://github.com/StefH)
 - [#1082](https://github.com/WireMock-Net/WireMock.Net/pull/1082) - Make WireMockAssertions extendable [feature] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.50</VersionPrefix>
+        <VersionPrefix>1.5.51</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.5.50
+SET version=1.5.51
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate example --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,7 +1,5 @@
-# 1.5.50 (12 March 2024)
-- #1080 Fix FluentAssertions on Header(s) [bug]
-- #1082 Make WireMockAssertions extendable [feature]
-- #1074 FluentAssertions extensions do not filter headers correctly [bug]
-- #1075 FluentAssertions extensions are not open for extension [feature]
+# 1.5.51 (20 March 2024)
+- #1085 Fix FluentAssertions (actual body is not displayed in error message) [bug]
+- #1084 FluentAssertions - Actual body is not displayed in error message when using Json Body [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

examples/WireMock.Net.Console.GrpcClient/WireMock.Net.Console.GrpcClient.csproj

@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.60.0">
+        <PackageReference Include="Google.Protobuf" Version="3.26.0" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.62.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs

@@ -1,7 +1,12 @@
 #pragma warning disable CS1591
 using System;
 using System.Collections.Generic;
+using AnyOfTypes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WireMock.Extensions;
 using WireMock.Matchers;
+using WireMock.Models;
 
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
@@ -9,7 +14,7 @@ namespace WireMock.FluentAssertions;
 public partial class WireMockAssertions
 {
     private const string MessageFormatNoCalls = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but no calls were made.";
-    private const string MessageFormat = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but didn't find it among the body {1}.";
+    private const string MessageFormat = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but didn't find it among the body/bodies {1}.";
 
     [CustomAssertion]
     public AndConstraint<WireMockAssertions> WithBody(string body, string because = "", params object[] becauseArgs)
@@ -56,7 +61,7 @@ public partial class WireMockAssertions
     {
         var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsBytes, matcher);
 
-        return ExecuteAssertionWithBodyAsBytesExactObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsBytes);
+        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsBytes);
     }
 
     private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyStringMatcher(
@@ -74,14 +79,14 @@ public partial class WireMockAssertions
             .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
-                matcher.GetPatterns()
+                FormatBody(matcher.GetPatterns())
             )
             .Then
             .ForCondition(condition)
             .FailWith(
                 MessageFormat,
-                _ => matcher.GetPatterns(),
-                requests => requests.Select(expression)
+                _ => FormatBody(matcher.GetPatterns()),
+                requests => FormatBodies(requests.Select(expression))
             );
 
         FilterRequestMessages(filter);
@@ -104,14 +109,14 @@ public partial class WireMockAssertions
             .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
-                matcher.Value
+                FormatBody(matcher.Value)
             )
             .Then
             .ForCondition(condition)
             .FailWith(
                 MessageFormat,
-                _ => matcher.Value,
-                requests => requests.Select(expression)
+                _ => FormatBody(matcher.Value),
+                requests => FormatBodies(requests.Select(expression))
             );
 
         FilterRequestMessages(filter);
@@ -119,33 +124,22 @@ public partial class WireMockAssertions
         return new AndConstraint<WireMockAssertions>(this);
     }
 
-    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsBytesExactObjectMatcher(
-        ExactObjectMatcher matcher,
-        string because,
-        object[] becauseArgs,
-        Func<IReadOnlyList<IRequestMessage>, bool> condition,
-        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter,
-        Func<IRequestMessage, object?> expression
-    )
+    private static string? FormatBody(object? body)
     {
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                MessageFormatNoCalls,
-                matcher.Value
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                MessageFormat,
-                _ => matcher.Value,
-                requests => requests.Select(expression)
-            );
+        return body switch
+        {
+            null => null,
+            string str => str,
+            AnyOf<string, StringPattern>[] stringPatterns => FormatBodies(stringPatterns.Select(p => p.GetPattern())),
+            byte[] bytes => $"byte[{bytes.Length}] {{...}}",
+            JToken jToken => jToken.ToString(Formatting.None),
+            _ => JToken.FromObject(body).ToString(Formatting.None)
+        };
+    }
 
-        FilterRequestMessages(filter);
-
-        return new AndConstraint<WireMockAssertions>(this);
+    private static string? FormatBodies(IEnumerable<object?> bodies)
+    {
+        var valueAsArray = bodies as object[] ?? bodies.ToArray();
+        return valueAsArray.Length == 1 ? FormatBody(valueAsArray.First()) : $"[ {string.Join(", ", valueAsArray.Select(FormatBody))} ]";
     }
 }

src/WireMock.Net/Extensions/AnyOfExtensions.cs

@@ -5,18 +5,36 @@ using WireMock.Models;
 
 namespace WireMock.Extensions;
 
-internal static class AnyOfExtensions
+/// <summary>
+/// Some extensions for AnyOf.
+/// </summary>
+public static class AnyOfExtensions
 {
+    /// <summary>
+    /// Gets the pattern.
+    /// </summary>
+    /// <param name="value">AnyOf type</param>
+    /// <returns>string value</returns>
     public static string GetPattern(this AnyOf<string, StringPattern> value)
     {
         return value.IsFirst ? value.First : value.Second.Pattern;
     }
 
+    /// <summary>
+    /// Converts a string-patterns to AnyOf patterns.
+    /// </summary>
+    /// <param name="patterns">The string patterns</param>
+    /// <returns>The AnyOf patterns</returns>
     public static AnyOf<string, StringPattern>[] ToAnyOfPatterns(this IEnumerable<string> patterns)
     {
         return patterns.Select(p => p.ToAnyOfPattern()).ToArray();
     }
 
+    /// <summary>
+    /// Converts a string-pattern to AnyOf pattern.
+    /// </summary>
+    /// <param name="pattern">The string pattern</param>
+    /// <returns>The AnyOf pattern</returns>
     public static AnyOf<string, StringPattern> ToAnyOfPattern(this string pattern)
     {
         return new AnyOf<string, StringPattern>(pattern);

test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs

@@ -702,7 +702,11 @@ public class WireMockAssertionsTests : IDisposable
         // Act
         var httpClient = new HttpClient();
 
-        await httpClient.PostAsync($"{server.Url}/a", new StringContent(@"{ ""x"": ""y"" }"));
+        var requestBody = new
+        {
+            x = "y"
+        };
+        await httpClient.PostAsJsonAsync($"{server.Url}/a", requestBody);
 
         // Assert
         server
@@ -740,6 +744,103 @@ public class WireMockAssertionsTests : IDisposable
         server.Stop();
     }
 
+    [Fact]
+    public async Task WithBodyAsJson_When_NoMatch_ShouldHaveCorrectErrorMessage()
+    {
+        // Arrange
+        var server = WireMockServer.Start();
+
+        server
+            .Given(Request.Create().WithPath("/a").UsingPost())
+            .RespondWith(Response.Create().WithBody("A response"));
+
+        // Act
+        var httpClient = new HttpClient();
+
+        var requestBody = new
+        {
+            x = "123"
+        };
+        await httpClient.PostAsJsonAsync($"{server.Url}/a", requestBody);
+
+        // Assert
+        Action act = () => server
+            .Should()
+            .HaveReceived(1)
+            .Calls()
+            .WithBodyAsJson(new { x = "y" })
+            .And
+            .UsingPost();
+
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("""Expected wiremockserver to have been called using body "{"x":"y"}", but didn't find it among the body/bodies "{"x":"123"}".""");
+
+        server.Stop();
+    }
+
+    [Fact]
+    public async Task WithBodyAsString_When_NoMatch_ShouldHaveCorrectErrorMessage()
+    {
+        // Arrange
+        var server = WireMockServer.Start();
+
+        server
+            .Given(Request.Create().WithPath("/a").UsingPost())
+            .RespondWith(Response.Create().WithBody("A response"));
+
+        // Act
+        var httpClient = new HttpClient();
+
+        await httpClient.PostAsync($"{server.Url}/a", new StringContent("123"));
+
+        // Assert
+        Action act = () => server
+            .Should()
+            .HaveReceived(1)
+            .Calls()
+            .WithBody("abc")
+            .And
+            .UsingPost();
+
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("""Expected wiremockserver to have been called using body "abc", but didn't find it among the body/bodies "123".""");
+
+        server.Stop();
+    }
+
+    [Fact]
+    public async Task WithBodyAsBytes_When_NoMatch_ShouldHaveCorrectErrorMessage()
+    {
+        // Arrange
+        var server = WireMockServer.Start();
+
+        server
+            .Given(Request.Create().WithPath("/a").UsingPost())
+            .RespondWith(Response.Create().WithBody("A response"));
+
+        // Act
+        var httpClient = new HttpClient();
+
+        await httpClient.PostAsync($"{server.Url}/a", new ByteArrayContent(new byte[] { 5 }));
+
+        // Assert
+        Action act = () => server
+            .Should()
+            .HaveReceived(1)
+            .Calls()
+            .WithBodyAsBytes(new byte[] { 1 })
+            .And
+            .UsingPost();
+
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("""Expected wiremockserver to have been called using body "byte[1] {...}", but didn't find it among the body/bodies "byte[1] {...}".""");
+
+        server.Stop();
+    }
+
     [Fact]
     public async Task HaveReceived1Call_WithBodyAsBytes()
     {

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

@@ -108,9 +108,9 @@
         <PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
         <PackageReference Include="JsonConverter.System.Text.Json" Version="0.5.0" />
 
-        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.60.0">
+        <PackageReference Include="Google.Protobuf" Version="3.26.0" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.62.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>