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 2012/06/05 21:46:52 UTC
svn commit: r1346551 - in
/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction:
AbstractTestTransSeq.java TestTransSequentialDisk.java
TestTransSequentialMem.java
Author: andy
Date: Tue Jun 5 19:46:52 2012
New Revision: 1346551
URL: http://svn.apache.org/viewvc?rev=1346551&view=rev
Log:
Re-org store release/connect tests.
Modified:
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestTransSeq.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialDisk.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialMem.java
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestTransSeq.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestTransSeq.java?rev=1346551&r1=1346550&r2=1346551&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestTransSeq.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestTransSeq.java Tue Jun 5 19:46:52 2012
@@ -535,10 +535,30 @@ public abstract class AbstractTestTransS
StoreConnection sConn2 = getStoreConnection() ;
}
- @Test
+ @Test(expected=TDBTransactionException.class)
public void trans_52()
{
- // Fails for in-memory because the sttae is lost on StoreConnection.release
+ // Expel.
+ // Only applies to non-memory.
+ StoreConnection sConn = getStoreConnection() ;
+ DatasetGraphTxn dsgR1 = sConn.begin(ReadWrite.READ) ;
+ StoreConnection.release(sConn.getLocation()) ;
+ }
+
+ @Test(expected=TDBTransactionException.class)
+ public void trans_53()
+ {
+ // Expel.
+ StoreConnection sConn = getStoreConnection() ;
+ DatasetGraphTxn dsgR1 = sConn.begin(ReadWrite.WRITE) ;
+ StoreConnection.release(sConn.getLocation()) ;
+ }
+
+
+ @Test
+ public void trans_54()
+ {
+ // Fails for in-memory because the state is lost on StoreConnection.release
StoreConnection sConn = getStoreConnection() ;
DatasetGraphTxn dsgR1 = sConn.begin(ReadWrite.READ) ;
@@ -561,6 +581,5 @@ public abstract class AbstractTestTransS
long x = Iter.count(dsgR2.find()) ;
assertEquals(2, x) ;
}
-
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialDisk.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialDisk.java?rev=1346551&r1=1346550&r2=1346551&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialDisk.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialDisk.java Tue Jun 5 19:46:52 2012
@@ -18,15 +18,13 @@
package com.hp.hpl.jena.tdb.transaction;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test ;
-import org.openjena.atlas.lib.FileOps;
-
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.tdb.ConfigTest;
-import com.hp.hpl.jena.tdb.StoreConnection;
-import com.hp.hpl.jena.tdb.sys.SystemTDB;
+import org.junit.After ;
+import org.junit.Before ;
+import org.openjena.atlas.lib.FileOps ;
+
+import com.hp.hpl.jena.tdb.ConfigTest ;
+import com.hp.hpl.jena.tdb.StoreConnection ;
+import com.hp.hpl.jena.tdb.sys.SystemTDB ;
/** Basic tests and tests of ordering (single thread) */
public class TestTransSequentialDisk extends AbstractTestTransSeq
@@ -50,25 +48,4 @@ public class TestTransSequentialDisk ext
{
return StoreConnection.make(DIR) ;
}
-
- @Test(expected=TDBTransactionException.class)
- public void trans_60()
- {
- // Expel.
- // Only applies to non-memory.
- StoreConnection sConn = getStoreConnection() ;
- DatasetGraphTxn dsgR1 = sConn.begin(ReadWrite.READ) ;
- StoreConnection.release(sConn.getLocation()) ;
- }
-
- @Test(expected=TDBTransactionException.class)
- public void trans_61()
- {
- // Expel.
- StoreConnection sConn = getStoreConnection() ;
- DatasetGraphTxn dsgR1 = sConn.begin(ReadWrite.WRITE) ;
- StoreConnection.release(sConn.getLocation()) ;
- }
-
-
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialMem.java?rev=1346551&r1=1346550&r2=1346551&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialMem.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransSequentialMem.java Tue Jun 5 19:46:52 2012
@@ -41,7 +41,10 @@ public class TestTransSequentialMem exte
return StoreConnection.make(Location.mem()) ;
}
- @Override
- @Test
- public void trans_52() {}
+ // release/connect - meaningless in-memory.
+ @Override @Test public void trans_50() {}
+ @Override @Test public void trans_51() {}
+ @Override @Test public void trans_52() {}
+ @Override @Test public void trans_53() {}
+ @Override @Test public void trans_54() {}
}