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 2013/09/12 18:38:59 UTC
svn commit: r1522655 - in
/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb: ConfigTest.java
base/file/TestMetaFile.java graph/TestPrefixMappingTDB.java
Author: andy
Date: Thu Sep 12 16:38:59 2013
New Revision: 1522655
URL: http://svn.apache.org/r1522655
Log:
JENA-553 : tidy up running on Windows (part II)
Modified:
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/ConfigTest.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestMetaFile.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/ConfigTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/ConfigTest.java?rev=1522655&r1=1522654&r2=1522655&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/ConfigTest.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/ConfigTest.java Thu Sep 12 16:38:59 2013
@@ -33,8 +33,6 @@ public class ConfigTest
private static void init()
{
- if ( initialized )
- return ;
FileOps.ensureDir("target") ;
FileOps.ensureDir(testingDir) ;
FileOps.ensureDir(testingDirDB) ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestMetaFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestMetaFile.java?rev=1522655&r1=1522654&r2=1522655&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestMetaFile.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestMetaFile.java Thu Sep 12 16:38:59 2013
@@ -18,24 +18,25 @@
package com.hp.hpl.jena.tdb.base.file;
-import java.io.File;
-
+import java.io.File ;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.After ;
+import org.junit.Before ;
+import org.junit.Test ;
-import com.hp.hpl.jena.tdb.ConfigTest;
+import com.hp.hpl.jena.tdb.ConfigTest ;
import com.hp.hpl.jena.tdb.sys.Names ;
public class TestMetaFile extends BaseTest
{
- static String testfile = ConfigTest.getTestingDir()+"/file" ;
- static String testfileMeta = ConfigTest.getTestingDir()+"/file."+Names.extMeta ;
+ String testfile = null ;
+ String testfileMeta = null ;
@Before public void before()
{
+ testfile = ConfigTest.getTestingDir()+"/file" ;
+ testfileMeta = ConfigTest.getTestingDir()+"/file."+Names.extMeta ;
File f = new File(testfileMeta) ;
f.delete() ;
}
@@ -63,10 +64,10 @@ public class TestMetaFile extends BaseTe
// Test MetaBase
- @AfterClass public static void afterClass()
+ @After public void afterClass()
{ clear() ; }
- private static void clear()
+ private void clear()
{
File f = new File(testfileMeta) ;
f.delete() ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java?rev=1522655&r1=1522654&r2=1522655&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java Thu Sep 12 16:38:59 2013
@@ -141,7 +141,7 @@ public class TestPrefixMappingTDB extend
assertEquals("http://test", ns) ;
graph.close();
}
- ConfigTest.deleteTestingDirDB() ;
+ FileOps.deleteSilent(DB);
}
}