This commit is contained in:
Stef Heyenrath
2017-02-14 21:38:44 +01:00
parent b25444d083
commit 571f434b9a
15 changed files with 65 additions and 34 deletions

View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
namespace WireMock.Matchers

View File

@@ -8,12 +8,12 @@ namespace WireMock.Matchers.Request
public class RequestMatchResult : IComparable
{
/// <summary>
/// Gets or sets the matches score.
/// Gets or sets the match-score.
/// </summary>
/// <value>
/// The number of matches.
/// The match-score.
/// </value>
public double MatchScore { get; set; }
public double TotalScore { get; set; }
/// <summary>
/// Gets or sets the total number of matches.
@@ -21,7 +21,7 @@ namespace WireMock.Matchers.Request
/// <value>
/// The total number of matches.
/// </value>
public int Total { get; set; }
public int TotalNumber { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this instance is perfect match.
@@ -29,7 +29,7 @@ namespace WireMock.Matchers.Request
/// <value>
/// <c>true</c> if this instance is perfect match; otherwise, <c>false</c>.
/// </value>
public bool IsPerfectMatch => Math.Abs(MatchScore - Total) < MatchScores.Tolerance;
public bool IsPerfectMatch => Math.Abs(TotalScore - TotalNumber) < MatchScores.Tolerance;
/// <summary>
/// Gets the match percentage.
@@ -37,7 +37,7 @@ namespace WireMock.Matchers.Request
/// <value>
/// The match percentage.
/// </value>
public double MatchPercentage => Total == 0 ? 1.0 : MatchScore / Total;
public double AverageTotalScore => TotalNumber == 0 ? 0.0 : TotalScore / TotalNumber;
/// <summary>
/// Compares the current instance with another object of the same type and returns an integer that indicates whether the current instance precedes, follows, or occurs in the same position in the sort order as the other object.
@@ -51,7 +51,7 @@ namespace WireMock.Matchers.Request
{
var compareObj = (RequestMatchResult)obj;
return compareObj.MatchPercentage.CompareTo(MatchPercentage);
return compareObj.AverageTotalScore.CompareTo(AverageTotalScore);
}
}
}

View File

@@ -98,9 +98,9 @@ namespace WireMock.Matchers.Request
public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{
double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score;
requestMatchResult.TotalScore += score;
requestMatchResult.Total++;
requestMatchResult.TotalNumber++;
return score;
}

View File

@@ -77,9 +77,9 @@ namespace WireMock.Matchers.Request
public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{
double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score;
requestMatchResult.TotalScore += score;
requestMatchResult.Total++;
requestMatchResult.TotalNumber++;
return score;
}

View File

@@ -77,9 +77,9 @@ namespace WireMock.Matchers.Request
public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{
double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score;
requestMatchResult.TotalScore += score;
requestMatchResult.Total++;
requestMatchResult.TotalNumber++;
return score;
}

View File

@@ -37,9 +37,9 @@ namespace WireMock.Matchers.Request
public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{
double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score;
requestMatchResult.TotalScore += score;
requestMatchResult.Total++;
requestMatchResult.TotalNumber++;
return score;
}

View File

@@ -65,9 +65,9 @@ namespace WireMock.Matchers.Request
public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{
double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score;
requestMatchResult.TotalScore += score;
requestMatchResult.Total++;
requestMatchResult.TotalNumber++;
return score;
}

View File

@@ -60,9 +60,9 @@ namespace WireMock.Matchers.Request
public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{
double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score;
requestMatchResult.TotalScore += score;
requestMatchResult.Total++;
requestMatchResult.TotalNumber++;
return score;
}

View File

@@ -60,9 +60,9 @@ namespace WireMock.Matchers.Request
public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{
double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score;
requestMatchResult.TotalScore += score;
requestMatchResult.Total++;
requestMatchResult.TotalNumber++;
return score;
}