#102 asserting query params

Test/Flurl.Test.Shared/Http/TestingTests.cs

@@ -65,6 +65,15 @@ namespace Flurl.Test.Http
 			HttpTest.ShouldNotHaveCalled("http://www.otherapi.com/*");
 		}
 
+		[Test]
+		public async Task can_assert_query_params() {
+			await "http://www.api.com?x=111&y=222&z=333".GetAsync();
+			HttpTest.ShouldHaveCalled("http://www.api.com*").WithQueryParam("x");
+			HttpTest.ShouldHaveCalled("http://www.api.com*").WithQueryParam("y", 222);
+			HttpTest.ShouldHaveCalled("*").WithQueryParam("z", "*3");
+			HttpTest.ShouldHaveCalled("*").WithQueryParams(new { z = 333, y = 222 });
+		}
+
 		[Test]
 		public async Task can_simulate_timeout() {
 			HttpTest.SimulateTimeout();

src/Flurl.Http.Shared/Testing/HttpCallAssertion.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Text;
 using System.Text.RegularExpressions;
+using Flurl.Util;
 
 namespace Flurl.Http.Testing
 {
@@ -45,7 +46,40 @@ namespace Flurl.Http.Testing
 		/// <param name="urlPattern">Can contain * wildcard.</param>
 		public HttpCallAssertion WithUrlPattern(string urlPattern) {
 			_urlPattern = urlPattern; // this will land in the exception message when we assert, which is the only reason for capturing it
-			return With(c => MatchesPattern(c.Request.RequestUri.AbsoluteUri, urlPattern));
+			return With(c => MatchesPattern(c.Url, urlPattern));
+		}
+
+		/// <summary>
+		/// Asserts whether calls were made containing the given query parameter (regardless of its value).
+		/// </summary>
+		/// <param name="name">The query parameter name.</param>
+		/// <returns></returns>
+		public HttpCallAssertion WithQueryParam(string name) {
+			return With(c => new Url(c.Url).QueryParams.Any(q => q.Name == name));
+		}
+
+		/// <summary>
+		/// Asserts whether calls were made containing the given query parameter name/value.
+		/// </summary>
+		/// <param name="name">The query parameter name.</param>
+		/// <param name="value">The query parameter value. Can contain * wildcard.</param>
+		/// <returns></returns>
+		public HttpCallAssertion WithQueryParam(string name, object value) {
+			return With(c => new Url(c.Url).QueryParams.Any(q => q.Name == name && MatchesPattern(q.Value.ToString(), value.ToString())));
+		}
+
+		/// <summary>
+		/// Asserts whether calls were made containing all of the given query parameters.
+		/// </summary>
+		/// <param name="values">Object (usually anonymous) or dictionary that is parsed to name/value query parameters to check for.</param>
+		/// <returns></returns>
+		public HttpCallAssertion WithQueryParams(object values) {
+			return With(c => {
+				var expected = values.ToKeyValuePairs().Select(kv => $"{kv.Key}={kv.Value}");
+				var actual = new Url(c.Url).QueryParams.Select(q => $"{q.Name}={q.Value}");
+				//http://stackoverflow.com/a/333034/62600
+				return !expected.Except(actual).Any();
+			});
 		}
 
 		/// <summary>

src/Flurl.Http.Shared/Testing/HttpTest.cs

@@ -120,8 +120,8 @@ namespace Flurl.Http.Testing
 		/// Throws an HttpCallAssertException if a URL matching the given pattern was called.
 		/// </summary>
 		/// <param name="urlPattern">URL that should not have been called. Can include * wildcard character.</param>
-		public HttpCallAssertion ShouldNotHaveCalled(string urlPattern) {
-			return new HttpCallAssertion(CallLog, true).WithUrlPattern(urlPattern);
+		public void ShouldNotHaveCalled(string urlPattern) {
+			new HttpCallAssertion(CallLog, true).WithUrlPattern(urlPattern);
 		}
 
 		/// <summary>