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 2009/08/06 11:27:01 UTC
svn commit: r801561 - in /qpid/trunk/qpid/java:
broker/src/main/java/org/apache/qpid/server/registry/
broker/src/main/java/org/apache/qpid/server/util/
broker/src/test/java/org/apache/qpid/server/
broker/src/test/java/org/apache/qpid/server/ack/ broker...
Author: ritchiem
Date: Thu Aug 6 09:26:56 2009
New Revision: 801561
URL: http://svn.apache.org/viewvc?rev=801561&view=rev
Log:
QPID-2028 : Ensure all Non QpidTestCase System tests correctly clean up by removing the ApplicationRegistry they create.
The biggest offenders are the broker tests which are not pure unit tests.
Added:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
- copied, changed from r801557, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestBlankActor.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
- copied, changed from r801557, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
Removed:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestBlankActor.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
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/exchange/DestWildExchangeTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.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/CurrentActorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ACLManagerTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Thu Aug 6 09:26:56 2009
@@ -36,6 +36,7 @@
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import org.apache.qpid.server.logging.RootMessageLogger;
+import org.apache.qpid.server.logging.actors.CurrentActor;
/**
* An abstract application registry that provides access to configuration information and handles the
@@ -115,11 +116,18 @@
}
/**
+ * Method to cleanly shutdown the default registry running in this JVM
+ */
+ public static void remove()
+ {
+ remove(DEFAULT_INSTANCE);
+ }
+
+ /**
* Method to cleanly shutdown specified registry running in this JVM
*
* @param instanceID the instance to shutdown
*/
-
public static void remove(int instanceID)
{
try
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java Thu Aug 6 09:26:56 2009
@@ -33,6 +33,7 @@
{
private QueueRegistry _queueRegistry;
private ExchangeRegistry _exchangeRegistry;
+ private VirtualHost _vHost;
public void testExchangeOperations() throws Exception
{
@@ -44,9 +45,8 @@
assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null);
assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) == null);
- VirtualHost vHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
- ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean) vHost.getManagedObject());
+ ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean) _vHost.getManagedObject());
mbean.createNewExchange(exchange1, "direct", false);
mbean.createNewExchange(exchange2, "topic", false);
mbean.createNewExchange(exchange3, "headers", false);
@@ -67,9 +67,8 @@
public void testQueueOperations() throws Exception
{
String queueName = "testQueue_" + System.currentTimeMillis();
- VirtualHost vHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
- ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean) vHost.getManagedObject());
+ ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean) _vHost.getManagedObject());
assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null);
@@ -85,7 +84,15 @@
{
super.setUp();
IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
- _queueRegistry = appRegistry.getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry();
- _exchangeRegistry = appRegistry.getVirtualHostRegistry().getVirtualHost("test").getExchangeRegistry();
+ _vHost = appRegistry.getVirtualHostRegistry().getVirtualHost("test");
+ _queueRegistry = _vHost.getQueueRegistry();
+ _exchangeRegistry = _vHost.getExchangeRegistry();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ //Ensure we close the opened Registry
+ ApplicationRegistry.remove();
}
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java Thu Aug 6 09:26:56 2009
@@ -28,6 +28,7 @@
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.server.RequiredDeliveryException;
+import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.queue.AMQMessage;
@@ -54,6 +55,10 @@
{
super.setUp();
+
+ // Highlight that this test will cause the creation of an AR
+ ApplicationRegistry.getInstance();
+
//ack only 5th msg
individual = new Scenario(10, Arrays.asList(5l), Arrays.asList(1l, 2l, 3l, 4l, 6l, 7l, 8l, 9l, 10l));
individual.update(5, false);
@@ -78,6 +83,10 @@
individual.stop();
multiple.stop();
combined.stop();
+
+ // Ensure we close the AR we created
+ ApplicationRegistry.remove();
+ super.tearDown();
}
public void testPrepare() throws AMQException
@@ -122,10 +131,8 @@
new LinkedList<RequiredDeliveryException>()
);
- PropertiesConfiguration env = new PropertiesConfiguration();
- env.setProperty("name", "test");
- VirtualHost virtualHost = new VirtualHost(new VirtualHostConfiguration("test", env), null);
-
+ VirtualHost virtualHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
+
_queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("test"), false, null, false,
virtualHost, null);
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java Thu Aug 6 09:26:56 2009
@@ -49,13 +49,17 @@
@Override
public void setUp()
{
+ //Highlight that this test will cause a new AR to be created
+ ApplicationRegistry.getInstance();
+
_config = new XMLConfiguration();
}
@Override
- public void tearDown()
+ public void tearDown() throws Exception
{
- ApplicationRegistry.removeAll();
+ //Correctly Close the AR we created
+ ApplicationRegistry.remove();
}
public void testSetJMXManagementPort() throws ConfigurationException
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=801561&r1=801560&r2=801561&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 Thu Aug 6 09:26:56 2009
@@ -21,7 +21,6 @@
import junit.framework.TestCase;
-
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.qpid.AMQException;
@@ -39,12 +38,23 @@
@Override
protected void setUp() throws Exception
- {
+ {
+ super.setUp();
+ //Highlight that this test will cause a new AR to be created
+ ApplicationRegistry.getInstance();
// Fill config file with stuff
configXml = new XMLConfiguration();
configXml.setRootElementName("virtualhosts");
configXml.addProperty("virtualhost(-1).name", "test");
}
+
+ public void tearDown() throws Exception
+ {
+ //Correctly close the AR we created
+ ApplicationRegistry.remove();
+
+ super.tearDown();
+ }
public void testQueuePriority() throws Exception
{
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java Thu Aug 6 09:26:56 2009
@@ -62,7 +62,7 @@
public void tearDown()
{
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java Thu Aug 6 09:26:56 2009
@@ -131,7 +131,7 @@
{
super.setUp();
- IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1);
+ IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
_virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
_queueRegistry = _virtualHost.getQueueRegistry();
_queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, _virtualHost,
@@ -141,7 +141,8 @@
protected void tearDown()
{
- ApplicationRegistry.remove(1);
+ // Correctly Close the AR that we created above
+ ApplicationRegistry.remove();
}
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Thu Aug 6 09:26:56 2009
@@ -22,7 +22,6 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.NullApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.protocol.InternalTestProtocolSession;
import org.apache.qpid.server.protocol.AMQProtocolSession;
@@ -34,15 +33,16 @@
protected void setUp() throws Exception
{
super.setUp();
- ApplicationRegistry.initialise(new NullApplicationRegistry(), 1);
+ // AR will use the NullAR by default
// Just use the first vhost.
- VirtualHost virtualHost = ApplicationRegistry.getInstance(1).getVirtualHostRegistry().getVirtualHosts().iterator().next();
+ VirtualHost virtualHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
_protocolSession = new InternalTestProtocolSession(virtualHost);
}
protected void tearDown()
{
- ApplicationRegistry.remove(1);
+ // Correctly Close the AR that we created above
+ ApplicationRegistry.remove();
}
public void testSimple() throws AMQException
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=801561&r1=801560&r2=801561&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 Thu Aug 6 09:26:56 2009
@@ -57,8 +57,12 @@
AMQProtocolSession _session;
AMQChannel _channel;
- public void setUp() throws ConfigurationException, AMQException
+ public void setUp() throws Exception, AMQException
{
+ super.setUp();
+ //Highlight that this test will cause a new AR to be created
+ ApplicationRegistry.getInstance();
+
Configuration config = new PropertiesConfiguration();
ServerConfiguration serverConfig = new ServerConfiguration(config);
@@ -84,9 +88,13 @@
}
- public void tearDown()
+ public void tearDown() throws Exception
{
_rawLogger.clearLogMessages();
+ // Correctly Close the AR we created
+ ApplicationRegistry.remove();
+
+ super.tearDown();
}
/**
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=801561&r1=801560&r2=801561&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 Thu Aug 6 09:26:56 2009
@@ -54,17 +54,26 @@
LogActor _amqpActor;
UnitTestMessageLogger _rawLogger;
- public void setUp() throws ConfigurationException, AMQException
+ public void setUp() throws Exception, AMQException
{
+ super.setUp();
+ //Highlight that this test will cause a new AR to be created
+ ApplicationRegistry.getInstance();
+
Configuration config = new PropertiesConfiguration();
ServerConfiguration serverConfig = new ServerConfiguration(config);
setUpWithConfig(serverConfig);
}
- public void tearDown()
+ public void tearDown() throws Exception
{
_rawLogger.clearLogMessages();
+
+ // Correctly Close the AR we created
+ ApplicationRegistry.remove();
+
+ super.tearDown();
}
private void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java Thu Aug 6 09:26:56 2009
@@ -62,8 +62,9 @@
// Create a single session for this test.
AMQProtocolSession _session;
- public void setUp() throws AMQException
+ public void setUp() throws Exception
{
+ super.setUp();
// Create a single session for this test.
VirtualHost virtualHost = ApplicationRegistry.getInstance().
getVirtualHostRegistry().getVirtualHosts().iterator().next();
@@ -72,6 +73,16 @@
_session = new InternalTestProtocolSession(virtualHost);
}
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ // Correctly Close the AR we created
+ ApplicationRegistry.remove();
+ super.tearDown();
+ }
+
+
public void testFIFO() throws AMQException
{
// Create a new actor using retrieving the rootMessageLogger from
@@ -143,11 +154,11 @@
assertEquals("Retrieved actor is not as expected ",
connectionActor, CurrentActor.get());
- // Verify that removing the last actor returns us to a null value.
+ // Verify that removing the our last actor it returns us to the test
+ // default that the ApplicationRegistry sets.
CurrentActor.remove();
- assertNull("CurrentActor should be null", CurrentActor.get());
-
+ assertEquals("CurrentActor not the Test default", TestLogActor.class ,CurrentActor.get().getClass());
}
public void testThreadLocal()
Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java (from r801557, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestBlankActor.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java&p1=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestBlankActor.java&r1=801557&r2=801561&rev=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestBlankActor.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java Thu Aug 6 09:26:56 2009
@@ -22,9 +22,9 @@
import org.apache.qpid.server.logging.RootMessageLogger;
-public class TestBlankActor extends AbstractActor
+public class TestLogActor extends AbstractActor
{
- public TestBlankActor(RootMessageLogger rootLogger)
+ public TestLogActor(RootMessageLogger rootLogger)
{
super(rootLogger);
_logString = "[Blank]";
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java Thu Aug 6 09:26:56 2009
@@ -30,9 +30,10 @@
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.RootMessageLoggerImpl;
-import org.apache.qpid.server.logging.actors.TestBlankActor;
+import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
import org.apache.qpid.server.logging.subjects.TestBlankSubject;
+import org.apache.qpid.server.registry.ApplicationRegistry;
import java.util.List;
@@ -44,15 +45,26 @@
protected UnitTestMessageLogger _logger;
protected LogSubject _logSubject = new TestBlankSubject();
- public void setUp() throws ConfigurationException
+ public void setUp() throws Exception
{
+ super.setUp();
+ // Highlight that we create a new AR here
+ ApplicationRegistry.getInstance();
+
ServerConfiguration serverConfig = new ServerConfiguration(_config);
_logger = new UnitTestMessageLogger();
RootMessageLogger rootLogger =
new RootMessageLoggerImpl(serverConfig, _logger);
- _actor = new TestBlankActor(rootLogger);
+ _actor = new TestLogActor(rootLogger);
+ }
+
+ public void tearDown() throws Exception
+ {
+ // Correctly Close the AR that we created above
+ ApplicationRegistry.remove();
+ super.tearDown();
}
protected List<Object> performLog()
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java Thu Aug 6 09:26:56 2009
@@ -32,7 +32,7 @@
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.RootMessageLoggerImpl;
-import org.apache.qpid.server.logging.actors.TestBlankActor;
+import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -60,6 +60,14 @@
_session = new InternalTestProtocolSession(virtualHost);
}
+ public void tearDown() throws Exception
+ {
+ // Correctly Close the AR that we created above
+ ApplicationRegistry.remove();
+
+ super.tearDown();
+ }
+
protected List<Object> performLog() throws ConfigurationException
{
if (_subject == null)
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java Thu Aug 6 09:26:56 2009
@@ -26,6 +26,7 @@
import org.apache.qpid.codec.AMQCodecFactory;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -109,20 +110,17 @@
{
super.setUp();
- IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
- _protocolSession =
- new AMQMinaProtocolSession(new TestIoSession(), appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true));
- // Need to authenticate session for it to work, (well for logging to work)
- _protocolSession.setAuthorizedID(new Principal()
- {
- public String getName()
- {
- return "AMQProtocolSessionMBeanTestUser";
- }
- });
- _protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
+ VirtualHost vhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
+ _protocolSession = new InternalTestProtocolSession(vhost);
+
_channel = new AMQChannel(_protocolSession, 1, _messageStore);
_protocolSession.addChannel(_channel);
_mbean = (AMQProtocolSessionMBean) _protocolSession.getManagedObject();
}
+
+ @Override
+ protected void tearDown()
+ {
+ ApplicationRegistry.remove();
+ }
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java Thu Aug 6 09:26:56 2009
@@ -25,6 +25,7 @@
import org.apache.qpid.codec.AMQCodecFactory;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.registry.IApplicationRegistry;
@@ -36,27 +37,12 @@
/** Test class to test MBean operations for AMQMinaProtocolSession. */
public class MaxChannelsTest extends TestCase
{
- private IApplicationRegistry _appRegistry;
private AMQMinaProtocolSession _session;
public void testChannels() throws Exception
{
- _session = new AMQMinaProtocolSession(new TestIoSession(), _appRegistry
- .getVirtualHostRegistry(), new AMQCodecFactory(true));
-
- // Set the current Actor for these tests
- CurrentActor.set(_session.getLogActor());
-
- // Need to authenticate session for it to work, (well for logging to work)
- _session.setAuthorizedID(new Principal()
- {
- public String getName()
- {
- return "AMQProtocolSessionMBeanTestUser";
- }
- });
-
- _session.setVirtualHost(_appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
+ VirtualHost vhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
+ _session = new InternalTestProtocolSession(vhost);
// check the channel count is correct
int channelCount = _session.getChannels().size();
@@ -84,11 +70,12 @@
@Override
public void setUp()
{
- _appRegistry = ApplicationRegistry.getInstance(1);
+ //Highlight that this test will cause a new AR to be created
+ ApplicationRegistry.getInstance();
}
@Override
- public void tearDown()
+ public void tearDown() throws Exception
{
try {
_session.closeSession();
@@ -98,10 +85,9 @@
}
finally
{
- //Remove the actor set during the test
- CurrentActor.remove();
- }
- ApplicationRegistry.remove(1);
+ // Correctly Close the AR we created
+ ApplicationRegistry.remove();
+ }
}
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java Thu Aug 6 09:26:56 2009
@@ -294,7 +294,7 @@
protected void setUp() throws Exception
{
super.setUp();
- IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1);
+ IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
_virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
_protocolSession = new InternalTestProtocolSession(_virtualHost);
CurrentActor.set(_protocolSession.getLogActor());
@@ -302,8 +302,9 @@
protected void tearDown()
{
+ // Remove the Protocol Session Actor set above
CurrentActor.remove();
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java Thu Aug 6 09:26:56 2009
@@ -46,7 +46,7 @@
public void tearDown()
{
assertEquals("Queue was not registered in virtualhost", 1, _queueRegistry.getQueues().size());
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java Thu Aug 6 09:26:56 2009
@@ -360,7 +360,7 @@
protected void setUp() throws Exception
{
super.setUp();
- IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1);
+ IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
_virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
_messageStore = _virtualHost.getMessageStore();
@@ -378,7 +378,7 @@
public void tearDown()
{
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
private void sendMessages(int messageCount, boolean persistent) throws AMQException
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java Thu Aug 6 09:26:56 2009
@@ -74,8 +74,8 @@
protected void setUp() throws Exception
{
super.setUp();
- ApplicationRegistry.initialise(new NullApplicationRegistry(), 1);
-
+ // The NullApplicationRegistry will be created by default when
+ // calling AR.getInstance
_virtualHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
_messageStore = new TestMemoryMessageStore();
_protocolSession = new InternalTestProtocolSession(_virtualHost);
@@ -89,7 +89,7 @@
protected void tearDown()
{
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
private void publishMessages(int count) throws AMQException
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java Thu Aug 6 09:26:56 2009
@@ -94,7 +94,7 @@
{
super.setUp();
//Create Application Registry for test
- ApplicationRegistry applicationRegistry = (ApplicationRegistry)ApplicationRegistry.getInstance(1);
+ ApplicationRegistry applicationRegistry = (ApplicationRegistry)ApplicationRegistry.getInstance();
PropertiesConfiguration env = new PropertiesConfiguration();
_virtualHost = new VirtualHost(new VirtualHostConfiguration(getClass().getName(), env), _store);
@@ -107,7 +107,7 @@
protected void tearDown()
{
_queue.stop();
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
public void testCreateQueue() throws AMQException
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java Thu Aug 6 09:26:56 2009
@@ -36,7 +36,7 @@
public void test() throws AMQException
{
int initialCount = ReferenceCountingExecutorService.getInstance().getReferenceCount();
- VirtualHost test = ApplicationRegistry.getInstance(1).getVirtualHostRegistry().getVirtualHost("test");
+ VirtualHost test = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
try
{
@@ -54,7 +54,7 @@
}
finally
{
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
}
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java Thu Aug 6 09:26:56 2009
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.apache.qpid.AMQException;
import java.security.Security;
import java.security.Provider;
@@ -37,13 +38,24 @@
public class ApplicationRegistryShutdownTest extends TestCase
{
- ApplicationRegistry _registry;
+ IApplicationRegistry _registry;
public void setUp() throws Exception
{
+ //Highlight that this test will cause a new AR to be created
+ // This must used TestAppRegistry but during the test getInstance()
+ // will be called so we must ensure to do the remove()
_registry = new TestApplicationRegistry();
}
+ @Override
+ public void tearDown() throws Exception
+ {
+ // Correctly Close the AR we created
+ ApplicationRegistry.remove();
+ }
+
+
/**
* QPID-1399 : Ensure that the Authentiction manager unregisters any SASL providers created during
* ApplicationRegistry initialisation.
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ACLManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ACLManagerTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ACLManagerTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ACLManagerTest.java Thu Aug 6 09:26:56 2009
@@ -72,6 +72,14 @@
// Create a single session for this test.
_session = new InternalTestProtocolSession(virtualHost);
}
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ // Correctly Close the AR we created
+ ApplicationRegistry.remove();
+ super.tearDown();
+ }
public void testACLManagerConfigurationPluginManager() throws Exception
{
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java Thu Aug 6 09:26:56 2009
@@ -36,6 +36,7 @@
import org.apache.qpid.server.security.access.ACLPlugin.AuthzResult;
import org.apache.qpid.server.store.SkeletonMessageStore;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.registry.ApplicationRegistry;
public class PrincipalPermissionsTest extends TestCase
{
@@ -65,6 +66,9 @@
@Override
public void setUp()
{
+ //Highlight that this test will cause a new AR to be created
+ ApplicationRegistry.getInstance();
+
_perms = new PrincipalPermissions(_user);
try
{
@@ -78,7 +82,15 @@
fail(e.getMessage());
}
}
-
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ //Ensure we close the opened Registry
+ ApplicationRegistry.remove();
+ }
+
+
public void testPrincipalPermissions()
{
assertNotNull(_perms);
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java Thu Aug 6 09:26:56 2009
@@ -89,6 +89,7 @@
@Override
public void setUp() throws Exception
{
+ super.setUp();
_store = new TestableMemoryMessageStore();
TestIoSession iosession = new TestIoSession();
iosession.setAddress("127.0.0.1");
@@ -100,7 +101,14 @@
AMQCodecFactory codecFactory = new AMQCodecFactory(true);
_session = new AMQMinaProtocolSession(iosession, virtualHostRegistry, codecFactory);
}
-
+
+ public void tearDown() throws Exception
+ {
+ // Correctly Close the AR that we created above
+ ApplicationRegistry.remove();
+ super.tearDown();
+ }
+
private FirewallPlugin initialisePlugin(String defaultAction, RuleInfo[] rules) throws IOException, ConfigurationException
{
// Create sample config file
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java Thu Aug 6 09:26:56 2009
@@ -136,12 +136,12 @@
protected void setUp()
{
- ApplicationRegistry.getInstance(1);
+ ApplicationRegistry.getInstance();
}
protected void tearDown()
{
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
protected void runTestWithStore(Configuration configuration)
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java Thu Aug 6 09:26:56 2009
@@ -91,7 +91,7 @@
public void tearDown() throws Exception
{
CurrentActor.remove();
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
super.tearDown();
}
Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java (from r801557, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java&r1=801557&r2=801561&rev=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java Thu Aug 6 09:26:56 2009
@@ -25,6 +25,9 @@
import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.logging.RootMessageLoggerImpl;
+import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.logging.actors.BrokerActor;
+import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.logging.rawloggers.Log4jMessageLogger;
import org.apache.qpid.server.management.NoopManagedObjectRegistry;
import org.apache.qpid.server.plugins.PluginManager;
@@ -53,6 +56,9 @@
_rootMessageLogger = new RootMessageLoggerImpl(_configuration, new Log4jMessageLogger());
+ //We should use a Test Actor Here not the Broker Actor
+ CurrentActor.set(new TestLogActor(_rootMessageLogger));
+
_configuration.setHousekeepingExpiredMessageCheckPeriod(200);
Properties users = new Properties();
@@ -81,6 +87,13 @@
String[] hosts = {"test"};
return Arrays.asList(hosts);
}
+
+ @Override
+ public void close() throws Exception
+ {
+ super.close();
+ CurrentActor.remove();
+ }
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java Thu Aug 6 09:26:56 2009
@@ -40,6 +40,8 @@
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import org.apache.qpid.server.logging.RootMessageLoggerImpl;
+import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.logging.rawloggers.Log4jMessageLogger;
import java.util.Collection;
@@ -77,7 +79,11 @@
{
_rootMessageLogger = new RootMessageLoggerImpl(_configuration,
new Log4jMessageLogger());
-
+
+ //Add a Test Actor as a lot of our System Tests reach in to the broker
+ // and manipulate it so the CurrentActor is not set.
+ CurrentActor.set(new TestLogActor(_rootMessageLogger));
+
Properties users = new Properties();
users.put("guest", "guest");
@@ -137,6 +143,13 @@
return _messageStore;
}
+ @Override
+ public void close() throws Exception
+ {
+ super.close();
+ CurrentActor.remove();
+ }
+
}
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build.xml?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build.xml Thu Aug 6 09:26:56 2009
@@ -21,6 +21,7 @@
<project name="Eclipse Plugin" default="build">
<property name="module.depends" value="broker common management/common"/>
+ <property name="module.test.depends" value="broker/test" />
<import file="../../module.xml"/>
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java Thu Aug 6 09:26:56 2009
@@ -58,7 +58,8 @@
@Override
protected void tearDown() throws Exception
{
- ApplicationRegistry.removeAll();
+ // Correctly Close the AR that we created above
+ ApplicationRegistry.remove();
}
/**
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java?rev=801561&r1=801560&r2=801561&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java Thu Aug 6 09:26:56 2009
@@ -38,7 +38,7 @@
public class SimpleACLTest extends QpidTestCase implements ConnectionListener
{
- private String BROKER = "vm://:1";//"tcp://localhost:5672";
+ private String BROKER = "vm://:"+ApplicationRegistry.DEFAULT_INSTANCE;//"tcp://localhost:5672";
public void setUp() throws Exception
{
@@ -61,14 +61,14 @@
}
ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile);
- ApplicationRegistry.initialise(config, 1);
- TransportConnection.createVMBroker(1);
+ ApplicationRegistry.initialise(config, ApplicationRegistry.DEFAULT_INSTANCE);
+ TransportConnection.createVMBroker(ApplicationRegistry.DEFAULT_INSTANCE);
}
public void tearDown()
{
TransportConnection.killAllVMBrokers();
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove(ApplicationRegistry.DEFAULT_INSTANCE);
}
public String createConnectionString(String username, String password, String broker)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org