Version 2.x (#1359)

* Version 2.x * Setup .NET 9 * 12 * cleanup some #if for NETSTANDARD1_3 * cleanup + fix tests for net8 * openapi * NO ConfigureAwait(false) + cleanup * . * #endif * HashSet * WireMock.Net.NUnit * HttpContext * Add WebSockets (#1423) * Add WebSockets * Add tests * fix * more tests * Add tests * ... * remove IOwin * - * tests * fluent * ok * match * . * byte[] * x * func * func * byte * trans * ... * frameworks......... * jmes * xxx * sc * using var httpClient = new HttpClient(); * usings * maxRetries * up * xunit v3 * ct * --- * ct * ct2 * T Unit * WireMock.Net.TUnitTests / 10 * t unit first * --project * no tunit * t2 * --project * --project * ci - --project * publish ./test/wiremock-coverage.xml * windows * . * log * ... * log * goed * BodyType * . * . * --scenario * ... * pact * ct * . * WireMock.Net.RestClient.AwesomeAssertions (#1427) * WireMock.Net.RestClient.AwesomeAssertions * ok * atpath * fix test * sonar fixes * ports * proxy test * FIX? * --- * await Task.Delay(100, _ct); * ? * --project * Aspire: use IDistributedApplicationEventingSubscriber (#1428) * broadcast * ok * more tsts * . * Collection * up * . * 2 * remove nfluent * <VersionPrefix>2.0.0-preview-02</VersionPrefix> * ... * . * nuget icon * . * <PackageReference Include="JmesPath.Net" Version="1.1.0" /> * x * 500 * . * fix some warnings * ws
2026-04-24 09:48:51 +02:00 · 2026-03-11 17:02:47 +01:00
parent d6e19532bc
commit a292f28dda
521 changed files with 79740 additions and 5246 deletions
--- a/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs
+++ b/test/WireMock.Net.Tests/Owin/ActivityTracing/WireMockActivitySourceTests.cs
@@ -1,22 +1,39 @@
 // Copyright © WireMock.Net

-#if NET6_0_OR_GREATER
-using System;
 using System.Diagnostics;
-using System.Linq;
-using FluentAssertions;
+using System.Net.WebSockets;
 using Moq;
 using WireMock.Logging;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Owin.ActivityTracing;
+using WireMock.Settings;
 using WireMock.Util;
-using Xunit;
+using WireMock.WebSockets;

 namespace WireMock.Net.Tests.Owin.ActivityTracing;

-public class WireMockActivitySourceTests
+public class WireMockActivitySourceTests : IDisposable
 {
+    private readonly ActivityListener _activityListener;
+
+    public WireMockActivitySourceTests()
+    {
+        // Set up ActivityListener for tests
+        _activityListener = new ActivityListener
+        {
+            ShouldListenTo = source => source.Name == WireMockActivitySource.SourceName,
+            Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData
+        };
+
+        ActivitySource.AddActivityListener(_activityListener);
+    }
+
+    public void Dispose()
+    {
+        _activityListener?.Dispose();
+    }
+
    [Fact]
    public void EnrichWithRequest_ShouldSetRequestTagsAndBody_WhenEnabled()
    {
@@ -66,7 +83,7 @@ public class WireMockActivitySourceTests

        // Assert
        activity.GetTagItem(WireMockSemanticConventions.HttpStatusCode).Should().Be(200);
-        activity.GetTagItem("otel.status_code").Should().Be("OK");
+        activity.GetTagItem(WireMockSemanticConventions.OtelStatusCode).Should().Be("OK");
        activity.GetTagItem(WireMockSemanticConventions.ResponseBody).Should().Be("ok");
    }

@@ -85,7 +102,7 @@ public class WireMockActivitySourceTests

        // Assert
        activity.GetTagItem(WireMockSemanticConventions.HttpStatusCode).Should().Be(500);
-        activity.GetTagItem("otel.status_code").Should().Be("ERROR");
+        activity.GetTagItem(WireMockSemanticConventions.OtelStatusCode).Should().Be("ERROR");
    }

    [Fact]
@@ -179,17 +196,264 @@ public class WireMockActivitySourceTests
    {
        // Arrange
        using var activity = new Activity("test").Start();
-        var exception = new InvalidOperationException("boom");
+        var exception = new InvalidOperationException("Yes, Rico; Kaboom.");

        // Act
        WireMockActivitySource.RecordException(activity, exception);

        // Assert
-        activity.GetTagItem("otel.status_code").Should().Be("ERROR");
-        activity.GetTagItem("otel.status_description").Should().Be("boom");
+        activity.GetTagItem(WireMockSemanticConventions.OtelStatusCode).Should().Be("ERROR");
+        activity.GetTagItem("otel.status_description").Should().Be("Yes, Rico; Kaboom.");
        activity.GetTagItem("exception.type").Should().Be(typeof(InvalidOperationException).FullName);
-        activity.GetTagItem("exception.message").Should().Be("boom");
+        activity.GetTagItem("exception.message").Should().Be("Yes, Rico; Kaboom.");
        activity.GetTagItem("exception.stacktrace").Should().NotBeNull();
    }
-}
-#endif
+
+    [Fact]
+    public void StartRequestActivity_ShouldCreateActivity_WithCorrectDisplayName()
+    {
+        // Arrange
+        var requestMethod = "POST";
+        var requestPath = "/api/users";
+
+        // Act
+        using var activity = WireMockActivitySource.StartRequestActivity(requestMethod, requestPath);
+
+        // Assert
+        activity.Should().NotBeNull();
+        activity.DisplayName.Should().Be("WireMock POST /api/users");
+        activity.Kind.Should().Be(ActivityKind.Server);
+    }
+
+    [Fact]
+    public void StartWebSocketMessageActivity_ShouldCreateActivity_WithCorrectName()
+    {
+        // Arrange
+        var mappingGuid = Guid.NewGuid();
+        var direction = WebSocketMessageDirection.Receive;
+
+        // Act
+        using var activity = WireMockActivitySource.StartWebSocketMessageActivity(direction, mappingGuid);
+
+        // Assert
+        activity.Should().NotBeNull();
+        activity.DisplayName.Should().Be("WireMock WebSocket receive");
+        activity.Kind.Should().Be(ActivityKind.Server);
+    }
+
+    [Fact]
+    public void StartWebSocketMessageActivity_ShouldSetMappingGuidTag()
+    {
+        // Arrange
+        var mappingGuid = Guid.NewGuid();
+        var direction = WebSocketMessageDirection.Send;
+
+        // Act
+        using var activity = WireMockActivitySource.StartWebSocketMessageActivity(direction, mappingGuid);
+
+        // Assert
+        activity.Should().NotBeNull();
+        activity.GetTagItem(WireMockSemanticConventions.MappingGuid).Should().Be(mappingGuid.ToString());
+    }
+
+    [Fact]
+    public void StartWebSocketMessageActivity_ShouldCreateActivityForSendDirection()
+    {
+        // Arrange
+        var mappingGuid = Guid.NewGuid();
+        var direction = WebSocketMessageDirection.Send;
+
+        // Act
+        using var activity = WireMockActivitySource.StartWebSocketMessageActivity(direction, mappingGuid);
+
+        // Assert
+        activity.Should().NotBeNull();
+        activity.DisplayName.Should().Be("WireMock WebSocket send");
+    }
+
+    [Fact]
+    public void StartWebSocketMessageActivity_ShouldCreateActivityWithListenerConfigured()
+    {
+        // Arrange
+        var mappingGuid = Guid.NewGuid();
+        var direction = WebSocketMessageDirection.Receive;
+
+        // Act - ActivityListener is configured in test constructor
+        using var activity = WireMockActivitySource.StartWebSocketMessageActivity(direction, mappingGuid);
+
+        // Assert - activity should be created since listener is active
+        activity.Should().NotBeNull();
+        activity.DisplayName.Should().Be("WireMock WebSocket receive");
+        activity.GetTagItem(WireMockSemanticConventions.MappingGuid).Should().Be(mappingGuid.ToString());
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldSetMessageTypeTag()
+    {
+        // Arrange
+        using var activity = new Activity("test").Start();
+        var messageType = WebSocketMessageType.Text;
+
+        // Act
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            activity,
+            messageType,
+            messageSize: 100,
+            endOfMessage: true
+        );
+
+        // Assert
+        activity.GetTagItem(WireMockSemanticConventions.WebSocketMessageType).Should().Be("Text");
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldSetMessageSizeTag()
+    {
+        // Arrange
+        using var activity = new Activity("test").Start();
+
+        // Act
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            activity,
+            WebSocketMessageType.Binary,
+            messageSize: 256,
+            endOfMessage: true
+        );
+
+        // Assert
+        activity.GetTagItem(WireMockSemanticConventions.WebSocketMessageSize).Should().Be(256);
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldSetEndOfMessageTag()
+    {
+        // Arrange
+        using var activity = new Activity("test").Start();
+
+        // Act
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            activity,
+            WebSocketMessageType.Text,
+            messageSize: 50,
+            endOfMessage: false
+        );
+
+        // Assert
+        activity.GetTagItem(WireMockSemanticConventions.WebSocketEndOfMessage).Should().Be(false);
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldSetOkStatus()
+    {
+        // Arrange
+        using var activity = new Activity("test").Start();
+
+        // Act
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            activity,
+            WebSocketMessageType.Text,
+            messageSize: 100,
+            endOfMessage: true
+        );
+
+        // Assert
+        activity.GetTagItem(WireMockSemanticConventions.OtelStatusCode).Should().Be("OK");
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldRecordTextContent_WhenEnabled()
+    {
+        // Arrange
+        using var activity = new Activity("test").Start();
+        var options = new ActivityTracingOptions { RecordRequestBody = true };
+        var textContent = "Hello WebSocket";
+
+        // Act
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            activity,
+            WebSocketMessageType.Text,
+            messageSize: textContent.Length,
+            endOfMessage: true,
+            textContent: textContent,
+            options: options
+        );
+
+        // Assert
+        activity.GetTagItem(WireMockSemanticConventions.WebSocketMessageContent).Should().Be(textContent);
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldNotRecordTextContent_WhenDisabled()
+    {
+        // Arrange
+        using var activity = new Activity("test").Start();
+        var options = new ActivityTracingOptions { RecordRequestBody = false };
+
+        // Act
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            activity,
+            WebSocketMessageType.Text,
+            messageSize: 100,
+            endOfMessage: true,
+            textContent: "Hello WebSocket",
+            options: options
+        );
+
+        // Assert
+        activity.GetTagItem(WireMockSemanticConventions.WebSocketMessageContent).Should().BeNull();
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldNotRecordBinaryContent()
+    {
+        // Arrange
+        using var activity = new Activity("test").Start();
+        var options = new ActivityTracingOptions { RecordRequestBody = true };
+
+        // Act
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            activity,
+            WebSocketMessageType.Binary,
+            messageSize: 100,
+            endOfMessage: true,
+            textContent: "should not record",
+            options: options
+        );
+
+        // Assert
+        activity.GetTagItem(WireMockSemanticConventions.WebSocketMessageContent).Should().BeNull();
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldHandleNullActivity()
+    {
+        // Arrange & Act - should not throw
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            null,
+            WebSocketMessageType.Text,
+            messageSize: 100,
+            endOfMessage: true
+        );
+
+        // Assert - no exception thrown
+    }
+
+    [Fact]
+    public void EnrichWithWebSocketMessage_ShouldHandleClosedMessageType()
+    {
+        // Arrange
+        using var activity = new Activity("test").Start();
+
+        // Act
+        WireMockActivitySource.EnrichWithWebSocketMessage(
+            activity,
+            WebSocketMessageType.Close,
+            messageSize: 0,
+            endOfMessage: true
+        );
+
+        // Assert
+        activity.GetTagItem(WireMockSemanticConventions.WebSocketMessageType).Should().Be("Close");
+        activity.GetTagItem(WireMockSemanticConventions.WebSocketMessageSize).Should().Be(0);
+    }
+}
--- a/test/WireMock.Net.Tests/Owin/GlobalExceptionMiddlewareTests.cs
+++ b/test/WireMock.Net.Tests/Owin/GlobalExceptionMiddlewareTests.cs
@@ -1,45 +1,49 @@
 // Copyright © WireMock.Net

