Fixed #106

test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs

@@ -0,0 +1,55 @@
+using System;
+using NFluent;
+using WireMock.Matchers.Request;
+using Xunit;
+
+namespace WireMock.Net.Tests.RequestMatchers
+{
+    public class RequestMessageParamMatcherTests
+    {
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_AllMatch()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new Uri("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher("key", new[] { "test1", "test2" });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_PartialMatch()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new Uri("http://localhost?key=test0,test2"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher("key", new[] { "test1", "test2" });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(0.5d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresent()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new Uri("http://localhost?key"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher("key", new[] { "test1", "test2" });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(0.0d);
+        }
+    }
+}

test/WireMock.Net.Tests/RequestMessageTests.cs

@@ -1,17 +1,15 @@
 using System;
-using System.Text;
 using NFluent;
 using Xunit;
 
 namespace WireMock.Net.Tests
 {
-    //[TestFixture]
     public class RequestMessageTests
     {
         private const string ClientIp = "::1";
 
         [Fact]
-        public void Should_handle_empty_query()
+        public void RequestMessage_ParseQuery_NoKeys()
         {
             // given
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp);
@@ -21,17 +19,36 @@ namespace WireMock.Net.Tests
         }
 
         [Fact]
-        public void Should_parse_query_params()
+        public void RequestMessage_ParseQuery_SingleKey_SingleValue()
         {
-            // given
-            string bodyAsString = "whatever";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost?foo=bar&multi=1&multi=2"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);
+            // Assign
+            var request = new RequestMessage(new Uri("http://localhost?foo=bar"), "POST", ClientIp);
 
-            // then
-            Check.That(request.GetParameter("foo")).Contains("bar");
-            Check.That(request.GetParameter("multi")).Contains("1");
-            Check.That(request.GetParameter("multi")).Contains("2");
+            // Assert
+            Check.That(request.GetParameter("foo")).ContainsExactly("bar");
+        }
+
+        [Fact]
+        public void RequestMessage_ParseQuery_MultipleKeys_MultipleValues()
+        {
+            // Assign
+            var request = new RequestMessage(new Uri("http://localhost?key=1&key=2"), "POST", ClientIp);
+
+            // Assert
+            Check.That(request.GetParameter("key")).Contains("1");
+            Check.That(request.GetParameter("key")).Contains("2");
+        }
+
+        [Fact]
+        public void RequestMessage_ParseQuery_SingleKey_MultipleValues()
+        {
+            // Assign
+            var request = new RequestMessage(new Uri("http://localhost?key=1,2&foo=bar&key=3"), "POST", ClientIp);
+
+            // Assert
+            Check.That(request.GetParameter("key")).Contains("1");
+            Check.That(request.GetParameter("key")).Contains("2");
+            Check.That(request.GetParameter("key")).Contains("3");
         }
     }
 }

test/WireMock.Net.Tests/RequestTests.cs

@@ -123,20 +123,6 @@ namespace WireMock.Net.Tests
             Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
         }
 
-        [Fact]
-        public void Should_specify_requests_matching_given_paramNoValue()
-        {
-            // given
-            var spec = Request.Create().WithParam("bar");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar"), "PUT", ClientIp);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
         [Fact]
         public void Should_specify_requests_matching_given_param_func()
         {