diff options
| author | Federico Igne <federico.igne@cs.ox.ac.uk> | 2020-10-09 18:26:25 +0200 |
|---|---|---|
| committer | Federico Igne <federico.igne@cs.ox.ac.uk> | 2020-10-09 18:26:25 +0200 |
| commit | 6d88de9bf58ddb499377a39b4d362e755fa379d2 (patch) | |
| tree | 15ff807e4f5f766947d7b3cf1e95cfc9c03a470a | |
| parent | 1d257a9287480014a4664c7808222179b6d2ae1d (diff) | |
| download | RSAComb-6d88de9bf58ddb499377a39b4d362e755fa379d2.tar.gz RSAComb-6d88de9bf58ddb499377a39b4d362e755fa379d2.zip | |
Fix problem with tests
Tests where not ported to the new (slightly more generic) interface.
| -rw-r--r-- | src/main/scala/rsacomb/RDFoxClassExprConverter.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/rsacomb/OWLAxiomSpec.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/rsacomb/OWLClassSpec.scala | 18 |
3 files changed, 11 insertions, 11 deletions
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 { | |||
| 35 | 35 | ||
| 36 | def apply( | 36 | def apply( |
| 37 | term: Term, | 37 | term: Term, |
| 38 | unsafe: List[OWLObjectPropertyExpression], | 38 | unsafe: List[OWLObjectPropertyExpression] = List(), |
| 39 | skolem: SkolemStrategy = SkolemStrategy.None, | 39 | skolem: SkolemStrategy = SkolemStrategy.None, |
| 40 | suffix: RSASuffix = RSASuffix.None | 40 | suffix: RSASuffix = RSASuffix.None |
| 41 | ): RDFoxClassExprConverter = | 41 | ): 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 { | |||
| 163 | term: Term, | 163 | term: Term, |
| 164 | skolem: SkolemStrategy = SkolemStrategy.None | 164 | skolem: SkolemStrategy = SkolemStrategy.None |
| 165 | ): List[Rule] = { | 165 | ): List[Rule] = { |
| 166 | axiom.accept(RDFoxAxiomConverter(term, skolem)) | 166 | axiom.accept(RDFoxAxiomConverter(term, List())) |
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | } // object OWLAxiomSpec | 169 | } // 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 { | |||
| 165 | // OWLObjectSomeValuesFrom | 165 | // OWLObjectSomeValuesFrom |
| 166 | (class_OWLObjectSomeValuesFrom.toString ++ " w/o skolemization") should | 166 | (class_OWLObjectSomeValuesFrom.toString ++ " w/o skolemization") should |
| 167 | "be converted into a RDFoxRuleShards" in { | 167 | "be converted into a RDFoxRuleShards" in { |
| 168 | val visitor = RDFoxClassExprConverter(term_x, SkolemStrategy.None) | 168 | val visitor = RDFoxClassExprConverter(term_x) |
| 169 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 169 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 170 | result shouldBe a[RDFoxRuleShards] | 170 | result shouldBe a[RDFoxRuleShards] |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | it should "have two Atoms in its result list" in { | 173 | it should "have two Atoms in its result list" in { |
| 174 | val visitor = RDFoxClassExprConverter(term_x, SkolemStrategy.None) | 174 | val visitor = RDFoxClassExprConverter(term_x) |
| 175 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 175 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 176 | exactly(2, result.res) should (be(an[Atom]) and have( | 176 | exactly(2, result.res) should (be(an[Atom]) and have( |
| 177 | 'numberOfArguments (3) | 177 | 'numberOfArguments (3) |
| @@ -179,7 +179,7 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { | |||
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | it should "have an empty extension list" in { | 181 | it should "have an empty extension list" in { |
| 182 | val visitor = RDFoxClassExprConverter(term_x, SkolemStrategy.None) | 182 | val visitor = RDFoxClassExprConverter(term_x) |
| 183 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 183 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 184 | result.ext shouldBe empty | 184 | result.ext shouldBe empty |
| 185 | } | 185 | } |
| @@ -187,14 +187,14 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { | |||
| 187 | (class_OWLObjectSomeValuesFrom.toString ++ " w/ skolemization") should | 187 | (class_OWLObjectSomeValuesFrom.toString ++ " w/ skolemization") should |
| 188 | "be converted into a RDFoxRuleShards" in { | 188 | "be converted into a RDFoxRuleShards" in { |
| 189 | val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) | 189 | val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) |
| 190 | val visitor = RDFoxClassExprConverter(term_x, skolem) | 190 | val visitor = RDFoxClassExprConverter(term_x, List(), skolem) |
| 191 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 191 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 192 | result shouldBe a[RDFoxRuleShards] | 192 | result shouldBe a[RDFoxRuleShards] |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | it should "have exactly two Atoms in its result list" in { | 195 | it should "have exactly two Atoms in its result list" in { |
| 196 | val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) | 196 | val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) |
| 197 | val visitor = RDFoxClassExprConverter(term_x, skolem) | 197 | val visitor = RDFoxClassExprConverter(term_x, List(), skolem) |
| 198 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 198 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 199 | exactly(2, result.res) should (be(an[Atom]) and have( | 199 | exactly(2, result.res) should (be(an[Atom]) and have( |
| 200 | 'numberOfArguments (3) | 200 | 'numberOfArguments (3) |
| @@ -203,7 +203,7 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { | |||
| 203 | 203 | ||
| 204 | it should "should have a single SKOLEM call in the extension list" in { | 204 | it should "should have a single SKOLEM call in the extension list" in { |
| 205 | val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) | 205 | val skolem = SkolemStrategy.Standard(class_OWLObjectSomeValuesFrom.toString) |
| 206 | val visitor = RDFoxClassExprConverter(term_x, skolem) | 206 | val visitor = RDFoxClassExprConverter(term_x, List(), skolem) |
| 207 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 207 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 208 | result.ext.loneElement shouldBe a[BindAtom] | 208 | result.ext.loneElement shouldBe a[BindAtom] |
| 209 | val builtin = result.ext.head.asInstanceOf[BindAtom].getBuiltinExpression | 209 | val builtin = result.ext.head.asInstanceOf[BindAtom].getBuiltinExpression |
| @@ -215,14 +215,14 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { | |||
| 215 | (class_OWLObjectSomeValuesFrom.toString ++ " w/ constant skolemization") should | 215 | (class_OWLObjectSomeValuesFrom.toString ++ " w/ constant skolemization") should |
| 216 | "be converted into a RDFoxRuleShards" in { | 216 | "be converted into a RDFoxRuleShards" in { |
| 217 | val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) | 217 | val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) |
| 218 | val visitor = RDFoxClassExprConverter(term_x, skolem) | 218 | val visitor = RDFoxClassExprConverter(term_x, List(), skolem) |
| 219 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 219 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 220 | result shouldBe a[RDFoxRuleShards] | 220 | result shouldBe a[RDFoxRuleShards] |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | it should "have exactly two Atoms in its result list" in { | 223 | it should "have exactly two Atoms in its result list" in { |
| 224 | val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) | 224 | val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) |
| 225 | val visitor = RDFoxClassExprConverter(term_x, skolem) | 225 | val visitor = RDFoxClassExprConverter(term_x, List(), skolem) |
| 226 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 226 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 227 | exactly(2, result.res) should (be(an[Atom]) and have( | 227 | exactly(2, result.res) should (be(an[Atom]) and have( |
| 228 | 'numberOfArguments (3) | 228 | 'numberOfArguments (3) |
| @@ -231,7 +231,7 @@ class OWLClassSpec extends FlatSpec with Matchers with LoneElement { | |||
| 231 | 231 | ||
| 232 | it should "have an empty extension list" in { | 232 | it should "have an empty extension list" in { |
| 233 | val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) | 233 | val skolem = SkolemStrategy.Constant(class_OWLObjectSomeValuesFrom.toString) |
| 234 | val visitor = RDFoxClassExprConverter(term_x, skolem) | 234 | val visitor = RDFoxClassExprConverter(term_x, List(), skolem) |
| 235 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) | 235 | val result = class_OWLObjectSomeValuesFrom.accept(visitor) |
| 236 | result.ext shouldBe empty | 236 | result.ext shouldBe empty |
| 237 | } | 237 | } |
