Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=1584600&r1=1584599&r2=1584600&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java Fri Apr 4 10:21:37 2014 @@ -31,6 +31,10 @@ import org.apache.log4j.Logger; import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.plugin.MessageStoreFactory; +import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler; +import org.apache.qpid.server.store.handler.DistributedTransactionHandler; +import org.apache.qpid.server.store.handler.MessageHandler; +import org.apache.qpid.server.store.handler.MessageInstanceHandler; public class SlowMessageStore implements MessageStore, DurableConfigurationStore { @@ -63,12 +67,6 @@ public class SlowMessageStore implements } } - @Override - public void recoverConfigurationStore(ConfigurationRecoveryHandler recoveryHandler) - { - _realDurableConfigurationStore.recoverConfigurationStore(recoveryHandler); - } - private void configureDelays(Map<String, Object> delays) { @@ -294,12 +292,6 @@ public class SlowMessageStore implements } @Override - public void recoverMessageStore(MessageStoreRecoveryHandler messageRecoveryHandler, TransactionLogRecoveryHandler transactionLogRecoveryHandler) - { - _realMessageStore.recoverMessageStore(messageRecoveryHandler, transactionLogRecoveryHandler); - } - - @Override public void addEventListener(EventListener eventListener, Event... events) { if (_realMessageStore == null) @@ -319,15 +311,33 @@ public class SlowMessageStore implements } @Override - public String getStoreType() + public void onDelete() { - return TYPE; + _realMessageStore.onDelete(); } @Override - public void onDelete() + public void visitConfiguredObjectRecords(ConfiguredObjectRecordHandler handler) throws StoreException { - _realMessageStore.onDelete(); + _realDurableConfigurationStore.visitConfiguredObjectRecords(handler); + } + + @Override + public void visitMessages(MessageHandler handler) throws StoreException + { + _realMessageStore.visitMessages(handler); + } + + @Override + public void visitMessageInstances(MessageInstanceHandler handler) throws StoreException + { + _realMessageStore.visitMessageInstances(handler); + } + + @Override + public void visitDistributedTransactions(DistributedTransactionHandler handler) throws StoreException + { + _realMessageStore.visitDistributedTransactions(handler); } }
Copied: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (from r1584379, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?p2=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java&p1=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java&r1=1584379&r2=1584600&rev=1584600&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Fri Apr 4 10:21:37 2014 @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.store; - import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -46,7 +45,6 @@ import org.apache.qpid.server.logging.Ev import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.MessageSource; import org.apache.qpid.server.model.Binding; -import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ExclusivityPolicy; import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.Queue; @@ -68,14 +66,16 @@ import org.apache.qpid.test.utils.QpidTe import org.apache.qpid.util.FileUtils; /** - * This tests the MessageStores by using the available interfaces. + * + * Virtualhost/store integration test. Tests for correct behaviour of the message store + * when exercised via the higher level functions of the store. * * For persistent stores, it validates that Exchanges, Queues, Bindings and * Messages are persisted and recovered correctly. */ -public class MessageStoreTest extends QpidTestCase +public class VirtualHostMessageStoreTest extends QpidTestCase { - private static final Logger _logger = Logger.getLogger(MessageStoreTest.class); + private static final Logger _logger = Logger.getLogger(VirtualHostMessageStoreTest.class); public static final int DEFAULT_PRIORTY_LEVEL = 5; public static final String SELECTOR_VALUE = "Test = 'MST'"; @@ -103,8 +103,7 @@ public class MessageStoreTest extends Qp private String queueOwner = "MST"; private VirtualHost _virtualHost; - private org.apache.qpid.server.model.VirtualHost _virtualHostModel; - private Broker _broker; + private org.apache.qpid.server.model.VirtualHost<?> _virtualHostModel; private String _storePath; public void setUp() throws Exception @@ -120,6 +119,7 @@ public class MessageStoreTest extends Qp messageStoreSettings.put(MessageStore.STORE_TYPE, getTestProfileMessageStoreType()); _virtualHostModel = mock(org.apache.qpid.server.model.VirtualHost.class); + when(_virtualHostModel.getMessageStoreSettings()).thenReturn(messageStoreSettings); when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.TYPE))).thenReturn(StandardVirtualHostFactory.TYPE); when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.NAME))).thenReturn(hostName); @@ -128,8 +128,6 @@ public class MessageStoreTest extends Qp cleanup(new File(_storePath)); - _broker = BrokerTestHelper.createBrokerMock(); - reloadVirtualHost(); } @@ -201,10 +199,6 @@ public class MessageStoreTest extends Qp assertTrue("Virtualhost has not changed, reload was not successful", original != getVirtualHost()); } - /** - * Old MessageStoreTest segment which runs against both persistent and non-persistent stores - * creating queues, exchanges and bindings and then verifying message delivery to them. - */ public void testQueueExchangeAndBindingCreation() throws Exception { assertEquals("Should not be any existing queues", 0, getVirtualHost().getQueues().size()); @@ -213,15 +207,15 @@ public class MessageStoreTest extends Qp createAllTopicQueues(); //Register Non-Durable DirectExchange - ExchangeImpl nonDurableExchange = createExchange(DirectExchange.TYPE, nonDurableExchangeName, false); + ExchangeImpl<?> nonDurableExchange = createExchange(DirectExchange.TYPE, nonDurableExchangeName, false); bindAllQueuesToExchange(nonDurableExchange, directRouting); //Register DirectExchange - ExchangeImpl directExchange = createExchange(DirectExchange.TYPE, directExchangeName, true); + ExchangeImpl<?> directExchange = createExchange(DirectExchange.TYPE, directExchangeName, true); bindAllQueuesToExchange(directExchange, directRouting); //Register TopicExchange - ExchangeImpl topicExchange = createExchange(TopicExchange.TYPE, topicExchangeName, true); + ExchangeImpl<?> topicExchange = createExchange(TopicExchange.TYPE, topicExchangeName, true); bindAllTopicQueuesToExchange(topicExchange, topicRouting); //Send Message To NonDurable direct Exchange = persistent @@ -248,12 +242,6 @@ public class MessageStoreTest extends Qp 10, getVirtualHost().getQueues().size()); } - /** - * Tests message persistence by running the testQueueExchangeAndBindingCreation() method above - * before reloading the virtual host and ensuring that the persistent messages were restored. - * - * More specific testing of message persistence is left to store-specific unit testing. - */ public void testMessagePersistence() throws Exception { testQueueExchangeAndBindingCreation(); @@ -346,7 +334,7 @@ public class MessageStoreTest extends Qp 1, getVirtualHost().getQueues().size()); //test that removing the queue means it is not recovered next time - final AMQQueue queue = getVirtualHost().getQueue(durableQueueName); + final AMQQueue<?> queue = getVirtualHost().getQueue(durableQueueName); DurableConfigurationStoreHelper.removeQueue(getVirtualHost().getDurableConfigurationStore(),queue); reloadVirtualHost(); @@ -397,7 +385,7 @@ public class MessageStoreTest extends Qp origExchangeCount + 1, getVirtualHost().getExchanges().size()); //test that removing the exchange means it is not recovered next time - final ExchangeImpl exchange = getVirtualHost().getExchange(directExchangeName); + final ExchangeImpl<?> exchange = getVirtualHost().getExchange(directExchangeName); DurableConfigurationStoreHelper.removeExchange(getVirtualHost().getDurableConfigurationStore(), exchange); reloadVirtualHost(); @@ -423,9 +411,9 @@ public class MessageStoreTest extends Qp Map<String, ExchangeImpl<?>> exchanges = createExchanges(); - ExchangeImpl nonDurableExchange = exchanges.get(nonDurableExchangeName); - ExchangeImpl directExchange = exchanges.get(directExchangeName); - ExchangeImpl topicExchange = exchanges.get(topicExchangeName); + ExchangeImpl<?> nonDurableExchange = exchanges.get(nonDurableExchangeName); + ExchangeImpl<?> directExchange = exchanges.get(directExchangeName); + ExchangeImpl<?> topicExchange = exchanges.get(topicExchangeName); bindAllQueuesToExchange(nonDurableExchange, directRouting); bindAllQueuesToExchange(directExchange, directRouting); @@ -449,7 +437,7 @@ public class MessageStoreTest extends Qp public void testDurableBindingRemoval() throws Exception { //create durable queue and exchange, bind them - ExchangeImpl exch = createExchange(DirectExchange.TYPE, directExchangeName, true); + ExchangeImpl<?> exch = createExchange(DirectExchange.TYPE, directExchangeName, true); createQueue(durableQueueName, false, true, false, false); bindQueueToExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false); @@ -482,7 +470,7 @@ public class MessageStoreTest extends Qp private void validateExchanges(int originalNumExchanges, Map<String, ExchangeImpl<?>> oldExchanges) { Collection<ExchangeImpl<?>> exchanges = getVirtualHost().getExchanges(); - Collection<String> exchangeNames = new ArrayList(exchanges.size()); + Collection<String> exchangeNames = new ArrayList<String>(exchanges.size()); for(ExchangeImpl<?> exchange : exchanges) { exchangeNames.add(exchange.getName()); @@ -506,6 +494,7 @@ public class MessageStoreTest extends Qp } /** Validates the Durable queues and their properties are as expected following recovery */ + @SuppressWarnings("unchecked") private void validateBindingProperties() { @@ -526,11 +515,11 @@ public class MessageStoreTest extends Qp * @param bindings the set of bindings to validate * @param useSelectors if set, check the binding has a JMS_SELECTOR argument and the correct value for it */ - private void validateBindingProperties(Collection<? extends Binding> bindings, boolean useSelectors) + private void validateBindingProperties(Collection<? extends Binding<?>> bindings, boolean useSelectors) { assertEquals("Each queue should only be bound once.", 1, bindings.size()); - Binding binding = bindings.iterator().next(); + Binding<?> binding = bindings.iterator().next(); if (useSelectors) { @@ -543,13 +532,13 @@ public class MessageStoreTest extends Qp private void setQueueExclusivity(boolean exclusive) throws MessageSource.ExistingConsumerPreventsExclusive { - AMQQueue queue = getVirtualHost().getQueue(durableExclusiveQueueName); + AMQQueue<?> queue = getVirtualHost().getQueue(durableExclusiveQueueName); queue.setExclusivityPolicy(exclusive ? ExclusivityPolicy.CONTAINER : ExclusivityPolicy.NONE); } private void validateQueueExclusivityProperty(boolean expected) { - AMQQueue queue = getVirtualHost().getQueue(durableExclusiveQueueName); + AMQQueue<?> queue = getVirtualHost().getQueue(durableExclusiveQueueName); assertEquals("Queue exclusivity was incorrect", queue.isExclusive(), expected); } @@ -565,7 +554,7 @@ public class MessageStoreTest extends Qp validateQueueProperties(getVirtualHost().getQueue(durableLastValueQueueName), false, true, true, true); } - private void validateQueueProperties(AMQQueue queue, boolean usePriority, boolean durable, boolean exclusive, boolean lastValueQueue) + private void validateQueueProperties(AMQQueue<?> queue, boolean usePriority, boolean durable, boolean exclusive, boolean lastValueQueue) { if(usePriority || lastValueQueue) { @@ -588,9 +577,9 @@ public class MessageStoreTest extends Qp assertEquals("Queue is not 'simple'", StandardQueue.class, queue.getClass()); } - assertEquals("Queue owner is not as expected", exclusive ? queueOwner : null, queue.getOwner()); - assertEquals("Queue durability is not as expected", durable, queue.isDurable()); - assertEquals("Queue exclusivity is not as expected", exclusive, queue.isExclusive()); + assertEquals("Queue owner is not as expected for queue " + queue.getName(), exclusive ? queueOwner : null, queue.getOwner()); + assertEquals("Queue durability is not as expected for queue " + queue.getName(), durable, queue.isDurable()); + assertEquals("Queue exclusivity is not as expected for queue " + queue.getName(), exclusive, queue.isExclusive()); } /** @@ -606,7 +595,7 @@ public class MessageStoreTest extends Qp } } - private void sendMessageOnExchange(ExchangeImpl exchange, String routingKey, boolean deliveryMode) + private void sendMessageOnExchange(ExchangeImpl<?> exchange, String routingKey, boolean deliveryMode) { //Set MessagePersistence BasicContentHeaderProperties properties = new BasicContentHeaderProperties(); @@ -698,15 +687,12 @@ public class MessageStoreTest extends Qp { queueArguments.put(Queue.OWNER, queueOwner); } - AMQQueue queue = null; + AMQQueue<?> queue = null; //Ideally we would be able to use the QueueDeclareHandler here. queue = getVirtualHost().createQueue(queueArguments); validateQueueProperties(queue, usePriority, durable, exclusive, lastValueQueue); - - - } private Map<String, ExchangeImpl<?>> createExchanges() throws Exception @@ -733,14 +719,14 @@ public class MessageStoreTest extends Qp attributes.put(org.apache.qpid.server.model.Exchange.TYPE, type.getType()); attributes.put(org.apache.qpid.server.model.Exchange.DURABLE, durable); attributes.put(org.apache.qpid.server.model.Exchange.LIFETIME_POLICY, - false ? LifetimePolicy.DELETE_ON_NO_LINKS : LifetimePolicy.PERMANENT); + durable ? LifetimePolicy.DELETE_ON_NO_LINKS : LifetimePolicy.PERMANENT); attributes.put(org.apache.qpid.server.model.Exchange.ALTERNATE_EXCHANGE, null); exchange = getVirtualHost().createExchange(attributes); return exchange; } - private void bindAllQueuesToExchange(ExchangeImpl exchange, String routingKey) + private void bindAllQueuesToExchange(ExchangeImpl<?> exchange, String routingKey) { bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityQueueName), false); bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableQueueName), false); @@ -749,7 +735,7 @@ public class MessageStoreTest extends Qp bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableExclusiveQueueName), false); } - private void bindAllTopicQueuesToExchange(ExchangeImpl exchange, String routingKey) + private void bindAllTopicQueuesToExchange(ExchangeImpl<?> exchange, String routingKey) { bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityTopicQueueName), true); @@ -759,9 +745,9 @@ public class MessageStoreTest extends Qp } - protected void bindQueueToExchange(ExchangeImpl exchange, + protected void bindQueueToExchange(ExchangeImpl<?> exchange, String routingKey, - AMQQueue queue, + AMQQueue<?> queue, boolean useSelector) { Map<String,Object> bindArguments = new HashMap<String, Object>(); @@ -781,9 +767,9 @@ public class MessageStoreTest extends Qp } } - protected void unbindQueueFromExchange(ExchangeImpl exchange, + protected void unbindQueueFromExchange(ExchangeImpl<?> exchange, String routingKey, - AMQQueue queue, + AMQQueue<?> queue, boolean useSelector) { Map<String,Object> bindArguments = new HashMap<String, Object>(); @@ -829,7 +815,7 @@ public class MessageStoreTest extends Qp private void validateMessageOnQueue(String queueName, long messageCount) { - AMQQueue queue = getVirtualHost().getQueue(queueName); + AMQQueue<?> queue = getVirtualHost().getQueue(queueName); assertNotNull("Queue(" + queueName + ") not correctly registered:", queue); @@ -839,12 +825,12 @@ public class MessageStoreTest extends Qp private class TestMessagePublishInfo implements MessagePublishInfo { - ExchangeImpl _exchange; + ExchangeImpl<?> _exchange; boolean _immediate; boolean _mandatory; String _routingKey; - TestMessagePublishInfo(ExchangeImpl exchange, boolean immediate, boolean mandatory, String routingKey) + TestMessagePublishInfo(ExchangeImpl<?> exchange, boolean immediate, boolean mandatory, String routingKey) { _exchange = exchange; _immediate = immediate; @@ -852,29 +838,35 @@ public class MessageStoreTest extends Qp _routingKey = routingKey; } + @Override public AMQShortString getExchange() { return new AMQShortString(_exchange.getName()); } + @Override public void setExchange(AMQShortString exchange) { //no-op } + @Override public boolean isImmediate() { return _immediate; } + @Override public boolean isMandatory() { return _mandatory; } + @Override public AMQShortString getRoutingKey() { return new AMQShortString(_routingKey); } } + } Modified: qpid/trunk/qpid/java/test-profiles/CPPExcludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/CPPExcludes?rev=1584600&r1=1584599&r2=1584600&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/CPPExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/CPPExcludes Fri Apr 4 10:21:37 2014 @@ -85,14 +85,14 @@ org.apache.qpid.server.store.PersistentS org.apache.qpid.server.store.SplitStoreTest#* // These tests are for the Java broker persistent store modules -org.apache.qpid.server.store.MessageStoreTest#testMessagePersistence -org.apache.qpid.server.store.MessageStoreTest#testMessageRemoval -org.apache.qpid.server.store.MessageStoreTest#testBindingPersistence -org.apache.qpid.server.store.MessageStoreTest#testDurableBindingRemoval -org.apache.qpid.server.store.MessageStoreTest#testQueuePersistence -org.apache.qpid.server.store.MessageStoreTest#testDurableQueueRemoval -org.apache.qpid.server.store.MessageStoreTest#testExchangePersistence -org.apache.qpid.server.store.MessageStoreTest#testDurableExchangeRemoval +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessagePersistence +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessageRemoval +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testBindingPersistence +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableBindingRemoval +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testQueuePersistence +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableQueueRemoval +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testExchangePersistence +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableExchangeRemoval org.apache.qpid.server.store.DurableConfigurationStoreTest#* // CPP Broker does not follow the same Logging convention as the Java broker Modified: qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes?rev=1584600&r1=1584599&r2=1584600&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes Fri Apr 4 10:21:37 2014 @@ -17,7 +17,3 @@ // under the License. // -//This test is subclassed within the bdbstore module to enable it to run and -//also add some bdb-specific tests. It is excluded to prevent running twice. -org.apache.qpid.server.store.MessageStoreTest#* -org.apache.qpid.server.store.DurableConfigurationStoreTest#* Modified: qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes?rev=1584600&r1=1584599&r2=1584600&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes Fri Apr 4 10:21:37 2014 @@ -33,19 +33,17 @@ org.apache.qpid.test.unit.xa.TopicTest#t org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash org.apache.qpid.test.unit.xa.TopicTest#testRecover -org.apache.qpid.server.store.MessageStoreTest#testMessagePersistence -org.apache.qpid.server.store.MessageStoreTest#testMessageRemoval -org.apache.qpid.server.store.MessageStoreTest#testBindingPersistence -org.apache.qpid.server.store.MessageStoreTest#testDurableBindingRemoval -org.apache.qpid.server.store.MessageStoreTest#testQueuePersistence -org.apache.qpid.server.store.MessageStoreTest#testDurableQueueRemoval -org.apache.qpid.server.store.MessageStoreTest#testExchangePersistence -org.apache.qpid.server.store.MessageStoreTest#testDurableExchangeRemoval +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessagePersistence +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessageRemoval +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testBindingPersistence +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableBindingRemoval +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testQueuePersistence +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableQueueRemoval +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testExchangePersistence +org.apache.qpid.server.store.VirtualHostMessageStoreTest#testDurableExchangeRemoval org.apache.qpid.server.store.berkeleydb.* -org.apache.qpid.server.store.DurableConfigurationStoreTest#* - org.apache.qpid.systest.management.jmx.QueueManagementTest#testAlternateExchangeSurvivesRestart org.apache.qpid.systest.management.jmx.QueueManagementTest#testQueueDescriptionSurvivesRestart org.apache.qpid.systest.management.jmx.QueueManagementTest#testMoveMessageBetweenQueuesWithBrokerRestart --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
