Now with PROPER querystring support

codeape2 · codeape2 · commit ed1b94215adf · 2016-11-10T07:31:10.000+01:00
diff --git a/UnitTests/TestEndpoint.cs b/UnitTests/TestEndpoint.cs
@@ -31,7 +31,7 @@ public void ResolveMoreThanOneMatcher()
             endpoint.Add(new AnyMatcher(), new LiteralResponse("foobar"));
 
             bool singleMatch;
-            var firstmatch = endpoint.Resolve(new Microsoft.AspNetCore.Http.PathString(""), "foo", null, out singleMatch);
+            var firstmatch = endpoint.Resolve(new Microsoft.AspNetCore.Http.PathString(""), new Microsoft.AspNetCore.Http.QueryString(""), "foo", null, out singleMatch);
             Assert.False(singleMatch);
             Assert.IsType(typeof(RegexMatcher), firstmatch.Item1);
         }
@@ -44,7 +44,7 @@ public void ResolveOnlyOne()
             endpoint.Add(new AnyMatcher(), new LiteralResponse("foobar"));
 
             bool singleMatch;
-            var firstmatch = endpoint.Resolve(new Microsoft.AspNetCore.Http.PathString(""), "bar", null, out singleMatch);
+            var firstmatch = endpoint.Resolve(new Microsoft.AspNetCore.Http.PathString(""), new Microsoft.AspNetCore.Http.QueryString(), "bar", null, out singleMatch);
             Assert.True(singleMatch);
             Assert.IsType(typeof(AnyMatcher), firstmatch.Item1);
 
diff --git a/UnitTests/TestRegExMatcher.cs b/UnitTests/TestRegExMatcher.cs
@@ -27,22 +27,29 @@ public class TestRegExMatcher
         public void CanMatchBody()
         {
             var matcher = new RegexMatcher("<ssn>13116900216</ssn>");
-            Assert.True(matcher.Matches(null, BODY, null));
+            Assert.True(matcher.Matches(null, new QueryString(), BODY, null));
         }
 
         [Fact]
         public void NoMatch()
         {
             var matcher = new RegexMatcher("<ssn>13116900217</ssn>");
-            Assert.False(matcher.Matches(null, BODY, null));
+            Assert.False(matcher.Matches(null, new QueryString(), BODY, null));
         }
 
         [Fact]
         public void MatchesBothUrlAndBody()
         {
             var matcher = new RegexMatcher("abcde");
-            Assert.True(matcher.Matches(new PathString("/foo/bar/ae/fx/"), "content in body: abcde", null));
-            Assert.True(matcher.Matches(new PathString("/foo/bar/abcde/fx/"), "", null));            
+            Assert.True(matcher.Matches(new PathString("/foo/bar/ae/fx/"), new QueryString(), "content in body: abcde", null));
+            Assert.True(matcher.Matches(new PathString("/foo/bar/abcde/fx/"), new QueryString(), "", null));            
+        }
+
+        [Fact]
+        public void MatchesQueryString()
+        {
+            var matcher = new RegexMatcher("abcde");
+            Assert.True(matcher.Matches(new PathString("/foo/bar/"), new QueryString("?value=abcde"), "", null));
         }
 
     }
diff --git a/UnitTests/TestTestCommand.cs b/UnitTests/TestTestCommand.cs
@@ -186,7 +186,7 @@ async public void CanCheckExpectedRequestMatcherSuccess()
         }
 
         [Fact]
-        async public void CanCheckExpectedResponseCreatorFailureError()
+        async public void CanCheckExpectedResponseCreatorError()
         {
             var testcase =
                 (new JSONTest { name = "checksomething", requestpath = "/foo/", requestbody = "foobar", expectedresponsecreator = "File content.txt" })
@@ -200,7 +200,7 @@ async public void CanCheckExpectedResponseCreatorFailureError()
         }
 
         [Fact]
