Repository: marmotta Updated Branches: refs/heads/develop 247e03695 -> 9f53b80eb
MARMOTTA-578: renamed test data Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9f53b80e Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9f53b80e Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9f53b80e Branch: refs/heads/develop Commit: 9f53b80ebccb9bedc258b5ea1e51bb7facacaba3 Parents: 247e036 Author: Sergio Fernández <[email protected]> Authored: Thu Dec 11 11:32:29 2014 +0100 Committer: Sergio Fernández <[email protected]> Committed: Thu Dec 11 11:32:29 2014 +0100 ---------------------------------------------------------------------- .../kiwi/sparql/builder/SQLBuilder.java | 1 - .../kiwi/sparql/test/KiWiSparqlTest.java | 2 +- .../kiwi/sparql/test/MARMOTTA-578.sparql | 27 ++++++++++++++++++++ .../marmotta/kiwi/sparql/test/query37.sparql | 27 -------------------- 4 files changed, 28 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9f53b80e/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java index 0b61ae6..3e64836 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java @@ -57,7 +57,6 @@ public class SQLBuilder { */ private static final String[] positions = new String[] {"subject","predicate","object","context"}; - /** * Reference to the registry of natively supported functions with parameter and return types as well as SQL translation */ http://git-wip-us.apache.org/repos/asf/marmotta/blob/9f53b80e/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 bd1aa0a..e346ce5 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 @@ -138,7 +138,7 @@ public class KiWiSparqlTest { */ @Test public void testQuery37() throws Exception { - testQuery("query37.sparql"); + testQuery("MARMOTTA-578.sparql"); } //TODO: generalize this infrastructure code also used by KiWiSparqlJoinTest http://git-wip-us.apache.org/repos/asf/marmotta/blob/9f53b80e/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-578.sparql ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-578.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-578.sparql new file mode 100644 index 0000000..c977bb7 --- /dev/null +++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-578.sparql @@ -0,0 +1,27 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +PREFIX foaf: <http://xmlns.com/foaf/0.1/> + +SELECT ?person ?name +WHERE { + ?person a foaf:Person ; + foaf:name ?name . +} +GROUP BY ?person ?name +ORDER BY ?name http://git-wip-us.apache.org/repos/asf/marmotta/blob/9f53b80e/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query37.sparql ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query37.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query37.sparql deleted file mode 100644 index c977bb7..0000000 --- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query37.sparql +++ /dev/null @@ -1,27 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -PREFIX foaf: <http://xmlns.com/foaf/0.1/> - -SELECT ?person ?name -WHERE { - ?person a foaf:Person ; - foaf:name ?name . -} -GROUP BY ?person ?name -ORDER BY ?name
