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/10/09 20:51:08 UTC
svn commit: r1396195 - in
/jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test: SDBTestAll.java
SDBTestSetup.java
Author: andy
Date: Tue Oct 9 18:51:08 2012
New Revision: 1396195
URL: http://svn.apache.org/viewvc?rev=1396195&view=rev
Log:
Delete derby log file after test run
Modified:
jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestAll.java
jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestSetup.java
Modified: jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestAll.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestAll.java?rev=1396195&r1=1396194&r2=1396195&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestAll.java (original)
+++ jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestAll.java Tue Oct 9 18:51:08 2012
@@ -18,23 +18,37 @@
package com.hp.hpl.jena.sdb.test;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
+import org.openjena.atlas.lib.FileOps ;
-/** Not quite all, yet: Does not yet include the model tests which need to be the linked to the store descriptions */
+/** Not quite all, yet: Does not yet include the model tests which need to be linked to the store descriptions */
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- SDBTestSetup.class , // Must be first
SDBTestMisc.class,
SDBQueryTestSuite.class,
SDBUpdateTestSuite.class
} )
-/** Derby needs this before the tests;
- sdbconfig --sdb testing/StoreDescSimple/derby-layout1.ttl --format
- sdbconfig --sdb testing/StoreDesc/derby-hash.ttl --format
- sdbconfig --sdb testing/StoreDesc/derby-index.ttl --format
- */
-
public class SDBTestAll
-{ }
+{
+ /* Derby needs this before the tests;
+ sdbconfig --sdb testing/StoreDescSimple/derby-layout1.ttl --format
+ sdbconfig --sdb testing/StoreDesc/derby-hash.ttl --format
+ sdbconfig --sdb testing/StoreDesc/derby-index.ttl --format
+ */
+
+ @BeforeClass public static void beforeClass() {
+ FileOps.ensureDir("target") ;
+ FileOps.ensureDir("target/Derby-test") ;
+ sdb.sdbconfig.main("--sdb=testing/StoreDescSimple/derby-layout1.ttl", "--format") ;
+ sdb.sdbconfig.main("--sdb=testing/StoreDesc/derby-hash.ttl", "--format") ;
+ sdb.sdbconfig.main("--sdb=testing/StoreDesc/derby-index.ttl", "--format") ;
+ }
+
+ @AfterClass public static void afterClass() {
+ FileOps.deleteSilent("derby.log") ;
+ }
+}
Modified: jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestSetup.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestSetup.java?rev=1396195&r1=1396194&r2=1396195&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestSetup.java (original)
+++ jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/SDBTestSetup.java Tue Oct 9 18:51:08 2012
@@ -18,14 +18,9 @@
package com.hp.hpl.jena.sdb.test;
-import org.junit.AfterClass ;
-import org.junit.BeforeClass ;
-import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.FileOps ;
-public class SDBTestSetup extends BaseTest
+public class SDBTestSetup
{
public static final String testDirSDB = "testing/" ;
public static final String manifestMain = testDirSDB + "manifest-sdb.ttl" ;
@@ -37,23 +32,4 @@ public class SDBTestSetup extends BaseTe
public static final String storeList = testDirSDB+"store-list.ttl" ;
public static final String storeListSimple = testDirSDB+"store-list-simple.ttl" ;
- /* Derby needs this before the tests;
- sdbconfig --sdb testing/StoreDescSimple/derby-layout1.ttl --format
- sdbconfig --sdb testing/StoreDesc/derby-hash.ttl --format
- sdbconfig --sdb testing/StoreDesc/derby-index.ttl --format
- */
-
- @BeforeClass public static void beforeClass() {
- FileOps.ensureDir("target") ;
- FileOps.ensureDir("target/Derby-test") ;
- sdb.sdbconfig.main("--sdb=testing/StoreDescSimple/derby-layout1.ttl", "--format") ;
- sdb.sdbconfig.main("--sdb=testing/StoreDesc/derby-hash.ttl", "--format") ;
- sdb.sdbconfig.main("--sdb=testing/StoreDesc/derby-index.ttl", "--format") ;
- }
-
- @AfterClass public static void afterClass() {
- }
-
- @Test public void dummy() {}
-
}