-        async public void CanCheckExpectedResponseCreatorFailureSuccess()
+        async public void CanCheckExpectedResponseCreatorSuccess()
         {
             var testcase =
                 (new JSONTest { name = "checksomething", requestpath = "/foo/", requestbody = "this is a test", expectedresponsecreator = "File content.txt" })
@@ -210,5 +210,23 @@ async public void CanCheckExpectedResponseCreatorFailureSuccess()
             Assert.True(result.OK, result.Message);
             Assert.Null(result.Message);
         }
+
+        [Fact]
+        public void CanReadQueryString()
+        {
+            var testcase = (new JSONTest { querystring = "?foo=bar" }).CreateTestCase(".");
+            Assert.Equal("?foo=bar", testcase.QueryString);
+        }
+
+        [Fact]
+        async public void CanExecuteWithQueryStringFailure()
+        {
+            var testcase =
+                (new JSONTest { name = "checksomething", requestpath = "/foo/", querystring = "?a=test", requestbody = "foobar", expectedresponsecreator = "File content.txt" })
+                .Validated().CreateTestCase(".");
+            var result = await testcase.ExecuteAsync(EndpointCollectionReader.ReadFromDirectory(dc.DirectoryName));
+            Assert.True(result.OK, result.Message);
+            Assert.Null(result.Message);
+        }
     }
 }
diff --git a/UnitTests/TestXPathMatcher.cs b/UnitTests/TestXPathMatcher.cs
@@ -27,15 +27,15 @@ public void CanMatchBody()
         {
             var matcher = new XPathMatcher("//nhn:ssn = '13116900216'");
             matcher.AddNamespace("nhn", "http://register.nhn.no/Orchestration");
-            Assert.True(matcher.Matches(null, BODY, null));
+            Assert.True(matcher.Matches(null, new Microsoft.AspNetCore.Http.QueryString(), BODY, null));
         }
 
         [Fact]
         public void NoMatch()
         {
             var matcher = new XPathMatcher("//nhn:ssn = '13116900217'");
             matcher.AddNamespace("nhn", "http://register.nhn.no/Orchestration");
-            Assert.False(matcher.Matches(null, BODY, null));
+            Assert.False(matcher.Matches(null, new Microsoft.AspNetCore.Http.QueryString(), BODY, null));
         }
     }
 }
diff --git a/netmockery/Endpoint.cs b/netmockery/Endpoint.cs
@@ -62,10 +62,10 @@ public void Add(RequestMatcher requestMatcher, ResponseCreator responseCreator)
             }
         }
 
