From 0d83a4d8a13aeacd4b05155a15eb4de83c276c12 Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Sun, 5 Feb 2017 10:42:57 +0100 Subject: [PATCH] IsMatch -> GetMatchingScore --- src/WireMock.Net/Mapping.cs | 2 +- .../Matchers/Request/IRequestMatcher.cs | 2 +- .../Request/RequestMessageBodyMatcher.cs | 2 +- .../Request/RequestMessageCompositeMatcher.cs | 6 +- .../Request/RequestMessageCookieMatcher.cs | 2 +- .../Request/RequestMessageHeaderMatcher.cs | 2 +- .../Request/RequestMessageMethodMatcher.cs | 2 +- .../Request/RequestMessageParamMatcher.cs | 2 +- .../Request/RequestMessagePathMatcher.cs | 2 +- .../Request/RequestMessageUrlMatcher.cs | 2 +- src/WireMock.Net/Server/FluentMockServer.cs | 2 +- test/WireMock.Net.Tests/RequestTests.cs | 62 +++++++++---------- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/WireMock.Net/Mapping.cs b/src/WireMock.Net/Mapping.cs index 0498bb7b..5f34c262 100644 --- a/src/WireMock.Net/Mapping.cs +++ b/src/WireMock.Net/Mapping.cs @@ -69,7 +69,7 @@ namespace WireMock { var result = new RequestMatchResult(); - RequestMatcher.IsMatch(requestMessage, result); + RequestMatcher.GetMatchingScore(requestMessage, result); return result; } diff --git a/src/WireMock.Net/Matchers/Request/IRequestMatcher.cs b/src/WireMock.Net/Matchers/Request/IRequestMatcher.cs index f724b1ba..b4c725fa 100644 --- a/src/WireMock.Net/Matchers/Request/IRequestMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/IRequestMatcher.cs @@ -15,6 +15,6 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - double IsMatch([NotNull] RequestMessage requestMessage, [NotNull] RequestMatchResult requestMatchResult); + double GetMatchingScore([NotNull] RequestMessage requestMessage, [NotNull] RequestMatchResult requestMatchResult); } } \ No newline at end of file diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs index 63003951..d85f7b54 100644 --- a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs @@ -95,7 +95,7 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) + public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult) { double score = IsMatch(requestMessage); requestMatchResult.MatchScore += score; diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs index 6182cbd9..61c4079a 100644 --- a/src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs @@ -41,14 +41,14 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) + public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult) { var list = new List(); if (_type == CompositeMatcherType.And) { foreach (var requestMatcher in RequestMatchers) { - double score = requestMatcher.IsMatch(requestMessage, requestMatchResult); + double score = requestMatcher.GetMatchingScore(requestMessage, requestMatchResult); list.Add(score); } @@ -57,7 +57,7 @@ namespace WireMock.Matchers.Request foreach (var requestMatcher in RequestMatchers) { - double score = requestMatcher.IsMatch(requestMessage, requestMatchResult); + double score = requestMatcher.GetMatchingScore(requestMessage, requestMatchResult); list.Add(score); } diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs index 00274a15..e0e07c64 100644 --- a/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs @@ -74,7 +74,7 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) + public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult) { double score = IsMatch(requestMessage); requestMatchResult.MatchScore += score; diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs index 5bed5f3c..24c3c7da 100644 --- a/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs @@ -74,7 +74,7 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) + public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult) { double score = IsMatch(requestMessage); requestMatchResult.MatchScore += score; diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageMethodMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageMethodMatcher.cs index 272418e2..02e19ba0 100644 --- a/src/WireMock.Net/Matchers/Request/RequestMessageMethodMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/RequestMessageMethodMatcher.cs @@ -34,7 +34,7 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) + public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult) { double score = IsMatch(requestMessage); requestMatchResult.MatchScore += score; diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs index a42fe4e5..2f215c27 100644 --- a/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs @@ -63,7 +63,7 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) + public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult) { double score = IsMatch(requestMessage); requestMatchResult.MatchScore += score; diff --git a/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs index e28004e6..925bf319 100644 --- a/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs @@ -57,7 +57,7 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) + public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult) { double score = IsMatch(requestMessage); requestMatchResult.MatchScore += score; diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs index c0a1c4d1..87020dc9 100644 --- a/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs +++ b/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs @@ -57,7 +57,7 @@ namespace WireMock.Matchers.Request /// /// A value between 0.0 - 1.0 of the similarity. /// - public double IsMatch(RequestMessage requestMessage, RequestMatchResult requestMatchResult) + public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult) { double score = IsMatch(requestMessage); requestMatchResult.MatchScore += score; diff --git a/src/WireMock.Net/Server/FluentMockServer.cs b/src/WireMock.Net/Server/FluentMockServer.cs index 56ea4bab..3a280687 100644 --- a/src/WireMock.Net/Server/FluentMockServer.cs +++ b/src/WireMock.Net/Server/FluentMockServer.cs @@ -246,7 +246,7 @@ namespace WireMock.Server lock (((ICollection)_logEntries).SyncRoot) { 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); } } diff --git a/test/WireMock.Net.Tests/RequestTests.cs b/test/WireMock.Net.Tests/RequestTests.cs index f885111b..71d54c39 100644 --- a/test/WireMock.Net.Tests/RequestTests.cs +++ b/test/WireMock.Net.Tests/RequestTests.cs @@ -23,7 +23,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -35,8 +35,8 @@ namespace WireMock.Net.Tests var request2 = new RequestMessage(new Uri("http://localhost/x2"), "blabla"); var requestMatchResult = new RequestMatchResult(); - Check.That(requestBuilder.IsMatch(request1, requestMatchResult)).IsEqualTo(1.0); - Check.That(requestBuilder.IsMatch(request2, requestMatchResult)).IsEqualTo(1.0); + Check.That(requestBuilder.GetMatchingScore(request1, requestMatchResult)).IsEqualTo(1.0); + Check.That(requestBuilder.GetMatchingScore(request2, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -50,7 +50,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -64,7 +64,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -78,7 +78,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } [Test] @@ -92,7 +92,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -106,7 +106,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -120,7 +120,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -134,7 +134,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -150,7 +150,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -164,7 +164,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -178,7 +178,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } [Test] @@ -192,7 +192,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } [Test] @@ -208,7 +208,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -224,7 +224,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } [Test] @@ -240,7 +240,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } [Test] @@ -256,7 +256,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -270,7 +270,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -286,7 +286,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -302,7 +302,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -318,7 +318,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -339,7 +339,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -360,7 +360,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } [Test] @@ -376,7 +376,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -392,7 +392,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } [Test] @@ -408,7 +408,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } [Test] @@ -422,7 +422,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -436,7 +436,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -450,7 +450,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0); } [Test] @@ -464,7 +464,7 @@ namespace WireMock.Net.Tests // then var requestMatchResult = new RequestMatchResult(); - Check.That(spec.IsMatch(request, requestMatchResult)).IsNotEqualTo(1.0); + Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0); } } }