You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2015/07/10 15:39:41 UTC

activemq git commit: Ensure that the test has it's own data dir so it doesn't stumble into the KahaDB store from some other test.

Repository: activemq
Updated Branches:
  refs/heads/master ba1bd264d -> 39a1e0455


Ensure that the test has it's own data dir so it doesn't stumble into
the KahaDB store from some other test.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/39a1e045
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/39a1e045
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/39a1e045

Branch: refs/heads/master
Commit: 39a1e0455477592cfa6116034d5b65da1720a1b7
Parents: ba1bd26
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Jul 10 09:38:22 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Jul 10 09:38:22 2015 -0400

----------------------------------------------------------------------
 .../activemq/broker/scheduler/SchedulerDBVersionTest.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/39a1e045/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java
index eb6a739..e0f6e22 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/SchedulerDBVersionTest.java
@@ -61,14 +61,14 @@ public class SchedulerDBVersionTest {
     final static File VERSION_LEGACY_JMS =
         new File(basedir + "/src/test/resources/org/apache/activemq/store/schedulerDB/legacy");
 
-    BrokerService broker = null;
+    private BrokerService broker = null;
 
     protected BrokerService createBroker(JobSchedulerStoreImpl scheduler) throws Exception {
         BrokerService answer = new BrokerService();
         answer.setStoreOpenWireVersion(OpenWireFormat.DEFAULT_LEGACY_VERSION);
         answer.setJobSchedulerStore(scheduler);
         answer.setPersistent(true);
-        answer.setDataDirectory("target");
+        answer.setDataDirectory("target/SchedulerDBVersionTest/");
         answer.setSchedulerSupport(true);
         answer.setUseJmx(false);
         return answer;
@@ -119,7 +119,7 @@ public class SchedulerDBVersionTest {
     }
 
     public void doTestScheduleRepeated(File existingStore) throws Exception {
-        File testDir = new File("target/activemq-data/store/scheduler/versionDB");
+        File testDir = new File("target/SchedulerDBVersionTest/store/scheduler/versionDB");
         IOHelper.deleteFile(testDir);
         IOHelper.copyFile(existingStore, testDir);