-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Moq;
-using NFluent;
+using WireMock.Logging;
 using WireMock.Owin;
 using WireMock.Owin.Mappers;
-using Xunit;
-#if NET452
-using IContext = Microsoft.Owin.IOwinContext;
-using IResponse = Microsoft.Owin.IOwinResponse;
-#else
-using IContext = Microsoft.AspNetCore.Http.HttpContext;
-using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
-#endif

-namespace WireMock.Net.Tests.Owin
+namespace WireMock.Net.Tests.Owin;
+
+public class GlobalExceptionMiddlewareTests
 {
-    public class GlobalExceptionMiddlewareTests
+    private readonly Mock<IWireMockMiddlewareOptions> _optionsMock;
+    private readonly Mock<IOwinResponseMapper> _responseMapperMock;
+
+    private readonly GlobalExceptionMiddleware _sut;
+
+    public GlobalExceptionMiddlewareTests()
    {
-        private readonly Mock<IWireMockMiddlewareOptions> _optionsMock;
-        private readonly Mock<IOwinResponseMapper> _responseMapperMock;
+        _optionsMock = new Mock<IWireMockMiddlewareOptions>();
+        _optionsMock.SetupGet(o => o.Logger).Returns(Mock.Of<IWireMockLogger>());

-        private readonly GlobalExceptionMiddleware _sut;
+        _responseMapperMock = new Mock<IOwinResponseMapper>();
+        _responseMapperMock.Setup(m => m.MapAsync(It.IsAny<ResponseMessage?>(), It.IsAny<HttpResponse>())).Returns(Task.FromResult(true));

-        public GlobalExceptionMiddlewareTests()
-        {
-            _optionsMock = new Mock<IWireMockMiddlewareOptions>();
-            _optionsMock.SetupAllProperties();
+        _sut = new GlobalExceptionMiddleware(_ => Task.CompletedTask, _optionsMock.Object, _responseMapperMock.Object);
+    }

-            _responseMapperMock = new Mock<IOwinResponseMapper>();
-            _responseMapperMock.SetupAllProperties();
-            _responseMapperMock.Setup(m => m.MapAsync(It.IsAny<ResponseMessage?>(), It.IsAny<IResponse>())).Returns(Task.FromResult(true));
+    [Fact]
+    public void GlobalExceptionMiddleware_Invoke_ValidNext_ShouldNotThrow()
+    {
+        // Act
+        _sut.Invoke(Mock.Of<HttpContext>());
+    }

-            _sut = new GlobalExceptionMiddleware(null, _optionsMock.Object, _responseMapperMock.Object);
-        }
+    [Fact]
+    public void GlobalExceptionMiddleware_Invoke_InvalidNext_ShouldCallResponseMapperWith500()
+    {
+        // Arrange
+        var sut = new GlobalExceptionMiddleware(_ => throw new ArgumentException(), _optionsMock.Object, _responseMapperMock.Object);

-        [Fact]
-        public void GlobalExceptionMiddleware_Invoke_NullAsNext_DoesNotInvokeNextAndDoesNotThrow()
-        {
-            // Act
-            Check.ThatAsyncCode(() => _sut.Invoke(null)).DoesNotThrow();
-        }
+        // Act
+        sut.Invoke(Mock.Of<HttpContext>());
+
+        // Verify
+        _responseMapperMock.Verify(m => m.MapAsync(It.IsAny<ResponseMessage>(), It.IsAny<HttpResponse>()), Times.Once);
+        _responseMapperMock.VerifyNoOtherCalls();
    }
 }
