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/22 17:03:50 UTC
svn commit: r1376087 - in /jena/trunk:
jena-arq/src/main/java/com/hp/hpl/jena/query/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/
jena-arq/src/test/java/com/hp/hpl/jena/sparql/ jena-arq/src/te...
Author: andy
Date: Wed Aug 22 15:03:48 2012
New Revision: 1376087
URL: http://svn.apache.org/viewvc?rev=1376087&view=rev
Log:
Migrate code up from TDB to ARQ.
Reorganise the test suite to reflect this and to make it more systematic in its naming.
Make the POM call the root test class (until autodiscovery of Junit3-stype scripted tests can be done).
Added:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java
- copied, changed from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphReadOnly.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java
- copied, changed from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphTrackActive.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java
- copied, changed from r1373614, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphWithLock.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java
- copied, changed from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DynamicDatasets.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java
- copied, changed from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java
- copied, changed from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphReadOnly.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java
- copied, changed from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphUnionRead.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_DAWG.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_DAWG.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_General.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java
- copied, changed from r1372890, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDataset.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TS_Binding.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java
- copied, changed from r1372890, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/TestGraphUnionRead.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestEsc.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestEsc.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS3_Update.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS3_Syntax.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Syntax.java
jena/trunk/jena-tdb/bin/tdbjournal (with props)
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDatasetTDB.java
Removed:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_DAWG.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_General.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestEsc.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Syntax.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphReadOnly.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphTrackActive.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphWithLock.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DynamicDatasets.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphReadOnly.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphUnionRead.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/TS_Migrate.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/TestGraphUnionRead.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDataset.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMem.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasetGraphMem.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TS_Lang.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TS_Store.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java Wed Aug 22 15:03:48 2012
@@ -44,7 +44,7 @@ public class DatasetFactory
/** Create an in-memory, modifiable Dataset.
* New graphs must be explicitly added using .addGraph.
*/
- public static Dataset createMemFixed() { return create(DatasetGraphFactory.createMem()) ; }
+ public static Dataset createMemFixed() { return create(DatasetGraphFactory.createMemFixed()) ; }
/** Create an in-memory, modifable Dataset
* @deprecated Use createMem
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java (from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphReadOnly.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphReadOnly.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphReadOnly.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java Wed Aug 22 15:03:48 2012
@@ -16,16 +16,14 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.core;
import java.util.HashMap ;
import java.util.Map ;
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.DatasetGraphWrapper ;
-import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.graph.GraphReadOnly ;
/** Read-only view of a DatasetGraph. Assumes the dataset underneath isn't changing.
*/
@@ -60,6 +58,7 @@ public class DatasetGraphReadOnly extend
Graph g = super.getGraph(graphNode) ;
if ( g == null ) return null ;
+ g = new GraphReadOnly(g) ;
namedGraphs.put(graphNode, g) ;
return g ;
}
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java (from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphTrackActive.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphTrackActive.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphTrackActive.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphTrackActive.java Wed Aug 22 15:03:48 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.core;
import java.util.Iterator ;
@@ -24,16 +24,10 @@ import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.shared.Lock ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
import com.hp.hpl.jena.sparql.util.Context ;
public abstract class DatasetGraphTrackActive implements DatasetGraph, Transactional
{
- // Layer - make this extend DatasetGraphWrapper - i.e. a switching wrapper.
- // Can use switcher for switching between locations?
-
protected abstract DatasetGraph get() ;
private boolean inTransaction = false ;
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java (from r1373614, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphWithLock.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphWithLock.java&r1=1373614&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DatasetGraphWithLock.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWithLock.java Wed Aug 22 15:03:48 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.core;
import org.openjena.atlas.lib.Lib ;
import org.openjena.atlas.lib.Sync ;
@@ -24,9 +24,8 @@ import org.openjena.atlas.lib.Sync ;
import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.shared.JenaException ;
import com.hp.hpl.jena.sparql.SystemARQ ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-/** A DatasetGraph that uses the dataset lock to give wek transactional behaviour.
+/** A DatasetGraph that uses the dataset lock to give weak transactional behaviour.
* Only supports multiple-reader OR single-writer, and no transction abort.
* Transactions are not durable.
*/
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java (from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DynamicDatasets.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DynamicDatasets.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/DynamicDatasets.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DynamicDatasets.java Wed Aug 22 15:03:48 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.core;
import java.util.Collection ;
import java.util.Set ;
@@ -25,10 +25,8 @@ import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
-import com.hp.hpl.jena.sparql.core.DatasetDescription ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphMap ;
-import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.graph.GraphOps ;
+import com.hp.hpl.jena.sparql.graph.GraphUnionRead ;
import com.hp.hpl.jena.sparql.util.NodeUtils ;
public class DynamicDatasets
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java (from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphOps.java Wed Aug 22 15:03:48 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.graph;
import java.util.List ;
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java (from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphReadOnly.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphReadOnly.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphReadOnly.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphReadOnly.java Wed Aug 22 15:03:48 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.graph;
import com.hp.hpl.jena.graph.BulkUpdateHandler ;
import com.hp.hpl.jena.graph.Graph ;
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java (from r1372890, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphUnionRead.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphUnionRead.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphUnionRead.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java Wed Aug 22 15:03:48 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.graph;
import java.util.Collection ;
@@ -32,11 +32,10 @@ import com.hp.hpl.jena.graph.query.Simpl
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.graph.GraphBase2 ;
import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
import com.hp.hpl.jena.util.iterator.WrappedIterator ;
-/** Immutable graph that is the view of a a union of graphs in a TDB store. */
+/** Immutable graph that is the view of a union of graphs in a dataset. */
public class GraphUnionRead extends GraphBase2
{
// This exists for the property path evaulator to have a graph to call.
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java Wed Aug 22 15:03:48 2012
@@ -26,27 +26,13 @@ import org.openjena.riot.ErrorHandlerFac
import org.openjena.riot.TC_Riot ;
import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.query.TS_ParamString ;
-import com.hp.hpl.jena.sparql.algebra.TC_Algebra ;
-import com.hp.hpl.jena.sparql.api.TS_API ;
-import com.hp.hpl.jena.sparql.engine.TS_Engine ;
-import com.hp.hpl.jena.sparql.engine.binding.TestBindingStreams ;
import com.hp.hpl.jena.sparql.engine.main.QueryEngineMain ;
import com.hp.hpl.jena.sparql.engine.ref.QueryEngineRef ;
import com.hp.hpl.jena.sparql.expr.E_Function ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
-import com.hp.hpl.jena.sparql.expr.TS_Expr ;
-import com.hp.hpl.jena.sparql.graph.TS_Graph ;
import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
-import com.hp.hpl.jena.sparql.lang.TS_Lang ;
-import com.hp.hpl.jena.sparql.modify.TS_Update ;
-import com.hp.hpl.jena.sparql.path.TS_Path ;
-import com.hp.hpl.jena.sparql.resultset.TS_ResultSet ;
-import com.hp.hpl.jena.sparql.solver.TS_Solver ;
-import com.hp.hpl.jena.sparql.syntax.TS_SSE ;
-import com.hp.hpl.jena.sparql.syntax.TS_Serialization ;
-import com.hp.hpl.jena.sparql.syntax.TS_Syntax ;
-import com.hp.hpl.jena.sparql.util.TS_Util ;
+import com.hp.hpl.jena.sparql.modify.TS3_Update ;
+import com.hp.hpl.jena.sparql.syntax.TS3_Syntax ;
/**
* All the ARQ tests
@@ -62,7 +48,7 @@ public class ARQTestSuite extends TestSu
static public TestSuite suite()
{
- // See also TS_General.
+ // See also TC_General.
TestSuite ts = new ARQTestSuite() ;
@@ -72,6 +58,9 @@ public class ARQTestSuite extends TestSu
// ARQ dependencies
ts.addTest(new JUnit4TestAdapter(TC_Atlas.class)) ;
ts.addTest(new JUnit4TestAdapter(TC_Riot.class)) ;
+
+ // Main ARQ internal test suite.
+ ts.addTest(new JUnit4TestAdapter(TC_General.class)) ;
// Fiddle around with the config if necessary
if ( false )
@@ -80,57 +69,30 @@ public class ARQTestSuite extends TestSu
QueryEngineRef.register() ;
}
+ // JUnit3 style.
+ ts.addTest(TS3_Syntax.suite()) ;
+ ts.addTest(TS3_Update.suite()) ;
+ ts.addTest(TS3_Syntax.suite()) ;
+
// Tests should be silent.
NodeValue.VerboseWarnings = false ;
E_Function.WarnOnUnknownFunction = false ;
// Lower level
- ts.addTest(TS_General.suite() );
- ts.addTest(TS_Expr.suite()) ;
- ts.addTest(TS_Util.suite()) ;
- ts.addTest(new JUnit4TestAdapter(TS_Lang.class)) ;
- ts.addTest(new JUnit4TestAdapter(TS_ResultSet.class)) ;
-
- // Syntax
- ts.addTest(TS_Syntax.suite()) ;
- // Serialization
- ts.addTest(TS_Serialization.suite()) ;
- // Binding I/O
- ts.addTest(TestBindingStreams.suite()) ;
-
- // Algebra
- ts.addTest(new JUnit4TestAdapter(TC_Algebra.class)) ;
-
- // Property paths
- ts.addTest(new JUnit4TestAdapter(TS_Path.class)) ;
-
// Scripted tests for SPARQL
ts.addTest(ScriptTestSuiteFactory.make(testDirARQ+"/manifest-arq.ttl")) ;
-
+
+ // SPARQL 1.1 test suite (when finalized)
+ // ts.addTest(TC_SPARQL11.suite()) ;
+
// Scripted tests for ARQ features outside SPARQL syntax
// Currently at end of manifest-arq.ttl
// ts.addTest(QueryTestSuiteFactory.make(testDirARQ+"/manifest-ext.ttl")) ;
// The DAWG official tests (some may be duplicated in ARQ test suite
// but this should be the untouched versions)
- ts.addTest(TS_DAWG.suite()) ;
-
- // API
- ts.addTest(new JUnit4TestAdapter(TS_API.class)) ;
-
- // SPARQL/Update
- ts.addTest(TS_Update.suite()) ;
-
- ts.addTest(TS_SSE.suite()) ;
-
- ts.addTest(new JUnit4TestAdapter(TS_Graph.class)) ;
- ts.addTest(new JUnit4TestAdapter(TS_Solver.class)) ;
- ts.addTest(new JUnit4TestAdapter(TS_Engine.class)) ;
-
- // API
- ts.addTest(new JUnit4TestAdapter(TS_ParamString.class)) ;
-
+ ts.addTest(TC_DAWG.suite()) ;
return ts ;
}
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_DAWG.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_DAWG.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_DAWG.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_DAWG.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_DAWG.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_DAWG.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_DAWG.java Wed Aug 22 15:03:48 2012
@@ -32,7 +32,7 @@ import com.hp.hpl.jena.sparql.junit.Scri
* but we keep this set here as a reference.
*
* */
-public class TS_DAWG extends TestSuite
+public class TC_DAWG extends TestSuite
{
static final String testSetNameDAWG = "DAWG - Misc" ;
@@ -65,11 +65,11 @@ public class TS_DAWG extends TestSuite
E_Function.WarnOnUnknownFunction = false ;
}
- static public TestSuite suite() { return new TS_DAWG(); }
+ static public TestSuite suite() { return new TC_DAWG(); }
- public TS_DAWG()
+ public TC_DAWG()
{
- super(TS_DAWG.class.getName()) ;
+ super(TC_DAWG.class.getName()) ;
// One test, dawg-optional-filter-005-simplified or dawg-optional-filter-005-not-simplified
// must fail because it's the same query and data with different interpretations of the
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_General.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_General.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TS_General.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java Wed Aug 22 15:03:48 2012
@@ -20,29 +20,50 @@ package com.hp.hpl.jena.sparql;
import junit.framework.TestSuite ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
-import com.hp.hpl.jena.sparql.core.TestContext ;
-import com.hp.hpl.jena.sparql.core.TestDatasetGraphMem ;
-import com.hp.hpl.jena.sparql.core.TestDatasetGraphMemTriplesQuads ;
-import com.hp.hpl.jena.sparql.core.TestDatasetMem ;
-import com.hp.hpl.jena.sparql.core.TestEsc ;
-import com.hp.hpl.jena.sparql.syntax.TestSerialization ;
+import com.hp.hpl.jena.query.TS_ParamString ;
+import com.hp.hpl.jena.sparql.algebra.TS_Algebra ;
+import com.hp.hpl.jena.sparql.api.TS_API ;
+import com.hp.hpl.jena.sparql.core.TS_Core ;
+import com.hp.hpl.jena.sparql.engine.TS_Engine ;
+import com.hp.hpl.jena.sparql.engine.binding.TS_Binding ;
+import com.hp.hpl.jena.sparql.expr.TS_Expr ;
+import com.hp.hpl.jena.sparql.graph.TS_Graph ;
+import com.hp.hpl.jena.sparql.lang.TS_Lang ;
+import com.hp.hpl.jena.sparql.path.TS_Path ;
+import com.hp.hpl.jena.sparql.resultset.TS_ResultSet ;
+import com.hp.hpl.jena.sparql.solver.TS_Solver ;
+import com.hp.hpl.jena.sparql.syntax.TS_SSE ;
+import com.hp.hpl.jena.sparql.syntax.TS_Serialization ;
+import com.hp.hpl.jena.sparql.util.TS_Util ;
+
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+ TS_SSE.class ,
+ TS_Lang.class ,
+ TS_Graph.class,
+ TS_Util.class ,
+
+ TS_Expr.class ,
+ TS_ResultSet.class ,
+ TS_Binding.class ,
+ TS_ParamString.class ,
+ TS_Engine.class ,
+ TS_Solver.class ,
+ TS_Algebra.class ,
+ TS_ResultSet.class ,
+ TS_Serialization.class ,
+
+ TS_API.class ,
+ TS_Core.class ,
+ TS_Path.class ,
+ TS_ParamString.class
+})
-public class TS_General extends TestSuite
+public class TC_General extends TestSuite
{
- static final String testSetName = "General" ;
- static public TestSuite suite() { return new TS_General(); }
-
- public TS_General()
- {
- super(TS_General.class.getName()) ;
- // Need to check each is JUnit 4 compatible then remove all .suite and use @RunWith(Suite.class) @SuiteClasses
- addTest(TestEsc.suite()) ;
- addTest(TestSerialization.suite()) ;
- addTest(TestContext.suite()) ;
- addTest(TestDatasetMem.suite()) ;
- addTest(TestDatasetGraphMem.suite()) ;
- addTest(TestDatasetGraphMemTriplesQuads.suite()) ;
- }
}
Added: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java?rev=1376087&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java (added)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java Wed Aug 22 15:03:48 2012
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql;
+
+import junit.framework.TestSuite ;
+
+/** The test suite for all SPARQL (the second SPARQL working group) approved tests.
+ */
+public class TC_SPARQL11 extends TestSuite
+{
+
+ static public TestSuite suite() { return new TC_SPARQL11(); }
+
+ // SPARQL 1.1 test suite (when ready)
+}
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java Wed Aug 22 15:03:48 2012
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-public abstract class DatasetGraphTests
+public abstract class AbstractDatasetGraphTests
{
protected abstract DatasetGraph emptyDataset() ;
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDataset.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java Wed Aug 22 15:03:48 2012
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.rdf.model.Property ;
import com.hp.hpl.jena.rdf.model.Resource ;
-public abstract class TestDataset extends BaseTest
+public abstract class AbstractTestDataset extends BaseTest
{
// Assumes a dadatset which need explicit add graph
protected abstract Dataset createFixed() ;
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java (from r1372890, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDataset.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDataset.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDataset.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java Wed Aug 22 15:03:48 2012
@@ -16,43 +16,28 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.store;
+package com.hp.hpl.jena.sparql.core;
-import java.util.Iterator ;
-
-import org.apache.log4j.Level ;
-import org.apache.log4j.Logger ;
+import org.junit.After ;
+import org.junit.Before ;
import org.junit.Test ;
import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.sparql.core.DatasetDescription ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderLib ;
-import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.sparql.sse.builders.BuilderGraph ;
-import com.hp.hpl.jena.tdb.TDB ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
-import com.hp.hpl.jena.tdb.migrate.DynamicDatasets ;
-import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-public class TestDynamicDataset extends BaseTest
+public abstract class AbstractTestDynamicDataset extends BaseTest
{
- static {
- Logger.getLogger("com.hp.hpl.jena.tdb.info").setLevel(Level.WARN) ;
- SystemTDB.defaultOptimizer = ReorderLib.identity() ;
- }
+ protected abstract Dataset createDataset() ;
+ Dataset dataset ;
- static Dataset dataset = TDBFactory.createDataset() ;
- static { init() ; }
- private static void init()
+ @After public void after() {}
+
+ @Before public void before()
{
+ dataset = createDataset() ;
// Named graphs
for ( int i = 0 ; i < 5 ; i++ )
addGraph(dataset, i) ;
@@ -69,7 +54,8 @@ public class TestDynamicDataset extends
private static void addGraph(Dataset dataset, int i)
{
// Not a very interesting model
- Model m = dataset.getNamedModel("graph:"+i) ;
+ String x = "graph:"+i ;
+ Model m = dataset.getNamedModel(x) ;
Triple t1 = SSE.parseTriple("(<uri:x> <uri:p> "+i+")") ;
Triple t2 = SSE.parseTriple("(<uri:y> <uri:q> 'ABC')") ;
m.getGraph().add(t1) ;
@@ -131,212 +117,216 @@ public class TestDynamicDataset extends
"{ GRAPH ?g { }}",
2, dataset) ;
}
-
-
- // If context.isTrue(TDB.symUnionDefaultGraph)
-
- @Test public void dynamicAndUnion1() {
- try { TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ;
- testCount("SELECT * "+
- "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
- "{ GRAPH ?g { ?s <uri:q> ?o }}",
- 2, dataset) ;
- TDB.getContext().unset(TDB.symUnionDefaultGraph) ;
- } finally { TDB.getContext().unset(TDB.symUnionDefaultGraph) ; }
- }
-
- @Test public void dynamicAndUnion2() {
- try { TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ;
- testCount("SELECT * "+
- "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
- "{ ?s <uri:q> ?o }", // Same in each graph
- 1, dataset) ;
- } finally { TDB.getContext().unset(TDB.symUnionDefaultGraph) ; }
- }
-
- @Test public void dynamicAndUnion3() {
- try { TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ;
- testCount("SELECT * "+
- "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
- "{ ?s <uri:p> ?o }", // Different in each graph
- 2, dataset) ;
- } finally { TDB.getContext().unset(TDB.symUnionDefaultGraph) ; }
- }
-
- @Test public void dynamicAndUnion4() {
- try { TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ;
- testCount("SELECT * "+
- "FROM <graph:1> FROM <graph:2>"+
- "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
- "{ ?s <uri:p> ?o }",
- 2, dataset) ; // Only see <graph:1> and <graph:2> as default graph.
- } finally { TDB.getContext().unset(TDB.symUnionDefaultGraph) ; }
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion5() {
- testCount("SELECT * "+
- "FROM <graph:1>"+
- "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
- "{ GRAPH <urn:x-arq:DefaultGraph> { ?s <uri:p> ?o } }", // Different in each graph
- 1, dataset) ;
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion6() {
- try {
- TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ;
- testCount("SELECT * "+
- "FROM <graph:1>"+
- "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
- "{ GRAPH <urn:x-arq:DefaultGraph> { ?s <uri:p> ?o } }",
- 1, dataset) ;
- } finally { TDB.getContext().unset(TDB.symUnionDefaultGraph) ; }
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion7() {
- testCount("SELECT * "+
- "FROM <graph:1>"+
- "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
- "{ GRAPH <urn:x-arq:UnionGraph> { ?s <uri:p> ?o } }",
- 2, dataset) ;
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion8() {
- try {
- TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ;
- testCount("SELECT * "+
- "FROM <graph:1>"+
- "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
- "{ GRAPH <urn:x-arq:UnionGraph> { ?s <uri:p> ?o } }",
- 2, dataset) ;
- } finally { TDB.getContext().unset(TDB.symUnionDefaultGraph) ; }
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion10() {
- testCount("SELECT * "+
- "FROM <urn:x-arq:DefaultGraph>" +
- "{ ?s ?p ?o }",
- 3, dataset) ;
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion10a() {
- testCount("SELECT * "+
- "FROM <urn:x-arq:DefaultGraph>" +
- "{ GRAPH ?g { ?s ?p ?o } }",
- 0, dataset) ;
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion11() {
- testCount("SELECT * "+
- "FROM <urn:x-arq:UnionGraph>" +
- "{ ?s ?p ?o }",
- 6, dataset) ;
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion11a() {
- testCount("SELECT * "+
- "FROM <urn:x-arq:UnionGraph>" +
- "{ GRAPH ?g { ?s ?p ?o } }",
- 0, dataset) ;
- }
-
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion12() {
- testCount("SELECT * "+
- "FROM <urn:x-arq:DefaultGraph>" +
- "FROM <urn:x-arq:UnionGraph>" +
- "{ ?s ?p ?o }",
- 7, dataset) ;
- }
-
- //@Ignore("Test of dynamic datasets with named default or union graph")
- @Test public void dynamicAndUnion12a() {
- testCount("SELECT * "+
- "FROM <urn:x-arq:DefaultGraph>" +
- "FROM <urn:x-arq:UnionGraph>" +
- "{ GRAPH ?g { ?s ?p ?o } }",
- 0, dataset) ;
- }
- @Test public void dynamic99() {
- // Check we did not mess with the global context in getting previous tests to pass.
- testCount("SELECT * FROM NAMED <graph:3> { ?s ?p ?o }", 0, dataset) ;
- }
-
- // Tests of patterns and paths across graphs.
-
- private static String dataStr = StrUtils.strjoinNL(
- "(dataset" ,
- " (graph" ,
- " (triple <http://example/s> <http://example/p> 'dft')" ,
- " (triple <http://example/s> <http://example/p> <http://example/x>)" ,
- " (triple <http://example/x> <http://example/p> <http://example/o>)" ,
- " )" ,
- " (graph <http://example/g1>",
- " (triple <http://example/s> <http://example/p> 'g1')",
- " (triple <http://example/s> <http://example/p1> <http://example/x>)",
- " (triple <http://example/x> <http://example/p2> <http://example/o>)",
- " )",
- " (graph <http://example/g2>",
- " (triple <http://example/s> <http://example/p> 'g2')",
- " (triple <http://example/x> <http://example/p1> <http://example/z>)",
- " (triple <http://example/x> <http://example/p2> <http://example/o>)",
- " (triple <http://example/x> <http://example/p2> <http://example/o2>)",
- " )",
- " (graph <http://example/g3>",
- " (triple <http://example/s> <http://example/p> 'g3')",
- " (triple <http://example/s> <http://example/p1> <http://example/y>)",
- " ))") ;
- private static Dataset dataset2 = TDBFactory.createDataset() ;
- static {
- Item item = SSE.parse(dataStr) ;
- DatasetGraph dsg = BuilderGraph.buildDataset(item) ;
-
- Iterator<Quad> iter = dsg.find() ;
- for ( ; iter.hasNext(); )
- dataset2.asDatasetGraph().add(iter.next()) ;
- }
- private static Node gn1 = SSE.parseNode("<http://example/g1>") ;
- private static Node gn2 = SSE.parseNode("<http://example/g2>") ;
- private static Node gn3 = SSE.parseNode("<http://example/g3>") ;
- private static Node gn9 = SSE.parseNode("<http://example/g9>") ;
-
- private static final String prefix = "PREFIX : <http://example/> " ;
-
- // g1+g2 { ?s :p1 ?x . ?x :p2 ?o } ==> 1
- // g1+g2 { ?s :p1* ?o } ==> 1
-
- @Test public void pattern_01()
- {
- testCount(prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1 ?x . ?x :p2 ?o }", 2, dataset2) ;
- }
-
- @Test public void pattern_02()
- {
- String qs = prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1+ ?x }" ;
+//
+//
+// // If context.isTrue(TDB.symUnionDefaultGraph)
+//
+// protected abstract void startDynamicAndUnionTest() ; // TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+// protected abstract void finishDynamicAndUnionTest() ; // TDB.getContext().unset(TDB.symUnionDefaultGraph) ;
+//
+// @Test public void dynamicAndUnion1() {
+// try {
+// startDynamicAndUnionTest() ;
+// testCount("SELECT * "+
+// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
+// "{ GRAPH ?g { ?s <uri:q> ?o }}",
+// 2, dataset) ;
+// } finally { finishDynamicAndUnionTest() ; }
+// }
+//
+// @Test public void dynamicAndUnion2() {
+// try { startDynamicAndUnionTest() ;
+// testCount("SELECT * "+
+// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
+// "{ ?s <uri:q> ?o }", // Same in each graph
+// 1, dataset) ;
+// } finally { finishDynamicAndUnionTest() ; }
+// }
+//
+// @Test public void dynamicAndUnion3() {
+// try { startDynamicAndUnionTest() ;
+// testCount("SELECT * "+
+// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
+// "{ ?s <uri:p> ?o }", // Different in each graph
+// 2, dataset) ;
+// } finally { finishDynamicAndUnionTest() ; }
+// }
+//
+// @Test public void dynamicAndUnion4() {
+// try { startDynamicAndUnionTest() ;
+// testCount("SELECT * "+
+// "FROM <graph:1> FROM <graph:2>"+
+// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
+// "{ ?s <uri:p> ?o }",
+// 2, dataset) ; // Only see <graph:1> and <graph:2> as default graph.
+// } finally { finishDynamicAndUnionTest() ; }
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion5() {
+// testCount("SELECT * "+
+// "FROM <graph:1>"+
+// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
+// "{ GRAPH <urn:x-arq:DefaultGraph> { ?s <uri:p> ?o } }", // Different in each graph
+// 1, dataset) ;
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion6() {
+// try {
+// startDynamicAndUnionTest() ;
+// testCount("SELECT * "+
+// "FROM <graph:1>"+
+// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
+// "{ GRAPH <urn:x-arq:DefaultGraph> { ?s <uri:p> ?o } }",
+// 1, dataset) ;
+// } finally { finishDynamicAndUnionTest() ; }
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion7() {
+// testCount("SELECT * "+
+// "FROM <graph:1>"+
+// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
+// "{ GRAPH <urn:x-arq:UnionGraph> { ?s <uri:p> ?o } }",
+// 2, dataset) ;
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion8() {
+// try {
+// startDynamicAndUnionTest() ;
+// testCount("SELECT * "+
+// "FROM <graph:1>"+
+// "FROM NAMED <graph:3> FROM NAMED <graph:4> "+
+// "{ GRAPH <urn:x-arq:UnionGraph> { ?s <uri:p> ?o } }",
+// 2, dataset) ;
+// } finally { finishDynamicAndUnionTest() ; }
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion10() {
+// testCount("SELECT * "+
+// "FROM <urn:x-arq:DefaultGraph>" +
+// "{ ?s ?p ?o }",
+// 3, dataset) ;
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion10a() {
+// testCount("SELECT * "+
+// "FROM <urn:x-arq:DefaultGraph>" +
+// "{ GRAPH ?g { ?s ?p ?o } }",
+// 0, dataset) ;
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion11() {
+// testCount("SELECT * "+
+// "FROM <urn:x-arq:UnionGraph>" +
+// "{ ?s ?p ?o }",
+// 6, dataset) ;
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion11a() {
+// testCount("SELECT * "+
+// "FROM <urn:x-arq:UnionGraph>" +
+// "{ GRAPH ?g { ?s ?p ?o } }",
+// 0, dataset) ;
+// }
+//
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion12() {
+// testCount("SELECT * "+
+// "FROM <urn:x-arq:DefaultGraph>" +
+// "FROM <urn:x-arq:UnionGraph>" +
+// "{ ?s ?p ?o }",
+// 7, dataset) ;
+// }
+//
+// //@Ignore("Test of dynamic datasets with named default or union graph")
+// @Test public void dynamicAndUnion12a() {
+// testCount("SELECT * "+
+// "FROM <urn:x-arq:DefaultGraph>" +
+// "FROM <urn:x-arq:UnionGraph>" +
+// "{ GRAPH ?g { ?s ?p ?o } }",
+// 0, dataset) ;
+// }
+// @Test public void dynamic99() {
+// // Check we did not mess with the global context in getting previous tests to pass.
+// testCount("SELECT * FROM NAMED <graph:3> { ?s ?p ?o }", 0, dataset) ;
+// }
+//
+// // Tests of patterns and paths across graphs.
+//
+// private static String dataStr = StrUtils.strjoinNL(
+// "(dataset" ,
+// " (graph" ,
+// " (triple <http://example/s> <http://example/p> 'dft')" ,
+// " (triple <http://example/s> <http://example/p> <http://example/x>)" ,
+// " (triple <http://example/x> <http://example/p> <http://example/o>)" ,
+// " )" ,
+// " (graph <http://example/g1>",
+// " (triple <http://example/s> <http://example/p> 'g1')",
+// " (triple <http://example/s> <http://example/p1> <http://example/x>)",
+// " (triple <http://example/x> <http://example/p2> <http://example/o>)",
+// " )",
+// " (graph <http://example/g2>",
+// " (triple <http://example/s> <http://example/p> 'g2')",
+// " (triple <http://example/x> <http://example/p1> <http://example/z>)",
+// " (triple <http://example/x> <http://example/p2> <http://example/o>)",
+// " (triple <http://example/x> <http://example/p2> <http://example/o2>)",
+// " )",
+// " (graph <http://example/g3>",
+// " (triple <http://example/s> <http://example/p> 'g3')",
+// " (triple <http://example/s> <http://example/p1> <http://example/y>)",
+// " ))") ;
+//
+// private static Dataset dataset2 = TDBFactory.createDataset() ;
+// static {
+// Item item = SSE.parse(dataStr) ;
+// DatasetGraph dsg = BuilderGraph.buildDataset(item) ;
+//
+// Iterator<Quad> iter = dsg.find() ;
+// for ( ; iter.hasNext(); )
+// dataset2.asDatasetGraph().add(iter.next()) ;
+// }
+// private static Node gn1 = SSE.parseNode("<http://example/g1>") ;
+// private static Node gn2 = SSE.parseNode("<http://example/g2>") ;
+// private static Node gn3 = SSE.parseNode("<http://example/g3>") ;
+// private static Node gn9 = SSE.parseNode("<http://example/g9>") ;
+//
+// private static final String prefix = "PREFIX : <http://example/> " ;
+//
+// // g1+g2 { ?s :p1 ?x . ?x :p2 ?o } ==> 1
+// // g1+g2 { ?s :p1* ?o } ==> 1
+//
+// @Test public void pattern_01()
+// {
+// testCount(prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1 ?x . ?x :p2 ?o }", 2, dataset2) ;
+// }
+//
+// @Test public void pattern_02()
+// {
+// String qs = prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1+ ?x }" ;
+//// Query query = QueryFactory.create(qs) ;
+//// Dataset ds = DatasetFactory.create(DynamicDatasets.dynamicDataset(query, dataset2.asDatasetGraph())) ;
+//// QueryExecution qExec = QueryExecutionFactory.create(query, ds) ;
+//// ResultSetFormatter.out(qExec.execSelect()) ;
+// testCount(qs, 3, dataset2) ;
+// }
+//
+// @Test public void pattern_03()
+// {
+// // Do it externally to the TDB query engine.
+// String qs = prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1+ ?x }" ;
// Query query = QueryFactory.create(qs) ;
-// Dataset ds = DatasetFactory.create(DynamicDatasets.dynamicDataset(query, dataset2.asDatasetGraph())) ;
-// QueryExecution qExec = QueryExecutionFactory.create(query, ds) ;
-// ResultSetFormatter.out(qExec.execSelect()) ;
- testCount(qs, 3, dataset2) ;
- }
-
- @Test public void pattern_03()
- {
- // Do it externally to the TDB query engine.
- String qs = prefix + "SELECT * FROM :g1 FROM :g2 { ?s :p1+ ?x }" ;
- Query query = QueryFactory.create(qs) ;
- DatasetDescription dsDesc = DatasetDescription.create(query) ;
- Dataset ds = DynamicDatasets.dynamicDataset(dsDesc, dataset2, false) ;
- testCount(qs, 3, ds) ;
- }
+// DatasetDescription dsDesc = DatasetDescription.create(query) ;
+// Dataset ds = DynamicDatasets.dynamicDataset(dsDesc, dataset2, false) ;
+// testCount(qs, 3, ds) ;
+// }
private static void testCount(String queryString, int expected, Dataset ds)
Added: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java?rev=1376087&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java (added)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java Wed Aug 22 15:03:48 2012
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.core;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+ TestContext.class
+ , TestDatasetGraphMem.class
+ , TestDatasetGraphMemTriplesQuads.class
+ , TestDatasetGraphMem.class
+ // Not ready , TestDynamicDatasetMem.class
+})
+
+public class TS_Core
+{
+
+}
+
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMem.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMem.java Wed Aug 22 15:03:48 2012
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sparql.core;
import junit.framework.JUnit4TestAdapter ;
-public class TestDatasetGraphMem extends DatasetGraphTests
+public class TestDatasetGraphMem extends AbstractDatasetGraphTests
{
public static junit.framework.Test suite()
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java Wed Aug 22 15:03:48 2012
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sparql.core;
import junit.framework.JUnit4TestAdapter ;
-public class TestDatasetGraphMemTriplesQuads extends DatasetGraphTests
+public class TestDatasetGraphMemTriplesQuads extends AbstractDatasetGraphTests
{
public static junit.framework.Test suite()
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java Wed Aug 22 15:03:48 2012
@@ -23,7 +23,7 @@ import junit.framework.JUnit4TestAdapter
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
-public class TestDatasetMem extends TestDataset
+public class TestDatasetMem extends AbstractTestDataset
{
public static junit.framework.Test suite()
{
Added: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java?rev=1376087&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java (added)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java Wed Aug 22 15:03:48 2012
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.core;
+
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.query.DatasetFactory ;
+
+public class TestDynamicDatasetMem extends AbstractTestDynamicDataset
+{
+
+ @Override
+ protected Dataset createDataset()
+ {
+ return DatasetFactory.createMem() ;
+ }
+
+}
+
Added: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TS_Binding.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TS_Binding.java?rev=1376087&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TS_Binding.java (added)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TS_Binding.java Wed Aug 22 15:03:48 2012
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.engine.binding;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+ TestBindingStreams.class
+})
+public class TS_Binding
+{
+
+}
+
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TS_Graph.java Wed Aug 22 15:03:48 2012
@@ -26,6 +26,8 @@ import org.junit.runners.Suite ;
TestGraphsMem.class
, TestDatasetGraphMem.class
, TestGraphsDataBag.class
+ , TestGraphUnionRead.class
+ , TestReifier2.class
})
public class TS_Graph
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasetGraphMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasetGraphMem.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasetGraphMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasetGraphMem.java Wed Aug 22 15:03:48 2012
@@ -20,10 +20,10 @@ package com.hp.hpl.jena.sparql.graph;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphTests ;
+import com.hp.hpl.jena.sparql.core.AbstractDatasetGraphTests ;
// Quad tests
-public class TestDatasetGraphMem extends DatasetGraphTests
+public class TestDatasetGraphMem extends AbstractDatasetGraphTests
{
@Override
protected DatasetGraph emptyDataset() { return DatasetGraphFactory.createMem() ; }
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java (from r1372890, jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/TestGraphUnionRead.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java&p1=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/TestGraphUnionRead.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/TestGraphUnionRead.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java Wed Aug 22 15:03:48 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.migrate;
+package com.hp.hpl.jena.sparql.graph;
import java.util.Arrays ;
import java.util.List ;
@@ -29,6 +29,7 @@ import org.openjena.atlas.lib.StrUtils ;
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.graph.GraphUnionRead ;
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.sse.builders.BuilderGraph ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TS_Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TS_Lang.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TS_Lang.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TS_Lang.java Wed Aug 22 15:03:48 2012
@@ -23,6 +23,7 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
+ TestEsc.class ,
TestVarScope.class
})
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestEsc.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestEsc.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestEsc.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestEsc.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestEsc.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestEsc.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestEsc.java Wed Aug 22 15:03:48 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.sparql.core;
+package com.hp.hpl.jena.sparql.lang;
import junit.framework.JUnit4TestAdapter ;
import junit.framework.TestCase ;
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS3_Update.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS3_Update.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS3_Update.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS3_Update.java Wed Aug 22 15:03:48 2012
@@ -22,13 +22,13 @@ package com.hp.hpl.jena.sparql.modify;
import junit.framework.TestSuite ;
-public class TS_Update extends TestSuite
+public class TS3_Update extends TestSuite
{
public static final String testDirUpdate = "testing/Update" ;
static public TestSuite suite()
{
- TestSuite ts = new TS_Update() ;
+ TestSuite ts = new TS3_Update() ;
// ts.addTestSuite(TestUpdateGraphMgtMem.class) ;
// ts.addTestSuite(TestUpdateGraphMem.class) ;
ts.addTest(TestUpdateGraphMgtMem.suite()) ;
@@ -36,8 +36,8 @@ public class TS_Update extends TestSuite
return ts ;
}
- private TS_Update()
+ private TS3_Update()
{
- super(TS_Update.class.getName());
+ super(TS3_Update.class.getName());
}
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java Wed Aug 22 15:03:48 2012
@@ -51,7 +51,7 @@ public abstract class TestUpdateBase ext
g.getBulkUpdateHandler().add(data) ;
}
- protected static final String FileBase = TS_Update.testDirUpdate ;
+ protected static final String FileBase = TS3_Update.testDirUpdate ;
protected static void script(GraphStore gStore, String filename)
{
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS3_Syntax.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Syntax.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS3_Syntax.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS3_Syntax.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Syntax.java&r1=1372890&r2=1376087&rev=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Syntax.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS3_Syntax.java Wed Aug 22 15:03:48 2012
@@ -23,7 +23,7 @@ import junit.framework.TestSuite ;
import com.hp.hpl.jena.sparql.ARQTestSuite ;
import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
-public class TS_Syntax extends TestSuite
+public class TS3_Syntax extends TestSuite
{
static public TestSuite suite()
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS_Serialization.java Wed Aug 22 15:03:48 2012
@@ -19,12 +19,18 @@
package com.hp.hpl.jena.sparql.syntax;
import junit.framework.TestSuite ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
import com.hp.hpl.jena.sparql.ARQTestSuite ;
import com.hp.hpl.jena.sparql.expr.E_Function;
import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
-
+@RunWith(Suite.class)
+@SuiteClasses( {
+ TestSerialization.class
+})
public class TS_Serialization extends TestSuite
{
// See also TestSerialization for some low level tests (not scripted)
Added: jena/trunk/jena-tdb/bin/tdbjournal
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/bin/tdbjournal?rev=1376087&view=auto
==============================================================================
--- jena/trunk/jena-tdb/bin/tdbjournal (added)
+++ jena/trunk/jena-tdb/bin/tdbjournal Wed Aug 22 15:03:48 2012
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [ "$TDBROOT" = "" ]
+ then
+ echo "TDBROOT is not set" 1>&2
+ exit 1
+fi
+
+INIT="$TDBROOT/bin/tdb_init"
+
+if [ ! -r "$INIT" ]
+then
+ echo "Script $INIT (\$TDBROOT/bin/tdb_init) does not exist or is not readable"
+ exit 1
+fi
+
+. "$INIT"
+#echo "$TDB_CP"
+exec java $JVM_ARGS $SOCKS -cp "$TDB_CP" "tdb.$TDB_CMD" $TDB_SPEC "$@"
Propchange: jena/trunk/jena-tdb/bin/tdbjournal
------------------------------------------------------------------------------
svn:executable = *
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java Wed Aug 22 15:03:48 2012
@@ -26,10 +26,7 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.sparql.algebra.Algebra ;
import com.hp.hpl.jena.sparql.algebra.Op ;
-import com.hp.hpl.jena.sparql.core.DatasetDescription ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.core.Substitute ;
+import com.hp.hpl.jena.sparql.core.* ;
import com.hp.hpl.jena.sparql.engine.Plan ;
import com.hp.hpl.jena.sparql.engine.QueryEngineFactory ;
import com.hp.hpl.jena.sparql.engine.QueryEngineRegistry ;
@@ -42,7 +39,6 @@ import com.hp.hpl.jena.sparql.util.NodeU
import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.migrate.A2 ;
-import com.hp.hpl.jena.tdb.migrate.DynamicDatasets ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.GraphNamedTDB ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java Wed Aug 22 15:03:48 2012
@@ -20,10 +20,10 @@ package com.hp.hpl.jena.tdb.transaction;
import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.sparql.JenaTransactionException ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphTrackActive ;
import com.hp.hpl.jena.tdb.StoreConnection ;
import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.migrate.DatasetGraphTrackActive ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
/** Transactional DatasetGraph that allows one active transaction.
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java Wed Aug 22 15:03:48 2012
@@ -34,7 +34,6 @@ import com.hp.hpl.jena.tdb.base.objectfi
import com.hp.hpl.jena.tdb.graph.TS_Graph ;
import com.hp.hpl.jena.tdb.index.TS_Index ;
import com.hp.hpl.jena.tdb.lib.TS_LibTDB ;
-import com.hp.hpl.jena.tdb.migrate.TS_Migrate ;
import com.hp.hpl.jena.tdb.nodetable.TS_NodeTable ;
import com.hp.hpl.jena.tdb.solver.TS_SolverTDB ;
import com.hp.hpl.jena.tdb.store.TS_Store ;
@@ -60,7 +59,6 @@ import com.hp.hpl.jena.tdb.transaction.T
, TS_Factory.class
, TS_TDBAssembler.class
, TS_Jena.class
- , TS_Migrate.class
, TS_Transaction.class
, TS_ObjectFile.class
, TS_TDBLoader3.class
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphTDB.java?rev=1376087&r1=1376086&r2=1376087&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphTDB.java Wed Aug 22 15:03:48 2012
@@ -20,12 +20,12 @@ package com.hp.hpl.jena.tdb.graph;
import org.junit.Test ;
+import com.hp.hpl.jena.sparql.core.AbstractDatasetGraphTests ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphTests ;
import com.hp.hpl.jena.tdb.TDBFactory ;
// Quad tests
-public class TestDatasetGraphTDB extends DatasetGraphTests
+public class TestDatasetGraphTDB extends AbstractDatasetGraphTests
{
@Override
protected DatasetGraph emptyDataset() { return TDBFactory.createDatasetGraph() ; }
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=1376087&r1=1376086&r2=1376087&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 Wed Aug 22 15:03:48 2012
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
, TestSuiteGraphTDB.class
, Test_SPARQL_TDB.class
, TestConcurrentAccess.class
- , TestDynamicDataset.class
+ , TestDynamicDatasetTDB.class
, TestLoader.class
, TestStoreConnectionsDirect.class
, TestStoreConnectionsMapped.class
Added: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDatasetTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDatasetTDB.java?rev=1376087&view=auto
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDatasetTDB.java (added)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDynamicDatasetTDB.java Wed Aug 22 15:03:48 2012
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.tdb.store;
+
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.sparql.core.AbstractTestDynamicDataset ;
+import com.hp.hpl.jena.tdb.TDB ;
+import com.hp.hpl.jena.tdb.TDBFactory ;
+
+public class TestDynamicDatasetTDB extends AbstractTestDynamicDataset
+{
+
+ @Override
+ protected Dataset createDataset()
+ {
+ return TDBFactory.createDataset() ;
+ }
+
+ protected void startDynamicAndUnionTest() { TDB.getContext().setTrue(TDB.symUnionDefaultGraph) ; }
+ protected void finishDynamicAndUnionTest() { TDB.getContext().unset(TDB.symUnionDefaultGraph) ; }
+
+}
+