You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2016/01/31 11:50:43 UTC
[1/3] marmotta git commit: MARMOTTA-625: applied patch provided by
Alan Robson
Repository: marmotta
Updated Branches:
refs/heads/MARMOTTA-625 [created] 7fdc700c2
MARMOTTA-625: applied patch provided by Alan Robson
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7e0c567d
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7e0c567d
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7e0c567d
Branch: refs/heads/MARMOTTA-625
Commit: 7e0c567d34c6ca2442744e3145dc0a68deba09d5
Parents: ea28ddb
Author: Sergio Fernández <wi...@apache.org>
Authored: Sun Jan 31 09:40:42 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Sun Jan 31 09:40:42 2016 +0100
----------------------------------------------------------------------
.../kiwi/reasoner/parser/KWRLProgramParser.jj | 26 +++++++++++++-------
.../test/parser/KWRLRuleParserTest.java | 24 ++++++++++++++++++
2 files changed, 41 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7e0c567d/libraries/kiwi/kiwi-reasoner/src/main/javacc/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParser.jj
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/javacc/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParser.jj b/libraries/kiwi/kiwi-reasoner/src/main/javacc/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParser.jj
index 67e502f..6044558 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/javacc/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParser.jj
+++ b/libraries/kiwi/kiwi-reasoner/src/main/javacc/org/apache/marmotta/kiwi/reasoner/parser/KWRLProgramParser.jj
@@ -148,6 +148,12 @@ TOKEN : /* OPERATORS */
< TYPE: "^^" >
}
+
+TOKEN : /* JIRA MARMOTTA-625 */
+{
+ < LANG: "@"["a"-"z"]["a"-"z"] >
+}
+
TOKEN :
{
< LEFTP: "(" > |
@@ -351,19 +357,21 @@ VariableField Variable() : {Token t;}
}
}
-//TODO language tags
-LiteralField Literal() : {Token literal = null; Token type = null;}
+
+// Modified for MARMOTTA-625
+LiteralField Literal() : {Token literal = null; Token type = null; Token language = null;}
{
(
- literal = <STRLIT> (<TYPE> type = <URI>)? | "\"\""
-){ //have to remove the leading " character first
+ literal = <STRLIT> (language = <LANG>)? (<TYPE> type = <URI>)? | "\"\""
+){ // have to remove the surrounding quotes ane leading @ characters
+ if (language != null) {
+ return new LiteralField(resolveLiteral(literal.image.substring(1, literal.image.length()-1),
+ new Locale(language.image.substring(1)), null));
+ }
if (type != null) {
- return new LiteralField(resolveLiteral(literal.image.substring(1, literal.image.length()-1), Locale.getDefault(), type.image));
+ return new LiteralField(resolveLiteral(literal.image.substring(1, literal.image.length()-1), null , type.image));
}
- return new LiteralField(resolveLiteral(literal.image.substring(1, literal.image.length()-1), Locale.getDefault(), null));
+ return new LiteralField(resolveLiteral(literal.image.substring(1, literal.image.length()-1), null, null));
}
-
}
-
-
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7e0c567d/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 187021e..2583c7b 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
@@ -92,4 +92,28 @@ public class KWRLRuleParserTest {
Assert.assertTrue(r.getHead().getObject().isVariableField());
}
+ @Test
+ public void testRule3() throws Exception {
+ String rule = "($1 $2 $3) -> ($1 $2 \"Hello\"@en)";
+ 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.assertTrue(r.getHead().getSubject().isVariableField());
+ Assert.assertTrue(r.getHead().getProperty().isResourceField());
+ Assert.assertTrue(r.getHead().getObject().isVariableField());
+ }
+
+ @Test
+ public void testRule4() throws Exception {
+ String rule = "($1 $2 $3) -> ($1 $2 \"Bonjour\"@fr)";
+ 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.assertTrue(r.getHead().getSubject().isVariableField());
+ Assert.assertTrue(r.getHead().getProperty().isResourceField());
+ Assert.assertTrue(r.getHead().getObject().isVariableField());
+ }
+
}
[3/3] marmotta git commit: MARMOTTA-625: added more basic parsing
tests
Posted by wi...@apache.org.
MARMOTTA-625: added more basic parsing tests
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7fdc700c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7fdc700c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7fdc700c
Branch: refs/heads/MARMOTTA-625
Commit: 7fdc700c2bca2398b4fe86fe86cebf7b197a6837
Parents: 437a610
Author: Sergio Fernández <wi...@apache.org>
Authored: Sun Jan 31 10:23:55 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Sun Jan 31 10:46:55 2016 +0100
----------------------------------------------------------------------
.../kiwi/reasoner/test/parser/KWRLRuleParserTest.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7fdc700c/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 83fb116..2f1651c 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
@@ -18,9 +18,9 @@
package org.apache.marmotta.kiwi.reasoner.test.parser;
import com.google.common.collect.ImmutableMap;
+import org.apache.marmotta.kiwi.reasoner.model.program.LiteralField;
import org.apache.marmotta.kiwi.reasoner.model.program.Rule;
import org.apache.marmotta.kiwi.reasoner.parser.KWRLProgramParser;
-import org.apache.marmotta.kiwi.test.RepositoryTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -98,9 +98,14 @@ public class KWRLRuleParserTest {
Assert.assertNotNull(r);
Assert.assertEquals(1, r.getBody().size());
+ Assert.assertTrue(r.getBody().get(0).getSubject().isVariableField());
+ Assert.assertTrue(r.getBody().get(0).getObject().isVariableField());
+ Assert.assertTrue(r.getBody().get(0).getProperty().isVariableField());
Assert.assertTrue(r.getHead().getSubject().isVariableField());
Assert.assertTrue(r.getHead().getProperty().isVariableField());
Assert.assertTrue(r.getHead().getObject().isLiteralField());
+ Assert.assertEquals("Hello", ((LiteralField) r.getHead().getObject()).getLiteral().getLabel());
+ Assert.assertEquals("en", ((LiteralField) r.getHead().getObject()).getLiteral().getLanguage());
}
@Test
@@ -110,9 +115,14 @@ public class KWRLRuleParserTest {
Assert.assertNotNull(r);
Assert.assertEquals(1, r.getBody().size());
+ Assert.assertTrue(r.getBody().get(0).getSubject().isVariableField());
+ Assert.assertTrue(r.getBody().get(0).getObject().isVariableField());
+ Assert.assertTrue(r.getBody().get(0).getProperty().isVariableField());
Assert.assertTrue(r.getHead().getSubject().isVariableField());
Assert.assertTrue(r.getHead().getProperty().isVariableField());
Assert.assertTrue(r.getHead().getObject().isLiteralField());
+ Assert.assertEquals("Bonjour", ((LiteralField)r.getHead().getObject()).getLiteral().getLabel());
+ Assert.assertEquals("fr", ((LiteralField) r.getHead().getObject()).getLiteral().getLanguage());
}
}
[2/3] marmotta git commit: MARMOTTA-625: fixed tests
Posted by wi...@apache.org.
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 <wi...@apache.org>
Authored: Sun Jan 31 10:23:04 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
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 (sschaffert@apache.org)
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
*/
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());