The test continues to fail but it is not clear why

Author: labra

modules/srdfJena/src/main/scala/es/weso/rdf/jena/JenaMapper.scala

@@ -28,8 +28,6 @@ import es.weso.utils.IOUtils._
 import cats.implicits._
 import org.apache.jena.graph.Node
 import es.weso.rdf.MsgRDFException
-import org.apache.jena.vocabulary.RDF.dtRDFHTML
-import org.apache.jena.vocabulary.RDF.dtXMLLiteral
 
 object JenaMapper {
 
@@ -209,6 +207,13 @@ object JenaMapper {
     }
   }
 
+  // I used org.apache.jena.vocabulary.RDF.dtRDFHTML but it seems to fail
+  lazy val rdfHTML =
+    new BaseDatatype("http://www.w3.org/1999/02/22-rdf-syntax-ns#HTML")
+
+  // I used org.apache.jena.vocabulary.RDF.dtRDFXMLLiteral but it seems to fail
+  lazy val rdfXML = new BaseDatatype("http://www.w3.org/1999/02/22-rdf-syntax-ns#XML")
+
   def createRDFNode(m: JenaModel, node: RDFNode, base: Option[IRI]): JenaRDFNode = {
     val xsd = "http://www.w3.org/2001/XMLSchema#"
     val xsdinteger = xsd + "integer"
@@ -224,9 +229,9 @@ object JenaMapper {
       case StringLiteral(str) =>
         m.createLiteral(str, false)
       case RDFHTMLLiteral(str) =>
-        m.createTypedLiteral(str, dtRDFHTML)
+        m.createTypedLiteral(str, rdfHTML)
       case RDFXMLLiteral(str) =>
-        m.createTypedLiteral(str, dtXMLLiteral)
+        m.createTypedLiteral(str, rdfXML)
       case DatatypeLiteral(str, i: IRI) =>
         i.str match {
           case `xsdinteger` => m.createTypedLiteral(str, XSDDatatype.XSDinteger)

modules/srdfJena/src/test/scala/es/weso/rdf/jena/JenaBased.scala

@@ -5,10 +5,9 @@ import java.io.ByteArrayInputStream
 import org.apache.jena.rdf.model.Model
 import java.io.InputStream
 
-
 trait JenaBased {
 
-  def checkIsomorphic(m1: Model, m2: Model): Either[String,Unit] = {
+  def checkIsomorphic(m1: Model, m2: Model): Either[String, Unit] = {
     val b = m1.isIsomorphicWith(m2)
     if (!b) {
       Left(s"""|Models are not isomorphic
@@ -17,16 +16,11 @@ trait JenaBased {
     } else Right(())
   }
 
-  /* def shouldBeIsomorphic(m1: Model,m2: Model): Unit = {
-    checkIsomorphic(m1,m2).fold(fail(_), _ => ())
-  }*/
-
-
   def str2model(s: String): Model = {
     val m = ModelFactory.createDefaultModel
     val in: InputStream = new ByteArrayInputStream(s.getBytes("UTF-8"))
     m.read(in, "", "TURTLE")
     m
-  } 
+  }
 
-}
+}

modules/srdfJena/src/test/scala/es/weso/rdftriple/jenaMapper/JenaMapperTest.scala

@@ -7,6 +7,8 @@ import es.weso.rdf.triples.RDFTriple
 import munit._
 import cats._
 import cats.implicits._
+import scala.jdk.CollectionConverters._
+import org.apache.jena.datatypes.RDFDatatype
 
 class JenaMapperTest extends CatsEffectSuite with JenaBased {
 
@@ -174,6 +176,18 @@ class JenaMapperTest extends CatsEffectSuite with JenaBased {
     val empty = ModelFactory.createDefaultModel
     val model1 = RDFTriples2Model(ts, empty, None)
     val model2 = str2model(s)
+    val s1 = model1.listSubjects().toList().asScala.head
+    val s2 = model2.listSubjects().toList().asScala.head
+    println(s"Subject1 = $s1, ${s1.getClass().getName()}")
+    println(s"Subject2 = $s2, ${s2.getClass().getName()}")
+    println(s"Are equal? ${s1.equals(s2)}")
+
+    val o1dt = model1.listObjects().toList().asScala.head.asLiteral().getDatatype()
+    val o2dt = model2.listObjects().toList().asScala.head.asLiteral().getDatatype()
+    println(s"Object1 = $o1dt, ${o1dt.getClass().getName()}")
+    println(s"Object2 = $o2dt, ${o2dt.getClass().getName()}")
+    println(s"Are equal? ${o1dt.equals(o2dt)}")
+
     assertEquals(checkIsomorphic(model1, model2), ().asRight)
   }