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 2011/09/04 19:11:17 UTC
svn commit: r1165077 - in /incubator/jena/Jena2/TDB/trunk: ./ src-dev/dev/
src/main/java/com/hp/hpl/jena/tdb/sys/
src/test/java/com/hp/hpl/jena/tdb/base/buffer/
src/test/java/com/hp/hpl/jena/tdb/base/recordfile/
src/test/java/com/hp/hpl/jena/tdb/index/...
Author: andy
Date: Sun Sep 4 17:11:17 2011
New Revision: 1165077
URL: http://svn.apache.org/viewvc?rev=1165077&view=rev
Log:
Fix order depenedence of running tests.
Modified:
incubator/jena/Jena2/TDB/trunk/.classpath
incubator/jena/Jena2/TDB/trunk/src-dev/dev/TS_Dev.java
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java
Modified: incubator/jena/Jena2/TDB/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/.classpath?rev=1165077&r1=1165076&r2=1165077&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/.classpath (original)
+++ incubator/jena/Jena2/TDB/trunk/.classpath Sun Sep 4 17:11:17 2011
@@ -4,7 +4,6 @@
<classpathentry excluding="**/.svn/" kind="src" path="src/test/java"/>
<classpathentry excluding="**/.svn/" kind="src" path="src-dev"/>
<classpathentry excluding="**" kind="src" path="resources"/>
-
<classpathentry kind="src" path="src-examples"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="lib" path="lib/icu4j-3.4.4.jar"/>
@@ -21,5 +20,8 @@
<classpathentry kind="lib" path="lib/jena-2.6.4-tests.jar" sourcepath="lib-src/jena-2.6.4-test-sources.jar"/>
<classpathentry kind="lib" path="lib/arq-2.8.9-SNAPSHOT-tests.jar" sourcepath="lib-src/arq-2.8.9-SNAPSHOT-test-sources.jar"/>
<classpathentry kind="lib" path="lib/arq-2.8.9-SNAPSHOT.jar" sourcepath="lib-src/arq-2.8.9-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="lib/commons-codec-1.4.jar"/>
+ <classpathentry kind="lib" path="lib/httpclient-4.1.2.jar"/>
+ <classpathentry kind="lib" path="lib/httpcore-4.1.2.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jena/Jena2/TDB/trunk/src-dev/dev/TS_Dev.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src-dev/dev/TS_Dev.java?rev=1165077&r1=1165076&r2=1165077&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src-dev/dev/TS_Dev.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src-dev/dev/TS_Dev.java Sun Sep 4 17:11:17 2011
@@ -14,11 +14,15 @@ import org.junit.runners.Suite ;
import org.openjena.atlas.junit.BaseTest ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderLib ;
+import com.hp.hpl.jena.tdb.graph.TS_Graph ;
+import com.hp.hpl.jena.tdb.index.TS_Index ;
import com.hp.hpl.jena.tdb.store.TS_Store ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
+ TS_Graph.class,
+ TS_Index.class,
TS_Store.class
})
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java?rev=1165077&r1=1165076&r2=1165077&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java Sun Sep 4 17:11:17 2011
@@ -181,7 +181,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/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java?rev=1165077&r1=1165076&r2=1165077&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java Sun Sep 4 17:11:17 2011
@@ -14,17 +14,27 @@ 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/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java?rev=1165077&r1=1165076&r2=1165077&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java Sun Sep 4 17:11:17 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/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java?rev=1165077&r1=1165076&r2=1165077&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java Sun Sep 4 17:11:17 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 ;
@@ -25,11 +26,19 @@ 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/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java?rev=1165077&r1=1165076&r2=1165077&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/index/ext/TestExtHash.java Sun Sep 4 17:11:17 2011
@@ -21,8 +21,10 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
public class TestExtHash extends TestIndex
{
+ static boolean oldNullOut ;
@BeforeClass static public void setup()
{
+ oldNullOut = SystemTDB.NullOut ;
SystemTDB.NullOut = true ;
ExtHash.Checking = true ;
ExtHash.Logging = false ;
@@ -30,7 +32,7 @@ public class TestExtHash extends TestInd
@AfterClass static public void teardown()
{
-
+ SystemTDB.NullOut = oldNullOut ;
}
@Override