Update answers pretty printer

2 files changed, 9 insertions, 4 deletions

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQueryAnswers.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQueryAnswers.scala
index 0f830eb..327ae8e 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQueryAnswers.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQueryAnswers.scala
@@ -1,6 +1,6 @@
 package uk.ac.ox.cs.rsacomb.sparql
 
-import tech.oxfordsemantic.jrdfox.logic.expression.{Resource, Variable}
+import tech.oxfordsemantic.jrdfox.logic.expression.{IRI, Resource, Variable}
 
 /** A collections of answers to a query.
   *
@@ -25,7 +25,12 @@ class ConjunctiveQueryAnswers(
         "NO ANSWER."
       else {
         val header = variables map (_.getName) mkString "\t"
-        val body = answers.map(_.mkString("\t")).mkString("\n")
+        val body = answers
+          .map(_.map {
+            case x: IRI => x.getIRI
+            case x      => x.toString
+          }.mkString("\t"))
+          .mkString("\n")
         s"$header\n$body"
       }
     }
diff --git a/src/test/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQueryAnswerSpecs.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQueryAnswerSpecs.scala
index ddc6377..b2319bc 100644
--- a/src/test/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQueryAnswerSpecs.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQueryAnswerSpecs.scala
@@ -43,11 +43,11 @@ class ConjunctiveQueryAnswerSpec extends AnyFlatSpec with Matchers {
   import ConjunctiveQueryAnswerSpec._
 
   "A conjunctive query" should "print an header and a single line if it has a single answer" in {
-    oneAnswer.toString shouldBe s"X\tY\tZ\n$iri1\t$iri2\t$iri3"
+    oneAnswer.toString shouldBe s"X\tY\tZ\n${iri1.getIRI}\t${iri2.getIRI}\t${iri3.getIRI}"
   }
 
   it should "print a header and multiple answers on multiple lines" in {
-    multipleAnswers.toString shouldBe s"Y\tZ\n$iri1\t$iri1\n$iri1\t$iri2\n$iri1\t$iri3"
+    multipleAnswers.toString shouldBe s"Y\tZ\n${iri1.getIRI}\t${iri1.getIRI}\n${iri1.getIRI}\t${iri2.getIRI}\n${iri1.getIRI}\t${iri3.getIRI}"
   }
 
   it should "print a special \"NO ANSWER.\" string when it has no answer" in {