Skip to content

Fix printing differing options in Rdf Validate #130

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
Ostrzyciel merged 2 commits into from
May 30, 2025
Merged

Fix printing differing options in Rdf Validate #130

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
6fad32f
Fix printing differing options in Rdf Validate
nk2IsHere May 30, 2025
14e4849
Reformat
nk2IsHere May 30, 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: 2 additions & 2 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 @@ -123,8 +123,8 @@ object RdfValidate extends JellyCommand[RdfValidateOptions]:
if streamOptions != o then
throw CriticalException(
s"Stream options do not match the expected options in $optionsFileName\n" +
s"Expected: $o\n" +
s"Actual: $streamOptions",
s"Expected: ${StreamOptionsUtil.prettyPrint(o)}\n" +
s"Actual: ${StreamOptionsUtil.prettyPrint(streamOptions)}",
)
o
}
Expand Down
12 changes: 12 additions & 0 deletions src/main/scala/eu/neverblink/jelly/cli/command/rdf/util/StreamOptionsUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package eu.neverblink.jelly.cli.command.rdf.util

import eu.neverblink.jelly.core.proto.google.v1 as google
import eu.neverblink.jelly.core.proto.v1.RdfStreamOptions

object StreamOptionsUtil:

def prettyPrint(streamOptions: RdfStreamOptions): String = {
val streamOptionsBytes = streamOptions.toByteArray
val googleStreamOptions = google.RdfStreamOptions.parseFrom(streamOptionsBytes)
return googleStreamOptions.toString
}
16 changes: 16 additions & 0 deletions 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 @@ -431,6 +431,22 @@ class RdfValidateSpec extends AnyWordSpec, Matchers, TestFixtureHelper:
}
e.cause.get shouldBe a[CriticalException]
e.cause.get.getMessage should include("Stream options do not match the expected options")
e.cause.get.getMessage should include("Stream options do not match the expected options")
e.cause.get.getMessage should include("""Expected: stream_name: "Stream"
|physical_type: PHYSICAL_STREAM_TYPE_TRIPLES
|generalized_statements: true
|rdf_star: true
|max_name_table_size: 128
|max_prefix_table_size: 16
|max_datatype_table_size: 16
|logical_type: LOGICAL_STREAM_TYPE_FLAT_TRIPLES
|version: 1""".stripMargin)

e.cause.get.getMessage should include("""Actual: physical_type: PHYSICAL_STREAM_TYPE_TRIPLES
|max_name_table_size: 4000
|max_prefix_table_size: 150
|max_datatype_table_size: 32
|version: 1""".stripMargin)
}
}

Expand Down