You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/01/15 15:32:41 UTC
svn commit: r1433439 - in
/qpid/branches/java-broker-config-qpid-4390/qpid/java:
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
broker/src/main/java/org/apache/qpid/server/configuration/
broker/src/main/java/org/apache/qpid/server/conf...
Author: orudyy
Date: Tue Jan 15 14:32:40 2013
New Revision: 1433439
URL: http://svn.apache.org/viewvc?rev=1433439&view=rev
Log:
QPID-4390: Change VHC to store the default HOUSEKEEPING_CHECK_PERIOD. Clear the current actor in tear down if test sets the current actor
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java
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/TransactionTimeoutHelperTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.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/actors/BaseConnectionActorTestCase.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.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/protocol/MultiVersionProtocolEngineFactoryTest.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/subscription/QueueBrowserUsesNoAckTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.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/BrokerTestHelper.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java Tue Jan 15 14:32:40 2013
@@ -80,7 +80,7 @@ public class BDBHAMessageStoreTest exten
// create virtual host configuration, registry and host instance
addVirtualHostConfiguration();
String vhostName = "test" + _masterPort;
- VirtualHostConfiguration configuration = new VirtualHostConfiguration(vhostName, _configXml.subset("virtualhosts.virtualhost." + vhostName), mock(Broker.class));
+ VirtualHostConfiguration configuration = new VirtualHostConfiguration(vhostName, _configXml.subset("virtualhosts.virtualhost." + vhostName), BrokerTestHelper.createBrokerMock());
_virtualHost = BrokerTestHelper.createVirtualHost(configuration);
BDBHAMessageStore store = (BDBHAMessageStore) _virtualHost.getMessageStore();
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java Tue Jan 15 14:32:40 2013
@@ -61,7 +61,7 @@ public class ServerConfiguration extends
public static final String QPID_WORK = "QPID_WORK";
public static final String LIB_DIR = "lib";
- private Map<String, VirtualHostConfiguration> _virtualHosts = new HashMap<String, VirtualHostConfiguration>();
+ private Map<String, Configuration> _virtualHosts = new HashMap<String, Configuration>();
private File _configFile;
private File _vhostsFile;
@@ -291,8 +291,7 @@ public class ServerConfiguration extends
String name = (String) hosts.get(j);
// Add the virtual hosts to the server configuration
- VirtualHostConfiguration virtualhost = new VirtualHostConfiguration(name, vhostConfiguration.subset("virtualhost." + escapeTagName(name)), null);
- _virtualHosts.put(virtualhost.getName(), virtualhost);
+ _virtualHosts.put(name, vhostConfiguration.subset("virtualhost." + escapeTagName(name)));
}
}
@@ -379,14 +378,14 @@ public class ServerConfiguration extends
return _virtualHosts.keySet().toArray(new String[_virtualHosts.size()]);
}
- public VirtualHostConfiguration getVirtualHostConfig(String name)
+ public Configuration getVirtualHostConfig(String name)
{
return _virtualHosts.get(name);
}
- public void setVirtualHostConfig(VirtualHostConfiguration config)
+ public void setVirtualHostConfig(String name, Configuration config)
{
- _virtualHosts.put(config.getName(), config);
+ _virtualHosts.put(name, config);
}
public String getDefaultAuthenticationManager()
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java Tue Jan 15 14:32:40 2013
@@ -40,18 +40,25 @@ public class VirtualHostConfiguration ex
private final Map<String, QueueConfiguration> _queues = new HashMap<String, QueueConfiguration>();
private final Map<String, ExchangeConfiguration> _exchanges = new HashMap<String, ExchangeConfiguration>();
private final Broker _broker;
+ private final long _defaultHouseKeepingCheckPeriod;
public VirtualHostConfiguration(String name, Configuration config, Broker broker) throws ConfigurationException
{
_name = name;
_broker = broker;
+
+ // store value of this attribute for running life of virtual host since updating of this value has no run-time effect
+ _defaultHouseKeepingCheckPeriod = ((Number)_broker.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).longValue();
setConfiguration(config);
}
public VirtualHostConfiguration(String name, File configurationFile, Broker broker) throws ConfigurationException
{
- _name = name;
- _broker = broker;
+ this(name, loadConfiguration(name, configurationFile), broker);
+ }
+
+ private static Configuration loadConfiguration(String name, File configurationFile) throws ConfigurationException
+ {
Configuration configuration = null;
if (configurationFile == null)
{
@@ -73,7 +80,7 @@ public class VirtualHostConfiguration ex
configuration = config;
}
}
- setConfiguration(configuration);
+ return configuration;
}
/**
@@ -113,7 +120,7 @@ public class VirtualHostConfiguration ex
public long getHousekeepingCheckPeriod()
{
- return getLongValue("housekeeping.checkPeriod", getBrokerAttributeAsLong(Broker.HOUSEKEEPING_CHECK_PERIOD));
+ return getLongValue("housekeeping.checkPeriod", _defaultHouseKeepingCheckPeriod);
}
public Configuration getStoreConfiguration()
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java Tue Jan 15 14:32:40 2013
@@ -317,16 +317,16 @@ public class XMLConfigurationEntryStore
private void createVirtualHostConfig(ServerConfiguration serverConfiguration, Map<UUID, ConfigurationEntry> rootChildren)
{
+ File configuration = serverConfiguration.getVirtualHostsFile();
for (String name : serverConfiguration.getVirtualHostsNames())
{
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(org.apache.qpid.server.model.VirtualHost.NAME, name);
- File configuration = serverConfiguration.getVirtualHostsFile();
if (configuration == null)
{
try
{
- HierarchicalConfiguration virtualHostConfig = ConfigurationUtils.convertToHierarchical(serverConfiguration.getVirtualHostConfig(name).getConfig());
+ HierarchicalConfiguration virtualHostConfig = ConfigurationUtils.convertToHierarchical(serverConfiguration.getVirtualHostConfig(name));
virtualHostConfig.getRootNode().setName(name);
configuration = File.createTempFile("_virtualhost", ".xml");
XMLConfiguration config = new XMLConfiguration();
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java Tue Jan 15 14:32:40 2013
@@ -75,7 +75,7 @@ public class AuthenticationProviderFacto
}
}
- throw new IllegalArgumentException("No factories found for configuration attributes " + attributes);
+ throw new IllegalArgumentException("No authentication provider factory found for configuration attributes " + attributes);
}
}
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -52,6 +52,7 @@ public class AMQChannelTest extends Qpid
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_virtualHost = BrokerTestHelper.createVirtualHost(getTestName());
_broker = BrokerTestHelper.createBrokerMock();
_protocolSession = new InternalTestProtocolSession(_virtualHost, _broker)
@@ -79,6 +80,7 @@ public class AMQChannelTest extends Qpid
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java Tue Jan 15 14:32:40 2013
@@ -98,4 +98,10 @@ public class TransactionTimeoutHelperTes
_transactionTimeoutHelper = new TransactionTimeoutHelper(_logSubject);
}
+ @Override
+ protected void tearDown() throws Exception
+ {
+ CurrentActor.remove();
+ super.tearDown();
+ }
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java Tue Jan 15 14:32:40 2013
@@ -47,6 +47,7 @@ public class AcknowledgeTest extends Qpi
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_channel = BrokerTestHelper.createChannel();
VirtualHost virtualHost = _channel.getVirtualHost();
_queueName = getTestName();
@@ -68,6 +69,7 @@ public class AcknowledgeTest extends Qpi
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.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/QueueConfigurationTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java Tue Jan 15 14:32:40 2013
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.configuration;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import junit.framework.TestCase;
@@ -29,6 +28,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.util.BrokerTestHelper;
public class QueueConfigurationTest extends TestCase
{
@@ -37,9 +37,12 @@ public class QueueConfigurationTest exte
private VirtualHostConfiguration _fullHostConf;
private Broker _broker;
+ @Override
public void setUp() throws Exception
{
- _broker = mock(Broker.class);
+ super.setUp();
+ BrokerTestHelper.setUp();
+ _broker = BrokerTestHelper.createBrokerMock();
_env = new PropertiesConfiguration();
_emptyConf = new VirtualHostConfiguration("test", _env, _broker);
@@ -56,6 +59,13 @@ public class QueueConfigurationTest exte
}
+ @Override
+ public void tearDown() throws Exception
+ {
+ BrokerTestHelper.tearDown();
+ super.tearDown();
+ }
+
public void testMaxDeliveryCount() throws Exception
{
// broker MAXIMUM_DELIVERY_ATTEMPTS attribute is not set
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.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/ServerConfigurationTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java Tue Jan 15 14:32:40 2013
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
@@ -33,6 +34,7 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.stats.StatisticsGatherer;
+import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -53,17 +55,21 @@ public class ServerConfigurationTest ext
{
private XMLConfiguration _config = new XMLConfiguration();
private ServerConfiguration _serverConfig = null;
+ private Broker _broker;
@Override
protected void setUp() throws Exception
{
super.setUp();
_serverConfig = new ServerConfiguration(_config);
+ BrokerTestHelper.setUp();
+ _broker = BrokerTestHelper.createBrokerMock();
}
@Override
protected void tearDown() throws Exception
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
@@ -1001,10 +1007,10 @@ public class ServerConfigurationTest ext
config.initialise();
// Test config
- VirtualHostConfiguration virtualHost = config.getVirtualHostConfig("a");
+ Configuration virtualHost = config.getVirtualHostConfig("a");
assertEquals("Incorrect virtualhost count", 1, config.getVirtualHostsNames().length);
- assertEquals("Incorrect virtualhost name", "a", virtualHost.getName());
+ assertNotNull("Unexpected virtual host configuration", virtualHost);
}
/**
@@ -1037,12 +1043,12 @@ public class ServerConfigurationTest ext
// Load config
ServerConfiguration config = new ServerConfiguration(mainFile.getAbsoluteFile());
config.initialise();
-
+
// Test config
- VirtualHostConfiguration virtualHost = config.getVirtualHostConfig("one");
+ Configuration virtualHost = config.getVirtualHostConfig("one");
assertEquals("Incorrect virtualhost count", 1, config.getVirtualHostsNames().length);
- assertEquals("Incorrect virtualhost name", "one", virtualHost.getName());
+ assertNotNull("Unexpected virtual host configuration", virtualHost);
}
/**
@@ -1091,11 +1097,11 @@ public class ServerConfigurationTest ext
// Load config
ServerConfiguration config = new ServerConfiguration(mainFile.getAbsoluteFile());
config.initialise();
-
+
// Test config
- VirtualHostConfiguration testHost = config.getVirtualHostConfig("test");
+ VirtualHostConfiguration testHost = new VirtualHostConfiguration("test", config.getVirtualHostConfig("test"), _broker);
ExchangeConfiguration testExchange = testHost.getExchangeConfiguration("test.topic");
- VirtualHostConfiguration fishHost = config.getVirtualHostConfig("fish");
+ VirtualHostConfiguration fishHost = new VirtualHostConfiguration("fish", config.getVirtualHostConfig("fish"), _broker);
ExchangeConfiguration fishExchange = fishHost.getExchangeConfiguration("fish.topic");
assertEquals("Incorrect virtualhost count", 2, config.getVirtualHostsNames().length);
@@ -1147,7 +1153,7 @@ public class ServerConfigurationTest ext
config.initialise();
// Test config
- VirtualHostConfiguration testHost = config.getVirtualHostConfig("test");
+ VirtualHostConfiguration testHost = new VirtualHostConfiguration("test", config.getVirtualHostConfig("test"), _broker);
ExchangeConfiguration testExchange = testHost.getExchangeConfiguration("test.topic");
assertEquals("Incorrect virtualhost count", 1, config.getVirtualHostsNames().length);
@@ -1185,7 +1191,7 @@ public class ServerConfigurationTest ext
config.initialise();
// Test config
- VirtualHostConfiguration oneHost = config.getVirtualHostConfig("test-one");
+ VirtualHostConfiguration oneHost = new VirtualHostConfiguration("test-one", config.getVirtualHostConfig("test-one"), _broker);
assertEquals("Incorrect virtualhost count", 1, config.getVirtualHostsNames().length);
assertEquals("Incorrect virtualhost name", "test-one", oneHost.getName());
@@ -1391,11 +1397,10 @@ public class ServerConfigurationTest ext
ServerConfiguration serverConfiguration = new ServerConfiguration(xml);
serverConfiguration.initialise();
- Broker broker = mock(Broker.class);
- when(broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
- VirtualHostConfiguration test = new VirtualHostConfiguration("test", serverConfiguration.getVirtualHostConfig("test").getConfig(), broker );
+ when(_broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
+ VirtualHostConfiguration test = new VirtualHostConfiguration("test", serverConfiguration.getVirtualHostConfig("test"), _broker );
assertNotNull("Host 'test' is not found", test);
- VirtualHostConfiguration extra = new VirtualHostConfiguration("extra", serverConfiguration.getVirtualHostConfig("extra").getConfig(), broker);
+ VirtualHostConfiguration extra = new VirtualHostConfiguration("extra", serverConfiguration.getVirtualHostConfig("extra"), _broker);
assertNotNull("Host 'extra' is not found", test);
QueueConfiguration biggles = test.getQueueConfiguration("biggles");
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -47,6 +47,7 @@ public class VirtualHostConfigurationTes
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_configXml = new XMLConfiguration();
_configXml.addProperty("security." + TestAuthenticationManagerFactory.TEST_AUTH_MANAGER_MARKER, "");
_configXml.addProperty("virtualhosts.virtualhost(-1).name", getName());
@@ -68,6 +69,7 @@ public class VirtualHostConfigurationTes
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -72,7 +72,7 @@ public class AbstractHeadersExchangeTest
public void setUp() throws Exception
{
super.setUp();
-
+ BrokerTestHelper.setUp();
_virtualHost = BrokerTestHelper.createVirtualHost(getClass().getName());
}
@@ -88,6 +88,7 @@ public class AbstractHeadersExchangeTest
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -33,10 +33,17 @@ public class HeadersExchangeTest extends
public void setUp() throws Exception
{
super.setUp();
-
+ BrokerTestHelper.setUp();
_protocolSession = new InternalTestProtocolSession(getVirtualHost(), BrokerTestHelper.createBrokerMock());
}
+ @Override
+ public void tearDown() throws Exception
+ {
+ BrokerTestHelper.tearDown();
+ super.tearDown();
+ }
+
public void testSimple() throws AMQException
{
TestQueue q1 = bindDefault("F0000");
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -53,6 +53,7 @@ public class TopicExchangeTest extends Q
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_exchange = new TopicExchange();
_vhost = BrokerTestHelper.createVirtualHost(getName());
_store = new MemoryMessageStore();
@@ -70,6 +71,7 @@ public class TopicExchangeTest extends Q
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.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/actors/BaseConnectionActorTestCase.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java Tue Jan 15 14:32:40 2013
@@ -31,8 +31,9 @@ public class BaseConnectionActorTestCase
public void setUp() throws Exception
{
super.setUp();
-
+ BrokerTestHelper.setUp();
_session = BrokerTestHelper.createSession();
+
setAmqpActor(new AMQPConnectionActor(_session, getRootLogger()));
}
@@ -48,6 +49,7 @@ public class BaseConnectionActorTestCase
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.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/AbstractTestMessages.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java Tue Jan 15 14:32:40 2013
@@ -29,6 +29,7 @@ import org.apache.qpid.server.logging.Lo
import org.apache.qpid.server.logging.UnitTestMessageLogger;
import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.logging.subjects.TestBlankSubject;
+import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.test.utils.QpidTestCase;
import java.util.List;
@@ -49,6 +50,14 @@ public abstract class AbstractTestMessag
_logger = new UnitTestMessageLogger();
_actor = new TestLogActor(_logger);
+ BrokerTestHelper.setUp();
+ }
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ BrokerTestHelper.tearDown();
+ super.tearDown();
}
protected List<Object> performLog()
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.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/AbstractTestLogSubject.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java Tue Jan 15 14:32:40 2013
@@ -30,6 +30,7 @@ import org.apache.qpid.server.logging.Un
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -51,8 +52,16 @@ public abstract class AbstractTestLogSub
protected LogSubject _subject = null;
@Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ BrokerTestHelper.setUp();
+ }
+
+ @Override
public void tearDown() throws Exception
{
+ BrokerTestHelper.tearDown();
try
{
CurrentActor.removeAll();
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -35,6 +35,7 @@ public class MaxChannelsTest extends Qpi
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_session = BrokerTestHelper.createSession();
}
@@ -75,6 +76,7 @@ public class MaxChannelsTest extends Qpi
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.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/MultiVersionProtocolEngineFactoryTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java Tue Jan 15 14:32:40 2013
@@ -43,7 +43,7 @@ public class MultiVersionProtocolEngineF
protected void setUp() throws Exception
{
super.setUp();
-
+ BrokerTestHelper.setUp();
_broker = BrokerTestHelper.createBrokerMock();
VirtualHostRegistry virtualHostRegistry = _broker.getVirtualHostRegistry();
when(_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST)).thenReturn("default");
@@ -55,8 +55,15 @@ public class MultiVersionProtocolEngineF
@Override
protected void tearDown() throws Exception
{
- _virtualHost.close();
- super.tearDown();
+ try
+ {
+ _virtualHost.close();
+ }
+ finally
+ {
+ BrokerTestHelper.tearDown();
+ super.tearDown();
+ }
}
private static final byte[] AMQP_0_8_HEADER =
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.queue;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.apache.commons.configuration.XMLConfiguration;
@@ -51,11 +50,12 @@ public class AMQQueueFactoryTest extends
{
super.setUp();
+ BrokerTestHelper.setUp();
XMLConfiguration configXml = new XMLConfiguration();
configXml.addProperty("store.class", TestableMemoryMessageStore.class.getName());
- Broker broker = mock(Broker.class);
+ Broker broker = BrokerTestHelper.createBrokerMock();
if (getName().equals("testDeadLetterQueueDoesNotInheritDLQorMDCSettings"))
{
when(broker.getAttribute(Broker.MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(5);
@@ -73,11 +73,12 @@ public class AMQQueueFactoryTest extends
{
try
{
- super.tearDown();
+ _virtualHost.close();
}
finally
{
- _virtualHost.close();
+ BrokerTestHelper.tearDown();
+ super.tearDown();
}
}
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -68,6 +68,7 @@ public class AckTest extends QpidTestCas
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_channel = BrokerTestHelper.createChannel(5);
_protocolSession = _channel.getProtocolSession();
_virtualHost = _protocolSession.getVirtualHost();
@@ -75,6 +76,13 @@ public class AckTest extends QpidTestCas
_messageStore = (TestableMemoryMessageStore)_virtualHost.getMessageStore();
}
+ @Override
+ protected void tearDown() throws Exception
+ {
+ BrokerTestHelper.tearDown();
+ super.tearDown();
+ }
+
private void publishMessages(int count) throws AMQException
{
publishMessages(count, false);
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -104,6 +104,7 @@ public class SimpleAMQQueueTest extends
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_virtualHost = BrokerTestHelper.createVirtualHost(getClass().getName());
@@ -116,9 +117,16 @@ public class SimpleAMQQueueTest extends
@Override
public void tearDown() throws Exception
{
- _queue.stop();
- _virtualHost.close();
- super.tearDown();
+ try
+ {
+ _queue.stop();
+ _virtualHost.close();
+ }
+ finally
+ {
+ BrokerTestHelper.tearDown();
+ super.tearDown();
+ }
}
public void testCreateQueue() throws AMQException
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -29,6 +29,20 @@ import org.apache.qpid.test.utils.QpidTe
public class SimpleAMQQueueThreadPoolTest extends QpidTestCase
{
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ BrokerTestHelper.setUp();
+ }
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ BrokerTestHelper.tearDown();
+ super.tearDown();
+ }
+
public void test() throws Exception
{
int initialCount = ReferenceCountingExecutorService.getInstance().getReferenceCount();
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.store;
-import static org.mockito.Mockito.mock;
import org.apache.commons.configuration.PropertiesConfiguration;
@@ -104,6 +103,7 @@ public class MessageStoreTest extends Qp
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
String storePath = System.getProperty("QPID_WORK") + File.separator + getName();
@@ -113,7 +113,8 @@ public class MessageStoreTest extends Qp
cleanup(new File(storePath));
- _broker = mock(Broker.class);
+ _broker = BrokerTestHelper.createBrokerMock();
+
reloadVirtualHost();
}
@@ -129,6 +130,7 @@ public class MessageStoreTest extends Qp
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java Tue Jan 15 14:32:40 2013
@@ -49,6 +49,7 @@ public class QueueBrowserUsesNoAckTest e
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_channel = BrokerTestHelper.createChannel();
VirtualHost virtualHost = _channel.getVirtualHost();
_queueName = getTestName();
@@ -70,6 +71,7 @@ public class QueueBrowserUsesNoAckTest e
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.java Tue Jan 15 14:32:40 2013
@@ -49,6 +49,7 @@ public class SubscriptionFactoryImplTest
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_channel = BrokerTestHelper.createChannel();
_session = _channel.getProtocolSession();
GenericActor.setDefaultMessageLogger(new UnitTestMessageLogger(false));
@@ -66,6 +67,7 @@ public class SubscriptionFactoryImplTest
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
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=1433439&r1=1433438&r2=1433439&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 Jan 15 14:32:40 2013
@@ -34,6 +34,7 @@ public class ServerSessionTest extends Q
public void setUp() throws Exception
{
super.setUp();
+ BrokerTestHelper.setUp();
_virtualHost = BrokerTestHelper.createVirtualHost(getName());
GenericActor.setDefaultMessageLogger(CurrentActor.get().getRootMessageLogger());
}
@@ -50,6 +51,7 @@ public class ServerSessionTest extends Q
}
finally
{
+ BrokerTestHelper.tearDown();
super.tearDown();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.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/BrokerTestHelper.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Tue Jan 15 14:32:40 2013
@@ -66,15 +66,13 @@ public class BrokerTestHelper
protected static final String BROKER_STORE_CLASS_NAME_KEY = "brokerstore.class.name";
protected static final String JSON_BROKER_STORE_CLASS_NAME = JsonConfigurationEntryStore.class.getName();
-
public static Broker createBrokerMock()
{
- setCurrentActorIfNecessary();
-
SubjectCreator subjectCreator = mock(SubjectCreator.class);
when(subjectCreator.getMechanisms()).thenReturn("");
Broker broker = mock(Broker.class);
when(broker.getAttribute(Broker.SESSION_COUNT_LIMIT)).thenReturn(1);
+ when(broker.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).thenReturn(10000l);
when(broker.getId()).thenReturn(UUID.randomUUID());
when(broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(subjectCreator);
RootMessageLogger rootMessageLogger = CurrentActor.get().getRootMessageLogger();
@@ -85,18 +83,19 @@ public class BrokerTestHelper
return broker;
}
- public static void setCurrentActorIfNecessary()
+ public static void setUp()
{
- if (CurrentActor.get() == null)
- {
- CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
- }
+ CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
+ }
+
+ public static void tearDown()
+ {
+ CurrentActor.remove();
}
public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration, VirtualHostRegistry virtualHostRegistry)
throws Exception
{
- setCurrentActorIfNecessary();
StatisticsGatherer statisticsGatherer = mock(StatisticsGatherer.class);
VirtualHost host = new VirtualHostImpl(virtualHostRegistry, statisticsGatherer, new SecurityManager(null), virtualHostConfiguration);
virtualHostRegistry.registerVirtualHost(host);
@@ -105,8 +104,6 @@ public class BrokerTestHelper
public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration) throws Exception
{
- setCurrentActorIfNecessary();
-
return new VirtualHostImpl(null, mock(StatisticsGatherer.class), new SecurityManager(null), virtualHostConfiguration);
}
@@ -124,7 +121,7 @@ public class BrokerTestHelper
private static VirtualHostConfiguration createVirtualHostConfiguration(String name) throws ConfigurationException
{
- VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, new PropertiesConfiguration(), mock(Broker.class));
+ VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, new PropertiesConfiguration(), createBrokerMock());
vhostConfig.setMessageStoreClass(TestableMemoryMessageStore.class.getName());
return vhostConfig;
}
@@ -160,8 +157,6 @@ public class BrokerTestHelper
public static Exchange createExchange(String hostName) throws Exception
{
- setCurrentActorIfNecessary();
-
SecurityManager securityManager = new SecurityManager(null);
VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getName()).thenReturn(hostName);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java?rev=1433439&r1=1433438&r2=1433439&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java Tue Jan 15 14:32:40 2013
@@ -45,19 +45,27 @@ public class VirtualHostImplTest extends
private VirtualHostRegistry _virtualHostRegistry;
@Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ BrokerTestHelper.setUp();
+ }
+
+ @Override
public void tearDown() throws Exception
{
try
{
- super.tearDown();
- }
- finally
- {
if (_virtualHostRegistry != null)
{
_virtualHostRegistry.close();
}
}
+ finally
+ {
+ BrokerTestHelper.tearDown();
+ super.tearDown();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org