From 39a1e0455477592cfa6116034d5b65da1720a1b7 Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Fri, 10 Jul 2015 09:38:22 -0400 Subject: [PATCH] Ensure that the test has it's own data dir so it doesn't stumble into the KahaDB store from some other test. --- .../activemq/broker/scheduler/SchedulerDBVersionTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 eb6a739382..e0f6e229e1 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);