1.5.59

Ref: https://github.com/testcontainers/testcontainers-dotnet/pull/1100

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Build with Tests
+name: Run Tests
 
 on: 
   pull_request:
@@ -10,47 +10,29 @@ on:
 
 jobs:
   windows-build-and-run:
+    name: Run Tests on Windows 
     runs-on: windows-2022
 
     env:
       IsRunningOnGitHubActions: 'true'
 
-    steps:  
+    steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-dotnet@v3
-      with:
-       dotnet-version: |
-         7.0.x
-         8.0.x
-              
-    - name: 'Build Unit Tests'
-      run: |
-        dotnet build './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net7.0
-
     - name: 'Run Unit Tests'
       run: |
-        dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net7.0
+        dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0
 
   linux-build-and-run:
+    name: Run Tests on Linux
     runs-on: ubuntu-latest
 
     env:
         IsRunningOnGitHubActions: 'true'
 
-    steps:  
+    steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-            7.0.x
-            8.0.x
-                
-    - name: 'Build Unit Tests'
-      run: |
-        dotnet build './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net7.0
-
     - name: 'Run Unit Tests'
       run: |
-        dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net7.0
+        dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0

CHANGELOG.md

@@ -1,3 +1,18 @@
+# 1.5.59 (26 June 2024)
+- [#1127](https://github.com/WireMock-Net/WireMock.Net/pull/1127) - Made changes to accommodate breaking change in testcontainers-dotnet 3.9 [feature] contributed by [epDugas](https://github.com/epDugas)
+
+# 1.5.58 (08 June 2024)
+- [#1116](https://github.com/WireMock-Net/WireMock.Net/pull/1116) - Add some methods to the BodyModelBuilder [feature] contributed by [StefH](https://github.com/StefH)
+- [#1117](https://github.com/WireMock-Net/WireMock.Net/issues/1117) - AbstractJsonPartialMatcher: Regex Value is Uppercased when IgnoreCase is set to true [bug]
+
+# 1.5.57 (04 June 2024)
+- [#1113](https://github.com/WireMock-Net/WireMock.Net/pull/1113) - Add some Extension methods to IWireMockAdminApi [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.56 (03 June 2024)
+- [#1111](https://github.com/WireMock-Net/WireMock.Net/pull/1111) - Fix Request.Create().WithBodyAsJson(...) [bug] contributed by [StefH](https://github.com/StefH)
+- [#1112](https://github.com/WireMock-Net/WireMock.Net/pull/1112) - Add "/__admin/health" endpoint [feature] contributed by [StefH](https://github.com/StefH)
+- [#1110](https://github.com/WireMock-Net/WireMock.Net/issues/1110) - Connection prematurely closed BEFORE response  [bug]
+
 # 1.5.55 (22 May 2024)
 - [#1107](https://github.com/WireMock-Net/WireMock.Net/pull/1107) - When only Port is provided, bind to * (Fixes #1100) [bug] contributed by [StefH](https://github.com/StefH)
 

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.55</VersionPrefix>
+        <VersionPrefix>1.5.59</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,7 +1,7 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.5.55
+SET version=1.5.59
 
-GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate example --version %version% --token %GH_TOKEN%
+GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%
 
-GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels question invalid doc duplicate --template PackageReleaseNotes.template --version %version% --token %GH_TOKEN%
+GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels question invalid doc duplicate example environment --template PackageReleaseNotes.template --version %version% --token %GH_TOKEN%

PackageReleaseNotes.txt

@@ -1,4 +1,4 @@
-# 1.5.55 (22 May 2024)
-- #1107 When only Port is provided, bind to * (Fixes #1100) [bug]
+# 1.5.59 (26 June 2024)
+- #1127 Made changes to accommodate breaking change in testcontainers-dotnet 3.9 [feature]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

WireMock.Net Solution.sln

@@ -70,7 +70,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net472
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Actions", "Actions", "{1DAEFF47-D117-4E95-8B3E-4F7C8B92011A}"
 	ProjectSection(SolutionItems) = preProject
-		..\System.Linq.Dynamic.Core\.github\workflows\ci.yml = ..\System.Linq.Dynamic.Core\.github\workflows\ci.yml
+		.github\workflows\ci.yml = .github\workflows\ci.yml
 		.github\workflows\CreateRelease.yml = .github\workflows\CreateRelease.yml
 	EndProjectSection
 EndProject

azure-pipelines-ci.yml

@@ -14,53 +14,45 @@ jobs:
       echo "BuildId = $(buildId)"
     displayName: 'Print buildId'
 
-  - task: UseDotNet@2
-    displayName: Use .NET 8.0
-    inputs:
-      packageType: 'sdk'
-      version: '8.0.x'    
+  - script: |
+      dotnet tool install --global dotnet-sonarscanner
+      dotnet tool install --global dotnet-coverage
+      dotnet tool install --global coverlet.console
+    displayName: 'Install dotnet tools'
 
   - task: PowerShell@2
-    displayName: "Use JDK11 by default"
+    displayName: "Use JDK17 by default"
     inputs:
       targetType: 'inline'
       script: |
-        $jdkPath = $env:JAVA_HOME_11_X64
+        $jdkPath = $env:JAVA_HOME_17_X64
         Write-Host "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
 
   - script: |
       dotnet dev-certs https --trust || true
     displayName: 'dotnet dev-certs https'
-  
-  - task: SonarCloudPrepare@1
-    displayName: 'Prepare analysis on SonarCloud'
+
+    # See: https://docs.sonarsource.com/sonarcloud/enriching/test-coverage/dotnet-test-coverage
+  - script: |
+      dotnet sonarscanner begin /k:"WireMock-Net_WireMock.Net" /o:"wiremock-net" /d:sonar.branch.name=$(Build.SourceBranchName) /d:sonar.host.url="https://sonarcloud.io" /d:sonar.token="$(SONAR_TOKEN)" /d:sonar.dotnet.excludeTestProjects=true /d:sonar.cs.vscoveragexml.reportsPaths=**/wiremock-coverage.xml /d:sonar.verbose=true
+    displayName: 'Begin analysis on SonarCloud'
     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-    inputs:
-      SonarCloud: SonarCloud
-      organization: wiremock-net
-      projectKey: 'WireMock-Net_WireMock.Net'
-      projectName: 'WireMock.Net'
-      extraProperties: |
-        sonar.cs.opencover.reportsPaths=**/coverage.net8.0.opencover.xml
   
   - task: DotNetCoreCLI@2
     displayName: 'Build Unit tests'
     inputs:
       command: 'build'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework net8.0'
+      arguments: '--configuration Debug --framework net8.0 --no-incremental'
 
   - task: CmdLine@2
     inputs:
-      script: 'dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --no-build --configuration Debug --framework net8.0'
+      script: 'dotnet-coverage collect "dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage.xml"'
     displayName: 'Execute Unit Tests with Coverage'
-   
-  - task: SonarCloudAnalyze@1
-    displayName: 'SonarCloud: Run Code Analysis'
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
   
-  - task: SonarCloudPublish@1
-    displayName: 'SonarCloud: Publish Quality Gate Result'
+  - script: |
+      dotnet sonarscanner end /d:sonar.token="$(SONAR_TOKEN)"
+    displayName: 'End analysis on SonarCloud'
     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
   
   - task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@19

examples/WireMock.Net.Client/Program.cs

@@ -14,10 +14,13 @@ class Program
 {
     static async Task Main(string[] args)
     {
+        // Start WireMock.Net tool with Admin interface
+        // dotnet-wiremock --StartAdminInterface
+
         // Create an implementation of the IWireMockAdminApi and pass in the base URL for the API.
         var api = RestClient.For<IWireMockAdminApi>("http://localhost:9091");
 
-        // await api.ResetMappingsAsync().ConfigureAwait(false);
+        await api.ResetMappingsAsync().ConfigureAwait(false);
 
         var mappingBuilder = api.GetMappingBuilder();
         mappingBuilder.Given(m => m
@@ -51,13 +54,32 @@ class Program
                 .WithPath("/bla3")
             )
             .WithResponse(rsp => rsp
-                .WithBodyAsJson(new 
+                .WithBodyAsJson(new
                 {
                     x = "test"
                 }, true)
             )
         );
 
+        mappingBuilder.Given(m => m
+            .WithRequest(req => req
+                .WithPath("/test1")
+                .UsingPost()
+                .WithBody(b => b
+                    .WithJmesPathMatcher("things.name == 'RequiredThing'")
+                )
+            )
+            .WithResponse(rsp => rsp
+                .WithHeaders(h => h.Add("Content-Type", "application/json"))
+                .WithDelay(TimeSpan.FromMilliseconds(50))
+                .WithStatusCode(200)
+                .WithBodyAsJson(new
+                {
+                    status = "ok"
+                }, true)
+            )
+        );
+
         var result = await mappingBuilder.BuildAndPostAsync().ConfigureAwait(false);
         Console.WriteLine($"result = {JsonConvert.SerializeObject(result)}");
 
@@ -112,6 +134,9 @@ class Program
         var getFileResult = await api.GetFileAsync("1.cs");
         Console.WriteLine($"getFileResult = {getFileResult}");
 
+        Console.WriteLine("Press any key to reset mappings");
+        Console.ReadKey();
+
         var resetMappingsAsync = await api.ResetMappingsAsync();
         Console.WriteLine($"resetMappingsAsync = {resetMappingsAsync.Status}");
 

examples/WireMock.Net.Client/Properties/launchSettings.json

@@ -1,8 +0,0 @@
-{
-  "profiles": {
-    "WSL": {
-      "commandName": "WSL2",
-      "distributionName": ""
-    }
-  }
-}

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

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
     </PropertyGroup>
 

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

@@ -97,34 +97,30 @@ message HelloReply {
 
         private static void RunOnLocal()
         {
-            var localIP = Dns.GetHostEntry(Dns.GetHostName()).AddressList.First(a => a.AddressFamily == AddressFamily.InterNetwork);
-
-            //try
-            //{
-            //    var server = WireMockServer.Start(new WireMockServerSettings
-            //    {
-            //        Urls = new[] { $"http://{localIP}:9091" },
-            //        StartAdminInterface = true
-            //    });
-            //    System.Console.WriteLine($"1: {string.Join(", ", server.Urls)}");
-
-            //    System.Console.WriteLine("Press any key to stop...");
-            //    System.Console.ReadKey();
-            //    server.Stop();
-            //}
-            //catch (Exception e)
-            //{
-            //    System.Console.WriteLine(e);
-            //}
-
             try
             {
                 var server = WireMockServer.Start(new WireMockServerSettings
                 {
                     Port = 9091,
-                    StartAdminInterface = true
+                    StartAdminInterface = true,
+                    Logger = new WireMockConsoleLogger()
                 });
-                System.Console.WriteLine($"2: {string.Join(", ", server.Urls)}");
+                System.Console.WriteLine(string.Join(", ", server.Urls));
+
+                var requestJson = new { PricingContext = new { Market = "USA" } };
+                var responseJson = new { Market = "{{JsonPath.SelectToken request.body \"$.PricingContext.Market\"}}" };
+                server
+                    .Given(Request.Create()
+                        //.WithBody(new JsonMatcher(requestJson))
+                        .WithBodyAsJson(requestJson)
+                        .WithPath("/pricing")
+                        .UsingPost()
+                    )
+                    .RespondWith(Response.Create()
+                        .WithHeader("Content-Type", "application/json")
+                        .WithBodyAsJson(responseJson)
+                        .WithTransformer(true)
+                    );
 
                 System.Console.WriteLine("Press any key to stop...");
                 System.Console.ReadKey();
@@ -134,24 +130,6 @@ message HelloReply {
             {
                 System.Console.WriteLine(e);
             }
-
-            //try
-            //{
-            //    var server = WireMockServer.Start(new WireMockServerSettings
-            //    {
-            //        Urls = new[] { "http://*:9091" },
-            //        StartAdminInterface = true
-            //    });
-            //    System.Console.WriteLine($"3: {string.Join(", ", server.Urls)}");
-
-            //    System.Console.WriteLine("Press any key to stop...");
-            //    System.Console.ReadKey();
-            //    server.Stop();
-            //}
-            //catch (Exception e)
-            //{
-            //    System.Console.WriteLine(e);
-            //}
         }
 
         public static void Run()
@@ -251,7 +229,9 @@ message HelloReply {
             server.SetBasicAuthentication("a", "b");
             //server.SetAzureADAuthentication("6c2a4722-f3b9-4970-b8fc-fac41e29stef", "8587fde1-7824-42c7-8592-faf92b04stef");
 
-            // server.AllowPartialMapping();
+            //var http = new HttpClient();
+            //var response = await http.GetAsync($"{_wireMockServer.Url}/pricing");
+            //var value = await response.Content.ReadAsStringAsync();
 
 #if PROTOBUF
             var protoBufJsonMatcher = new JsonPartialWildcardMatcher(new { name = "*" });
@@ -395,7 +375,6 @@ message HelloReply {
                         .WithHeader("Content-Type", "text/plain")
                 );
 
-
             server
                 .Given(Request.Create()
                     .UsingMethod("GET")

src/WireMock.Net.Abstractions/BuilderExtensions/BodyModelBuilder.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// BodyModelBuilder
+/// </summary>
+public partial class BodyModelBuilder
+{
+    public BodyModelBuilder WithNotNullOrEmptyMatcher(bool rejectOnMatch = false)
+    {
+        return WithMatcher(mb => mb
+            .WithName("NotNullOrEmptyMatcher")
+            .WithRejectOnMatch(rejectOnMatch)
+        );
+    }
+
+    public BodyModelBuilder WithCSharpCodeMatcher(string pattern, bool rejectOnMatch = false)
+    {
+        return WithMatcher("CSharpCodeMatcher", pattern, rejectOnMatch);
+    }
+
+    public BodyModelBuilder WithLinqMatcher(string pattern, bool rejectOnMatch = false)
+    {
+        return WithMatcher("LinqMatcher", pattern, rejectOnMatch);
+    }
+
+    public BodyModelBuilder WithExactMatcher(string pattern, bool rejectOnMatch = false)
+    {
+        return WithMatcher("ExactMatcher", pattern, rejectOnMatch);
+    }
+
+    public BodyModelBuilder WithExactObjectMatcher(object value, bool rejectOnMatch = false)
+    {
+        return WithMatcher("ExactObjectMatcher", value, rejectOnMatch);
+    }
+
+    public BodyModelBuilder WithGraphQLMatcher(string pattern, IDictionary<string, Type>? customScalars = null, bool rejectOnMatch = false)
+    {
+        return WithMatcher(mb => mb
+            .WithName("GraphQLMatcher")
+            .WithCustomScalars(customScalars)
+            .WithPattern(pattern)
+            .WithRejectOnMatch(rejectOnMatch)
+        );
+    }
+
+    public BodyModelBuilder WithProtoBufMatcher(string pattern, bool rejectOnMatch = false)
+    {
+        return WithMatcher(mb => mb
+            .WithName("ProtoBufMatcher")
+            .WithPattern(pattern)
+            .WithRejectOnMatch(rejectOnMatch)
+        );
+    }
+
+    public BodyModelBuilder WithRegexMatcher(string pattern, bool ignoreCase = false, bool rejectOnMatch = false)
+    {
+        return WithMatcher(mb => mb
+            .WithName("RegexMatcher")
+            .WithPattern(pattern)
+            .WithIgnoreCase(ignoreCase)
+            .WithRejectOnMatch(rejectOnMatch)
+        );
+    }
+
+    public BodyModelBuilder WithJsonMatcher(string pattern, bool ignoreCase = false, bool useRegex = false, bool rejectOnMatch = false)
+    {
+        return WithMatcher(mb => mb
+            .WithName("JsonMatcher")
+            .WithPattern(pattern)
+            .WithIgnoreCase(ignoreCase)
+            .WithRegex(useRegex)
+            .WithRejectOnMatch(rejectOnMatch)
+        );
+    }
+
+    public BodyModelBuilder WithJsonPartialMatcher(string pattern, bool ignoreCase = false, bool useRegex = false, bool rejectOnMatch = false)
+    {
+        return WithMatcher(mb => mb
+            .WithName("JsonPartialMatcher")
+            .WithPattern(pattern)
+            .WithIgnoreCase(ignoreCase)
+            .WithRegex(useRegex)
+            .WithRejectOnMatch(rejectOnMatch)
+        );
+    }
+
+    public BodyModelBuilder WithJsonPathMatcher(string pattern, bool rejectOnMatch = false)
+    {
+        return WithMatcher("JsonPathMatcher", pattern, rejectOnMatch);
+    }
+
+    public BodyModelBuilder WithJmesPathMatcher(string pattern, bool rejectOnMatch = false)
+    {
+        return WithMatcher("JmesPathMatcher", pattern, rejectOnMatch);
+    }
+
+    public BodyModelBuilder WithXPathMatcher(string pattern, XmlNamespace[]? xmlNamespaceMap = null, bool rejectOnMatch = false)
+    {
+        return WithMatcher(mb => mb
+            .WithName("PathMatcher")
+            .WithPattern(pattern)
+            .WithXmlNamespaceMap(xmlNamespaceMap)
+            .WithRejectOnMatch(rejectOnMatch)
+        );
+    }
+
+    public BodyModelBuilder WithWildcardMatcher(string pattern, bool ignoreCase = false, bool rejectOnMatch = false)
+    {
+        return WithMatcher("WildcardMatcher", pattern, rejectOnMatch, ignoreCase);
+    }
+
+    public BodyModelBuilder WithSimMetricsMatcher(string pattern, bool ignoreCase = false, bool rejectOnMatch = false)
+    {
+        return WithMatcher("SimMetricsMatcher", pattern, rejectOnMatch, ignoreCase);
+    }
+
+    private BodyModelBuilder WithMatcher(string name, object pattern, bool rejectOnMatch, bool ignoreCase = false)
+    {
+        return WithMatcher(mb => mb
+            .WithName(name)
+            .WithPattern(pattern)
+            .WithRejectOnMatch(rejectOnMatch)
+            .WithIgnoreCase(ignoreCase)
+        );
+    }
+}

src/WireMock.Net.RestClient/Extensions/WireMockAdminApiExtensions.cs

@@ -1,3 +1,9 @@
+using System;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Stef.Validation;
 using WireMock.Client.Builders;
 
 namespace WireMock.Client.Extensions;
@@ -7,13 +13,77 @@ namespace WireMock.Client.Extensions;
 /// </summary>
 public static class WireMockAdminApiExtensions
 {
+    private const int MaxRetries = 5;
+    private const int InitialWaitingTimeInMilliSeconds = 500;
+    private const string HealthStatusHealthy = "Healthy";
+
     /// <summary>
     /// Get a new <see cref="AdminApiMappingBuilder"/> for the <see cref="IWireMockAdminApi"/>.
     /// </summary>
-    /// <param name="api">See <see cref="IWireMockAdminApi"/>.</param>
+    /// <param name="adminApi">See <see cref="IWireMockAdminApi"/>.</param>
     /// <returns></returns>
-    public static AdminApiMappingBuilder GetMappingBuilder(this IWireMockAdminApi api)
+    public static AdminApiMappingBuilder GetMappingBuilder(this IWireMockAdminApi adminApi)
     {
-        return new AdminApiMappingBuilder(api);
+        return new AdminApiMappingBuilder(adminApi);
+    }
+
+    /// <summary>
+    /// Set basic authentication to access the <see cref="IWireMockAdminApi"/>.
+    /// </summary>
+    /// <param name="adminApi">See <see cref="IWireMockAdminApi"/>.</param>
+    /// <param name="username">The admin username.</param>
+    /// <param name="password">The admin password.</param>
+    /// <returns><see cref="IWireMockAdminApi"/></returns>
+    public static IWireMockAdminApi WithAuthorization(this IWireMockAdminApi adminApi, string username, string password)
+    {
+        Guard.NotNull(adminApi);
+        Guard.NotNullOrEmpty(username);
+        Guard.NotNullOrEmpty(password);
+
+        adminApi.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}")));
+        return adminApi;
+    }
+
+    /// <summary>
+    /// Wait for the WireMock.Net server to be healthy. (The "/__admin/health" returns "Healthy").
+    /// </summary>
+    /// <param name="adminApi">See <see cref="IWireMockAdminApi"/>.</param>
+    /// <param name="maxRetries">The maximum number of retries. Default is <c>5</c>.</param>
+    /// <param name="cancellationToken">The optional <see cref="CancellationToken"/>.</param>
+    /// <returns>A completed Task in case the health endpoint is available, else throws a <see cref="InvalidOperationException"/>.</returns>
+    public static async Task WaitForHealthAsync(this IWireMockAdminApi adminApi, int maxRetries = MaxRetries, CancellationToken cancellationToken = default)
+    {
+        Guard.NotNull(adminApi);
+
+        var retries = 0;
+        var waitTime = InitialWaitingTimeInMilliSeconds;
+        var totalWaitTime = waitTime;
+        var isHealthy = await IsHealthyAsync(adminApi, cancellationToken);
+        while (!isHealthy && retries < MaxRetries && !cancellationToken.IsCancellationRequested)
+        {
+            waitTime = (int)(InitialWaitingTimeInMilliSeconds * Math.Pow(2, retries));
+            await Task.Delay(waitTime, cancellationToken);
+            isHealthy = await IsHealthyAsync(adminApi, cancellationToken);
+            retries++;
+            totalWaitTime += waitTime;
+        }
+
+        if (retries >= MaxRetries)
+        {
+            throw new InvalidOperationException($"The /__admin/health endpoint did not return 'Healthy' after {MaxRetries} retries and {totalWaitTime / 1000.0:0.0} seconds.");
+        }
+    }
+
+    private static async Task<bool> IsHealthyAsync(IWireMockAdminApi adminApi, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var status = await adminApi.GetHealthAsync(cancellationToken);
+            return string.Equals(status, HealthStatusHealthy, StringComparison.OrdinalIgnoreCase);
+        }
+        catch
+        {
+            return false;
+        }
     }
 }

src/WireMock.Net.RestClient/IWireMockAdminApi.cs

@@ -24,12 +24,24 @@ public interface IWireMockAdminApi
     [Header("Authorization")]
     AuthenticationHeaderValue Authorization { get; set; }
 
+    /// <summary>
+    /// Get health status.
+    /// </summary>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    /// <returns>
+    /// Returns HttpStatusCode <c>200</c> with a value <c>Healthy</c> to indicate that WireMock.Net is healthy.
+    /// Else it returns HttpStatusCode <c>404</c>.
+    /// </returns>
+    [Get("health")]
+    [AllowAnyStatusCode]
+    Task<string> GetHealthAsync(CancellationToken cancellationToken = default);
+
     /// <summary>
     /// Get the settings.
     /// </summary>
     /// <returns>SettingsModel</returns>
     [Get("settings")]
-    Task<SettingsModel> GetSettingsAsync();
+    Task<SettingsModel> GetSettingsAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Update the settings.

src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj

@@ -29,7 +29,7 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="Testcontainers" Version="[3.7.0]" />
+        <PackageReference Include="Testcontainers" Version="[3.9.0]" />
         <PackageReference Include="JetBrains.Annotations" VersionOverride="2022.3.1" PrivateAssets="All" Version="2023.3.0" />
     </ItemGroup>
 

src/WireMock.Net.Testcontainers/WireMockContainer.cs

@@ -4,10 +4,10 @@ using System.Net.Http.Headers;
 using System.Text;
 using DotNet.Testcontainers.Containers;
 using JetBrains.Annotations;
-using Microsoft.Extensions.Logging;
 using RestEase;
 using Stef.Validation;
 using WireMock.Client;
+using WireMock.Client.Extensions;
 using WireMock.Http;
 
 namespace WireMock.Net.Testcontainers;
@@ -25,8 +25,7 @@ public sealed class WireMockContainer : DockerContainer
     /// Initializes a new instance of the <see cref="WireMockContainer" /> class.
     /// </summary>
     /// <param name="configuration">The container configuration.</param>
-    /// <param name="logger">The logger.</param>
-    public WireMockContainer(WireMockConfiguration configuration, ILogger logger) : base(configuration, logger)
+    public WireMockContainer(WireMockConfiguration configuration) : base(configuration)
     {
         _configuration = Guard.NotNull(configuration);
     }
@@ -47,13 +46,7 @@ public sealed class WireMockContainer : DockerContainer
         ValidateIfRunning();
 
         var api = RestClient.For<IWireMockAdminApi>(GetPublicUri());
-
-        if (_configuration.HasBasicAuthentication)
-        {
-            api.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($"{_configuration.Username}:{_configuration.Password}")));
-        }
-
-        return api;
+        return _configuration.HasBasicAuthentication ? api.WithAuthorization(_configuration.Username!, _configuration.Password!) : api;
     }
 
     /// <summary>

src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs

@@ -138,7 +138,7 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
     {
         Validate();
 
-        return new WireMockContainer(DockerResourceConfiguration, TestcontainersSettings.Logger);
+        return new WireMockContainer(DockerResourceConfiguration);
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -31,7 +31,6 @@ public class JsonMatcher : IJsonMatcher
     public bool Regex { get; }
 
     private readonly JToken _valueAsJToken;
-    private readonly Func<JToken, JToken> _jTokenConverter;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
@@ -70,7 +69,6 @@ public class JsonMatcher : IJsonMatcher
 
         Value = value;
         _valueAsJToken = JsonUtils.ConvertValueToJToken(value);
-        _jTokenConverter = ignoreCase ? Rename : jToken => jToken;
     }
 
     /// <inheritdoc />
@@ -86,7 +84,7 @@ public class JsonMatcher : IJsonMatcher
             {
                 var inputAsJToken = JsonUtils.ConvertValueToJToken(input);
 
-                var match = IsMatch(_jTokenConverter(_valueAsJToken), _jTokenConverter(inputAsJToken));
+                var match = IsMatch(RenameJToken(_valueAsJToken), RenameJToken(inputAsJToken));
                 score = MatchScores.ToScore(match);
             }
             catch (Exception ex)
@@ -179,38 +177,59 @@ public class JsonMatcher : IJsonMatcher
         }
     }
 
+    // https://stackoverflow.com/questions/11679804/json-net-rename-properties
+    private JToken RenameJToken(JToken input)
+    {
+        if (!IgnoreCase)
+        {
+            return input;
+        }
+
+        return input switch
+        {
+            JProperty property => RenameJProperty(property),
+            JArray array => RenameJArray(array),
+            JObject obj => RenameJObject(obj),
+            _ => input
+        };
+    }
+
+    private JProperty RenameJProperty(JProperty property)
+    {
+        if (!IgnoreCase)
+        {
+            return property;
+        }
+
+        var propertyValue = property.Value;
+        if (propertyValue.Type == JTokenType.String && !Regex)
+        {
+            var stringValue = propertyValue.Value<string>()!;
+            propertyValue = ToUpper(stringValue);
+        }
+
+        return new JProperty(ToUpper(property.Name)!, RenameJToken(propertyValue));
+    }
+
+    private JArray RenameJArray(JArray array)
+    {
+        if (Regex)
+        {
+            return array;
+        }
+
+        var renamedValues = array.Select(RenameJToken);
+        return new JArray(renamedValues);
+    }
+
+    private JObject RenameJObject(JObject obj)
+    {
+        var renamedProperties = obj.Properties().Select(RenameJProperty);
+        return new JObject(renamedProperties);
+    }
+
     private static string? ToUpper(string? input)
     {
         return input?.ToUpperInvariant();
     }
-
-    // https://stackoverflow.com/questions/11679804/json-net-rename-properties
-    private static JToken Rename(JToken json)
-    {
-        if (json is JProperty property)
-        {
-            JToken propertyValue = property.Value;
-            if (propertyValue.Type == JTokenType.String)
-            {
-                string stringValue = propertyValue.Value<string>()!;
-                propertyValue = ToUpper(stringValue);
-            }
-
-            return new JProperty(ToUpper(property.Name)!, Rename(propertyValue));
-        }
-
-        if (json is JArray array)
-        {
-            var renamedValues = array.Select(Rename);
-            return new JArray(renamedValues);
-        }
-
-        if (json is JObject obj)
-        {
-            var renamedProperties = obj.Properties().Select(Rename);
-            return new JObject(renamedProperties);
-        }
-
-        return json;
-    }
 }

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -51,23 +51,13 @@ public interface IBodyRequestBuilder : IProtoBufRequestBuilder
     IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
     /// <summary>
-    /// WithBody : Body as a string response based on a object (which will be converted to a JSON string using NewtonSoft.Json).
+    /// WithBodyAsJson: A <see cref="JsonMatcher"/> will be used to match this object.
     /// </summary>
     /// <param name="body">The body.</param>
     /// <param name="matchBehaviour">The match behaviour [default is AcceptOnMatch].</param>
     /// <returns>A <see cref="IRequestBuilder"/>.</returns>
     IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-    /// <summary>
-    /// WithBody : Body as a string response based on a object (which will be converted to a JSON string using the <see cref="IJsonConverter"/>).
-    /// </summary>
-    /// <param name="body">The body.</param>
-    /// <param name="converter">The JsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <param name="matchBehaviour">The match behaviour [default is AcceptOnMatch].</param>
-    /// <returns>A <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsJson(object body, IJsonConverter converter, JsonConverterOptions? options = null, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
     /// <summary>
     /// WithBody: func (string)
     /// </summary>

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

@@ -2,8 +2,6 @@
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System;
 using System.Collections.Generic;
-using JsonConverter.Abstractions;
-using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
@@ -37,19 +35,7 @@ public partial class Request
     /// <inheritdoc />
     public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
-        var bodyAsJsonString = JsonConvert.SerializeObject(body);
-        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, bodyAsJsonString));
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsJson(object body, IJsonConverter converter, JsonConverterOptions? options = null, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        Guard.NotNull(converter);
-
-        var bodyAsJsonString = converter.Serialize(body, options);
-        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, bodyAsJsonString));
-        return this;
+        return WithBody(new IMatcher[] { new JsonMatcher(matchBehaviour, body) });
     }
 
     /// <inheritdoc />

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

@@ -31,6 +31,7 @@ public partial class WireMockServer
 {
     private const int EnhancedFileSystemWatcherTimeoutMs = 1000;
     private const string AdminFiles = "/__admin/files";
+    private const string AdminHealth = "/__admin/health";
     private const string AdminMappings = "/__admin/mappings";
     private const string AdminMappingsCode = "/__admin/mappings/code";
     private const string AdminMappingsWireMockOrg = "/__admin/mappings/wiremock.org";
@@ -54,6 +55,9 @@ public partial class WireMockServer
     #region InitAdmin
     private void InitAdmin()
     {
+        // __admin/health
+        Given(Request.Create().WithPath(AdminHealth).UsingGet()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(HealthGet));
+
         // __admin/settings
         Given(Request.Create().WithPath(AdminSettings).UsingGet()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(SettingsGet));
         Given(Request.Create().WithPath(AdminSettings).UsingMethod("PUT", "POST").WithHeader(HttpKnownHeaderNames.ContentType, AdminRequestContentTypeJson)).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(SettingsUpdate));
@@ -218,6 +222,22 @@ public partial class WireMockServer
     }
     #endregion
 
+    #region Health
+    private static IResponseMessage HealthGet(IRequestMessage requestMessage)
+    {
+        return new ResponseMessage
+        {
+            BodyData = new BodyData
+            {
+                DetectedBodyType = BodyType.String,
+                BodyAsString = "Healthy"
+            },
+            StatusCode = (int)HttpStatusCode.OK,
+            Headers = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string>(WireMockConstants.ContentTypeTextPlain) } }
+        };
+    }
+    #endregion
+
     #region Settings
     private IResponseMessage SettingsGet(IRequestMessage requestMessage)
     {
@@ -830,4 +850,4 @@ public partial class WireMockServer
         var singleResult = ((JObject)value).ToObject<T>();
         return new[] { singleResult! };
     }
-}
+}

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs

@@ -17,6 +17,7 @@ using VerifyXunit;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Settings;
 using WireMock.Client;
+using WireMock.Client.Extensions;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
@@ -41,6 +42,47 @@ public partial class WireMockAdminApiTests
         VerifyNewtonsoftJson.Enable(VerifySettings);
     }
 
+    [Fact]
+    public async Task IWireMockAdminApi_WaitForHealthAsync_AndCall_GetHealthAsync_OK()
+    {
+        // Arrange
+        var adminUsername = $"username_{Guid.NewGuid()}";
+        var adminPassword = $"password_{Guid.NewGuid()}";
+        var server = WireMockServer.Start(w =>
+        {
+            w.StartAdminInterface = true;
+            w.AdminUsername = adminUsername;
+            w.AdminPassword = adminPassword;
+        });
+        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0])
+            .WithAuthorization(adminUsername, adminPassword);
+
+        // Act 1
+        await api.WaitForHealthAsync().ConfigureAwait(false);
+
+        // Act 2
+        var status = await api.GetHealthAsync().ConfigureAwait(false);
+        status.Should().Be("Healthy");
+    }
+
+    [Fact]
+    public async Task IWireMockAdminApi_WaitForHealthAsync_AndCall_GetHealthAsync_ThrowsException()
+    {
+        // Arrange
+        var server = WireMockServer.Start(w =>
+        {
+            w.StartAdminInterface = true;
+            w.AdminUsername = $"username_{Guid.NewGuid()}";
+            w.AdminPassword = $"password_{Guid.NewGuid()}";
+        });
+
+        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
+
+        // Act
+        Func<Task> act = () => api.WaitForHealthAsync(maxRetries: 3);
+        await act.Should().ThrowAsync<InvalidOperationException>();
+    }
+
     [Fact]
     public async Task IWireMockAdminApi_GetSettingsAsync()
     {

test/WireMock.Net.Tests/Extensions/EnumExtensionsTests.cs

@@ -0,0 +1,40 @@
+using System;
+using FluentAssertions;
+using WireMock.Extensions;
+using Xunit;
+
+namespace WireMock.Net.Tests.Extensions;
+
+public class EnumExtensionsTests
+{
+    private enum TestEnum
+    {
+        Value1
+    }
+
+    [Fact]
+    public void EnumExtensions_GetFullyQualifiedEnumValue_ShouldReturnCorrectValue()
+    {
+        // Arrange
+        var enumValue = TestEnum.Value1;
+
+        // Act
+        var result = enumValue.GetFullyQualifiedEnumValue();
+
+        // Assert
+        result.Should().Be("WireMock.Net.Tests.Extensions.TestEnum.Value1");
+    }
+
+    [Fact]
+    public void EnumExtensions_GetFullyQualifiedEnumValue_ShouldThrowArgumentException_WhenTypeIsNotEnum()
+    {
+        // Arrange
+        int nonEnumValue = 42;
+
+        // Act
+        Action act = () => nonEnumValue.GetFullyQualifiedEnumValue();
+
+        // Assert
+        act.Should().Throw<ArgumentException>().WithMessage("T must be an enum");
+    }
+}

test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs

@@ -385,4 +385,22 @@ public class JsonPartialWildcardMatcherTests
         // Assert
         Assert.Equal(0.0, match);
     }