--- a/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs
+++ b/test/WireMock.Net.Tests/Owin/HostUrlOptionsTests.cs
@@ -1,11 +1,8 @@
 // Copyright © WireMock.Net

 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using FluentAssertions;
 using WireMock.Owin;
 using WireMock.Types;
-using Xunit;

 namespace WireMock.Net.Tests.Owin;

--- a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs
+++ b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs
@@ -1,29 +1,14 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
-using System.IO;
-using Xunit;
 using Moq;
-using System.Threading.Tasks;
-using System.Threading;
-using FluentAssertions;
 using WireMock.Handlers;
 using WireMock.Owin.Mappers;
 using WireMock.ResponseBuilders;
 using WireMock.Types;
 using WireMock.Util;
 using WireMock.Owin;
-#if NET452
-using Microsoft.Owin;
-using IResponse = Microsoft.Owin.IOwinResponse;
-// using Response = Microsoft.Owin.OwinResponse;
-#else
 using Microsoft.AspNetCore.Http;
-using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
-// using Response = Microsoft.AspNetCore.Http.HttpResponse;
 using Microsoft.Extensions.Primitives;
-#endif

 namespace WireMock.Net.Tests.Owin.Mappers;

@@ -31,7 +16,7 @@ public class OwinResponseMapperTests
 {
    private static readonly Task CompletedTask = Task.FromResult(true);
    private readonly OwinResponseMapper _sut;
-    private readonly Mock<IResponse> _responseMock;
+    private readonly Mock<HttpResponse> _responseMock;
    private readonly Mock<Stream> _stream;
    private readonly Mock<IHeaderDictionary> _headers;
    private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock;
@@ -58,7 +43,7 @@ public class OwinResponseMapperTests
        _headers.Setup(h => h.Add(It.IsAny<string>(), It.IsAny<StringValues>()));
 #endif

-        _responseMock = new Mock<IResponse>();
+        _responseMock = new Mock<HttpResponse>();
        _responseMock.SetupAllProperties();
        _responseMock.SetupGet(r => r.Body).Returns(_stream.Object);
        _responseMock.SetupGet(r => r.Headers).Returns(_headers.Object);
@@ -70,7 +55,7 @@ public class OwinResponseMapperTests
    public async Task OwinResponseMapper_MapAsync_Null()
    {
        // Act
-        await _sut.MapAsync(null, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(null, _responseMock.Object);
    }

    [Theory]
@@ -85,7 +70,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -106,7 +91,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -122,7 +107,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _responseMock.VerifySet(r => r.StatusCode = It.IsAny<int>(), Times.Never);
@@ -142,7 +127,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -158,7 +143,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Never);
@@ -176,7 +161,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny<CancellationToken>()), Times.Once);
@@ -194,7 +179,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _stream.Verify(s => s.WriteAsync(bytes, 0, bytes.Length, It.IsAny<CancellationToken>()), Times.Once);
@@ -212,7 +197,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _stream.Verify(s => s.WriteAsync(new byte[] { 123, 34, 116, 34, 58, 34, 120, 34, 125 }, 0, 9, It.IsAny<CancellationToken>()), Times.Once);
@@ -228,7 +213,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
 #if NET452
