Use an exact match for the pattern matching.

dnperfors · web-flow · commit 4595dc41f994 · 2020-02-25T13:08:58.000+01:00
Fixes #8
diff --git a/src/HttpClientTestHelpers/HttpRequestMessageExtensions.cs b/src/HttpClientTestHelpers/HttpRequestMessageExtensions.cs
@@ -246,7 +246,7 @@ private static bool Matches(string value, string pattern)
         {
             var regex = Regex.Escape(pattern).Replace("\\*", "(.*)");
 
-            return Regex.IsMatch(value, regex);
+            return Regex.IsMatch(value, $"^{regex}$");
         }
     }
 }
diff --git a/test/HttpClientTestHelpers.Tests/HttpRequestMessageAsserterTests.cs b/test/HttpClientTestHelpers.Tests/HttpRequestMessageAsserterTests.cs
@@ -34,27 +34,27 @@ public void WithUriPattern_NullOrEmptyPattern_ThrowsArgumentNullException(string
         [Fact]
         public void WithUriPattern_RequestWithMatchingUri_DoesNotThrowException()
         {
-            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com")) });
+            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com/")) });
 
-            sut.WithUriPattern("https://example.com");
+            sut.WithUriPattern("https://example.com/");
         }
 
         [Fact]
         public void WithUriPattern_RequestWithMatchingUriAndNegationTurnedOn_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()
         {
-            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com")) }, true);
+            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com/")) }, true);
 
-            var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithUriPattern("https://example.com"));
-            Assert.Equal("Expected no requests to be made with uri pattern 'https://example.com', but one request was made.", exception.Message);
+            var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithUriPattern("https://example.com/"));
+            Assert.Equal("Expected no requests to be made with uri pattern 'https://example.com/', but one request was made.", exception.Message);
         }
 
         [Fact]
         public void WithUriPattern_RequestWithNotMatchingUri_ThrowsHttpRequestMessageassertionExceptionWithSpecificMessage()
         {
-            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com")) });
+            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com/")) });
 
-            var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithUriPattern("https://test.org"));
-            Assert.Equal("Expected at least one request to be made with uri pattern 'https://test.org', but no requests were made.", exception.Message);
+            var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithUriPattern("https://test.org/"));
+            Assert.Equal("Expected at least one request to be made with uri pattern 'https://test.org/', but no requests were made.", exception.Message);
         }
 
         [Fact]
@@ -91,7 +91,7 @@ public void WithHttpMethod_NoRequests_ThrowsHttpRequestMessageAssertionException
         [Fact]
         public void WithHttpMethod_RequestsWithIncorrectHttpMethod_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()
         {
-            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Post, new Uri("https://example.com")) });
+            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Post, new Uri("https://example.com/")) });
 
             var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithHttpMethod(HttpMethod.Get));
 
@@ -101,7 +101,7 @@ public void WithHttpMethod_RequestsWithIncorrectHttpMethod_ThrowsHttpRequestMess
         [Fact]
         public void WithHttpMethod_RequestsWithCorrectMethod_ReturnsHttpRequestMessageAsserter()
         {
-            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com")) });
+            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com/")) });
 
             var result = sut.WithHttpMethod(HttpMethod.Get);
 
@@ -402,13 +402,13 @@ public void WithContentHeaderNameAndValue_RequestWithNotMatchingHeaderValue_Thro
         }
 
         [Fact]
-        public void WithContentHeaderNameAndValue_RequestWithMatchinHeader_ReturnsHttpRequestMessageAssert()
+        public void WithContentHeaderNameAndValue_RequestWithMatchingHeader_ReturnsHttpRequestMessageAssert()
         {
             var request = new HttpRequestMessage();
             request.Content = new StringContent("", Encoding.UTF8, "application/json");
             var sut = new HttpRequestMessageAsserter(new[] { request });
 
-            var result = sut.WithContentHeader("Content-Type", "application/json");
+            var result = sut.WithContentHeader("Content-Type", "application/json; charset=utf-8");
 
             Assert.NotNull(result);
             Assert.IsType<HttpRequestMessageAsserter>(result);
@@ -540,7 +540,7 @@ public void WithHeaderNameAndValue_RequestWithNotMatchingHeaderValue_ThrowsHttpR
         }
 
         [Theory]
