diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2013-07-10 09:10:51 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2013-07-10 09:10:51 +0000 |
| commit | eaa8c11396b13c46c59c2030a23cc7763ecee9d7 (patch) | |
| tree | 1035b7dd270a843436871ef4f321e956c5d220f3 /qpid/java/bdbstore/src/test | |
| parent | 934d23d90cb12c820ff71e54f2220991fd72c081 (diff) | |
| download | qpid-python-eaa8c11396b13c46c59c2030a23cc7763ecee9d7.tar.gz | |
QPID-4983 : [Java Broker] Move store implementations to broker plugins
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1501682 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/src/test')
2 files changed, 20 insertions, 8 deletions
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java index 6c6145fabb..da1038284e 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java @@ -20,26 +20,40 @@ */ package org.apache.qpid.server.store.berkeleydb; +import org.apache.qpid.server.store.AbstractDurableConfigurationStoreTestCase; import org.apache.qpid.server.store.DurableConfigurationStore; -import org.apache.qpid.server.store.DurableConfigurationStoreTest; -import org.apache.qpid.server.store.MessageStore; -public class BDBMessageStoreConfigurationTest extends DurableConfigurationStoreTest +public class BDBMessageStoreConfigurationTest extends AbstractDurableConfigurationStoreTestCase { private BDBMessageStore _bdbMessageStore; @Override + protected void onReopenStore() + { + _bdbMessageStore = null; + } + + @Override protected BDBMessageStore createMessageStore() throws Exception { - _bdbMessageStore = new BDBMessageStore(); + createStoreIfNecessary(); return _bdbMessageStore; } - // TODO - this only works so long as createConfigStore is called after createMessageStore + private void createStoreIfNecessary() + { + if(_bdbMessageStore == null) + { + _bdbMessageStore = new BDBMessageStore(); + } + } + @Override protected DurableConfigurationStore createConfigStore() throws Exception { + createStoreIfNecessary(); + return _bdbMessageStore; } } diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java index 8564199009..730001d849 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java @@ -20,16 +20,14 @@ */ package org.apache.qpid.server.store.berkeleydb; -import org.apache.qpid.server.store.MemoryMessageStore; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.MessageStoreCreator; import org.apache.qpid.server.store.berkeleydb.BDBMessageStore; -import org.apache.qpid.server.store.derby.DerbyMessageStore; import org.apache.qpid.test.utils.QpidTestCase; public class MessageStoreCreatorTest extends QpidTestCase { - private static final String[] STORE_TYPES = {MemoryMessageStore.TYPE, DerbyMessageStore.TYPE, BDBMessageStore.TYPE}; + private static final String[] STORE_TYPES = {BDBMessageStore.TYPE}; public void testMessageStoreCreator() { |