summaryrefslogtreecommitdiff
path: root/qpid/java/systests/src
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2010-09-03 15:35:44 +0000
committerRobert Gemmell <robbie@apache.org>2010-09-03 15:35:44 +0000
commite05d000fea861e01d5a98dac417642f47a8ccbc5 (patch)
treee76f4e64bd03d0baac64d7fb78b4dc3501595043 /qpid/java/systests/src
parente940a053f38846188a9206a1185d81d2094d7fed (diff)
downloadqpid-python-e05d000fea861e01d5a98dac417642f47a8ccbc5.tar.gz
QPID-2843: Ensure that a MNG-1004 message is logged when using the platform agent (and indicates use of the platform agent), merge the BRK-1004 message text with the previously used stdout startup log message.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@992330 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java4
1 files changed, 2 insertions, 2 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 eafa2f6e61..66bcc10c50 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
@@ -601,7 +601,7 @@ public class BrokerLoggingTest extends AbstractTestLogging
* No input, all successful broker startups will show BRK-1004 messages.
* Output:
*
- * 2009-07-09 15:50:20 +0100 MESSAGE BRK-1004 : Ready
+ * 2009-07-09 15:50:20 +0100 MESSAGE BRK-1004 : Qpid Broker Ready
*
* Validation Steps:
*
@@ -659,7 +659,7 @@ public class BrokerLoggingTest extends AbstractTestLogging
validateMessageID(TESTID, log);
//2
- assertEquals("Ready message not present", "Ready", getMessageString(log));
+ assertEquals("Ready message not present", "Qpid Broker Ready", getMessageString(log));
//There will be 2 copies of the startup message (one via SystemOut, and one via Log4J)
assertEquals("Unexpected ready message count",