+
+    [Fact]
+    public void JsonPartialWildcardMatcher_IsMatch_WithIgnoreCaseTrueAndRegexTrue_JObject()
+    {
+        // Assign 
+        var matcher = new JsonPartialWildcardMatcher(new { id = 1, Number = "^\\d+$" }, ignoreCase: true, regex: true);
+
+        // Act 
+        var jObject = new JObject
+        {
+            { "Id", new JValue(1) },
+            { "Number", new JValue(1) }
+        };
+        double match = matcher.IsMatch(jObject).Score;
+
+        // Assert 
+        Assert.Equal(1.0, match);
+    }
 }

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs

@@ -3,8 +3,6 @@ using FluentAssertions;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using JsonConverter.Abstractions;
-using Moq;
 using Newtonsoft.Json;
 using NFluent;
 using WireMock.Matchers;
@@ -293,7 +291,7 @@ public class RequestBuilderWithBodyTests
     }
 
     [Fact]
-    public void Request_WithBodyAsJson_Object_JsonPathMatcher_true()
+    public void Request_WithBody_Object_JsonPathMatcher_true()
     {
         // Arrange
         var spec = Request.Create().UsingAnyMethod().WithBody(new JsonPathMatcher("$..things[?(@.name == 'RequiredThing')]"));
@@ -316,7 +314,7 @@ public class RequestBuilderWithBodyTests
     }
 
     [Fact]
