MARMOTTA-625: fixed tests
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/437a6108 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/437a6108 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/437a6108 Branch: refs/heads/MARMOTTA-625 Commit: 437a61088caaddaa7d641346dea008933d713f47 Parents: 7e0c567 Author: Sergio Fernández <[email protected]> Authored: Sun Jan 31 10:23:04 2016 +0100 Committer: Sergio Fernández <[email protected]> Committed: Sun Jan 31 10:23:04 2016 +0100 ---------------------------------------------------------------------- .../reasoner/test/parser/KWRLRuleParserTest.java | 17 ++++++++--------- .../persistence/KWRLProgramPersistenceTest.java | 2 -- 2 files changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/437a6108/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/parser/KWRLRuleParserTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/parser/KWRLRuleParserTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/parser/KWRLRuleParserTest.java index 2583c7b..83fb116 100644 --- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/parser/KWRLRuleParserTest.java +++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/parser/KWRLRuleParserTest.java @@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory; /** * Test parsing of individual rules - * <p/> - * Author: Sebastian Schaffert ([email protected]) + * + * @author Sebastian Schaffert ([email protected]) */ public class KWRLRuleParserTest { @@ -48,7 +48,6 @@ public class KWRLRuleParserTest { repository.initialize(); } - @After public void shutdown() throws Exception { repository.shutDown(); @@ -98,10 +97,10 @@ public class KWRLRuleParserTest { Rule r = KWRLProgramParser.parseRule(rule, ImmutableMap.of("rdfs", "http://www.w3.org/2000/01/rdf-schema#";), repository.getValueFactory()); Assert.assertNotNull(r); - Assert.assertEquals(2, r.getBody().size()); + Assert.assertEquals(1, r.getBody().size()); Assert.assertTrue(r.getHead().getSubject().isVariableField()); - Assert.assertTrue(r.getHead().getProperty().isResourceField()); - Assert.assertTrue(r.getHead().getObject().isVariableField()); + Assert.assertTrue(r.getHead().getProperty().isVariableField()); + Assert.assertTrue(r.getHead().getObject().isLiteralField()); } @Test @@ -110,10 +109,10 @@ public class KWRLRuleParserTest { Rule r = KWRLProgramParser.parseRule(rule, ImmutableMap.of("rdfs", "http://www.w3.org/2000/01/rdf-schema#";), repository.getValueFactory()); Assert.assertNotNull(r); - Assert.assertEquals(2, r.getBody().size()); + Assert.assertEquals(1, r.getBody().size()); Assert.assertTrue(r.getHead().getSubject().isVariableField()); - Assert.assertTrue(r.getHead().getProperty().isResourceField()); - Assert.assertTrue(r.getHead().getObject().isVariableField()); + Assert.assertTrue(r.getHead().getProperty().isVariableField()); + Assert.assertTrue(r.getHead().getObject().isLiteralField()); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/437a6108/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java index a24fa5e..773bed7 100644 --- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java +++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java @@ -63,13 +63,11 @@ public class KWRLProgramPersistenceTest { private Repository repository; private final KiWiConfiguration config; - public KWRLProgramPersistenceTest(KiWiConfiguration config) { this.config = config; } - @Before public void initDatabase() throws Exception { repository = new SailRepository(new MemoryStore());
