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 2012/12/22 18:52:29 UTC
svn commit: r1425325 [4/4] - in /jena/trunk/jena-arq: ./
src-examples/arq/examples/riot/ src-examples/arq/examples/update/
src/main/java/arq/ src/main/java/arq/cmdline/
src/main/java/com/hp/hpl/jena/query/
src/main/java/com/hp/hpl/jena/sparql/engine/bi...
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java Sat Dec 22 17:52:26 2012
@@ -31,18 +31,23 @@ import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.atlas.lib.SinkCounting ;
import org.apache.jena.atlas.lib.SinkNull ;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.riot.lang.* ;
+import org.apache.jena.riot.* ;
+import org.apache.jena.riot.lang.LabelToNode ;
+import org.apache.jena.riot.lang.LangRIOT ;
+import org.apache.jena.riot.lang.RDFParserOutput ;
+import org.apache.jena.riot.lang.RDFParserOutputLib ;
+import org.apache.jena.riot.out.NodeToLabel ;
+import org.apache.jena.riot.out.SinkQuadOutput ;
+import org.apache.jena.riot.out.SinkTripleOutput ;
import org.apache.jena.riot.process.inf.InfFactory ;
import org.apache.jena.riot.process.inf.InferenceSetupRDFS ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.apache.jena.riot.system.RiotLib ;
import org.apache.jena.riot.system.SyntaxLabels ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.apache.log4j.PropertyConfigurator ;
-import org.openjena.riot.* ;
-import org.openjena.riot.out.NodeToLabel ;
-import org.openjena.riot.out.SinkQuadOutput ;
-import org.openjena.riot.out.SinkTripleOutput ;
import arq.cmd.CmdException ;
import arq.cmdline.* ;
@@ -92,9 +97,9 @@ public abstract class CmdLangParse exten
protected static Map<Lang, LangHandler> dispatch = new HashMap<Lang, LangHandler>() ;
static {
- for ( Lang lang : Lang.values())
+ for ( Lang lang : RDFLanguages.getRegisteredLanguages() )
{
- if ( lang.isQuads() )
+ if ( RDFLanguages.isQuads(lang) )
dispatch.put(lang, langHandlerQuads) ;
else
dispatch.put(lang, langHandlerTriples) ;
@@ -222,7 +227,7 @@ public abstract class CmdLangParse exten
parseRIOT(baseURI, filename, in) ;
}
- protected abstract Lang selectLang(String filename, Lang lang) ;
+ protected abstract Lang selectLang(String filename, Lang dftLang) ;
protected void parseRIOT(String baseURI, String filename, InputStream in)
{
@@ -247,7 +252,7 @@ public abstract class CmdLangParse exten
// TODO skipOnBadterm
}
- Lang lang = selectLang(filename, Lang.NQUADS) ;
+ Lang lang = selectLang(filename, RDFLanguages.NQuads) ;
LangHandler handler = dispatch.get(lang) ;
if ( handler == null )
throw new CmdException("Undefined language: "+lang) ;
@@ -281,7 +286,7 @@ public abstract class CmdLangParse exten
// Uglyness because quads and triples aren't subtype of some Tuple<Node>
// That would change a lot (Triples came several years before Quads).
- if ( lang.isTriples() )
+ if ( RDFLanguages.isTriples(lang) )
{
Sink<Triple> s = SinkNull.create() ;
if ( ! modLangParse.toBitBucket() )
@@ -313,7 +318,7 @@ public abstract class CmdLangParse exten
{
if ( checking )
{
- if ( parser.getLang() == Lang.NTRIPLES || parser.getLang() == Lang.NQUADS )
+ if ( parser.getLang() == RDFLanguages.NTriples || parser.getLang() == RDFLanguages.NQuads )
parser.setProfile(RiotLib.profile(baseURI, false, true, errHandler)) ;
else
parser.setProfile(RiotLib.profile(baseURI, true, true, errHandler)) ;
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/infer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/infer.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/infer.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/infer.java Sat Dec 22 17:52:26 2012
@@ -24,13 +24,14 @@ import java.util.List ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.IRILib ;
import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.lang.RDFParserOutput ;
import org.apache.jena.riot.lang.RDFParserOutputLib ;
+import org.apache.jena.riot.out.SinkQuadOutput ;
import org.apache.jena.riot.process.inf.InfFactory ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.out.SinkQuadOutput ;
import arq.cmd.CmdException ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdGeneral ;
@@ -143,11 +144,11 @@ public class infer extends CmdGeneral
private void processFile(String filename, Sink<Quad> qsink)
{
- Lang lang = filename.equals("-") ? Lang.NQUADS : Lang.guess(filename, Lang.NQUADS) ;
+ Lang lang = filename.equals("-") ? RDFLanguages.NQuads : RDFLanguages.filenameToLang(filename, RDFLanguages.NQuads) ;
String baseURI = IRILib.filenameToIRI(filename) ;
RDFParserOutput sink = RDFParserOutputLib.sinkQuads(qsink) ;
- if ( lang.isTriples() )
+ if ( RDFLanguages.isTriples(lang) )
{
InputStream in = IO.openFile(filename) ;
sink = RDFParserOutputLib.extendTriplesToQuads(sink) ;
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java Sat Dec 22 17:52:26 2012
@@ -18,8 +18,8 @@
package riotcmd;
-import org.openjena.riot.Lang ;
-
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
import com.hp.hpl.jena.sparql.util.Utils ;
@@ -43,6 +43,6 @@ public class nquads extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename, Lang nquads)
- { return Lang.NQUADS ; }
+ protected Lang selectLang(String filename, Lang lang)
+ { return RDFLanguages.NQuads ; }
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java Sat Dec 22 17:52:26 2012
@@ -18,8 +18,8 @@
package riotcmd;
-import org.openjena.riot.Lang ;
-
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
import com.hp.hpl.jena.sparql.util.Utils ;
@@ -43,6 +43,6 @@ public class ntriples extends CmdLangPar
}
@Override
- protected Lang selectLang(String filename, Lang nquads)
- { return Lang.NTRIPLES ; }
+ protected Lang selectLang(String filename, Lang lang)
+ { return RDFLanguages.NTriples ; }
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/riot.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/riot.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/riot.java Sat Dec 22 17:52:26 2012
@@ -18,8 +18,8 @@
package riotcmd;
-import org.openjena.riot.Lang ;
-
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
import com.hp.hpl.jena.sparql.util.Utils ;
@@ -39,9 +39,9 @@ public class riot extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename, Lang nquads)
+ protected Lang selectLang(String filename, Lang dftLang)
{
- return Lang.guess(filename, Lang.NQUADS) ;
+ return RDFLanguages.filenameToLang(filename, RDFLanguages.NQuads) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/trig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/trig.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/trig.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/trig.java Sat Dec 22 17:52:26 2012
@@ -18,8 +18,8 @@
package riotcmd;
-import org.openjena.riot.Lang ;
-
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
import com.hp.hpl.jena.sparql.util.Utils ;
@@ -43,6 +43,6 @@ public class trig extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename, Lang nquads)
- { return Lang.TRIG ; }
+ protected Lang selectLang(String filename, Lang lang)
+ { return RDFLanguages.TriG ; }
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java Sat Dec 22 17:52:26 2012
@@ -18,8 +18,8 @@
package riotcmd;
-import org.openjena.riot.Lang ;
-
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
import com.hp.hpl.jena.sparql.util.Utils ;
@@ -43,6 +43,6 @@ public class turtle extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename, Lang nquads)
- { return Lang.TURTLE ; }
+ protected Lang selectLang(String filename, Lang dftLang)
+ { return RDFLanguages.Turtle ; }
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java Sat Dec 22 17:52:26 2012
@@ -25,13 +25,13 @@ import java.util.List ;
import junit.framework.JUnit4TestAdapter ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.rdf.model.AnonId ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java Sat Dec 22 17:52:26 2012
@@ -22,9 +22,9 @@ import java.util.ArrayDeque ;
import java.util.Deque ;
import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.junit.Assert ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
public class BaseTest extends Assert
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java Sat Dec 22 17:52:26 2012
@@ -21,7 +21,7 @@ package org.apache.jena.riot;
import java.util.ArrayList ;
import java.util.List ;
-import org.openjena.riot.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandler ;
public class ErrorHandlerTestLib
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java Sat Dec 22 17:52:26 2012
@@ -20,6 +20,7 @@ package org.apache.jena.riot;
import org.apache.jena.riot.adapters.TS_RIOTAdapters ;
import org.apache.jena.riot.lang.TS_Lang ;
+import org.apache.jena.riot.out.TS_Out ;
import org.apache.jena.riot.process.TS_Process ;
import org.apache.jena.riot.stream.TS_IO2 ;
import org.apache.jena.riot.system.TS_RiotSystem ;
@@ -27,8 +28,6 @@ import org.apache.jena.riot.web.TS_RiotW
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
-import org.openjena.riot.RIOT ;
-import org.openjena.riot.out.TS_Out ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java Sat Dec 22 17:52:26 2012
@@ -22,7 +22,6 @@ import junit.framework.TestSuite ;
import org.apache.jena.riot.langsuite.FactoryTestRiot ;
import org.junit.runner.RunWith ;
import org.junit.runners.AllTests ;
-import org.openjena.riot.RIOT ;
/** The test suites - these are driven by a manifest file and use external files for tests */
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java Sat Dec 22 17:52:26 2012
@@ -23,7 +23,6 @@ import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
import org.junit.runners.Suite.SuiteClasses ;
-import org.openjena.riot.RIOT ;
@RunWith(Suite.class)
@SuiteClasses(
@@ -31,7 +30,7 @@ import org.openjena.riot.RIOT ;
TestLangRIOT.class
, TestStreamManager.class
, TestJenaReaderRIOT.class
- , TestReadDataset.class
+ , TestReadData.class
})
public class TS_ReaderRIOT
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java Sat Dec 22 17:52:26 2012
@@ -28,7 +28,6 @@ import org.apache.jena.atlas.web.TypedIn
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import org.openjena.riot.RIOT ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -36,6 +35,8 @@ import com.hp.hpl.jena.rdf.model.Resourc
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.util.FileUtils ;
+/* Test of integration with Jena via model.read.
+ * Also tests triples format reading of RDFDataMgr */
public class TestJenaReaderRIOT extends BaseTest
{
private static final String directory = "testing/RIOT/Reader" ;
@@ -78,12 +79,12 @@ public class TestJenaReaderRIOT extends
@Test public void read_30()
{
{
- TypedInputStream in = WebReader2.open(filename("D-not-TTL.ttl") );
+ TypedInputStream in = RDFDataMgr.open(filename("D-not-TTL.ttl") );
Model m0 = ModelFactory.createDefaultModel() ;
- WebReader2.read(m0, in, RDFLanguages.RDFXML) ;
+ RDFDataMgr.read(m0, in, RDFLanguages.RDFXML) ;
}
- TypedInputStream in1 = WebReader2.open(filename("D-not-TTL.ttl") );
+ TypedInputStream in1 = RDFDataMgr.open(filename("D-not-TTL.ttl") );
Model m1 = ModelFactory.createDefaultModel() ;
// Fails until integration with jena-core as hintlang gets lost.
m1.read(in1, null, "RDF/XML") ;
@@ -97,7 +98,7 @@ public class TestJenaReaderRIOT extends
{
StringReader s = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, s, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(m, s, null, RDFLanguages.NTriples) ;
}
StringReader s1 = new StringReader("<s> <p> <p> .") ;
@@ -118,7 +119,7 @@ public class TestJenaReaderRIOT extends
{
StringReader s = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, s, null, RDFLanguages.RDFXML) ;
+ RDFDataMgr.read(m, s, null, RDFLanguages.RDFXML) ;
}
StringReader s1 = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
@@ -144,13 +145,13 @@ public class TestJenaReaderRIOT extends
// Read with a base
FileInputStream in0 = new FileInputStream(filename) ;
Model m0 = ModelFactory.createDefaultModel() ;
- WebReader2.read(m0, in0, "http://example/base2", RDFLanguages.nameToLang(lang)) ;
+ RDFDataMgr.read(m0, in0, "http://example/base2", RDFLanguages.nameToLang(lang)) ;
in0.close() ;
// Read again, but without base
FileInputStream in1 = new FileInputStream(filename) ;
Model m1 = ModelFactory.createDefaultModel() ;
- WebReader2.read(m1, in1, RDFLanguages.nameToLang(lang)) ;
+ RDFDataMgr.read(m1, in1, RDFLanguages.nameToLang(lang)) ;
in1.close() ;
// Fail because Jena core does a look up of lang with ModelCom builtin in RDFReaderF, then calls RIOReader().
@@ -188,7 +189,7 @@ public class TestJenaReaderRIOT extends
dataurl = filename(dataurl) ;
Model m0 = ModelFactory.createDefaultModel() ;
- WebReader2.read(m0, dataurl, RDFLanguages.nameToLang(lang)) ;
+ RDFDataMgr.read(m0, dataurl, RDFLanguages.nameToLang(lang)) ;
assertTrue(m0.size() != 0 ) ;
Model m1 = ModelFactory.createDefaultModel() ;
@@ -208,7 +209,7 @@ public class TestJenaReaderRIOT extends
Model m2 = ModelFactory.createDefaultModel() ;
// This call
- WebReader2.read(m1, dataurl, base, RDFLanguages.nameToLang(lang)) ;
+ RDFDataMgr.read(m1, dataurl, base, RDFLanguages.nameToLang(lang)) ;
// should be an implementation of:
m2.read("file:"+dataurl, base, lang) ;
assertTrue(m1.size() != 0 ) ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java Sat Dec 22 17:52:26 2012
@@ -63,15 +63,15 @@ public class TestLangRIOT extends BaseTe
@Test public void guess_08() { guess("D.nq", RDFLanguages.NQuads) ; }
@Test public void guess_09() { guess("D.trig", RDFLanguages.TriG) ; }
- private void test(Lang2 expected, String string)
+ private void test(Lang expected, String string)
{
- Lang2 lang = RDFLanguages.nameToLang(string) ;
+ Lang lang = RDFLanguages.nameToLang(string) ;
assertEquals(expected, lang) ;
}
- private void guess(String filename, Lang2 expected)
+ private void guess(String filename, Lang expected)
{
- Lang2 lang = RDFLanguages.filenameToLang(filename) ;
+ Lang lang = RDFLanguages.filenameToLang(filename) ;
assertEquals(expected, lang) ;
}
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java (from r1424610, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java&p1=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java&r1=1424610&r2=1425325&rev=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java Sat Dec 22 17:52:26 2012
@@ -25,13 +25,16 @@ import org.apache.jena.atlas.junit.BaseT
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import org.openjena.riot.RIOT ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
+import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.util.Context ;
-public class TestReadDataset extends BaseTest
+/* Tests of RDFDataMgr.
+ * See also TestJenaReaderRIOT (which covers reading triples formats)
+ */
+public class TestReadData extends BaseTest
{
private static final String directory = "testing/RIOT/Reader" ;
@@ -47,6 +50,8 @@ public class TestReadDataset extends Bas
// Unwire?
}
+ // Model, graph
+
@Test public void read_01() { read("D.nq") ; }
@Test public void read_02() { read("D.trig") ; }
@Test public void read_03() { read("D.nq", RDFLanguages.NQuads) ; }
@@ -70,22 +75,38 @@ public class TestReadDataset extends Bas
@Test public void read_input_2() throws IOException
{ read_stream("D.trig", "trig") ; }
+ @Test public void load_01() { RDFDataMgr.loadModel(filename("D.nt")) ; }
+ @Test public void load_02() { RDFDataMgr.loadModel(filename("D.nt"), RDFLanguages.NTriples) ; }
+ @Test public void load_03() { RDFDataMgr.loadModel(filename("D-nt"), RDFLanguages.NTriples) ; }
+
+ @Test public void load_04() { RDFDataMgr.loadDataset(filename("D.nq")) ; }
+ @Test public void load_05() { RDFDataMgr.loadDataset(filename("D.nq"), RDFLanguages.NQuads) ; }
+ @Test public void load_06() { RDFDataMgr.loadDataset(filename("D-nq"), RDFLanguages.NQuads) ; }
+
+ @Test public void load_11() { RDFDataMgr.loadGraph(filename("D.nt")) ; }
+ @Test public void load_12() { RDFDataMgr.loadGraph(filename("D.nt"), RDFLanguages.NTriples) ; }
+ @Test public void load_13() { RDFDataMgr.loadGraph(filename("D-nt"), RDFLanguages.NTriples) ; }
+
+ @Test public void load_14() { RDFDataMgr.loadDatasetGraph(filename("D.nq")) ; }
+ @Test public void load_15() { RDFDataMgr.loadDatasetGraph(filename("D.nq"), RDFLanguages.NQuads) ; }
+ @Test public void load_16() { RDFDataMgr.loadDatasetGraph(filename("D-nq"), RDFLanguages.NQuads) ; }
+
private static String filename(String filename) { return directory+"/"+filename ; }
// Base.
- private static void read(String dataurl) { read(dataurl, (Lang2)null) ; }
+ private static void read(String dataurl) { read(dataurl, (Lang)null) ; }
private static void read(String dataurl, String lang)
{
read(dataurl, RDFLanguages.nameToLang(lang)) ;
}
- private static void read(String dataurl, Lang2 lang)
+ private static void read(String dataurl, Lang lang)
{
dataurl = filename(dataurl) ;
Dataset ds = DatasetFactory.createMem() ;
- WebReader2.read(ds, dataurl, lang) ;
+ RDFDataMgr.read(ds, dataurl, lang) ;
}
private static void read_stream(String filename, String lang) throws IOException
@@ -93,22 +114,27 @@ public class TestReadDataset extends Bas
read_stream(filename, RDFLanguages.nameToLang(lang)) ;
}
- private static void read_stream(String filename, Lang2 lang) throws IOException
+ private static void read_stream(String filename, Lang lang) throws IOException
{
filename = filename(filename) ;
// Read with a base
Dataset ds0 = DatasetFactory.createMem() ;
FileInputStream in0 = new FileInputStream(filename) ;
- WebReader2.read(ds0, in0, "http://example/base2", lang) ;
+ RDFDataMgr.read(ds0, in0, "http://example/base2", lang) ;
in0.close() ;
// Read again, but without base
Dataset ds1 = DatasetFactory.createMem() ;
FileInputStream in1 = new FileInputStream(filename) ;
- WebReader2.read(ds1, in1, null, lang) ;
+ RDFDataMgr.read(ds1, in1, null, lang) ;
in1.close() ;
}
+
+ private static Model loadModel(String uri)
+ {
+ return RDFDataMgr.loadModel(filename(uri)) ;
+ }
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java Sat Dec 22 17:52:26 2012
@@ -27,9 +27,9 @@ import org.apache.jena.riot.ErrorHandler
import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
import org.apache.jena.riot.checker.CheckerIRI ;
import org.apache.jena.riot.system.Checker ;
+import org.apache.jena.riot.system.ErrorHandler ;
import org.apache.jena.riot.system.RiotLib ;
import org.junit.Test ;
-import org.openjena.riot.ErrorHandler ;
public class TestIRI extends BaseTest
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java Sat Dec 22 17:52:26 2012
@@ -18,77 +18,79 @@
package org.apache.jena.riot.lang;
-import java.util.ArrayList ;
-import java.util.Arrays ;
-import java.util.Collection ;
+import java.util.HashMap ;
+import java.util.Map ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.WebContent ;
import org.junit.Assert ;
import org.junit.Test ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.WebContent ;
import com.hp.hpl.jena.util.FileUtils ;
public class TestLang extends BaseTest
{
+ static { RDFLanguages.init() ; }
+
@Test public void lang_01()
- { assertEquals(Lang.TURTLE, Lang.get("TTL")) ; }
+ { assertEquals(RDFLanguages.Turtle, RDFLanguages.shortnameToLang("TTL")) ; }
@Test public void lang_02()
- { assertEquals(Lang.TURTLE, Lang.get("ttl")) ; }
+ { assertEquals(RDFLanguages.Turtle, RDFLanguages.shortnameToLang("ttl")) ; }
@Test public void lang_03()
- { assertEquals(Lang.TURTLE, Lang.get("Turtle")) ; }
+ { assertEquals(RDFLanguages.Turtle, RDFLanguages.shortnameToLang("Turtle")) ; }
@Test public void lang_04()
- { assertEquals(Lang.RDFXML, Lang.get(FileUtils.langXML)) ; }
+ { assertEquals(RDFLanguages.RDFXML, RDFLanguages.shortnameToLang(FileUtils.langXML)) ; }
@Test public void lang_05()
- { assertEquals(Lang.RDFXML, Lang.get(FileUtils.langXMLAbbrev)) ; }
+ { assertEquals(RDFLanguages.RDFXML, RDFLanguages.shortnameToLang(FileUtils.langXMLAbbrev)) ; }
@Test public void lang_06()
- { assertEquals(Lang.NTRIPLES, Lang.get(FileUtils.langNTriple)) ; }
+ { assertEquals(RDFLanguages.NTriples, RDFLanguages.shortnameToLang(FileUtils.langNTriple)) ; }
+
@Test public void lang_07()
- { assertEquals(Lang.NTRIPLES, Lang.get(WebContent.langNTriples)) ; }
+ { assertEquals(RDFLanguages.NTriples, RDFLanguages.shortnameToLang(WebContent.langNTriples)) ; }
@Test public void lang_08()
- { assertEquals(Lang.NQUADS, Lang.get(WebContent.langNQuads)) ; }
+ { assertEquals(RDFLanguages.NQuads, RDFLanguages.shortnameToLang(WebContent.langNQuads)) ; }
@Test public void lang_09()
- { assertEquals(Lang.TRIG, Lang.get(WebContent.langTriG)) ; }
+ { assertEquals(RDFLanguages.TriG, RDFLanguages.shortnameToLang(WebContent.langTriG)) ; }
@Test public void lang_10()
- { assertEquals(Lang.RDFJSON, Lang.get("RDF/JSON")) ; }
+ { assertEquals(RDFLanguages.RDFJSON, RDFLanguages.shortnameToLang("RDF/JSON")) ; }
@Test public void lang_11()
- { assertEquals(Lang.RDFJSON, Lang.get(WebContent.langRdfJson)) ; }
+ { assertEquals(RDFLanguages.RDFJSON, RDFLanguages.shortnameToLang(WebContent.langRdfJson)) ; }
@Test
public void testFileExtensionsProvided()
{
- for (Lang l : Lang.values())
+ for (Lang l : RDFLanguages.getRegisteredLanguages() )
{
- String ext = l.getDefaultFileExtension();
- Assert.assertFalse( l+" does not have default extension defined", ext==null||ext.isEmpty() );
Assert.assertNotNull( l+" does not have file extensions defined", l.getFileExtensions());
- Assert.assertTrue( l+" does not have file extensions defined", l.getFileExtensions().length > 0);
+ Assert.assertTrue( l+" does not have file extensions defined", l.getFileExtensions().size() > 0);
}
}
@Test
public void testFileExtensionUnique()
{
- Collection<String> exts = new ArrayList<String>();
- for (Lang l : Lang.values())
+ Map<String, Lang> exts = new HashMap<String, Lang>();
+
+ for (Lang lang1 : RDFLanguages.getRegisteredLanguages() )
{
- for (String ext : l.getFileExtensions())
+ for (String ext : lang1.getFileExtensions())
{
- Assert.assertFalse( "The "+ext+" file extensions in "+l+" was already used",
- exts.contains(ext));
+ Lang lang2 = exts.get(ext) ;
+ Assert.assertTrue( "The "+ext+" file extensions in "+lang1+" was already used", lang2 == null || lang1 == lang2) ;
+ exts.put(ext, lang1) ;
}
- exts.addAll( Arrays.asList(l.getFileExtensions()));
}
}
@@ -96,18 +98,16 @@ public class TestLang extends BaseTest
@Test
public void testDefaultInExtensions()
{
- for (Lang l : Lang.values())
- {
- Assert.assertTrue( l+" default extension not in file extensions list", Arrays.asList( l.getFileExtensions()).contains( l.getDefaultFileExtension()) );
- }
+ for (Lang l : RDFLanguages.getRegisteredLanguages() )
+ Assert.assertTrue( l+" default extension not in file extensions list", l.getFileExtensions().contains( l.getFileExtensions().get(0)) );
}
@Test
public void testGet()
{
- for (Lang l : Lang.values())
+ for (Lang l : RDFLanguages.getRegisteredLanguages() )
{
- Assert.assertNotNull( l+" can not be parsed by name", Lang.get( l.getName(), null ) );
+ Assert.assertNotNull( l+" can not be parsed by name", RDFLanguages.shortnameToLang( l.getName()) );
}
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java Sat Dec 22 17:52:26 2012
@@ -18,6 +18,7 @@
package org.apache.jena.riot.lang;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.lang.RDFParserOutput ;
@@ -25,7 +26,6 @@ import org.apache.jena.riot.lang.RDFPars
import org.apache.jena.riot.lang.RDFParserOutputLib ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.junit.Test ;
-import org.openjena.riot.RiotReader ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java Sat Dec 22 17:52:26 2012
@@ -22,13 +22,13 @@ import java.io.StringReader ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.junit.Test ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.rdf.model.Model ;
@@ -47,7 +47,7 @@ public class TestLangNTriples extends Te
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, r, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.NTriples) ;
assertEquals(1, m.size()) ;
String x = m.listStatements().next().getSubject().getId().getLabelString() ;
@@ -55,7 +55,7 @@ public class TestLangNTriples extends Te
// reset - reread - new bNode.
r = new StringReader(s) ;
- WebReader2.read(m, r, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.NTriples) ;
assertEquals(2, m.size()) ;
}
@@ -110,7 +110,7 @@ public class TestLangNTriples extends Te
{
StringReader r = new StringReader(string) ;
Model model = ModelFactory.createDefaultModel() ;
- WebReader2.read(model, r, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(model, r, null, RDFLanguages.NTriples) ;
return model ;
}
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java Sat Dec 22 17:52:26 2012
@@ -22,6 +22,8 @@ import java.io.ByteArrayInputStream ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExError ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
@@ -34,8 +36,6 @@ import org.apache.jena.riot.system.RiotL
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.junit.Test ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
/** Test of syntax by a tuples parser (does not include node validitiy checking) */
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java Sat Dec 22 17:52:26 2012
@@ -25,8 +25,7 @@ import org.apache.jena.atlas.io.PeekRead
import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.* ;
import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
import org.apache.jena.riot.lang.LangRDFJSON ;
@@ -37,8 +36,6 @@ import org.apache.jena.riot.tokens.Token
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.SysRIOT ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -48,13 +45,13 @@ public class TestLangRdfJson extends Bas
@BeforeClass
public static void setup()
{
- SysRIOT.wireIntoJena();
+ IO_Jena.wireIntoJena();
}
@AfterClass
public static void teardown()
{
- SysRIOT.resetJenaReaders();
+ IO_Jena.resetJenaReaders();
}
@Test
@@ -522,7 +519,7 @@ public class TestLangRdfJson extends Bas
{
StringReader r = new StringReader(string) ;
Model model = ModelFactory.createDefaultModel() ;
- WebReader2.read(model, r, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(model, r, null, RDFLanguages.NTriples) ;
return model ;
}
@@ -530,7 +527,7 @@ public class TestLangRdfJson extends Bas
{
StringReader r = new StringReader(string) ;
Model model = ModelFactory.createDefaultModel() ;
- WebReader2.read(model, r, null, RDFLanguages.RDFJSON) ;
+ RDFDataMgr.read(model, r, null, RDFLanguages.RDFJSON) ;
return model ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java Sat Dec 22 17:52:26 2012
@@ -20,6 +20,7 @@ package org.apache.jena.riot.lang;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
import org.apache.jena.riot.lang.LangTriG ;
@@ -28,7 +29,6 @@ import org.apache.jena.riot.lang.RDFPars
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.junit.Test ;
-import org.openjena.riot.RiotReader ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java Sat Dec 22 17:52:26 2012
@@ -18,29 +18,25 @@
package org.apache.jena.riot.lang;
-import static org.openjena.riot.ErrorHandlerFactory.errorHandlerNoLogging ;
-import static org.openjena.riot.ErrorHandlerFactory.getDefaultErrorHandler ;
-import static org.openjena.riot.ErrorHandlerFactory.setDefaultErrorHandler ;
+import static org.apache.jena.riot.system.ErrorHandlerFactory.errorHandlerNoLogging ;
+import static org.apache.jena.riot.system.ErrorHandlerFactory.getDefaultErrorHandler ;
+import static org.apache.jena.riot.system.ErrorHandlerFactory.setDefaultErrorHandler ;
import java.io.Reader ;
import java.io.StringReader ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.WebReader2 ;
import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
-import org.apache.jena.riot.lang.LangTurtle ;
-import org.apache.jena.riot.lang.RDFParserOutput ;
-import org.apache.jena.riot.lang.RDFParserOutputLib ;
+import org.apache.jena.riot.* ;
+import org.apache.jena.riot.system.ErrorHandler ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import org.openjena.riot.* ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
@@ -56,7 +52,7 @@ public class TestLangTurtle extends Base
String s = "_:a <http://example/p> 'foo' . " ;
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, r, null, RDFLanguages.Turtle) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.Turtle) ;
assertEquals(1, m.size()) ;
String x = m.listStatements().next().getSubject().getId().getLabelString() ;
@@ -64,7 +60,7 @@ public class TestLangTurtle extends Base
// reset - reread - new bNode.
r = new StringReader(s) ;
- WebReader2.read(m, r, null, RDFLanguages.Turtle) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.Turtle) ;
assertEquals(2, m.size()) ;
}
@@ -74,7 +70,7 @@ public class TestLangTurtle extends Base
String s = "_:a <http://example/p> 'foo' . _:a <http://example/p> 'foo' ." ;
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, r, null, RDFLanguages.Turtle) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.Turtle) ;
assertEquals(1, m.size()) ;
}
@@ -83,7 +79,7 @@ public class TestLangTurtle extends Base
{
Model model = ModelFactory.createDefaultModel() ;
StringReader reader = new StringReader("@prefix x: <http://example/x>.") ;
- WebReader2.read(model, reader, null, RDFLanguages.Turtle) ;
+ RDFDataMgr.read(model, reader, null, RDFLanguages.Turtle) ;
assertEquals(1, model.getNsPrefixMap().size()) ;
assertEquals("http://example/x", model.getNsPrefixURI("x")) ;
}
@@ -130,7 +126,7 @@ public class TestLangTurtle extends Base
// Tokenizer tokenizer = TokenizerFactory.makeTokenizer(reader) ;
// String baseIRI = "http://base/" ;
// LangTurtle parser = RiotReader.createParserTurtle(tokenizer, baseIRI, new SinkNull<Triple>()) ;
-// parser.setProfile(RiotReader.profile(Lang.TURTLE, baseIRI, ErrorHandlerLib.errorHandlerNoLogging)) ;
+// parser.setProfile(RiotReader.profile(RDFLanguages.Turtle, baseIRI, ErrorHandlerLib.errorHandlerNoLogging)) ;
// parser.parse() ;
// }
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java Sat Dec 22 17:52:26 2012
@@ -24,12 +24,12 @@ import java.util.List ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.atlas.lib.Tuple ;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.lang.RDFParserOutput ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.junit.Test ;
-import org.openjena.riot.RiotReader ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java Sat Dec 22 17:52:26 2012
@@ -19,6 +19,7 @@
package org.apache.jena.riot.lang;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.lang.LangTurtle ;
import org.apache.jena.riot.lang.RDFParserOutput ;
import org.apache.jena.riot.lang.RDFParserOutputLib ;
@@ -26,7 +27,6 @@ import org.apache.jena.riot.system.Prefi
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.junit.Test ;
-import org.openjena.riot.RiotReader ;
public class TestTurtleTerms extends BaseTest
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Sat Dec 22 17:52:26 2012
@@ -21,8 +21,8 @@ package org.apache.jena.riot.langsuite ;
import junit.framework.Test ;
import junit.framework.TestSuite ;
import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.VocabTestRIOT ;
-import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java Sat Dec 22 17:52:26 2012
@@ -19,8 +19,8 @@
package org.apache.jena.riot.langsuite;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.SysRIOT ;
+import org.apache.jena.riot.SysRIOT ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
import com.hp.hpl.jena.sparql.junit.EarlTestCase ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java Sat Dec 22 17:52:26 2012
@@ -19,13 +19,13 @@
package org.apache.jena.riot.langsuite;
-import org.apache.jena.riot.Lang2 ;
-import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.junit.After ;
import org.junit.Before ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -35,9 +35,9 @@ import com.hp.hpl.jena.sparql.junit.Earl
public class UnitTestBadEval extends LangTestCase
{
private final String input ;
- private final Lang2 lang ;
+ private final Lang lang ;
- protected UnitTestBadEval(String name, String testURI, String uri, Lang2 lang, EarlReport earl)
+ protected UnitTestBadEval(String name, String testURI, String uri, Lang lang, EarlReport earl)
{
super(name, testURI, earl) ;
this.input = uri ;
@@ -67,7 +67,7 @@ public class UnitTestBadEval extends Lan
{
Model model = ModelFactory.createDefaultModel() ;
try {
- WebReader2.read(model, input) ;
+ RDFDataMgr.read(model, input) ;
fail("Managed to read a bad evaluation test without error") ;
}
catch (RiotException ex) {}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java Sat Dec 22 17:52:26 2012
@@ -18,13 +18,13 @@
package org.apache.jena.riot.langsuite;
-import static org.openjena.riot.SysRIOT.fmtMessage ;
+import static org.apache.jena.riot.SysRIOT.fmtMessage ;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.riot.Lang2 ;
-import org.apache.jena.riot.WebReader2 ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.RiotException ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -33,9 +33,9 @@ import com.hp.hpl.jena.sparql.junit.Earl
public class UnitTestBadSyntax extends LangTestCase
{
private final String uri ;
- private final Lang2 lang ;
+ private final Lang lang ;
- protected UnitTestBadSyntax(String name, String testURI, String uri, Lang2 lang, EarlReport earl)
+ protected UnitTestBadSyntax(String name, String testURI, String uri, Lang lang, EarlReport earl)
{
super(name, testURI, earl) ;
this.uri = uri ;
@@ -77,7 +77,7 @@ public class UnitTestBadSyntax extends L
{
Model model = ModelFactory.createDefaultModel() ;
try {
- WebReader2.read(model, uri, uri, lang) ;
+ RDFDataMgr.read(model, uri, uri, lang) ;
} catch (RiotException ex) { return ; }
catch (RuntimeException ex) {
ex.printStackTrace(System.err) ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Sat Dec 22 17:52:26 2012
@@ -20,12 +20,8 @@ package org.apache.jena.riot.langsuite;
import java.io.InputStream ;
-import org.apache.jena.riot.Lang2 ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.RDFReaderRIOT ;
-import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.* ;
import org.apache.jena.riot.stream.StreamManager ;
-import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -38,9 +34,9 @@ public class UnitTestEval extends LangTe
String input ;
String output ;
String baseIRI ;
- Lang2 lang ;
+ Lang lang ;
- public UnitTestEval(String name, String testURI, String input, String output, String baseIRI, Lang2 lang, EarlReport earl)
+ public UnitTestEval(String name, String testURI, String input, String output, String baseIRI, Lang lang, EarlReport earl)
{
super(name, testURI, earl) ;
this.input = input ;
@@ -64,15 +60,15 @@ public class UnitTestEval extends LangTe
RDFReader rdfreader = new RDFReaderRIOT() ;
try {
if ( baseIRI != null )
- WebReader2.read(model, input, baseIRI, lang) ;
+ RDFDataMgr.read(model, input, baseIRI, lang) ;
else
- WebReader2.read(model, input, lang) ;
+ RDFDataMgr.read(model, input, lang) ;
String syntax = FileUtils.guessLang(output, FileUtils.langNTriple) ;
Model results = ModelFactory.createDefaultModel() ;
// Directly get an N-triples reader
InputStream in = StreamManager.get().open(output) ;
- WebReader2.read(results, in, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(results, in, null, RDFLanguages.NTriples) ;
boolean b = model.isIsomorphicWith(results) ;
if ( !b )
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java Sat Dec 22 17:52:26 2012
@@ -18,8 +18,8 @@
package org.apache.jena.riot.langsuite;
-import org.apache.jena.riot.Lang2 ;
-import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -28,9 +28,9 @@ import com.hp.hpl.jena.sparql.junit.Earl
public class UnitTestSyntax extends LangTestCase
{
private final String uri ;
- private final Lang2 lang ;
+ private final Lang lang ;
- public UnitTestSyntax(String name, String testURI, String uri, Lang2 lang, EarlReport earl)
+ public UnitTestSyntax(String name, String testURI, String uri, Lang lang, EarlReport earl)
{
super(name, testURI, earl) ;
this.uri = uri ;
@@ -41,7 +41,7 @@ public class UnitTestSyntax extends Lang
public void runTestForReal()
{
Model model = ModelFactory.createDefaultModel() ;
- WebReader2.read(model, uri, uri, lang) ;
+ RDFDataMgr.read(model, uri, uri, lang) ;
}
@Override
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java (from r1424610, jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java&r1=1424610&r2=1425325&rev=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java Sat Dec 22 17:52:26 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.out;
+package org.apache.jena.riot.out;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java?rev=1425325&r1=1422691&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java Sat Dec 22 17:52:26 2012
@@ -16,11 +16,14 @@
* limitations under the License.
*/
-package org.openjena.riot.out;
+package org.apache.jena.riot.out;
import java.io.StringWriter ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.out.NodeFormatter ;
+import org.apache.jena.riot.out.NodeFormatterNT ;
+import org.apache.jena.riot.out.NodeFormatterTTL ;
import org.apache.jena.riot.system.PrefixMap ;
import org.junit.Test ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java?rev=1425325&r1=1422691&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java Sat Dec 22 17:52:26 2012
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-package org.openjena.riot.out;
+package org.apache.jena.riot.out;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;
import com.hp.hpl.jena.vocabulary.RDF ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.out.NodeFmtLib ;
import org.junit.Test ;
public class TestNodeFmtLib extends BaseTest
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java?rev=1425325&r1=1422691&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java Sat Dec 22 17:52:26 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.out;
+package org.apache.jena.riot.out;
import java.io.ByteArrayOutputStream ;
import java.io.IOException ;
@@ -25,6 +25,7 @@ import java.io.UnsupportedEncodingExcept
import java.io.Writer ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.out.OutputLangUtils ;
import org.apache.jena.riot.system.Prologue ;
import org.junit.Test ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutputNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutputNTriples.java?rev=1425325&r1=1422691&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutputNTriples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutputNTriples.java Sat Dec 22 17:52:26 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.out;
+package org.apache.jena.riot.out;
import java.io.ByteArrayOutputStream ;
import java.io.OutputStream ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutputRDFJSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutputRDFJSON.java?rev=1425325&r1=1422691&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutputRDFJSON.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutputRDFJSON.java Sat Dec 22 17:52:26 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.out;
+package org.apache.jena.riot.out;
import java.io.ByteArrayInputStream ;
import java.io.ByteArrayOutputStream ;
@@ -25,11 +25,12 @@ import org.apache.jena.atlas.json.JSON ;
import org.apache.jena.atlas.json.JsonObject ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.lang.RDFParserOutput ;
import org.apache.jena.riot.lang.RDFParserOutputLib ;
+import org.apache.jena.riot.out.RDFJSONWriter ;
import org.junit.Test ;
-import org.openjena.riot.RiotReader ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java Sat Dec 22 17:52:26 2012
@@ -22,8 +22,8 @@ import java.io.File ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.WebContent ;
import org.junit.Test ;
-import org.openjena.riot.WebContent ;
public class TestLocators extends BaseTest
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java Sat Dec 22 17:52:26 2012
@@ -23,11 +23,11 @@ import java.io.File ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.web.TypedInputStream ;
-import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RiotNotFoundException ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import org.openjena.riot.RiotNotFoundException ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -52,17 +52,17 @@ public class TestStreamManager extends B
streamMgr.addLocator(new LocatorFile2(directory)) ;
streamMgr.addLocator(new LocatorURL2()) ;
- streamManagerContextValue = context.get(WebReader2.streamManagerSymbol) ;
- context.put(WebReader2.streamManagerSymbol, streamMgr) ;
+ streamManagerContextValue = context.get(RDFDataMgr.streamManagerSymbol) ;
+ context.put(RDFDataMgr.streamManagerSymbol, streamMgr) ;
}
@AfterClass static public void afterClass()
{
StreamManager.setGlobal(streamMgrStd) ;
if ( streamManagerContextValue == null )
- context.remove(WebReader2.streamManagerSymbol) ;
+ context.remove(RDFDataMgr.streamManagerSymbol) ;
else
- context.put(WebReader2.streamManagerSymbol, streamManagerContextValue) ;
+ context.put(RDFDataMgr.streamManagerSymbol, streamManagerContextValue) ;
}
@Test public void fm_open_01() { open(directory+"/D.ttl", context) ; }
@@ -94,8 +94,8 @@ public class TestStreamManager extends B
{
TypedInputStream in =
( context != null ) ?
- WebReader2.open(dataName, context) :
- WebReader2.open(dataName) ;
+ RDFDataMgr.open(dataName, context) :
+ RDFDataMgr.open(dataName) ;
assertNotNull(in) ;
IO.close(in) ;
}
@@ -104,7 +104,7 @@ public class TestStreamManager extends B
{
StreamManager.setGlobal(streamMgr) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, dataName) ;
+ RDFDataMgr.read(m, dataName) ;
assertTrue(m.size() != 0 ) ;
StreamManager.setGlobal(streamMgrStd) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java Sat Dec 22 17:52:26 2012
@@ -24,8 +24,8 @@ import java.io.ByteArrayInputStream ;
import org.apache.jena.atlas.io.PeekReader ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.RiotParseException ;
import org.junit.Test ;
-import org.openjena.riot.RiotParseException ;
import com.hp.hpl.jena.sparql.ARQConstants ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/web/TestWebContent.java Sat Dec 22 17:52:26 2012
@@ -20,8 +20,8 @@ package org.apache.jena.riot.web;
import junit.framework.Assert;
+import org.apache.jena.riot.WebContent ;
import org.junit.Test;
-import org.openjena.riot.WebContent ;
public class TestWebContent {
Modified: jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java?rev=1425325&r1=1425324&r2=1425325&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java (original)
+++ jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java Sat Dec 22 17:52:26 2012
@@ -20,10 +20,9 @@ package riotcmd;
import junit.framework.TestSuite ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.langsuite.FactoryTestRiot ;
import org.apache.jena.riot.langsuite.VocabLangRDF ;
-import org.openjena.riot.RIOT ;
-import org.openjena.riot.SysRIOT ;
import arq.cmd.CmdException ;
import arq.cmd.TerminationException ;
import arq.cmdline.ArgDecl ;
@@ -74,7 +73,7 @@ public class rdflangtest extends CmdGene
public static void main (String... argv)
{
- SysRIOT.wireIntoJena() ;
+ RIOT.init() ;
try { new rdflangtest(argv).mainRun() ; }
catch (TerminationException ex) { System.exit(ex.getCode()) ; }
}