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 2019/06/23 19:56:51 UTC
[jena] branch master updated: Clean up test WARN messages
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new c56d3d5 Clean up test WARN messages
new 7b8f3d0 Merge pull request #579 from afs/clean-test-warnings
c56d3d5 is described below
commit c56d3d5676a95c26b6f07cf9fbcff9cf528848b2
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Jun 21 11:14:24 2019 +0100
Clean up test WARN messages
---
.../jena/dboe/transaction/txn/TransactionCoordinator.java | 6 +++++-
.../org/apache/jena/dboe/transaction/AbstractTestTxn.java | 7 ++-----
.../jena/dboe/transaction/TestThreadingTransactions.java | 2 +-
.../java/org/apache/jena/fuseki/main/TS_FusekiMain.java | 13 ++++++++++++-
jena-tdb/src/test/java/org/apache/jena/tdb/TC_TDB.java | 2 +-
.../apache/jena/tdb/{TS_Factory.java => TS_TDBFactory.java} | 2 +-
.../src/test/java/org/apache/jena/tdb/TestTDBFactory.java | 1 +
.../org/apache/jena/tdb/store/TestDatasetTDBPersist.java | 2 +-
.../org/apache/jena/tdb/store/TestDynamicDatasetTDB.java | 5 ++++-
.../test/java/org/apache/jena/tdb/store/TestGraphTDB.java | 11 ++---------
.../src/test/java/org/apache/jena/tdb/store/TestLoader.java | 2 ++
.../apache/jena/tdb/store/TestStoreConnectionsMapped.java | 2 ++
.../org/apache/jena/tdb/transaction/TestTransRestart.java | 3 +++
.../org/apache/jena/tdb/transaction/TestTransactionTDB.java | 4 ++--
.../jena/query/text/assembler/TestTextDatasetAssembler.java | 12 ++++++------
15 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java
index 7b535a1..f3d586b 100644
--- a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java
+++ b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/TransactionCoordinator.java
@@ -301,9 +301,13 @@ public class TransactionCoordinator {
}
public void shutdown() {
+ shutdown(false);
+ }
+
+ public void shutdown(boolean silent) {
if ( coordinatorLock == null )
return;
- if ( countActive() > 0 )
+ if ( ! silent && countActive() > 0 )
FmtLog.warn(SysErr, "Transactions active: W=%d, R=%d", countActiveWriter(), countActiveReaders());
components.forEach((id, c) -> c.shutdown());
shutdownHooks.forEach((h)-> h.shutdown());
diff --git a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/AbstractTestTxn.java b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/AbstractTestTxn.java
index e43064c..c8c1f87 100644
--- a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/AbstractTestTxn.java
+++ b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/AbstractTestTxn.java
@@ -24,9 +24,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.jena.dboe.base.file.Location;
-import org.apache.jena.dboe.transaction.TransInteger;
-import org.apache.jena.dboe.transaction.TransMonitor;
-import org.apache.jena.dboe.transaction.Transactional;
import org.apache.jena.dboe.transaction.txn.*;
import org.apache.jena.dboe.transaction.txn.journal.Journal;
import org.junit.After;
@@ -49,7 +46,8 @@ public abstract class AbstractTestTxn {
}
@After public void clearup() {
- txnMgr.shutdown();
+ // Some test that expect exceptions leave active transactions around.
+ txnMgr.shutdown(true);
}
protected void checkClear() {
@@ -60,4 +58,3 @@ public abstract class AbstractTestTxn {
}
}
-
diff --git a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestThreadingTransactions.java b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestThreadingTransactions.java
index b31c6fa..9417834 100644
--- a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestThreadingTransactions.java
+++ b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestThreadingTransactions.java
@@ -42,7 +42,7 @@ public class TestThreadingTransactions {
}
@After public void after() {
- transInt.getTxnMgr().shutdown();
+ transInt.getTxnMgr().shutdown(true);
}
// Read synchronously in a transaction.
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TS_FusekiMain.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TS_FusekiMain.java
index 8acb9bc..e64f4eb 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TS_FusekiMain.java
+++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TS_FusekiMain.java
@@ -18,7 +18,10 @@
package org.apache.jena.fuseki.main;
+import org.apache.jena.atlas.logging.LogCtl;
+import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.fuseki.main.old.TestFusekiTestAuthOld;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@@ -32,4 +35,12 @@ import org.junit.runners.Suite.SuiteClasses;
, TestFusekiMainCmd.class
, TestStdSetup.class
})
-public class TS_FusekiMain { }
+public class TS_FusekiMain {
+ @BeforeClass public static void setupForFusekiServer() {
+ LogCtl.setLevel(Fuseki.serverLogName, "WARN");
+ LogCtl.setLevel(Fuseki.actionLogName, "WARN");
+ LogCtl.setLevel(Fuseki.requestLogName, "WARN");
+ LogCtl.setLevel(Fuseki.adminLogName, "WARN");
+ LogCtl.setLevel("org.eclipse.jetty", "WARN");
+ }
+}
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/TC_TDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/TC_TDB.java
index d9c91db..ee0e4b8 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/TC_TDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/TC_TDB.java
@@ -59,7 +59,7 @@ import org.junit.runners.Suite ;
, TS_SolverTDB.class
, TS_Sys.class
, TS_Graph.class
- , TS_Factory.class
+ , TS_TDBFactory.class
, TS_TDBAssembler.class
, TS_TransactionTDB.class
, TS_ObjectFile.class
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/TS_Factory.java b/jena-tdb/src/test/java/org/apache/jena/tdb/TS_TDBFactory.java
similarity index 97%
rename from jena-tdb/src/test/java/org/apache/jena/tdb/TS_Factory.java
rename to jena-tdb/src/test/java/org/apache/jena/tdb/TS_TDBFactory.java
index 9345613..9cb8da8 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/TS_Factory.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/TS_TDBFactory.java
@@ -27,7 +27,7 @@ import org.junit.runners.Suite;
TestTDBFactory.class
})
-public class TS_Factory
+public class TS_TDBFactory
{
}
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/TestTDBFactory.java b/jena-tdb/src/test/java/org/apache/jena/tdb/TestTDBFactory.java
index 2aa11dc..aff6fe5 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/TestTDBFactory.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/TestTDBFactory.java
@@ -46,6 +46,7 @@ public class TestTDBFactory extends BaseTest
@After
public void after() {
+ TDBInternal.reset();
FileOps.clearDirectory(DIR);
}
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDatasetTDBPersist.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDatasetTDBPersist.java
index 38b675c..d45c602 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDatasetTDBPersist.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDatasetTDBPersist.java
@@ -53,8 +53,8 @@ public class TestDatasetTDBPersist extends BaseTest
@Before public void before()
{
+ TDBInternal.reset() ;
String dirname = ConfigTest.getCleanDir() ;
- TDBInternal.reset() ;
graphLocation = new GraphLocation(Location.create(dirname)) ;
graphLocation.createDataset() ;
}
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java
index 2aaedda..9d16896 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestDynamicDatasetTDB.java
@@ -21,6 +21,7 @@ package org.apache.jena.tdb.store;
import org.apache.jena.query.Dataset ;
import org.apache.jena.sparql.core.AbstractTestDynamicDataset ;
import org.apache.jena.tdb.TDBFactory ;
+import org.apache.jena.tdb.sys.TDBInternal;
public class TestDynamicDatasetTDB extends AbstractTestDynamicDataset
{
@@ -31,6 +32,8 @@ public class TestDynamicDatasetTDB extends AbstractTestDynamicDataset
}
@Override
- protected void releaseDataset(Dataset ds) {}
+ protected void releaseDataset(Dataset ds) {
+ TDBInternal.expel(ds.asDatasetGraph());
+ }
}
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestGraphTDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestGraphTDB.java
index 31047d0..8851883 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestGraphTDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestGraphTDB.java
@@ -18,7 +18,6 @@
package org.apache.jena.tdb.store;
-import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.sparql.graph.AbstractTestGraphAddDelete ;
import org.apache.jena.tdb.ConfigTest ;
@@ -49,6 +48,7 @@ public class TestGraphTDB extends AbstractTestGraphAddDelete
@AfterClass public static void afterClass()
{
graphLocation.release() ;
+ TDBInternal.reset() ;
graphLocation.clearDirectory() ;
ConfigTest.deleteTestingDirDB() ;
}
@@ -56,15 +56,8 @@ public class TestGraphTDB extends AbstractTestGraphAddDelete
static Graph graph = null ;
@Before public void before()
{
- try {
+ if ( graph != null )
graph.clear() ;
- } catch (Exception ex)
- {
- Log.warn(this, "before() : "+ex.getMessage(), ex) ;
- // Problem - reset.
- beforeClass() ;
- }
-
}
@After public void after()
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestLoader.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestLoader.java
index 71a11ff..d9df478 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestLoader.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestLoader.java
@@ -35,6 +35,7 @@ import org.apache.jena.tdb.TDB ;
import org.apache.jena.tdb.TDBLoader ;
import org.apache.jena.tdb.base.file.Location ;
import org.apache.jena.tdb.setup.DatasetBuilderStd;
+import org.apache.jena.tdb.sys.TDBInternal;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
@@ -57,6 +58,7 @@ public class TestLoader extends BaseTest {
static public void afterClass() {
LogCtl.enable(ARQ.logExecName) ;
LogCtl.enable(TDB.logLoaderName) ;
+ TDBInternal.reset();
}
static DatasetGraphTDB fresh() {
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestStoreConnectionsMapped.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestStoreConnectionsMapped.java
index 471bf06..c292167 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestStoreConnectionsMapped.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/TestStoreConnectionsMapped.java
@@ -20,6 +20,7 @@ package org.apache.jena.tdb.store;
import org.apache.jena.tdb.base.block.FileMode ;
import org.apache.jena.tdb.sys.SystemTDB ;
+import org.apache.jena.tdb.sys.TDBInternal;
import org.apache.jena.tdb.sys.TestOps ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
@@ -39,6 +40,7 @@ public class TestStoreConnectionsMapped extends AbstractStoreConnections
public static void afterClassFileMode()
{
TestOps.setFileMode(mode) ;
+ TDBInternal.reset();
}
}
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransRestart.java b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransRestart.java
index ce1559a..3ad1501 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransRestart.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransRestart.java
@@ -37,6 +37,7 @@ import org.apache.jena.tdb.setup.DatasetBuilderStd;
import org.apache.jena.tdb.store.DatasetGraphTDB ;
import org.apache.jena.tdb.sys.Names ;
import org.apache.jena.tdb.sys.SystemTDB ;
+import org.apache.jena.tdb.sys.TDBInternal;
import org.junit.After ;
import org.junit.Before ;
import org.junit.Test ;
@@ -57,6 +58,7 @@ public class TestTransRestart extends BaseTest {
private static Quad quad2 = SSE.parseQuad("(_ <foo:bar> rdfs:label 'bar')") ;
@Before public void setup() {
+ TDBInternal.reset();
path = ConfigTest.getCleanDir() ;
location = Location.create (path) ;
if ( useTransactionsSetup )
@@ -93,6 +95,7 @@ public class TestTransRestart extends BaseTest {
}
private void cleanup() {
+ TDBInternal.reset();
if ( FileOps.exists(path)) {
FileOps.clearDirectory(path) ;
FileOps.deleteSilent(path) ;
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransactionTDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransactionTDB.java
index 396e236..85c8994 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransactionTDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransactionTDB.java
@@ -40,13 +40,13 @@ public class TestTransactionTDB extends AbstractTestTransactionLifecycle
@Before
public void before() {
- DIR = ConfigTest.getCleanDir();
TDBInternal.reset();
+ DIR = ConfigTest.getCleanDir();
}
@After
public void after() {
-
+ TDBInternal.reset();
FileOps.clearDirectory(DIR);
}
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java
index f85b047..f71fe3f 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue ;
import java.util.Iterator;
import org.apache.jena.assembler.Assembler ;
-import org.apache.jena.assembler.exceptions.AssemblerException ;
+import org.apache.jena.assembler.exceptions.AssemblerException;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.query.Dataset ;
@@ -37,8 +37,8 @@ import org.apache.jena.sys.JenaSystem;
import org.apache.jena.tdb.assembler.AssemblerTDB ;
import org.apache.jena.tdb.sys.TDBInternal;
import org.apache.jena.vocabulary.RDF ;
-import org.junit.AfterClass;
-import org.junit.Before;
+import org.junit.After;
+import org.junit.BeforeClass;
import org.junit.Test ;
@@ -55,11 +55,11 @@ public class TestTextDatasetAssembler extends AbstractTestTextAssembler {
private static final Resource customTextDocProducerSpec;
private static final Resource customDyadicTextDocProducerSpec;
- @Before public void clearBefore() {
+ @BeforeClass public static void clearBefore() {
TDBInternal.reset();
}
- @AfterClass public static void clearAfter() {
+ @After public void clearAfter() {
TDBInternal.reset();
}
@@ -67,6 +67,7 @@ public class TestTextDatasetAssembler extends AbstractTestTextAssembler {
public void testSimpleDatasetAssembler() {
Dataset dataset = (Dataset) Assembler.general.open(spec1);
assertTrue(dataset.getContext().get(TextQuery.textIndex) instanceof TextIndexLucene);
+ dataset.close();
}
@Test(expected = AssemblerException.class)
@@ -101,7 +102,6 @@ public class TestTextDatasetAssembler extends AbstractTestTextAssembler {
dsgText.begin(ReadWrite.WRITE);
dsgText.add(G, S, P, O);
dsgText.commit();
- dataset.close();
}
static {