-    public void Request_WithBodyAsJson_Array_JsonPathMatcher_1()
+    public void Request_WithBody_Array_JsonPathMatcher_1()
     {
         // Arrange
         var spec = Request.Create().UsingAnyMethod().WithBody(new JsonPathMatcher("$..books[?(@.price < 10)]"));
@@ -339,7 +337,7 @@ public class RequestBuilderWithBodyTests
     }
 
     [Fact]
-    public void Request_WithBodyAsJson_Array_JsonPathMatcher_2()
+    public void Request_WithBody_Array_JsonPathMatcher_2()
     {
         // Arrange
         var spec = Request.Create().UsingAnyMethod().WithBody(new JsonPathMatcher("$..[?(@.Id == 1)]"));
@@ -363,7 +361,7 @@ public class RequestBuilderWithBodyTests
     }
 
     [Fact]
-    public void Request_WithBodyAsObject_ExactObjectMatcher_true()
+    public void Request_WithBody_ExactObjectMatcher_true()
     {
         // Assign
         object body = DateTime.MinValue;
@@ -384,7 +382,7 @@ public class RequestBuilderWithBodyTests
     }
 
     [Fact]
-    public void Request_WithBodyAsJson_UsingObject()
+    public void Request_WithBodyAsJson_UsingObject_UsesJsonMatcher()
     {
         // Assign
         object body = new
@@ -395,34 +393,8 @@ public class RequestBuilderWithBodyTests
 
         var bodyData = new BodyData
         {
-            BodyAsString = JsonConvert.SerializeObject(body),
-            DetectedBodyType = BodyType.String
-        };
-
-        // Act
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, bodyData);
-
-        // Assert
-        var requestMatchResult = new RequestMatchResult();
-        Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-    }
-
-    [Fact]
-    public void Request_WithBodyAsJson_WithIJsonConverter_UsingObject()
-    {
-        // Assign
-        var jsonConverterMock = new Mock<IJsonConverter>();
-        jsonConverterMock.Setup(j => j.Serialize(It.IsAny<object>(), It.IsAny<JsonConverterOptions>())).Returns("test");
-        object body = new
-        {
-            Any = "key"
-        };
-        var requestBuilder = Request.Create().UsingAnyMethod().WithBodyAsJson(body, jsonConverterMock.Object);
-
-        var bodyData = new BodyData
-        {
-            BodyAsString = "test",
-            DetectedBodyType = BodyType.String
+            BodyAsJson = body,
+            DetectedBodyType = BodyType.Json
         };
 
         // Act

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

@@ -1,6 +1,7 @@
 using System;
 using System.Text;
 using System.Threading.Tasks;
+using FluentAssertions;
 using Moq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -354,7 +355,7 @@ public class ResponseWithHandlebarsJsonPathTests
     public async Task Response_ProvideResponse_Transformer_WithBodyAsFile_JsonPath()
     {
         // Assign
-        string jsonString = "{ \"MyUniqueNumber\": \"1\" }";
+        const string jsonString = "{ \"MyUniqueNumber\": \"1\" }";
         var bodyData = new BodyData
         {
             BodyAsString = jsonString,
@@ -365,15 +366,17 @@ public class ResponseWithHandlebarsJsonPathTests
         };
         var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, bodyData);
 
-        string jsonPath = "\"$.MyUniqueNumber\"";
         var responseBuilder = Response.Create()
             .WithTransformer()
-            .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ?
+
+            // We need to use `c:\\\\` here because when just using `c:\\\`, the `\\` it will be interpreted as an escape character to skip / exclude / escape the whole {{}} expression.
+            // See https://handlebarsjs.com/guide/expressions.html#escaping-handlebars-expressions
+            .WithBodyFromFile("c:\\\\{{JsonPath.SelectToken request.body \"$.MyUniqueNumber\" }}\\test.json");
 
         // Act
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.json");
+        response.Message.BodyData?.BodyAsFile.Should().Be(@"c:\1\test.json");
     }
 }

