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 2016/09/27 20:11:47 UTC
[5/6] jena git commit: JENA-1223: Incorporate review suggestions
JENA-1223: Incorporate review suggestions
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/779e85cf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/779e85cf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/779e85cf
Branch: refs/heads/master
Commit: 779e85cf4d66a0dcbfea41a657f262249c2d9f57
Parents: 2610908
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Sep 27 18:51:17 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Sep 27 18:51:17 2016 +0100
----------------------------------------------------------------------
.../sparql/core/mem/TestDatasetGraphInMemoryPromote.java | 2 +-
.../jena/sparql/transaction/AbstractTestTransPromote.java | 5 +++--
.../sparql/transaction/AbstractTestTransactionIsolation.java | 8 ++------
.../org/apache/jena/tdb/transaction/TestTransPromoteTDB.java | 2 +-
4 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/779e85cf/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java
index dbcfde0..644de58 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java
@@ -59,7 +59,7 @@ public class TestDatasetGraphInMemoryPromote extends AbstractTestTransPromote {
}
@Override
- protected Class<?> getTransactionExceptionClass() {
+ protected Class<JenaTransactionException> getTransactionExceptionClass() {
return JenaTransactionException.class ;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/779e85cf/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransPromote.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransPromote.java b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransPromote.java
index f7c7fcb..aec1b8f 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransPromote.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransPromote.java
@@ -81,7 +81,7 @@ public abstract class AbstractTestTransPromote {
// The exact class used by exceptions of the system under test.
// TDB transctions are in the TDBException hierarchy
// so can't be JenaTransactionException.
- protected abstract Class<?> getTransactionExceptionClass() ;
+ protected abstract Class<? extends Exception> getTransactionExceptionClass() ;
@Before
public void before() {
@@ -287,7 +287,8 @@ public abstract class AbstractTestTransPromote {
getTransactionExceptionClass()) ;
}
- private void expect(Runnable runnable, Class<?>...classes) {
+ @SafeVarargs
+ private final void expect(Runnable runnable, Class<? extends Exception>...classes) {
try {
runnable.run();
fail("Exception expected") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/779e85cf/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransactionIsolation.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransactionIsolation.java b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransactionIsolation.java
index 85a574f..f4d85cd 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransactionIsolation.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/AbstractTestTransactionIsolation.java
@@ -18,9 +18,8 @@
package org.apache.jena.sparql.transaction;
-import static org.apache.jena.query.ReadWrite.* ;
+import static org.apache.jena.query.ReadWrite.WRITE ;
-import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.sse.SSE ;
@@ -42,10 +41,7 @@ public abstract class AbstractTestTransactionIsolation {
// returns but the action of the ThreadTxn is not triggered
// until other.run() is called.
DatasetGraph dsg = create() ;
- ThreadAction other = ThreadTxn.threadTxnRead(dsg, ()-> {
- long x = Iter.count(dsg.find()) ;
- Assert.assertEquals(0, x) ;
- }) ;
+ ThreadAction other = ThreadTxn.threadTxnRead(dsg, ()-> Assert.assertTrue(dsg.isEmpty()) ) ;
dsg.begin(WRITE) ;
dsg.add(q1) ;
dsg.commit() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/779e85cf/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java
index 61ba5f1..c93ecb1 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java
@@ -66,7 +66,7 @@ public class TestTransPromoteTDB extends AbstractTestTransPromote {
}
@Override
- protected Class<?> getTransactionExceptionClass() {
+ protected Class<TDBTransactionException> getTransactionExceptionClass() {
return TDBTransactionException.class ;
}
}
\ No newline at end of file