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/05/23 14:53:02 UTC
svn commit: r1485671 - in
/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store: TS_Store.java
TestDatasetTDB.java TestStoreConnectionsDirect.java
TestStoreConnectionsMapped.java
Author: andy
Date: Thu May 23 12:53:02 2013
New Revision: 1485671
URL: http://svn.apache.org/r1485671
Log:
Remove denbug output.
Modified:
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TS_Store.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsDirect.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsMapped.java
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TS_Store.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TS_Store.java?rev=1485671&r1=1485670&r2=1485671&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TS_Store.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TS_Store.java Thu May 23 12:53:02 2013
@@ -19,11 +19,13 @@
package com.hp.hpl.jena.tdb.store;
import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
import com.hp.hpl.jena.tdb.base.block.FileMode ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
+import com.hp.hpl.jena.tdb.sys.TestOps ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
@@ -45,10 +47,18 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
} )
public class TS_Store
{
+ static FileMode mode ;
+
+ @BeforeClass
+ public static void beforeClass()
+ {
+ mode = SystemTDB.fileMode() ;
+ }
+
@AfterClass
- public static void doubleCheck()
+ public static void afterClass()
{
- if (SystemTDB.fileMode() != FileMode.mapped)
- System.err.println("Wrong mode") ;
+ if ( ! SystemTDB.fileMode().equals(mode) )
+ TestOps.setFileMode(mode) ;
}
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java?rev=1485671&r1=1485670&r2=1485671&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java Thu May 23 12:53:02 2013
@@ -18,22 +18,16 @@
package com.hp.hpl.jena.tdb.store;
-import java.util.Iterator ;
-
-import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.junit.Test ;
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.NodeFactory ;
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.rdf.model.Property ;
import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.tdb.TDB ;
@@ -193,31 +187,13 @@ public class TestDatasetTDB extends Base
assertTrue(m.isIsomorphicWith(m2)) ;
}
- @Test public void special_debug()
- {
- Dataset ds = create() ;
-
- load1(ds.getDefaultModel()) ;
- load2(ds.getNamedModel("http://example/graph1")) ;
- load3(ds.getNamedModel("http://example/graph2")) ;
-
- DatasetGraph dsg = ds.asDatasetGraph() ;
- Node s = null ;
- Node p = NodeFactory.createURI(baseNS+"p1") ;
- Node o = SSE.parseNode("'x1'") ;
-
- Iterator<Quad> iter = dsg.find(Node.ANY, s,p,o) ;
- Iter.print(iter) ;
- }
-
-
@Test public void special4()
{
Dataset ds = create() ;
load1(ds.getDefaultModel()) ;
load2(ds.getNamedModel("http://example/graph1")) ;
- load3(ds.getNamedModel("http://example/graph2")) ;
+ load3(ds.getNamedModel("http://example/graph2")) ;
Model m = ModelFactory.createDefaultModel() ;
load2(m) ;
@@ -232,27 +208,20 @@ public class TestDatasetTDB extends Base
// dataset
qExec = QueryExecutionFactory.create(q, ds) ;
- qExec.getContext().set(TDB.symUnionDefaultGraph, true) ;
+ qExec.getContext().set(TDB.symUnionDefaultGraph, true) ;
+
long c_ds = qExec.execSelect().next().getLiteral("c").getLong() ;
qExec.close() ;
+// String qs2 = "PREFIX : <"+baseNS+"> SELECT * WHERE { ?x (:p1|:p2) 'x1' }" ;
+// Query q2 = QueryFactory.create(qs2) ;
+// qExec = QueryExecutionFactory.create(q2, ds) ;
+// qExec.getContext().set(TDB.symUnionDefaultGraph, true) ;
+// ResultSetFormatter.out(qExec.execSelect()) ;
+//
+// qExec = QueryExecutionFactory.create(q2, m) ;
+// ResultSetFormatter.out(qExec.execSelect()) ;
// --------
- SSE.write(m) ;
- System.out.println() ;
- SSE.write(ds) ;
-
- String qs2 = "PREFIX : <"+baseNS+"> SELECT * WHERE { ?x (:p1|:p2) 'x1' }" ;
- Query q2 = QueryFactory.create(qs2) ;
- System.out.println("Dataset") ;
- qExec = QueryExecutionFactory.create(q2, ds) ;
- qExec.getContext().set(TDB.symUnionDefaultGraph, true) ;
- ResultSetFormatter.out(qExec.execSelect()) ;
-
- System.out.println("Model") ;
- qExec = QueryExecutionFactory.create(q2, m) ;
- ResultSetFormatter.out(qExec.execSelect()) ;
- // --------
-
assertEquals(c_m, c_ds) ;
qExec.close() ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsDirect.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsDirect.java?rev=1485671&r1=1485670&r2=1485671&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsDirect.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsDirect.java Thu May 23 12:53:02 2013
@@ -27,9 +27,19 @@ import com.hp.hpl.jena.tdb.sys.TestOps ;
public class TestStoreConnectionsDirect extends AbstractStoreConnections
{
- static FileMode mode = SystemTDB.fileMode() ;
- @BeforeClass public static void beforeClassFileMode() { TestOps.setFileMode(FileMode.direct) ; }
- @AfterClass public static void afterClassFileMode() { TestOps.setFileMode(mode) ; }
+ static FileMode mode ;
+ @BeforeClass
+ public static void beforeClassFileMode()
+ {
+ mode = SystemTDB.fileMode() ;
+ TestOps.setFileMode(FileMode.direct) ;
+ }
+
+ @AfterClass
+ public static void afterClassFileMode()
+ {
+ TestOps.setFileMode(mode) ;
+ }
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsMapped.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsMapped.java?rev=1485671&r1=1485670&r2=1485671&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsMapped.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestStoreConnectionsMapped.java Thu May 23 12:53:02 2013
@@ -27,9 +27,19 @@ import com.hp.hpl.jena.tdb.sys.TestOps ;
public class TestStoreConnectionsMapped extends AbstractStoreConnections
{
- static FileMode mode = SystemTDB.fileMode() ;
- @BeforeClass public static void beforeClassFileMode() { TestOps.setFileMode(FileMode.mapped) ; }
- @AfterClass public static void afterClassFileMode() { TestOps.setFileMode(mode) ; }
+ static FileMode mode ;
+ @BeforeClass
+ public static void beforeClassFileMode()
+ {
+ mode = SystemTDB.fileMode() ;
+ TestOps.setFileMode(FileMode.mapped) ;
+ }
+
+ @AfterClass
+ public static void afterClassFileMode()
+ {
+ TestOps.setFileMode(mode) ;
+ }
}