You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by en...@apache.org on 2014/03/16 19:08:42 UTC
git commit: CLEREZZA-895 Implemented a cleaner way of execute the
tests only if virtuoso.test property is set to true
Repository: clerezza
Updated Branches:
refs/heads/master 8f0949651 -> f5f5112dd
CLEREZZA-895 Implemented a cleaner way of execute the tests only if virtuoso.test property is set to true
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f5f5112d
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f5f5112d
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f5f5112d
Branch: refs/heads/master
Commit: f5f5112dd99f5bf2d372b7ed8f644a76e67606db
Parents: 8f09496
Author: enridaga <en...@apache.org>
Authored: Sun Mar 16 18:08:37 2014 +0000
Committer: enridaga <en...@apache.org>
Committed: Sun Mar 16 18:08:37 2014 +0000
----------------------------------------------------------------------
.../rdf/virtuoso/storage/ConnectionTest.java | 25 +-----
.../java/rdf/virtuoso/storage/RdfIOTest.java | 51 ++----------
.../java/rdf/virtuoso/storage/TestUtils.java | 4 +-
.../rdf/virtuoso/storage/ThreadSafetyTest.java | 31 ++-----
.../virtuoso/storage/VirtuosoMGraphTest.java | 85 +++-----------------
.../virtuoso/storage/access/DataAccessTest.java | 30 ++-----
.../access/VirtuosoWeightedProviderTest.java | 46 +----------
7 files changed, 38 insertions(+), 234 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f5f5112d/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ConnectionTest.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ConnectionTest.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ConnectionTest.java
index 87bb1a7..cfe6aa4 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ConnectionTest.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ConnectionTest.java
@@ -49,47 +49,28 @@ public class ConnectionTest {
@BeforeClass
public static void before() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
+ org.junit.Assume.assumeTrue(!TestUtils.SKIP);
connection = TestUtils.getConnection();
}
@Test
public void testIsClosed() {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
assertFalse(connection.isClosed());
}
@Test
public void testIsConnectionLost() {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
assertFalse(connection.isConnectionLost(0));
}
@Test
public void testIsReadOnly() throws VirtuosoException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
assertFalse(connection.isReadOnly());
}
@Test
public void testConnection() {
log.info("testConnection()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
try {
Statement st = connection.createStatement();
@@ -128,10 +109,6 @@ public class ConnectionTest {
@Test
public void test() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
DatabaseMetaData dm = connection.getMetaData();
log.debug("Username is {}", dm.getUserName());
Properties p = connection.getClientInfo();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f5f5112d/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/RdfIOTest.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/RdfIOTest.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/RdfIOTest.java
index fb62bf2..4bd02ee 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/RdfIOTest.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/RdfIOTest.java
@@ -40,6 +40,7 @@ import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,6 +55,11 @@ public class RdfIOTest {
static Logger log = LoggerFactory.getLogger(RdfIOTest.class);
static DataAccess da;
+ @BeforeClass
+ public static void assume(){
+ org.junit.Assume.assumeTrue(!TestUtils.SKIP);
+ }
+
/**
* Clean before any test
*
@@ -62,10 +68,7 @@ public class RdfIOTest {
*/
@Before
public void before() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
+
da = TestUtils.getProvider().createDataAccess();
mgraph = new VirtuosoMGraph(TEST_GRAPH_NAME, da);
mgraph.clear();
@@ -82,10 +85,6 @@ public class RdfIOTest {
@After
public void clear() throws VirtuosoException, ClassNotFoundException,
SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.debug("Clearing graph <{}> of size {}", TEST_GRAPH_NAME,
mgraph.size());
// clear all resources
@@ -102,10 +101,6 @@ public class RdfIOTest {
@Test
public void xsdString() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Text an xsd:string");
TypedLiteral object = new TypedLiteralImpl("lorem ipsum", new UriRef(
XSD + "string"));
@@ -124,10 +119,6 @@ public class RdfIOTest {
@Test
public void longString() throws ClassNotFoundException, SQLException, InterruptedException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Test a long xsd:string");
StringBuilder longStr = new StringBuilder();
int c = 250000;
@@ -159,10 +150,6 @@ public class RdfIOTest {
@Test
public void subjectAsUriTest() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Test subject as UriRef");
NonLiteral subject;
@@ -184,10 +171,6 @@ public class RdfIOTest {
@Test
public void subjectAsBnodeTest() throws ClassNotFoundException,
SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Test subject as BNode");
NonLiteral subject;
@@ -210,10 +193,6 @@ public class RdfIOTest {
@Test
public void objectAsUriTest() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Test object as UriRef");
NonLiteral subject = new UriRef("urn:io-test:enridaga");
@@ -232,10 +211,6 @@ public class RdfIOTest {
@Test
public void objectAsBnodeTest() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Test object as Bnode");
NonLiteral subject = new UriRef("urn:io-test:subject");
@@ -262,10 +237,6 @@ public class RdfIOTest {
@Test
public void bnodesTest() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Test iterations and filter with bnode");
NonLiteral s1 = new BNode();
@@ -339,10 +310,6 @@ public class RdfIOTest {
@Test
public void sysconfigTest(){
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
SystemConfig sc = new SystemConfig();
MGraph systemGraph = mgraph;
@@ -362,10 +329,6 @@ public class RdfIOTest {
@Test
public void testUnicodeChars() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Text an xsd:string");
String s = "lorem ipsum è é £ ò ç à ù β ät ü ä";
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f5f5112d/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/TestUtils.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/TestUtils.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/TestUtils.java
index a720e4d..2ca6d3c 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/TestUtils.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/TestUtils.java
@@ -53,7 +53,7 @@ public class TestUtils {
static {
String skipProperty = System.getProperty("virtuoso.test");
if (skipProperty == null) {
- log.warn("virtuoso.skip property is not set. We skip tests by default.");
+ log.info("virtuoso.skip property is not set. We skip tests by default.");
SKIP = true;
} else
SKIP = !skipProperty.equals("true");
@@ -73,7 +73,7 @@ public class TestUtils {
private static void initProvider() throws ClassNotFoundException,
SQLException {
if (SKIP) {
- log.warn("SKIPPING ALL TESTS!");
+ log.warn("Skipping tests.");
return;
}
String host = System.getProperty("virtuoso.host");
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f5f5112d/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ThreadSafetyTest.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ThreadSafetyTest.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ThreadSafetyTest.java
index 17cb722..a3f30fd 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ThreadSafetyTest.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/ThreadSafetyTest.java
@@ -35,6 +35,7 @@ import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,12 +57,14 @@ public class ThreadSafetyTest {
private DataAccess da = null;
static Logger log = LoggerFactory.getLogger(ThreadSafetyTest.class);
+ @BeforeClass
+ public static void assume(){
+ org.junit.Assume.assumeTrue(!TestUtils.SKIP);
+ }
+
@Before
public void setUp() throws Exception {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
+
da = TestUtils.getProvider().createDataAccess();
da.clearGraph("ThreadSafetyTest");
mgraph = new VirtuosoMGraph("ThreadSafetyTest",
@@ -72,10 +75,6 @@ public class ThreadSafetyTest {
@After
public void tearDown() throws Exception {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
try {
executor.shutdown();
if (!executor.awaitTermination(5, TimeUnit.SECONDS)) {
@@ -92,10 +91,6 @@ public class ThreadSafetyTest {
@Test
public void testProduceFirstAndThenConsume() throws Exception {
log.info("testProduceFirstAndThenConsume()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// Produce first...
Future<Result> fp = executor.submit(new Producer("A", 100));
fp.get().assertResult();
@@ -114,10 +109,6 @@ public class ThreadSafetyTest {
@Test
public void testProduceAndConsumeSingle() throws Exception {
log.info("testProduceAndConsumeSingle()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
List<Task> tasks = Arrays.asList(
new Consumer("A", 100), new Producer("A", 100));
List<Future<Result>> futures = executor.invokeAll(tasks);
@@ -130,10 +121,6 @@ public class ThreadSafetyTest {
@Test
public void testProduceAndConsumeMultiple() throws Exception {
log.info("testProduceAndConsumeMultiple()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
List<Task> tasks = Arrays.asList(
new Consumer("A", 100), new Producer("A", 100),
new Consumer("B", 100), new Producer("B", 100),
@@ -149,10 +136,6 @@ public class ThreadSafetyTest {
@Test
public void testProduceAndConsumeMixed() throws Exception {
log.info("testProduceAndConsumeMixed()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
List<? extends Task> tasks = Arrays.asList(
new Consumer("A", 110), new Consumer("A", 170),
new Consumer("B", 100), new Consumer("B", 500),
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f5f5112d/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java
index 26fff47..c899d3b 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java
@@ -40,6 +40,8 @@ import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.impl.TypedLiteralImpl;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,6 +56,11 @@ public class VirtuosoMGraphTest {
static Logger log = LoggerFactory.getLogger(VirtuosoMGraphTest.class);
+ @BeforeClass
+ public static void assume(){
+ org.junit.Assume.assumeTrue(!TestUtils.SKIP);
+ }
+
/**
* Clean before any test
*
@@ -62,10 +69,7 @@ public class VirtuosoMGraphTest {
*/
@Before
public void before() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
+
da = TestUtils.getProvider().createDataAccess();
mgraph = new VirtuosoMGraph(TEST_GRAPH_NAME, da);
mgraph.clear();
@@ -85,10 +89,6 @@ public class VirtuosoMGraphTest {
@Test
public void testAddSingle() {
log.info("testAddSingle()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Triple triple = new Triple() {
@Override
@@ -116,10 +116,6 @@ public class VirtuosoMGraphTest {
@Test
public void testAddSingleTypedLiteral() {
log.info("testAddSingleTypedLiteral()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Triple triple = new Triple() {
@Override
@@ -143,14 +139,11 @@ public class VirtuosoMGraphTest {
assertTrue(mgraph.filter(enridaga, predicate, objectTyped).hasNext());
assertTrue(mgraph.filter(enridaga, predicate, objectTyped).next().equals(triple));
}
-
-// @Test
+
+ @Ignore
+ @Test
public void testAddSingleXMLLiteral() {
log.info("testAddSingleXMLLiteral()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Triple triple = new Triple() {
@Override
@@ -184,13 +177,8 @@ public class VirtuosoMGraphTest {
@Test
public void testFilter() {
log.info("testFilter(); Test filter(s,p,o)");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// We use testAdd to prepare this
testAddSingle();
-
Iterator<Triple> its = mgraph.filter(null, null, null);
while (its.hasNext()) {
@@ -220,10 +208,6 @@ public class VirtuosoMGraphTest {
@Test
public void testFilterSubject() {
log.info("testFilterSubject(); Test filter(s,null,null)");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// We use testAdd to prepare this
testAddSingle();
Iterator<Triple> it = mgraph.filter(enridaga, null, null);
@@ -244,10 +228,6 @@ public class VirtuosoMGraphTest {
@Test
public void testFilterSubjectBnode() throws VirtuosoException, SQLException, ClassNotFoundException {
log.info("testFilterSubjectBnode(); Test filter(s,null,null)");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
final BNode bn = new BNode();
// We use testAdd to prepare this
Triple triple = new Triple() {
@@ -304,10 +284,6 @@ public class VirtuosoMGraphTest {
@Test
public void testFilterPredicate() {
log.info("testFilterPredicate(); Test filter(null,p,null)");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// We use testAdd to prepare this
testAddSingle();
Iterator<Triple> it = mgraph.filter(null, predicate, null);
@@ -327,10 +303,6 @@ public class VirtuosoMGraphTest {
@Test
public void testFilterObject() {
log.info("testFilterObject(); Test filter(null,null,o)");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// We use testAdd to prepare this
testAddSingle();
Iterator<Triple> it = mgraph.filter(null, null, object);
@@ -350,10 +322,6 @@ public class VirtuosoMGraphTest {
@Test
public void testFilterObjectTyped() {
log.info("testFilterObjectTyped(); Test filter(null,null,o)");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// We use testAdd to prepare this
testAddSingleTypedLiteral();
Iterator<Triple> it = mgraph.filter(null, null, objectTyped);
@@ -370,13 +338,10 @@ public class VirtuosoMGraphTest {
assertTrue(found);
}
-// @Test
+ @Ignore
+ @Test
public void testFilterObjectXml() {
log.info("testFilterObjectXml(); Test filter(null,null,o)");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// We use testAdd to prepare this
testAddSingleXMLLiteral();
Iterator<Triple> it = mgraph.filter(null, null, objectXml);
@@ -396,10 +361,6 @@ public class VirtuosoMGraphTest {
@Test
public void testSize() {
log.info("testSize()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// We use testAdd to prepare this
testAddSingle();
// Should be 1 at this time
@@ -411,10 +372,6 @@ public class VirtuosoMGraphTest {
@Test
public void testIncreaseSize() {
log.info("testIncreaseSize()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
int beforeSize = mgraph.size();
Triple t = new Triple() {
@@ -441,10 +398,6 @@ public class VirtuosoMGraphTest {
@Test
public void testAddRemoveSize() {
log.info("testAddRemoveSize()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
int beforeSize = mgraph.size();
Triple t = new Triple() {
@@ -472,10 +425,6 @@ public class VirtuosoMGraphTest {
@Test
public void testGetGraphReadOnly() {
log.info("testGetGraphReadOnly()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Graph g = mgraph.getGraph();
Triple t = new Triple() {
@@ -507,10 +456,6 @@ public class VirtuosoMGraphTest {
@Test
public void testContains() {
log.info("testContains()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Triple t = new Triple() {
@Override
@@ -567,10 +512,6 @@ public class VirtuosoMGraphTest {
@After
public void clear() throws VirtuosoException, ClassNotFoundException,
SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.info("Clearing graph <{}> of size {}", TEST_GRAPH_NAME,
mgraph.size());
log.debug("Removing graph <{}>", TEST_GRAPH_NAME);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f5f5112d/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/DataAccessTest.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/DataAccessTest.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/DataAccessTest.java
index 725cf60..76ec921 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/DataAccessTest.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/DataAccessTest.java
@@ -10,6 +10,7 @@ import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -22,22 +23,19 @@ public class DataAccessTest {
static Logger log = LoggerFactory.getLogger(DataAccessTest.class);
+ @BeforeClass
+ public static void assume(){
+ org.junit.Assume.assumeTrue(!TestUtils.SKIP);
+ }
+
@Before
public void before() throws ClassNotFoundException, SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
da = TestUtils.getProvider().createDataAccess();
da.clearGraph( "urn:x-test:DataAccessTest" );
}
@After
public void after() {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
da.clearGraph( "urn:x-test:DataAccessTest" );
da.close();
da = null;
@@ -69,40 +67,24 @@ public class DataAccessTest {
@Test
public void test_Uri_Uri_Uri(){
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Triple t = new TripleImpl(new UriRef("urn:subject"), new UriRef("urn:predicate"), new UriRef("urn:object"));
testTriple(t);
}
@Test
public void test_Uri_Uri_PlainLiteral(){
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Triple t = new TripleImpl(new UriRef("urn:subject"), new UriRef("urn:predicate"), new PlainLiteralImpl("Lorem Ipsum"));
testTriple(t);
}
@Test
public void test_Uri_Uri_BNode(){
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Triple t = new TripleImpl(new UriRef("urn:subject"), new UriRef("urn:predicate"), new BNode());
testTriple(t);
}
@Test
public void testRenew(){
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
int i = 100;
while(i>0){
test_Uri_Uri_Uri();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f5f5112d/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/VirtuosoWeightedProviderTest.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/VirtuosoWeightedProviderTest.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/VirtuosoWeightedProviderTest.java
index 8d704ac..319232b 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/VirtuosoWeightedProviderTest.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/access/VirtuosoWeightedProviderTest.java
@@ -65,21 +65,15 @@ public class VirtuosoWeightedProviderTest {
@BeforeClass
public static void before() throws ClassNotFoundException, SQLException {
+ org.junit.Assume.assumeTrue(!TestUtils.SKIP);
+
log.info("Preparing VirtuosoWeightedProvider for test");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
wp = TestUtils.getProvider();
}
@Test
public void weight() {
log.info("Test setting the weight");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
int w = 200;
wp.setWeight(w);
assertTrue(wp.getWeight() == w);
@@ -88,10 +82,6 @@ public class VirtuosoWeightedProviderTest {
@Test
public void listGraphs() {
log.info("Test listGraphs()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Set<UriRef> gs = wp.listGraphs();
Iterator<UriRef> it = gs.iterator();
log.debug("Graphs:");
@@ -108,10 +98,6 @@ public class VirtuosoWeightedProviderTest {
@Test
public void listGraphsIsUnmodifiable() {
log.info("Test listGraphsIsUnmodifiable()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Set<UriRef> gs = wp.listGraphs();
boolean exception = false;
try {
@@ -128,10 +114,6 @@ public class VirtuosoWeightedProviderTest {
@Test
public void listMGraphs() {
log.info("Test listMGraphs()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
Set<UriRef> mg = wp.listMGraphs();
log.debug("Graphs:");
for (UriRef r : mg) {
@@ -153,10 +135,6 @@ public class VirtuosoWeightedProviderTest {
@Test
public void createMGraph() {
log.info("createMGraph()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
try {
MGraph mgraph = wp.createMGraph(new UriRef(TEST_GRAPH_URI));
assertNotNull(mgraph);
@@ -192,10 +170,6 @@ public class VirtuosoWeightedProviderTest {
@Test
public void createGraph() throws VirtuosoException, ClassNotFoundException,
SQLException {
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
MGraph smg = new SimpleMGraph();
Triple t = new Triple() {
@@ -230,10 +204,6 @@ public class VirtuosoWeightedProviderTest {
@Test
public void testEquals() {
log.info("testEquals()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
UriRef name = new UriRef(TEST_GRAPH_URI);
MGraph g = wp.createMGraph(name);
// Equals
@@ -250,10 +220,6 @@ public class VirtuosoWeightedProviderTest {
public void clear() throws VirtuosoException, ClassNotFoundException,
SQLException {
log.info("clear()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
log.debug("Removing test graphs <{}>", TEST_GRAPH_URI);
try {
wp.deleteTripleCollection(new UriRef(TEST_GRAPH_URI));
@@ -275,10 +241,6 @@ public class VirtuosoWeightedProviderTest {
@Test
public void testCreateEmptyMGraph(){
log.info("testCreateEmptyMGraph()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
// try {
UriRef ur = new UriRef("urn:my-empty-graph");
Assert.assertFalse(wp.listGraphs().contains(ur));
@@ -299,10 +261,6 @@ public class VirtuosoWeightedProviderTest {
@Test
public void testEmptyAndNonEmptyGraphs(){
log.info("testEmptyAndNonEmptyGraphs()");
- if (TestUtils.SKIP) {
- log.warn("SKIPPED");
- return;
- }
UriRef ur = new UriRef("urn:my-empty-graph");
UriRef nur = new UriRef("urn:my-non-empty-graph");