test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs

@@ -1,4 +1,5 @@
 #if NET6_0_OR_GREATER
+using System;
 using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Execution;
@@ -13,9 +14,12 @@ public class TestcontainersTests
     public async Task WireMockContainer_Build_and_StartAsync_and_StopAsync()
     {
         // Act
+        var adminUsername = $"username_{Guid.NewGuid()}";
+        var adminPassword = $"password_{Guid.NewGuid()}";
         var wireMockContainer = new WireMockContainerBuilder()
             .WithAutoRemove(true)
             .WithCleanUp(true)
+            .WithAdminUserNameAndPassword(adminUsername, adminPassword)
             .Build();
 
         try

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

@@ -117,7 +117,7 @@ public class WireMockServerProxyTests
         }
 
         // Assert
-        server.Mappings.Should().HaveCount(35);
+        server.Mappings.Should().HaveCount(36);
     }
 
     [Fact]

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

@@ -81,7 +81,7 @@ public class WireMockServerSettingsTests
 
         // Assert
         server.Mappings.Should().NotBeNull();
-        server.Mappings.Should().HaveCount(33);
+        server.Mappings.Should().HaveCount(34);
         server.Mappings.All(m => m.Priority == WireMockConstants.AdminPriority).Should().BeTrue();
     }
 
@@ -100,9 +100,9 @@ public class WireMockServerSettingsTests
 
         // Assert
         server.Mappings.Should().NotBeNull();
-        server.Mappings.Should().HaveCount(34);
+        server.Mappings.Should().HaveCount(35);
 
-        server.Mappings.Count(m => m.Priority == WireMockConstants.AdminPriority).Should().Be(33);
+        server.Mappings.Count(m => m.Priority == WireMockConstants.AdminPriority).Should().Be(34);
         server.Mappings.Count(m => m.Priority == WireMockConstants.ProxyPriority).Should().Be(1);
     }