@@ -270,7 +255,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _stream.Verify(s => s.WriteAsync(new byte[0], 0, 0, It.IsAny<CancellationToken>()), Times.Once);
@@ -280,7 +265,7 @@ public class OwinResponseMapperTests
    [InlineData("abcd", BodyType.String)]
    [InlineData("", BodyType.String)]
    [InlineData(null, BodyType.None)]
-    public async Task OwinResponseMapper_MapAsync_WithFault_MALFORMED_RESPONSE_CHUNK(string body, BodyType detected)
+    public async Task OwinResponseMapper_MapAsync_WithFault_MALFORMED_RESPONSE_CHUNK(string? body, BodyType detected)
    {
        // Arrange
        var responseMessage = new ResponseMessage
@@ -292,7 +277,7 @@ public class OwinResponseMapperTests
        };

        // Act
-        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        await _sut.MapAsync(responseMessage, _responseMock.Object);

        // Assert
        _responseMock.VerifySet(r => r.StatusCode = 100, Times.Once);
--- a/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs
@@ -1,15 +1,12 @@
 // Copyright © WireMock.Net

-using System;
 using System.Collections.Concurrent;
-using FluentAssertions;
 using Moq;
 using WireMock.Logging;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Owin;
 using WireMock.Services;
-using Xunit;

 namespace WireMock.Net.Tests.Owin;