-        [InlineData("Content-Type", "application/json")]
+        [InlineData("Content-Type", "application/json; charset=utf-8")]
         [InlineData("Host", "Test")]
         public void WithHeaderNameAndValue_RequestWithMatchinHeader_ReturnsHttpRequestMessageAssert(string name, string value)
         {
diff --git a/test/HttpClientTestHelpers.Tests/HttpRequestMessageExtensionsTests.MatchesUri.cs b/test/HttpClientTestHelpers.Tests/HttpRequestMessageExtensionsTests.MatchesUri.cs
@@ -35,7 +35,7 @@ public void HasMatchingUri_EmptyPattern_ReturnsFalse()
 
         [Theory]
         [InlineData("*")]
-        [InlineData("https://example.com")]
+        [InlineData("https://example.com*")]
         [InlineData("https://example.com/")]
         [InlineData("https://example.com/*")]
         [InlineData("https://*/")]
@@ -58,6 +58,7 @@ public void HasMatchingUri_PatternWithMultipleWildCards_ReturnsTrue()
         [Theory]
         [InlineData("")]
         [InlineData("http://example.com")]
+        [InlineData("https://example.com")] // Missing slash at the end.
         [InlineData("http://*")]
         [InlineData("https://*/api/test")]
         public void HasMatchingUri_WithPatternThatDoesnotMatch_ReturnsFalse(string pattern)
diff --git a/test/HttpClientTestHelpers.Tests/TestableHttpMessageHandlerTests.cs b/test/HttpClientTestHelpers.Tests/TestableHttpMessageHandlerTests.cs
@@ -14,7 +14,7 @@ public async Task SendAsync_WhenRequestsAreMade_LogsRequests()
         {
             using var sut = new TestableHttpMessageHandler();
             using var client = new HttpClient(sut);
-            using var request = new HttpRequestMessage(HttpMethod.Get, "https://example.com");
+            using var request = new HttpRequestMessage(HttpMethod.Get, "https://example.com/");
 
             _ = await client.SendAsync(request);
 
@@ -26,10 +26,10 @@ public async Task SendAsync_WhenMultipleRequestsAreMade_AllRequestsAreLogged()
         {
             using var sut = new TestableHttpMessageHandler();
             using var client = new HttpClient(sut);
-            using var request1 = new HttpRequestMessage(HttpMethod.Get, "https://example1.com");
-            using var request2 = new HttpRequestMessage(HttpMethod.Post, "https://example2.com");
-            using var request3 = new HttpRequestMessage(HttpMethod.Delete, "https://example3.com");
-            using var request4 = new HttpRequestMessage(HttpMethod.Head, "https://example4.com");
+            using var request1 = new HttpRequestMessage(HttpMethod.Get, "https://example1.com/");
+            using var request2 = new HttpRequestMessage(HttpMethod.Post, "https://example2.com/");
+            using var request3 = new HttpRequestMessage(HttpMethod.Delete, "https://example3.com/");
+            using var request4 = new HttpRequestMessage(HttpMethod.Head, "https://example4.com/");
 
             _ = await client.SendAsync(request1);
             _ = await client.SendAsync(request2);
@@ -45,7 +45,7 @@ public async Task SendAsync_ByDefault_ReturnsHttpStatusCodeOK()
             using var sut = new TestableHttpMessageHandler();
             using var client = new HttpClient(sut);
 
-            var result = await client.GetAsync(new Uri("https://example.com"));
+            var result = await client.GetAsync(new Uri("https://example.com/"));
 
             Assert.Equal(HttpStatusCode.OK, result.StatusCode);
         }
@@ -58,7 +58,7 @@ public async Task SendAsync_WhenRespondWithIsSet_SetRespondIsUsed()
             sut.RespondWith(response);
             using var client = new HttpClient(sut);
 
-            var result = await client.GetAsync(new Uri("https://example.com"));
+            var result = await client.GetAsync(new Uri("https://example.com/"));
 
             Assert.Equal(HttpStatusCode.NotFound, result.StatusCode);
             Assert.Same(response, result);
@@ -78,7 +78,7 @@ public async Task ShouldHaveMadeRequests_WhenRequestsWereMade_DoesNotThrowExcept
             using var sut = new TestableHttpMessageHandler();
             using var client = new HttpClient(sut);
 
-            _ = await client.GetAsync(new Uri("https://example.com"));
+            _ = await client.GetAsync(new Uri("https://example.com/"));
 
             sut.ShouldHaveMadeRequests();
         }
@@ -88,7 +88,7 @@ public void ShouldHaveMadeRequestsTo_WhenNoRequestsWereMade_ThrowsHttpRequestMes
         {
             using var sut = new TestableHttpMessageHandler();
 
-            Assert.Throws<HttpRequestMessageAssertionException>(() => sut.ShouldHaveMadeRequestsTo("https://example.com"));
+            Assert.Throws<HttpRequestMessageAssertionException>(() => sut.ShouldHaveMadeRequestsTo("https://example.com/"));
         }
 
         [Fact]
@@ -97,9 +97,9 @@ public async Task ShouldHaveMadeRequestsTo_WhenMatchinRequestsWereMade_ReturnsHt
             using var sut = new TestableHttpMessageHandler();
             using var client = new HttpClient(sut);
 
-            _ = await client.GetAsync(new Uri("https://example.com"));
+            _ = await client.GetAsync(new Uri("https://example.com/"));
 
-            var result = sut.ShouldHaveMadeRequestsTo("https://example.com");
+            var result = sut.ShouldHaveMadeRequestsTo("https://example.com/");
 
             Assert.NotNull(result);
             Assert.IsType<HttpRequestMessageAsserter>(result);
@@ -119,7 +119,7 @@ public async Task ShouldNotHaveMadeRequests_WhenASingleRequestWasMade_ThrowsHttp
             using var sut = new TestableHttpMessageHandler();
             using var client = new HttpClient(sut);
 
-            _ = await client.GetAsync(new Uri("https://example.com"));
+            _ = await client.GetAsync(new Uri("https://example.com/"));
 
             var result = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.ShouldNotHaveMadeRequests());
             Assert.Equal("Expected no requests to be made, but one request was made.", result.Message);
