svn commit: r1349018 - /jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java

[an...@apache.org]

Author: andy
Date: Mon Jun 11 21:19:08 2012
New Revision: 1349018

URL: http://svn.apache.org/viewvc?rev=1349018&view=rev
Log:
Use fresh directories in tests.

Modified:
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java

Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java?rev=1349018&r1=1349017&r2=1349018&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java Mon Jun 11 21:19:08 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.tdb;
 
-import org.junit.AfterClass ;
-import org.junit.BeforeClass ;
+import org.junit.After ;
+import org.junit.Before ;
 import org.junit.Test ;
 import org.openjena.atlas.junit.BaseTest ;
 import org.openjena.atlas.lib.FileOps ;
@@ -30,23 +30,24 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
 import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
 import com.hp.hpl.jena.tdb.sys.DatasetGraphMakerTDB ;
+import com.hp.hpl.jena.tdb.sys.SystemTDB ;
 import com.hp.hpl.jena.tdb.sys.TDBMaker ;
 import com.hp.hpl.jena.tdb.sys.TDBMakerTxn ;
 import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
 
 public class TestTDBFactory extends BaseTest
 {
-    static final String DIR = ConfigTest.getTestingDirDB() ; 
+    final String DIR = SystemTDB.isWindows ? ConfigTest.getTestingDirUnique() : ConfigTest.getTestingDirDB() ;
     
     static Quad quad1 = SSE.parseQuad("(_ <s> <p> 1)") ;
     static Quad quad2 = SSE.parseQuad("(_ <s> <p> 1)") ;
     
-    @BeforeClass public static void beforeClass()
+    @Before public void before()
     {
         FileOps.clearDirectory(DIR) ; 
     }
     
-    @AfterClass public static void afterClass()
+    @After public void after()
     {
         FileOps.clearDirectory(DIR) ; 
     }