--- a/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs
+++ b/test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs
@@ -1,49 +1,31 @@
 // Copyright © WireMock.Net

-using System;
 using System.Collections.Concurrent;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-using Moq;
-using Xunit;
-using WireMock.Models;
-using WireMock.Owin;
-using WireMock.Owin.Mappers;
-using WireMock.Util;
-using WireMock.Logging;
-using WireMock.Matchers;
-using System.Collections.Generic;
-#if NET6_0_OR_GREATER
 using System.Diagnostics;
-#endif
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Http;
+using Moq;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
-using WireMock.Settings;
-using FluentAssertions;
 using WireMock.Handlers;
+using WireMock.Logging;
+using WireMock.Matchers;
 using WireMock.Matchers.Request;
-using WireMock.ResponseBuilders;
-using WireMock.RequestBuilders;
-#if NET6_0_OR_GREATER
+using WireMock.Models;
+using WireMock.Owin;
 using WireMock.Owin.ActivityTracing;
-#endif
-#if NET452
-using Microsoft.Owin;
-using IContext = Microsoft.Owin.IOwinContext;
-using IRequest = Microsoft.Owin.IOwinRequest;
-using IResponse = Microsoft.Owin.IOwinResponse;
-#else
-using Microsoft.AspNetCore.Http;
-using IContext = Microsoft.AspNetCore.Http.HttpContext;
-using IRequest = Microsoft.AspNetCore.Http.HttpRequest;
-using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
-#endif
+using WireMock.Owin.Mappers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using WireMock.Util;

 namespace WireMock.Net.Tests.Owin;

 public class WireMockMiddlewareTests
 {
    private static readonly Guid NewGuid = new("98fae52e-76df-47d9-876f-2ee32e931d9b");
+    private static readonly DateTime UtcNow = new(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc);
    private static readonly DateTime UpdatedAt = new(2022, 12, 4);

    private readonly ConcurrentDictionary<Guid, IMapping> _mappings = new();
@@ -53,14 +35,21 @@ public class WireMockMiddlewareTests
    private readonly Mock<IMappingMatcher> _matcherMock;
    private readonly Mock<IMapping> _mappingMock;
    private readonly Mock<IRequestMatchResult> _requestMatchResultMock;
-    private readonly Mock<IContext> _contextMock;
+    private readonly Mock<HttpContext> _contextMock;
+    private readonly Mock<IGuidUtils> _guidUtilsMock;
+    private readonly Mock<IDateTimeUtils> _dateTimeUtilsMock;

    private readonly WireMockMiddleware _sut;

    public WireMockMiddlewareTests()
    {
-        var guidUtilsMock = new Mock<IGuidUtils>();
-        guidUtilsMock.Setup(g => g.NewGuid()).Returns(NewGuid);
+        var wireMockMiddlewareLoggerMock = new Mock<IWireMockMiddlewareLogger>();
+
+        _guidUtilsMock = new Mock<IGuidUtils>();
+        _guidUtilsMock.Setup(g => g.NewGuid()).Returns(NewGuid);
+
+        _dateTimeUtilsMock = new Mock<IDateTimeUtils>();
+        _dateTimeUtilsMock.Setup(d => d.UtcNow).Returns(UtcNow);

        _optionsMock = new Mock<IWireMockMiddlewareOptions>();
        _optionsMock.SetupAllProperties();
@@ -74,31 +63,34 @@ public class WireMockMiddlewareTests
        _requestMapperMock = new Mock<IOwinRequestMapper>();
        _requestMapperMock.SetupAllProperties();
        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<HttpContext>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);

        _responseMapperMock = new Mock<IOwinResponseMapper>();
        _responseMapperMock.SetupAllProperties();
-        _responseMapperMock.Setup(m => m.MapAsync(It.IsAny<ResponseMessage?>(), It.IsAny<IResponse>())).Returns(Task.FromResult(true));
+        _responseMapperMock.Setup(m => m.MapAsync(It.IsAny<ResponseMessage?>(), It.IsAny<HttpResponse>())).Returns(Task.FromResult(true));

        _matcherMock = new Mock<IMappingMatcher>();
        _matcherMock.SetupAllProperties();
        // _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((new MappingMatcherResult(), new MappingMatcherResult()));

-        _contextMock = new Mock<IContext>();
+        _contextMock = new Mock<HttpContext>();
+        _contextMock.SetupGet(c => c.Items).Returns(new Dictionary<object, object?>());

        _mappingMock = new Mock<IMapping>();

        _requestMatchResultMock = new Mock<IRequestMatchResult>();
        _requestMatchResultMock.Setup(r => r.TotalNumber).Returns(1);
-        _requestMatchResultMock.Setup(r => r.MatchDetails).Returns(new List<MatchDetail>());
+        _requestMatchResultMock.Setup(r => r.MatchDetails).Returns([]);

        _sut = new WireMockMiddleware(
-            null,
+            _ => Task.CompletedTask,
            _optionsMock.Object,
            _requestMapperMock.Object,
            _responseMapperMock.Object,
            _matcherMock.Object,
-            guidUtilsMock.Object
+            wireMockMiddlewareLoggerMock.Object,
+            _guidUtilsMock.Object,
+            _dateTimeUtilsMock.Object
        );
    }

