Merge branch 'master' into stef-fluent

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 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)
+- [#1074](https://github.com/WireMock-Net/WireMock.Net/issues/1074) - FluentAssertions extensions do not filter headers correctly [bug]
+- [#1075](https://github.com/WireMock-Net/WireMock.Net/issues/1075) - FluentAssertions extensions are not open for extension [feature]
+
 # 1.5.49 (06 March 2024)
 - [#1069](https://github.com/WireMock-Net/WireMock.Net/pull/1069) - Extend TypeLoader [feature] contributed by [StefH](https://github.com/StefH)
 - [#1078](https://github.com/WireMock-Net/WireMock.Net/pull/1078) - Upgrade ProtoBufJsonConverter to fix issue with dot(s) in package name [bug] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
  </PropertyGroup>
 
  <PropertyGroup>
- <VersionPrefix>1.5.49</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.49
+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,6 +1,5 @@
-# 1.5.49 (06 March 2024)
-- #1069 Extend TypeLoader [feature]
-- #1078 Upgrade ProtoBufJsonConverter to fix issue with dot(s) in package name [bug]
-- #1077 ProtoBufMatcher not working when proto package name contains dots [bug]
+# 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

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

@@ -0,0 +1,60 @@
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+ [CustomAssertion]
+ public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
+ {
+ var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase));
+
+ Execute.Assertion
+ .BecauseOf(because, becauseArgs)
+ .Given(() => RequestMessages)
+ .ForCondition(requests => CallsCount == 0 || requests.Any())
+ .FailWith(
+ "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
+ absoluteUrl
+ )
+ .Then
+ .ForCondition(condition)
+ .FailWith(
+ "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
+ _ => absoluteUrl,
+ requests => requests.Select(request => request.AbsoluteUrl)
+ );
+
+ FilterRequestMessages(filter);
+
+ return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
+ }
+
+ [CustomAssertion]
+ public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
+ {
+ var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.Url, url, StringComparison.OrdinalIgnoreCase));
+
+ Execute.Assertion
+ .BecauseOf(because, becauseArgs)
+ .Given(() => RequestMessages)
+ .ForCondition(requests => CallsCount == 0 || requests.Any())
+ .FailWith(
+ "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but no calls were made.",
+ url
+ )
+ .Then
+ .ForCondition(condition)
+ .FailWith(
+ "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
+ _ => url,
+ requests => requests.Select(request => request.Url)
+ );
+
+ FilterRequestMessages(filter);
+
+ return new AndWhichConstraint<WireMockAssertions, string>(this, url);
+ }
+}

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

@@ -0,0 +1,33 @@
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+ [CustomAssertion]
+ public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
+ {
+ var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase));
+
+ Execute.Assertion
+ .BecauseOf(because, becauseArgs)
+ .Given(() => RequestMessages)
+ .ForCondition(requests => CallsCount == 0 || requests.Any())
+ .FailWith(
+ "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
+ clientIP
+ )
+ .Then
+ .ForCondition(condition)
+ .FailWith(
+ "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
+ _ => clientIP, requests => requests.Select(request => request.ClientIP)
+ );
+
+ FilterRequestMessages(filter);
+
+ return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
+ }
+}

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

@@ -58,8 +58,8 @@ public AndConstraint<WireMockAssertions> UsingMethod(string method, string becau
 
  Execute.Assertion
  .BecauseOf(because, becauseArgs)
- .Given(() => _requestMessages)
- .ForCondition(requests => _callsCount == 0 || requests.Any())
+ .Given(() => RequestMessages)
+ .ForCondition(requests => CallsCount == 0 || requests.Any())
  .FailWith(
  "Expected {context:wiremockserver} to have been called using method {0}{reason}, but no calls were made.",
  method
@@ -72,7 +72,7 @@ public AndConstraint<WireMockAssertions> UsingMethod(string method, string becau
  requests => requests.Select(request => request.Method)
  );
 
- _requestMessages = filter(_requestMessages).ToList();
+ FilterRequestMessages(filter);
 
  return new AndConstraint<WireMockAssertions>(this);
  }

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

@@ -1,15 +1,20 @@
 #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;
 
 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 AndConstraint<WireMockAssertions> WithBodyAsBytes(ExactObjectMatcher matc
  {
  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(
@@ -70,21 +75,21 @@ public AndConstraint<WireMockAssertions> WithBodyAsBytes(ExactObjectMatcher matc
  {
  Execute.Assertion
  .BecauseOf(because, becauseArgs)
- .Given(() => _requestMessages)
- .ForCondition(requests => _callsCount == 0 || requests.Any())
+ .Given(() => RequestMessages)
+ .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))
  );
 
- _requestMessages = filter(_requestMessages).ToList();
+ FilterRequestMessages(filter);
 
  return new AndConstraint<WireMockAssertions>(this);
  }
@@ -100,52 +105,41 @@ public AndConstraint<WireMockAssertions> WithBodyAsBytes(ExactObjectMatcher matc
  {
  Execute.Assertion
  .BecauseOf(because, becauseArgs)
- .Given(() => _requestMessages)
- .ForCondition(requests => _callsCount == 0 || requests.Any())
+ .Given(() => RequestMessages)
+ .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))
  );
 
- _requestMessages = filter(_requestMessages).ToList();
+ FilterRequestMessages(filter);
 
  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)
- );
-
- _requestMessages = filter(_requestMessages).ToList();
+ 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)
+ };
+ }
 
- 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))} ]";
  }
 }