You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/12/20 12:12:27 UTC
[1/3] jena git commit: Rename TestEsc as TestUnescape.
Repository: jena
Updated Branches:
refs/heads/master e70adf702 -> 1c8060d8c
Rename TestEsc as TestUnescape.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e8a4c4c4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e8a4c4c4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e8a4c4c4
Branch: refs/heads/master
Commit: e8a4c4c4439dba2a3a0f1617aa837b36539ee5df
Parents: e70adf7
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 20 10:40:00 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 20 10:40:00 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/sparql/lang/TS_Lang.java | 2 +-
.../org/apache/jena/sparql/lang/TestEsc.java | 74 --------------------
.../apache/jena/sparql/lang/TestUnescape.java | 68 ++++++++++++++++++
3 files changed, 69 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e8a4c4c4/jena-arq/src/test/java/org/apache/jena/sparql/lang/TS_Lang.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/lang/TS_Lang.java b/jena-arq/src/test/java/org/apache/jena/sparql/lang/TS_Lang.java
index cd109b1..ee31c7e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/lang/TS_Lang.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/lang/TS_Lang.java
@@ -23,7 +23,7 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestEsc.class ,
+ TestUnescape.class ,
TestVarScope.class
})
http://git-wip-us.apache.org/repos/asf/jena/blob/e8a4c4c4/jena-arq/src/test/java/org/apache/jena/sparql/lang/TestEsc.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/lang/TestEsc.java b/jena-arq/src/test/java/org/apache/jena/sparql/lang/TestEsc.java
deleted file mode 100644
index 633d08e..0000000
--- a/jena-arq/src/test/java/org/apache/jena/sparql/lang/TestEsc.java
+++ /dev/null
@@ -1,74 +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.
- */
-
-package org.apache.jena.sparql.lang;
-
-import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.query.QueryParseException ;
-import org.apache.jena.sparql.lang.ParserBase ;
-import org.junit.Test ;
-
-public class TestEsc extends BaseTest
-{
- @Test public void testEsc01() { execTest("x\\uabcd", "x\uabcd") ; }
- @Test public void testEsc02() { execTest("\\uabcdx", "\uabcdx") ; }
- @Test public void testEsc03() { execTest("1234\\uabcd1234", "1234\uabcd1234") ; }
- @Test public void testEsc04() { execTestFail("\\X") ; }
- @Test public void testEsc05() { execTestFail("\\Xz") ; }
- @Test public void testEsc06() { execTestFail("a\\X") ; }
-
-
- @Test public void testEscUni01() { execTestFail("\\uabck") ; }
- @Test public void testEscUni02() { execTestFail("\\uab") ; }
- @Test public void testEscUni03() { execTestFail("\\uabc") ; }
- @Test public void testEscUni04() { execTestFail("\\ua") ; }
- @Test public void testEscUni05() { execTestFail("\\u") ; }
- @Test public void testEscUni06() { execTestFail("\\") ; }
- @Test public void testEscUni07() { execTest("\\u0020", " ") ; }
- @Test public void testEscUni08() { execTest("\\uFFFF", "\uFFFF") ; }
- @Test public void testEscUni09() { execTest("\\u0000", "\u0000") ; }
- @Test public void testEscUni10() { execTestFail("\\U0000") ; }
- @Test public void testEscUni11() { execTestFail("\\U0000A") ; }
- @Test public void testEscUni12() { execTestFail("\\U0000AB") ; }
- @Test public void testEscUni13() { execTestFail("\\U0000ABC") ; }
- @Test public void testEscUni14() { execTest("\\U0000ABCD", "\uABCD") ; }
- @Test public void testEscUni15() { execTestFail("\\U0000") ; }
- @Test public void testEscUni16() { execTest("\\U00000000", "\u0000") ; }
- @Test public void testEscUni17() { execTest("x\\tx\\nx\\r", "x\tx\nx\r") ; }
- @Test public void testEscUni18() { execTest("x\\t\\n\\r", "x\t\n\r") ; }
-
- private void execTestFail(String input)
- {
- try {
- String s = ParserBase.unescapeStr(input) ;
- fail("Unescaping succeeded on "+input) ;
- } catch (QueryParseException ex)
- {
- return ;
- }
-
- }
-
- private void execTest(String input, String outcome)
- {
- String result = ParserBase.unescapeStr(input) ;
- assertEquals("Unescaped string does not match ("+input+")", outcome, result) ;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/e8a4c4c4/jena-arq/src/test/java/org/apache/jena/sparql/lang/TestUnescape.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/lang/TestUnescape.java b/jena-arq/src/test/java/org/apache/jena/sparql/lang/TestUnescape.java
new file mode 100644
index 0000000..201e6da
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/lang/TestUnescape.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package org.apache.jena.sparql.lang;
+
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.query.QueryParseException ;
+import org.apache.jena.sparql.lang.ParserBase ;
+import org.junit.Test ;
+
+public class TestUnescape extends BaseTest
+{
+ @Test public void testEsc01() { execTest("x\\uabcd", "x\uabcd") ; }
+ @Test public void testEsc02() { execTest("\\uabcdx", "\uabcdx") ; }
+ @Test public void testEsc03() { execTest("1234\\uabcd1234", "1234\uabcd1234") ; }
+ @Test public void testEsc04() { execTestFail("\\X") ; }
+ @Test public void testEsc05() { execTestFail("\\Xz") ; }
+ @Test public void testEsc06() { execTestFail("a\\X") ; }
+
+ @Test public void testEscUni01() { execTestFail("\\uabck") ; }
+ @Test public void testEscUni02() { execTestFail("\\uab") ; }
+ @Test public void testEscUni03() { execTestFail("\\uabc") ; }
+ @Test public void testEscUni04() { execTestFail("\\ua") ; }
+ @Test public void testEscUni05() { execTestFail("\\u") ; }
+ @Test public void testEscUni06() { execTestFail("\\") ; }
+ @Test public void testEscUni07() { execTest("\\u0020", " ") ; }
+ @Test public void testEscUni08() { execTest("\\uFFFF", "\uFFFF") ; }
+ @Test public void testEscUni09() { execTest("\\u0000", "\u0000") ; }
+ @Test public void testEscUni10() { execTestFail("\\U0000") ; }
+ @Test public void testEscUni11() { execTestFail("\\U0000A") ; }
+ @Test public void testEscUni12() { execTestFail("\\U0000AB") ; }
+ @Test public void testEscUni13() { execTestFail("\\U0000ABC") ; }
+ @Test public void testEscUni14() { execTest("\\U0000ABCD", "\uABCD") ; }
+ @Test public void testEscUni15() { execTestFail("\\U0000") ; }
+ @Test public void testEscUni16() { execTest("\\U00000000", "\u0000") ; }
+ @Test public void testEscUni17() { execTest("x\\tx\\nx\\r", "x\tx\nx\r") ; }
+ @Test public void testEscUni18() { execTest("x\\t\\n\\r", "x\t\n\r") ; }
+
+ private void execTestFail(String input) {
+ try {
+ String s = ParserBase.unescapeStr(input);
+ fail("Unescaping succeeded on " + input + " producing <<"+s+">>");
+ }
+ catch (QueryParseException ex) {
+ return;
+ }
+ }
+
+ private void execTest(String input, String outcome) {
+ String result = ParserBase.unescapeStr(input);
+ assertEquals("Unescaped string does not match (" + input + ")", outcome, result);
+ }
+}
[2/3] jena git commit: Allow no dataset,
default to empty (useful in testing).
Posted by an...@apache.org.
Allow no dataset, default to empty (useful in testing).
SPARQL 1.1 allows inline data with VALUES and BIND.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c31a1e77
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c31a1e77
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c31a1e77
Branch: refs/heads/master
Commit: c31a1e775f606fe4d692c8a7a1956dae98af74c0
Parents: e8a4c4c
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 20 10:41:09 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 20 10:41:09 2015 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/arq/query.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c31a1e77/jena-arq/src/main/java/arq/query.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/query.java b/jena-arq/src/main/java/arq/query.java
index 76865e1..a825e6f 100644
--- a/jena-arq/src/main/java/arq/query.java
+++ b/jena-arq/src/main/java/arq/query.java
@@ -187,7 +187,8 @@ public class query extends CmdARQ
}
protected Dataset dealWithNoDataset() {
- throw new CmdException("No dataset provided") ;
+ return DatasetFactory.create() ;
+ //throw new CmdException("No dataset provided") ;
}
protected long totalTime = 0 ;
[3/3] jena git commit: Indentation error.
Posted by an...@apache.org.
Indentation error.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1c8060d8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1c8060d8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1c8060d8
Branch: refs/heads/master
Commit: 1c8060d8cde1ecc924d56f021798ce9010087d12
Parents: c31a1e7
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 20 11:12:13 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 20 11:12:13 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1c8060d8/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
index 8bd4afd..3b8923e 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
@@ -210,8 +210,8 @@ public class FusekiConfig {
}
// Files that are not hidden.
DirectoryStream.Filter<Path> filter = (entry)-> {
- File f = entry.toFile() ;
- return ! f.isHidden() && f.isFile() ;
+ File f = entry.toFile() ;
+ return ! f.isHidden() && f.isFile() ;
} ;
List<DataAccessPoint> dataServiceRef = new ArrayList<>() ;