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.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@906559 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 144 insertions, 42 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
index 7c143285f9..b5203742bd 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
@@ -81,6 +81,8 @@ public class BrokerLoggingTest extends AbstractTestLogging
      */
     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 @@ public class BrokerLoggingTest extends AbstractTestLogging
 
             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 @@ public class BrokerLoggingTest extends AbstractTestLogging
                 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 @@ public class BrokerLoggingTest extends AbstractTestLogging
             // 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 @@ public class BrokerLoggingTest extends AbstractTestLogging
             // 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 @@ public class BrokerLoggingTest extends AbstractTestLogging
 
             // 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 @@ public class BrokerLoggingTest extends AbstractTestLogging
             // 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 @@ public class BrokerLoggingTest extends AbstractTestLogging
             // 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 @@ public class BrokerLoggingTest extends AbstractTestLogging
 
             //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 @@ public class BrokerLoggingTest extends AbstractTestLogging
                     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 @@ public class BrokerLoggingTest extends AbstractTestLogging
             // 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
             {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
index 10044fe24d..2d1a204ce4 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
@@ -64,7 +64,10 @@ public class ChannelLoggingTest extends AbstractTestLogging
         // 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 @@ public class ChannelLoggingTest extends AbstractTestLogging
 
         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 @@ public class ChannelLoggingTest extends AbstractTestLogging
         // 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 @@ public class ChannelLoggingTest extends AbstractTestLogging
         // 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 @@ public class ChannelLoggingTest extends AbstractTestLogging
         // 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));
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
index 6256d4964a..9bdf2bb7a3 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
@@ -146,7 +146,10 @@ public class ConnectionLoggingTest extends AbstractTestLogging
         // 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
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
index d021aa89a7..5b2fc4cdcb 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
@@ -516,7 +516,7 @@ public class DerbyMessageStoreLoggingTest extends MemoryMessageStoreLoggingTest
             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);
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
index 48c1b6e487..a58c09b1e0 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
@@ -94,7 +94,10 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
         _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 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
         _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 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
         _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 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
         _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 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
         _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());
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
index 7ffbaa4fc9..5facafe6aa 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
@@ -94,7 +94,10 @@ public class ExchangeLoggingTest extends AbstractTestLogging
 
         // 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 @@ public class ExchangeLoggingTest extends AbstractTestLogging
         _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 @@ public class ExchangeLoggingTest extends AbstractTestLogging
 
         ((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());
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
index 906e37e46f..9ec223f694 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
@@ -85,7 +85,11 @@ public class ManagementLoggingTest extends AbstractTestLogging
             // 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 @@ public class ManagementLoggingTest extends AbstractTestLogging
             // 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
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
index d63bb77c47..1bcef1dbb0 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
@@ -93,7 +93,7 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging
         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 @@ public class MemoryMessageStoreLoggingTest extends AbstractTestLogging
         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());
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
index 639516a083..0637271c0c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
@@ -94,7 +94,10 @@ public class QueueLoggingTest extends AbstractTestLogging
         _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 @@ public class QueueLoggingTest extends AbstractTestLogging
            _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());
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
index 425be0fce9..6a0e2f1e86 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
@@ -91,7 +91,10 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
 
         //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 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
         _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 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
         _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 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
 
         //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 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
 
         //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 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
         _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());
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
index 17e2d2e554..b97bd64a55 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
@@ -59,8 +59,10 @@ public class VirtualHostLoggingTest extends AbstractTestLogging
      */
     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 @@ public class VirtualHostLoggingTest extends AbstractTestLogging
     {
         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