-        public Tuple<RequestMatcher, ResponseCreator> Resolve(PathString path, string body, IHeaderDictionary headers, out bool singleMatch)
+        public Tuple<RequestMatcher, ResponseCreator> Resolve(PathString path, QueryString queryString, string body, IHeaderDictionary headers, out bool singleMatch)
         {
             singleMatch = true;
-            var candidates = (from t in _responses where t.Item1.Matches(path, body, headers) select t).Take(2);
+            var candidates = (from t in _responses where t.Item1.Matches(path, queryString, body, headers) select t).Take(2);
             if (! candidates.Any())
             {
                 return null;
diff --git a/netmockery/JSONReader.cs b/netmockery/JSONReader.cs
@@ -18,13 +18,9 @@ public static Endpoint ReadEndpoint(string jsonString, string rootDir)
 
     public class JSONTest
     {
-        /*
-         * Typer tester vi boer stoette:
-         * - expectedendpointname
-         * - expectedrequestmatcher
-         */
         public string name;
         public string requestpath;
+        public string querystring;
         public string requestbody;
         public string expectedresponsebody;
         public string expectedrequestmatcher;
@@ -50,6 +46,7 @@ public NetmockeryTestCase CreateTestCase(string directory)
             return new NetmockeryTestCase {
                 Name = name,
                 RequestPath = requestpath,
+                QueryString = querystring,
                 RequestBody = 
                     requestbody != null && requestbody.StartsWith("file:")
                     ?
diff --git a/netmockery/NetmockeryTestCase.cs b/netmockery/NetmockeryTestCase.cs
@@ -72,6 +72,7 @@ public class NetmockeryTestCase
     {
         public string Name;
         public string RequestPath;
+        public string QueryString;
         public string RequestBody;
 
         public string ExpectedRequestMatcher;
@@ -140,7 +141,7 @@ async public Task<NetmockeryTestCaseResult> ExecuteAsync(EndpointCollection endp
                 else
                 {
                     bool singleMatch;
-                    var matcher_and_creator = endpoint.Resolve(new PathString(RequestPath), RequestBody, null, out singleMatch);
+                    var matcher_and_creator = endpoint.Resolve(new PathString(RequestPath), new QueryString(QueryString), RequestBody, null, out singleMatch);
                     if (matcher_and_creator != null)
                     {
                         var responseCreator = matcher_and_creator.Item2;
diff --git a/netmockery/Program.cs b/netmockery/Program.cs
@@ -187,7 +187,7 @@ public static void Match(string[] args)
             }
             WriteLine($"Endpoint: {endpoint.Name}");
             bool singleMatch;
-            var responseMatch = endpoint.Resolve(new Microsoft.AspNetCore.Http.PathString(path), body, null, out singleMatch);
+            var responseMatch = endpoint.Resolve(new Microsoft.AspNetCore.Http.PathString(path), new Microsoft.AspNetCore.Http.QueryString(), body, null, out singleMatch);
             if (responseMatch == null)
             {
                 WriteLine("No match");
diff --git a/netmockery/RequestMatcher.cs b/netmockery/RequestMatcher.cs
@@ -16,12 +16,12 @@ namespace netmockery
     public abstract class RequestMatcher
     {
         public int Index = -1;
-        public abstract bool Matches(PathString path, string body, IHeaderDictionary headers);
+        public abstract bool Matches(PathString path, QueryString queryString, string body, IHeaderDictionary headers);
     }
 
     public class AnyMatcher : RequestMatcher
     {
-        public override bool Matches(PathString path, string body, IHeaderDictionary headers)
+        public override bool Matches(PathString path, QueryString queryString, string body, IHeaderDictionary headers)
         {
             return true;
         }
@@ -43,9 +43,9 @@ public RegexMatcher(string regex)
 
         public string Expression => _regex;
 
-        public override bool Matches(PathString path, string body, IHeaderDictionary headers)
+        public override bool Matches(PathString path, QueryString queryString, string body, IHeaderDictionary headers)
         {
-            return Regex.IsMatch(path.ToString(), _regex) || Regex.IsMatch(body, _regex);
+            return Regex.IsMatch(path.ToString(), _regex) || Regex.IsMatch(queryString.ToString(), _regex) || Regex.IsMatch(body, _regex);
         }
 
         public override string ToString()
@@ -75,7 +75,7 @@ public void AddNamespace(string prefix, string ns)
             _namespaces.Add(ns);
         }
 
-        public override bool Matches(PathString path, string body, IHeaderDictionary headers)
+        public override bool Matches(PathString path, QueryString queryString, string body, IHeaderDictionary headers)
         {
             var reader = XmlReader.Create(new StringReader(body));
             var root = XElement.Load(reader);
diff --git a/netmockery/ResponseRegistry.cs b/netmockery/ResponseRegistry.cs
@@ -15,6 +15,7 @@ public class ResponseRegistryItem
         public RequestMatcher RequestMatcher;
         public ResponseCreator ResponseCreator;
         public string RequestPath;
+        public string QueryString;
         public string RequestBody;
         public string ResponseBody;
         public string Error;
diff --git a/netmockery/Startup.cs b/netmockery/Startup.cs
@@ -40,7 +40,7 @@ public async Task HandleRequest(ResponseRegistryItem responseRegistryItem, HttpC
             if (endpoint != null)
             {
                 bool singleMatch;
-                var matcher_and_creator = endpoint.Resolve(context.Request.Path, requestBody, context.Request.Headers, out singleMatch);
+                var matcher_and_creator = endpoint.Resolve(context.Request.Path, context.Request.QueryString, requestBody, context.Request.Headers, out singleMatch);
                 if (matcher_and_creator != null)
                 {
                     var responseCreator = matcher_and_creator.Item2;
@@ -94,7 +94,8 @@ public void Configure(IApplicationBuilder app)
                 {
                     Timestamp = DateTime.Now,
                     RequestBody = requestBody,
-                    RequestPath = context.Request.Path.ToString()
+                    RequestPath = context.Request.Path.ToString(),
+                    QueryString = context.Request.QueryString.ToString()
                 };
 
                 try
diff --git a/netmockery/Views/Shared/Components/ResponseTable/Default.cshtml b/netmockery/Views/Shared/Components/ResponseTable/Default.cshtml
@@ -4,7 +4,7 @@
     <thead>
         <tr>
             <th>Timestamp</th>
-            <th>Request Path</th>
+            <th>Request</th>
             <th>Endpoint</th>
             <th>Request Matcher</th>
             <th>Response Creator</th>
@@ -20,7 +20,7 @@
         {
             <tr>
                 <td>@item.Timestamp.ToString("HH:mm:ss.fff")</td>
-                <td>@item.RequestPath</td>
+                <td>@(item.RequestPath)@(item.QueryString)</td>
                 <td>
                     @if (item.Endpoint != null)
                     {

Original file line number	Diff line number	Diff line change
`@@ -27,22 +27,29 @@ public class TestRegExMatcher`
`27`	`27`	`public void CanMatchBody()`
`28`	`28`	`{`
`29`	`29`	`var matcher = new RegexMatcher("<ssn>13116900216</ssn>");`
`30`		`- Assert.True(matcher.Matches(null, BODY, null));`
	`30`	`+ Assert.True(matcher.Matches(null, new QueryString(), BODY, null));`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`[Fact]`
`34`	`34`	`public void NoMatch()`
`35`	`35`	`{`
`36`	`36`	`var matcher = new RegexMatcher("<ssn>13116900217</ssn>");`
`37`		`- Assert.False(matcher.Matches(null, BODY, null));`
	`37`	`+ Assert.False(matcher.Matches(null, new QueryString(), BODY, null));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`[Fact]`
`41`	`41`	`public void MatchesBothUrlAndBody()`
`42`	`42`	`{`
`43`	`43`	`var matcher = new RegexMatcher("abcde");`
`44`		`- Assert.True(matcher.Matches(new PathString("/foo/bar/ae/fx/"), "content in body: abcde", null));`
`45`		`- Assert.True(matcher.Matches(new PathString("/foo/bar/abcde/fx/"), "", null));`
	`44`	`+ Assert.True(matcher.Matches(new PathString("/foo/bar/ae/fx/"), new QueryString(), "content in body: abcde", null));`
	`45`	`+ Assert.True(matcher.Matches(new PathString("/foo/bar/abcde/fx/"), new QueryString(), "", null));`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ [Fact]`
	`49`	`+ public void MatchesQueryString()`
	`50`	`+ {`
	`51`	`+ var matcher = new RegexMatcher("abcde");`
	`52`	`+ Assert.True(matcher.Matches(new PathString("/foo/bar/"), new QueryString("?value=abcde"), "", null));`
`46`	`53`	`}`
`47`	`54`
`48`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ async public void CanCheckExpectedRequestMatcherSuccess()`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`[Fact]`
`189`		`- async public void CanCheckExpectedResponseCreatorFailureError()`
	`189`	`+ async public void CanCheckExpectedResponseCreatorError()`
`190`	`190`	`{`
`191`	`191`	`var testcase =`
`192`	`192`	`(new JSONTest { name = "checksomething", requestpath = "/foo/", requestbody = "foobar", expectedresponsecreator = "File content.txt" })`
`@@ -200,7 +200,7 @@ async public void CanCheckExpectedResponseCreatorFailureError()`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`[Fact]`
`203`		`- async public void CanCheckExpectedResponseCreatorFailureSuccess()`
	`203`	`+ async public void CanCheckExpectedResponseCreatorSuccess()`
`204`	`204`	`{`
`205`	`205`	`var testcase =`
`206`	`206`	`(new JSONTest { name = "checksomething", requestpath = "/foo/", requestbody = "this is a test", expectedresponsecreator = "File content.txt" })`
`@@ -210,5 +210,23 @@ async public void CanCheckExpectedResponseCreatorFailureSuccess()`
`210`	`210`	`Assert.True(result.OK, result.Message);`
`211`	`211`	`Assert.Null(result.Message);`
`212`	`212`	`}`
	`213`	`+`
	`214`	`+ [Fact]`
	`215`	`+ public void CanReadQueryString()`
	`216`	`+ {`
	`217`	`+ var testcase = (new JSONTest { querystring = "?foo=bar" }).CreateTestCase(".");`
	`218`	`+ Assert.Equal("?foo=bar", testcase.QueryString);`
	`219`	`+ }`
	`220`	`+`
	`221`	`+ [Fact]`
	`222`	`+ async public void CanExecuteWithQueryStringFailure()`
	`223`	`+ {`
	`224`	`+ var testcase =`
	`225`	`+ (new JSONTest { name = "checksomething", requestpath = "/foo/", querystring = "?a=test", requestbody = "foobar", expectedresponsecreator = "File content.txt" })`
	`226`	`+ .Validated().CreateTestCase(".");`
	`227`	`+ var result = await testcase.ExecuteAsync(EndpointCollectionReader.ReadFromDirectory(dc.DirectoryName));`
	`228`	`+ Assert.True(result.OK, result.Message);`
	`229`	`+ Assert.Null(result.Message);`
	`230`	`+ }`
`213`	`231`	`}`
`214`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,15 @@ public void CanMatchBody()`
`27`	`27`	`{`
`28`	`28`	`var matcher = new XPathMatcher("//nhn:ssn = '13116900216'");`
`29`	`29`	`matcher.AddNamespace("nhn", "http://register.nhn.no/Orchestration");`
`30`		`- Assert.True(matcher.Matches(null, BODY, null));`
	`30`	`+ Assert.True(matcher.Matches(null, new Microsoft.AspNetCore.Http.QueryString(), BODY, null));`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`[Fact]`
`34`	`34`	`public void NoMatch()`
`35`	`35`	`{`
`36`	`36`	`var matcher = new XPathMatcher("//nhn:ssn = '13116900217'");`
`37`	`37`	`matcher.AddNamespace("nhn", "http://register.nhn.no/Orchestration");`
`38`		`- Assert.False(matcher.Matches(null, BODY, null));`
	`38`	`+ Assert.False(matcher.Matches(null, new Microsoft.AspNetCore.Http.QueryString(), BODY, null));`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,10 @@ public void Add(RequestMatcher requestMatcher, ResponseCreator responseCreator)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- public Tuple<RequestMatcher, ResponseCreator> Resolve(PathString path, string body, IHeaderDictionary headers, out bool singleMatch)`
	`65`	`+ public Tuple<RequestMatcher, ResponseCreator> Resolve(PathString path, QueryString queryString, string body, IHeaderDictionary headers, out bool singleMatch)`
`66`	`66`	`{`
`67`	`67`	`singleMatch = true;`
`68`		`- var candidates = (from t in _responses where t.Item1.Matches(path, body, headers) select t).Take(2);`
	`68`	`+ var candidates = (from t in _responses where t.Item1.Matches(path, queryString, body, headers) select t).Take(2);`
`69`	`69`	`if (! candidates.Any())`
`70`	`70`	`{`
`71`	`71`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public class NetmockeryTestCase`
`72`	`72`	`{`
`73`	`73`	`public string Name;`
`74`	`74`	`public string RequestPath;`
	`75`	`+ public string QueryString;`
`75`	`76`	`public string RequestBody;`
`76`	`77`
`77`	`78`	`public string ExpectedRequestMatcher;`
`@@ -140,7 +141,7 @@ async public Task<NetmockeryTestCaseResult> ExecuteAsync(EndpointCollection endp`
`140`	`141`	`else`
`141`	`142`	`{`
`142`	`143`	`bool singleMatch;`
`143`		`- var matcher_and_creator = endpoint.Resolve(new PathString(RequestPath), RequestBody, null, out singleMatch);`
	`144`	`+ var matcher_and_creator = endpoint.Resolve(new PathString(RequestPath), new QueryString(QueryString), RequestBody, null, out singleMatch);`
`144`	`145`	`if (matcher_and_creator != null)`
`145`	`146`	`{`
`146`	`147`	`var responseCreator = matcher_and_creator.Item2;`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public static void Match(string[] args)`
`187`	`187`	`}`
`188`	`188`	`WriteLine($"Endpoint: {endpoint.Name}");`
`189`	`189`	`bool singleMatch;`
`190`		`- var responseMatch = endpoint.Resolve(new Microsoft.AspNetCore.Http.PathString(path), body, null, out singleMatch);`
	`190`	`+ var responseMatch = endpoint.Resolve(new Microsoft.AspNetCore.Http.PathString(path), new Microsoft.AspNetCore.Http.QueryString(), body, null, out singleMatch);`
`191`	`191`	`if (responseMatch == null)`
`192`	`192`	`{`
`193`	`193`	`WriteLine("No match");`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ namespace netmockery`
`16`	`16`	`public abstract class RequestMatcher`
`17`	`17`	`{`
`18`	`18`	`public int Index = -1;`
`19`		`- public abstract bool Matches(PathString path, string body, IHeaderDictionary headers);`
	`19`	`+ public abstract bool Matches(PathString path, QueryString queryString, string body, IHeaderDictionary headers);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public class AnyMatcher : RequestMatcher`
`23`	`23`	`{`
`24`		`- public override bool Matches(PathString path, string body, IHeaderDictionary headers)`
	`24`	`+ public override bool Matches(PathString path, QueryString queryString, string body, IHeaderDictionary headers)`
`25`	`25`	`{`
`26`	`26`	`return true;`
`27`	`27`	`}`
`@@ -43,9 +43,9 @@ public RegexMatcher(string regex)`
`43`	`43`
`44`	`44`	`public string Expression => _regex;`
`45`	`45`
`46`		`- public override bool Matches(PathString path, string body, IHeaderDictionary headers)`
	`46`	`+ public override bool Matches(PathString path, QueryString queryString, string body, IHeaderDictionary headers)`
`47`	`47`	`{`
`48`		`- return Regex.IsMatch(path.ToString(), _regex) \|\| Regex.IsMatch(body, _regex);`
	`48`	`+ return Regex.IsMatch(path.ToString(), _regex) \|\| Regex.IsMatch(queryString.ToString(), _regex) \|\| Regex.IsMatch(body, _regex);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public override string ToString()`
`@@ -75,7 +75,7 @@ public void AddNamespace(string prefix, string ns)`
`75`	`75`	`_namespaces.Add(ns);`
`76`	`76`	`}`
`77`	`77`
`78`		`- public override bool Matches(PathString path, string body, IHeaderDictionary headers)`
	`78`	`+ public override bool Matches(PathString path, QueryString queryString, string body, IHeaderDictionary headers)`
`79`	`79`	`{`
`80`	`80`	`var reader = XmlReader.Create(new StringReader(body));`
`81`	`81`	`var root = XElement.Load(reader);`