You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2010/06/02 18:46:38 UTC
svn commit: r950654 - in
/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server:
configuration/ logging/actors/
Author: ritchiem
Date: Wed Jun 2 16:46:37 2010
New Revision: 950654
URL: http://svn.apache.org/viewvc?rev=950654&view=rev
Log:
QPID-2632 : Fix test that need to modify the configuration before starting the broker. VHCT needed to ensure that the configuration for the various queue priorities was set. The actors need to be able to en/disable status-updates as required.
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java?rev=950654&r1=950653&r2=950654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java Wed Jun 2 16:46:37 2010
@@ -20,59 +20,69 @@
package org.apache.qpid.server.configuration;
-import junit.framework.TestCase;
import org.apache.commons.configuration.XMLConfiguration;
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;
public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
{
- private XMLConfiguration configXml;
-
@Override
public void setUp() throws Exception
{
super.setUp();
- // Fill config file with stuff
- configXml = new XMLConfiguration();
- configXml.setRootElementName("virtualhosts");
- configXml.addProperty("virtualhost(-1).name", "test");
+ // Set the default configuration items
+ _configXml.clear();
+ _configXml.addProperty("virtualhosts.virtualhost(-1).name", "test");
+ _configXml.addProperty("virtualhosts.virtualhost(-1).test.store.class", TestableMemoryMessageStore.class.getName());
+
+ _configXml.addProperty("virtualhosts.virtualhost.name", getName());
+ _configXml.addProperty("virtualhosts.virtualhost."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
+ }
+
+ @Override
+ public void createBroker()
+ {
+ // Prevent auto broker startup
}
public void testQueuePriority() throws Exception
{
- configXml.addProperty("virtualhost.testQueuePriority.name", "testQueuePriority");
// Set up queue with 5 priorities
- configXml.addProperty("virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
"atest");
- configXml.addProperty("virtualhost.testQueuePriority.queues.queue.atest(-1).exchange",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.atest(-1).exchange",
"amq.direct");
- configXml.addProperty("virtualhost.testQueuePriority.queues.queue.atest.priorities",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.atest.priorities",
"5");
// Set up queue with JMS style priorities
- configXml.addProperty("virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
"ptest");
- configXml.addProperty("virtualhost.testQueuePriority.queues.queue.ptest(-1).exchange",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ptest(-1).exchange",
"amq.direct");
- configXml.addProperty("virtualhost.testQueuePriority.queues.queue.ptest.priority",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ptest.priority",
"true");
// Set up queue with no priorities
- configXml.addProperty("virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
"ntest");
- configXml.addProperty("virtualhost.testQueuePriority.queues.queue.ntest(-1).exchange",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ntest(-1).exchange",
"amq.direct");
- configXml.addProperty("virtualhost.testQueuePriority.queues.queue.ntest.priority",
+ _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ntest.priority",
"false");
- VirtualHost vhost = ApplicationRegistry.getInstance().createVirtualHost(new VirtualHostConfiguration("testQueuePriority", configXml.subset("virtualhost.testQueuePriority")));
+ // Start the broker now.
+ super.createBroker();
+
+ VirtualHost vhost =
+ ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
// Check that atest was a priority queue with 5 priorities
AMQQueue atest = vhost.getQueueRegistry().getQueue(new AMQShortString("atest"));
@@ -87,29 +97,29 @@ public class VirtualHostConfigurationTes
// Check that ntest wasn't a priority queue
AMQQueue ntest = vhost.getQueueRegistry().getQueue(new AMQShortString("ntest"));
assertFalse(ntest instanceof AMQPriorityQueue);
-
- ApplicationRegistry.remove();
-
}
public void testQueueAlerts() throws Exception
{
- configXml.addProperty("virtualhost.testQueueAlerts.name", "testQueueAlerts");
// Set up queue with 5 priorities
- configXml.addProperty("virtualhost.testQueueAlerts.queues.exchange", "amq.topic");
- configXml.addProperty("virtualhost.testQueueAlerts.queues.maximumQueueDepth", "1");
- configXml.addProperty("virtualhost.testQueueAlerts.queues.maximumMessageSize", "2");
- configXml.addProperty("virtualhost.testQueueAlerts.queues.maximumMessageAge", "3");
-
- configXml.addProperty("virtualhost.testQueueAlerts.queues(-1).queue(1).name(1)", "atest");
- configXml.addProperty("virtualhost.testQueueAlerts.queues.queue.atest(-1).exchange", "amq.direct");
- configXml.addProperty("virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumQueueDepth", "4");
- configXml.addProperty("virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageSize", "5");
- configXml.addProperty("virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageAge", "6");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.exchange", "amq.topic");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumQueueDepth", "1");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumMessageSize", "2");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumMessageAge", "3");
+
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues(-1).queue(1).name(1)", "atest");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).exchange", "amq.direct");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumQueueDepth", "4");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageSize", "5");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageAge", "6");
- configXml.addProperty("virtualhost.testQueueAlerts.queues(-1).queue(-1).name(-1)", "btest");
+ _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues(-1).queue(-1).name(-1)", "btest");
- VirtualHost vhost = ApplicationRegistry.getInstance().createVirtualHost(new VirtualHostConfiguration("testQueueAlerts", configXml.subset("virtualhost.testQueueAlerts")));
+ // Start the broker now.
+ super.createBroker();
+
+ VirtualHost vhost =
+ ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
// Check specifically configured values
AMQQueue aTest = vhost.getQueueRegistry().getQueue(new AMQShortString("atest"));
@@ -122,8 +132,6 @@ public class VirtualHostConfigurationTes
assertEquals(1, bTest.getMaximumQueueDepth());
assertEquals(2, bTest.getMaximumMessageSize());
assertEquals(3, bTest.getMaximumMessageAge());
-
- ApplicationRegistry.remove();
}
/**
@@ -135,20 +143,17 @@ public class VirtualHostConfigurationTes
{
int initialPoolSize = 10;
- configXml.addProperty("virtualhost.testHouseKeepingThreadCount.name", "testHouseKeepingThreadCount");
- configXml.addProperty("virtualhost.testHouseKeepingThreadCount.housekeeping.poolSize",
+ _configXml.addProperty("virtualhosts.virtualhost.testHouseKeepingThreadCount.housekeeping.poolSize",
initialPoolSize);
- VirtualHostConfiguration config =
- new VirtualHostConfiguration("testHouseKeepingThreadCount",
- configXml.subset("virtualhost.testHouseKeepingThreadCount"));
+ // Start the broker now.
+ super.createBroker();
+
VirtualHost vhost =
- ApplicationRegistry.getInstance().createVirtualHost(config);
+ ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
assertEquals("HouseKeeping PoolSize not set correctly.",
initialPoolSize, vhost.getHouseKeepingPoolSize());
-
- ApplicationRegistry.remove();
}
/**
@@ -158,12 +163,11 @@ public class VirtualHostConfigurationTes
*/
public void testDefaultHouseKeepingTasks() throws Exception
{
- configXml.addProperty("virtualhost.testDefaultHouseKeepingTasks.name", "testDefaultHouseKeepingTasks");
- VirtualHostConfiguration config =
- new VirtualHostConfiguration("testDefaultHouseKeepingTasks",
- configXml.subset("virtualhost.testDefaultHouseKeepingTasks"));
+ // Start the broker now.
+ super.createBroker();
+
VirtualHost vhost =
- ApplicationRegistry.getInstance().createVirtualHost(config);
+ ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
assertEquals("Default houseKeeping task count incorrect.", 2,
vhost.getHouseKeepingTaskCount());
@@ -171,9 +175,6 @@ public class VirtualHostConfigurationTes
// Currently the two are tasks:
// ExpiredMessageTask from VirtualHost
// UpdateTask from the QMF ManagementExchange
-
-
- ApplicationRegistry.remove();
}
/**
@@ -185,15 +186,14 @@ public class VirtualHostConfigurationTes
{
int initialPoolSize = 10;
- configXml.addProperty("virtualhost.testDynamicHouseKeepingPoolSizeChange.name", "testDynamicHouseKeepingPoolSizeChange");
- configXml.addProperty("virtualhost.testDynamicHouseKeepingPoolSizeChange.housekeeping.poolSize",
+ _configXml.addProperty("virtualhosts.virtualhost.testDynamicHouseKeepingPoolSizeChange.housekeeping.poolSize",
initialPoolSize);
- VirtualHostConfiguration config =
- new VirtualHostConfiguration("testHouseKeepingThreadCount",
- configXml.subset("virtualhost.testDynamicHouseKeepingPoolSizeChange"));
+ // Start the broker now.
+ super.createBroker();
+
VirtualHost vhost =
- ApplicationRegistry.getInstance().createVirtualHost(config);
+ ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
assertEquals("HouseKeeping PoolSize not set correctly.",
initialPoolSize, vhost.getHouseKeepingPoolSize());
@@ -203,7 +203,6 @@ public class VirtualHostConfigurationTes
assertEquals("HouseKeeping PoolSize not correctly change.",
1, vhost.getHouseKeepingPoolSize());
- ApplicationRegistry.remove();
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java?rev=950654&r1=950653&r2=950654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java Wed Jun 2 16:46:37 2010
@@ -44,16 +44,27 @@ import java.util.List;
public class AMQPChannelActorTest extends BaseConnectionActorTestCase
{
- AMQChannel _channel;
-
@Override
public void configure()
{
- super.configure();
+ // Prevent defaulting Logging to ON
+ }
+
+
+ @Override
+ public void createBroker() throws Exception
+ {
+ //prevent auto-broker startup
+ }
+
+ private void startBrokerNow() throws Exception
+ {
+ super.createBroker();
_amqpActor = new AMQPChannelActor(_channel, _rootLogger);
}
+
/**
* Test that when logging on behalf of the channel
* The test sends a message then verifies that it entered the logs.
@@ -61,8 +72,12 @@ public class AMQPChannelActorTest extend
* The log message should be fully repalaced (no '{n}' values) and should
* contain the channel id ('/ch:1') identification.
*/
- public void testChannel()
+ public void testChannel() throws Exception
{
+ _configXml.setProperty("status-updates", "ON");
+
+ startBrokerNow();
+
final String message = sendTestMessage();
List<Object> logs = _rawLogger.getLogMessages();
@@ -120,16 +135,15 @@ public class AMQPChannelActorTest extend
* @throws ConfigurationException
* @throws AMQException
*/
- public void testChannelLoggingOFF() throws ConfigurationException, AMQException
+ public void testChannelLoggingOFF() throws Exception, AMQException
{
- Configuration config = new PropertiesConfiguration();
- config.addProperty("status-updates", "OFF");
-
- ServerConfiguration serverConfig = new ServerConfiguration(config);
+ _configXml.setProperty("status-updates", "OFF");
_rawLogger = new UnitTestMessageLogger();
- setUpWithConfig(serverConfig);
+ // Start the broker now.
+ startBrokerNow();
+
sendTestMessage();
@@ -145,16 +159,13 @@ public class AMQPChannelActorTest extend
* @throws ConfigurationException
* @throws AMQException
*/
- public void testChannelLoggingOfF() throws ConfigurationException, AMQException
+ public void testChannelLoggingOfF() throws Exception, AMQException
{
- Configuration config = new PropertiesConfiguration();
- config.addProperty("status-updates", "OfF");
-
- ServerConfiguration serverConfig = new ServerConfiguration(config);
+ _configXml.setProperty("status-updates", "OfF");
_rawLogger = new UnitTestMessageLogger();
- setUpWithConfig(serverConfig);
+ startBrokerNow();
sendTestMessage();
@@ -170,16 +181,13 @@ public class AMQPChannelActorTest extend
* @throws ConfigurationException
* @throws AMQException
*/
- public void testChannelLoggingOff() throws ConfigurationException, AMQException
+ public void testChannelLoggingOff() throws Exception, AMQException
{
- Configuration config = new PropertiesConfiguration();
- config.addProperty("status-updates", "Off");
-
- ServerConfiguration serverConfig = new ServerConfiguration(config);
+ _configXml.setProperty("status-updates", "Off");
_rawLogger = new UnitTestMessageLogger();
- setUpWithConfig(serverConfig);
+ startBrokerNow();
sendTestMessage();
@@ -195,16 +203,13 @@ public class AMQPChannelActorTest extend
* @throws ConfigurationException
* @throws AMQException
*/
- public void testChannelLoggingofF() throws ConfigurationException, AMQException
+ public void testChannelLoggingofF() throws Exception, AMQException
{
- Configuration config = new PropertiesConfiguration();
- config.addProperty("status-updates", "ofF");
-
- ServerConfiguration serverConfig = new ServerConfiguration(config);
+ _configXml.setProperty("status-updates", "ofF");
_rawLogger = new UnitTestMessageLogger();
- setUpWithConfig(serverConfig);
+ startBrokerNow();
sendTestMessage();
@@ -220,16 +225,13 @@ public class AMQPChannelActorTest extend
* @throws ConfigurationException
* @throws AMQException
*/
- public void testChannelLoggingoff() throws ConfigurationException, AMQException
+ public void testChannelLoggingoff() throws Exception, AMQException
{
- Configuration config = new PropertiesConfiguration();
- config.addProperty("status-updates", "off");
-
- ServerConfiguration serverConfig = new ServerConfiguration(config);
+ _configXml.setProperty("status-updates", "off");
_rawLogger = new UnitTestMessageLogger();
- setUpWithConfig(serverConfig);
+ startBrokerNow();
sendTestMessage();
@@ -245,16 +247,13 @@ public class AMQPChannelActorTest extend
* @throws ConfigurationException
* @throws AMQException
*/
- public void testChannelLoggingoFf() throws ConfigurationException, AMQException
- {
- Configuration config = new PropertiesConfiguration();
- config.addProperty("status-updates", "oFf");
-
- ServerConfiguration serverConfig = new ServerConfiguration(config);
+ public void testChannelLoggingoFf() throws Exception, AMQException
+ {
+ _configXml.setProperty("status-updates", "oFf");
_rawLogger = new UnitTestMessageLogger();
- setUpWithConfig(serverConfig);
+ startBrokerNow();
sendTestMessage();
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java?rev=950654&r1=950653&r2=950654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java Wed Jun 2 16:46:37 2010
@@ -41,6 +41,19 @@ import java.util.List;
*/
public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
{
+ @Override
+ public void configure()
+ {
+ // Prevent defaulting Logging to ON
+ }
+
+
+ @Override
+ public void createBroker()
+ {
+ //Prevent auto-broker startup
+ }
+
/**
* Test the AMQPActor logging as a Connection level.
*
@@ -49,8 +62,12 @@ public class AMQPConnectionActorTest ext
* The log message should be fully repalaced (no '{n}' values) and should
* not contain any channel identification.
*/
- public void testConnection()
+ public void testConnection() throws Exception
{
+ _configXml.setProperty("status-updates", "ON");
+
+ super.createBroker();
+
final String message = sendLogMessage();
List<Object> logs = _rawLogger.getLogMessages();
@@ -75,14 +92,12 @@ public class AMQPConnectionActorTest ext
logs.get(0).toString().contains("/ch:"));
}
- public void testConnectionLoggingOff() throws ConfigurationException, AMQException
+ public void testConnectionLoggingOff() throws Exception, AMQException
{
- Configuration config = new PropertiesConfiguration();
- config.addProperty("status-updates", "OFF");
-
- ServerConfiguration serverConfig = new ServerConfiguration(config);
+ _configXml.setProperty("status-updates", "OFF");
- setUpWithConfig(serverConfig);
+ // Start the broker now.
+ super.createBroker();
sendLogMessage();
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java?rev=950654&r1=950653&r2=950654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java Wed Jun 2 16:46:37 2010
@@ -20,17 +20,12 @@
*/
package org.apache.qpid.server.logging.actors;
-import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.RootMessageLoggerImpl;
import org.apache.qpid.server.logging.LogActor;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
public class BaseActorTestCase extends InternalBrokerBaseCase
@@ -43,6 +38,12 @@ public class BaseActorTestCase extends I
public void configure()
{
_configuration.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+ }
+
+ @Override
+ public void createBroker() throws Exception
+ {
+ super.createBroker();
_rawLogger = new UnitTestMessageLogger();
@@ -57,9 +58,4 @@ public class BaseActorTestCase extends I
super.tearDown();
}
- protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
- {
- }
-
-
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java?rev=950654&r1=950653&r2=950654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java Wed Jun 2 16:46:37 2010
@@ -24,9 +24,9 @@ public class BaseConnectionActorTestCase
{
@Override
- public void configure()
+ public void createBroker() throws Exception
{
- super.configure();
+ super.createBroker();
_amqpActor = new AMQPConnectionActor(_session, _rootLogger);
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java?rev=950654&r1=950653&r2=950654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java Wed Jun 2 16:46:37 2010
@@ -44,9 +44,9 @@ public class ManagementActorTest extends
private String _threadName;
@Override
- public void configure()
+ public void createBroker() throws Exception
{
- super.configure();
+ super.createBroker();
_amqpActor = new ManagementActor(_rootLogger);
// Set the thread name to be the same as a RMI JMX Connection would use
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java?rev=950654&r1=950653&r2=950654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java Wed Jun 2 16:46:37 2010
@@ -32,9 +32,9 @@ public class QueueActorTest extends Base
{
@Override
- public void configure()
+ public void createBroker() throws Exception
{
- super.configure();
+ super.createBroker();
_amqpActor = new QueueActor(_queue, _rootLogger);
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java?rev=950654&r1=950653&r2=950654&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java Wed Jun 2 16:46:37 2010
@@ -42,9 +42,9 @@ public class SubscriptionActorTest exten
{
@Override
- public void configure()
+ public void createBroker() throws Exception
{
- super.configure();
+ super.createBroker();
MockSubscription mockSubscription = new MockSubscription();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org