DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Improve error on "no path found" in openapi file

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-03-15 10:13:38 +01:00
parent 869093ab25
commit 235de4e5ff
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/kotlin/integration/steps/then/schema.kt
View File

@@ -20,6 +20,7 @@ import org.openapi4j.schema.validator.ValidationData
import org.openapi4j.schema.validator.v3.SchemaValidator import org.openapi4j.schema.validator.v3.SchemaValidator
import java.io.File import java.io.File
import kotlin.test.assertTrue import kotlin.test.assertTrue
import kotlin.test.fail
fun Schema.validate(api: OpenApi3, toValidate: JsonNode) { fun Schema.validate(api: OpenApi3, toValidate: JsonNode) {
val validationContext: ValidationContext<OAI3> = ValidationContext(api.context) val validationContext: ValidationContext<OAI3> = ValidationContext(api.context)
@@ -32,19 +33,20 @@ fun Schema.validate(api: OpenApi3, toValidate: JsonNode) {
} }
fun TestApplicationResponse.operation(route: String? = null, callback: Operation.(OpenApi3, String) -> Unit): Operation { fun TestApplicationResponse.operation(route: String? = null, callback: Operation.(OpenApi3, String) -> Unit): Operation {
return OpenApi3Parser().parse(File("/openapi2.yaml".getResource().toURI()), true).let { api: OpenApi3 -> val filePath = "/openapi2.yaml"
val operation = call.request.httpMethod return OpenApi3Parser().parse(File(filePath.getResource().toURI()), true).let { api: OpenApi3 ->
val httpMethod = call.request.httpMethod
val uri = route ?: "/" + Url(call.request.uri).encodedPath val uri = route ?: "/" + Url(call.request.uri).encodedPath
val path = api.paths val path = api.paths
.keys .keys
.firstOrNull { uri.matches(it.replace("""\{[^{}]+}""".toRegex(), "[^/]+").toRegex()) } .firstOrNull { uri.matches(it.replace("""\{[^{}]+}""".toRegex(), "[^/]+").toRegex()) }
api.getPath(path) api.getPath(path)
?.getOperation(operation.value.toLowerCase()) ?.getOperation(httpMethod.value.toLowerCase())
?.apply { ?.apply {
this.callback(api, uri) this.callback(api, uri)
} }
?: error("""No path found for "$operation $uri".""") ?: fail("""No path found for "${httpMethod.value} $uri". (on file "$filePath")""")
} }
} }
@@ -57,7 +59,7 @@ fun TestApplicationResponse.`And the schema must be valid`(route: String? = null
?.getContentMediaType(contentType.toString()) ?.getContentMediaType(contentType.toString())
?.schema ?.schema
?.validate(api, ObjectMapper().readTree(content)) ?.validate(api, ObjectMapper().readTree(content))
?: error("""No path found for "$this $uri" for status ${status.value} with media type "$contentType".""") ?: fail("""No Status "${status.value}" found with media type "$contentType" for "$this $uri".""")
} }
/* Validate Request URL */ /* Validate Request URL */
this.apply { this.apply {
@@ -65,7 +67,7 @@ fun TestApplicationResponse.`And the schema must be valid`(route: String? = null
getParametersIn(api.context, "query") getParametersIn(api.context, "query")
?.firstOrNull { it.name == parameter }?.schema ?.firstOrNull { it.name == parameter }?.schema
?.validate(api, TextNode(values.first())) ?.validate(api, TextNode(values.first()))
?: error("""No path found for "$this $uri" for status "$parameter".""") ?: error("""No parameter found ($parameter) for "$this $uri".""")
} }
} }
} }