@@ -106,35 +98,13 @@ public class WireMockMiddlewareTests
    public async Task WireMockMiddleware_Invoke_NoMatch()
    {
        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);

        // Assert and Verify
        _optionsMock.Verify(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);

        Expression<Func<ResponseMessage, bool>> match = r => (int)r.StatusCode! == 404 && ((StatusModel)r.BodyData!.BodyAsJson!).Status == "No matching mapping found";
-        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
-    }
-
-    [Fact]
-    public async Task WireMockMiddleware_Invoke_NoMatch_When_SaveUnmatchedRequestsIsTrue_Should_Call_LocalFileSystemHandler_WriteUnmatchedRequest()
-    {
-        // Arrange
-        var fileSystemHandlerMock = new Mock<IFileSystemHandler>();
-        _optionsMock.Setup(o => o.FileSystemHandler).Returns(fileSystemHandlerMock.Object);
-        _optionsMock.Setup(o => o.SaveUnmatchedRequests).Returns(true);
-
-        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
-
-        // Assert
-        _optionsMock.Verify(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
-
-        Expression<Func<ResponseMessage, bool>> match = r => (int)r.StatusCode! == 404 && ((StatusModel)r.BodyData!.BodyAsJson!).Status == "No matching mapping found";
-        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
-
-        // Verify
-        fileSystemHandlerMock.Verify(f => f.WriteUnmatchedRequest("98fae52e-76df-47d9-876f-2ee32e931d9b.LogEntry.json", It.IsAny<string>()));
-        fileSystemHandlerMock.VerifyNoOtherCalls();
+        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<HttpResponse>()), Times.Once);
    }

    [Fact]
