starred/WireMock.Net-wiremock
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-04-26 10:18:26 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Fix CompareTo in RequestMatchResult (#345)

Browse Source 
* Fix CompareTo in RequestMatchResult
#344

* fix test
This commit is contained in:
Stef Heyenrath
2019-09-17 14:50:43 +02:00
committed by GitHub
parent 2f406029c9
commit 5b8b588983
6 changed files with 117 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/WireMock.Net/Matchers/Request/RequestMatchResult.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace WireMock.Matchers.Request
{
@@ -14,7 +15,7 @@ namespace WireMock.Matchers.Request
/// <value>
/// The match-score.
/// </value>
public double TotalScore { get; private set; }
public double TotalScore => MatchDetails.Sum(md => md.Score);
/// <summary>
/// Gets or sets the total number of matches.
@@ -22,7 +23,7 @@ namespace WireMock.Matchers.Request
/// <value>
/// The total number of matches.
/// </value>
public int TotalNumber { get; private set; }
public int TotalNumber => MatchDetails.Count;
/// <summary>
/// Gets or sets a value indicating whether this instance is perfect match.
@@ -43,12 +44,7 @@ namespace WireMock.Matchers.Request
/// <summary>
/// Gets the match details.
/// </summary>
public IList<KeyValuePair<Type, double>> MatchDetails { get; }
/// <summary>
/// Initializes a new instance of the <see cref="RequestMatchResult"/> class.
/// </summary>
public RequestMatchResult() => MatchDetails = new List<KeyValuePair<Type, double>>();
public IList<MatchDetail> MatchDetails { get; } = new List<MatchDetail>();
/// <summary>
/// Adds the score.
@@ -58,9 +54,7 @@ namespace WireMock.Matchers.Request
/// <returns>The score.</returns>
public double AddScore(Type matcherType, double score)
{
TotalScore += score;
TotalNumber++;
MatchDetails.Add(new KeyValuePair<Type, double>(matcherType, score));
MatchDetails.Add(new MatchDetail { MatcherType = matcherType, Score = score });
return score;
}
@@ -76,7 +70,10 @@ namespace WireMock.Matchers.Request
{
var compareObj = (RequestMatchResult)obj;
return compareObj.AverageTotalScore.CompareTo(AverageTotalScore);
int averageTotalScoreResult = compareObj.AverageTotalScore.CompareTo(AverageTotalScore);
// In case the score is equal, prefer the one with the most matchers.
return averageTotalScoreResult == 0 ? compareObj.TotalNumber.CompareTo(TotalNumber) : averageTotalScoreResult;
}
}
}