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/10/17 12:34:24 UTC
[7/7] jena git commit: Adjust to deprecations in RiotParser.
Adjust to deprecations in RiotParser.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/77ddb0e1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/77ddb0e1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/77ddb0e1
Branch: refs/heads/master
Commit: 77ddb0e11e46527cee1a859bf33339c5103b33e2
Parents: 0e66ac9
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 17 11:06:59 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 17 11:06:59 2015 +0100
----------------------------------------------------------------------
.../apache/jena/riot/lang/TestLangNTriples.java | 1 +
.../apache/jena/riot/lang/TestLangNTuples.java | 25 +----------
.../apache/jena/riot/lang/TestLangRdfJson.java | 1 +
.../jena/riot/lang/TestParserFactory.java | 47 +++++++++++++++++---
.../apache/jena/riot/lang/TestTurtleTerms.java | 3 +-
5 files changed, 48 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/77ddb0e1/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
index 55b9bd6..8306786 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
@@ -101,6 +101,7 @@ public class TestLangNTriples extends TestLangNTuples
String string = StrUtils.strjoin("\n", strings);
Tokenizer tokenizer = tokenizer(charSpace, string);
StreamRDFCounting sink = StreamRDFLib.count();
+ @SuppressWarnings("deprecation")
LangNTriples x = RiotParsers.createParserNTriples(tokenizer, sink);
x.getProfile().setHandler(new ErrorHandlerEx());
x.parse();
http://git-wip-us.apache.org/repos/asf/jena/blob/77ddb0e1/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
index d75987c..ced99bd 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
@@ -187,34 +187,13 @@ abstract public class TestLangNTuples extends BaseTest
Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(in) ;
return tokenizer ;
}
-//
-// protected void parse(StreamRDF sink, String... strings ) {
-// ParserTestBaseLib.parse(getLang(), sink, strings);
-// }
-//
-// protected void parseASCII(StreamRDF sink, String string) {
-// Tokenizer tokenizer = tokenizer(CharSpace.ASCII, string) ;
-// LangRIOT parser = RiotParsers.createParserNTriples(tokenizer, sink) ;
-// parser.getProfile().setHandler(new ErrorHandlerEx()) ;
-// parser.parse() ;
-// }
-//
-//
-// {
-// String string = StrUtils.strjoin("\n", strings) ;
-// Tokenizer tokenizer = tokenizer(string) ;
-// LangRIOT parser = createParser(tokenizer(string), sink) ;
-// parser.getProfile().setHandler(new ErrorHandlerEx()) ;
-// parser.parse() ;
-// }
-//
-//// protected abstract LangRIOT createParser(Tokenizer tokenizer, StreamRDF sink) ;
-//
+
final protected void parseCheck(String... strings)
{
String string = StrUtils.strjoin("\n", strings) ;
Tokenizer tokenizer = tokenizer(string) ;
StreamRDFCounting sink = StreamRDFLib.count() ;
+ @SuppressWarnings("deprecation")
LangRIOT x = RiotParsers.createParserNQuads(tokenizer, sink) ;
x.setProfile(RiotLib.profile(null, false, true, new ErrorHandlerEx())) ;
x.parse() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/77ddb0e1/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
index 950d6c3..5fef1fe 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
@@ -446,6 +446,7 @@ public class TestLangRdfJson extends BaseTest
ByteArrayInputStream in = new ByteArrayInputStream(b);
Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(in) ;
StreamRDFCounting sink = StreamRDFLib.count() ;
+ @SuppressWarnings("deprecation")
LangRDFJSON parser = RiotParsers.createParserRdfJson(tokenizer, sink) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/77ddb0e1/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
index 22503c5..413d333 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
@@ -63,9 +63,21 @@ public class TestParserFactory extends BaseTest
@Test public void ntriples_01()
{
+ {
+ String s = "<http://base/x> <http://base/p> <http://base/q> ." ;
+ CatchParserOutput sink = parseCapture(s, Lang.NT) ;
+ assertEquals(1, sink.startCalled) ;
+ assertEquals(1, sink.finishCalled) ;
+ assertEquals(1, sink.triples.size()) ;
+ assertEquals(0, sink.quads.size()) ;
+ Triple t = SSE.parseTriple("(<http://base/x> <http://base/p> <http://base/q>)") ;
+ assertEquals(t, last(sink.triples)) ;
+ }
+
+ // Old style, deprecated.
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString("<x> <p> <q> .") ;
CatchParserOutput sink = new CatchParserOutput() ;
-
+ @SuppressWarnings("deprecation")
LangRIOT parser = RiotParsers.createParserNTriples(tokenizer, sink) ;
parserSetup(parser) ;
parser.parse();
@@ -78,8 +90,21 @@ public class TestParserFactory extends BaseTest
@Test public void turtle_01()
{
+ {
+ String s = "<x> <p> <q> ." ;
+ CatchParserOutput sink = parseCapture(s, Lang.TTL) ;
+ assertEquals(1, sink.startCalled) ;
+ assertEquals(1, sink.finishCalled) ;
+ assertEquals(1, sink.triples.size()) ;
+ assertEquals(0, sink.quads.size()) ;
+ Triple t = SSE.parseTriple("(<http://base/x> <http://base/p> <http://base/q>)") ;
+ assertEquals(t, last(sink.triples)) ;
+ }
+
+ // Old style, deprecated.
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString("<x> <p> <q> .") ;
CatchParserOutput sink = new CatchParserOutput() ;
+ @SuppressWarnings("deprecation")
LangRIOT parser = RiotParsers.createParserTurtle(tokenizer, "http://base/", sink) ;
parserSetup(parser) ;
parser.parse();
@@ -92,8 +117,20 @@ public class TestParserFactory extends BaseTest
@Test public void nquads_01()
{
+ {
+ String s = "<x> <p> <q> <g> ." ;
+ CatchParserOutput sink = parseCapture(s, Lang.NQ) ;
+ assertEquals(1, sink.startCalled) ;
+ assertEquals(1, sink.finishCalled) ;
+ assertEquals(0, sink.triples.size()) ;
+ assertEquals(1, sink.quads.size()) ;
+ Quad q = SSE.parseQuad("(<g> <x> <p> <q>)") ;
+ assertEquals(q, last(sink.quads)) ;
+ }
+ // Old style, deprecated.
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString("<x> <p> <q> <g>.") ;
CatchParserOutput sink = new CatchParserOutput() ;
+ @SuppressWarnings("deprecation")
LangRIOT parser = RiotParsers.createParserNQuads(tokenizer, sink) ;
parserSetup(parser) ;
parser.parse();
@@ -108,7 +145,7 @@ public class TestParserFactory extends BaseTest
@Test public void trig_01()
{
String s = "{ <x> <p> <q> }" ;
- CatchParserOutput sink = parseCapture(s) ;
+ CatchParserOutput sink = parseCapture(s, Lang.TRIG) ;
assertEquals(1, sink.startCalled) ;
assertEquals(1, sink.finishCalled) ;
assertEquals(0, sink.triples.size()) ;
@@ -122,7 +159,7 @@ public class TestParserFactory extends BaseTest
@Test public void trig_02()
{
String s = "<g> { <x> <p> <q> }" ;
- CatchParserOutput sink = parseCapture(s) ;
+ CatchParserOutput sink = parseCapture(s, Lang.TRIG) ;
assertEquals(1, sink.startCalled) ;
assertEquals(1, sink.finishCalled) ;
assertEquals(0, sink.triples.size()) ;
@@ -132,9 +169,9 @@ public class TestParserFactory extends BaseTest
assertEquals(q, last(sink.quads)) ;
}
- private CatchParserOutput parseCapture(String s) {
+ private CatchParserOutput parseCapture(String s, Lang lang) {
CatchParserOutput sink = new CatchParserOutput() ;
- RDFDataMgr.parse(sink, new StringReader(s), "http://base/", Lang.TRIG) ;
+ RDFDataMgr.parse(sink, new StringReader(s), "http://base/", lang) ;
return sink ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/77ddb0e1/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
index 1986495..662bdb7 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
@@ -243,7 +243,8 @@ public class TestTurtleTerms extends BaseTest
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString(testString) ;
StreamRDF sink = StreamRDFLib.sinkNull() ;
- LangTurtle parser = RiotParsers.createParserTurtle(tokenizer, "http://base/", sink) ;
+ @SuppressWarnings("deprecation")
+ LangTurtle parser = RiotParsers.createParserTurtle(tokenizer, "http://base/", sink) ;
PrefixMap prefixMap = parser.getProfile().getPrologue().getPrefixMap() ;
prefixMap.add("a", "http://host/a#") ;