@@ -131,8 +131,8 @@ public async Task ShouldNotHaveMadeRequests_WhenMultipleRequestsWereMade_ThrowsH
             using var sut = new TestableHttpMessageHandler();
             using var client = new HttpClient(sut);
 
-            _ = await client.GetAsync(new Uri("https://example.com"));
-            _ = await client.GetAsync(new Uri("https://example.com"));
+            _ = await client.GetAsync(new Uri("https://example.com/"));
+            _ = await client.GetAsync(new Uri("https://example.com/"));
 
             var result = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.ShouldNotHaveMadeRequests());
             Assert.Equal("Expected no requests to be made, but 2 requests were made.", result.Message);
@@ -143,7 +143,7 @@ public void ShouldNotHaveMadeRequestsTo_WhenNoRequestsWereMade_ReturnsHttpReques
         {
             using var sut = new TestableHttpMessageHandler();
 
-            var result = sut.ShouldNotHaveMadeRequestsTo("https://example.com");
+            var result = sut.ShouldNotHaveMadeRequestsTo("https://example.com/");
 
             Assert.NotNull(result);
             Assert.IsType<HttpRequestMessageAsserter>(result);
@@ -155,9 +155,9 @@ public async Task ShouldNotHaveMadeRequestsTo_WhenMatchinRequestsWereMade_Throws
             using var sut = new TestableHttpMessageHandler();
             using var client = new HttpClient(sut);
 
-            _ = await client.GetAsync(new Uri("https://example.com"));
+            _ = await client.GetAsync(new Uri("https://example.com/"));
 
-            Assert.Throws<HttpRequestMessageAssertionException>(() => sut.ShouldNotHaveMadeRequestsTo("https://example.com"));
+            Assert.Throws<HttpRequestMessageAssertionException>(() => sut.ShouldNotHaveMadeRequestsTo("https://example.com/"));
         }
 
 #nullable disable
@@ -193,7 +193,7 @@ public async Task SimulateTimout_WhenRequestIsMade_ThrowsTaskCancelationExceptio
             sut.SimulateTimeout();
             using var client = new HttpClient(sut);
 
