From 6d88de9bf58ddb499377a39b4d362e755fa379d2 Mon Sep 17 00:00:00 2001 From: Federico Igne Date: Fri, 9 Oct 2020 18:26:25 +0200 Subject: Fix problem with tests Tests where not ported to the new (slightly more generic) interface. --- src/main/scala/rsacomb/RDFoxClassExprConverter.scala | 2 +- src/test/scala/rsacomb/OWLAxiomSpec.scala | 2 +- src/test/scala/rsacomb/OWLClassSpec.scala | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/main/scala/rsacomb/RDFoxClassExprConverter.scala b/src/main/scala/rsacomb/RDFoxClassExprConverter.scala index 2029f0b..f07e3c6 100644 --- a/src/main/scala/rsacomb/RDFoxClassExprConverter.scala +++ b/src/main/scala/rsacomb/RDFoxClassExprConverter.scala @@ -35,7 +35,7 @@ object RDFoxClassExprConverter { def apply( term: Term, - unsafe: List[OWLObjectPropertyExpression], + unsafe: List[OWLObjectPropertyExpression] = List(), skolem: SkolemStrategy = SkolemStrategy.None, suffix: RSASuffix = RSASuffix.None ): RDFoxClassExprConverter = diff --git a/src/test/scala/rsacomb/OWLAxiomSpec.scala b/src/test/scala/rsacomb/OWLAxiomSpec.scala index bbccd7b..c5b8763 100644 --- a/src/test/scala/rsacomb/OWLAxiomSpec.scala +++ b/src/test/scala/rsacomb/OWLAxiomSpec.scala @@ -163,7 +163,7 @@ object OWLAxiomSpec { term: Term, skolem: SkolemStrategy = SkolemStrategy.None ): List[Rule] = { - axiom.accept(RDFoxAxiomConverter(term, skolem)) + axiom.accept(RDFoxAxiomConverter(term, List())) } } // object OWLAxiomSpec diff --git a/src/test/scala/rsacomb/OWLClassSpec.scala b/src/test/scala/rsacomb/OWLClassSpec.scala index 23a96fa..d1e9fdb 100644 --- a/src/test/scala/rsacomb/OWLClassSpec.scala +++ b/src/test/scala/rsacomb/OWLClassSpec.scala @@ -165,13 +165,13 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { // OWLObjectSomeValuesFrom (class_OWLObjectSomeValuesFrom.toString ++ " w/o skolemization") should "be converted into a RDFoxRuleShards" in { - val visitor = RDFoxClassExprConverter(term_x, SkolemStrategy.None) + val visitor = RDFoxClassExprConverter(term_x) val result = class_OWLObjectSomeValuesFrom.accept(visitor) result shouldBe a[RDFoxRuleShards] } it should "have two Atoms in its result list" in { - val visitor = RDFoxClassExprConverter(term_x, SkolemStrategy.None) + val visitor = RDFoxClassExprConverter(term_x) val result = class_OWLObjectSomeValuesFrom.accept(visitor) exactly(2, result.res) should (be(an[Atom]) and have( 'numberOfArguments (3) @@ -179,7 +179,7 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { } it should "have an empty extension list" in { - val visitor = RDFoxClassExprConverter(term_x, SkolemStrategy.None) + val visitor = RDFoxClassExprConverter(term_x) val result = class_OWLObjectSomeValuesFrom.accept(visitor) result.ext shouldBe empty } @@ -187,14 +187,14 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { (class_OWLObjectSomeValuesFrom.toString ++ " w/ skolemization") should "be converted into a RDFoxRuleShards" in { val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) - val visitor = RDFoxClassExprConverter(term_x, skolem) + val visitor = RDFoxClassExprConverter(term_x, List(), skolem) val result = class_OWLObjectSomeValuesFrom.accept(visitor) result shouldBe a[RDFoxRuleShards] } it should "have exactly two Atoms in its result list" in { val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) - val visitor = RDFoxClassExprConverter(term_x, skolem) + val visitor = RDFoxClassExprConverter(term_x, List(), skolem) val result = class_OWLObjectSomeValuesFrom.accept(visitor) exactly(2, result.res) should (be(an[Atom]) and have( 'numberOfArguments (3) @@ -203,7 +203,7 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { it should "should have a single SKOLEM call in the extension list" in { val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) - val visitor = RDFoxClassExprConverter(term_x, skolem) + val visitor = RDFoxClassExprConverter(term_x, List(), skolem) val result = class_OWLObjectSomeValuesFrom.accept(visitor) result.ext.loneElement shouldBe a[BindAtom] val builtin = result.ext.head.asInstanceOf[BindAtom].getBuiltinExpression @@ -215,14 +215,14 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { (class_OWLObjectSomeValuesFrom.toString ++ " w/ constant skolemization") should "be converted into a RDFoxRuleShards" in { val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) - val visitor = RDFoxClassExprConverter(term_x, skolem) + val visitor = RDFoxClassExprConverter(term_x, List(), skolem) val result = class_OWLObjectSomeValuesFrom.accept(visitor) result shouldBe a[RDFoxRuleShards] } it should "have exactly two Atoms in its result list" in { val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) - val visitor = RDFoxClassExprConverter(term_x, skolem) + val visitor = RDFoxClassExprConverter(term_x, List(), skolem) val result = class_OWLObjectSomeValuesFrom.accept(visitor) exactly(2, result.res) should (be(an[Atom]) and have( 'numberOfArguments (3) @@ -231,7 +231,7 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { it should "have an empty extension list" in { val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) - val visitor = RDFoxClassExprConverter(term_x, skolem) + val visitor = RDFoxClassExprConverter(term_x, List(), skolem) val result = class_OWLObjectSomeValuesFrom.accept(visitor) result.ext shouldBe empty } -- cgit v1.2.3