Jena, RDF4J, stream tests

Only integration-tests left now
Jelly-RDF · Dec 20, 2024 · d6b8e96 · d6b8e96
1 parent d2aa7ad
commit d6b8e96
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/jena/src/main/scala/eu/ostrzyciel/jelly/convert/jena/riot/JellyWriter.scala b/jena/src/main/scala/eu/ostrzyciel/jelly/convert/jena/riot/JellyWriter.scala
@@ -156,7 +156,9 @@ final class JellyStreamWriterAutodetectType(opt: JellyFormatVariant, out: Output
   // Not supported
   override def base(base: String): Unit = ()
 
-  override def prefix(prefix: String, iri: String): Unit = inner.prefix(prefix, iri)
+  override def prefix(prefix: String, iri: String): Unit =
+    if inner != null then
+      inner.prefix(prefix, iri)
 
   override def finish(): Unit =
     if inner != null then

diff --git a/jena/src/test/scala/eu/ostrzyciel/jelly/convert/jena/riot/JellyWriterFactorySpec.scala b/jena/src/test/scala/eu/ostrzyciel/jelly/convert/jena/riot/JellyWriterFactorySpec.scala
@@ -64,12 +64,16 @@ class JellyWriterFactorySpec extends AnyWordSpec, Matchers, JenaTest:
 
   for (factoryName, streamType, factory) <- factories do
     f"$factoryName ($streamType)" should {
-      for (presetName <- JellyLanguage.presets.keys) do
-        f"write a header with the $presetName preset set in the context" in {
+      for
+        presetName <- JellyLanguage.presets.keys
+        enableNsDecls <- Seq(Some(true), Some(false), None)
+      do
+        f"write a header with the $presetName preset set in the context, NS declarations $enableNsDecls" in {
           val os = new ByteArrayOutputStream()
           val format = RDFFormat(JellyLanguage.JELLY)
           val ctx = new Context()
           ctx.set(JellyLanguage.SYMBOL_PRESET, presetName)
+          enableNsDecls.foreach(ctx.set(JellyLanguage.SYMBOL_ENABLE_NAMESPACE_DECLARATIONS, _))
           factory(format, ctx, os)
           val bytes = os.toByteArray
           bytes should not be empty
@@ -91,6 +95,9 @@ class JellyWriterFactorySpec extends AnyWordSpec, Matchers, JenaTest:
           options.maxNameTableSize should be(expOpt.maxNameTableSize)
           options.maxPrefixTableSize should be(expOpt.maxPrefixTableSize)
           options.maxDatatypeTableSize should be(expOpt.maxDatatypeTableSize)
-          options.version should be(Constants.protoVersion)
+          if enableNsDecls.isDefined && enableNsDecls.get then
+            options.version should be(Constants.protoVersion)
+          else
+            options.version should be (Constants.protoVersionNoNsDecl)
         }
     }
diff --git a/stream/src/test/scala/eu/ostrzyciel/jelly/stream/EncoderFlowSpec.scala b/stream/src/test/scala/eu/ostrzyciel/jelly/stream/EncoderFlowSpec.scala
@@ -3,7 +3,7 @@ package eu.ostrzyciel.jelly.stream
 import eu.ostrzyciel.jelly.core.helpers.Assertions.*
 import eu.ostrzyciel.jelly.core.helpers.MockConverterFactory
 import eu.ostrzyciel.jelly.core.proto.v1.*
-import eu.ostrzyciel.jelly.core.{JellyOptions, ProtoTestCases}
+import eu.ostrzyciel.jelly.core.{Constants, JellyOptions, ProtoTestCases}
 import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.stream.scaladsl.*
 import org.scalatest.concurrent.ScalaFutures
@@ -31,6 +31,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Triples1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.TRIPLES)
           .withLogicalType(LogicalStreamType.FLAT_TRIPLES)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (1)
@@ -47,6 +48,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Triples1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.TRIPLES)
           .withLogicalType(LogicalStreamType.FLAT_TRIPLES)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (3)
@@ -63,6 +65,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Triples1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.TRIPLES)
           .withLogicalType(LogicalStreamType.FLAT_TRIPLES)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (4)
@@ -82,6 +85,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Triples1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.TRIPLES)
           .withLogicalType(LogicalStreamType.FLAT_TRIPLES)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (2)
@@ -101,6 +105,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Triples1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.TRIPLES)
           .withLogicalType(LogicalStreamType.FLAT_TRIPLES)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (5)
@@ -125,6 +130,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Triples1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.TRIPLES)
           .withLogicalType(LogicalStreamType.GRAPHS)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be(2)
@@ -145,6 +151,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Quads1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.QUADS)
           .withLogicalType(LogicalStreamType.FLAT_QUADS)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (1)
@@ -164,6 +171,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Quads1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.QUADS)
           .withLogicalType(LogicalStreamType.FLAT_QUADS)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (2)
@@ -185,6 +193,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Quads1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.QUADS)
           .withLogicalType(LogicalStreamType.DATASETS)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be(2)
@@ -205,6 +214,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Graphs1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.GRAPHS)
           .withLogicalType(LogicalStreamType.NAMED_GRAPHS)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (2)
@@ -221,6 +231,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Graphs1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.GRAPHS)
           .withLogicalType(LogicalStreamType.NAMED_GRAPHS)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       // 1 additional split due to split by graph
@@ -241,6 +252,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Graphs1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.GRAPHS)
           .withLogicalType(LogicalStreamType.DATASETS)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (1)
@@ -258,6 +270,7 @@ class EncoderFlowSpec extends AnyWordSpec, Matchers, ScalaFutures:
         Graphs1.encoded(JellyOptions.smallGeneralized
           .withPhysicalType(PhysicalStreamType.GRAPHS)
           .withLogicalType(LogicalStreamType.DATASETS)
+          .withVersion(Constants.protoVersionNoNsDecl)
         )
       )
       encoded.size should be (4)