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 2025/05/29 12:50:11 UTC
(jena) 01/03: Rename test classes TDB -> TDB1
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 89be5e21869ab714a5c463ef3554d4a2217edcc1
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu May 22 22:00:24 2025 +0100
Rename test classes TDB -> TDB1
---
.../test/java/org/apache/jena/tdb1/TC_TDB1.java | 16 +++++-----
.../java/org/apache/jena/tdb1/TS_TDB1Factory.java | 2 +-
.../{TestTDBFactory.java => TestTDB1Factory.java} | 2 +-
...{TS_TDBAssembler.java => TS_TDB1Assembler.java} | 4 +--
...estTDBAssembler.java => TestTDB1Assembler.java} | 2 +-
.../org/apache/jena/tdb1/graph/TS_GraphTDB1.java | 4 +--
.../jena/tdb1/graph/TestGraphOverDatasetTDB1.java | 2 +-
...nsideTxn.java => TestGraphsTDB1_insideTxn.java} | 2 +-
...hsTDBnonTxn.java => TestGraphsTDB1_nonTxn.java} | 6 ++--
...DBTestException.java => TDB1TestException.java} | 10 +++---
.../tdb1/lib/{TS_LibTDB.java => TS_LibTDB1.java} | 2 +-
.../setup/{TS_TDBSetup.java => TS_TDB1Setup.java} | 2 +-
.../{TS_SolverTDB.java => TS_SolverTDB1.java} | 4 +--
.../{TestSolverTDB.java => TestSolverTDB1.java} | 2 +-
.../jena/tdb1/{junit => store}/GraphLocation.java | 31 ++++++++++---------
.../java/org/apache/jena/tdb1/store/TS_Store.java | 20 ++++++------
...hTDBFind.java => TestDatasetGraphTDB1Find.java} | 2 +-
...n.java => TestDatasetGraphTDB1FindPattern.java} | 2 +-
.../{TestDatasetTDB.java => TestDatasetTDB1.java} | 2 +-
...TDBPersist.java => TestDatasetTDB1Persist.java} | 3 +-
...DatasetTDB.java => TestDynamicDatasetTDB1.java} | 2 +-
...tGraphNamedTDB.java => TestGraphNamedTDB1.java} | 2 +-
.../{TestGraphTDB.java => TestGraphTDB1.java} | 3 +-
...B_Prefixes.java => TestGraphTDB1_Prefixes.java} | 2 +-
...estQueryExecTDB.java => TestQueryExecTDB1.java} | 2 +-
...{Test_SPARQL_TDB.java => Test_SPARQL_TDB1.java} | 2 +-
.../jena/tdb1/transaction/TS_TransactionTDB1.java | 8 ++---
...{TestTDBInternal.java => TestTDB1Internal.java} | 36 +++++++++++-----------
...nsPromoteTDB.java => TestTransPromoteTDB1.java} | 4 +--
...onMiscTDB.java => TestTransactionMiscTDB1.java} | 2 +-
...ransactionTDB.java => TestTransactionTDB1.java} | 2 +-
31 files changed, 92 insertions(+), 93 deletions(-)
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TC_TDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TC_TDB1.java
index 04ea797843..6fa2665eb7 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TC_TDB1.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TC_TDB1.java
@@ -20,15 +20,15 @@ package org.apache.jena.tdb1;
import org.apache.jena.sparql.engine.optimizer.reorder.ReorderLib ;
import org.apache.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
-import org.apache.jena.tdb1.assembler.TS_TDBAssembler;
+import org.apache.jena.tdb1.assembler.TS_TDB1Assembler;
import org.apache.jena.tdb1.base.TC_Base;
import org.apache.jena.tdb1.base.block.FileMode;
import org.apache.jena.tdb1.base.objectfile.TS_ObjectFile;
import org.apache.jena.tdb1.graph.TS_GraphTDB1;
import org.apache.jena.tdb1.index.TS_Index;
-import org.apache.jena.tdb1.lib.TS_LibTDB;
-import org.apache.jena.tdb1.setup.TS_TDBSetup;
-import org.apache.jena.tdb1.solver.TS_SolverTDB;
+import org.apache.jena.tdb1.lib.TS_LibTDB1;
+import org.apache.jena.tdb1.setup.TS_TDB1Setup;
+import org.apache.jena.tdb1.solver.TS_SolverTDB1;
import org.apache.jena.tdb1.store.TS_Store;
import org.apache.jena.tdb1.store.nodetable.TS_NodeTable;
import org.apache.jena.tdb1.store.tupletable.TS_TupleTable;
@@ -48,17 +48,17 @@ import org.junit.runners.Suite ;
@Suite.SuiteClasses( {
// TDB
TC_Base.class // ==> TS_Block, TS_File.class, TS_Record, TS_RecordFile
- , TS_LibTDB.class
+ , TS_LibTDB1.class
, TS_NodeTable.class
, TS_Index.class
, TS_TupleTable.class
- , TS_TDBSetup.class
+ , TS_TDB1Setup.class
, TS_Store.class // The main storage implementation. Some slow tests.
- , TS_SolverTDB.class
+ , TS_SolverTDB1.class
, TS_Sys.class
, TS_GraphTDB1.class
, TS_TDB1Factory.class
- , TS_TDBAssembler.class
+ , TS_TDB1Assembler.class
, TS_TransactionTDB1.class
, TS_ObjectFile.class
, TestMiscTDB1.class
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TS_TDB1Factory.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TS_TDB1Factory.java
index d018ad995b..b9df544d3f 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TS_TDB1Factory.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TS_TDB1Factory.java
@@ -24,7 +24,7 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestTDBFactory.class
+ TestTDB1Factory.class
})
public class TS_TDB1Factory
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDBFactory.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDB1Factory.java
similarity index 99%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDBFactory.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDB1Factory.java
index 82fb2f5e3e..68c1a9bc5a 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDBFactory.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDB1Factory.java
@@ -35,7 +35,7 @@ import org.junit.After ;
import org.junit.Before ;
import org.junit.Test ;
-public class TestTDBFactory
+public class TestTDB1Factory
{
String DIR = ConfigTest.getCleanDir() ;
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TS_TDBAssembler.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TS_TDB1Assembler.java
similarity index 94%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TS_TDBAssembler.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TS_TDB1Assembler.java
index 3e3c8066f4..e7b2469ea2 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TS_TDBAssembler.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TS_TDB1Assembler.java
@@ -23,8 +23,8 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestTDBAssembler.class
+ TestTDB1Assembler.class
})
-public class TS_TDBAssembler
+public class TS_TDB1Assembler
{}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDBAssembler.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDB1Assembler.java
similarity index 99%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDBAssembler.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDB1Assembler.java
index ba0ebbd9a4..04d8927744 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDBAssembler.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDB1Assembler.java
@@ -39,7 +39,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-public class TestTDBAssembler {
+public class TestTDB1Assembler {
// Can be slow - explicitly closes the dataset.
static String dirAssem = null;
static final String dirDB = ConfigTest.getTestingDir() + "/DB";
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TS_GraphTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TS_GraphTDB1.java
index 891a718243..0de416e636 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TS_GraphTDB1.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TS_GraphTDB1.java
@@ -26,8 +26,8 @@ import org.junit.runners.Suite ;
TestPrefixMapTDB1.class
, TestPrefixMappingTDB1.class
, TestDatasetGraphTDB1.class
- , TestGraphsTDBnonTxn.class
- , TestGraphsTDBinsideTxn.class
+ , TestGraphsTDB1_nonTxn.class
+ , TestGraphsTDB1_insideTxn.class
, TestGraphOverDatasetTDB1.class
})
public class TS_GraphTDB1
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphOverDatasetTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphOverDatasetTDB1.java
index c6ab0168e0..3f85043821 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphOverDatasetTDB1.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphOverDatasetTDB1.java
@@ -29,7 +29,7 @@ public class TestGraphOverDatasetTDB1 extends AbstractTestGraphOverDatasetGraph
{
@Override
protected DatasetGraph createBaseDSG() { return TDB1Factory.createDatasetGraph() ; }
-
+
@Override
protected Graph makeNamedGraph(DatasetGraph dsg, Node gn)
{
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDBinsideTxn.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDB1_insideTxn.java
similarity index 94%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDBinsideTxn.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDB1_insideTxn.java
index 2a9a78ec30..501537a77a 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDBinsideTxn.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDB1_insideTxn.java
@@ -22,7 +22,7 @@ import org.apache.jena.query.ReadWrite ;
import org.junit.After ;
import org.junit.Before ;
-public class TestGraphsTDBinsideTxn extends AbstractTestGraphsTDB1
+public class TestGraphsTDB1_insideTxn extends AbstractTestGraphsTDB1
{
@Before public void before()
{
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDBnonTxn.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDB1_nonTxn.java
similarity index 87%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDBnonTxn.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDB1_nonTxn.java
index a6fab5e123..84d3955699 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDBnonTxn.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphsTDB1_nonTxn.java
@@ -21,14 +21,14 @@ package org.apache.jena.tdb1.graph;
import org.junit.After ;
import org.junit.Before ;
-public class TestGraphsTDBnonTxn extends AbstractTestGraphsTDB1
+public class TestGraphsTDB1_nonTxn extends AbstractTestGraphsTDB1
{
// Non-transactional.
- @Before public void before()
+ @Before public void before()
{
}
- @After public void after()
+ @After public void after()
{
}
}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/TDBTestException.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/TDB1TestException.java
similarity index 76%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/TDBTestException.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/TDB1TestException.java
index 9cda7c0186..434fb1b278 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/TDBTestException.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/TDB1TestException.java
@@ -20,10 +20,10 @@ package org.apache.jena.tdb1.junit;
import org.apache.jena.tdb1.TDB1Exception;
-public class TDBTestException extends TDB1Exception
+public class TDB1TestException extends TDB1Exception
{
- public TDBTestException() {}
- public TDBTestException(String msg) { super(msg) ; }
- public TDBTestException(Throwable th) { super(th) ;}
- public TDBTestException(String msg, Throwable th) { super(msg, th) ; }
+ public TDB1TestException() {}
+ public TDB1TestException(String msg) { super(msg) ; }
+ public TDB1TestException(Throwable th) { super(th) ;}
+ public TDB1TestException(String msg, Throwable th) { super(msg, th) ; }
}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/lib/TS_LibTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/lib/TS_LibTDB1.java
similarity index 97%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/lib/TS_LibTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/lib/TS_LibTDB1.java
index ac39579f6c..dbbfb25014 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/lib/TS_LibTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/lib/TS_LibTDB1.java
@@ -29,7 +29,7 @@ import org.junit.runners.Suite;
})
-public class TS_LibTDB
+public class TS_LibTDB1
{
}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TS_TDBSetup.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TS_TDB1Setup.java
similarity index 97%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TS_TDBSetup.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TS_TDB1Setup.java
index 83d94d5da8..2ed711d367 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TS_TDBSetup.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/setup/TS_TDB1Setup.java
@@ -27,7 +27,7 @@ import org.junit.runners.Suite ;
, TestStoreParamsChoose.class
, TestStoreParamsCreate.class
})
-public class TS_TDBSetup {
+public class TS_TDB1Setup {
}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TS_SolverTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TS_SolverTDB1.java
similarity index 94%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TS_SolverTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TS_SolverTDB1.java
index 9840d237bd..0f4994ac2c 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TS_SolverTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TS_SolverTDB1.java
@@ -23,9 +23,9 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestSolverTDB.class
+ TestSolverTDB1.class
, TestStats.class
})
-public class TS_SolverTDB
+public class TS_SolverTDB1
{}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB1.java
similarity index 99%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB1.java
index c3f4e444d7..8855033795 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB1.java
@@ -49,7 +49,7 @@ import org.apache.jena.sparql.sse.SSE;
import org.apache.jena.tdb1.ConfigTest;
import org.apache.jena.tdb1.TDB1Factory;
-public class TestSolverTDB {
+public class TestSolverTDB1 {
static String graphData = null;
static Dataset dataset = null;
static PrefixMapping pmap = null;
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/GraphLocation.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/GraphLocation.java
similarity index 90%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/GraphLocation.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/GraphLocation.java
index 5d12512adc..9f843995d2 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/GraphLocation.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/GraphLocation.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdb1.junit;
+package org.apache.jena.tdb1.store;
import java.util.Iterator ;
@@ -34,56 +34,57 @@ import org.apache.jena.rdf.model.ModelFactory ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.base.file.Location;
+import org.apache.jena.tdb1.junit.TDB1TestException;
/** Manage a graph at a fixed location */
-public class GraphLocation
+class GraphLocation
{
private Location loc = null ;
private Graph graph = null ;
private Model model = null ;
private DatasetGraph dsg = null ;
-
+
public GraphLocation(Location loc)
{
this.loc = loc ;
}
-
+
public void clearDirectory() { FileOps.clearDirectory(loc.getDirectoryPath()) ; }
-
+
public Graph getGraph() { return graph ; }
-
+
public Model getModel() { return model ; }
-
+
public Dataset getDataset()
- {
+ {
if ( dsg == null ) return null ;
return DatasetFactory.wrap(dsg) ;
}
- public Dataset createDataset()
+ public Dataset createDataset()
{
if ( dsg != null )
- throw new TDBTestException("dataset already in use") ;
+ throw new TDB1TestException("dataset already in use") ;
dsg = TDB1Factory.createDatasetGraph(loc) ;
return DatasetFactory.wrap(dsg) ;
}
-
+
public Graph createGraph()
{
if ( graph != null )
- throw new TDBTestException("Graph already in use") ;
+ throw new TDB1TestException("Graph already in use") ;
graph = TDB1Factory.createDatasetGraph(loc).getDefaultGraph() ;
model = ModelFactory.createModelForGraph(graph) ;
return graph ;
}
-
+
public void clearGraph()
- {
+ {
if ( graph != null )
{
Iterator<Triple> iter = graph.find(Node.ANY, Node.ANY, Node.ANY) ;
List<Triple> triples = Iter.toList(iter) ;
-
+
for ( Triple t : triples )
graph.delete(t) ;
}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TS_Store.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TS_Store.java
index ced984c335..9ffa60aef9 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TS_Store.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TS_Store.java
@@ -30,21 +30,21 @@ import org.junit.runners.Suite ;
@Suite.SuiteClasses( {
TestNodeId.class
, TestTripleTable.class
- , TestGraphTDB.class
- , TestGraphNamedTDB.class
- , TestDatasetTDBPersist.class
- , TestDatasetTDB.class
- , TestDatasetGraphTDBFind.class
- , TestDatasetGraphTDBFindPattern.class
+ , TestGraphTDB1.class
+ , TestGraphNamedTDB1.class
+ , TestDatasetTDB1Persist.class
+ , TestDatasetTDB1.class
+ , TestDatasetGraphTDB1Find.class
+ , TestDatasetGraphTDB1FindPattern.class
, TestLoader.class
- , Test_SPARQL_TDB.class
+ , Test_SPARQL_TDB1.class
, TestConcurrentAccess.class
- , TestQueryExecTDB.class
- , TestDynamicDatasetTDB.class
+ , TestQueryExecTDB1.class
+ , TestDynamicDatasetTDB1.class
, TestStoreConnectionsDirect.class
, TestStoreConnectionsMapped.class
, TestLocationLockStoreConnection.class
- , TestGraphTDB_Prefixes.class
+ , TestGraphTDB1_Prefixes.class
, TestQuadFilter.class
} )
public class TS_Store
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDBFind.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1Find.java
similarity index 94%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDBFind.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1Find.java
index f849d78e49..c5d2d76b0f 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDBFind.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1Find.java
@@ -23,7 +23,7 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.transaction.DatasetGraphTransaction;
-public class TestDatasetGraphTDBFind extends AbstractDatasetGraphFind {
+public class TestDatasetGraphTDB1Find extends AbstractDatasetGraphFind {
@Override
public DatasetGraph create() {
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDBFindPattern.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1FindPattern.java
similarity index 93%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDBFindPattern.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1FindPattern.java
index 56fbf0bcb8..c5468acb14 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDBFindPattern.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1FindPattern.java
@@ -23,7 +23,7 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.transaction.DatasetGraphTransaction;
-public class TestDatasetGraphTDBFindPattern extends AbstractDatasetGraphFindPatterns {
+public class TestDatasetGraphTDB1FindPattern extends AbstractDatasetGraphFindPatterns {
@Override
public DatasetGraph create() {
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1.java
similarity index 99%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1.java
index b2308dc4c7..7c8ff4ebfb 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1.java
@@ -35,7 +35,7 @@ import org.apache.jena.tdb1.TDB1Factory;
import org.junit.Test ;
/** Tests of datasets, prefixes, special URIs etc (see also {@link org.apache.jena.sparql.graph.GraphsTests} */
-public class TestDatasetTDB
+public class TestDatasetTDB1
{
private static Dataset create()
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDBPersist.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1Persist.java
similarity index 98%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDBPersist.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1Persist.java
index 17c4e6d651..b0022a3de1 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDBPersist.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1Persist.java
@@ -34,7 +34,6 @@ import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
import org.apache.jena.tdb1.ConfigTest;
import org.apache.jena.tdb1.base.file.Location;
-import org.apache.jena.tdb1.junit.GraphLocation;
import org.apache.jena.tdb1.sys.TDBInternal;
import org.junit.After ;
import org.junit.AfterClass ;
@@ -42,7 +41,7 @@ import org.junit.Before ;
import org.junit.Test ;
/** Testing persistence */
-public class TestDatasetTDBPersist
+public class TestDatasetTDB1Persist
{
static Node n0 = NodeFactoryExtra.parseNode("<http://example/n0>") ;
static Node n1 = NodeFactoryExtra.parseNode("<http://example/n1>") ;
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB1.java
similarity index 94%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB1.java
index 05fd3cf8df..309cef9c25 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB1.java
@@ -23,7 +23,7 @@ import org.apache.jena.sparql.core.AbstractTestDynamicDataset ;
import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.sys.TDBInternal;
-public class TestDynamicDatasetTDB extends AbstractTestDynamicDataset
+public class TestDynamicDatasetTDB1 extends AbstractTestDynamicDataset
{
@Override
protected Dataset createDataset()
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB1.java
similarity index 95%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB1.java
index 7f694a4e55..79912666cf 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB1.java
@@ -26,7 +26,7 @@ import org.apache.jena.sparql.util.NodeFactoryExtra ;
import org.apache.jena.tdb1.TDB1Factory;
/** Programmatic tests on persistent graph */
-public class TestGraphNamedTDB extends AbstractTestGraphAddDelete
+public class TestGraphNamedTDB1 extends AbstractTestGraphAddDelete
{
Node graphNode = NodeFactoryExtra.parseNode("<http://example/namedGraph>") ;
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1.java
similarity index 95%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1.java
index 1c4330217b..be755c0bd3 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1.java
@@ -22,7 +22,6 @@ import org.apache.jena.graph.Graph ;
import org.apache.jena.sparql.graph.AbstractTestGraphAddDelete ;
import org.apache.jena.tdb1.ConfigTest;
import org.apache.jena.tdb1.base.file.Location;
-import org.apache.jena.tdb1.junit.GraphLocation;
import org.apache.jena.tdb1.sys.TDBInternal;
import org.junit.After;
import org.junit.AfterClass;
@@ -30,7 +29,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
/** Programmatic tests on persistent graph */
-public class TestGraphTDB extends AbstractTestGraphAddDelete
+public class TestGraphTDB1 extends AbstractTestGraphAddDelete
{
static GraphLocation graphLocation = null ;
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB_Prefixes.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1_Prefixes.java
similarity index 99%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB_Prefixes.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1_Prefixes.java
index 1c86fdd704..9f70a85f57 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB_Prefixes.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1_Prefixes.java
@@ -34,7 +34,7 @@ import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.transaction.DatasetGraphTransaction;
import org.junit.Test;
-public class TestGraphTDB_Prefixes {
+public class TestGraphTDB1_Prefixes {
public static Graph graphX(DatasetGraph dataset, Node graphName) {
DatasetGraphTransaction dsgtdb = (DatasetGraphTransaction)dataset;
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB1.java
similarity index 95%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB1.java
index 72f3869247..5d6a63f0ed 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB1.java
@@ -23,7 +23,7 @@ import org.apache.jena.sparql.core.AbstractTestQueryExec;
import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.sys.TDBInternal;
-public class TestQueryExecTDB extends AbstractTestQueryExec
+public class TestQueryExecTDB1 extends AbstractTestQueryExec
{
@Override
protected Dataset createDataset()
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB1.java
similarity index 99%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB1.java
index 7e41522ea0..aa08934eaf 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB1.java
@@ -41,7 +41,7 @@ import org.junit.Test ;
/**
* Test SPARQL
*/
-public class Test_SPARQL_TDB
+public class Test_SPARQL_TDB1
{
private static Dataset create() {
return TDB1Factory.createDataset();
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TS_TransactionTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TS_TransactionTDB1.java
index 4f8737dede..daf018832c 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TS_TransactionTDB1.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TS_TransactionTDB1.java
@@ -36,11 +36,11 @@ import org.junit.runners.Suite ;
, TestTransDiskDirect.class
, TestTransDiskMapped.class
, TestTransRestart.class
- , TestTransactionTDB.class
+ , TestTransactionTDB1.class
, TestTransactionUnionGraph.class
- , TestTransactionMiscTDB.class
- , TestTDBInternal.class
- , TestTransPromoteTDB.class
+ , TestTransactionMiscTDB1.class
+ , TestTDB1Internal.class
+ , TestTransPromoteTDB1.class
, TestTransControl.class
, TestTransIsolation.class
})
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDBInternal.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDB1Internal.java
similarity index 95%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDBInternal.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDB1Internal.java
index f06dcc4050..b5ac3bb41b 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDBInternal.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDB1Internal.java
@@ -29,36 +29,36 @@ import org.junit.Assert ;
import org.junit.Test ;
/** Tests for lower level details of TDB */
-public class TestTDBInternal {
+public class TestTDB1Internal {
@Test public void basics_1() {
DatasetGraph dsg = TDB1Factory.createDatasetGraph() ;
StoreConnection sConn = TDBInternal.getStoreConnection(dsg) ;
Assert.assertNotNull(sConn);
}
-
+
@Test public void basics_2() {
DatasetGraph dsg = TDB1Factory.createDatasetGraph() ;
TransactionManager txnmgr = TDBInternal.getTransactionManager(dsg) ;
- Assert.assertNotNull(txnmgr);
+ Assert.assertNotNull(txnmgr);
}
-
+
@Test public void exclusive_1() {
DatasetGraph dsg = TDB1Factory.createDatasetGraph() ;
TransactionManager txnmgr = TDBInternal.getTransactionManager(dsg) ;
checkTxnMgr(txnmgr, 0, 0) ;
-
+
ReentrantReadWriteLock rwx = (ReentrantReadWriteLock)txnmgr.getExclusivityLock$() ;
checkLock(rwx,0,0) ;
-
+
dsg.begin(ReadWrite.WRITE);
checkLock(rwx,1,0) ; // Exclusivity reader lock.
checkTxnMgr(txnmgr, 0, 1) ;
dsg.commit();
-
+
checkLock(rwx,0,0) ; // Exclusivity reader lock.
checkTxnMgr(txnmgr, 0, 0) ;
-
+
dsg.end();
checkLock(rwx,0,0) ; // Exclusivity reader lock.
checkTxnMgr(txnmgr, 0, 0) ;
@@ -68,10 +68,10 @@ public class TestTDBInternal {
DatasetGraph dsg = TDB1Factory.createDatasetGraph() ;
TransactionManager txnmgr = TDBInternal.getTransactionManager(dsg) ;
checkTxnMgr(txnmgr, 0, 0) ;
-
+
ReentrantReadWriteLock rwx = (ReentrantReadWriteLock)txnmgr.getExclusivityLock$() ;
checkLock(rwx,0,0) ;
-
+
dsg.begin(ReadWrite.READ);
checkLock(rwx,1,0) ;
checkTxnMgr(txnmgr, 1, 0) ;
@@ -79,12 +79,12 @@ public class TestTDBInternal {
checkLock(rwx,0,0) ;
checkTxnMgr(txnmgr, 0, 0) ;
}
-
+
@Test public void exclusive_3() {
DatasetGraph dsg = TDB1Factory.createDatasetGraph() ;
TransactionManager txnmgr = TDBInternal.getTransactionManager(dsg) ;
ReentrantReadWriteLock rwx = (ReentrantReadWriteLock)txnmgr.getExclusivityLock$() ;
-
+
checkLock(rwx, 0, 0) ;
txnmgr.startExclusiveMode();
checkLock(rwx, 0, 1) ;
@@ -96,7 +96,7 @@ public class TestTDBInternal {
DatasetGraph dsg = TDB1Factory.createDatasetGraph() ;
TransactionManager txnmgr = TDBInternal.getTransactionManager(dsg) ;
ReentrantReadWriteLock rwx = (ReentrantReadWriteLock)txnmgr.getExclusivityLock$() ;
-
+
checkLock(rwx, 0, 0) ;
boolean b = txnmgr.tryExclusiveMode();
Assert.assertTrue("Exclusive 1", b);
@@ -115,19 +115,19 @@ public class TestTDBInternal {
boolean b = txnmgr.tryExclusiveMode();
Assert.assertFalse(b);
}
-
+
private static void checkLock(ReentrantReadWriteLock rwx, int expectedR, int expectedW) {
int r = rwx.getReadHoldCount() ;
int w = rwx.getWriteHoldCount() ;
Assert.assertEquals("R", expectedR, r);
- Assert.assertEquals("W", expectedW, w);
+ Assert.assertEquals("W", expectedW, w);
}
-
+
private static void checkTxnMgr(TransactionManager txnmgr , int expectedActiveReaders, int expectedActiveWriters) {
long r = txnmgr.getCountActiveReaders() ;
long w = txnmgr.getCountActiveWriters() ;
Assert.assertEquals("R-active", expectedActiveReaders, r);
- Assert.assertEquals("W-active", expectedActiveWriters, w);
-
+ Assert.assertEquals("W-active", expectedActiveWriters, w);
+
}
}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB1.java
similarity index 94%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB1.java
index 07981c8523..b329b6f0be 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB1.java
@@ -26,8 +26,8 @@ import org.apache.jena.tdb1.TDB1Factory;
import org.apache.jena.tdb1.sys.SystemTDB;
/** Tests for transactions that start read and then promote to write -- TDB */
-public class TestTransPromoteTDB extends AbstractTestTransPromote {
- public TestTransPromoteTDB() {
+public class TestTransPromoteTDB1 extends AbstractTestTransPromote {
+ public TestTransPromoteTDB1() {
super(getLoggers()) ;
}
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB1.java
similarity index 96%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB1.java
index 214b95e418..6e198ddd7d 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB1.java
@@ -23,7 +23,7 @@ import org.apache.jena.tdb1.TDB1Factory;
import org.junit.Assert ;
import org.junit.Test ;
-public class TestTransactionMiscTDB {
+public class TestTransactionMiscTDB1 {
@Test public void support() {
DatasetGraph dsg = TDB1Factory.createDatasetGraph() ;
Assert.assertTrue(dsg.supportsTransactions()) ;
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB1.java
similarity index 96%
rename from jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB.java
rename to jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB1.java
index 9674ef9d69..5eac92b454 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB1.java
@@ -31,7 +31,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-public class TestTransactionTDB extends AbstractTestTransactionLifecycle
+public class TestTransactionTDB1 extends AbstractTestTransactionLifecycle
{
private String DIR = null ;
private static String level = null ;