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 22:12:24 UTC
svn commit: r1430541 - in /jena/trunk/jena-arq:
src/main/java/com/hp/hpl/jena/sparql/core/
src/main/java/org/apache/jena/riot/system/
src/test/java/org/apache/jena/riot/ testing/RIOT/Reader/
Author: andy
Date: Tue Jan 8 21:12:23 2013
New Revision: 1430541
URL: http://svn.apache.org/viewvc?rev=1430541&view=rev
Log:
Tests for read quads to triples and triples to quads.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
jena/trunk/jena-arq/testing/RIOT/Reader/D.trig
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java?rev=1430541&r1=1430540&r2=1430541&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java Tue Jan 8 21:12:23 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.core;
import java.util.Iterator ;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Lib ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
@@ -87,7 +88,7 @@ public abstract class DatasetGraphCollec
protected Graph fetchGraph(Node gn)
{
- if ( Quad.isDefaultGraph(gn) )
+ if ( Quad.isDefaultGraph(gn) || Lib.equal(gn,Quad.tripleInQuad)) // Not preferrred style
return getDefaultGraph() ;
else
return getGraph(gn) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java?rev=1430541&r1=1430540&r2=1430541&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java Tue Jan 8 21:12:23 2013
@@ -20,7 +20,6 @@ package org.apache.jena.riot.system;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.atlas.lib.Tuple ;
-import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.lang.RDFParserOutputCounting ;
import com.hp.hpl.jena.graph.Graph ;
@@ -40,7 +39,7 @@ public class StreamRDFLib
public static StreamRDF dataset(DatasetGraph dataset) { return new ParserOutputDataset(dataset) ; }
/**
- * Outpout to a sink; prefix and base handled only within the parser.
+ * Output to a sink; prefix and base handled only within the parser.
* Unfortunately, Java needs different names for the triples and
* quads versions because of type erasure.
*/
@@ -136,7 +135,11 @@ public class StreamRDFLib
else
{
if ( ! warningIssued )
- SysRIOT.getLogger().warn("Only triples or default graph data expected : named graph data ignored") ;
+ {
+ //SysRIOT.getLogger().warn("Only triples or default graph data expected : named graph data ignored") ;
+ // Not ideal - assumes the global default.
+ ErrorHandlerFactory.getDefaultErrorHandler().warning("Only triples or default graph data expected : named graph data ignored", -1, -1) ;
+ }
warningIssued = true ;
}
//throw new IllegalStateException("Quad passed to graph parsing") ;
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=1430541&r1=1430540&r2=1430541&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 Tue Jan 8 21:12:23 2013
@@ -170,9 +170,7 @@ public class TestJenaReaderRIOT extends
m2.read(new StringReader(x), "http://example/base4", lang) ;
}
- // Web.
- // TriG
- // NQ
+ // See also TestDataRead
private static void jenaread(String dataurl)
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java?rev=1430541&r1=1430540&r2=1430541&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java Tue Jan 8 21:12:23 2013
@@ -21,14 +21,19 @@ package org.apache.jena.riot;
import java.io.FileInputStream ;
import java.io.IOException ;
+import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
+import com.hp.hpl.jena.graph.Graph ;
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.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.util.Context ;
/* Tests of RDFDataMgr.
@@ -91,6 +96,35 @@ public class TestReadData extends BaseTe
@Test public void load_15() { RDFDataMgr.loadDatasetGraph(filename("D.nq"), RDFLanguages.NQUADS) ; }
@Test public void load_16() { RDFDataMgr.loadDatasetGraph(filename("D-nq"), RDFLanguages.NQUADS) ; }
+ // Load triples into DSG
+ @Test public void load_17() {
+ DatasetGraph dsg = RDFDataMgr.loadDatasetGraph(filename("D.ttl")) ;
+ assertFalse(dsg.getDefaultGraph().isEmpty()) ;
+ assertEquals(0, Iter.count(dsg.listGraphNodes())) ;
+ }
+
+ // Load quads into graph - warning on named graphs
+ @Test
+ public void load_18()
+ {
+ ErrorHandler err = ErrorHandlerFactory.getDefaultErrorHandler() ;
+ try
+ {
+ ErrorHandlerFactory.setDefaultErrorHandler(new ErrorHandlerTestLib.ErrorHandlerEx()) ;
+ try {
+ Graph g = RDFDataMgr.loadGraph(filename("D.trig")) ;
+ fail("No expection generated") ;
+ } catch (ErrorHandlerTestLib.ExWarning e) { }
+ ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerNoLogging) ;
+ Graph g = RDFDataMgr.loadGraph(filename("D.trig")) ;
+ assertFalse(g.isEmpty()) ;
+ assertEquals(1, g.size()) ;
+ } finally
+ {
+ ErrorHandlerFactory.setDefaultErrorHandler(err) ;
+ }
+ }
+
private static String filename(String filename) { return directory+"/"+filename ; }
// Base.
Modified: jena/trunk/jena-arq/testing/RIOT/Reader/D.trig
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/RIOT/Reader/D.trig?rev=1430541&r1=1430540&r2=1430541&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/RIOT/Reader/D.trig (original)
+++ jena/trunk/jena-arq/testing/RIOT/Reader/D.trig Tue Jan 8 21:12:23 2013
@@ -1,4 +1,5 @@
@base <http://example/> .
+{ <s1> <p1> <o1> }
<g> { <s> <p> <o> }