-            var exception = await Assert.ThrowsAsync<TaskCanceledException>(() => client.GetAsync(new Uri("https://example.com")));
+            var exception = await Assert.ThrowsAsync<TaskCanceledException>(() => client.GetAsync(new Uri("https://example.com/")));
             Assert.Equal(new OperationCanceledException().Message, exception.Message);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ private static bool Matches(string value, string pattern)`
`246`	`246`	`{`
`247`	`247`	`var regex = Regex.Escape(pattern).Replace("\\", "(.)");`
`248`	`248`
`249`		`- return Regex.IsMatch(value, regex);`
	`249`	`+ return Regex.IsMatch(value, $"^{regex}$");`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,27 +34,27 @@ public void WithUriPattern_NullOrEmptyPattern_ThrowsArgumentNullException(string`
`34`	`34`	`[Fact]`
`35`	`35`	`public void WithUriPattern_RequestWithMatchingUri_DoesNotThrowException()`
`36`	`36`	`{`
`37`		`- var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com")) });`
	`37`	`+ var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com/")) });`
`38`	`38`
`39`		`- sut.WithUriPattern("https://example.com");`
	`39`	`+ sut.WithUriPattern("https://example.com/");`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[Fact]`
`43`	`43`	`public void WithUriPattern_RequestWithMatchingUriAndNegationTurnedOn_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()`
`44`	`44`	`{`
`45`		`- var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com")) }, true);`
	`45`	`+ var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com/")) }, true);`
`46`	`46`
`47`		`- var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithUriPattern("https://example.com"));`
`48`		`- Assert.Equal("Expected no requests to be made with uri pattern 'https://example.com', but one request was made.", exception.Message);`
	`47`	`+ var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithUriPattern("https://example.com/"));`
	`48`	`+ Assert.Equal("Expected no requests to be made with uri pattern 'https://example.com/', but one request was made.", exception.Message);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`[Fact]`
`52`	`52`	`public void WithUriPattern_RequestWithNotMatchingUri_ThrowsHttpRequestMessageassertionExceptionWithSpecificMessage()`
`53`	`53`	`{`
`54`		`- var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com")) });`
	`54`	`+ var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com/")) });`
`55`	`55`
`56`		`- var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithUriPattern("https://test.org"));`
`57`		`- Assert.Equal("Expected at least one request to be made with uri pattern 'https://test.org', but no requests were made.", exception.Message);`
	`56`	`+ var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithUriPattern("https://test.org/"));`
	`57`	`+ Assert.Equal("Expected at least one request to be made with uri pattern 'https://test.org/', but no requests were made.", exception.Message);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`[Fact]`
`@@ -91,7 +91,7 @@ public void WithHttpMethod_NoRequests_ThrowsHttpRequestMessageAssertionException`
`91`	`91`	`[Fact]`
`92`	`92`	`public void WithHttpMethod_RequestsWithIncorrectHttpMethod_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()`
`93`	`93`	`{`
`94`		`- var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Post, new Uri("https://example.com")) });`
	`94`	`+ var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Post, new Uri("https://example.com/")) });`
`95`	`95`
`96`	`96`	`var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithHttpMethod(HttpMethod.Get));`
`97`	`97`
`@@ -101,7 +101,7 @@ public void WithHttpMethod_RequestsWithIncorrectHttpMethod_ThrowsHttpRequestMess`
`101`	`101`	`[Fact]`
`102`	`102`	`public void WithHttpMethod_RequestsWithCorrectMethod_ReturnsHttpRequestMessageAsserter()`
`103`	`103`	`{`
`104`		`- var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com")) });`
	`104`	`+ var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Get, new Uri("https://example.com/")) });`
`105`	`105`
`106`	`106`	`var result = sut.WithHttpMethod(HttpMethod.Get);`
`107`	`107`
`@@ -402,13 +402,13 @@ public void WithContentHeaderNameAndValue_RequestWithNotMatchingHeaderValue_Thro`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`[Fact]`
`405`		`- public void WithContentHeaderNameAndValue_RequestWithMatchinHeader_ReturnsHttpRequestMessageAssert()`
	`405`	`+ public void WithContentHeaderNameAndValue_RequestWithMatchingHeader_ReturnsHttpRequestMessageAssert()`
`406`	`406`	`{`
`407`	`407`	`var request = new HttpRequestMessage();`
`408`	`408`	`request.Content = new StringContent("", Encoding.UTF8, "application/json");`
`409`	`409`	`var sut = new HttpRequestMessageAsserter(new[] { request });`
`410`	`410`
`411`		`- var result = sut.WithContentHeader("Content-Type", "application/json");`
	`411`	`+ var result = sut.WithContentHeader("Content-Type", "application/json; charset=utf-8");`
`412`	`412`
`413`	`413`	`Assert.NotNull(result);`
`414`	`414`	`Assert.IsType<HttpRequestMessageAsserter>(result);`
`@@ -540,7 +540,7 @@ public void WithHeaderNameAndValue_RequestWithNotMatchingHeaderValue_ThrowsHttpR`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`[Theory]`
`543`		`- [InlineData("Content-Type", "application/json")]`
	`543`	`+ [InlineData("Content-Type", "application/json; charset=utf-8")]`
`544`	`544`	`[InlineData("Host", "Test")]`
`545`	`545`	`public void WithHeaderNameAndValue_RequestWithMatchinHeader_ReturnsHttpRequestMessageAssert(string name, string value)`
`546`	`546`	`{`