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/08/18 12:47:08 UTC
svn commit: r1374554 -
/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java
Author: andy
Date: Sat Aug 18 10:47:07 2012
New Revision: 1374554
URL: http://svn.apache.org/viewvc?rev=1374554&view=rev
Log:
Refactor txn pattern tests.
Modified:
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java?rev=1374554&r1=1374553&r2=1374554&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java Sat Aug 18 10:47:07 2012
@@ -29,13 +29,13 @@ public abstract class AbstractTestTransa
//MIGRATE
protected abstract Dataset create() ;
- @Test public void transaction_0()
+ @Test public void transaction_00()
{
Dataset ds = create() ;
assertTrue(ds.supportsTransactions()) ;
}
- @Test public void transaction_1()
+ @Test public void transaction_01()
{
Dataset ds = create() ;
ds.begin(ReadWrite.READ) ;
@@ -44,7 +44,7 @@ public abstract class AbstractTestTransa
assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_2()
+ @Test public void transaction_02()
{
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
@@ -53,7 +53,7 @@ public abstract class AbstractTestTransa
assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_3()
+ @Test public void transaction_03()
{
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
@@ -62,7 +62,7 @@ public abstract class AbstractTestTransa
assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_4()
+ @Test public void transaction_04()
{
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
@@ -73,7 +73,7 @@ public abstract class AbstractTestTransa
assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_5()
+ @Test public void transaction_05()
{
Dataset ds = create() ;
ds.begin(ReadWrite.WRITE) ;
@@ -84,7 +84,7 @@ public abstract class AbstractTestTransa
assertFalse(ds.isInTransaction()) ;
}
- @Test public void transaction_6()
+ @Test public void transaction_06()
{
// .end is not necessary
Dataset ds = create() ;
@@ -98,60 +98,63 @@ public abstract class AbstractTestTransa
ds.abort() ;
assertFalse(ds.isInTransaction()) ;
}
-
- @Test public void transaction_7()
+
+ // Patterns.
+ @Test public void transaction_07()
{
Dataset ds = create() ;
- ds.begin(ReadWrite.READ) ;
- assertTrue(ds.isInTransaction()) ;
- ds.commit() ;
- assertFalse(ds.isInTransaction()) ;
-
- ds.begin(ReadWrite.READ) ;
- assertTrue(ds.isInTransaction()) ;
- ds.commit() ;
- assertFalse(ds.isInTransaction()) ;
+ read1(ds) ;
+ read1(ds) ;
}
- @Test public void transaction_8()
+ @Test public void transaction_08()
{
Dataset ds = create() ;
- ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
- ds.commit() ;
- assertFalse(ds.isInTransaction()) ;
-
- ds.begin(ReadWrite.WRITE) ;
- assertTrue(ds.isInTransaction()) ;
- ds.commit() ;
- assertFalse(ds.isInTransaction()) ;
+ read2(ds) ;
+ read2(ds) ;
}
- @Test public void transaction_9()
+ @Test public void transaction_09()
{
Dataset ds = create() ;
- ds.begin(ReadWrite.WRITE) ;
+ write(ds) ;
+ write(ds) ;
+ }
+
+ @Test public void transaction_10()
+ {
+ Dataset ds = create() ;
+ write(ds) ;
+ read2(ds) ;
+ read2(ds) ;
+ write(ds) ;
+ read2(ds) ;
+ }
+
+ private void read1(Dataset ds)
+ {
+ ds.begin(ReadWrite.READ) ;
assertTrue(ds.isInTransaction()) ;
ds.commit() ;
assertFalse(ds.isInTransaction()) ;
ds.end() ;
- assertFalse(ds.isInTransaction()) ;
-
+ }
+
+ private void read2(Dataset ds)
+ {
ds.begin(ReadWrite.READ) ;
assertTrue(ds.isInTransaction()) ;
- ds.commit() ;
- assertFalse(ds.isInTransaction()) ;
ds.end() ;
assertFalse(ds.isInTransaction()) ;
+ }
- ds.begin(ReadWrite.READ) ;
+ private void write(Dataset ds)
+ {
+ ds.begin(ReadWrite.WRITE) ;
assertTrue(ds.isInTransaction()) ;
ds.commit() ;
assertFalse(ds.isInTransaction()) ;
ds.end() ;
- assertFalse(ds.isInTransaction()) ;
}
-
-
}