You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2010/02/04 17:45:07 UTC
svn commit: r906559 -
/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/
Author: ritchiem
Date: Thu Feb 4 16:45:07 2010
New Revision: 906559
URL: http://svn.apache.org/viewvc?rev=906559&view=rev
Log:
QPID-2059 : Being even more explicit in some of the Logging tests as the previous update caused a sinle ExchangeLoggingTest failure. Updated tests where I can to explicitly wait for a message ID they are testing for. Then used a findMatches with the more general match. i.e. wait for QUE-1001 but find all QUE- messages.
Modified:
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -81,6 +81,8 @@
*/
public void testBrokerStartupConfiguration() throws Exception
{
+ String TESTID="BRK-1006";
+
// This logging startup code only occurs when you run a Java broker,
// that broker must be started via Main so not an InVM broker.
if (isJavaBroker() && isExternalBroker())
@@ -93,6 +95,9 @@
String configFilePath = _configFile.toString();
+ // Ensure we wait for TESTID to be logged
+ _monitor.waitAndFindMatches(TESTID, DEFAULT_LOG_WAIT);
+
List<String> results = _monitor.waitAndFindMatches(BRK_LOG_PREFIX, DEFAULT_LOG_WAIT);
try
{
@@ -103,10 +108,10 @@
String log = getLog(results.get(0));
//1
- validateMessageID("BRK-1006", log);
+ validateMessageID(TESTID, log);
//2
- results = _monitor.findMatches("BRK-1006");
+ results = _monitor.findMatches(TESTID);
assertEquals("More than one configuration message found.",
1, results.size());
@@ -172,6 +177,9 @@
// Ensure broker has fully started up.
getConnection();
+ // Ensure we wait for TESTID to be logged
+ _monitor.waitAndFindMatches(TESTID, DEFAULT_LOG_WAIT);
+
List<String> results = _monitor.waitAndFindMatches(BRK_LOG_PREFIX, DEFAULT_LOG_WAIT);
try
{
@@ -270,6 +278,9 @@
// Ensure broker has fully started up.
getConnection();
+ // Ensure we wait for TESTID to be logged
+ _monitor.waitAndFindMatches(TESTID, DEFAULT_LOG_WAIT);
+
List<String> results = _monitor.waitAndFindMatches(BRK_LOG_PREFIX, DEFAULT_LOG_WAIT);
try
{
@@ -355,8 +366,14 @@
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(_outputFile);
+
+ // Ensure we wait for TESTID to be logged
+ _monitor.waitAndFindMatches(TESTID, DEFAULT_LOG_WAIT);
+
+ // Retrieve all BRK- log messages so we can check for an erroneous
+ // BRK-1002 message.
+ List<String> results = _monitor.findMatches(BRK_LOG_PREFIX);
- List<String> results = _monitor.waitAndFindMatches(BRK_LOG_PREFIX, DEFAULT_LOG_WAIT);
try
{
// Validation
@@ -439,7 +456,12 @@
// Ensure broker has fully started up.
getConnection();
- List<String> results = _monitor.waitAndFindMatches(BRK_LOG_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we wait for TESTID to be logged
+ _monitor.waitAndFindMatches(TESTID, DEFAULT_LOG_WAIT);
+
+ // Retrieve all BRK- log messages so we can check for an erroneous
+ // BRK-1002 message.
+ List<String> results = _monitor.findMatches(BRK_LOG_PREFIX);
try
{
// Validation
@@ -539,7 +561,12 @@
// Ensure broker has fully started up.
getConnection();
- List<String> results = _monitor.waitAndFindMatches(BRK_LOG_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we wait for TESTID to be logged
+ _monitor.waitAndFindMatches(TESTID, DEFAULT_LOG_WAIT);
+
+ // Retrieve all BRK- log messages so we can check for an erroneous
+ // BRK-1002 message.
+ List<String> results = _monitor.findMatches(BRK_LOG_PREFIX);
try
{
// Validation
@@ -632,8 +659,12 @@
//Ensure the broker has fully started up.
getConnection();
+ // Ensure we wait for TESTID to be logged
+ _monitor.waitAndFindMatches(TESTID, DEFAULT_LOG_WAIT);
- List<String> results = _monitor.waitAndFindMatches(BRK_LOG_PREFIX, DEFAULT_LOG_WAIT);
+ // Retrieve all BRK- log messages so we can check for an erroneous
+ // BRK-1001 message.
+ List<String> results = _monitor.findMatches(BRK_LOG_PREFIX);
try
{
// Validation
@@ -647,7 +678,7 @@
assertFalse("More broker log statements present after ready message", validation);
String log = getLog(rawLog);
- // Ensure we do not have a BRK-1002 message
+ // Ensure we do not have a BRK-1001 message
if (!getMessageID(log).equals(TESTID))
{
if (getMessageID(log).equals("BRK-1001"))
@@ -912,6 +943,8 @@
// Ensure the broker has shutdown before retreving results
checkSocketClosed(getPort());
+ _monitor.waitAndFindMatches(TESTID, DEFAULT_LOG_WAIT);
+
List<String> results = _monitor.waitAndFindMatches(BRK_LOG_PREFIX, DEFAULT_LOG_WAIT);
try
{
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -64,7 +64,10 @@
// Test that calling session.close gives us the expected output
((AMQConnection)connection).createSession(false, Session.AUTO_ACKNOWLEDGE,PREFETCH);
- List<String> results = _monitor.waitAndFindMatches(CHANNEL_PREFIX, DEFAULT_LOG_WAIT);
+ // Wait to ensure that the CHN-1004 message is logged
+ _monitor.waitForMessage("CHN-1004", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(CHANNEL_PREFIX);
// Validation
@@ -119,13 +122,16 @@
connection.start();
- List<String> results = _monitor.waitAndFindMatches(CHANNEL_PREFIX, DEFAULT_LOG_WAIT);
+ // Wait to ensure that the CHN-1002 message is logged
+ _monitor.waitForMessage("CHN-1002", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(CHANNEL_PREFIX);
assertTrue("No CHN messages logged", results.size() > 0);
// The last channel message should be:
//
- // INFO - MESSAGE [con:0(guest@anonymous(4205299)/test)/ch:1] [con:0(guest@anonymous(4205299)/test)/ch:1] CHN-1002 : Flow Off
+ // INFO - MESSAGE [con:0(guest@anonymous(4205299)/test)/ch:1] [con:0(guest@anonymous(4205299)/test)/ch:1] CHN-1002 : Flow Stopped
// Verify
int resultSize = results.size();
@@ -178,7 +184,10 @@
// incase it did take more than 2 seconds to log.
_monitor.waitForMessage(CHANNEL_PREFIX, 2000);
- List<String> results = _monitor.waitAndFindMatches(CHANNEL_PREFIX, DEFAULT_LOG_WAIT);
+ // Wait to ensure that the CHN-1002 message is logged
+ _monitor.waitForMessage("CHN-1002", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(CHANNEL_PREFIX);
assertTrue("No CHN messages logged", results.size() > 0);
@@ -227,7 +236,10 @@
// Close the connection to verify the created session closing is logged.
connection.close();
- List<String> results = _monitor.waitAndFindMatches(CHANNEL_PREFIX, DEFAULT_LOG_WAIT);
+ // Wait to ensure that the CHN-1003 message is logged
+ _monitor.waitForMessage("CHN-1003", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(CHANNEL_PREFIX);
assertTrue("No CHN messages logged", results.size() > 0);
@@ -274,16 +286,14 @@
// Create a session and then close it
connection.createSession(false, Session.AUTO_ACKNOWLEDGE).close();
- List<String> results = _monitor.waitAndFindMatches(CHANNEL_PREFIX, DEFAULT_LOG_WAIT);
+ // Wait to ensure that the CHN-1003 message is logged
+ _monitor.waitForMessage("CHN-1003", DEFAULT_LOG_WAIT);
- assertTrue("No CHN messages logged", results.size() > 0);
+ List<String> results = _monitor.findMatches(CHANNEL_PREFIX);
- // The last two channel messages should be:
- //
- // INFO - MESSAGE [con:0(guest@anonymous(4205299)/test)/ch:1] [con:0(guest@anonymous(4205299)/test)/ch:1] CHN-1002 : Flow On
+ assertTrue("No CHN messages logged", results.size() > 0);
// Verify
-
int resultSize = results.size();
String log = getLog(results.get(resultSize - 1));
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -146,7 +146,10 @@
// Open and then close the conneciton
getConnection().close();
- List<String> results = _monitor.waitAndFindMatches(CONNECTION_PREFIX, DEFAULT_LOG_WAIT);
+ // Wait to ensure that the desired message is logged
+ _monitor.waitForMessage("CON-1002", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(CONNECTION_PREFIX);
// Validation
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -516,7 +516,7 @@
assertTrue("MST-1004 does end with queue '" + queueName + "':" + getMessageString(result),
getMessageString(result).endsWith(queueName));
- results = _monitor.findMatches("MST-1005");
+ results = _monitor.waitAndFindMatches("MST-1005", DEFAULT_LOG_WAIT);
assertTrue("Insufficient MST-1005 logged.", results.size()>0);
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -94,7 +94,10 @@
_session.createConsumer(queue);
// Validation
- List<String> results = _monitor.waitAndFindMatches(QUEUE_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we have received the QUE log msg.
+ _monitor.waitForMessage("QUE-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(QUEUE_PREFIX);
// Only 1 Queue message should hav been logged
assertEquals("Result set size not as expected", 1, results.size());
@@ -145,7 +148,10 @@
_session.createConsumer(queue);
// Validation
- List<String> results = _monitor.waitAndFindMatches(QUEUE_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we have received the QUE log msg.
+ _monitor.waitForMessage("QUE-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(QUEUE_PREFIX);
// Only 1 Queue message should hav been logged
assertEquals("Result set size not as expected", 1, results.size());
@@ -196,7 +202,10 @@
_session.createConsumer(queue);
// Validation
- List<String> results = _monitor.waitAndFindMatches(QUEUE_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we have received the QUE log msg.
+ _monitor.waitForMessage("QUE-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(QUEUE_PREFIX);
// Only 1 Queue message should hav been logged
assertEquals("Result set size not as expected", 1, results.size());
@@ -256,7 +265,10 @@
_session.createConsumer(_session.createQueue(getTestQueueName()));
// Validation
- List<String> results = _monitor.waitAndFindMatches(QUEUE_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we have received the QUE log msg.
+ _monitor.waitForMessage("QUE-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(QUEUE_PREFIX);
// Only 1 Queue message should hav been logged
assertEquals("Result set size not as expected", 1, results.size());
@@ -317,7 +329,10 @@
_session.createConsumer(_session.createQueue(getTestQueueName()));
// Validation
- List<String> results = _monitor.waitAndFindMatches(QUEUE_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we have received the QUE log msg.
+ _monitor.waitForMessage("QUE-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(QUEUE_PREFIX);
// Only 1 Queue message should hav been logged
assertEquals("Result set size not as expected", 1, results.size());
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -94,7 +94,10 @@
// They should all be durable
- List<String> results = _monitor.waitAndFindMatches(EXH_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we have received the EXH log msg.
+ _monitor.waitForMessage("EXH-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(EXH_PREFIX);
assertTrue("No Results found for Exchange.", results.size()>0);
@@ -131,8 +134,10 @@
_monitor.reset();
_session.createConsumer(_queue);
+ // Ensure we have received the EXH log msg.
+ _monitor.waitForMessage("EXH-1001", DEFAULT_LOG_WAIT);
- List<String> results = _monitor.waitAndFindMatches(EXH_PREFIX, DEFAULT_LOG_WAIT);
+ List<String> results = _monitor.findMatches(EXH_PREFIX);
assertEquals("Result set larger than expected.", 1, results.size());
@@ -180,7 +185,10 @@
((AMQConnection) _connection).getProtocolHandler().syncWrite(exchangeDeclare, ExchangeDeleteOkBody.class);
- List<String> results = _monitor.waitAndFindMatches(EXH_PREFIX, DEFAULT_LOG_WAIT);
+ //Wait and ensure we get our last EXH-1002 msg
+ _monitor.waitForMessage("EXH-1002", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(EXH_PREFIX);
assertEquals("Result set larger than expected.", 2, results.size());
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -85,7 +85,11 @@
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(_outputFile);
- List<String> results = _monitor.waitAndFindMatches(MNG_PREFIX, DEFAULT_LOG_WAIT);
+ // Ensure we have received the MNG log msg.
+ _monitor.waitForMessage("MNG-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(MNG_PREFIX);
+
try
{
// Validation
@@ -144,7 +148,7 @@
// Now we can create the monitor as _outputFile will now be defined
_monitor = new LogMonitor(_outputFile);
- List<String> results = _monitor.waitAndFindMatches(MNG_PREFIX, DEFAULT_LOG_WAIT);
+ List<String> results = _monitor.findMatches(MNG_PREFIX);
try
{
// Validation
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -93,7 +93,7 @@
List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
//Validate each vhost logs a creation
- results = _monitor.findMatches("MST-1001");
+ results = _monitor.waitAndFindMatches("MST-1001", DEFAULT_LOG_WAIT);
assertEquals("Each vhost did not create a store.", vhosts.size(), results.size());
@@ -160,7 +160,7 @@
List<String> vhosts = configuration.getConfig().getList("virtualhosts.virtualhost.name");
//Validate each vhost logs a creation
- results = _monitor.findMatches("MST-1003");
+ results = _monitor.waitAndFindMatches("MST-1003", DEFAULT_LOG_WAIT);
assertEquals("Each vhost did not close its store.", vhosts.size(), results.size());
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -94,7 +94,10 @@
_session.close();
// Validation
- List<String> results = _monitor.waitAndFindMatches(QUEUE_PREFIX, DEFAULT_LOG_WAIT);
+ //Ensure that we wait for the QUE log message
+ _monitor.waitAndFindMatches("QUE-1002", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(QUEUE_PREFIX);
// Only 1 Queue message should hav been logged
assertEquals("Result set size not as expected", 2, results.size());
@@ -145,7 +148,10 @@
_session.createConsumer(_session.createTemporaryQueue()).close();
// Validation
- List<String> results = _monitor.waitAndFindMatches(QUEUE_PREFIX, DEFAULT_LOG_WAIT);
+ //Ensure that we wait for the QUE log message
+ _monitor.waitAndFindMatches("QUE-1002", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(QUEUE_PREFIX);
// Only 1 Queue message should hav been logged
assertEquals("Result set size not as expected", 2, results.size());
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -91,7 +91,10 @@
//Validate
- List<String> results = _monitor.waitAndFindMatches(SUB_PREFIX, DEFAULT_LOG_WAIT);
+ //Ensure that we wait for the SUB log message
+ _monitor.waitAndFindMatches("SUB-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(SUB_PREFIX);
assertEquals("Result set larger than expected.", 1, results.size());
@@ -126,7 +129,10 @@
_session.createDurableSubscriber(_topic, getName());
//Validate
- List<String> results = _monitor.waitAndFindMatches(SUB_PREFIX, 2000);
+ //Ensure that we wait for the SUB log message
+ _monitor.waitAndFindMatches("SUB-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(SUB_PREFIX);
assertEquals("Result set not as expected.", 1, results.size());
@@ -162,7 +168,10 @@
_session.createBrowser(_queue);
//Validate
- List<String> results = _monitor.waitAndFindMatches(SUB_PREFIX, DEFAULT_LOG_WAIT);
+ //Ensure that we wait for the SUB log message
+ _monitor.waitAndFindMatches("SUB-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(SUB_PREFIX);
assertEquals("Result set larger than expected.", 2, results.size());
@@ -206,7 +215,10 @@
//Validate
- List<String> results = _monitor.waitAndFindMatches(SUB_PREFIX, DEFAULT_LOG_WAIT);
+ //Ensure that we wait for the SUB log message
+ _monitor.waitAndFindMatches("SUB-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(SUB_PREFIX);
assertEquals("Result set larger than expected.", 1, results.size());
@@ -244,7 +256,10 @@
//Validate
- List<String> results = _monitor.waitAndFindMatches(SUB_PREFIX, 2000);
+ //Ensure that we wait for the SUB log message
+ _monitor.waitAndFindMatches("SUB-1001", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(SUB_PREFIX);
assertEquals("Result set larger than expected.", 1, results.size());
@@ -282,7 +297,10 @@
_session.createConsumer(_queue).close();
//Validate
- List<String> results = _monitor.waitAndFindMatches(SUB_PREFIX, DEFAULT_LOG_WAIT);
+ //Ensure that we wait for the SUB log message
+ _monitor.waitAndFindMatches("SUB-1002", DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(SUB_PREFIX);
//3
assertEquals("Result set larger than expected.", 2, results.size());
Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java?rev=906559&r1=906558&r2=906559&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java Thu Feb 4 16:45:07 2010
@@ -59,8 +59,10 @@
*/
public void testVirtualhostCreation() throws Exception
{
+ //Wait for the correct VHT message to arrive.
+ _monitor.waitForMessage("VHT-1001",DEFAULT_LOG_WAIT);
- List<String> results = _monitor.waitAndFindMatches(VHT_PREFIX, DEFAULT_LOG_WAIT);
+ List<String> results = _monitor.findMatches(VHT_PREFIX);
try
{
// Validation
@@ -112,7 +114,10 @@
{
stopBroker();
- List<String> results = _monitor.waitAndFindMatches(VHT_PREFIX, DEFAULT_LOG_WAIT);
+ //Wait for the correct VHT message to arrive.
+ _monitor.waitForMessage("VHT-1002",DEFAULT_LOG_WAIT);
+
+ List<String> results = _monitor.findMatches(VHT_PREFIX);
try
{
// Validation
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org