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 2017/09/28 11:08:24 UTC
[08/50] [abbrv] jena git commit: Remove use of BaseTest
Remove use of BaseTest
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7624f540
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7624f540
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7624f540
Branch: refs/heads/jena-tdb2
Commit: 7624f54062ebda6ab9672b572e1a96a20cb01c78
Parents: 0d5a468
Author: Andy Seaborne <an...@seaborne.org>
Authored: Sat Sep 2 18:48:01 2017 +0100
Committer: Andy Seaborne <an...@seaborne.org>
Committed: Sat Sep 2 18:48:01 2017 +0100
----------------------------------------------------------------------
tdb2/src/test/java/org/seaborne/tdb2/TestDatabaseMgr.java | 4 ++--
tdb2/src/test/java/org/seaborne/tdb2/TestTDBFactory.java | 4 ++--
.../java/org/seaborne/tdb2/assembler/TestTDBAssembler.java | 4 ++--
tdb2/src/test/java/org/seaborne/tdb2/lib/TestNodeLib.java | 4 ++--
.../test/java/org/seaborne/tdb2/setup/TestStoreParams.java | 4 ++--
.../java/org/seaborne/tdb2/setup/TestStoreParamsChoose.java | 4 ++--
.../java/org/seaborne/tdb2/setup/TestStoreParamsCreate.java | 4 ++--
.../src/test/java/org/seaborne/tdb2/solver/TestSolverTDB.java | 4 ++--
tdb2/src/test/java/org/seaborne/tdb2/solver/TestStats.java | 4 ++--
.../tdb2/store/AbstractTestStoreConnectionBasics.java | 5 +++--
.../src/test/java/org/seaborne/tdb2/store/TestDatasetTDB.java | 4 ++--
.../src/test/java/org/seaborne/tdb2/store/TestQuadFilter.java | 4 ++--
.../test/java/org/seaborne/tdb2/store/TestTransactions.java | 4 ++--
.../test/java/org/seaborne/tdb2/store/TestTripleTable.java | 4 ++--
.../test/java/org/seaborne/tdb2/store/Test_SPARQL_TDB.java | 4 ++--
.../seaborne/tdb2/store/nodetable/AbstractTestNodeTable.java | 7 +++++--
.../tdb2/store/tupletable/AbstractTestTupleIndex.java | 4 ++--
.../tdb2/store/tupletable/TestTupleIndexRecordDirect.java | 4 ++--
.../org/seaborne/tdb2/store/tupletable/TestTupleTable.java | 4 ++--
tdb2/src/test/java/org/seaborne/tdb2/sys/TestSys.java | 4 ++--
20 files changed, 44 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/TestDatabaseMgr.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/TestDatabaseMgr.java b/tdb2/src/test/java/org/seaborne/tdb2/TestDatabaseMgr.java
index 552aa56..da75494 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/TestDatabaseMgr.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/TestDatabaseMgr.java
@@ -17,7 +17,7 @@
package org.seaborne.tdb2;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Quad ;
@@ -28,7 +28,7 @@ import org.seaborne.dboe.jenax.Txn ;
import org.seaborne.tdb2.sys.TDBInternal ;
/** Test of DatabaseMgr - the DatasetGraph level API to TDB2 **/
-public class TestDatabaseMgr extends BaseTest
+public class TestDatabaseMgr
{
// String DIRx = ConfigTest.getCleanDir() ;
// Location DIR = Location.create(DIRx);
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/TestTDBFactory.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/TestTDBFactory.java b/tdb2/src/test/java/org/seaborne/tdb2/TestTDBFactory.java
index 795c871..752a95c 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/TestTDBFactory.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/TestTDBFactory.java
@@ -17,7 +17,7 @@
package org.seaborne.tdb2;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.query.Dataset ;
@@ -31,7 +31,7 @@ import org.seaborne.dboe.jenax.Txn ;
import org.seaborne.tdb2.sys.TDBInternal ;
/** Test of TDB2Factory - the Dataset level API to TDB2 **/
-public class TestTDBFactory extends BaseTest
+public class TestTDBFactory
{
static Resource s1 = ResourceFactory.createResource("http://example/s2");
static Resource s2 = ResourceFactory.createResource();
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/assembler/TestTDBAssembler.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/assembler/TestTDBAssembler.java b/tdb2/src/test/java/org/seaborne/tdb2/assembler/TestTDBAssembler.java
index 581af56..f1e13e2 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/assembler/TestTDBAssembler.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/assembler/TestTDBAssembler.java
@@ -19,7 +19,7 @@ package org.seaborne.tdb2.assembler;
import org.apache.jena.assembler.JA ;
import org.apache.jena.assembler.exceptions.AssemblerException ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.query.Dataset ;
@@ -36,7 +36,7 @@ import org.seaborne.tdb2.store.DatasetGraphSwitchable ;
import org.seaborne.tdb2.store.GraphViewSwitchable ;
import org.seaborne.tdb2.sys.TDBInternal ;
-public class TestTDBAssembler extends BaseTest
+public class TestTDBAssembler
{
// Can be slow - explicitly closes the dataset.
static String dirAssem = null ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/lib/TestNodeLib.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/lib/TestNodeLib.java b/tdb2/src/test/java/org/seaborne/tdb2/lib/TestNodeLib.java
index ee69570..3e85f41 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/lib/TestNodeLib.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/lib/TestNodeLib.java
@@ -18,12 +18,12 @@
package org.seaborne.tdb2.lib;
import static org.seaborne.tdb2.lib.NodeLib.hash ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
import org.junit.Test ;
-public class TestNodeLib extends BaseTest
+public class TestNodeLib
{
// Tests of TDBs NodeLib
@Test public void hash1()
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParams.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParams.java b/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParams.java
index 5396733..0d8468c 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParams.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParams.java
@@ -19,7 +19,7 @@ package org.seaborne.tdb2.setup;
import org.apache.jena.atlas.json.JSON ;
import org.apache.jena.atlas.json.JsonObject ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.junit.Test ;
import org.seaborne.dboe.base.block.FileMode ;
import org.seaborne.tdb2.TDBException ;
@@ -27,7 +27,7 @@ import org.seaborne.tdb2.setup.StoreParams ;
import org.seaborne.tdb2.setup.StoreParamsBuilder ;
import org.seaborne.tdb2.setup.StoreParamsCodec ;
-public class TestStoreParams extends BaseTest {
+public class TestStoreParams {
@Test public void store_params_01() {
assertEqualsStoreParams(StoreParams.getDftStoreParams(), StoreParams.getDftStoreParams()) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsChoose.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsChoose.java b/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsChoose.java
index 5bbf3c3..2b20d54 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsChoose.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsChoose.java
@@ -17,7 +17,7 @@
package org.seaborne.tdb2.setup;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.FileOps ;
import org.junit.Test ;
import org.seaborne.dboe.base.file.Location ;
@@ -26,7 +26,7 @@ import org.seaborne.tdb2.ConfigTest ;
//TestParamsCreate
/** This test suite uses on-disk structures and can be slow */
-public class TestStoreParamsChoose extends BaseTest {
+public class TestStoreParamsChoose {
private String DIR = ConfigTest.getCleanDir() ;
static final StoreParams pApp = StoreParams.builder()
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsCreate.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsCreate.java b/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsCreate.java
index fbac48e..44aacfb 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsCreate.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/setup/TestStoreParamsCreate.java
@@ -23,7 +23,7 @@ import java.nio.file.Paths ;
import org.apache.jena.atlas.json.JSON ;
import org.apache.jena.atlas.json.JsonObject ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.FileOps ;
import org.junit.After ;
import org.junit.Before ;
@@ -39,7 +39,7 @@ import org.seaborne.tdb2.sys.TDBInternal ;
* This test suite uses on-disk structures, does a lot of clean/create/sync
* calls and can be noticably slow.
*/
-public class TestStoreParamsCreate extends BaseTest {
+public class TestStoreParamsCreate {
private final String DB_DIR = ConfigTest.getCleanDir() ;
private final Path db = Paths.get(DB_DIR) ;
private final Path cfg = Paths.get(DB_DIR, Names.TDB_CONFIG_FILE) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/solver/TestSolverTDB.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/solver/TestSolverTDB.java b/tdb2/src/test/java/org/seaborne/tdb2/solver/TestSolverTDB.java
index dcaa71e..d94252e 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/solver/TestSolverTDB.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/solver/TestSolverTDB.java
@@ -22,7 +22,7 @@ import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
@@ -44,7 +44,7 @@ import org.junit.Test ;
import org.seaborne.tdb2.ConfigTest ;
import org.seaborne.tdb2.junit.TL ;
-public class TestSolverTDB extends BaseTest
+public class TestSolverTDB
{
static String graphData = null ;
static Graph graph = null ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/solver/TestStats.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/solver/TestStats.java b/tdb2/src/test/java/org/seaborne/tdb2/solver/TestStats.java
index e31263b..8bb3ae7 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/solver/TestStats.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/solver/TestStats.java
@@ -19,7 +19,7 @@ package org.seaborne.tdb2.solver;
import java.util.Iterator ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.tuple.Tuple ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.sparql.core.Quad ;
@@ -34,7 +34,7 @@ import org.seaborne.tdb2.store.nodetable.NodeTable ;
import org.seaborne.tdb2.store.nodetupletable.NodeTupleTable ;
import org.seaborne.tdb2.sys.TDBInternal ;
-public class TestStats extends BaseTest
+public class TestStats
{
static DatasetGraphTDB dsg = TDBInternal.getDatasetGraphTDB(TL.createTestDatasetGraphMem()) ;
static NodeTupleTable quads = dsg.getQuadTable().getNodeTupleTable() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/AbstractTestStoreConnectionBasics.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/AbstractTestStoreConnectionBasics.java b/tdb2/src/test/java/org/seaborne/tdb2/store/AbstractTestStoreConnectionBasics.java
index c23dc0e..792fef4 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/AbstractTestStoreConnectionBasics.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/AbstractTestStoreConnectionBasics.java
@@ -17,7 +17,8 @@
package org.seaborne.tdb2.store;
-import org.apache.jena.atlas.junit.BaseTest ;
+
+import static org.junit.Assert.*;
import org.apache.jena.query.ReadWrite ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.sse.SSE ;
@@ -33,7 +34,7 @@ import org.seaborne.tdb2.sys.TDBInternal ;
* These tests are slow on rotational disk.
* Complet cleaning of file areas is done.
*/
-public abstract class AbstractTestStoreConnectionBasics extends BaseTest
+public abstract class AbstractTestStoreConnectionBasics
{
// Subclass to give direct and mapped versions.
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/TestDatasetTDB.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/TestDatasetTDB.java b/tdb2/src/test/java/org/seaborne/tdb2/store/TestDatasetTDB.java
index 9bc74bb..48fd7fb 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/TestDatasetTDB.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/TestDatasetTDB.java
@@ -17,7 +17,7 @@
package org.seaborne.tdb2.store;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.query.* ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.rdf.model.ModelFactory ;
@@ -34,7 +34,7 @@ import org.seaborne.tdb2.TDB2 ;
import org.seaborne.tdb2.junit.TL ;
/** Tests of datasets, prefixes, special URIs etc (see also {@link org.apache.jena.sparql.graph.GraphsTests} */
-public class TestDatasetTDB extends BaseTest
+public class TestDatasetTDB
{
private Dataset dataset ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/TestQuadFilter.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/TestQuadFilter.java b/tdb2/src/test/java/org/seaborne/tdb2/store/TestQuadFilter.java
index a08b263..78ee4c4 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/TestQuadFilter.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/TestQuadFilter.java
@@ -19,7 +19,7 @@ package org.seaborne.tdb2.store;
import java.util.function.Predicate ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.tuple.Tuple ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.query.* ;
@@ -36,7 +36,7 @@ import org.seaborne.tdb2.store.nodetable.NodeTable ;
import org.seaborne.tdb2.sys.SystemTDB ;
@Ignore("Quad filter tests not ready (transactions)")
-public class TestQuadFilter extends BaseTest
+public class TestQuadFilter
{
private static String graphToHide = "http://example/g2" ;
private static Dataset ds = setup() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/TestTransactions.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/TestTransactions.java b/tdb2/src/test/java/org/seaborne/tdb2/store/TestTransactions.java
index 5442c79..47bc3e5 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/TestTransactions.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/TestTransactions.java
@@ -21,7 +21,7 @@ import java.io.StringReader ;
import java.util.Iterator;
import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.query.Dataset ;
import org.apache.jena.query.ReadWrite;
@@ -48,7 +48,7 @@ import org.seaborne.tdb2.sys.TDBInternal;
* @see TestStoreConnectionMapped
* @see TestStoreConnectionMem
*/
-public class TestTransactions extends BaseTest
+public class TestTransactions
{
// Per-test unique-ish.
static int count = 0 ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/TestTripleTable.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/TestTripleTable.java b/tdb2/src/test/java/org/seaborne/tdb2/store/TestTripleTable.java
index 5908498..98e48d1 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/TestTripleTable.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/TestTripleTable.java
@@ -19,7 +19,7 @@ package org.seaborne.tdb2.store;
import java.util.Iterator ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.query.ReadWrite ;
@@ -30,7 +30,7 @@ import org.junit.Test ;
import org.seaborne.dboe.base.file.Location ;
import org.seaborne.tdb2.setup.TDBBuilder ;
-public class TestTripleTable extends BaseTest
+public class TestTripleTable
{
static {
Logger.getLogger("org.apache.jena.tdb.info").setLevel(Level.WARN) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/Test_SPARQL_TDB.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/Test_SPARQL_TDB.java b/tdb2/src/test/java/org/seaborne/tdb2/store/Test_SPARQL_TDB.java
index e23875b..0ab4cb4 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/Test_SPARQL_TDB.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/Test_SPARQL_TDB.java
@@ -17,7 +17,7 @@
package org.seaborne.tdb2.store;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.NodeFactory ;
@@ -35,7 +35,7 @@ import org.seaborne.tdb2.TDB2Factory ;
/**
* Test SPARQL
*/
-public class Test_SPARQL_TDB extends BaseTest
+public class Test_SPARQL_TDB
{
private static Dataset create() {
return TDB2Factory.createDataset() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/nodetable/AbstractTestNodeTable.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/nodetable/AbstractTestNodeTable.java b/tdb2/src/test/java/org/seaborne/tdb2/store/nodetable/AbstractTestNodeTable.java
index 8f0c279..158e2ff 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/nodetable/AbstractTestNodeTable.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/nodetable/AbstractTestNodeTable.java
@@ -17,13 +17,16 @@
package org.seaborne.tdb2.store.nodetable;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.assertEquals ;
+import static org.junit.Assert.assertNotEquals ;
+import static org.junit.Assert.assertNotNull ;
+
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
import org.junit.Test ;
import org.seaborne.tdb2.store.NodeId ;
-public abstract class AbstractTestNodeTable extends BaseTest
+public abstract class AbstractTestNodeTable
{
protected abstract NodeTable createEmptyNodeTable() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/AbstractTestTupleIndex.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/AbstractTestTupleIndex.java b/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/AbstractTestTupleIndex.java
index 42651ad..6a2e138 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/AbstractTestTupleIndex.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/AbstractTestTupleIndex.java
@@ -23,7 +23,7 @@ import java.util.Iterator ;
import java.util.Set ;
import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.tuple.Tuple ;
import org.junit.Test ;
import org.seaborne.tdb2.store.NodeId ;
@@ -31,7 +31,7 @@ import org.seaborne.tdb2.store.tupletable.TupleIndex ;
import static org.seaborne.tdb2.store.tupletable.NData.*;
/** Test TupleIndexes (general) */
-public abstract class AbstractTestTupleIndex extends BaseTest
+public abstract class AbstractTestTupleIndex
{
protected abstract TupleIndex create(String description) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleIndexRecordDirect.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleIndexRecordDirect.java b/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleIndexRecordDirect.java
index b6b9119..a48c87b 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleIndexRecordDirect.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleIndexRecordDirect.java
@@ -24,7 +24,7 @@ import java.util.Iterator ;
import java.util.Set ;
import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.tuple.Tuple ;
import org.apache.jena.atlas.lib.tuple.TupleMap ;
import org.junit.Test ;
@@ -37,7 +37,7 @@ import org.seaborne.tdb2.setup.StoreParams ;
import org.seaborne.tdb2.store.NodeId ;
import org.seaborne.tdb2.sys.SystemTDB ;
-public class TestTupleIndexRecordDirect extends BaseTest
+public class TestTupleIndexRecordDirect
{
static RecordFactory factory = new RecordFactory(3*SystemTDB.SizeOfNodeId, 0) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleTable.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleTable.java b/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleTable.java
index f82b52d..4d27266 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleTable.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/store/tupletable/TestTupleTable.java
@@ -23,7 +23,7 @@ import java.util.Iterator ;
import java.util.List ;
import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.apache.jena.atlas.lib.tuple.Tuple ;
import org.junit.Test ;
import org.seaborne.dboe.base.record.RecordFactory ;
@@ -31,7 +31,7 @@ import org.seaborne.tdb2.store.NodeId ;
import org.seaborne.tdb2.sys.SystemTDB ;
import static org.seaborne.tdb2.store.tupletable.NData.*;
-public class TestTupleTable extends BaseTest
+public class TestTupleTable
{
static RecordFactory factory = new RecordFactory(3*SystemTDB.SizeOfNodeId, 0) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7624f540/tdb2/src/test/java/org/seaborne/tdb2/sys/TestSys.java
----------------------------------------------------------------------
diff --git a/tdb2/src/test/java/org/seaborne/tdb2/sys/TestSys.java b/tdb2/src/test/java/org/seaborne/tdb2/sys/TestSys.java
index 0a98d8d..b537655 100644
--- a/tdb2/src/test/java/org/seaborne/tdb2/sys/TestSys.java
+++ b/tdb2/src/test/java/org/seaborne/tdb2/sys/TestSys.java
@@ -18,11 +18,11 @@
package org.seaborne.tdb2.sys;
-import org.apache.jena.atlas.junit.BaseTest ;
+import static org.junit.Assert.*;
import org.junit.Test ;
import org.seaborne.tdb2.TDB2 ;
-public class TestSys extends BaseTest
+public class TestSys
{
@Test public void sys1()
{