Add PartialMatch to logging / logentries

WireMock.Net Solution.sln

@@ -69,6 +69,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser.ConsoleApp", "examples\WireMock.Net.OpenApiParser.ConsoleApp\WireMock.Net.OpenApiParser.ConsoleApp.csproj", "{5C09FB93-1535-4F92-AF26-21E8A061EE4A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.FluentAssertions", "src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj", "{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -167,6 +169,10 @@ Global
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -195,6 +201,7 @@ Global
 		{02082E34-DEF2-47D0-AF0B-3326FAA908CE} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{D3804228-91F4-4502-9595-39584E5AADAD} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs

@@ -36,5 +36,20 @@ public class LogEntryModel
         /// The request match result.
         /// </summary>
         public LogRequestMatchModel RequestMatchResult { get; set; }
+
+        /// <summary>
+        /// The partial mapping unique identifier.
+        /// </summary>
+        public Guid? PartialMappingGuid { get; set; }
+
+        /// <summary>
+        /// The partial mapping unique title.
+        /// </summary>
+        public string PartialMappingTitle { get; set; }
+
+        /// <summary>
+        /// The partial request match result.
+        /// </summary>
+        public LogRequestMatchModel PartialRequestMatchResult { get; set; }
     }
 }

src/WireMock.Net.FluentAssertions/Assertions/WireMockANumberOfCallsAssertions.cs

@@ -0,0 +1,22 @@
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions
+{
+    public class WireMockANumberOfCallsAssertions
+    {
+        private readonly WireMockServer _server;
+        private readonly int _callsCount;
+
+        public WireMockANumberOfCallsAssertions(WireMockServer server, int callsCount)
+        {
+            _server = server;
+            _callsCount = callsCount;
+        }
+
+        public WireMockAssertions Calls()
+        {
+            return new WireMockAssertions(_server, _callsCount);
+        }
+    }
+}

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

