You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/12/19 15:49:05 UTC
[4/5] git commit: Fixed some warnings
Fixed some warnings
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/97425c6a
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/97425c6a
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/97425c6a
Branch: refs/heads/develop
Commit: 97425c6a08c064d8772d141ea9ef4c54c010941a
Parents: a0b38a5
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Dec 19 15:37:26 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 19 15:37:26 2013 +0100
----------------------------------------------------------------------
.../commons/sesame/rio/ical/TestICalParser.java | 4 +++-
.../commons/sesame/rio/rss/TestAtomParser.java | 4 +++-
.../commons/sesame/rio/rss/TestRSSParser.java | 4 +++-
.../commons/sesame/rio/vcard/TestVCardParser.java | 4 +++-
.../apache/marmotta/kiwi/test/PersistenceTest.java | 6 +++---
.../apache/marmotta/kiwi/test/RepositoryTest.java | 17 +++++++++--------
.../kiwi/test/generator/SnowflakeTest.java | 1 +
.../kiwi/test/generator/UUIDRandomTest.java | 1 +
.../marmotta/kiwi/test/generator/UUIDTimeTest.java | 1 +
.../test/sesame/repository/KiWiRepositoryTest.java | 8 --------
10 files changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java b/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
index 09a1698..30353b7 100644
--- a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
+++ b/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
@@ -20,6 +20,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
+import info.aduna.iteration.Iterations;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -93,7 +95,7 @@ public class TestICalParser {
}
assertTrue(connection.size() > 0);
- int count = connection.getStatements(null, null, null, false).asList().size();
+ int count = Iterations.asList(connection.getStatements(null, null, null, false)).size();
assertTrue(count > 0);
BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
index 311daec..a643277 100644
--- a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
+++ b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
@@ -34,6 +34,8 @@ import org.openrdf.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.aduna.iteration.Iterations;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -84,7 +86,7 @@ public class TestAtomParser {
}
assertTrue(connection.size() > 0);
- int count = connection.getStatements(null, null, null, false).asList().size();
+ int count = Iterations.asList(connection.getStatements(null, null, null, false)).size();
assertTrue(count > 0);
BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql).replaceAll("http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/rdfa1.1/","http://localhost/rdfa/"));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
index 305f016..7454c50 100644
--- a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
+++ b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
@@ -34,6 +34,8 @@ import org.openrdf.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.aduna.iteration.Iterations;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -84,7 +86,7 @@ public class TestRSSParser {
}
assertTrue(connection.size() > 0);
- int count = connection.getStatements(null, null, null, false).asList().size();
+ int count = Iterations.asList(connection.getStatements(null, null, null, false)).size();
assertTrue(count > 0);
BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql).replaceAll("http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/rdfa1.1/","http://localhost/rdfa/"));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java b/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
index c34d92a..aab8242 100644
--- a/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
+++ b/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
@@ -38,6 +38,8 @@ import org.openrdf.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.aduna.iteration.Iterations;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -89,7 +91,7 @@ public class TestVCardParser {
}
assertTrue(connection.size() > 0);
- int count = connection.getStatements(null, null, null, false).asList().size();
+ int count = Iterations.asList(connection.getStatements(null, null, null, false)).size();
assertTrue(count > 0);
BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql).replaceAll("http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/rdfa1.1/","http://localhost/rdfa/"));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
index 69cb81e..9eff945 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
@@ -1018,7 +1018,7 @@ public class PersistenceTest {
connection.storeTriple(triple2);
// check querying within transaction
- List<Statement> result1 = connection.listTriples(subject,null,null,null,false, true).asList();
+ List<Statement> result1 = Iterations.asList(connection.listTriples(subject,null,null,null,false, true));
Assert.assertThat(result1,hasItems((Statement)triple1,(Statement)triple2));
Assert.assertEquals(2, connection.getSize());
@@ -1027,7 +1027,7 @@ public class PersistenceTest {
connection.commit();
- List<Statement> result2 = connection.listTriples(subject,null,null,null,false, true).asList();
+ List<Statement> result2 = Iterations.asList(connection.listTriples(subject,null,null,null,false, true));
Assert.assertThat(result2,hasItems((Statement)triple1,(Statement)triple2));
Assert.assertEquals(2, connection.getSize());
@@ -1039,7 +1039,7 @@ public class PersistenceTest {
// clear cache and test again
persistence.clearCache();
- List<Statement> result3 = connection.listTriples(subject,null,null,null,false, true).asList();
+ List<Statement> result3 = Iterations.asList(connection.listTriples(subject,null,null,null,false, true));
Assert.assertThat(result3,hasItems((Statement)triple1,(Statement)triple2));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
index ce2adae..0f752b7 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
@@ -44,6 +44,8 @@ import org.openrdf.rio.RDFParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.aduna.iteration.Iterations;
+
import java.io.IOException;
import java.io.InputStream;
import java.sql.SQLException;
@@ -53,9 +55,7 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.*;
-import static org.hamcrest.Matchers.is;
import static org.junit.Assume.assumeThat;
/**
@@ -162,6 +162,7 @@ public class RepositoryTest {
* @throws RepositoryException
*/
@Test
+ @SuppressWarnings("unchecked")
public void testNamespaces() throws RepositoryException {
RepositoryConnection connection = repository.getConnection();
@@ -173,9 +174,9 @@ public class RepositoryTest {
Assert.assertEquals("http://localhost/ns1/", connection.getNamespace("ns1"));
Assert.assertEquals("http://localhost/ns2/", connection.getNamespace("ns2"));
- Assert.assertEquals(2, connection.getNamespaces().asList().size());
+ Assert.assertEquals(2, Iterations.asList(connection.getNamespaces()).size());
Assert.assertThat(
- connection.getNamespaces().asList(),
+ Iterations.asList(connection.getNamespaces()),
CoreMatchers.<Namespace>hasItems(
hasProperty("name", is("http://localhost/ns1/")),
hasProperty("name", is("http://localhost/ns2/"))
@@ -189,7 +190,7 @@ public class RepositoryTest {
Assert.assertEquals("http://localhost/ns3/", connection.getNamespace("ns1"));
Assert.assertThat(
- connection.getNamespaces().asList(),
+ Iterations.asList(connection.getNamespaces()),
CoreMatchers.<Namespace>hasItems(
hasProperty("name", is("http://localhost/ns3/")),
hasProperty("name", is("http://localhost/ns2/"))
@@ -203,7 +204,7 @@ public class RepositoryTest {
connection.commit();
connection.begin();
- Assert.assertEquals(1, connection.getNamespaces().asList().size());
+ Assert.assertEquals(1, Iterations.asList(connection.getNamespaces()).size());
connection.commit();
@@ -313,7 +314,7 @@ public class RepositoryTest {
connectionRDF.add(rdfXML, "http://localhost/srfg/", RDFFormat.RDFXML);
connectionRDF.commit();
- oldTriples = connectionRDF.getStatements(null,null,null,true).asList();
+ oldTriples = Iterations.asList(connectionRDF.getStatements(null,null,null,true));
oldsize = connectionRDF.size();
} finally {
connectionRDF.close();
@@ -329,7 +330,7 @@ public class RepositoryTest {
connection.add(rdfXML, "http://localhost/srfg/", RDFFormat.RDFXML);
connection.commit();
- newTriples = connection.getStatements(null,null,null,true).asList();
+ newTriples = Iterations.asList(connection.getStatements(null,null,null,true));
newsize = connection.size();
} finally {
connection.commit();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java
index 3bd0402..9e153b0 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java
@@ -54,6 +54,7 @@ public class SnowflakeTest {
while(System.currentTimeMillis() < start + 5000) {
long id = generator.getId(null,null);
count++;
+ log.trace("Generated ID: {}", id);
}
log.info("generated {} ids ({}/sec)", count, count/5);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
index b6329a4..43debb5 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
@@ -57,6 +57,7 @@ public class UUIDRandomTest {
while(System.currentTimeMillis() < start + 5000) {
long id = generator.getId(null,null);
count++;
+ log.trace("Generated ID: {}", id);
}
log.info("generated {} ids ({}/sec)", count, count/5);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
index 5c58fcd..43dea59 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
@@ -57,6 +57,7 @@ public class UUIDTimeTest {
while(System.currentTimeMillis() < start + 5000) {
long id = generator.getId(null,null);
count++;
+ log.trace("Generated ID: {}", id);
}
log.info("generated {} ids ({}/sec)", count, count/5);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
index 7291859..5dc25bb 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
@@ -20,18 +20,10 @@ package org.apache.marmotta.kiwi.test.sesame.repository;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.sail.KiWiStore;
import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner;
-import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryTest;
import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailException;
-import org.openrdf.sail.helpers.SailWrapper;
-
-import java.sql.SQLException;
-
-import static org.junit.Assert.fail;
/**
* Run the {@link RepositoryTest}s.