Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/Stubbery/RequestMatching/RouteMatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ public RouteValueDictionary Match(string routeTemplate, string requestPath, IQue
}
}

var template = TemplateParser.Parse(routeTemplate);
var (isSuccess, template) = TryParseTemplate(routeTemplate);

if (!isSuccess)
{
return null;
}

var matcher = new TemplateMatcher(template, GetDefaults(template));

Expand All @@ -37,6 +42,18 @@ public RouteValueDictionary Match(string routeTemplate, string requestPath, IQue
return matcher.TryMatch(requestPath, values) ? values : null;
}

private static (bool IsSuccess, RouteTemplate Template) TryParseTemplate(string routeTemplate)
{
try
{
return (true, TemplateParser.Parse(routeTemplate));
}
catch
{
return (false, null);
}
}

private RouteValueDictionary GetDefaults(RouteTemplate parsedTemplate)
{
var result = new RouteValueDictionary();
Expand Down
23 changes: 23 additions & 0 deletions test/Stubbery.IntegrationTests/MultipleSetupsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,28 @@ public async Task MultipleSetups_AllMatch_TheFirstOneReturned()

Assert.Equal("testresponse1", resultString);
}

[Fact]
public async Task MultipleSetups_OneHasWrongRoute_OthersStillMatch()
{
using var sut = new ApiStub();

sut.Get("/testget/one", (req, args) => "testresponse1");
sut.Get("/testget//two", (req, args) => "doesn't match");
sut.Get("/testget/three", (req, args) => "testresponse3");

sut.Start();

var result3 = await httpClient.GetAsync(new UriBuilder(new Uri(sut.Address))
{
Path = "/testget/three"
}.Uri);

Assert.Equal(HttpStatusCode.OK, result3.StatusCode);

var resultString = await result3.Content.ReadAsStringAsync();

Assert.Equal("testresponse3", resultString);
}
}
}