Skip to content

Commit f24cbcc

Browse files
authored
[tests] Fix RouteOverviewTest by actually iterating over all entries (javalin#1809)
The old implementation just searched for stars.
1 parent 260884a commit f24cbcc

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

javalin/src/main/java/io/javalin/routing/PathMatcher.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ class PathMatcher {
2727
internal fun hasEntries(handlerType: HandlerType, requestUri: String): Boolean =
2828
handlerEntries[handlerType]!!.any { entry -> match(entry, requestUri) }
2929

30+
internal fun getAllEntriesOfType(handlerType: HandlerType) =
31+
handlerEntries[handlerType]!!
32+
3033
private fun match(entry: HandlerEntry, requestPath: String): Boolean = when (entry.path) {
3134
"*" -> true
3235
requestPath -> true

javalin/src/test/java/io/javalin/routeoverview/TestRouteOverviewPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class TestRouteOverviewPlugin {
2020
VisualTest.setupJavalinRoutes(app)
2121

2222
val allPaths = HandlerType.values()
23-
.flatMap { app.javalinServlet().matcher.findEntries(it, "*").map { entry -> entry.path } }
23+
.flatMap { app.javalinServlet().matcher.getAllEntriesOfType(it).map { entry -> entry.path } }
2424

2525
assertThat(allPaths).isNotEmpty
2626
assertThat(http.getBody("/overview")).contains(allPaths)

0 commit comments

Comments
 (0)