Repository: activemq Updated Branches: refs/heads/master db8c771b2 -> 20ec044c4
refactor test to cleanup persistence adapter creation for combos - fix ci Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/20ec044c Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/20ec044c Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/20ec044c Branch: refs/heads/master Commit: 20ec044c416bd507070f5943699b0ca033317096 Parents: db8c771 Author: gtully <[email protected]> Authored: Wed May 23 11:56:57 2018 +0100 Committer: gtully <[email protected]> Committed: Wed May 23 11:56:57 2018 +0100 ---------------------------------------------------------------------- .../store/RecoverExpiredMessagesTest.java | 28 +++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/20ec044c/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java index 581311d..ab8858a 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/RecoverExpiredMessagesTest.java @@ -16,10 +16,8 @@ */ package org.apache.activemq.broker.store; -import java.io.File; -import java.util.ArrayList; -import java.util.concurrent.TimeUnit; import junit.framework.Test; +import org.apache.activemq.TestSupport; import org.apache.activemq.broker.BrokerRestartTestSupport; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.StubConnection; @@ -35,16 +33,15 @@ import org.apache.activemq.command.Message; import org.apache.activemq.command.MessageAck; import org.apache.activemq.command.ProducerInfo; import org.apache.activemq.command.SessionInfo; -import org.apache.activemq.openwire.OpenWireFormat; -import org.apache.activemq.store.PersistenceAdapter; -import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; -import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter; -import org.apache.activemq.util.IOHelper; + +import java.util.ArrayList; +import java.util.concurrent.TimeUnit; public class RecoverExpiredMessagesTest extends BrokerRestartTestSupport { final ArrayList<String> expected = new ArrayList<String>(); final ActiveMQDestination destination = new ActiveMQQueue("TEST"); public PendingQueueMessageStoragePolicy queuePendingPolicy; + public TestSupport.PersistenceAdapterChoice persistenceAdapterChoice; @Override protected void setUp() throws Exception { @@ -54,14 +51,10 @@ public class RecoverExpiredMessagesTest extends BrokerRestartTestSupport { public void initCombosForTestRecovery() throws Exception { addCombinationValues("queuePendingPolicy", new PendingQueueMessageStoragePolicy[] {new FilePendingQueueMessageStoragePolicy(), new VMPendingQueueMessageStoragePolicy()}); - PersistenceAdapter[] persistenceAdapters = new PersistenceAdapter[] { - new KahaDBPersistenceAdapter(), - new JDBCPersistenceAdapter() + TestSupport.PersistenceAdapterChoice[] persistenceAdapters = new TestSupport.PersistenceAdapterChoice[] { + TestSupport.PersistenceAdapterChoice.JDBC, TestSupport.PersistenceAdapterChoice.KahaDB }; - for (PersistenceAdapter adapter : persistenceAdapters) { - adapter.setDirectory(new File(IOHelper.getDefaultDataDirectory())); - } - addCombinationValues("persistenceAdapter", persistenceAdapters); + addCombinationValues("persistenceAdapterChoice", persistenceAdapters); } public void testRecovery() throws Exception { @@ -134,10 +127,7 @@ public class RecoverExpiredMessagesTest extends BrokerRestartTestSupport { @Override protected void configureBroker(BrokerService broker) throws Exception { super.configureBroker(broker); - if (persistenceAdapter instanceof JDBCPersistenceAdapter) { - ((JDBCPersistenceAdapter) persistenceAdapter).setLockDataSource(null); - } - broker.setPersistenceAdapter(persistenceAdapter); + TestSupport.setPersistenceAdapter(broker, persistenceAdapterChoice); } public static Test suite() {