@@ -0,0 +1,37 @@
+using System.Linq;
+using FluentAssertions;
+using FluentAssertions.Execution;
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions
+{
+    public class WireMockAssertions
+    {
+        private readonly WireMockServer _instance;
+
+        public WireMockAssertions(WireMockServer instance, int? callsCount)
+        {
+            _instance = instance;
+        }
+
+        [CustomAssertion]
+        public AndConstraint<WireMockAssertions> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
+        {
+            Execute.Assertion
+                .BecauseOf(because, becauseArgs)
+                .Given(() => _instance.LogEntries.Select(x => x.RequestMessage).ToList())
+                .ForCondition(requests => requests.Any())
+                .FailWith(
+                    "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
+                    absoluteUrl)
+                .Then
+                .ForCondition(x => x.Any(y => y.AbsoluteUrl == absoluteUrl))
+                .FailWith(
+                    "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
+                    _ => absoluteUrl, requests => requests.Select(request => request.AbsoluteUrl));
+
+            return new AndConstraint<WireMockAssertions>(this);
+        }
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs

@@ -0,0 +1,26 @@
+using FluentAssertions.Primitives;
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions
+{
+    public class WireMockReceivedAssertions : ReferenceTypeAssertions<WireMockServer, WireMockReceivedAssertions>
+    {
+        public WireMockReceivedAssertions(WireMockServer server)
+        {
+            Subject = server;
+        }
+
+        public WireMockAssertions HaveReceivedACall()
+        {
+            return new WireMockAssertions(Subject, null);
+        }
+
+        public WireMockANumberOfCallsAssertions HaveReceived(int callsCount)
+        {
+            return new WireMockANumberOfCallsAssertions(Subject, callsCount);
+        }
+
+        protected override string Identifier => "wiremockserver";
+    }
+}

src/WireMock.Net.FluentAssertions/Extensions/WireMockExtensions.cs

@@ -0,0 +1,13 @@
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions
+{
+    public static class WireMockExtensions
+    {
+        public static WireMockReceivedAssertions Should(this WireMockServer instance)
+        {
+            return new WireMockReceivedAssertions(instance);
+        }
+    }
+}

src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj

@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<Version>1.2.13-preview-01</Version>
+		<Description>FluentAssertions extensions for WireMock.Net</Description>
+		<AssemblyTitle>WireMock.Net.FluentAssertions</AssemblyTitle>
+		<Authors>Mahmoud Ali;Stef Heyenrath</Authors>
+		<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net45</TargetFrameworks>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<AssemblyName>WireMock.Net.FluentAssertions</AssemblyName>
+		<PackageId>WireMock.Net.FluentAssertions</PackageId>
+		<PackageTags>wiremock;FluentAssertions;UnitTest;Assert;Assertions</PackageTags>
+		<RootNamespace>WireMock.FluentAssertions</RootNamespace>
+		<ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A95}</ProjectGuid>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+		<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+		<CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+		<!--<DelaySign>true</DelaySign>-->
+		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="FluentAssertions" Version="5.10.3" />
+		<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
+	</ItemGroup>
+
+</Project>

src/WireMock.Net/Logging/LogEntry.cs

@@ -1,59 +1,83 @@
-using System;
-using WireMock.Matchers.Request;
-
-namespace WireMock.Logging
-{
-    /// <summary>
-    /// LogEntry
-    /// </summary>
-    public class LogEntry
-    {
-        /// <summary>
-        /// Gets or sets the unique identifier.
-        /// </summary>
-        /// <value>
-        /// The unique identifier.
-        /// </value>
-        public Guid Guid { get; set; }
-
-        /// <summary>
-        /// Gets or sets the request message.
-        /// </summary>
-        /// <value>
-        /// The request message.
-        /// </value>
-        public RequestMessage RequestMessage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the response message.
-        /// </summary>
-        /// <value>
-        /// The response message.
-        /// </value>
-        public ResponseMessage ResponseMessage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the request match result.
-        /// </summary>
-        /// <value>
-        /// The request match result.
-        /// </value>
-        public RequestMatchResult RequestMatchResult { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mapping unique identifier.
-        /// </summary>
-        /// <value>
-        /// The mapping unique identifier.
-        /// </value>
-        public Guid? MappingGuid { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mapping unique title.
-        /// </summary>
-        /// <value>
-        /// The mapping unique title.
-        /// </value>
-        public string MappingTitle { get; set; }
-    }
+using System;
+using WireMock.Matchers.Request;
+
+namespace WireMock.Logging
+{
+    /// <summary>
+    /// LogEntry
+    /// </summary>
+    public class LogEntry
+    {
+        /// <summary>
+        /// Gets or sets the unique identifier.
+        /// </summary>
+        /// <value>
+        /// The unique identifier.
+        /// </value>
+        public Guid Guid { get; set; }
+
+        /// <summary>
+        /// Gets or sets the request message.
+        /// </summary>
+        /// <value>
+        /// The request message.
+        /// </value>
+        public RequestMessage RequestMessage { get; set; }
+
+        /// <summary>
+        /// Gets or sets the response message.
+        /// </summary>
+        /// <value>
+        /// The response message.
+        /// </value>
+        public ResponseMessage ResponseMessage { get; set; }
+
+        /// <summary>
+        /// Gets or sets the request match result.
+        /// </summary>
+        /// <value>
+        /// The request match result.
+        /// </value>
+        public RequestMatchResult RequestMatchResult { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mapping unique identifier.
+        /// </summary>
+        /// <value>
+        /// The mapping unique identifier.
+        /// </value>
+        public Guid? MappingGuid { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mapping unique title.
+        /// </summary>
+        /// <value>
+        /// The mapping unique title.
+        /// </value>
+        public string MappingTitle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the partial mapping unique identifier.
+        /// </summary>
+        /// <value>
+        /// The mapping unique identifier.
+        /// </value>
+        public Guid? PartialMappingGuid { get; set; }
+
+        /// <summary>
+        /// Gets or sets the partial mapping unique title.
+        /// </summary>
+        /// <value>
+        /// The mapping unique title.
+        /// </value>
+        public string PartialMappingTitle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the partial match result.
+        /// </summary>
+        /// <value>
+        /// The request match result.
+        /// </value>
+        public RequestMatchResult PartialMatchResult { get; set; }
+    }
 }

src/WireMock.Net/Owin/IMappingMatcher.cs

@@ -1,7 +1,7 @@
-namespace WireMock.Owin
-{
-    internal interface IMappingMatcher
-    {
-        MappingMatcherResult FindBestMatch(RequestMessage request);
-    }
+namespace WireMock.Owin
+{
+    internal interface IMappingMatcher
+    {
+        (MappingMatcherResult Match, MappingMatcherResult Partial) FindBestMatch(RequestMessage request);
+    }
 }

src/WireMock.Net/Owin/MappingMatcher.cs

@@ -16,7 +16,7 @@ public MappingMatcher(IWireMockMiddlewareOptions options)
             _options = options;
         }
 
-        public MappingMatcherResult FindBestMatch(RequestMessage request)
+        public (MappingMatcherResult Match, MappingMatcherResult Partial) FindBestMatch(RequestMessage request)
         {
             var mappings = new List<MappingMatcherResult>();
             foreach (var mapping in _options.Mappings.Values)
@@ -37,21 +37,24 @@ public MappingMatcherResult FindBestMatch(RequestMessage request)
                 }
             }
 
+            var partialMappings = mappings
+                .Where(pm => (pm.Mapping.IsAdminInterface && pm.RequestMatchResult.IsPerfectMatch) || !pm.Mapping.IsAdminInterface)
+                .OrderBy(m => m.RequestMatchResult)
+                .ThenBy(m => m.Mapping.Priority)
+                .ToList();
+            var partialMatch = partialMappings.FirstOrDefault(pm => pm.RequestMatchResult.AverageTotalScore > 0.0);
+
             if (_options.AllowPartialMapping == true)
             {
-                var partialMappings = mappings
-                    .Where(pm => (pm.Mapping.IsAdminInterface && pm.RequestMatchResult.IsPerfectMatch) || !pm.Mapping.IsAdminInterface)
-                    .OrderBy(m => m.RequestMatchResult)
-                    .ThenBy(m => m.Mapping.Priority)
-                    .ToList();
-
-                return partialMappings.FirstOrDefault(pm => pm.RequestMatchResult.AverageTotalScore > 0.0);
+                return (partialMatch, partialMatch);
             }
 
-            return mappings
+            var match = mappings
                 .Where(m => m.RequestMatchResult.IsPerfectMatch)
                 .OrderBy(m => m.Mapping.Priority).ThenBy(m => m.RequestMatchResult)
                 .FirstOrDefault();
+
+            return (match, partialMatch);
         }
     }
 }