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

IsMatch -> GetMatchingScore

Browse Source
This commit is contained in:
Stef Heyenrath
2017-02-05 10:42:57 +01:00
parent 2bac30b442
commit 0d83a4d8a1
12 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WireMock.Net/Mapping.cs
View File

@@ -69,7 +69,7 @@ namespace WireMock
{ {
var result = new RequestMatchResult(); var result = new RequestMatchResult();
RequestMatcher.IsMatch(requestMessage, result); RequestMatcher.GetMatchingScore(requestMessage, result);
return result; return result;
} }

2
src/WireMock.Net/Matchers/Request/IRequestMatcher.cs
View File

@@ -15,6 +15,6 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
double IsMatch([NotNull] RequestMessage requestMessage, [NotNull] RequestMatchResult requestMatchResult); double GetMatchingScore([NotNull] RequestMessage requestMessage, [NotNull] RequestMatchResult requestMatchResult);
} }
} }

2
src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
View File

@@ -95,7 +95,7 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{ {
double score = IsMatch(requestMessage); double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score; requestMatchResult.MatchScore += score;

6
src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs
View File

@@ -41,14 +41,14 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{ {
var list = new List<double>(); var list = new List<double>();
if (_type == CompositeMatcherType.And) if (_type == CompositeMatcherType.And)
{ {
foreach (var requestMatcher in RequestMatchers) foreach (var requestMatcher in RequestMatchers)
{ {
double score = requestMatcher.IsMatch(requestMessage, requestMatchResult); double score = requestMatcher.GetMatchingScore(requestMessage, requestMatchResult);
list.Add(score); list.Add(score);
} }
@@ -57,7 +57,7 @@ namespace WireMock.Matchers.Request
foreach (var requestMatcher in RequestMatchers) foreach (var requestMatcher in RequestMatchers)
{ {
double score = requestMatcher.IsMatch(requestMessage, requestMatchResult); double score = requestMatcher.GetMatchingScore(requestMessage, requestMatchResult);
list.Add(score); list.Add(score);
} }

2
src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs
View File

@@ -74,7 +74,7 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{ {
double score = IsMatch(requestMessage); double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score; requestMatchResult.MatchScore += score;

2
src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
View File

@@ -74,7 +74,7 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{ {
double score = IsMatch(requestMessage); double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score; requestMatchResult.MatchScore += score;

2
src/WireMock.Net/Matchers/Request/RequestMessageMethodMatcher.cs
View File

@@ -34,7 +34,7 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{ {
double score = IsMatch(requestMessage); double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score; requestMatchResult.MatchScore += score;

2
src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
View File

@@ -63,7 +63,7 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{ {
double score = IsMatch(requestMessage); double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score; requestMatchResult.MatchScore += score;

2
src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs
View File

@@ -57,7 +57,7 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{ {
double score = IsMatch(requestMessage); double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score; requestMatchResult.MatchScore += score;

2
src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs
View File

@@ -57,7 +57,7 @@ namespace WireMock.Matchers.Request
/// <returns> /// <returns>
/// A value between 0.0 - 1.0 of the similarity. /// A value between 0.0 - 1.0 of the similarity.
/// </returns> /// </returns>
public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
{ {
double score = IsMatch(requestMessage); double score = IsMatch(requestMessage);
requestMatchResult.MatchScore += score; requestMatchResult.MatchScore += score;

2
src/WireMock.Net/Server/FluentMockServer.cs
View File

@@ -246,7 +246,7 @@ namespace WireMock.Server
lock (((ICollection)_logEntries).SyncRoot) lock (((ICollection)_logEntries).SyncRoot)
{ {
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
return _logEntries.Where(log => matcher.IsMatch(log.RequestMessage, requestMatchResult) > 0.99); return _logEntries.Where(log => matcher.GetMatchingScore(log.RequestMessage, requestMatchResult) > 0.99);
} }
} }

62
test/WireMock.Net.Tests/RequestTests.cs
View File

@@ -23,7 +23,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -35,8 +35,8 @@ namespace WireMock.Net.Tests
var request2 = new RequestMessage(new Uri("http://localhost/x2"), "blabla"); var request2 = new RequestMessage(new Uri("http://localhost/x2"), "blabla");
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(requestBuilder.IsMatch(request1, requestMatchResult)).IsEqualTo(1.0); Check.That(requestBuilder.GetMatchingScore(request1, requestMatchResult)).IsEqualTo(1.0);
Check.That(requestBuilder.IsMatch(request2, requestMatchResult)).IsEqualTo(1.0); Check.That(requestBuilder.GetMatchingScore(request2, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -50,7 +50,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -64,7 +64,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -78,7 +78,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
[Test] [Test]
@@ -92,7 +92,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -106,7 +106,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -120,7 +120,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -134,7 +134,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -150,7 +150,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -164,7 +164,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -178,7 +178,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
[Test] [Test]
@@ -192,7 +192,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
[Test] [Test]
@@ -208,7 +208,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -224,7 +224,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
[Test] [Test]
@@ -240,7 +240,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
[Test] [Test]
@@ -256,7 +256,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -270,7 +270,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -286,7 +286,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -302,7 +302,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -318,7 +318,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -339,7 +339,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -360,7 +360,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
[Test] [Test]
@@ -376,7 +376,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -392,7 +392,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
[Test] [Test]
@@ -408,7 +408,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
[Test] [Test]
@@ -422,7 +422,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -436,7 +436,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -450,7 +450,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
} }
[Test] [Test]
@@ -464,7 +464,7 @@ namespace WireMock.Net.Tests
// then // then
var requestMatchResult = new RequestMatchResult(); var requestMatchResult = new RequestMatchResult();
Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
} }
} }
} }