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 2013/01/08 19:43:57 UTC
svn commit: r1430439 [4/4] - in /jena/branches/streaming-update/jena-arq: ./
Grammar/ Vocabularies/ bin/ bin2/ 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...
Modified: jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java Tue Jan 8 18:43:53 2013
@@ -18,94 +18,23 @@
package org.openjena.riot;
-import org.apache.jena.atlas.event.EventType ;
-import org.openjena.riot.system.JenaReaderNTriples2 ;
-import org.openjena.riot.system.JenaReaderRdfJson ;
-import org.openjena.riot.system.JenaReaderTurtle2 ;
-import org.openjena.riot.system.JenaWriterRdfJson ;
-import org.slf4j.Logger ;
-import org.slf4j.LoggerFactory ;
-
-import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl ;
-import com.hp.hpl.jena.rdf.model.impl.RDFWriterFImpl ;
+/** @deprecated */
+@Deprecated
public class SysRIOT
{
- public static final String riotLoggerName = "org.openjena.riot" ;
- private static Logger riotLogger = LoggerFactory.getLogger(riotLoggerName) ;
- public static final EventType startRead = new EventType(SysRIOT.class, "StartRead") ;
- public static final EventType finishRead = new EventType(SysRIOT.class, "FinishRead") ;
-
- public static boolean StrictXSDLexicialForms = false ;
- public static boolean strictMode = false ;
-
- public static final String BNodeGenIdPrefix = "genid" ;
-
- static public String fmtMessage(String message, long line, long col)
- {
- if ( col == -1 && line == -1 )
- return message ;
- if ( col == -1 && line != -1 )
- return String.format("[line: %d] %s", line, message) ;
- if ( col != -1 && line == -1 )
- return String.format("[col: %d] %s", col, message) ;
- // Mild attempt to keep some alignment
- return String.format("[line: %d, col: %-2d] %s", line, col, message) ;
- }
-
- public static Logger getLogger()
- {
- return riotLogger ;
- }
-
- static String jenaNTriplesReader = "com.hp.hpl.jena.rdf.model.impl.NTripleReader" ;
- static String jenaTurtleReader = "com.hp.hpl.jena.n3.turtle.TurtleReader" ;
- static String jenaN3Reader = jenaTurtleReader ;
-
+ /** @deprecated Use {@link org.apache.jena.riot.IO_Jena#wireIntoJena} if necessary */
+ @Deprecated
public static void wireIntoJena()
{
- RIOT.init() ;
- /* No getter (!!)
- * Standard:
- com.hp.hpl.jena.rdf.model.impl.NTripleReader
- com.hp.hpl.jena.rdf.model.impl.NTripleReader
-
- com.hp.hpl.jena.n3.turtle.TurtleReader
- com.hp.hpl.jena.n3.turtle.TurtleReader
- com.hp.hpl.jena.n3.turtle.TurtleReader
- com.hp.hpl.jena.n3.turtle.TurtleReader
- */
-
- // Override N-TRIPLES and Turtle with faster implementations.
- String readerNT = JenaReaderNTriples2.class.getName() ;
- RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", readerNT) ;
- RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", readerNT) ;
-
- String readerTTL = JenaReaderTurtle2.class.getName() ;
- RDFReaderFImpl.setBaseReaderClassName("N3", readerTTL) ;
- RDFReaderFImpl.setBaseReaderClassName("TURTLE", readerTTL) ;
- RDFReaderFImpl.setBaseReaderClassName("Turtle", readerTTL) ;
- RDFReaderFImpl.setBaseReaderClassName("TTL", readerTTL) ;
-
- // Add in the RDF/JSON reader and writer
- String readerRdfJson = JenaReaderRdfJson.class.getName() ;
- RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", readerRdfJson) ;
- String writerRdfJson = JenaWriterRdfJson.class.getName() ;
- RDFWriterFImpl.setBaseWriterClassName("RDF/JSON", writerRdfJson) ;
+ org.apache.jena.riot.IO_Jena.wireIntoJena() ;
}
+ /** @deprecated Use {@link org.apache.jena.riot.IO_Jena#wireIntoJena} if necessary */
+ @Deprecated
public static void resetJenaReaders()
{
- RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", jenaNTriplesReader) ;
- RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", jenaNTriplesReader) ;
-
- RDFReaderFImpl.setBaseReaderClassName("N3", jenaTurtleReader) ;
- RDFReaderFImpl.setBaseReaderClassName("TURTLE", jenaTurtleReader) ;
- RDFReaderFImpl.setBaseReaderClassName("Turtle", jenaTurtleReader) ;
- RDFReaderFImpl.setBaseReaderClassName("TTL", jenaTurtleReader) ;
-
- RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", "") ;
- RDFWriterFImpl.setBaseWriterClassName("RDF/JSON", "") ;
+ org.apache.jena.riot.IO_Jena.wireIntoJena() ;
}
}
Modified: jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/WebReader.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/WebReader.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/WebReader.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/org/openjena/riot/WebReader.java Tue Jan 8 18:43:53 2013
@@ -18,140 +18,42 @@
package org.openjena.riot;
-import static org.openjena.riot.WebContent.contentTypeN3 ;
-import static org.openjena.riot.WebContent.contentTypeN3Alt1 ;
-import static org.openjena.riot.WebContent.contentTypeN3Alt2 ;
-import static org.openjena.riot.WebContent.contentTypeNQuads ;
-import static org.openjena.riot.WebContent.contentTypeNQuadsAlt1 ;
-import static org.openjena.riot.WebContent.contentTypeNQuadsAlt2 ;
-import static org.openjena.riot.WebContent.contentTypeNTriples ;
-import static org.openjena.riot.WebContent.contentTypeNTriplesAlt ;
-import static org.openjena.riot.WebContent.contentTypeRDFXML ;
-import static org.openjena.riot.WebContent.contentTypeTriG ;
-import static org.openjena.riot.WebContent.contentTypeTriGAlt1 ;
-import static org.openjena.riot.WebContent.contentTypeTriGAlt2 ;
-import static org.openjena.riot.WebContent.contentTypeTurtle ;
-import static org.openjena.riot.WebContent.contentTypeTurtleAlt1 ;
-import static org.openjena.riot.WebContent.contentTypeTurtleAlt2 ;
-
-import java.io.FileInputStream ;
-import java.io.IOException ;
-import java.io.InputStream ;
-import java.util.HashMap ;
-import java.util.Map ;
-
-import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.lib.Sink ;
-import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.Lang ;
import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Quad ;
-/** Retrieve data from the web */
+/** Retrieve data from the web
+ * @depreated Use org.apache.jena.riot.WebReader
+ */
+@Deprecated
public class WebReader
{
- /* where files are "on the web" */
-
- // TODO base URIs.
-
- // Reuse FileManager and LocationMapper.
+ /** @deprecated Use org.apache.jena.riot.WebReader.read */
+ @Deprecated
public static void readGraph(Graph graph, String uri)
{
- Lang lang = Lang.guess(uri) ;
- readGraph(graph, uri, lang) ;
+ org.apache.jena.riot.RDFDataMgr.read(graph, uri) ;
}
+ /** @deprecated Use org.apache.jena.riot.WebReader.read */
+ @Deprecated
public static void readGraph(Graph graph, String uri, Lang lang)
{
- TypedInputStream typedInput = open(uri, lang) ;
- String contentType = typedInput.getMediaType() ;
- lang = chooseLang(contentType, lang) ;
-
- if ( lang == null )
- throw new RiotException("Can't determine the syntax of <"+uri+"> (media type="+typedInput.getMediaType()+")") ;
-
- Sink<Triple> sink = RiotLoader.graphSink(graph) ;
- try {
- RiotLoader.readTriples(typedInput, lang, uri, sink) ;
- } finally { sink.close() ; }
- }
-
-
- static private Lang chooseLang(String contentType, Lang lang)
- {
- contentType = contentType.toLowerCase() ;
- return contentTypeToLang.get(contentType) ;
+ org.apache.jena.riot.RDFDataMgr.read(graph, uri, lang) ;
}
+ /** @deprecated Use org.apache.jena.riot.WebReader.read */
+ @Deprecated
public static void readDataset(DatasetGraph dataset, String uri)
{
- Lang lang = Lang.guess(uri) ;
- readDataset(dataset, uri, lang) ;
+ org.apache.jena.riot.RDFDataMgr.read(dataset, uri) ;
}
+ /** @deprecated Use org.apache.jena.riot.WebReader.read */
+ @Deprecated
public static void readDataset(DatasetGraph dataset, String uri, Lang lang)
{
- TypedInputStream typedInput = open(uri, lang) ;
- String contentType = typedInput.getMediaType() ;
- lang = chooseLang(contentType, lang) ;
-
- if ( lang == null )
- throw new RiotException("Can't determine the syntax of <"+uri+"> (media type="+typedInput.getMediaType()+")") ;
-
- Sink<Quad> sink = RiotLoader.datasetSink(dataset) ;
- try {
- RiotLoader.readQuads(typedInput, lang, uri, sink) ;
- } finally { sink.close() ; }
- }
-
- private static TypedInputStream open(String uri, Lang lang)
- {
- // Partial/
- try {
- InputStream in = new FileInputStream(uri) ;
- // **** A FileManager that deals in TypedStreams properly (copy/rewrite)
- return new TypedInputStream(in, lang.getContentType()/*Content-Type*/, null/*charset*/) ;
- } catch (IOException ex) { IO.exception(ex) ; return null ; }
- }
-
- // -----------------------
- // Extensibility.
- interface Process<T> { void parse(InputStream inputStream) ; }
- // Name?
- interface SinkTriplesFactory { Process<Triple> create(String contentType) ; }
-
- static private Map<String, Lang> contentTypeToLang = new HashMap<String, Lang>() ;
-
-// static public void addReader(String contentType, SinkTriplesFactory implFactory) {}
-// static public void removeReader(String contentType) {}
-
- // -----------------------
-
- // No need for this - use content type to get lang.
-
- /** Media type name to language */
- static {
- contentTypeToLang.put(contentTypeN3.toLowerCase(), Lang.N3) ;
- contentTypeToLang.put(contentTypeN3Alt1.toLowerCase(), Lang.N3) ;
- contentTypeToLang.put(contentTypeN3Alt2.toLowerCase(), Lang.N3) ;
-
- contentTypeToLang.put(contentTypeTurtle.toLowerCase(), Lang.TURTLE) ;
- contentTypeToLang.put(contentTypeTurtleAlt1.toLowerCase(), Lang.TURTLE) ;
- contentTypeToLang.put(contentTypeTurtleAlt2.toLowerCase(), Lang.TURTLE) ;
-
- contentTypeToLang.put(contentTypeNTriples.toLowerCase(), Lang.NTRIPLES) ;
- contentTypeToLang.put(contentTypeNTriplesAlt.toLowerCase(), Lang.NTRIPLES) ;
-
- contentTypeToLang.put(contentTypeRDFXML.toLowerCase(), Lang.RDFXML) ;
-
- contentTypeToLang.put(contentTypeTriG.toLowerCase(), Lang.TRIG) ;
- contentTypeToLang.put(contentTypeTriGAlt1.toLowerCase(), Lang.TRIG) ;
- contentTypeToLang.put(contentTypeTriGAlt2.toLowerCase(), Lang.TRIG) ;
-
- contentTypeToLang.put(contentTypeNQuads.toLowerCase(), Lang.NQUADS) ;
- contentTypeToLang.put(contentTypeNQuadsAlt1.toLowerCase(), Lang.NQUADS) ;
- contentTypeToLang.put(contentTypeNQuadsAlt2.toLowerCase(), Lang.NQUADS) ;
+ org.apache.jena.riot.RDFDataMgr.read(dataset, uri, lang) ;
}
}
Modified: jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdLangParse.java Tue Jan 8 18:43:53 2013
@@ -31,20 +31,18 @@ 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.* ;
+import org.apache.jena.riot.lang.LabelToNode ;
+import org.apache.jena.riot.lang.LangRIOT ;
+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.* ;
+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.lang.LabelToNode ;
-import org.openjena.riot.lang.LangRDFXML ;
-import org.openjena.riot.lang.LangRIOT ;
-import org.openjena.riot.out.NodeToLabel ;
-import org.openjena.riot.out.SinkQuadOutput ;
-import org.openjena.riot.out.SinkTripleOutput ;
-import org.openjena.riot.process.inf.InfFactory ;
-import org.openjena.riot.process.inf.InferenceSetupRDFS ;
-import org.openjena.riot.system.RiotLib ;
-import org.openjena.riot.system.SyntaxLabels ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
import arq.cmd.CmdException ;
import arq.cmdline.* ;
@@ -94,9 +92,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) ;
@@ -224,11 +222,11 @@ 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)
{
- baseURI = RiotReader.chooseBaseIRI(baseURI, filename) ;
+ baseURI = SysRIOT.chooseBaseIRI(baseURI, filename) ;
boolean checking = true ;
if ( modLangParse.explicitChecking() ) checking = true ;
@@ -249,7 +247,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) ;
@@ -283,7 +281,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() )
@@ -292,12 +290,8 @@ public abstract class CmdLangParse exten
s = InfFactory.infTriples(s, setup) ;
SinkCounting<Triple> sink2 = new SinkCounting<Triple>(s) ;
-
- if ( lang.equals(Lang.RDFXML) )
- // Adapter round ARP RDF/XML reader.
- parser = LangRDFXML.create(in, baseURI, filename, errHandler, sink2) ;
- else
- parser = RiotReader.createParserTriples(in, lang, baseURI, sink2) ;
+ StreamRDF dest = StreamRDFLib.sinkTriples(sink2) ;
+ parser = RiotReader.createParser(in, lang, baseURI, dest) ;
sink = sink2 ;
}
@@ -310,7 +304,8 @@ public abstract class CmdLangParse exten
s = InfFactory.infQuads(s, setup) ;
SinkCounting<Quad> sink2 = new SinkCounting<Quad>(s) ;
- parser = RiotReader.createParserQuads(in, lang, baseURI, sink2) ;
+ StreamRDF dest = StreamRDFLib.sinkQuads(sink2) ;
+ parser = RiotReader.createParser(in, lang, baseURI, dest) ;
sink = sink2 ;
}
@@ -318,7 +313,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/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdTokens.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdTokens.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdTokens.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/CmdTokens.java Tue Jan 8 18:43:53 2013
@@ -21,9 +21,9 @@ package riotcmd;
import java.io.InputStream ;
import org.apache.jena.atlas.io.IO ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
import com.hp.hpl.jena.sparql.util.Timer ;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/infer.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/infer.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/infer.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/infer.java Tue Jan 8 18:43:53 2013
@@ -24,17 +24,18 @@ 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.openjena.riot.Lang ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.lang.LangRIOT ;
-import org.openjena.riot.out.SinkQuadOutput ;
-import org.openjena.riot.process.inf.InfFactory ;
-import org.openjena.riot.system.SinkExtendTriplesToQuads ;
+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.out.SinkQuadOutput ;
+import org.apache.jena.riot.process.inf.InfFactory ;
+import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.StreamRDFLib ;
import arq.cmd.CmdException ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdGeneral ;
-import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.util.FileManager ;
@@ -141,23 +142,24 @@ public class infer extends CmdGeneral
IO.flush(System.out);
}
- private void processFile(String filename, Sink<Quad> sink)
+ 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) ;
+ StreamRDF sink = StreamRDFLib.sinkQuads(qsink) ;
- if ( lang.isTriples() )
+ if ( RDFLanguages.isTriples(lang) )
{
InputStream in = IO.openFile(filename) ;
- Sink<Triple> sink2 = new SinkExtendTriplesToQuads(sink) ;
- LangRIOT parser = RiotReader.createParserTriples(in, lang, baseURI, sink2) ;
+ sink = StreamRDFLib.extendTriplesToQuads(sink) ;
+ LangRIOT parser = RiotReader.createParser(in, lang, baseURI, sink) ;
parser.parse() ;
return ;
}
else
{
InputStream in = IO.openFile(filename) ;
- LangRIOT parser = RiotReader.createParserQuads(in, lang, baseURI, sink) ;
+ LangRIOT parser = RiotReader.createParser(in, lang, baseURI, sink) ;
parser.parse() ;
}
}
Modified: jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/nquads.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/nquads.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/nquads.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/nquads.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/main/java/riotcmd/ntriples.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/ntriples.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/ntriples.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/ntriples.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/main/java/riotcmd/riot.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/riot.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/riot.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/riot.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/main/java/riotcmd/trig.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/trig.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/trig.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/trig.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/main/java/riotcmd/turtle.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/turtle.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/turtle.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/riotcmd/turtle.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/resources/META-INF/NOTICE?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/resources/META-INF/NOTICE (original)
+++ jena/branches/streaming-update/jena-arq/src/main/resources/META-INF/NOTICE Tue Jan 8 18:43:53 2013
@@ -1,5 +1,5 @@
Apache Jena - ARQ module
-Copyright 2011, 2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/OpAsQueryTest.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/OpAsQueryTest.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/OpAsQueryTest.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/OpAsQueryTest.java Tue Jan 8 18:43:53 2013
@@ -25,8 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- *
- * @author Damian Steer <d....@bris.ac.uk>
+ * Tests for {@link OpAsQuery}
*/
public class OpAsQueryTest {
@@ -103,6 +102,44 @@ public class OpAsQueryTest {
assertEquals(result[0], result[1]);
}
+ @Test
+ public void testQuadPatternInDefaultGraph() {
+ Object[] result = checkQuadQuery("SELECT * WHERE { ?s a ?type }");
+ assertEquals(result[0], result[1]);
+ }
+
+ @Test
+ public void testGraphClauseUri() {
+ Object[] result = checkQuery("SELECT * WHERE { GRAPH <http://example> { ?s a ?type } }");
+ assertEquals(result[0], result[1]);
+ }
+
+ @Test
+ public void testGraphClauseComplex() {
+ Object[] result = checkQuery("SELECT * WHERE { GRAPH <http://example> { ?s a ?type . OPTIONAL { ?s <http://label> ?label } } }");
+ assertEquals(result[0], result[1]);
+ }
+
+ @Test
+ public void testQuadPatternInGraph() {
+ Object[] result = checkQuadQuery("SELECT * WHERE { GRAPH <http://example> { ?s a ?type } }");
+ assertEquals(result[0], result[1]);
+ }
+
+ @Test
+ public void testQuadPatternInGraphComplex01() {
+ //This fails because OpQuadPattern's are converted back to individual GRAPH clauses
+ Object[] result = checkQuadQuery("SELECT * WHERE { GRAPH <http://example> { ?s a ?type . OPTIONAL { ?s <http://label> ?label } } }");
+ assertFalse(result[0].equals(result[1]));
+ }
+
+ @Test
+ public void testQuadPatternInGraphComplex02() {
+ //This succeeds since each OpQuadPattern is from a single simple GRAPH clause
+ Object[] result = checkQuadQuery("SELECT * WHERE { GRAPH <http://example> { ?s a ?type } OPTIONAL { GRAPH <http://example> { ?s <http://label> ?label } } }");
+ assertEquals(result[0], result[1]);
+ }
+
public Object[] checkQuery(String query) {
Query orig = QueryFactory.create(query, Syntax.syntaxSPARQL_11);
Op toReconstruct = Algebra.compile(orig);
@@ -110,4 +147,13 @@ public class OpAsQueryTest {
Object[] r = { orig, got };
return r;
}
+
+ public Object[] checkQuadQuery(String query) {
+ Query orig = QueryFactory.create(query, Syntax.syntaxSPARQL_11);
+ Op toReconstruct = Algebra.compile(orig);
+ toReconstruct = Algebra.toQuadForm(toReconstruct);
+ Query got = OpAsQuery.asQuery(toReconstruct);
+ Object[] r = { orig, got };
+ return r;
+ }
}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java Tue Jan 8 18:43:53 2013
@@ -26,12 +26,9 @@ import org.junit.runners.Suite ;
TestContext.class
, TestDatasetGraphMem.class
, TestDatasetGraphMemTriplesQuads.class
- , TestDatasetGraphMem.class
// Not ready , TestDynamicDatasetMem.class
})
public class TS_Core
-{
-
-}
+{}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java Tue Jan 8 18:43:53 2013
@@ -18,15 +18,9 @@
package com.hp.hpl.jena.sparql.core;
-import junit.framework.JUnit4TestAdapter ;
public class TestDatasetGraphMemTriplesQuads extends AbstractDatasetGraphTests
{
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter(TestDatasetGraphMemTriplesQuads.class) ;
- }
-
@Override
protected DatasetGraph emptyDataset()
{
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java Tue Jan 8 18:43:53 2013
@@ -18,18 +18,11 @@
package com.hp.hpl.jena.sparql.core;
-import junit.framework.JUnit4TestAdapter ;
-
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
public class TestDatasetMem extends AbstractTestDataset
{
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter(TestDatasetMem.class) ;
- }
-
@Override
protected Dataset createFixed() { return DatasetFactory.createMem() ; }
}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java Tue Jan 8 18:43:53 2013
@@ -18,12 +18,18 @@
package com.hp.hpl.jena.sparql.core;
+import org.junit.After ;
+import org.junit.Before ;
+
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
public class TestDynamicDatasetMem extends AbstractTestDynamicDataset
{
+ @Before public void before1() {}
+ @After public void after1() {}
+
@Override
protected Dataset createDataset()
{
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java Tue Jan 8 18:43:53 2013
@@ -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 org.openjena.riot.system.PrefixMap ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.rdf.model.AnonId ;
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java Tue Jan 8 18:43:53 2013
@@ -206,7 +206,7 @@ public abstract class AbstractTestGraph2
Graph g = emptyGraph() ;
Triple t1 = triple(s1, p1, o1) ;
g.add(t1) ;
- g.getBulkUpdateHandler().remove(any, any, any) ;
+ g.remove(any, any, any) ;
assertEquals(0, g.size()) ;
returnGraph(g) ;
}
@@ -216,7 +216,7 @@ public abstract class AbstractTestGraph2
Graph g = emptyGraph() ;
Triple t1 = triple(s1, p1, o1) ;
g.add(t1) ;
- g.getBulkUpdateHandler().remove(s2, any, any) ;
+ g.remove(s2, any, any) ;
assertEquals(1, g.size()) ;
assertTrue(g.contains(t1)) ;
returnGraph(g) ;
@@ -227,7 +227,7 @@ public abstract class AbstractTestGraph2
Graph g = emptyGraph() ;
Triple t1 = triple(s1, p1, o1) ;
g.add(t1) ;
- g.getBulkUpdateHandler().remove(s1, any, any) ;
+ g.remove(s1, any, any) ;
assertEquals(0, g.size()) ;
returnGraph(g) ;
}
@@ -243,7 +243,7 @@ public abstract class AbstractTestGraph2
g.add(t2) ;
g.add(t3) ;
g.add(t4) ;
- g.getBulkUpdateHandler().removeAll() ;
+ g.clear() ;
assertEquals(0, g.size()) ;
returnGraph(g) ;
}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java Tue Jan 8 18:43:53 2013
@@ -28,7 +28,6 @@ import org.junit.runners.Suite ;
, TestDatasetGraphMem.class
, TestGraphsDataBag.class
, TestGraphUnionRead.class
- , TestReifier2.class
})
public class TS_Graph
{
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java Tue Jan 8 18:43:53 2013
@@ -27,13 +27,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.QueryExecutionFactory ;
-import com.hp.hpl.jena.query.QueryFactory ;
-import com.hp.hpl.jena.query.ResultSet ;
-import com.hp.hpl.jena.query.ResultSetFormatter ;
-import com.hp.hpl.jena.query.Syntax ;
+import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.shared.DeleteDeniedException ;
@@ -104,8 +98,7 @@ public class TestGraphsDataBag extends B
{
distinct.add(SSE.parseTriple("(<x> <p> 'ZZZ')"));
assertEquals(1, count(distinct));
-
- distinct.getBulkUpdateHandler().removeAll();
+ distinct.clear();
assertEquals(0, count(distinct));
}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/EarlReport.java Tue Jan 8 18:43:53 2013
@@ -40,7 +40,7 @@ public class EarlReport
earl:assertedBy [ ...]
earl:result [
rdf:type earl:TestResult;
- earl:outcome earl:pass ];
+ earl:outcome earl:passed ];
earl:subject <thingBeingTested>;
earl:test <testPerformed> ;
earl:mode .... ].
@@ -97,22 +97,26 @@ public class EarlReport
public void success(String testURI)
{
- createAssertionResult(testURI, EARL.pass) ;
+ createAssertionResult(testURI, EARL.passed) ;
+ //Old -- createAssertionResult(testURI, EARL.pass) ;
}
public void failure(String testURI)
{
- createAssertionResult(testURI, EARL.fail) ;
+ createAssertionResult(testURI, EARL.failed) ;
+ //Old -- createAssertionResult(testURI, EARL.fail) ;
}
public void notApplicable(String testURI)
{
- createAssertionResult(testURI, EARL.notApplicable);
+ createAssertionResult(testURI, EARL.inapplicable);
+ // Old -- createAssertionResult(testURI, EARL.notApplicable);
}
public void notTested(String testURI)
{
- createAssertionResult(testURI, EARL.notTested);
+ createAssertionResult(testURI, EARL.untested);
+ // Old -- createAssertionResult(testURI, EARL.notTested);
}
private void createAssertionResult(String testURI, Resource outcome)
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java Tue Jan 8 18:43:53 2013
@@ -24,7 +24,7 @@ import java.io.PrintWriter ;
import java.util.* ;
import org.apache.jena.atlas.logging.Log ;
-import org.openjena.riot.checker.CheckerLiterals ;
+import org.apache.jena.riot.checker.CheckerLiterals ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.* ;
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java Tue Jan 8 18:43:53 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList ;
import java.util.List ;
import org.apache.jena.atlas.iterator.Iter ;
-import org.openjena.riot.checker.CheckerLiterals ;
+import org.apache.jena.riot.checker.CheckerLiterals ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java Tue Jan 8 18:43:53 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.modify;
import org.apache.jena.atlas.junit.BaseTest ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.ARQTestSuite ;
@@ -35,8 +36,8 @@ public abstract class AbstractTestUpdate
protected void defaultGraphData(GraphStore gStore, Graph data)
{
Graph g = gStore.getDefaultGraph() ;
- g.getBulkUpdateHandler().removeAll() ;
- g.getBulkUpdateHandler().add(data) ;
+ g.clear() ;
+ GraphUtil.addInto(g, data) ;
}
protected void namedGraphData(GraphStore gStore, Node uri, Graph data)
@@ -48,8 +49,8 @@ public abstract class AbstractTestUpdate
g = gStore.getGraph(uri) ;
}
else
- g.getBulkUpdateHandler().removeAll() ;
- g.getBulkUpdateHandler().add(data) ;
+ g.clear() ;
+ GraphUtil.addInto(g,data) ;
}
protected static final String FileBase = ARQTestSuite.testDirUpdate ;
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java Tue Jan 8 18:43:53 2013
@@ -338,7 +338,7 @@ public class TestResultSetFormat2
parseTSVAsBoolean(x, false);
}
- public void parseTSV(String x)
+ private void parseTSV(String x)
{
byte[] b = StrUtils.asUTF8bytes(x) ;
ByteArrayInputStream in = new ByteArrayInputStream(b) ;
@@ -350,13 +350,12 @@ public class TestResultSetFormat2
}
}
- public void parseTSVAsBoolean(String x, boolean expected)
+ private void parseTSVAsBoolean(String x, boolean expected)
{
byte[] b = StrUtils.asUTF8bytes(x);
ByteArrayInputStream in = new ByteArrayInputStream(b);
boolean actual = TSVInput.booleanFromTSV(in);
Assert.assertEquals(expected, actual);
- }
-
+ }
}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java Tue Jan 8 18:43:53 2013
@@ -19,20 +19,31 @@
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 ;
+import org.apache.jena.riot.web.TS_RiotWeb ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
-import org.openjena.riot.RIOT ;
-import org.openjena.riot.TS_Riot1 ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TS_Riot1.class
- , TS_LangSuite.class
- , TS_ReaderRIOT.class
- , TS_IO2.class
- , TS_RIOTAdapters.class
+ // Old world - org.openjena.riot
+ TS_Out.class
+
+ // New world - org.apache.jena.riot
+ , TS_Lang.class
+ , TS_LangSuite.class
+ , TS_ReaderRIOT.class
+ , TS_IO2.class
+ , TS_RIOTAdapters.class
+ , TS_Process.class
+ //, TS_RiotMisc.class
+ , TS_RiotSystem.class
+ , TS_RiotWeb.class
})
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java Tue Jan 8 18:43:53 2013
@@ -24,10 +24,11 @@ import java.io.StringReader ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.adapters.RDFReaderFactoryRIOT ;
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 ;
@@ -35,6 +36,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" ;
@@ -44,7 +47,6 @@ public class TestJenaReaderRIOT extends
@BeforeClass static public void beforeClass()
{
RIOT.init() ;
- WebReader2.wireIntoJena() ;
}
@AfterClass static public void afterClass()
@@ -78,15 +80,15 @@ public class TestJenaReaderRIOT extends
@Test public void read_30()
{
{
- TypedInputStream2 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.getInput(), RDFLanguages.langRDFXML) ;
+ RDFDataMgr.read(m0, in, RDFLanguages.RDFXML) ;
}
- TypedInputStream2 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.getInput(), null, "RDF/XML") ;
+ m1.read(in1, null, "RDF/XML") ;
}
// test read from StringReader..
@@ -97,7 +99,7 @@ public class TestJenaReaderRIOT extends
{
StringReader s = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, s, null, RDFLanguages.langNTriples) ;
+ RDFDataMgr.read(m, s, null, RDFLanguages.NTRIPLES) ;
}
StringReader s1 = new StringReader("<s> <p> <p> .") ;
@@ -118,7 +120,7 @@ public class TestJenaReaderRIOT extends
{
StringReader s = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, s, null, RDFLanguages.langRDFXML) ;
+ RDFDataMgr.read(m, s, null, RDFLanguages.RDFXML) ;
}
StringReader s1 = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
@@ -144,13 +146,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 +190,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 +210,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/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java Tue Jan 8 18:43:53 2013
@@ -26,52 +26,52 @@ public class TestLangRIOT extends BaseTe
{
@BeforeClass public static void beforeClass() { RDFLanguages.init() ; }
- @Test public void lang_01() { test(RDFLanguages.langNTriples, "NT") ; }
- @Test public void lang_02() { test(RDFLanguages.langNTriples, "N-Triples") ; }
- @Test public void lang_03() { test(RDFLanguages.langNTriples, "N-TRIPLES") ; }
- @Test public void lang_04() { test(RDFLanguages.langNTriples, "NTRIPLE") ; }
- @Test public void lang_05() { test(RDFLanguages.langNTriples, "NTRIPLES") ; }
+ @Test public void lang_01() { test(RDFLanguages.NTRIPLES, "NT") ; }
+ @Test public void lang_02() { test(RDFLanguages.NTRIPLES, "N-Triples") ; }
+ @Test public void lang_03() { test(RDFLanguages.NTRIPLES, "N-TRIPLES") ; }
+ @Test public void lang_04() { test(RDFLanguages.NTRIPLES, "NTRIPLE") ; }
+ @Test public void lang_05() { test(RDFLanguages.NTRIPLES, "NTRIPLES") ; }
- @Test public void lang_11() { test(RDFLanguages.langTurtle, "TTL") ; }
- @Test public void lang_12() { test(RDFLanguages.langTurtle, "TUrtLE") ; }
+ @Test public void lang_11() { test(RDFLanguages.TURTLE, "TTL") ; }
+ @Test public void lang_12() { test(RDFLanguages.TURTLE, "TUrtLE") ; }
- @Test public void lang_21() { test(RDFLanguages.langRDFXML, "RDF/XML") ; }
- @Test public void lang_22() { test(RDFLanguages.langRDFXML, "RDFXML") ; }
- @Test public void lang_23() { test(RDFLanguages.langRDFXML, "RDF/XML-ABBREV") ; }
+ @Test public void lang_21() { test(RDFLanguages.RDFXML, "RDF/XML") ; }
+ @Test public void lang_22() { test(RDFLanguages.RDFXML, "RDFXML") ; }
+ @Test public void lang_23() { test(RDFLanguages.RDFXML, "RDF/XML-ABBREV") ; }
- @Test public void lang_30() { test(RDFLanguages.langRDFJSON, "RDFJSON") ; }
- @Test public void lang_31() { test(RDFLanguages.langRDFJSON, "RDF/json") ; }
+ @Test public void lang_30() { test(RDFLanguages.RDFJSON, "RDFJSON") ; }
+ @Test public void lang_31() { test(RDFLanguages.RDFJSON, "RDF/json") ; }
- @Test public void lang_40() { test(RDFLanguages.langNQuads, "N-QUADS") ; }
- @Test public void lang_41() { test(RDFLanguages.langNQuads, "NQuads") ; }
+ @Test public void lang_40() { test(RDFLanguages.NQUADS, "N-QUADS") ; }
+ @Test public void lang_41() { test(RDFLanguages.NQUADS, "NQuads") ; }
- @Test public void lang_50() { test(RDFLanguages.langTriG, "TriG") ; }
- @Test public void lang_51() { test(RDFLanguages.langTriG, "trig") ; }
- @Test public void lang_52() { test(RDFLanguages.langTriG, "TRIG") ; }
+ @Test public void lang_50() { test(RDFLanguages.TRIG, "TriG") ; }
+ @Test public void lang_51() { test(RDFLanguages.TRIG, "trig") ; }
+ @Test public void lang_52() { test(RDFLanguages.TRIG, "TRIG") ; }
- @Test public void guess_01() { guess("D.nt", RDFLanguages.langNTriples) ; }
- @Test public void guess_02() { guess("D.ttl.nt", RDFLanguages.langNTriples) ; }
+ @Test public void guess_01() { guess("D.nt", RDFLanguages.NTRIPLES) ; }
+ @Test public void guess_02() { guess("D.ttl.nt", RDFLanguages.NTRIPLES) ; }
- @Test public void guess_03() { guess("D.ttl", RDFLanguages.langTurtle) ; }
+ @Test public void guess_03() { guess("D.ttl", RDFLanguages.TURTLE) ; }
- @Test public void guess_04() { guess("D.rdf", RDFLanguages.langRDFXML) ; }
- @Test public void guess_05() { guess("D.owl", RDFLanguages.langRDFXML) ; }
+ @Test public void guess_04() { guess("D.rdf", RDFLanguages.RDFXML) ; }
+ @Test public void guess_05() { guess("D.owl", RDFLanguages.RDFXML) ; }
- @Test public void guess_06() { guess("D.rj", RDFLanguages.langRDFJSON) ; }
- @Test public void guess_07() { guess("D.json", RDFLanguages.langRDFJSON) ; }
+ @Test public void guess_06() { guess("D.rj", RDFLanguages.RDFJSON) ; }
+ @Test public void guess_07() { guess("D.json", RDFLanguages.RDFJSON) ; }
- @Test public void guess_08() { guess("D.nq", RDFLanguages.langNQuads) ; }
- @Test public void guess_09() { guess("D.trig", RDFLanguages.langTriG) ; }
+ @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) ;
}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Tue Jan 8 18:43:53 2013
@@ -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.openjena.riot.RiotException ;
-import org.openjena.riot.TestVocabRIOT ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.VocabTestRIOT ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
@@ -68,28 +68,28 @@ public class FactoryTestRiot extends Tes
Resource input = action ;
Resource output = result ;
- String baseIRI = TestVocabRIOT.assumedBaseURI ;
+ String baseIRI = VocabTestRIOT.assumedBaseURI ;
String x = input.getLocalName() ;
// Yuk, yuk, yuk.
baseIRI = baseIRI+x ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxTTL) )
- return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langTurtle, report) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxTTL) )
- return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langTurtle, report) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxNT) )
- return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langNTriples, report) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxNT) )
- return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langNTriples, report) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxRJ) )
- return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langRDFJSON, report) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxRJ) )
- return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langRDFJSON, report) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestSurpressed ))
return new UnitTestSurpressed(testName, item.getURI(), report) ;
@@ -97,22 +97,22 @@ public class FactoryTestRiot extends Tes
// Eval.
if ( r.equals(VocabLangRDF.TestEvalTTL) )
- return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.langTurtle, report) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalTTL) )
- return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.langTurtle, report) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestEvalNT) )
- return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.langNTriples, report) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalNT) )
- return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.langNTriples, report) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestEvalRJ) )
- return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.langRDFJSON, report) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalRJ) )
- return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.langRDFJSON, report) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.RDFJSON, report) ;
System.err.println("Unrecognized turtle test : " + testName) ;
return null ;
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java Tue Jan 8 18:43:53 2013
@@ -19,26 +19,25 @@
package org.apache.jena.riot.langsuite;
-import org.apache.jena.riot.Lang2 ;
+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 org.openjena.riot.system.JenaReaderTurtle2 ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
-import com.hp.hpl.jena.rdf.model.RDFReader ;
import com.hp.hpl.jena.shared.JenaException ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
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,9 +66,8 @@ public class UnitTestBadEval extends Lan
public void runTestForReal()
{
Model model = ModelFactory.createDefaultModel() ;
- RDFReader rdfreader = new JenaReaderTurtle2() ;
try {
- rdfreader.read(model, input) ;
+ RDFDataMgr.read(model, input) ;
fail("Managed to read a bad evaluation test without error") ;
}
catch (RiotException ex) {}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java Tue Jan 8 18:43:53 2013
@@ -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/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Tue Jan 8 18:43:53 2013
@@ -18,15 +18,16 @@
package org.apache.jena.riot.langsuite;
-import org.apache.jena.riot.Lang2 ;
-import org.apache.jena.riot.RDFReaderRIOT ;
-import org.apache.jena.riot.WebReader2 ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.system.JenaReaderNTriples2 ;
+import java.io.InputStream ;
+
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.stream.StreamManager ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
-import com.hp.hpl.jena.rdf.model.RDFReader ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
import com.hp.hpl.jena.util.FileUtils ;
@@ -35,9 +36,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 ;
@@ -58,17 +59,17 @@ public class UnitTestEval extends LangTe
public void runTestForReal()
{
Model model = ModelFactory.createDefaultModel() ;
- 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
- new JenaReaderNTriples2().read(results, output) ;
+ InputStream in = StreamManager.get().open(output) ;
+ RDFDataMgr.read(results, in, null, RDFLanguages.NTRIPLES) ;
boolean b = model.isIsomorphicWith(results) ;
if ( !b )
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java Tue Jan 8 18:43:53 2013
@@ -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
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java Tue Jan 8 18:43:53 2013
@@ -21,10 +21,9 @@ package org.apache.jena.riot.stream;
import java.io.File ;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.riot.TypedInputStream2 ;
-import org.apache.jena.riot.stream.LocatorFile2 ;
+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
{
@@ -32,7 +31,7 @@ public class TestLocators extends BaseTe
@Test public void locatorFile_01()
{
- LocatorFile2 loc = new LocatorFile2() ;
+ LocatorFile loc = new LocatorFile() ;
assertTrue(loc.exists("pom.xml")) ;
assertTrue(loc.exists(testingDir+"data.ttl")) ;
assertFalse(loc.exists("IDoNotExist")) ;
@@ -40,7 +39,7 @@ public class TestLocators extends BaseTe
@Test public void locatorFile_02()
{
- LocatorFile2 loc = new LocatorFile2(".") ;
+ LocatorFile loc = new LocatorFile(".") ;
assertTrue(loc.exists("pom.xml")) ;
assertTrue(loc.exists(testingDir+"data.ttl")) ;
assertFalse(loc.exists("IDoNotExist")) ;
@@ -49,7 +48,7 @@ public class TestLocators extends BaseTe
@Test public void locatorFile_03()
{
String dir = new File(".").getAbsolutePath() ;
- LocatorFile2 loc = new LocatorFile2(dir) ;
+ LocatorFile loc = new LocatorFile(dir) ;
assertTrue(loc.exists("pom.xml")) ;
assertFalse(loc.exists("IDoNotExist")) ;
}
@@ -57,7 +56,7 @@ public class TestLocators extends BaseTe
@Test public void locatorFile_04()
{
String dir = new File("src").getAbsolutePath() ;
- LocatorFile2 loc = new LocatorFile2(dir) ;
+ LocatorFile loc = new LocatorFile(dir) ;
assertFalse(loc.exists("pom.xml")) ;
assertTrue(loc.exists("main")) ;
@@ -68,8 +67,8 @@ public class TestLocators extends BaseTe
@Test public void locatorFile_05()
{
- LocatorFile2 loc = new LocatorFile2() ;
- TypedInputStream2 ts = loc.open(testingDir+"data.ttl") ;
+ LocatorFile loc = new LocatorFile() ;
+ TypedInputStream ts = loc.open(testingDir+"data.ttl") ;
assertTrue("Not equal: "+WebContent.contentTypeTurtle+" != "+ts.getMediaType(),
WebContent.contentTypeTurtle.equalsIgnoreCase(ts.getContentType())) ;
}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java Tue Jan 8 18:43:53 2013
@@ -20,16 +20,14 @@ package org.apache.jena.riot.stream;
import java.io.File ;
+import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.riot.TypedInputStream2 ;
-import org.apache.jena.riot.WebReader2 ;
-import org.apache.jena.riot.stream.LocatorFile2 ;
-import org.apache.jena.riot.stream.LocatorURL2 ;
-import org.apache.jena.riot.stream.StreamManager ;
+import org.apache.jena.atlas.web.TypedInputStream ;
+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 ;
@@ -50,21 +48,21 @@ public class TestStreamManager extends B
{
streamMgrStd = StreamManager.get() ;
streamMgr = new StreamManager() ;
- streamMgr.addLocator(new LocatorFile2()) ;
- streamMgr.addLocator(new LocatorFile2(directory)) ;
- streamMgr.addLocator(new LocatorURL2()) ;
+ streamMgr.addLocator(new LocatorFile()) ;
+ streamMgr.addLocator(new LocatorFile(directory)) ;
+ streamMgr.addLocator(new LocatorURL()) ;
- 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,20 +92,19 @@ public class TestStreamManager extends B
private static void open(String dataName, Context context)
{
- TypedInputStream2 in ;
- if ( context != null )
- in = WebReader2.open(dataName, context) ;
- else
- in = WebReader2.open(dataName) ;
+ TypedInputStream in =
+ ( context != null ) ?
+ RDFDataMgr.open(dataName, context) :
+ RDFDataMgr.open(dataName) ;
assertNotNull(in) ;
- in.close() ;
+ IO.close(in) ;
}
private static void read(String dataName)
{
StreamManager.setGlobal(streamMgr) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, dataName) ;
+ RDFDataMgr.read(m, dataName) ;
assertTrue(m.size() != 0 ) ;
StreamManager.setGlobal(streamMgrStd) ;
}
Modified: jena/branches/streaming-update/jena-arq/src/test/java/riotcmd/rdflangtest.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/riotcmd/rdflangtest.java?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/riotcmd/rdflangtest.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/riotcmd/rdflangtest.java Tue Jan 8 18:43:53 2013
@@ -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()) ; }
}
Modified: jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/manifest.ttl
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/manifest.ttl?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/manifest.ttl (original)
+++ jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/manifest.ttl Tue Jan 8 18:43:53 2013
@@ -92,6 +92,8 @@
<#turtle-syntax-struct-01>
<#turtle-syntax-struct-02>
<#turtle-syntax-struct-03>
+ <#turtle-syntax-struct-04>
+ <#turtle-syntax-struct-05>
<#turtle-syntax-lists-01>
<#turtle-syntax-lists-02>
<#turtle-syntax-lists-03>
@@ -530,6 +532,16 @@
mf:action <turtle-syntax-struct-03.ttl> ;
.
+<#turtle-syntax-struct-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+ mf:name "turtle-syntax-struct-04" ;
+ mf:action <turtle-syntax-struct-04.ttl> ;
+ .
+
+<#turtle-syntax-struct-05> rdf:type rdft:TestTurtlePositiveSyntax ;
+ mf:name "turtle-syntax-struct-05" ;
+ mf:action <turtle-syntax-struct-05.ttl> ;
+ .
+
<#turtle-syntax-lists-01> rdf:type rdft:TestTurtlePositiveSyntax ;
mf:name "turtle-syntax-lists-01" ;
mf:action <turtle-syntax-lists-01.ttl> ;
Modified: jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/master
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/master?rev=1430439&r1=1430438&r2=1430439&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/master (original)
+++ jena/branches/streaming-update/jena-arq/testing/RIOT/Lang/Turtle/master Tue Jan 8 18:43:53 2013
@@ -359,6 +359,20 @@ ROOT=turtle-syntax-struct
.
--End--
+--Syntax--
+@prefix : <http://example/> .
+:s :p1 :o1 ;;
+ :p2 :o2
+ .
+--End--
+
+--Syntax--
+@prefix : <http://example/> .
+:s :p1 :o1 ;
+ :p2 :o2 ;;
+ .
+--End--
+
ROOT=turtle-syntax-lists
--Syntax--
@prefix : <http://example/> .