[jboss-cvs] JBoss Messaging SVN: r7506 - in branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests: performance/journal and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-07-01 00:41:56 -0400 (Wed, 01 Jul 2009)
New Revision: 7506

Modified:
   branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOJournalCompactTest.java
   branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOSequentialFileFactoryTest.java
   branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/performance/journal/RealJournalImplAIOTest.java
   branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/performance/journal/RealJournalImplNIOTest.java
Log:
tweaks

Modified: branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOJournalCompactTest.java
===================================================================
--- branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOJournalCompactTest.java	2009-07-01 02:06:26 UTC (rev 7505)
+++ branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOJournalCompactTest.java	2009-07-01 04:41:56 UTC (rev 7506)
@@ -53,8 +53,6 @@
 {
    private static final Logger log = Logger.getLogger(NIOJournalCompactTest.class);
 
-   protected String journalDir = System.getProperty("user.home") + "/journal-test";
-
    private static final int NUMBER_OF_RECORDS = 1000;
 
    IDGenerator idGenerator = new TimeAndCounterIDGenerator();
@@ -595,7 +593,7 @@
    {
       super.setUp();
 
-      File file = new File(journalDir);
+      File file = new File(getTestDir());
 
       deleteDirectory(file);
 
@@ -608,7 +606,7 @@
    @Override
    protected SequentialFileFactory getFileFactory() throws Exception
    {
-      return new NIOSequentialFileFactory(journalDir);
+      return new NIOSequentialFileFactory(getTestDir());
    }
 
 }

Modified: branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOSequentialFileFactoryTest.java
===================================================================
--- branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOSequentialFileFactoryTest.java	2009-07-01 02:06:26 UTC (rev 7505)
+++ branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOSequentialFileFactoryTest.java	2009-07-01 04:41:56 UTC (rev 7506)
@@ -37,14 +37,13 @@
  */
 public class NIOSequentialFileFactoryTest extends SequentialFileFactoryTestBase
 {
-   protected String journalDir = System.getProperty("user.home") + "/journal-test";
 
    @Override
    protected void setUp() throws Exception
    {
       super.setUp();
 
-      File file = new File(journalDir);
+      File file = new File(getTestDir());
 
       deleteDirectory(file);
 
@@ -54,7 +53,7 @@
    @Override
    protected SequentialFileFactory createFactory()
    {
-      return new NIOSequentialFileFactory(journalDir);
+      return new NIOSequentialFileFactory(getTestDir());
    }
 
 }

Modified: branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/performance/journal/RealJournalImplAIOTest.java
===================================================================
--- branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/performance/journal/RealJournalImplAIOTest.java	2009-07-01 02:06:26 UTC (rev 7505)
+++ branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/performance/journal/RealJournalImplAIOTest.java	2009-07-01 04:41:56 UTC (rev 7506)
@@ -23,7 +23,6 @@
 package org.jboss.messaging.tests.performance.journal;
 
 import java.io.File;
-import java.util.concurrent.Executors;
 
 import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
 import org.jboss.messaging.core.journal.SequentialFileFactory;
@@ -41,8 +40,6 @@
 public class RealJournalImplAIOTest extends JournalImplTestUnit
 {
    private static final Logger log = Logger.getLogger(RealJournalImplAIOTest.class);
-   
-   protected String journalDir = System.getProperty("user.home") + "/journal-test";
       
    @Override
    protected void setUp() throws Exception
@@ -60,15 +57,15 @@
    
    protected SequentialFileFactory getFileFactory() throws Exception
    {
-      File file = new File(journalDir);
+      File file = new File(getTestDir());
       
-      log.debug("deleting directory " + journalDir);
+      log.debug("deleting directory " + file);
       
       deleteDirectory(file);
       
       file.mkdir();     
       
-      return new AIOSequentialFileFactory(journalDir);
+      return new AIOSequentialFileFactory(getTestDir());
    }
    
 }

Modified: branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/performance/journal/RealJournalImplNIOTest.java
===================================================================
--- branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/performance/journal/RealJournalImplNIOTest.java	2009-07-01 02:06:26 UTC (rev 7505)
+++ branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/performance/journal/RealJournalImplNIOTest.java	2009-07-01 04:41:56 UTC (rev 7506)
@@ -39,20 +39,18 @@
 public class RealJournalImplNIOTest extends JournalImplTestUnit
 {
 	private static final Logger log = Logger.getLogger(RealJournalImplNIOTest.class);
-	
-	protected String journalDir = System.getProperty("user.home") + "/journal-test";
 		
 	protected SequentialFileFactory getFileFactory() throws Exception
 	{
-		File file = new File(journalDir);
+		File file = new File(getTestDir());
 		
-		log.debug("deleting directory " + journalDir);
+		log.debug("deleting directory " + getTestDir());
 		
 		deleteDirectory(file);
 		
 		file.mkdir();		
 		
-		return new NIOSequentialFileFactory(journalDir);
+		return new NIOSequentialFileFactory(getTestDir());
 	}