Skip to content

rdf validate: add checks for version <= 0 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Karolina-Bogacka merged 2 commits into from
Apr 25, 2025
Merged

rdf validate: add checks for version <= 0 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2af3b0b
rdf validate: add checks for version <= 0
Ostrzyciel Apr 25, 2025
2fc4534
Merge branch 'main' into 89-add-version-check-to-rdf-validate
Ostrzyciel Apr 25, 2025
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
4 changes: 4 additions & 0 deletions src/main/scala/eu/neverblink/jelly/cli/command/rdf/RdfValidate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ object RdfValidate extends JellyCommand[RdfValidateOptions]:
)
o
}
if streamOptions.version <= 0 then
throw CriticalException(
"The version field in RdfStreamOptions is <= 0. This field MUST be set to a positive value.",
)
JellyOptions.checkCompatibility(
streamOptions,
expectedOptions.getOrElse(JellyOptions.defaultSupportedOptions),
Expand Down
14 changes: 13 additions & 1 deletion src/test/scala/eu/neverblink/jelly/cli/command/rdf/RdfValidateSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ class RdfValidateSpec extends AnyWordSpec, Matchers, TestFixtureHelper:
val f = RdfStreamFrame(
Seq(
RdfStreamRow(
JellyOptions.smallStrict,
JellyOptions.smallStrict.withVersion(2),
),
),
)
Expand All @@ -349,6 +349,18 @@ class RdfValidateSpec extends AnyWordSpec, Matchers, TestFixtureHelper:
e.cause.get.getMessage should include("Incoming physical stream type is not set")
}

"version in options is set to 0" in {
val f = RdfStreamFrame(
Seq(RdfStreamRow(JellyOptions.smallStrict)),
)
RdfValidate.setStdIn(ByteArrayInputStream(f.toByteArray))
val e = intercept[ExitException] {
RdfValidate.runTestCommand(List("rdf", "validate"))
}
e.cause.get shouldBe a[CriticalException]
e.cause.get.getMessage should include("The version field in RdfStreamOptions is <= 0")
}

"same input options supplied as in the validation source" in withFullJellyFile { j =>
val f = RdfStreamFrame(
Seq(
Expand Down