@@ -142,7 +112,7 @@ public class WireMockMiddlewareTests
    {
        // Assign
        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
-        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<HttpContext>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);

        _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
        _mappingMock.SetupGet(m => m.IsAdminInterface).Returns(true);
@@ -151,13 +121,13 @@ public class WireMockMiddlewareTests
        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));

        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);

        // Assert and Verify
        _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);

        Expression<Func<ResponseMessage, bool>> match = r => (int?)r.StatusCode == 401;
-        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
+        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<HttpResponse>()), Times.Once);
    }

    [Fact]
@@ -165,7 +135,7 @@ public class WireMockMiddlewareTests
    {
        // Assign
        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]> { { "h", new[] { "x" } } });
-        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<HttpContext>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);

        _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
        _mappingMock.SetupGet(m => m.IsAdminInterface).Returns(true);
@@ -174,13 +144,13 @@ public class WireMockMiddlewareTests
        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));

        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);

        // Assert and Verify
        _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);

        Expression<Func<ResponseMessage, bool>> match = r => (int?)r.StatusCode == 401;
-        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
+        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<HttpResponse>()), Times.Once);
    }

    [Fact]
@@ -190,7 +160,7 @@ public class WireMockMiddlewareTests
        _optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1);

        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);
    }

    [Fact]
