Author: ritchiem Date: Fri Aug 7 18:08:54 2009 New Revision: 802120 URL: http://svn.apache.org/viewvc?rev=802120&view=rev Log: Ensured monitor resets do not exclude test connnection setup
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java?rev=802120&r1=802119&r2=802120&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java Fri Aug 7 18:08:54 2009 @@ -57,11 +57,12 @@ public void setUp() throws Exception { super.setUp(); + //Ensure we only have logs from our test + _monitor.reset(); + _connection = getConnection(); _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE); _durable = true; - //Ensure we only have logs from our - _monitor.reset(); } /** Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java?rev=802120&r1=802119&r2=802120&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java Fri Aug 7 18:08:54 2009 @@ -53,11 +53,11 @@ public void setUp() throws Exception { super.setUp(); - _connection = getConnection(); - _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - //Remove broker startup logging messages _monitor.reset(); + + _connection = getConnection(); + _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE); } /** Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java?rev=802120&r1=802119&r2=802120&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java Fri Aug 7 18:08:54 2009 @@ -51,6 +51,8 @@ public void setUp() throws Exception { super.setUp(); + //Remove broker startup logging messages + _monitor.reset(); _connection = getConnection(); @@ -58,8 +60,6 @@ _queue = (Queue) getInitialContext().lookup(QUEUE); _topic = (Topic) getInitialContext().lookup(TOPIC); - - _monitor.reset(); } /** --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org