Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1457917 -
 /activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java
Date: Mon, 18 Mar 2013 18:52:33 -0000
To: commits@activemq.apache.org
From: tabish@apache.org
Message-Id: <20130318185233.4590023888CD@eris.apache.org>

Author: tabish
Date: Mon Mar 18 18:52:32 2013
New Revision: 1457917

URL: http://svn.apache.org/r1457917
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-4384

Modified:
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java?rev=1457917&r1=1457916&r2=1457917&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java Mon Mar 18 18:52:32 2013
@@ -17,6 +17,7 @@
 package org.apache.activemq.store.kahadb;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
 
@@ -33,6 +34,7 @@ import org.apache.activemq.command.Messa
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.SessionInfo;
+import org.apache.commons.io.FileUtils;
 
 
 /**
@@ -41,15 +43,33 @@ import org.apache.activemq.command.Sessi
  *
  */
 public class KahaDBStoreRecoveryBrokerTest extends RecoveryBrokerTest {
+    public static final String KAHADB_DIR_BASE = "target/activemq-data/kahadb";
+    public static String kahaDbDirectoryName;
 
     enum CorruptionType { None, FailToLoad, LoadInvalid, LoadCorrupt };
     public CorruptionType  failTest = CorruptionType.None;
 
     @Override
+    protected void setUp() throws Exception {
+        kahaDbDirectoryName = KAHADB_DIR_BASE + "/" + System.currentTimeMillis();
+        super.setUp();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        try {
+            File kahaDbDir = new File(kahaDbDirectoryName);
+            FileUtils.deleteDirectory(kahaDbDir);
+        } catch (IOException e) {
+        }
+    }
+
+    @Override
     protected BrokerService createBroker() throws Exception {
         BrokerService broker = new BrokerService();
         KahaDBStore kaha = new KahaDBStore();
-        kaha.setDirectory(new File("target/activemq-data/kahadb"));
+        kaha.setDirectory(new File(kahaDbDirectoryName));
         kaha.deleteAllMessages();
         broker.setPersistenceAdapter(kaha);
         return broker;
@@ -60,7 +80,7 @@ public class KahaDBStoreRecoveryBrokerTe
     protected BrokerService createRestartedBroker() throws Exception {
 
         // corrupting index
-        File index = new File("target/activemq-data/kahadb/db.data");
+        File index = new File(kahaDbDirectoryName + "/db.data");
         RandomAccessFile raf = new RandomAccessFile(index, "rw");
         switch (failTest) {
             case FailToLoad:
@@ -89,7 +109,7 @@ public class KahaDBStoreRecoveryBrokerTe
         KahaDBStore kaha = new KahaDBStore();
         // uncomment if you want to test archiving
         //kaha.setArchiveCorruptedIndex(true);
-        kaha.setDirectory(new File("target/activemq-data/kahadb"));
+        kaha.setDirectory(new File(kahaDbDirectoryName));
         broker.setPersistenceAdapter(kaha);
         return broker;
     }