From 11f3ff314778a42b91312ac5bbd9568876c98e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= Date: Tue, 4 Feb 2025 16:54:01 +0100 Subject: [PATCH 1/2] test: use Core Schema in Json Schema Validator validation test --- .../JsonSchemaValidatorSchemaValidationTest.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt b/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt index 6294e43f..f7432bd5 100644 --- a/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt +++ b/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt @@ -7,6 +7,8 @@ import io.kotest.matchers.should import io.kotest.matchers.shouldNot import io.kotest.mpp.sysprop import it.krzeminski.snakeyaml.engine.kmp.api.Load +import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings +import it.krzeminski.snakeyaml.engine.kmp.schema.CoreSchema import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonNull @@ -46,7 +48,12 @@ private fun beValid(): Matcher { var errorMessage: String? = null MatcherResult( runCatching { - schema.validate(dataFile.inputStream().use { Load().loadOne(it) }.toJsonElement()) { + schema.validate(dataFile.inputStream().use { + Load( + // work-around for https://github.com/krzema12/snakeyaml-engine-kmp/pull/390 + LoadSettings.builder().setSchema(CoreSchema()).build() + ).loadOne(it) + }.toJsonElement()) { errorMessage = buildString { if (errorMessage != null) { appendLine(errorMessage) From 7f9b468c37f2647923004190c2ec39a90ee7d67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Krzemi=C5=84ski?= <3110813+krzema12@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:38:10 +0100 Subject: [PATCH 2/2] Update src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt --- .../JsonSchemaValidatorSchemaValidationTest.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt b/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt index f7432bd5..436c07c5 100644 --- a/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt +++ b/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt @@ -51,6 +51,9 @@ private fun beValid(): Matcher { schema.validate(dataFile.inputStream().use { Load( // work-around for https://github.com/krzema12/snakeyaml-engine-kmp/pull/390 + // Per https://yaml.org/spec/1.2.2/#recommended-schemas, the Core Schema is + // the recommended default schema that YAML processor should use unless + // instructed otherwise. LoadSettings.builder().setSchema(CoreSchema()).build() ).loadOne(it) }.toJsonElement()) {