Author: ritchiem
Date: Thu Dec 3 09:34:38 2009
New Revision: 886720
URL: http://svn.apache.org/viewvc?rev=886720&view=rev
Log:
QPID-2001 : Address points raised in code rewview document
Added:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
- copied, changed from r886719,
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
Thu Dec 3 09:34:38 2009
@@ -20,83 +20,40 @@
*/
package org.apache.qpid.server.logging.actors;
-import junit.framework.TestCase;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.RootMessageLoggerImpl;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.AMQChannel;
import java.util.List;
/**
- * Test : AMQPConnectionActorTest
- * Validate the AMQPConnectionActor class.
+ * Test : AMQPChannelActorTest
+ * Validate the AMQPChannelActor class.
*
* The test creates a new AMQPActor and then logs a message using it.
*
* The test then verifies that the logged message was the only one created and
* that the message contains the required message.
*/
-public class AMQPChannelActorTest extends TestCase
+public class AMQPChannelActorTest extends BaseConnectionActorTestCase
{
- LogActor _amqpActor;
- UnitTestMessageLogger _rawLogger;
- AMQProtocolSession _session;
AMQChannel _channel;
- public void setUp() throws Exception, AMQException
+ @Override
+ protected void setUpWithConfig(ServerConfiguration serverConfig) throws
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);
-
-
serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
-
- setUpWithConfig(serverConfig);
- }
-
- private void setUpWithConfig(ServerConfiguration serverConfig) throws
AMQException
- {
- _rawLogger = new UnitTestMessageLogger();
- RootMessageLogger rootLogger =
- new RootMessageLoggerImpl(serverConfig, _rawLogger);
-
- VirtualHost virtualHost = ApplicationRegistry.getInstance().
-
getVirtualHostRegistry().getVirtualHosts().iterator().next();
-
- // Create a single session for this test.
- _session = new InternalTestProtocolSession(virtualHost);
-
+ super.setUpWithConfig(serverConfig);
_channel = new AMQChannel(_session, 1,
_session.getVirtualHost().getMessageStore());
- _amqpActor = new AMQPChannelActor(_channel, rootLogger);
-
- }
-
- public void tearDown() throws Exception
- {
- _rawLogger.clearLogMessages();
- // Correctly Close the AR we created
- ApplicationRegistry.remove();
-
- super.tearDown();
+ _amqpActor = new AMQPChannelActor(_channel, _rootLogger);
}
/**
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
Thu Dec 3 09:34:38 2009
@@ -20,22 +20,13 @@
*/
package org.apache.qpid.server.logging.actors;
-import junit.framework.TestCase;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.LogMessage;
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.rawloggers.UnitTestMessageLogger;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
import java.util.List;
@@ -48,51 +39,8 @@
* The test then verifies that the logged message was the only one created and
* that the message contains the required message.
*/
-public class AMQPConnectionActorTest extends TestCase
+public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
{
-
- LogActor _amqpActor;
- UnitTestMessageLogger _rawLogger;
-
- 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);
-
-
serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
-
- setUpWithConfig(serverConfig);
- }
-
- public void tearDown() throws Exception
- {
- _rawLogger.clearLogMessages();
-
- // Correctly Close the AR we created
- ApplicationRegistry.remove();
-
- super.tearDown();
- }
-
- private void setUpWithConfig(ServerConfiguration serverConfig) throws
AMQException
- {
- _rawLogger = new UnitTestMessageLogger();
- RootMessageLogger rootLogger =
- new RootMessageLoggerImpl(serverConfig, _rawLogger);
-
- VirtualHost virtualHost = ApplicationRegistry.getInstance().
- getVirtualHostRegistry().getVirtualHosts().iterator().next();
-
- // Create a single session for this test.
- AMQProtocolSession session = new
InternalTestProtocolSession(virtualHost);
-
- _amqpActor = new AMQPConnectionActor(session, rootLogger);
- }
-
/**
* Test the AMQPActor logging as a Connection level.
*
@@ -114,7 +62,7 @@
logs.get(0).toString().contains(message));
// Verify that the message has the correct type
- assertTrue("Message contains the [con: prefix",
+ assertTrue("Message does not contain the [con: prefix",
logs.get(0).toString().contains("[con:"));
// Verify that all the values were presented to the MessageFormatter
Added:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java?rev=886720&view=auto
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
(added)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
Thu Dec 3 09:34:38 2009
@@ -0,0 +1,74 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+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;
+
+public class BaseActorTestCase extends TestCase
+{
+ protected LogActor _amqpActor;
+ protected UnitTestMessageLogger _rawLogger;
+ protected RootMessageLogger _rootLogger;
+
+ public void setUp() throws Exception
+ {
+ 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);
+
+
serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+
+ setUpWithConfig(serverConfig);
+ }
+
+ public void tearDown() throws Exception
+ {
+ _rawLogger.clearLogMessages();
+
+ // Correctly Close the AR we created
+ ApplicationRegistry.remove();
+
+ super.tearDown();
+ }
+
+ protected void setUpWithConfig(ServerConfiguration serverConfig) throws
AMQException
+ {
+ _rawLogger = new UnitTestMessageLogger();
+
+ _rootLogger =
+ new RootMessageLoggerImpl(serverConfig, _rawLogger);
+ }
+
+
+}
Copied:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
(from r886719,
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java?p2=qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java&p1=qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java&r1=886719&r2=886720&rev=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
Thu Dec 3 09:34:38 2009
@@ -18,37 +18,33 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.subjects;
+package org.apache.qpid.server.logging.actors;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.protocol.AMQProtocolSession;
+import org.apache.qpid.server.protocol.InternalTestProtocolSession;
+import org.apache.qpid.AMQException;
-public class ExchangeLogSubjectTest extends AbstractTestLogSubject
+public class BaseConnectionActorTestCase extends BaseActorTestCase
{
- Exchange _exchange;
- VirtualHost _testVhost;
- public void setUp() throws Exception
+ protected AMQProtocolSession _session;
+
+ @Override
+ protected void setUpWithConfig(ServerConfiguration serverConfig) throws
AMQException
{
- super.setUp();
+ super.setUpWithConfig(serverConfig);
- _testVhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().
- getVirtualHost("test");
+ VirtualHost virtualHost = ApplicationRegistry.getInstance().
+ getVirtualHostRegistry().getVirtualHosts().iterator().next();
- _exchange = _testVhost.getExchangeRegistry().getDefaultExchange();
- _subject = new ExchangeLogSubject(_exchange,_testVhost);
+ // Create a single session for this test.
+ _session = new InternalTestProtocolSession(virtualHost);
+
+ _amqpActor = new AMQPConnectionActor(_session, _rootLogger);
}
- /**
- * Validate that the logged Subject message is as expected:
- * MESSAGE [Blank][vh(/test)/ex(direct/<<default>>)] <Log Message>
- * @param message the message whos format needs validation
- */
- @Override
- protected void validateLogStatement(String message)
- {
- verifyVirtualHost(message, _testVhost);
- verifyExchange(message, _exchange);
- }
+
}
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
Thu Dec 3 09:34:38 2009
@@ -20,15 +20,11 @@
*/
package org.apache.qpid.server.logging.actors;
-import junit.framework.TestCase;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.AMQChannel;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
/**
* Test : CurrentActorTest
@@ -51,38 +47,28 @@
* is called before one or more threads call get(). This way we can ensure that
* the remove does not affect more than the Thread it was called in.
*/
-public class CurrentActorTest extends TestCase
+public class CurrentActorTest extends BaseConnectionActorTestCase
{
//Set this to be a reasonably large number
int THREADS = 10;
// Record any exceptions that are thrown by the threads
- final Exception[] _errors = new Exception[THREADS];
-
- // Create a single session for this test.
- AMQProtocolSession _session;
-
- public void setUp() throws Exception
- {
- super.setUp();
- // Create a single session for this test.
- VirtualHost virtualHost = ApplicationRegistry.getInstance().
- getVirtualHostRegistry().getVirtualHosts().iterator().next();
-
- // 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();
- }
-
+ Exception[] _errors = new Exception[THREADS];
+ /**
+ * Test that CurrentActor behaves as LIFO queue.
+ *
+ * Test creates two Actors Connection and Channel and then sets the
+ * CurrentActor.
+ *
+ * The test validates that CurrentActor remembers the Connection actor
+ * after the Channel actor has been removed.
+ *
+ * And then finally validates that removing the Connection actor results
+ * in there being no actors set.
+ *
+ * @throws AMQException
+ */
public void testLIFO() throws AMQException
{
// Create a new actor using retrieving the rootMessageLogger from
@@ -92,6 +78,12 @@
ApplicationRegistry.getInstance().
getRootMessageLogger());
+ /*
+ * Push the actor on to the stack:
+ *
+ * CurrentActor -> Connection
+ * Stack -> null
+ */
CurrentActor.set(connectionActor);
//Use the Actor to send a simple message
@@ -115,8 +107,12 @@
connectionActor, CurrentActor.get());
/**
- * Set the actor to nwo be the Channel actor so testing the ability
- * to push the actor on to the stack
+ * Set the actor to now be the Channel actor so testing the ability
+ * to push the actor on to the stack:
+ *
+ * CurrentActor -> Channel
+ * Stack -> Connection, null
+ *
*/
AMQChannel channel = new AMQChannel(_session, 1,
_session.getVirtualHost().getMessageStore());
@@ -149,6 +145,13 @@
// Remove the ChannelActor from the stack
CurrentActor.remove();
+ /*
+ * Pop the actor on to the stack:
+ *
+ * CurrentActor -> Connection
+ * Stack -> null
+ */
+
// Verify we now have the same connection actor as we set earlier
assertEquals("Retrieved actor is not as expected ",
@@ -157,18 +160,44 @@
// Verify that removing the our last actor it returns us to the test
// default that the ApplicationRegistry sets.
CurrentActor.remove();
+ /*
+ * Pop the actor on to the stack:
+ *
+ * CurrentActor -> null
+ */
+
assertEquals("CurrentActor not the Test default", TestLogActor.class
,CurrentActor.get().getClass());
}
+ /**
+ * Test the setting CurrentActor is done correctly as a ThreadLocal.
+ *
+ * The test starts 'THREADS' threads that all set the CurrentActor log
+ * a message then remove the actor.
+ *
+ * Checks are done to ensure that there is no set actor after the remove.
+ *
+ * If the ThreadLoacl was not working then having concurrent actor sets
+ * would result in more than one actor and so the remove will not result
+ * in the clearing of the CurrentActor
+ *
+ */
public void testThreadLocal()
{
+ new Runnable(){
+ public void run()
+ {
+ System.out.println(_errors[0]);
+ }
+ };
+
// Setup the threads
Thread[] threads = new Thread[THREADS];
for (int count = 0; count < THREADS; count++)
{
- Runnable test = new Test(count);
+ Runnable test = new LogMessagesWithAConnectionActor(count);
threads[count] = new Thread(test);
}
@@ -202,11 +231,15 @@
}
}
- public class Test implements Runnable
+ /**
+ * Creates a new ConnectionActor and logs the given number of messages
+ * before removing the actor and validating that there is no set actor.
+ */
+ public class LogMessagesWithAConnectionActor implements Runnable
{
int count;
- Test(int count)
+ LogMessagesWithAConnectionActor(int count)
{
this.count = count;
}
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
Thu Dec 3 09:34:38 2009
@@ -20,60 +20,45 @@
*/
package org.apache.qpid.server.logging.actors;
-import junit.framework.TestCase;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.LogMessage;
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.rawloggers.UnitTestMessageLogger;
+import org.apache.qpid.AMQException;
import java.util.List;
/**
- * Test : AMQPConnectionActorTest
- * Validate the AMQPConnectionActor class.
+ * Test : AMQPManagementActorTest
+ * Validate the AMQPManagementActor class.
*
* The test creates a new AMQPActor and then logs a message using it.
*
* The test then verifies that the logged message was the only one created and
* that the message contains the required message.
*/
-public class ManagementActorTest extends TestCase
+public class ManagementActorTest extends BaseActorTestCase
{
- LogActor _amqpActor;
- UnitTestMessageLogger _rawLogger;
private static final String IP = "127.0.0.1";
private static final String CONNECTION_ID = "1";
private String _threadName;
- public void setUp() throws ConfigurationException
+ @Override
+ protected void setUpWithConfig(ServerConfiguration serverConfig) throws
AMQException
{
- Configuration config = new PropertiesConfiguration();
- ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-
serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
-
- _rawLogger = new UnitTestMessageLogger();
- RootMessageLogger rootLogger =
- new RootMessageLoggerImpl(serverConfig, _rawLogger);
-
- _amqpActor = new ManagementActor(rootLogger);
+ super.setUpWithConfig(serverConfig);
+ _amqpActor = new ManagementActor(_rootLogger);
// Set the thread name to be the same as a RMI JMX Connection would use
_threadName = Thread.currentThread().getName();
Thread.currentThread().setName("RMI TCP Connection(" + CONNECTION_ID +
")-" + IP);
}
- public void tearDown()
+ @Override
+ public void tearDown() throws Exception
{
Thread.currentThread().setName(_threadName);
- _rawLogger.clearLogMessages();
+ super.tearDown();
}
/**
@@ -117,7 +102,7 @@
logs.get(0).toString().contains("{"));
// Verify that the message has the correct type
- assertTrue("Message contains the [mng: prefix",
+ assertTrue("Message does not contain the [mng: prefix",
logs.get(0).toString().contains("[mng:"));
// Verify that the logged message does not contains the 'ch:' marker
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
Thu Dec 3 09:34:38 2009
@@ -20,49 +20,27 @@
*/
package org.apache.qpid.server.logging.actors;
-import junit.framework.TestCase;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.LogMessage;
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.rawloggers.UnitTestMessageLogger;
import org.apache.qpid.server.queue.MockAMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.AMQException;
import java.util.List;
-public class QueueActorTest extends TestCase
+public class QueueActorTest extends BaseConnectionActorTestCase
{
- LogActor _amqpActor;
- UnitTestMessageLogger _rawLogger;
- public void setUp() throws ConfigurationException
+ @Override
+ protected void setUpWithConfig(ServerConfiguration serverConfig) throws
AMQException
{
- Configuration config = new PropertiesConfiguration();
- ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-
serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
-
- _rawLogger = new UnitTestMessageLogger();
- RootMessageLogger rootLogger =
- new RootMessageLoggerImpl(serverConfig, _rawLogger);
+ super.setUpWithConfig(serverConfig);
MockAMQQueue queue = new MockAMQQueue(getName());
-
queue.setVirtualHost(ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next());
+ queue.setVirtualHost(_session.getVirtualHost());
- _amqpActor = new QueueActor(queue, rootLogger);
- }
-
- public void tearDown()
- {
- _rawLogger.clearLogMessages();
- ApplicationRegistry.remove();
+ _amqpActor = new QueueActor(queue, _rootLogger);
}
/**
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
Thu Dec 3 09:34:38 2009
@@ -20,23 +20,13 @@
*/
package org.apache.qpid.server.logging.actors;
-import junit.framework.TestCase;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.LogMessage;
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.rawloggers.UnitTestMessageLogger;
import org.apache.qpid.server.subscription.MockSubscription;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.MockAMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.AMQException;
-import java.security.Principal;
import java.util.List;
/**
@@ -48,38 +38,24 @@
* The test then verifies that the logged message was the only one created and
* that the message contains the required message.
*/
-public class SubscriptionActorTest extends TestCase
+public class SubscriptionActorTest extends BaseConnectionActorTestCase
{
- LogActor _amqpActor;
- UnitTestMessageLogger _rawLogger;
-
- public void setUp() throws ConfigurationException
+ @Override
+ protected void setUpWithConfig(ServerConfiguration serverConfig) throws
AMQException
{
- Configuration config = new PropertiesConfiguration();
- ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-
serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+ super.setUpWithConfig(serverConfig);
- _rawLogger = new UnitTestMessageLogger();
- RootMessageLogger rootLogger =
- new RootMessageLoggerImpl(serverConfig, _rawLogger);
MockSubscription mockSubscription = new MockSubscription();
MockAMQQueue queue = new MockAMQQueue(getName());
-
queue.setVirtualHost(ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next());
+ queue.setVirtualHost(_session.getVirtualHost());
mockSubscription.setQueue(queue,false);
- _amqpActor = new SubscriptionActor(rootLogger, mockSubscription);
- }
-
- public void tearDown()
- {
- _rawLogger.clearLogMessages();
- ApplicationRegistry.remove();
+ _amqpActor = new SubscriptionActor(_rootLogger, mockSubscription);
}
/**
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
Thu Dec 3 09:34:38 2009
@@ -22,7 +22,6 @@
import junit.framework.TestCase;
import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.server.logging.LogActor;
@@ -87,9 +86,8 @@
*
* @param logs the logs generated during test run
* @param tag the tag to check for
- * @param expected
+ * @param expected the expected log messages
*
- * @return the log message section for further testing
*/
protected void validateLogMessage(List<Object> logs, String tag, String[]
expected)
{
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -22,6 +22,9 @@
import java.util.List;
+/**
+ * Test BND Log Messages
+ */
public class BindingMessagesTest extends AbstractTestMessages
{
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -22,6 +22,9 @@
import java.util.List;
+/**
+ * Test BRK log Messages
+ */
public class BrokerMessagesTest extends AbstractTestMessages
{
public void testMessage1001()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -20,9 +20,11 @@
*/
package org.apache.qpid.server.logging.messages;
-import java.text.MessageFormat;
import java.util.List;
+/**
+ * Test CHN Log Messges
+ */
public class ChannelMessagesTest extends AbstractTestMessages
{
public void testMessage1001()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -22,6 +22,9 @@
import java.util.List;
+/**
+ * Test CON Log Messages
+ */
public class ConnectionMessagesTest extends AbstractTestMessages
{
public void testMessage1001_WithClientIDProtocolVersion()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -25,6 +25,9 @@
import java.util.List;
+/**
+ * Test EXH Log Messages
+ */
public class ExchangeMessagesTest extends AbstractTestMessages
{
public void testMessage1001_Transient()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -22,6 +22,9 @@
import java.util.List;
+/**
+ * Test MNG Log Messages
+ */
public class ManagementConsoleMessagesTest extends AbstractTestMessages
{
public void testMessage1001()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -23,6 +23,9 @@
import java.text.MessageFormat;
import java.util.List;
+/**
+ * Test MST Log Messages
+ */
public class MessageStoreMessagesTest extends AbstractTestMessages
{
public void testMessage1001()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -22,6 +22,9 @@
import java.util.List;
+/**
+ * Test QUE Log Messages
+ */
public class QueueMessagesTest extends AbstractTestMessages
{
public void testMessage1001ALL()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -22,6 +22,9 @@
import java.util.List;
+/**
+ * Test SUB Log Messages
+ */
public class SubscriptionMessagesTest extends AbstractTestMessages
{
public void testMessage1001ALL()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
Thu Dec 3 09:34:38 2009
@@ -22,6 +22,9 @@
import java.util.List;
+/**
+ * Test VHT Log Messages
+ */
public class VirtualHostMessagesTest extends AbstractTestMessages
{
public void testMessage1001()
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
Thu Dec 3 09:34:38 2009
@@ -42,6 +42,17 @@
import java.util.List;
+/**
+ * Abstract Test for LogSubject testing
+ * Includes common validation code and two common tests.
+ *
+ * Each test class sets up the LogSubject and contains details of how to
+ * validate this class then performs a log statement with logging enabled and
+ * logging disabled.
+ *
+ * The resulting log file is then validated.
+ *
+ */
public abstract class AbstractTestLogSubject extends TestCase
{
protected Configuration _config = new PropertiesConfiguration();
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
Thu Dec 3 09:34:38 2009
@@ -27,6 +27,9 @@
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
+/**
+ * Validate BindingLogSubjects are logged as expected
+ */
public class BindingLogSubjectTest extends AbstractTestLogSubject
{
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
Thu Dec 3 09:34:38 2009
@@ -22,6 +22,9 @@
import org.apache.qpid.server.AMQChannel;
+/**
+ * Validate ChannelLogSubjects are logged as expected
+ */
public class ChannelLogSubjectTest extends ConnectionLogSubjectTest
{
private final int _channelID = 1;
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
Thu Dec 3 09:34:38 2009
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.logging.subjects;
+/**
+ * Validate ConnectionLogSubjects are logged as expected
+ */
public class ConnectionLogSubjectTest extends AbstractTestLogSubject
{
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
Thu Dec 3 09:34:38 2009
@@ -24,6 +24,10 @@
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
+
+/**
+ * Validate ExchangeLogSubjects are logged as expected
+ */
public class ExchangeLogSubjectTest extends AbstractTestLogSubject
{
Exchange _exchange;
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
Thu Dec 3 09:34:38 2009
@@ -23,6 +23,9 @@
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.registry.ApplicationRegistry;
+/**
+ * Validate MessageStoreLogSubjects are logged as expected
+ */
public class MessageStoreLogSubjectTest extends AbstractTestLogSubject
{
VirtualHost _testVhost;
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
Thu Dec 3 09:34:38 2009
@@ -25,6 +25,9 @@
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
+/**
+ * Validate QueueLogSubjects are logged as expected
+ */
public class QueueLogSubjectTest extends AbstractTestLogSubject
{
@@ -46,14 +49,13 @@
/**
* Validate that the logged Subject message is as expected:
- * MESSAGE [Blank][vh(/test)/qu(BindingLogSubjectTest)] <Log Message>
+ * MESSAGE [Blank][vh(/test)/qu(QueueLogSubjectTest)] <Log Message>
*
* @param message the message whos format needs validation
*/
@Override
protected void validateLogStatement(String message)
{
- System.err.println(message);
verifyVirtualHost(message, _testVhost);
verifyQueue(message, _queue);
}
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
Thu Dec 3 09:34:38 2009
@@ -21,7 +21,6 @@
package org.apache.qpid.server.logging.subjects;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.server.AMQChannel;
import org.apache.qpid.server.flow.LimitlessCreditManager;
import org.apache.qpid.server.queue.AMQQueue;
@@ -32,14 +31,14 @@
import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
import org.apache.qpid.server.virtualhost.VirtualHost;
+/**
+ * Validate SubscriptionLogSubjects are logged as expected
+ */
public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
{
AMQQueue _queue;
VirtualHost _testVhost;
- private boolean _acks;
- private FieldTable _filters;
- private boolean _noLocal;
private int _channelID = 1;
Subscription _subscription;
@@ -50,7 +49,7 @@
_testVhost =
ApplicationRegistry.getInstance().getVirtualHostRegistry().
getVirtualHost("test");
- _queue = new MockAMQQueue("QueueLogSubjectTest");
+ _queue = new MockAMQQueue("SubscriptionLogSubjectTest");
((MockAMQQueue) _queue).setVirtualHost(_testVhost);
AMQChannel channel = new AMQChannel(_session, _channelID,
_session.getVirtualHost().getMessageStore());
@@ -60,7 +59,7 @@
SubscriptionFactory factory = new SubscriptionFactoryImpl();
_subscription = factory.createSubscription(_channelID, _session, new
AMQShortString("cTag"),
- _acks, _filters, _noLocal,
+ false, null, false,
new
LimitlessCreditManager());
_subscription.setQueue(_queue, false);
@@ -70,7 +69,7 @@
/**
* Validate that the logged Subject message is as expected:
- * MESSAGE [Blank][sub:0(qu(QueueLogSubjectTest))] <Log Message>
+ * MESSAGE [Blank][sub:0(qu(SubscriptionLogSubjectTest))] <Log Message>
*
* @param message the message whos format needs validation
*/
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java?rev=886720&r1=886719&r2=886720&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
Thu Dec 3 09:34:38 2009
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.logging.subjects;
+/**
+ * Blank Subject for testing
+ */
public class TestBlankSubject extends AbstractLogSubject
{
public TestBlankSubject()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
