mm

Author: StefH

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Build with Tests
+name: Run Tests
 
 on: 
   pull_request:
@@ -10,45 +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: |
-         8.0.x
-              
-    - name: 'Build Unit Tests'
-      run: |
-        dotnet build './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0
-
     - name: 'Run Unit Tests'
       run: |
         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: |
-            8.0.x
-                
-    - name: 'Build Unit Tests'
-      run: |
-        dotnet build './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0
-
     - name: 'Run Unit Tests'
       run: |
         dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 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)
 

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.57</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.57
+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.57 (04 June 2024)
-- #1113 Add some Extension methods to IWireMockAdminApi [feature]
+# 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

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

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,7 +4,6 @@
 using System.Text;
 using DotNet.Testcontainers.Containers;
 using JetBrains.Annotations;
-using Microsoft.Extensions.Logging;
 using RestEase;
 using Stef.Validation;
 using WireMock.Client;
@@ -26,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);
     }

src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs

@@ -138,7 +138,7 @@ public override WireMockContainer Build()
     {
         Validate();
 
-        return new WireMockContainer(DockerResourceConfiguration, TestcontainersSettings.Logger);
+        return new WireMockContainer(DockerResourceConfiguration);
     }
 
     /// <inheritdoc />

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");
+    }
+}