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/08/11 20:58:58 UTC
svn commit: r1371998 - in
/jena/Scratch/AFS/Dev/trunk/src/main/java/projects: riot_reader/ viewgraph/
viewgraph/test/
Author: andy
Date: Sat Aug 11 18:58:58 2012
New Revision: 1371998
URL: http://svn.apache.org/viewvc?rev=1371998&view=rev
Log: (empty)
Added:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS_RiotReader.java
- copied, changed from r1367966, jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS_ViewGraphs.java
- copied, changed from r1371767, jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDatasetMem.java
- copied, changed from r1371767, jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDataset.java
Removed:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDataset.java
Modified:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TS_ViewGraphs.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetGraphsRegular.java
Copied: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS_RiotReader.java (from r1367966, jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS.java)
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS_RiotReader.java?p2=jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS_RiotReader.java&p1=jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS.java&r1=1367966&r2=1371998&rev=1371998&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_reader/PROCESS_RiotReader.java Sat Aug 11 18:58:58 2012
@@ -22,11 +22,11 @@ package projects.riot_reader;
/** Not a class. */
-public class PROCESS
+public class PROCESS_RiotReader
{
// ready to integrate
- // packaing:
+ // packaging:
// c.h.h.j.reader (understands Model and Dataset)
// o.oj.riot => o.a.j.riot
// with compatibility for FileManager
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java?rev=1371998&r1=1371997&r2=1371998&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java Sat Aug 11 18:58:58 2012
@@ -57,13 +57,17 @@ public class GraphViewDataset extends Gr
// TODO Use GraphPrefixesProjection (not PrefixMappingOverPrefixMap).
private final DatasetGraph dsg ;
- private final Node gn ;
+ private final Node gn ; // null for default graph.
private DatasetPrefixes dsgPrefixes ;
protected GraphViewDataset(DatasetGraph dsg, DatasetPrefixes dsgPrefixes, Node gn)
{
this.dsg = dsg ;
this.dsgPrefixes = dsgPrefixes ;
+ //Quad.defaultGraphIRI ;
+ //Quad.defaultGraphNodeGenerated
+ if ( gn == null )
+ gn = Quad.defaultGraphNodeGenerated ;
this.gn = gn ;
}
Copied: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS_ViewGraphs.java (from r1371767, jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS.java)
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS_ViewGraphs.java?p2=jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS_ViewGraphs.java&p1=jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS.java&r1=1371767&r2=1371998&rev=1371998&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROCESS_ViewGraphs.java Sat Aug 11 18:58:58 2012
@@ -18,14 +18,28 @@
package projects.viewgraph;
-public class PROCESS
+
+public class PROCESS_ViewGraphs
{
/*
+ * Tests:
+ * Update through a viewgraph
+ * exists tests, contains tests
+ * prefix tests
+ *
+ * Migrate to TDB first, use GraphOps.
+ * Compare GraphOps.getNamedgraph as the dft1/dt2/union code.
+ *
* Find union graph tests - to AbstractTestGraphOverDataset
- * Tests with non-existent graphs
- * TDB tests.
- * graph.size() tests.
- * dsg.contains tests.
+ * ARQ-tests-com.hp.hpl.jena.sparql.algebra.uniongraph :: Dev_TS_UnionGraph
+ * DatasetGraph hierarchy: (add "getUnionGraph())"
+ * c.f. [[DynDS]]
+ *
+ * See also: comment in GraphNamedTDB
+ */
+
+ /* Migration cleanup
+ * To TDB first.
+ * Check all uses of defaultGraph and union graph names.
*/
}
-
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java?rev=1371998&r1=1371997&r2=1371998&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java Sat Aug 11 18:58:58 2012
@@ -24,12 +24,13 @@ import org.junit.Before ;
import org.junit.Test ;
import org.openjena.atlas.iterator.Iter ;
import org.openjena.atlas.junit.BaseTest ;
+import projects.viewgraph.DSGViewGraphs ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.sse.SSE ;
@@ -45,34 +46,39 @@ public abstract class AbstractTestGraphO
private static Quad q2 = SSE.parseQuad("(<g2> <s> <p> 2)") ; // same triple - different graph
private static Quad q3 = SSE.parseQuad("(<g3> <s> <p> 2)") ; // same triple - different graph
+ private static Node gn1 = SSE.parseNode("<g1>") ;
+ private static Node gn2 = SSE.parseNode("<g2>") ;
+ private static Node gn3 = SSE.parseNode("<g3>") ;
+ private static Node gnNotSuchGraph = SSE.parseNode("<NoSuchGraph>") ;
+
+
protected abstract Graph makeNamedGraph(DatasetGraph dsg, Node gn) ;
protected abstract Graph makeDefaultGraph(DatasetGraph dsg) ;
@Before public void before()
{
- baseDSG = DatasetGraphFactory.createMem() ;
+ baseDSG = createBaseDSG() ;
baseDSG.add(q0) ;
baseDSG.add(q1) ;
baseDSG.add(q2) ;
baseDSG.add(q3) ;
}
- @Test public void graphDSG_01()
+ @Test public void graphDSG_view_1()
{
Triple t = makeDefaultGraph(baseDSG).find(null, null, null).next() ;
assertEquals(SSE.parseTriple("(<s> <p> 0)"), t) ;
// Check exact iterator.
}
- @Test public void graphDSG_02()
+ @Test public void graphDSG_view_2()
{
- Node g = SSE.parseNode("<g1>") ;
- Triple t = makeNamedGraph(baseDSG, g).find(null, null, null).next() ;
+ Triple t = makeNamedGraph(baseDSG, gn1).find(null, null, null).next() ;
assertEquals(SSE.parseTriple("(<s> <p> 1)"), t) ;
// Check exact iterator.
}
- @Test public void graphDSG_03()
+ @Test public void graphDSG_view_3()
{
Graph g = makeDefaultGraph(baseDSG) ;
g.add(SSE.parseTriple("(<s> <p> 99)")) ;
@@ -81,24 +87,17 @@ public abstract class AbstractTestGraphO
assertEquals(2, g.size()) ;
// Check exact iterator.
}
-
- // *** count / exists
-
- // *** contains
// non-existant graph
- @Test public void graphDSG_04()
+ @Test public void graphDSG_view_4()
{
- Node gn = SSE.parseNode("<NoSuchGraph>") ;
- Graph g = makeNamedGraph(baseDSG, gn) ;
- long x = Iter.count(baseDSG.find(gn, null, null, null)) ;
+ Graph g = makeNamedGraph(baseDSG, gnNotSuchGraph) ;
+ long x = Iter.count(baseDSG.find(gnNotSuchGraph, null, null, null)) ;
assertEquals(0, x) ;
assertEquals(0, g.size()) ;
- // Check exact iterator.
}
-
- @Test public void graphDSG_10()
+ @Test public void graphDSG_view_5()
{
Graph g = makeNamedGraph(baseDSG, Quad.unionGraph) ;
Iterator<Triple> iter = g.find(null,null,null) ;
@@ -106,4 +105,51 @@ public abstract class AbstractTestGraphO
iter.next() ;
assertEquals(2, g.size()) ;
}
+
+ // ---- contains
+
+ @Test public void graphDSG_contains_1()
+ {
+ boolean b = new DSGViewGraphs(baseDSG, null).containsGraph(gn1) ;
+ assertTrue(b) ;
+ }
+
+ @Test public void graphDSG_contains_2()
+ {
+ boolean b = new DSGViewGraphs(baseDSG, null).containsGraph(gnNotSuchGraph) ;
+ assertFalse(b) ;
+ }
+
+ // ---- prefixes
+
+ @Test public void graphDSG_prefixes_1()
+ {
+ Graph g = makeNamedGraph(baseDSG, gn1) ;
+ PrefixMapping pmap = g.getPrefixMapping() ;
+ assertNotNull(pmap) ;
+ }
+
+ @Test public void graphDSG_prefixes_2()
+ {
+ Graph g = makeNamedGraph(baseDSG, Quad.unionGraph) ;
+ PrefixMapping pmap = g.getPrefixMapping() ;
+ assertNotNull(pmap) ;
+ }
+
+ @Test public void graphDSG_prefixes_3()
+ {
+ Graph g = makeDefaultGraph(baseDSG) ;
+ PrefixMapping pmap = g.getPrefixMapping() ;
+ assertNotNull(pmap) ;
+ }
+
+ @Test public void graphDSG_prefixes_4()
+ {
+ // All graphs exist.
+ Graph g = makeNamedGraph(baseDSG, gnNotSuchGraph) ;
+ PrefixMapping pmap = g.getPrefixMapping() ;
+ assertNotNull(pmap) ;
+ }
+
+ // add/delete
}
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TS_ViewGraphs.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TS_ViewGraphs.java?rev=1371998&r1=1371997&r2=1371998&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TS_ViewGraphs.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TS_ViewGraphs.java Sat Aug 11 18:58:58 2012
@@ -26,7 +26,7 @@ import org.junit.runners.Suite.SuiteClas
@RunWith(Suite.class)
@SuiteClasses( {
TestDatasetGraphsRegular.class ,
- TestGraphOverDataset.class ,
+ TestGraphOverDatasetMem.class ,
TestDSGViewGraphs.class ,
TestDatasetPrefixes.class ,
TestGraphOverDatasetTDB.class
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetGraphsRegular.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetGraphsRegular.java?rev=1371998&r1=1371997&r2=1371998&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetGraphsRegular.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetGraphsRegular.java Sat Aug 11 18:58:58 2012
@@ -22,6 +22,7 @@ import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
+import com.hp.hpl.jena.tdb.migrate.GraphOps ;
/** This is teh etst suite run over a regular DatasetGraph to check compatibility */
public class TestDatasetGraphsRegular extends AbstractTestGraphOverDataset
@@ -32,7 +33,9 @@ public class TestDatasetGraphsRegular ex
@Override
protected Graph makeNamedGraph(DatasetGraph dsg, Node gn)
{
- return dsg.getGraph(gn) ;
+ // TDB migraate code
+ return GraphOps.getGraph(dsg, gn) ;
+ //return dsg.getGraph(gn) ;
}
@Override
Copied: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDatasetMem.java (from r1371767, jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDataset.java)
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDatasetMem.java?p2=jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDatasetMem.java&p1=jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDataset.java&r1=1371767&r2=1371998&rev=1371998&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDataset.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestGraphOverDatasetMem.java Sat Aug 11 18:58:58 2012
@@ -26,13 +26,13 @@ import com.hp.hpl.jena.sparql.core.Datas
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
/** Test using a view-generating dataset */
-public class TestGraphOverDataset extends AbstractTestGraphOverDataset
+public class TestGraphOverDatasetMem extends AbstractTestGraphOverDataset
{
@Override
protected DatasetGraph createBaseDSG()
{
DatasetGraph dsg = DatasetGraphFactory.createMem() ;
- return new DSGViewGraphs(baseDSG, null) ;
+ return new DSGViewGraphs(dsg, null) ;
}
@Override