-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix missing physical stream type in Jena stream writer (#219)
* Fix missing phys. stream type in Jena stream writer I've also added a bunch of tests to improve the coverage on the writer code in the various rarely used code paths. Issue: #218 * Automatically set the logical stream type This is done in RDF4J writer and in the "classic" Jena writers, so we should do it too. I've added a test that fails without the new addition. * Add more checks if the stream opts are saved correctly
- Loading branch information
1 parent
2892f77
commit c586814
Showing
4 changed files
with
134 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
jena/src/test/scala/eu/ostrzyciel/jelly/convert/jena/riot/JellyWriterSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package eu.ostrzyciel.jelly.convert.jena.riot | ||
|
|
||
| import eu.ostrzyciel.jelly.convert.jena.traits.JenaTest | ||
| import org.apache.commons.io.output.NullWriter | ||
| import org.apache.jena.riot.RiotException | ||
| import org.scalatest.matchers.should.Matchers | ||
| import org.scalatest.wordspec.AnyWordSpec | ||
|
|
||
| import java.io.OutputStream | ||
|
|
||
| /** | ||
| * Tests covering rare edge cases in the Jelly writer. | ||
| * The main tests are done in the integration-tests module. | ||
| */ | ||
| class JellyWriterSpec extends AnyWordSpec, Matchers, JenaTest: | ||
| val streamWriters = Seq( | ||
| ("JellyStreamWriter", (opt, out) => JellyStreamWriter(opt, out)), | ||
| ("JellyStreamWriterAutodetectType", (opt, out) => JellyStreamWriterAutodetectType(opt, out)), | ||
| ) | ||
|
|
||
| for (writerName, writerFactory) <- streamWriters do | ||
| f"$writerName" should { | ||
| for op <- Seq("start", "base", "prefix") do | ||
| f"do nothing on $op()" in { | ||
| var mutations = 0 | ||
| val out = new OutputStream { | ||
| override def write(b: Int): Unit = mutations += 1 | ||
| } | ||
| val writer = writerFactory(JellyFormatVariant(), out) | ||
| op match | ||
| case "start" => writer.start() | ||
| case "base" => writer.base("http://example.com") | ||
| case "prefix" => writer.prefix("ex", "http://example.com") | ||
| mutations should be (0) | ||
| } | ||
| } | ||
|
|
||
| "JellyStreamWriterAutodetectType" should { | ||
| "do nothing if the stream was not started" in { | ||
| val out = new OutputStream { | ||
| override def write(b: Int): Unit = fail("Should not write anything") | ||
| } | ||
| val writer = JellyStreamWriterAutodetectType(JellyFormatVariant(), out) | ||
| writer.finish() | ||
| } | ||
| } | ||
|
|
||
| val classicWriters: Seq[(String, JellyFormatVariant => JellyGraphWriter | JellyDatasetWriter)] = Seq( | ||
| ("JellyGraphWriter", (opt) => JellyGraphWriter(opt)), | ||
| ("JellyDatasetWriter", (opt) => JellyDatasetWriter(opt)), | ||
| ) | ||
|
|
||
| for (writerName, writerFactory) <- classicWriters do | ||
| f"$writerName" should { | ||
| "throw an exception when writing to a Java Writer" in { | ||
| val writer = writerFactory(JellyFormatVariant()) | ||
| val javaWriter = NullWriter.INSTANCE | ||
| intercept[RiotException] { | ||
| writer match | ||
| case graphWriter: JellyGraphWriter => graphWriter.write(javaWriter, null, null, null, null) | ||
| case datasetWriter: JellyDatasetWriter => datasetWriter.write(javaWriter, null, null, null, null) | ||
| }.getMessage should include ("Writing binary data to a java.io.Writer is not supported") | ||
| } | ||
|
|
||
| ".getLang return JellyLanguage.JELLY" in { | ||
| val writer = writerFactory(JellyFormatVariant()) | ||
| writer match | ||
| case graphWriter: JellyGraphWriter => graphWriter.getLang should be (JellyLanguage.JELLY) | ||
| case datasetWriter: JellyDatasetWriter => datasetWriter.getLang should be (JellyLanguage.JELLY) | ||
| } | ||
| } |