jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1165079 - in /incubator/jena/Experimental/TxTDB/trunk/src: main/java/com/hp/hpl/jena/tdb/ main/java/com/hp/hpl/jena/tdb/sys/ test/java/com/hp/hpl/jena/tdb/base/buffer/ test/java/com/hp/hpl/jena/tdb/base/recordfile/ test/java/com/hp/hpl/jen...
Date Sun, 04 Sep 2011 17:16:59 GMT
Author: andy
Date: Sun Sep  4 17:16:59 2011
New Revision: 1165079

URL: http://svn.apache.org/viewvc?rev=1165079&view=rev
Log:
Fix order depenedence of running tests.

Modified:
    incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java
    incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
    incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java
    incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java
    incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java
    incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java
    incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java

Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1165079&r1=1165078&r2=1165079&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java Sun
Sep  4 17:16:59 2011
@@ -14,8 +14,6 @@ import org.openjena.riot.SysRIOT ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
-import arq.cmdline.ModSymbol ;
-
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.ARQ ;

Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java?rev=1165079&r1=1165078&r2=1165079&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
(original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
Sun Sep  4 17:16:59 2011
@@ -191,7 +191,7 @@ public class SystemTDB
 //    public static boolean getNullOut()
 //    { return SystemTDB.NullOut ; }
 
-    /** null out (wuth the FillByte) freed up space in buffers */
+    /** null out (with the FillByte) freed up space in buffers */
     public static boolean NullOut = false ;
     
     /** FillByte value for NullOut */

Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java?rev=1165079&r1=1165078&r2=1165079&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java
(original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java
Sun Sep  4 17:16:59 2011
@@ -14,17 +14,25 @@ import com.hp.hpl.jena.tdb.base.buffer.P
 import com.hp.hpl.jena.tdb.sys.SystemTDB;
 
 
+import org.junit.AfterClass ;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openjena.atlas.junit.BaseTest ;
 
 public class TestPtrBuffer extends BaseTest
 {
-    @BeforeClass static public void before()
+    static boolean originalNullOut ; 
+    @BeforeClass static public void beforeClass()
     {
+        originalNullOut = SystemTDB.NullOut ;
         SystemTDB.NullOut = true ;    
     }
     
+    @AfterClass static public void afterClass()
+    {
+        SystemTDB.NullOut = originalNullOut ;    
+    }
+    
     // Testing the test framework!
     @Test public void ptrbuffer01()
     {

Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java?rev=1165079&r1=1165078&r2=1165079&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java
(original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java
Sun Sep  4 17:16:59 2011
@@ -13,6 +13,7 @@ import java.util.Iterator;
 import java.util.List;
 
 
+import org.junit.AfterClass ;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openjena.atlas.junit.BaseTest ;
@@ -24,14 +25,20 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
 
 public class TestRecordBuffer extends BaseTest
 {
-    static RecordFactory recordFactory  ;
+    static RecordFactory recordFactory = new RecordFactory(RecordLib.TestRecordLength, 0)
; ;
     
-    @BeforeClass static public void before()
+    static boolean originalNullOut ; 
+    @BeforeClass static public void beforeClass()
     {
-        recordFactory = new RecordFactory(RecordLib.TestRecordLength, 0) ;
+        originalNullOut = SystemTDB.NullOut ;
         SystemTDB.NullOut = true ;    
     }
     
+    @AfterClass static public void afterClass()
+    {
+        SystemTDB.NullOut = originalNullOut ;    
+    }
+
     @Test public void recBuffer01()
     {
         RecordBuffer rb = make(4, 4) ;

Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java?rev=1165079&r1=1165078&r2=1165079&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java
(original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java
Sun Sep  4 17:16:59 2011
@@ -6,6 +6,7 @@
 
 package com.hp.hpl.jena.tdb.base.recordfile;
 
+import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
 import org.openjena.atlas.junit.BaseTest ;
@@ -27,11 +28,18 @@ public class TestRecordBufferPage extend
     static final int TestNumRecord  = 3 ;           // Size, in bytes.
     static RecordFactory factory = new RecordFactory(2, 0) ; 
     
-    @BeforeClass static public void before()
+    static boolean originalNullOut ; 
+    @BeforeClass static public void beforeClass()
     {
+        originalNullOut = SystemTDB.NullOut ;
         SystemTDB.NullOut = true ;    
     }
     
+    @AfterClass static public void afterClass()
+    {
+        SystemTDB.NullOut = originalNullOut ;    
+    }
+
     @Test public void recBufferPage01()
     {
         BlockMgr blkMgr = makeBlockMgr() ;

Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java?rev=1165079&r1=1165078&r2=1165079&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java
(original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTree.java
Sun Sep  4 17:16:59 2011
@@ -16,20 +16,20 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
 
 public class TestBPlusTree extends TestRangeIndex
 {
-    static boolean b ;
-    @BeforeClass public static void before()
-    { 
+    static boolean originalNullOut ; 
+    @BeforeClass static public void beforeClass()
+    {
         BPlusTreeParams.CheckingNode = true ;
         //BPlusTreeParams.CheckingTree = true ;   // Breaks with block tracking.
-        b = SystemTDB.NullOut ;
-        SystemTDB.NullOut = true ;
+        originalNullOut = SystemTDB.NullOut ;
+        SystemTDB.NullOut = true ;    
     }
     
-    @AfterClass public static void after()
-    { 
-        SystemTDB.NullOut = b ;
+    @AfterClass static public void afterClass()
+    {
+        SystemTDB.NullOut = originalNullOut ;    
     }
-    
+
     
     @Override
     protected RangeIndex makeRangeIndex(int order, int minRecords)

Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java?rev=1165079&r1=1165078&r2=1165079&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java
(original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java
Sun Sep  4 17:16:59 2011
@@ -22,10 +22,13 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
 
 public class TestExtHash extends TestIndex
 {
+
+    static boolean originalNullOut ; 
     static boolean b ; 
 
     @BeforeClass static public void setup()
     {
+        originalNullOut = SystemTDB.NullOut ;
         SystemTDB.NullOut = true ;
         ExtHash.Checking = true ;
         ExtHash.Logging = false ;
@@ -36,6 +39,7 @@ public class TestExtHash extends TestInd
     @AfterClass static public void teardown()
     {
         BlockMgrFactory.AddTracker = b  ;
+        SystemTDB.NullOut = originalNullOut ;
     }
 
     @Override



Mime
View raw message