You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2013/09/20 20:59:50 UTC
svn commit: r1525101 [17/21] - in /qpid/branches/linearstore/qpid: ./ bin/
cpp/ cpp/bindings/ cpp/bindings/qmf/ cpp/bindings/qmf/python/
cpp/bindings/qmf/ruby/ cpp/bindings/qmf/tests/ cpp/bindings/qmf2/
cpp/bindings/qmf2/examples/cpp/ cpp/bindings/qmf2...
Modified: qpid/branches/linearstore/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java Fri Sep 20 18:59:30 2013
@@ -20,9 +20,6 @@
*/
package org.apache.qpid.server.virtualhost;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
@@ -31,28 +28,16 @@ import java.util.UUID;
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
import org.apache.qpid.server.logging.messages.TransactionLogMessages;
import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
-import org.apache.qpid.server.message.AMQMessage;
import org.apache.qpid.server.message.EnqueableMessage;
import org.apache.qpid.server.message.MessageReference;
-import org.apache.qpid.server.message.MessageTransferMessage;
import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.model.Binding;
-import org.apache.qpid.server.model.LifetimePolicy;
-import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.protocol.v1_0.Message_1_0;
import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.store.ConfigurationRecoveryHandler;
-import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreRecoveryHandler;
import org.apache.qpid.server.store.StoredMessage;
@@ -64,9 +49,8 @@ import org.apache.qpid.server.txn.DtxReg
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.transport.Xid;
import org.apache.qpid.transport.util.Functions;
-import org.apache.qpid.util.ByteBufferInputStream;
-public class VirtualHostConfigRecoveryHandler implements ConfigurationRecoveryHandler,
+public class VirtualHostConfigRecoveryHandler implements
MessageStoreRecoveryHandler,
MessageStoreRecoveryHandler.StoredMessageRecoveryHandler,
TransactionLogRecoveryHandler,
@@ -81,8 +65,6 @@ public class VirtualHostConfigRecoveryHa
private final Map<Long, ServerMessage> _recoveredMessages = new HashMap<Long, ServerMessage>();
private final Map<Long, StoredMessage> _unusedMessages = new HashMap<Long, StoredMessage>();
- private final Map<String, Map<UUID, Map<String, Object>>> _configuredObjects = new HashMap<String, Map<UUID, Map<String, Object>>>();
-
private final ExchangeRegistry _exchangeRegistry;
private final ExchangeFactory _exchangeFactory;
@@ -98,75 +80,14 @@ public class VirtualHostConfigRecoveryHa
_exchangeFactory = exchangeFactory;
}
- @Override
- public void beginConfigurationRecovery(DurableConfigurationStore store)
- {
- _logSubject = new MessageStoreLogSubject(_virtualHost,store.getClass().getSimpleName());
-
- CurrentActor.get().message(_logSubject, ConfigStoreMessages.RECOVERY_START());
- }
-
public VirtualHostConfigRecoveryHandler begin(MessageStore store)
{
- _logSubject = new MessageStoreLogSubject(_virtualHost,store.getClass().getSimpleName());
+ _logSubject = new MessageStoreLogSubject(_virtualHost.getName(), store.getClass().getSimpleName());
_store = store;
CurrentActor.get().message(_logSubject, TransactionLogMessages.RECOVERY_START(null, false));
return this;
}
- public void queue(UUID id, String queueName, String owner, boolean exclusive, FieldTable arguments, UUID alternateExchangeId)
- {
- try
- {
- AMQQueue q = _virtualHost.getQueueRegistry().getQueue(queueName);
-
- if (q == null)
- {
- q = AMQQueueFactory.createAMQQueueImpl(id, queueName, true, owner, false, exclusive, _virtualHost,
- FieldTable.convertToMap(arguments));
- _virtualHost.getQueueRegistry().registerQueue(q);
-
- if (alternateExchangeId != null)
- {
- Exchange altExchange = _exchangeRegistry.getExchange(alternateExchangeId);
- if (altExchange == null)
- {
- _logger.error("Unknown exchange id " + alternateExchangeId + ", cannot set alternate exchange on queue with id " + id);
- return;
- }
- q.setAlternateExchange(altExchange);
- }
- }
-
- CurrentActor.get().message(_logSubject, TransactionLogMessages.RECOVERY_START(queueName, true));
-
- //Record that we have a queue for recovery
- _queueRecoveries.put(queueName, 0);
- }
- catch (AMQException e)
- {
- throw new RuntimeException("Error recovering queue uuid " + id + " name " + queueName, e);
- }
- }
-
- public void exchange(UUID id, String exchangeName, String type, boolean autoDelete)
- {
- try
- {
- Exchange exchange;
- exchange = _exchangeRegistry.getExchange(exchangeName);
- if (exchange == null)
- {
- exchange = _exchangeFactory.createExchange(id, exchangeName, type, true, autoDelete);
- _exchangeRegistry.registerExchange(exchange);
- }
- }
- catch (AMQException e)
- {
- throw new RuntimeException("Error recovering exchange uuid " + id + " name " + exchangeName, e);
- }
- }
-
public StoredMessageRecoveryHandler begin()
{
return this;
@@ -174,21 +95,7 @@ public class VirtualHostConfigRecoveryHa
public void message(StoredMessage message)
{
- ServerMessage serverMessage;
- switch(message.getMetaData().getType())
- {
- case META_DATA_0_8:
- serverMessage = new AMQMessage(message);
- break;
- case META_DATA_0_10:
- serverMessage = new MessageTransferMessage(message, null);
- break;
- case META_DATA_1_0:
- serverMessage = new Message_1_0(message);
- break;
- default:
- throw new RuntimeException("Unknown message type retrieved from store " + message.getMetaData().getClass());
- }
+ ServerMessage serverMessage = message.getMetaData().getType().createMessage(message);
_recoveredMessages.put(message.getMessageNumber(), serverMessage);
_unusedMessages.put(message.getMessageNumber(), message);
@@ -212,7 +119,7 @@ public class VirtualHostConfigRecoveryHa
}
for(Transaction.Record record : enqueues)
{
- final AMQQueue queue = _virtualHost.getQueueRegistry().getQueue(record.getQueue().getId());
+ final AMQQueue queue = _virtualHost.getQueue(record.getQueue().getId());
if(queue != null)
{
final long messageId = record.getMessage().getMessageNumber();
@@ -272,7 +179,7 @@ public class VirtualHostConfigRecoveryHa
}
for(Transaction.Record record : dequeues)
{
- final AMQQueue queue = _virtualHost.getQueueRegistry().getQueue(record.getQueue().getId());
+ final AMQQueue queue = _virtualHost.getQueue(record.getQueue().getId());
if(queue != null)
{
final long messageId = record.getMessage().getMessageNumber();
@@ -355,63 +262,13 @@ public class VirtualHostConfigRecoveryHa
CurrentActor.get().message(_logSubject, TransactionLogMessages.RECOVERY_COMPLETE(null, false));
}
- private void binding(UUID bindingId, UUID exchangeId, UUID queueId, String bindingKey, ByteBuffer buf)
- {
- try
- {
- Exchange exchange = _exchangeRegistry.getExchange(exchangeId);
- if (exchange == null)
- {
- _logger.error("Unknown exchange id " + exchangeId + ", cannot bind queue with id " + queueId);
- return;
- }
-
- AMQQueue queue = _virtualHost.getQueueRegistry().getQueue(queueId);
- if (queue == null)
- {
- _logger.error("Unknown queue id " + queueId + ", cannot be bound to exchange: " + exchange.getName());
- }
- else
- {
- FieldTable argumentsFT = null;
- if(buf != null)
- {
- try
- {
- argumentsFT = new FieldTable(new DataInputStream(new ByteBufferInputStream(buf)),buf.limit());
- }
- catch (IOException e)
- {
- throw new RuntimeException("IOException should not be thrown here", e);
- }
- }
-
- Map<String, Object> argumentMap = FieldTable.convertToMap(argumentsFT);
-
- if(exchange.getBinding(bindingKey, queue, argumentMap) == null)
- {
-
- _logger.info("Restoring binding: (Exchange: " + exchange.getNameShortString() + ", Queue: " + queue.getName()
- + ", Routing Key: " + bindingKey + ", Arguments: " + argumentsFT + ")");
-
- exchange.restoreBinding(bindingId, bindingKey, queue, argumentMap);
- }
- }
- }
- catch (AMQException e)
- {
- throw new RuntimeException(e);
- }
-
- }
-
public void complete()
{
}
public void queueEntry(final UUID queueId, long messageId)
{
- AMQQueue queue = _virtualHost.getQueueRegistry().getQueue(queueId);
+ AMQQueue queue = _virtualHost.getQueue(queueId);
try
{
if(queue != null)
@@ -486,107 +343,6 @@ public class VirtualHostConfigRecoveryHa
return this;
}
- @Override
- public void configuredObject(UUID id, String type, Map<String, Object> attributes)
- {
- Map<UUID, Map<String, Object>> typeMap = _configuredObjects.get(type);
- if(typeMap == null)
- {
- typeMap = new HashMap<UUID, Map<String, Object>>();
- _configuredObjects.put(type,typeMap);
- }
- typeMap.put(id, attributes);
- }
-
- @Override
- public void completeConfigurationRecovery()
- {
- Map<UUID, Map<String, Object>> exchangeObjects =
- _configuredObjects.remove(org.apache.qpid.server.model.Exchange.class.getName());
-
- if(exchangeObjects != null)
- {
- recoverExchanges(exchangeObjects);
- }
-
- Map<UUID, Map<String, Object>> queueObjects =
- _configuredObjects.remove(org.apache.qpid.server.model.Queue.class.getName());
-
- if(queueObjects != null)
- {
- recoverQueues(queueObjects);
- }
-
-
- Map<UUID, Map<String, Object>> bindingObjects =
- _configuredObjects.remove(Binding.class.getName());
-
- if(bindingObjects != null)
- {
- recoverBindings(bindingObjects);
- }
-
-
- CurrentActor.get().message(_logSubject, ConfigStoreMessages.RECOVERY_COMPLETE());
- }
-
- private void recoverExchanges(Map<UUID, Map<String, Object>> exchangeObjects)
- {
- for(Map.Entry<UUID, Map<String,Object>> entry : exchangeObjects.entrySet())
- {
- Map<String,Object> attributeMap = entry.getValue();
- String exchangeName = (String) attributeMap.get(org.apache.qpid.server.model.Exchange.NAME);
- String exchangeType = (String) attributeMap.get(org.apache.qpid.server.model.Exchange.TYPE);
- String lifeTimePolicy = (String) attributeMap.get(org.apache.qpid.server.model.Exchange.LIFETIME_POLICY);
- boolean autoDelete = lifeTimePolicy == null
- || LifetimePolicy.valueOf(lifeTimePolicy) == LifetimePolicy.AUTO_DELETE;
- exchange(entry.getKey(), exchangeName, exchangeType, autoDelete);
- }
- }
-
- private void recoverQueues(Map<UUID, Map<String, Object>> queueObjects)
- {
- for(Map.Entry<UUID, Map<String,Object>> entry : queueObjects.entrySet())
- {
- Map<String,Object> attributeMap = entry.getValue();
-
- String queueName = (String) attributeMap.get(Queue.NAME);
- String owner = (String) attributeMap.get(Queue.OWNER);
- boolean exclusive = (Boolean) attributeMap.get(Queue.EXCLUSIVE);
- UUID alternateExchangeId = attributeMap.get(Queue.ALTERNATE_EXCHANGE) == null ? null : UUID.fromString((String)attributeMap.get(Queue.ALTERNATE_EXCHANGE));
- @SuppressWarnings("unchecked")
- Map<String, Object> queueArgumentsMap = (Map<String, Object>) attributeMap.get(Queue.ARGUMENTS);
- FieldTable arguments = null;
- if (queueArgumentsMap != null)
- {
- arguments = FieldTable.convertToFieldTable(queueArgumentsMap);
- }
- queue(entry.getKey(), queueName, owner, exclusive, arguments, alternateExchangeId);
- }
- }
-
- private void recoverBindings(Map<UUID, Map<String, Object>> bindingObjects)
- {
- for(Map.Entry<UUID, Map<String,Object>> entry : bindingObjects.entrySet())
- {
- Map<String,Object> attributeMap = entry.getValue();
- UUID exchangeId = UUID.fromString((String)attributeMap.get(Binding.EXCHANGE));
- UUID queueId = UUID.fromString((String) attributeMap.get(Binding.QUEUE));
- String bindingName = (String) attributeMap.get(Binding.NAME);
-
- @SuppressWarnings("unchecked")
- Map<String, Object> bindingArgumentsMap = (Map<String, Object>) attributeMap.get(Binding.ARGUMENTS);
- FieldTable arguments = null;
- if (bindingArgumentsMap != null)
- {
- arguments = FieldTable.convertToFieldTable(bindingArgumentsMap);
- }
- ByteBuffer argumentsBB = (arguments == null ? null : ByteBuffer.wrap(arguments.getDataAsBytes()));
-
- binding(entry.getKey(), exchangeId, queueId, bindingName, argumentsBB);
- }
- }
-
private static class DummyMessage implements EnqueableMessage
{
Modified: qpid/branches/linearstore/qpid/java/broker/src/main/resources/initial-config.json
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/main/resources/initial-config.json?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/main/resources/initial-config.json (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/main/resources/initial-config.json Fri Sep 20 18:59:30 2013
@@ -26,7 +26,12 @@
"authenticationproviders" : [ {
"name" : "passwordFile",
"type" : "PlainPasswordFile",
- "path" : "${qpid.home_dir}/etc/passwd"
+ "path" : "${qpid.home_dir}/etc/passwd",
+ "preferencesproviders" : [{
+ "name": "fileSystemPreferences",
+ "type": "FileSystemPreferences",
+ "path" : "${qpid.work_dir}/preferences/passwordFile"
+ }]
} ],
"ports" : [ {
"name" : "AMQP",
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java Fri Sep 20 18:59:30 2013
@@ -240,11 +240,10 @@ public class BrokerOptionsTest extends Q
public void testDefaultWorkDirWithQpidWork()
{
- String qpidWork = "/test/value";
+ String qpidWork = new File(File.separator + "test" + File.separator + "value").getAbsolutePath();
setTestSystemProperty("QPID_WORK", qpidWork);
- String expectedPath = new File(qpidWork).getAbsolutePath();
- assertEquals (expectedPath, _options.getConfigProperties().get(BrokerOptions.QPID_WORK_DIR));
+ assertEquals (qpidWork, _options.getConfigProperties().get(BrokerOptions.QPID_WORK_DIR));
}
public void testDefaultWorkDirWithoutQpidWork()
@@ -265,11 +264,10 @@ public class BrokerOptionsTest extends Q
public void testDefaultHomeDirWithQpidHome()
{
- String qpidHome = "/test/value";
+ String qpidHome = new File(File.separator + "test" + File.separator + "value").getAbsolutePath();
setTestSystemProperty("QPID_HOME", qpidHome);
- String expectedPath = new File(qpidHome).getAbsolutePath();
- assertEquals (expectedPath, _options.getConfigProperties().get(BrokerOptions.QPID_HOME_DIR));
+ assertEquals (qpidHome, _options.getConfigProperties().get(BrokerOptions.QPID_HOME_DIR));
assertEquals("unexpected number of entries", 6, _options.getConfigProperties().keySet().size());
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java Fri Sep 20 18:59:30 2013
@@ -113,17 +113,17 @@ public class VirtualHostConfigurationTes
VirtualHost vhost = createVirtualHost(getName());
// Check that atest was a priority queue with 5 priorities
- AMQQueue atest = vhost.getQueueRegistry().getQueue(new AMQShortString("atest"));
+ AMQQueue atest = vhost.getQueue("atest");
assertTrue(atest instanceof AMQPriorityQueue);
assertEquals(5, ((AMQPriorityQueue) atest).getPriorities());
// Check that ptest was a priority queue with 10 priorities
- AMQQueue ptest = vhost.getQueueRegistry().getQueue(new AMQShortString("ptest"));
+ AMQQueue ptest = vhost.getQueue("ptest");
assertTrue(ptest instanceof AMQPriorityQueue);
assertEquals(10, ((AMQPriorityQueue) ptest).getPriorities());
// Check that ntest wasn't a priority queue
- AMQQueue ntest = vhost.getQueueRegistry().getQueue(new AMQShortString("ntest"));
+ AMQQueue ntest = vhost.getQueue("ntest");
assertFalse(ntest instanceof AMQPriorityQueue);
}
@@ -146,13 +146,13 @@ public class VirtualHostConfigurationTes
VirtualHost vhost = createVirtualHost(getName());
// Check specifically configured values
- AMQQueue aTest = vhost.getQueueRegistry().getQueue(new AMQShortString("atest"));
+ AMQQueue aTest = vhost.getQueue("atest");
assertEquals(4, aTest.getMaximumQueueDepth());
assertEquals(5, aTest.getMaximumMessageSize());
assertEquals(6, aTest.getMaximumMessageAge());
// Check default values
- AMQQueue bTest = vhost.getQueueRegistry().getQueue(new AMQShortString("btest"));
+ AMQQueue bTest = vhost.getQueue("btest");
assertEquals(1, bTest.getMaximumQueueDepth());
assertEquals(2, bTest.getMaximumMessageSize());
assertEquals(3, bTest.getMaximumMessageAge());
@@ -214,10 +214,10 @@ public class VirtualHostConfigurationTes
assertFalse("c3p0 queue DLQ was configured as disabled", extra.getConfiguration().getQueueConfiguration("c3p0").isDeadLetterQueueEnabled());
// Get queues
- AMQQueue biggles = test.getQueueRegistry().getQueue(new AMQShortString("biggles"));
- AMQQueue beetle = test.getQueueRegistry().getQueue(new AMQShortString("beetle"));
- AMQQueue r2d2 = extra.getQueueRegistry().getQueue(new AMQShortString("r2d2"));
- AMQQueue c3p0 = extra.getQueueRegistry().getQueue(new AMQShortString("c3p0"));
+ AMQQueue biggles = test.getQueue("biggles");
+ AMQQueue beetle = test.getQueue("beetle");
+ AMQQueue r2d2 = extra.getQueue("r2d2");
+ AMQQueue c3p0 = extra.getQueue("c3p0");
// Disabled specifically for this queue, overriding virtualhost setting
assertNull("Biggles queue should not have alt exchange as DLQ should be configured as disabled: " + biggles.getAlternateExchange(), biggles.getAlternateExchange());
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java Fri Sep 20 18:59:30 2013
@@ -55,6 +55,8 @@ import org.apache.qpid.server.model.adap
import org.apache.qpid.server.model.adapter.AuthenticationProviderFactory;
import org.apache.qpid.server.model.adapter.GroupProviderFactory;
import org.apache.qpid.server.model.adapter.PortFactory;
+import org.apache.qpid.server.model.adapter.PreferencesProviderCreator;
+import org.apache.qpid.server.configuration.store.StoreConfigurationChangeListener;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
@@ -76,7 +78,9 @@ public class BrokerRecovererTest extends
super.setUp();
_brokerRecoverer = new BrokerRecoverer(mock(AuthenticationProviderFactory.class), mock(GroupProviderFactory.class), mock(AccessControlProviderFactory.class), mock(PortFactory.class),
- mock(StatisticsGatherer.class), mock(VirtualHostRegistry.class), mock(LogRecorder.class), mock(RootMessageLogger.class), mock(TaskExecutor.class), mock(BrokerOptions.class));
+ mock(PreferencesProviderCreator.class),
+ mock(StatisticsGatherer.class), mock(VirtualHostRegistry.class), mock(LogRecorder.class), mock(RootMessageLogger.class), mock(TaskExecutor.class), mock(BrokerOptions.class),
+ mock(StoreConfigurationChangeListener.class));
when(_brokerEntry.getId()).thenReturn(_brokerId);
when(_brokerEntry.getChildren()).thenReturn(_brokerEntryChildren);
when(_brokerEntry.getAttributes()).thenReturn(Collections.<String, Object>singletonMap(Broker.MODEL_VERSION, Model.MODEL_VERSION));
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java Fri Sep 20 18:59:30 2013
@@ -35,6 +35,7 @@ import org.apache.qpid.server.model.Plug
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.configuration.store.StoreConfigurationChangeListener;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
@@ -55,7 +56,9 @@ public class DefaultRecovererProviderTes
RootMessageLogger rootMessageLogger = mock(RootMessageLogger.class);
TaskExecutor taskExecutor = mock(TaskExecutor.class);
- DefaultRecovererProvider provider = new DefaultRecovererProvider(statisticsGatherer, virtualHostRegistry, logRecorder, rootMessageLogger, taskExecutor, mock(BrokerOptions.class));
+ DefaultRecovererProvider provider = new DefaultRecovererProvider(statisticsGatherer, virtualHostRegistry,
+ logRecorder, rootMessageLogger, taskExecutor, mock(BrokerOptions.class),
+ mock(StoreConfigurationChangeListener.class));
for (String configuredObjectType : supportedTypes)
{
ConfiguredObjectRecoverer<?> recovever = provider.getRecoverer(configuredObjectType);
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java Fri Sep 20 18:59:30 2013
@@ -78,7 +78,7 @@ public class VirtualHostRecovererTest ex
attributes.put(VirtualHost.NAME, getName());
attributes.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
- attributes.put(VirtualHost.STORE_TYPE, "MEMORY");
+ attributes.put(VirtualHost.STORE_TYPE, "TESTMEMORY");
when(entry.getAttributes()).thenReturn(attributes);
VirtualHost host = recoverer.create(null, entry, parent);
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java Fri Sep 20 18:59:30 2013
@@ -95,7 +95,7 @@ public class DefaultExchangeFactoryTest
}
catch (IllegalStateException e)
{
- assertEquals("Unexpected exception message", "Did not find expected exchange type: " + _directExchangeType.getName(), e.getMessage());
+ assertEquals("Unexpected exception message", "Did not find expected exchange type: " + _directExchangeType.getType(), e.getMessage());
}
}
@@ -112,7 +112,7 @@ public class DefaultExchangeFactoryTest
}
catch (IllegalStateException e)
{
- assertEquals("Unexpected exception message", "Did not find expected exchange type: " + _topicExchangeType.getName(), e.getMessage());
+ assertEquals("Unexpected exception message", "Did not find expected exchange type: " + _topicExchangeType.getType(), e.getMessage());
}
}
@@ -129,7 +129,7 @@ public class DefaultExchangeFactoryTest
}
catch (IllegalStateException e)
{
- assertEquals("Unexpected exception message", "Did not find expected exchange type: " + _fanoutExchangeType.getName(), e.getMessage());
+ assertEquals("Unexpected exception message", "Did not find expected exchange type: " + _fanoutExchangeType.getType(), e.getMessage());
}
}
@@ -146,7 +146,7 @@ public class DefaultExchangeFactoryTest
}
catch (IllegalStateException e)
{
- assertEquals("Unexpected exception message", "Did not find expected exchange type: " + _headersExchangeType.getName(), e.getMessage());
+ assertEquals("Unexpected exception message", "Did not find expected exchange type: " + _headersExchangeType.getType(), e.getMessage());
}
}
@@ -163,7 +163,7 @@ public class DefaultExchangeFactoryTest
catch (IllegalStateException e)
{
assertTrue( "Unexpected exception message", e.getMessage().contains("ExchangeType with type name '"
- + _directExchangeType.getName() + "' is already registered using class '"
+ + _directExchangeType.getType() + "' is already registered using class '"
+ DirectExchangeType.class.getName()));
}
}
@@ -175,24 +175,18 @@ public class DefaultExchangeFactoryTest
@Override
public String getType()
{
- return getName().toString();
+ return "my-custom-exchange";
}
@Override
- public AMQShortString getName()
- {
- return new AMQShortString("my-custom-exchange");
- }
-
- @Override
- public Exchange newInstance(UUID id, VirtualHost host, AMQShortString name, boolean durable,
+ public Exchange newInstance(UUID id, VirtualHost host, String name, boolean durable,
boolean autoDelete) throws AMQException
{
return null;
}
@Override
- public AMQShortString getDefaultExchangeName()
+ public String getDefaultExchangeName()
{
return null;
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java Fri Sep 20 18:59:30 2013
@@ -22,11 +22,13 @@ package org.apache.qpid.server.exchange;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anySet;
+import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.UUID;
import junit.framework.TestCase;
@@ -61,22 +63,22 @@ public class FanoutExchangeTest extends
_virtualHost = mock(VirtualHost.class);
SecurityManager securityManager = mock(SecurityManager.class);
when(_virtualHost.getSecurityManager()).thenReturn(securityManager);
- when(securityManager.authoriseBind(any(Exchange.class), any(AMQQueue.class), any(AMQShortString.class))).thenReturn(true);
- when(securityManager.authoriseUnbind(any(Exchange.class), any(AMQShortString.class), any(AMQQueue.class))).thenReturn(true);
+ when(securityManager.authoriseBind(any(Exchange.class), any(AMQQueue.class), anyString())).thenReturn(true);
+ when(securityManager.authoriseUnbind(any(Exchange.class), anyString(), any(AMQQueue.class))).thenReturn(true);
- _exchange.initialise(UUID.randomUUID(), _virtualHost, AMQShortString.valueOf("test"), false, false);
+ _exchange.initialise(UUID.randomUUID(), _virtualHost, "test", false, false);
}
- public void testIsBoundAMQShortStringFieldTableAMQQueueWhenQueueIsNull()
+ public void testIsBoundStringMapAMQQueueWhenQueueIsNull()
{
assertFalse("calling isBound(AMQShortString,FieldTable,AMQQueue) with null queue should return false",
- _exchange.isBound((AMQShortString) null, (FieldTable) null, (AMQQueue) null));
+ _exchange.isBound((String) null, (Map) null, (AMQQueue) null));
}
- public void testIsBoundAMQShortStringAMQQueueWhenQueueIsNull()
+ public void testIsBoundStringAMQQueueWhenQueueIsNull()
{
assertFalse("calling isBound(AMQShortString,AMQQueue) with null queue should return false",
- _exchange.isBound((AMQShortString) null, (AMQQueue) null));
+ _exchange.isBound((String) null, (AMQQueue) null));
}
public void testIsBoundAMQQueueWhenQueueIsNull()
@@ -84,18 +86,18 @@ public class FanoutExchangeTest extends
assertFalse("calling isBound(AMQQueue) with null queue should return false", _exchange.isBound((AMQQueue) null));
}
- public void testIsBoundAMQShortStringFieldTableAMQQueue() throws AMQSecurityException, AMQInternalException
+ public void testIsBoundStringMapAMQQueue() throws AMQSecurityException, AMQInternalException
{
AMQQueue queue = bindQueue();
assertTrue("Should return true for a bound queue",
- _exchange.isBound(new AMQShortString("matters"), (FieldTable) null, queue));
+ _exchange.isBound("matters", null, queue));
}
- public void testIsBoundAMQShortStringAMQQueue() throws AMQSecurityException, AMQInternalException
+ public void testIsBoundStringAMQQueue() throws AMQSecurityException, AMQInternalException
{
AMQQueue queue = bindQueue();
assertTrue("Should return true for a bound queue",
- _exchange.isBound(new AMQShortString("matters"), queue));
+ _exchange.isBound("matters", queue));
}
public void testIsBoundAMQQueue() throws AMQSecurityException, AMQInternalException
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Fri Sep 20 18:59:30 2013
@@ -65,10 +65,10 @@ public class HeadersExchangeTest extends
_virtualHost = mock(VirtualHost.class);
SecurityManager securityManager = mock(SecurityManager.class);
when(_virtualHost.getSecurityManager()).thenReturn(securityManager);
- when(securityManager.authoriseBind(any(Exchange.class), any(AMQQueue.class), any(AMQShortString.class))).thenReturn(true);
- when(securityManager.authoriseUnbind(any(Exchange.class), any(AMQShortString.class), any(AMQQueue.class))).thenReturn(true);
+ when(securityManager.authoriseBind(any(Exchange.class), any(AMQQueue.class), anyString())).thenReturn(true);
+ when(securityManager.authoriseUnbind(any(Exchange.class), anyString(), any(AMQQueue.class))).thenReturn(true);
- _exchange.initialise(UUID.randomUUID(), _virtualHost, AMQShortString.valueOf("test"), false, false);
+ _exchange.initialise(UUID.randomUUID(), _virtualHost, "test", false, false);
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Fri Sep 20 18:59:30 2013
@@ -20,33 +20,31 @@
*/
package org.apache.qpid.server.exchange;
+import java.util.List;
import junit.framework.Assert;
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.server.binding.Binding;
-import org.apache.qpid.server.message.AMQMessage;
-import org.apache.qpid.server.message.MessageMetaData;
+import org.apache.qpid.server.message.InboundMessage;
+import org.apache.qpid.server.message.MessageReference;
+import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.queue.BaseQueue;
-import org.apache.qpid.server.queue.IncomingMessage;
-import org.apache.qpid.server.store.MemoryMessageStore;
-import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class TopicExchangeTest extends QpidTestCase
{
private TopicExchange _exchange;
private VirtualHost _vhost;
- private MessageStore _store;
@Override
@@ -56,7 +54,6 @@ public class TopicExchangeTest extends Q
BrokerTestHelper.setUp();
_exchange = new TopicExchange();
_vhost = BrokerTestHelper.createVirtualHost(getName());
- _store = new MemoryMessageStore();
}
@Override
@@ -78,37 +75,33 @@ public class TopicExchangeTest extends Q
public void testNoRoute() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a*#b", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a*#b", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.*.#.b",queue, _exchange, null));
- IncomingMessage message = createMessage("a.b");
- routeMessage(message);
+ routeMessage("a.b", 0l);
Assert.assertEquals(0, queue.getMessageCount());
}
public void testDirectMatch() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "ab", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "ab", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.b",queue, _exchange, null));
- IncomingMessage message = createMessage("a.b");
-
- routeMessage(message);
+ routeMessage("a.b",0l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
-
- message = createMessage("a.c");
-
- int queueCount = routeMessage(message);
+ int queueCount = routeMessage("a.c",1l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
@@ -117,38 +110,30 @@ public class TopicExchangeTest extends Q
public void testStarMatch() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a*", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a*", false, null, false, false, false, null);
_exchange.registerQueue(new Binding(null, "a.*",queue, _exchange, null));
- IncomingMessage message = createMessage("a.b");
-
- routeMessage(message);
+ routeMessage("a.b",0l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("a.c");
-
- int queueCount = routeMessage(message);
+ routeMessage("a.c",1l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
-
- message = createMessage("a");
-
-
- queueCount = routeMessage(message);
+ int queueCount = routeMessage("a",2l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
@@ -156,61 +141,49 @@ public class TopicExchangeTest extends Q
public void testHashMatch() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, false, null);
_exchange.registerQueue(new Binding(null, "a.#",queue, _exchange, null));
- IncomingMessage message = createMessage("a.b.c");
-
- int queueCount = routeMessage(message);
+ routeMessage("a.b.c",0l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
-
- message = createMessage("a.b");
-
- queueCount = routeMessage(message);
+ routeMessage("a.b",1l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("a.c");
-
- queueCount = routeMessage(message);
+ routeMessage("a.c",2l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 2l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("a");
-
- queueCount = routeMessage(message);
+ routeMessage("a",3l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 3l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("b");
-
-
- queueCount = routeMessage(message);
+ int queueCount = routeMessage("b", 4l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
@@ -219,28 +192,24 @@ public class TopicExchangeTest extends Q
public void testMidHash() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.*.#.b",queue, _exchange, null));
-
- IncomingMessage message = createMessage("a.c.d.b");
-
- routeMessage(message);
+ routeMessage("a.c.d.b",0l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("a.c.b");
-
- routeMessage(message);
+ routeMessage("a.c.b",1l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
@@ -249,43 +218,36 @@ public class TopicExchangeTest extends Q
public void testMatchafterHash() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.*.#.b.c",queue, _exchange, null));
- IncomingMessage message = createMessage("a.c.b.b");
-
- int queueCount = routeMessage(message);
+ int queueCount = routeMessage("a.c.b.b",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("a.a.b.c");
-
- routeMessage(message);
+ routeMessage("a.a.b.c",1l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("a.b.c.b");
-
- queueCount = routeMessage(message);
+ queueCount = routeMessage("a.b.c.b",2l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("a.b.c.b.c");
-
- routeMessage(message);
+ routeMessage("a.b.c.b.c",3l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 3l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
@@ -295,25 +257,20 @@ public class TopicExchangeTest extends Q
public void testHashAfterHash() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.*.#.b.c.#.d",queue, _exchange, null));
-
- IncomingMessage message = createMessage("a.c.b.b.c");
-
- int queueCount = routeMessage(message);
+ int queueCount = routeMessage("a.c.b.b.c",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
-
- message = createMessage("a.a.b.c.d");
-
- routeMessage(message);
+ routeMessage("a.a.b.c.d",1l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
@@ -322,24 +279,20 @@ public class TopicExchangeTest extends Q
public void testHashHash() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.#.*.#.d",queue, _exchange, null));
-
- IncomingMessage message = createMessage("a.c.b.b.c");
-
- int queueCount = routeMessage(message);
+ int queueCount = routeMessage("a.c.b.b.c",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
- message = createMessage("a.a.b.c.d");
-
- routeMessage(message);
+ routeMessage("a.a.b.c.d",1l);
Assert.assertEquals(1, queue.getMessageCount());
- Assert.assertEquals("Wrong message recevied", (Object) message.getMessageNumber(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
+ Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.deleteMessageFromTop();
Assert.assertEquals(0, queue.getMessageCount());
@@ -348,43 +301,43 @@ public class TopicExchangeTest extends Q
public void testSubMatchFails() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.b.c.d",queue, _exchange, null));
-
- IncomingMessage message = createMessage("a.b.c");
-
- int queueCount = routeMessage(message);
+ int queueCount = routeMessage("a.b.c",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
}
- private int routeMessage(final IncomingMessage message)
- throws AMQException
+ private int routeMessage(String routingKey, long messageNumber) throws AMQException
{
- MessageMetaData mmd = message.headersReceived(System.currentTimeMillis());
- message.setStoredMessage(_store.addMessage(mmd));
-
- message.enqueue(_exchange.route(message));
- AMQMessage msg = new AMQMessage(message.getStoredMessage());
- for(BaseQueue q : message.getDestinationQueues())
+ InboundMessage inboundMessage = mock(InboundMessage.class);
+ when(inboundMessage.getRoutingKey()).thenReturn(routingKey);
+ List<? extends BaseQueue> queues = _exchange.route(inboundMessage);
+ ServerMessage message = mock(ServerMessage.class);
+ MessageReference ref = mock(MessageReference.class);
+ when(ref.getMessage()).thenReturn(message);
+ when(message.newReference()).thenReturn(ref);
+ when(message.getMessageNumber()).thenReturn(messageNumber);
+ for(BaseQueue q : queues)
{
- q.enqueue(msg);
+ q.enqueue(message);
}
- return message.getDestinationQueues().size();
+
+ return queues.size();
}
public void testMoreRouting() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.b",queue, _exchange, null));
- IncomingMessage message = createMessage("a.b.c");
-
- int queueCount = routeMessage(message);
+ int queueCount = routeMessage("a.b.c",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
@@ -393,66 +346,16 @@ public class TopicExchangeTest extends Q
public void testMoreQueue() throws AMQException
{
- AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
+ AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false,
+ false, null);
_exchange.registerQueue(new Binding(null, "a.b",queue, _exchange, null));
- IncomingMessage message = createMessage("a");
-
- int queueCount = routeMessage(message);
+ int queueCount = routeMessage("a",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
Assert.assertEquals(0, queue.getMessageCount());
}
- private IncomingMessage createMessage(String s) throws AMQException
- {
- MessagePublishInfo info = new PublishInfo(new AMQShortString(s));
-
- IncomingMessage message = new IncomingMessage(info);
- final ContentHeaderBody chb = new ContentHeaderBody();
- BasicContentHeaderProperties props = new BasicContentHeaderProperties();
- chb.setProperties(props);
- message.setContentHeaderBody(chb);
-
-
- return message;
- }
-
-
- class PublishInfo implements MessagePublishInfo
- {
- private AMQShortString _routingkey;
-
- PublishInfo(AMQShortString routingkey)
- {
- _routingkey = routingkey;
- }
-
- public AMQShortString getExchange()
- {
- return null;
- }
-
- public void setExchange(AMQShortString exchange)
- {
-
- }
-
- public boolean isImmediate()
- {
- return false;
- }
-
- public boolean isMandatory()
- {
- return true;
- }
-
- public AMQShortString getRoutingKey()
- {
- return _routingkey;
- }
- }
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java Fri Sep 20 18:59:30 2013
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.logging.actors;
-import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.util.BrokerTestHelper;
import java.util.List;
@@ -45,7 +45,7 @@ public class AMQPChannelActorTest extend
private void setUpNow() throws Exception
{
super.setUp();
- AMQChannel channel = BrokerTestHelper.createChannel(1, getSession());
+ AMQSessionModel channel = BrokerTestHelper.createSession(1, getConnection());
setAmqpActor(new AMQPChannelActor(channel, getRootLogger()));
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java Fri Sep 20 18:59:30 2013
@@ -20,31 +20,43 @@
*/
package org.apache.qpid.server.logging.actors;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
+import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.util.BrokerTestHelper;
+import org.apache.qpid.server.virtualhost.VirtualHost;
public class BaseConnectionActorTestCase extends BaseActorTestCase
{
- private AMQProtocolSession _session;
+ private AMQConnectionModel _session;
+ private VirtualHost _virtualHost;
@Override
public void setUp() throws Exception
{
super.setUp();
BrokerTestHelper.setUp();
- _session = BrokerTestHelper.createSession();
-
+ _session = BrokerTestHelper.createConnection();
+ _virtualHost = BrokerTestHelper.createVirtualHost("test");
setAmqpActor(new AMQPConnectionActor(_session, getRootLogger()));
}
+ public VirtualHost getVirtualHost()
+ {
+ return _virtualHost;
+ }
+
@Override
public void tearDown() throws Exception
{
try
{
+ if(_virtualHost != null)
+ {
+ _virtualHost.close();
+ }
if (_session != null)
{
- _session.getVirtualHost().close();
+ _session.close(AMQConstant.CONNECTION_FORCED, "");
}
}
finally
@@ -54,7 +66,7 @@ public class BaseConnectionActorTestCase
}
}
- public AMQProtocolSession getSession()
+ public AMQConnectionModel getConnection()
{
return _session;
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java Fri Sep 20 18:59:30 2013
@@ -23,9 +23,10 @@ package org.apache.qpid.server.logging.a
import org.apache.commons.configuration.ConfigurationException;
import org.apache.qpid.AMQException;
-import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.NullRootMessageLogger;
+import org.apache.qpid.server.util.BrokerTestHelper;
/**
* Test : CurrentActorTest
@@ -71,7 +72,7 @@ public class CurrentActorTest extends Ba
public void testLIFO() throws AMQException, ConfigurationException
{
assertTrue("Unexpected actor: " + CurrentActor.get(), CurrentActor.get() instanceof TestLogActor);
- AMQPConnectionActor connectionActor = new AMQPConnectionActor(getSession(),
+ AMQPConnectionActor connectionActor = new AMQPConnectionActor(getConnection(),
new NullRootMessageLogger());
/*
@@ -98,7 +99,7 @@ public class CurrentActorTest extends Ba
*
*/
- AMQChannel channel = new AMQChannel(getSession(), 1, getSession().getVirtualHost().getMessageStore());
+ AMQSessionModel channel = BrokerTestHelper.createSession(1, getConnection());
AMQPChannelActor channelActor = new AMQPChannelActor(channel,
new NullRootMessageLogger());
@@ -214,7 +215,7 @@ public class CurrentActorTest extends Ba
{
LogActor defaultActor = CurrentActor.get();
- AMQPConnectionActor actor = new AMQPConnectionActor(getSession(),
+ AMQPConnectionActor actor = new AMQPConnectionActor(getConnection(),
new NullRootMessageLogger());
CurrentActor.set(actor);
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java Fri Sep 20 18:59:30 2013
@@ -31,7 +31,7 @@ public class QueueActorTest extends Base
public void setUp() throws Exception
{
super.setUp();
- setAmqpActor(new QueueActor(BrokerTestHelper.createQueue(getName(), getSession().getVirtualHost()), getRootLogger()));
+ setAmqpActor(new QueueActor(BrokerTestHelper.createQueue(getName(), getVirtualHost()), getRootLogger()));
}
/**
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java Fri Sep 20 18:59:30 2013
@@ -44,7 +44,7 @@ public class SubscriptionActorTest exten
MockSubscription mockSubscription = new MockSubscription();
- mockSubscription.setQueue(BrokerTestHelper.createQueue(getName(), getSession().getVirtualHost()), false);
+ mockSubscription.setQueue(BrokerTestHelper.createQueue(getName(), getVirtualHost()), false);
setAmqpActor(new SubscriptionActor(getRootLogger(), mockSubscription));
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java Fri Sep 20 18:59:30 2013
@@ -34,8 +34,8 @@ public class ExchangeMessagesTest extend
{
Exchange exchange = BrokerTestHelper.createExchange("test");
- String type = exchange.getTypeShortString().toString();
- String name = exchange.getNameShortString().toString();
+ String type = exchange.getTypeName();
+ String name = exchange.getName();
_logMessage = ExchangeMessages.CREATED(type, name, false);
List<Object> log = performLog();
@@ -49,8 +49,8 @@ public class ExchangeMessagesTest extend
{
Exchange exchange = BrokerTestHelper.createExchange("test");
- String type = exchange.getTypeShortString().toString();
- String name = exchange.getNameShortString().toString();
+ String type = exchange.getTypeName();
+ String name = exchange.getName();
_logMessage = ExchangeMessages.CREATED(type, name, true);
List<Object> log = performLog();
@@ -74,7 +74,7 @@ public class ExchangeMessagesTest extend
{
Exchange exchange = BrokerTestHelper.createExchange("test");
- final String name = exchange.getNameShortString().toString();
+ final String name = exchange.getName();
final String routingKey = "routingKey";
_logMessage = ExchangeMessages.DISCARDMSG(name, routingKey);
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java Fri Sep 20 18:59:30 2013
@@ -21,7 +21,6 @@
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.LogMessage;
@@ -113,7 +112,7 @@ public abstract class AbstractTestLogSub
// This should return us MockProtocolSessionUser@null/test
String connectionSlice = getSlice("con:" + connectionID, message);
- assertNotNull("Unable to find connection 'con:" + connectionID + "'",
+ assertNotNull("Unable to find connection 'con:" + connectionID + "' in '"+message+"'",
connectionSlice);
// Exract the userName
@@ -131,7 +130,7 @@ public abstract class AbstractTestLogSub
// We will have three sections
assertEquals("Unable to split IP from rest of Connection:"
- + userNameParts[1], 3, ipParts.length);
+ + userNameParts[1] + " in '"+message+"'", 3, ipParts.length);
// We need to skip the first '/' split will be empty so validate 1 as IP
assertEquals("IP not as expected", ipString, ipParts[1]);
@@ -146,14 +145,14 @@ public abstract class AbstractTestLogSub
* @param message The message to check
* @param routingKey The routing key to check against
*/
- protected void verifyRoutingKey(String message, AMQShortString routingKey)
+ protected void verifyRoutingKey(String message, String routingKey)
{
String routingKeySlice = getSlice("rk", message);
- assertNotNull("Routing Key not found:" + message, routingKey);
+ assertNotNull("Routing Key not found:" + message, routingKeySlice);
assertEquals("Routing key not correct",
- routingKey.toString(), routingKeySlice);
+ routingKey, routingKeySlice);
}
/**
@@ -169,7 +168,7 @@ public abstract class AbstractTestLogSub
assertNotNull("Queue not found:" + message, queueSlice);
assertEquals("Queue name not correct",
- queue.getNameShortString().toString(), queueSlice);
+ queue.getName(), queueSlice);
}
/**
@@ -191,10 +190,10 @@ public abstract class AbstractTestLogSub
exchangeParts.length);
assertEquals("Exchange type not correct",
- exchange.getTypeShortString().toString(), exchangeParts[0]);
+ exchange.getType().getType(), exchangeParts[0]);
assertEquals("Exchange name not correct",
- exchange.getNameShortString().toString(), exchangeParts[1]);
+ exchange.getName(), exchangeParts[1]);
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java Fri Sep 20 18:59:30 2013
@@ -34,7 +34,7 @@ public class BindingLogSubjectTest exten
{
private AMQQueue _queue;
- private AMQShortString _routingKey;
+ private String _routingKey;
private Exchange _exchange;
private VirtualHost _testVhost;
@@ -44,12 +44,12 @@ public class BindingLogSubjectTest exten
super.setUp();
_testVhost = BrokerTestHelper.createVirtualHost("test");
- _routingKey = new AMQShortString("RoutingKey");
+ _routingKey = "RoutingKey";
_exchange = _testVhost.getExchange("amq.direct");
_queue = new MockAMQQueue("BindingLogSubjectTest");
((MockAMQQueue) _queue).setVirtualHost(_testVhost);
- _subject = new BindingLogSubject(String.valueOf(_routingKey), _exchange, _queue);
+ _subject = new BindingLogSubject(_routingKey, _exchange, _queue);
}
@Override
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java Fri Sep 20 18:59:30 2013
@@ -20,7 +20,10 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.protocol.AMQSessionModel;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Validate ChannelLogSubjects are logged as expected
@@ -34,10 +37,10 @@ public class ChannelLogSubjectTest exten
{
super.setUp();
-
- AMQChannel channel = new AMQChannel(getSession(), _channelID, getSession().getVirtualHost().getMessageStore());
-
- _subject = new ChannelLogSubject(channel);
+ AMQSessionModel session = mock(AMQSessionModel.class);
+ when(session.getConnectionModel()).thenReturn(getConnection());
+ when(session.getChannelId()).thenReturn(_channelID);
+ _subject = new ChannelLogSubject(session);
}
/**
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java Fri Sep 20 18:59:30 2013
@@ -20,8 +20,10 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.util.BrokerTestHelper;
+import org.apache.qpid.server.protocol.AMQConnectionModel;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Validate ConnectionLogSubjects are logged as expected
@@ -29,25 +31,24 @@ import org.apache.qpid.server.util.Broke
public class ConnectionLogSubjectTest extends AbstractTestLogSubject
{
- private InternalTestProtocolSession _session;
+ private static final long CONNECTION_ID = 456l;
+ private static final String USER = "InternalTestProtocolSession";
+ private static final String IP_STRING = "127.0.0.1:1";
+ private static final String VHOST = "test";
+
+ private AMQConnectionModel _connection;
@Override
public void setUp() throws Exception
{
super.setUp();
- _session = BrokerTestHelper.createSession("test");
- _subject = new ConnectionLogSubject(_session);
- }
-
- @Override
- public void tearDown() throws Exception
- {
- if (_session != null)
- {
- _session.getVirtualHost().close();
- }
- super.tearDown();
+ _connection = mock(AMQConnectionModel.class);
+ when(_connection.getConnectionId()).thenReturn(CONNECTION_ID);
+ when(_connection.getPrincipalAsString()).thenReturn(USER);
+ when(_connection.getRemoteAddressString()).thenReturn("/"+IP_STRING);
+ when(_connection.getVirtualHostName()).thenReturn(VHOST);
+ _subject = new ConnectionLogSubject(_connection);
}
/**
@@ -57,12 +58,12 @@ public class ConnectionLogSubjectTest ex
*/
protected void validateLogStatement(String message)
{
- verifyConnection(_session.getSessionID(), "InternalTestProtocolSession", "127.0.0.1:1", "test", message);
+ verifyConnection(CONNECTION_ID, USER, IP_STRING, VHOST, message);
}
- public InternalTestProtocolSession getSession()
+ public AMQConnectionModel getConnection()
{
- return _session;
+ return _connection;
}
}
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java Fri Sep 20 18:59:30 2013
@@ -37,7 +37,8 @@ public class MessageStoreLogSubjectTest
_testVhost = BrokerTestHelper.createVirtualHost("test");
- _subject = new MessageStoreLogSubject(_testVhost, _testVhost.getMessageStore().getClass().getSimpleName());
+ _subject = new MessageStoreLogSubject(_testVhost.getName(),
+ _testVhost.getMessageStore().getClass().getSimpleName());
}
@Override
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java Fri Sep 20 18:59:30 2013
@@ -20,27 +20,24 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.flow.LimitlessCreditManager;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.MockAMQQueue;
import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.subscription.SubscriptionFactory;
-import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* Validate SubscriptionLogSubjects are logged as expected
*/
public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
{
+ private static final long SUBSCRIPTION_ID = 1;
private AMQQueue _queue;
private VirtualHost _testVhost;
- private int _channelID = 1;
private Subscription _subscription;
@Override
@@ -48,23 +45,14 @@ public class SubscriptionLogSubjectTest
{
super.setUp();
- InternalTestProtocolSession session = BrokerTestHelper.createSession();
- _testVhost = session.getVirtualHost();
+ _testVhost = BrokerTestHelper.createVirtualHost("test");
_queue = new MockAMQQueue("SubscriptionLogSubjectTest");
((MockAMQQueue) _queue).setVirtualHost(_testVhost);
- AMQChannel channel = new AMQChannel(session, _channelID, _testVhost.getMessageStore());
-
- session.addChannel(channel);
-
- SubscriptionFactory factory = new SubscriptionFactoryImpl();
-
- _subscription = factory.createSubscription(_channelID, session, new AMQShortString("cTag"),
- false, null, false,
- new LimitlessCreditManager());
-
- _subscription.setQueue(_queue, false);
+ _subscription = mock(Subscription.class);
+ when(_subscription.getQueue()).thenReturn(_queue);
+ when(_subscription.getSubscriptionID()).thenReturn(SUBSCRIPTION_ID);
_subject = new SubscriptionLogSubject(_subscription);
}
@@ -102,7 +90,7 @@ public class SubscriptionLogSubjectTest
// MESSAGE [Blank][sub:0(vh(/
// test)/
// qu(SubscriptionLogSubjectTest))]
- // Take the last bit and drop off the extra )]
+ // Take the last bit and drop off the extra )]
String[] parts = message.split("/");
assertEquals("Message part count wrong", 3, parts.length);
String subscription = parts[2].substring(0, parts[2].indexOf(")") + 1);
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java Fri Sep 20 18:59:30 2013
@@ -35,6 +35,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
import org.apache.qpid.server.configuration.RecovererProvider;
import org.apache.qpid.server.configuration.startup.DefaultRecovererProvider;
+import org.apache.qpid.server.configuration.store.StoreConfigurationChangeListener;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
import org.apache.qpid.server.security.group.FileGroupManagerFactory;
@@ -62,7 +63,7 @@ public class ConfiguredObjectStateTransi
when(_broker.getTaskExecutor()).thenReturn(executor);
_recovererProvider = new DefaultRecovererProvider(statisticsGatherer, _broker.getVirtualHostRegistry(),
- _broker.getLogRecorder(), _broker.getRootMessageLogger(), executor, new BrokerOptions());
+ _broker.getLogRecorder(), _broker.getRootMessageLogger(), executor, new BrokerOptions(), mock(StoreConfigurationChangeListener.class));
_store = mock(ConfigurationEntryStore.class);
Modified: qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1525101&r1=1525100&r2=1525101&view=diff
==============================================================================
--- qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/branches/linearstore/qpid/java/broker/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Fri Sep 20 18:59:30 2013
@@ -38,9 +38,8 @@ import org.apache.qpid.server.logging.Sy
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.stats.StatisticsGatherer;
-import org.apache.qpid.server.store.MemoryMessageStore;
+import org.apache.qpid.server.store.TestMemoryMessageStore;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.StandardVirtualHost;
import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
public class VirtualHostTest extends TestCase
@@ -92,7 +91,7 @@ public class VirtualHostTest extends Tes
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(VirtualHost.NAME, getName());
attributes.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
- attributes.put(VirtualHost.STORE_TYPE, MemoryMessageStore.TYPE);
+ attributes.put(VirtualHost.STORE_TYPE, TestMemoryMessageStore.TYPE);
attributes.put(VirtualHost.STATE, State.QUIESCED);
VirtualHost host = createHost(attributes);
@@ -131,7 +130,7 @@ public class VirtualHostTest extends Tes
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(VirtualHost.NAME, getName());
attributes.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
- attributes.put(VirtualHost.STORE_TYPE, MemoryMessageStore.TYPE);
+ attributes.put(VirtualHost.STORE_TYPE, TestMemoryMessageStore.TYPE);
VirtualHost host = createHost(attributes);
return host;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org