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/02/12 13:24:09 UTC
[1/2] marmotta git commit: MARMOTTA-628: applied patch by @orinciog
from github, closes #18
Repository: marmotta
Updated Branches:
refs/heads/develop 7eb9bc298 -> 0b07a02b0
MARMOTTA-628: applied patch by @orinciog from github, closes #18
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2a6f700c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2a6f700c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2a6f700c
Branch: refs/heads/develop
Commit: 2a6f700c3368438acb873dc1040ed83a329cd27c
Parents: 7eb9bc2
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Feb 12 13:21:36 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Feb 12 13:21:36 2016 +0100
----------------------------------------------------------------------
.../kiwi/sparql/builder/eval/ValueExpressionEvaluator.java | 4 ++++
.../org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java | 5 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2a6f700c/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
index 2d41ff9..2082164 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
@@ -500,9 +500,13 @@ public class ValueExpressionEvaluator extends QueryModelVisitorBase<RuntimeExcep
}
optypes.push(ot);
+ builder.append("(");
expr.getLeftArg().visit(this);
+ builder.append(")");
builder.append(getSQLOperator(expr.getOperator()));
+ builder.append("(");
expr.getRightArg().visit(this);
+ builder.append(")");
optypes.pop();
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2a6f700c/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
index 1246845..67be368 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
@@ -296,13 +296,12 @@ public class KiWiSparqlTest {
}
}
- /*
- see https://issues.apache.org/jira/browse/MARMOTTA-628
+
@Test
public void testMarmotta627_1() throws Exception {
testMarmotta627("SELECT ( (4.5-4.4)*0.1 as ?c ) WHERE {}", 0.01);
}
- */
+
@Test
public void testMarmotta627_2() throws Exception {
[2/2] marmotta git commit: MARMOTTA-628: added another test
Posted by wi...@apache.org.
MARMOTTA-628: added another test
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0b07a02b
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0b07a02b
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0b07a02b
Branch: refs/heads/develop
Commit: 0b07a02b04ea5a84a73e834f8aa671bf3fbf9e1f
Parents: 2a6f700
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Feb 12 13:23:57 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Feb 12 13:23:57 2016 +0100
----------------------------------------------------------------------
.../marmotta/kiwi/sparql/test/KiWiSparqlTest.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0b07a02b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
index 67be368..bb61a5a 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
@@ -296,32 +296,34 @@ public class KiWiSparqlTest {
}
}
-
@Test
- public void testMarmotta627_1() throws Exception {
+ public void testMarmotta628_1() throws Exception {
testMarmotta627("SELECT ( (4.5-4.4)*0.1 as ?c ) WHERE {}", 0.01);
}
-
@Test
- public void testMarmotta627_2() throws Exception {
+ public void testMarmotta628_2() throws Exception {
+ testMarmotta627("SELECT ( (4.5*4.4)*0.1 as ?c ) WHERE {}", 1.98);
+ }
+
+ @Test
+ public void testMarmotta627_1() throws Exception {
testMarmotta627("SELECT ( 0.1*0.1 as ?c ) WHERE {}", 0.01);
}
@Test
- public void testMarmotta627_3() throws Exception {
+ public void testMarmotta627_2() throws Exception {
testMarmotta627("SELECT ( 0.10*0.01 as ?c ) WHERE {}", 0.001);
}
@Test
- public void testMarmotta627_4() throws Exception {
+ public void testMarmotta627_3() throws Exception {
testMarmotta627("SELECT ( 1.00*3.10 as ?c ) WHERE {}", 3.10);
}
@Test
- public void testMarmotta627_5() throws Exception {
+ public void testMarmotta627_4() throws Exception {
testMarmotta627("SELECT ( 2.00*4.00 as ?c ) WHERE {}", 8.00);
}
-
}