tests/qg-253: Link переведён на матчинг урлов через UriTemplate

Для повышения надёжности. В частности для матчинга урлов с вложенными uri с query-параметрами в качестве значений query-параметров url

Author: d-r-q

app/src/testFixtures/kotlin/pro/qyoga/tests/assertions/ElementMatchers.kt

@@ -6,6 +6,7 @@ import io.kotest.matchers.compose.all
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldNot
 import org.jsoup.nodes.Element
+import org.springframework.web.util.UriTemplate
 import pro.qyoga.tests.platform.html.Component
 import pro.qyoga.tests.platform.html.HtmlPage
 import pro.qyoga.tests.platform.html.Input
@@ -104,6 +105,14 @@ fun haveAttributeValueMatching(attr: String, valueRegex: Regex) = Matcher { elem
     )
 }
 
+fun haveAttributeValueMatching(attr: String, uriTemplate: UriTemplate) = Matcher { element: Element ->
+    MatcherResult.invoke(
+        uriTemplate.matches(element.attr(attr)),
+        { "Element ${element.descr} has $attr=\"${element.attr(attr)}\" but `$attr` value matching \"${uriTemplate}}\" is expected" },
+        { "Element ${element.descr} should not have attribute `$attr` value matching \"${uriTemplate}}\"" },
+    )
+}
+
 fun haveAttributeValue(attr: String, value: String, ignoreCase: Boolean = false) = Matcher { element: Element ->
     MatcherResult.invoke(
         element.attr(attr).equals(value, ignoreCase = ignoreCase),
@@ -277,4 +286,4 @@ data class SelectorOnlyComponent(val selector: String) : Component {
 
     override fun matcher(): Matcher<Element> = alwaysSuccess()
 
-}
+}

app/src/testFixtures/kotlin/pro/qyoga/tests/platform/html/Link.kt

@@ -2,12 +2,12 @@ package pro.qyoga.tests.platform.html
 
 import io.kotest.matchers.Matcher
 import org.jsoup.nodes.Element
+import org.springframework.web.util.UriTemplate
 import pro.qyoga.tests.assertions.haveAttribute
 import pro.qyoga.tests.assertions.haveAttributeValueMatching
 import pro.qyoga.tests.assertions.haveText
 import pro.qyoga.tests.assertions.isTag
 import pro.qyoga.tests.platform.kotest.all
-import pro.qyoga.tests.platform.pathToRegex
 
 class Link(
     val id: String,
@@ -16,7 +16,7 @@ class Link(
     val targetAttr: String = "href"
 ) : Component {
 
-    val urlRegex = urlPattern.pathToRegex().toRegex()
+    val urlRegex = UriTemplate(urlPattern)
 
     constructor(id: String, page: HtmlPageCompat, text: String) : this(id, page.path, text)
 
@@ -36,12 +36,8 @@ class Link(
 
     fun pathParam(element: Element, paramName: String): String? {
         val actualUrl = element.select(selector()).attr(targetAttr)
-        val paramIdx = "\\{.*?}".toRegex().findAll(urlPattern)
-            .indexOfFirst { it.value == "{$paramName}" }
-            .takeIf { it >= 0 }
-            ?: return null
-
-        return urlRegex.matchEntire(actualUrl)!!.groupValues[paramIdx + 1]
+        val vars = urlRegex.match(actualUrl)
+        return vars[paramName]
     }
 
     companion object {
@@ -52,4 +48,4 @@ class Link(
 
     }
 
-}
+}