Author: orudyy
Date: Tue Nov 13 18:10:57 2012
New Revision: 1408866
URL: http://svn.apache.org/viewvc?rev=1408866&view=rev
Log:
QPID-4390: WIP - Remove calls to ApplicationRegistry.getInstance() from broker
unit tests
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java
Tue Nov 13 18:10:57 2012
@@ -22,9 +22,9 @@ package org.apache.qpid.server;
import org.apache.qpid.server.protocol.AMQProtocolSession;
import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
public class AMQChannelTest extends InternalBrokerBaseCase
{
@@ -35,8 +35,9 @@ public class AMQChannelTest extends Inte
public void setUp() throws Exception
{
super.setUp();
- _virtualHost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
- _protocolSession = new InternalTestProtocolSession(_virtualHost);
+ VirtualHostRegistry registry = getRegistry().getVirtualHostRegistry();
+ _virtualHost = registry.getVirtualHosts().iterator().next();
+ _protocolSession = new InternalTestProtocolSession(_virtualHost,
registry);
}
public void testCompareTo() throws Exception
@@ -44,7 +45,7 @@ public class AMQChannelTest extends Inte
AMQChannel channel1 = new AMQChannel(_protocolSession, 1,
_virtualHost.getMessageStore());
// create a channel with the same channelId but on a different session
- AMQChannel channel2 = new AMQChannel(new
InternalTestProtocolSession(_virtualHost), 1, _virtualHost.getMessageStore());
+ AMQChannel channel2 = new AMQChannel(new
InternalTestProtocolSession(_virtualHost,
getRegistry().getVirtualHostRegistry()), 1, _virtualHost.getMessageStore());
assertFalse("Unexpected compare result", channel1.compareTo(channel2)
== 0);
assertEquals("Unexpected compare result", 0,
channel1.compareTo(channel1));
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
Tue Nov 13 18:10:57 2012
@@ -25,7 +25,6 @@ import org.apache.commons.configuration.
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.server.queue.AMQPriorityQueue;
import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.store.TestableMemoryMessageStore;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -68,8 +67,7 @@ public class VirtualHostConfigurationTes
// Start the broker now.
super.createBroker();
- VirtualHost vhost =
-
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
+ VirtualHost vhost =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName());
// Check that atest was a priority queue with 5 priorities
AMQQueue atest = vhost.getQueueRegistry().getQueue(new
AMQShortString("atest"));
@@ -105,8 +103,7 @@ public class VirtualHostConfigurationTes
// Start the broker now.
super.createBroker();
- VirtualHost vhost =
-
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
+ VirtualHost vhost =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName());
// Check specifically configured values
AMQQueue aTest = vhost.getQueueRegistry().getQueue(new
AMQShortString("atest"));
@@ -133,7 +130,7 @@ public class VirtualHostConfigurationTes
super.createBroker();
// Get vhosts
- VirtualHost test =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
+ VirtualHost test =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName());
// Enabled specifically
assertEquals("Test vhost MDC was configured as enabled", 5
,test.getConfiguration().getMaxDeliveryCount());
@@ -167,8 +164,8 @@ public class VirtualHostConfigurationTes
super.createBroker();
// Get vhosts
- VirtualHost test =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
- VirtualHost extra =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName()
+ "Extra");
+ VirtualHost test =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName());
+ VirtualHost extra =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName() + "Extra");
// Enabled specifically
assertTrue("Test vhost DLQ was configured as enabled",
test.getConfiguration().isDeadLetterQueueEnabled());
@@ -218,8 +215,7 @@ public class VirtualHostConfigurationTes
// Start the broker now.
super.createBroker();
- VirtualHost vhost =
-
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
+ VirtualHost vhost =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName());
assertEquals("HouseKeeping PoolSize not set correctly.",
initialPoolSize, vhost.getHouseKeepingPoolSize());
@@ -235,8 +231,7 @@ public class VirtualHostConfigurationTes
// Start the broker now.
super.createBroker();
- VirtualHost vhost =
-
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
+ VirtualHost vhost =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName());
assertEquals("Default houseKeeping task count incorrect.", 1,
vhost.getHouseKeepingTaskCount());
@@ -260,8 +255,7 @@ public class VirtualHostConfigurationTes
// Start the broker now.
super.createBroker();
- VirtualHost vhost =
-
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
+ VirtualHost vhost =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName());
assertEquals("HouseKeeping PoolSize not set correctly.",
initialPoolSize, vhost.getHouseKeepingPoolSize());
@@ -336,7 +330,7 @@ public class VirtualHostConfigurationTes
super.createBroker();
// Get vhosts
- VirtualHost test =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
+ VirtualHost test =
getRegistry().getVirtualHostRegistry().getVirtualHost(getName());
// Check, that the property stored within the <dot.in.a.name> tag has
been properly loaded
assertEquals("queue with dots in its name has been properly loaded",
5,
test.getConfiguration().getQueueConfiguration("dot.in.a.name").getMaxDeliveryCount());
@@ -359,7 +353,7 @@ public class VirtualHostConfigurationTes
super.createBroker();
// Get vhosts
- VirtualHost test =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("dot.in.a.name");
+ VirtualHost test =
getRegistry().getVirtualHostRegistry().getVirtualHost("dot.in.a.name");
// Check, that the property stored within the <dot.in.a.name> tag has
been properly loaded
assertEquals("virtual host with dots in the name has been properly
loaded", TestableMemoryMessageStore.class.getName(),
test.getMessageStore().getClass().getName());
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
Tue Nov 13 18:10:57 2012
@@ -53,7 +53,7 @@ import org.apache.qpid.server.queue.Inco
import org.apache.qpid.server.queue.MockStoredMessage;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.queue.SimpleAMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.subscription.Subscription;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
@@ -92,7 +92,7 @@ public class AbstractHeadersExchangeTest
private TestQueue bind(String key, String queueName, Map<String,Object>
args) throws AMQException
{
- TestQueue queue = new TestQueue(new AMQShortString(queueName));
+ TestQueue queue = new TestQueue(new AMQShortString(queueName),
getRegistry());
queues.add(queue);
exchange.onBind(new Binding(null, key, queue, exchange, args));
return queue;
@@ -273,10 +273,10 @@ public class AbstractHeadersExchangeTest
return getNameShortString().toString();
}
- public TestQueue(AMQShortString name) throws AMQException
+ public TestQueue(AMQShortString name, IApplicationRegistry registry)
throws AMQException
{
- super(UUIDGenerator.generateRandomUUID(), name, false, new
AMQShortString("test"), true,
false,ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test"),
Collections.EMPTY_MAP);
-
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry().registerQueue(this);
+ super(UUIDGenerator.generateRandomUUID(), name, false, new
AMQShortString("test"), true, false,
registry.getVirtualHostRegistry().getVirtualHost("test"),
Collections.EMPTY_MAP);
+
registry.getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry().registerQueue(this);
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
Tue Nov 13 18:10:57 2012
@@ -23,8 +23,8 @@ package org.apache.qpid.server.exchange;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.protocol.AMQProtocolSession;
import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
{
@@ -35,9 +35,9 @@ public class HeadersExchangeTest extends
{
super.setUp();
// Just use the first vhost.
- VirtualHost
- virtualHost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
- _protocolSession = new InternalTestProtocolSession(virtualHost);
+ VirtualHostRegistry registry = getRegistry().getVirtualHostRegistry();
+ VirtualHost virtualHost = registry.getVirtualHosts().iterator().next();
+ _protocolSession = new InternalTestProtocolSession(virtualHost,
registry);
}
public void testSimple() throws AMQException
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
Tue Nov 13 18:10:57 2012
@@ -36,11 +36,11 @@ import org.apache.qpid.server.queue.AMQQ
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.registry.ApplicationRegistry;
import org.apache.qpid.server.store.MemoryMessageStore;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
public class TopicExchangeTest extends InternalBrokerBaseCase
{
@@ -58,9 +58,10 @@ public class TopicExchangeTest extends I
{
super.setUp();
_exchange = new TopicExchange();
- _vhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
+ VirtualHostRegistry registry = getRegistry().getVirtualHostRegistry();
+ _vhost = registry.getVirtualHosts().iterator().next();
_store = new MemoryMessageStore();
- _protocolSession = new InternalTestProtocolSession(_vhost);
+ _protocolSession = new InternalTestProtocolSession(_vhost, registry);
}
public void testNoRoute() throws AMQException
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
Tue Nov 13 18:10:57 2012
@@ -33,7 +33,7 @@ public class ExchangeMessagesTest extend
public void testExchangeCreated_Transient()
{
// Get the Default Exchange on the Test Vhost for testing
- Exchange exchange = ApplicationRegistry.getInstance().
+ Exchange exchange = getRegistry().
getVirtualHostRegistry().getVirtualHost("test").
getExchangeRegistry().getDefaultExchange();
@@ -51,7 +51,7 @@ public class ExchangeMessagesTest extend
public void testExchangeCreated_Persistent()
{
// Get the Default Exchange on the Test Vhost for testing
- Exchange exchange = ApplicationRegistry.getInstance().
+ Exchange exchange = getRegistry().
getVirtualHostRegistry().getVirtualHost("test").
getExchangeRegistry().getDefaultExchange();
@@ -79,7 +79,7 @@ public class ExchangeMessagesTest extend
public void testExchangeDiscardedMessage()
{
// Get the Default Exchange on the Test Vhost for testing
- final Exchange exchange = ApplicationRegistry.getInstance().
+ final Exchange exchange = getRegistry().
getVirtualHostRegistry().getVirtualHost("test").
getExchangeRegistry().getDefaultExchange();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
Tue Nov 13 18:10:57 2012
@@ -24,7 +24,6 @@ import org.apache.qpid.framing.AMQShortS
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.MockAMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
/**
@@ -42,7 +41,7 @@ public class BindingLogSubjectTest exten
{
super.setUp();
- _testVhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().
+ _testVhost = getRegistry().getVirtualHostRegistry().
getVirtualHost("test");
// Configure items for subjectCreation
_routingKey = new AMQShortString("RoutingKey");
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
Tue Nov 13 18:10:57 2012
@@ -21,7 +21,6 @@
package org.apache.qpid.server.logging.subjects;
import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -37,7 +36,7 @@ public class ExchangeLogSubjectTest exte
{
super.setUp();
- _testVhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().
+ _testVhost = getRegistry().getVirtualHostRegistry().
getVirtualHost("test");
_exchange = _testVhost.getExchangeRegistry().getDefaultExchange();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
Tue Nov 13 18:10:57 2012
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
/**
@@ -34,7 +33,7 @@ public class MessageStoreLogSubjectTest
{
super.setUp();
- _testVhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().
+ _testVhost = getRegistry().getVirtualHostRegistry().
getVirtualHost("test");
_subject = new MessageStoreLogSubject(_testVhost,
_testVhost.getMessageStore().getClass().getSimpleName());
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
Tue Nov 13 18:10:57 2012
@@ -39,7 +39,7 @@ public class QueueLogSubjectTest extends
{
super.setUp();
- _testVhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().
+ _testVhost = getRegistry().getVirtualHostRegistry().
getVirtualHost("test");
_queue = new MockAMQQueue("QueueLogSubjectTest");
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
Tue Nov 13 18:10:57 2012
@@ -46,7 +46,7 @@ public class SubscriptionLogSubjectTest
{
super.setUp();
- _testVhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().
+ _testVhost = getRegistry().getVirtualHostRegistry().
getVirtualHost("test");
_queue = new MockAMQQueue("SubscriptionLogSubjectTest");
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
Tue Nov 13 18:10:57 2012
@@ -30,13 +30,13 @@ import org.apache.qpid.server.message.AM
import org.apache.qpid.server.message.MessageContentSource;
import org.apache.qpid.server.output.ProtocolOutputConverter;
import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.subscription.ClientDeliveryMethod;
import org.apache.qpid.server.subscription.Subscription;
import org.apache.qpid.server.subscription.SubscriptionImpl;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import org.apache.qpid.transport.TestNetworkConnection;
import javax.security.auth.Subject;
@@ -58,9 +58,9 @@ public class InternalTestProtocolSession
private AtomicInteger _deliveryCount = new AtomicInteger(0);
private static final AtomicLong ID_GENERATOR = new AtomicLong(0);
- public InternalTestProtocolSession(VirtualHost virtualHost) throws
AMQException
+ public InternalTestProtocolSession(VirtualHost virtualHost,
VirtualHostRegistry registry) throws AMQException
{
- super(ApplicationRegistry.getInstance().getVirtualHostRegistry(), new
TestNetworkConnection(), ID_GENERATOR.getAndIncrement());
+ super(registry, new TestNetworkConnection(),
ID_GENERATOR.getAndIncrement());
_channelDelivers = new HashMap<Integer, Map<AMQShortString,
LinkedList<DeliveryPair>>>();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
Tue Nov 13 18:10:57 2012
@@ -26,6 +26,7 @@ import org.apache.qpid.server.AMQChannel
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
/** Test class to test MBean operations for AMQMinaProtocolSession. */
public class MaxChannelsTest extends InternalBrokerBaseCase
@@ -34,8 +35,9 @@ public class MaxChannelsTest extends Int
public void testChannels() throws Exception
{
- VirtualHost vhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
- _session = new InternalTestProtocolSession(vhost);
+ VirtualHostRegistry registry = getRegistry().getVirtualHostRegistry();
+ VirtualHost vhost = registry.getVirtualHost("test");
+ _session = new InternalTestProtocolSession(vhost, registry);
// check the channel count is correct
int channelCount = _session.getChannels().size();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
Tue Nov 13 18:10:57 2012
@@ -351,13 +351,6 @@ public class AMQQueueFactoryTest extends
assertTrue("Unexpected exception message!",
e.getMessage().contains("DLQ queue name")
&& e.getMessage().contains("length exceeds limit of 255"));
}
- finally
- {
- ApplicationRegistry.getInstance().getConfiguration().getConfig()
- .addProperty("deadLetterExchangeSuffix",
DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
- ApplicationRegistry.getInstance().getConfiguration().getConfig()
- .addProperty("deadLetterQueueSuffix",
AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
- }
}
/**
@@ -384,13 +377,6 @@ public class AMQQueueFactoryTest extends
assertTrue("Unexpected exception message!",
e.getMessage().contains("DL exchange name")
&& e.getMessage().contains("length exceeds limit of 255"));
}
- finally
- {
- ApplicationRegistry.getInstance().getConfiguration().getConfig()
- .addProperty("deadLetterExchangeSuffix",
DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
- ApplicationRegistry.getInstance().getConfiguration().getConfig()
- .addProperty("deadLetterQueueSuffix",
AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
- }
}
private String generateStringWithLength(char ch, int length)
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
Tue Nov 13 18:10:57 2012
@@ -44,6 +44,7 @@ import org.apache.qpid.server.txn.AutoCo
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import java.util.ArrayList;
import java.util.Set;
@@ -70,9 +71,10 @@ public class AckTest extends InternalBro
public void setUp() throws Exception
{
super.setUp();
- _virtualHost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
+ VirtualHostRegistry registry = getRegistry().getVirtualHostRegistry();
+ _virtualHost = registry.getVirtualHost("test");
_messageStore = new TestableMemoryMessageStore();
- _protocolSession = new InternalTestProtocolSession(_virtualHost);
+ _protocolSession = new InternalTestProtocolSession(_virtualHost,
registry);
_channel = new AMQChannel(_protocolSession,5, _messageStore /*dont
need exchange registry*/);
_protocolSession.addChannel(_channel);
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
Tue Nov 13 18:10:57 2012
@@ -48,7 +48,7 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.queue.BaseQueue.PostEnqueueAction;
import org.apache.qpid.server.queue.SimpleAMQQueue.QueueEntryFilter;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TestableMemoryMessageStore;
@@ -111,7 +111,7 @@ public class SimpleAMQQueueTest extends
{
super.setUp();
//Create Application Registry for test
- ApplicationRegistry applicationRegistry =
(ApplicationRegistry)ApplicationRegistry.getInstance();
+ IApplicationRegistry applicationRegistry = getRegistry();
PropertiesConfiguration env = new PropertiesConfiguration();
final VirtualHostConfiguration vhostConfig = new
VirtualHostConfiguration(getClass().getName(), env, mock(Broker.class));
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
Tue Nov 13 18:10:57 2012
@@ -33,7 +33,7 @@ public class SimpleAMQQueueThreadPoolTes
public void test() throws AMQException
{
int initialCount =
ReferenceCountingExecutorService.getInstance().getReferenceCount();
- VirtualHost test =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
+ VirtualHost test =
getRegistry().getVirtualHostRegistry().getVirtualHost("test");
try
{
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
Tue Nov 13 18:10:57 2012
@@ -38,7 +38,6 @@ import org.apache.qpid.server.exchange.E
import org.apache.qpid.server.exchange.TopicExchange;
import org.apache.qpid.server.message.AMQMessage;
import org.apache.qpid.server.message.MessageMetaData;
-import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.queue.AMQPriorityQueue;
@@ -49,13 +48,12 @@ import org.apache.qpid.server.queue.Conf
import org.apache.qpid.server.queue.IncomingMessage;
import org.apache.qpid.server.queue.QueueRegistry;
import org.apache.qpid.server.queue.SimpleAMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.util.FileUtils;
-import org.mockito.Mockito;
import java.io.File;
import java.util.HashMap;
@@ -116,6 +114,7 @@ public class MessageStoreTest extends In
protected void reloadVirtualHost()
{
+ IApplicationRegistry registry = getRegistry();
VirtualHost original = getVirtualHost();
if (getVirtualHost() != null)
@@ -134,7 +133,7 @@ public class MessageStoreTest extends In
try
{
-
setVirtualHost(ApplicationRegistry.getInstance().createVirtualHost(new
VirtualHostConfiguration(getClass().getName(), _config,
Mockito.mock(Broker.class))));
+ setVirtualHost(registry.createVirtualHost(new
VirtualHostConfiguration(getClass().getName(), _config, registry.getBroker())));
}
catch (Exception e)
{
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java
Tue Nov 13 18:10:57 2012
@@ -18,7 +18,6 @@
*/
package org.apache.qpid.server.transport;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.transport.Binary;
@@ -32,7 +31,7 @@ public class ServerSessionTest extends I
public void setUp() throws Exception
{
super.setUp();
- _virtualHost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
+ _virtualHost =
getRegistry().getVirtualHostRegistry().getVirtualHosts().iterator().next();
}
public void testCompareTo() throws Exception
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=1408866&r1=1408865&r2=1408866&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
Tue Nov 13 18:10:57 2012
@@ -106,7 +106,7 @@ public class InternalBrokerBaseCase exte
_virtualHost.getBindingFactory().addBinding(getName(), _queue,
defaultExchange, null);
- _session = new InternalTestProtocolSession(_virtualHost);
+ _session = new InternalTestProtocolSession(_virtualHost,
_registry.getVirtualHostRegistry());
CurrentActor.set(_session.getLogActor());
_channel = new AMQChannel(_session, 1, _messageStore);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