@@ -198,7 +168,7 @@ public class WireMockMiddlewareTests
    {
        // Assign
        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
-        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<HttpContext>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);

        _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());

@@ -225,7 +195,7 @@ public class WireMockMiddlewareTests
        _mappingMock.SetupGet(m => m.Settings).Returns(settings);

        var newMappingFromProxy = new Mapping(NewGuid, UpdatedAt, string.Empty, string.Empty, null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null, null);
-        _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
+        _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<HttpContext>(), It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));

        var requestBuilder = Request.Create().UsingAnyMethod();
        _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
@@ -234,7 +204,7 @@ public class WireMockMiddlewareTests
        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));

        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);

        // Assert and Verify
        fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
@@ -247,7 +217,7 @@ public class WireMockMiddlewareTests
    {
        // Assign
        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
-        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<HttpContext>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);

        _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());

@@ -279,16 +249,16 @@ public class WireMockMiddlewareTests
        _mappingMock.SetupGet(m => m.Settings).Returns(settings);

        var newMappingFromProxy = new Mapping(NewGuid, UpdatedAt, "my-title", "my-description", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null, data: null);
-        _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
+        _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<HttpContext>(), It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));

        var requestBuilder = Request.Create().UsingAnyMethod();
        _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);

-        var result = new MappingMatcherResult (_mappingMock.Object, _requestMatchResultMock.Object);
+        var result = new MappingMatcherResult(_mappingMock.Object, _requestMatchResultMock.Object);
        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));

        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);

        // Assert and Verify
        fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
@@ -296,15 +266,14 @@ public class WireMockMiddlewareTests
        _mappings.Should().HaveCount(1);
    }

-#if NET6_0_OR_GREATER
    [Fact]
    public async Task WireMockMiddleware_Invoke_AdminPath_WithExcludeAdminRequests_ShouldNotStartActivity()
    {
        // Arrange
        var request = new RequestMessage(new UrlDetails("http://localhost/__admin/health"), "GET", "::1");
-        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<HttpContext>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);

-        _optionsMock.SetupGet(o => o.ActivityTracingOptions).Returns(new WireMock.Owin.ActivityTracing.ActivityTracingOptions
+        _optionsMock.SetupGet(o => o.ActivityTracingOptions).Returns(new ActivityTracingOptions
        {
            ExcludeAdminRequests = true
        });
@@ -320,7 +289,7 @@ public class WireMockMiddlewareTests
        ActivitySource.AddActivityListener(listener);

        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);

        // Assert
        activityStarted.Should().BeFalse();
@@ -331,9 +300,9 @@ public class WireMockMiddlewareTests
    {
        // Arrange
        var request = new RequestMessage(new UrlDetails("http://localhost/api/orders"), "GET", "::1");
-        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<HttpContext>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);

-        _optionsMock.SetupGet(o => o.ActivityTracingOptions).Returns(new WireMock.Owin.ActivityTracing.ActivityTracingOptions
+        _optionsMock.SetupGet(o => o.ActivityTracingOptions).Returns(new ActivityTracingOptions
        {
            ExcludeAdminRequests = true
        });
@@ -349,7 +318,7 @@ public class WireMockMiddlewareTests
        ActivitySource.AddActivityListener(listener);

        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);

        // Assert
        activityStarted.Should().BeTrue();
@@ -360,9 +329,9 @@ public class WireMockMiddlewareTests
    {
        // Arrange
        var request = new RequestMessage(new UrlDetails("http://localhost/api/orders"), "GET", "::1");
-        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<HttpContext>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);

-        _optionsMock.SetupGet(o => o.ActivityTracingOptions).Returns((WireMock.Owin.ActivityTracing.ActivityTracingOptions?)null);
+        _optionsMock.SetupGet(o => o.ActivityTracingOptions).Returns((ActivityTracingOptions?)null);

        var activityStarted = false;
        using var listener = new ActivityListener
@@ -375,10 +344,9 @@ public class WireMockMiddlewareTests
        ActivitySource.AddActivityListener(listener);

        // Act
-        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        await _sut.Invoke(_contextMock.Object);

        // Assert
        activityStarted.Should().BeFalse();
    }
-#endif
 }